{labelText && (
)}
- {helperText && = ({ title, afterClose })
className="delete"
aria-label="close"
data-test="modal-close-button"
+ type="button"
onClick={event => {
event.preventDefault()
afterClose && afterClose()
diff --git a/packages/elements/src/styles/base/layout.scss b/packages/elements/src/styles/base/layout.scss
index a72b0a77b4..7df7746e4b 100644
--- a/packages/elements/src/styles/base/layout.scss
+++ b/packages/elements/src/styles/base/layout.scss
@@ -14,4 +14,5 @@ $layout-quadruple: calc(1rem * 4);
$layout-sextuple: calc(1rem * 6);
$menu-width: 250px;
-$page-container: calc(100vw - 250px);
\ No newline at end of file
+$nav-bar-width: 66px;
+$page-container: calc(100vw - 250px);
diff --git a/packages/elements/src/styles/base/utilities.scss b/packages/elements/src/styles/base/utilities.scss
index 50c8cfa08c..9906505703 100644
--- a/packages/elements/src/styles/base/utilities.scss
+++ b/packages/elements/src/styles/base/utilities.scss
@@ -7,6 +7,10 @@ $units: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10;
flex-grow: $unit;
}
+ .flex-shrink-#{$unit} {
+ flex-shrink: $unit;
+ }
+
.text-ellipsis-#{$unit} {
display: -webkit-box;
-webkit-line-clamp: 1;
diff --git a/packages/elements/src/styles/components/table.scss b/packages/elements/src/styles/components/table.scss
index fcf6311dcb..89d443406a 100644
--- a/packages/elements/src/styles/components/table.scss
+++ b/packages/elements/src/styles/components/table.scss
@@ -7,6 +7,7 @@
& td {
word-break: normal;
max-width: 300px;
+ overflow-wrap: break-word;
}
tr {
&.is-expanded {
diff --git a/packages/elements/src/styles/components/toast.scss b/packages/elements/src/styles/components/toast.scss
index caa67f9f08..d77a109d66 100644
--- a/packages/elements/src/styles/components/toast.scss
+++ b/packages/elements/src/styles/components/toast.scss
@@ -1,4 +1,5 @@
@import '../base/layout.scss';
+@import '../base/browser.scss';
.toast {
width: 100%;
@@ -18,6 +19,11 @@
-webkit-transform: translateY(-$layout-base);
}
+ @include for-ie-only {
+ width: inherit;
+ left: $nav-bar-width;
+ }
+
button {
white-space: unset;
}
diff --git a/packages/elements/src/styles/vendor/bulma-overrides.scss b/packages/elements/src/styles/vendor/bulma-overrides.scss
index a844932c4c..09c937c687 100644
--- a/packages/elements/src/styles/vendor/bulma-overrides.scss
+++ b/packages/elements/src/styles/vendor/bulma-overrides.scss
@@ -112,7 +112,8 @@ html {
}
}
-.field, .field:not(:last-child) {
+.field,
+.field:not(:last-child) {
margin-bottom: 0.75rem;
}
@@ -168,9 +169,11 @@ html {
}
.control {
- .label, i {
+ .label,
+ i {
color: $grey;
}
+
&.has-icons-right,
&.has-icons-left {
.icon {
@@ -284,9 +287,13 @@ a {
}
&.is-page-container {
- // to allow scroll past end of content, allowing for toast popup and
+ // to allow scroll past end of content, allowing for toast popup and
// increase readability, especially in mobile
- margin-bottom: 6rem;
+ // Need to use "padding-bottom" here because "margin-bottom" doesn't work on IE
+ padding-bottom: 6rem;
+ // Fix IE flex columns height bug
+ // https://stackoverflow.com/a/36900208
+ flex-shrink: 0;
}
}
@@ -294,9 +301,14 @@ a {
font-family: $title-family;
}
+.modal-card {
+ overflow: auto;
+}
+
.modal-card,
.modal-content {
margin: 0 auto;
+
.modal-card {
@media screen and (max-width: 768px) {
max-height: calc(100vh - 160px);
diff --git a/packages/elements/src/tests/badges/badge-branches.svg b/packages/elements/src/tests/badges/badge-branches.svg
index e5cde05d0b..2c0fafd5e1 100644
--- a/packages/elements/src/tests/badges/badge-branches.svg
+++ b/packages/elements/src/tests/badges/badge-branches.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/packages/elements/src/tests/badges/badge-lines.svg b/packages/elements/src/tests/badges/badge-lines.svg
index 066a599791..8abe5c7a74 100644
--- a/packages/elements/src/tests/badges/badge-lines.svg
+++ b/packages/elements/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/packages/elements/src/tests/badges/badge-statements.svg b/packages/elements/src/tests/badges/badge-statements.svg
index 3644494653..dbccb30666 100644
--- a/packages/elements/src/tests/badges/badge-statements.svg
+++ b/packages/elements/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/packages/elements/src/utils/validators/error-messages.ts b/packages/elements/src/utils/validators/error-messages.ts
index d9268f5898..83052a7650 100644
--- a/packages/elements/src/utils/validators/error-messages.ts
+++ b/packages/elements/src/utils/validators/error-messages.ts
@@ -10,7 +10,7 @@ const errorMessages = {
FIELD_INVALID_PASSWORD:
'Your Password should be a minimum of 8 characters; ' +
'must contain at least one lowercase letter, one uppercase letter and one number.',
- FIELD_WRONG_URI_FORMAT: 'Invalid uri format',
+ FIELD_WRONG_URI_FORMAT: 'Invalid URI format',
MINIMUM_CHARACTER_LENGTH: minCharLengthErrMessage,
MAXIMUM_CHARACTER_LENGTH: maxCharLengthErrMessage,
}
diff --git a/packages/foundations-ts-definitions/types/marketplace-api-schema.ts b/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
index 2f9fe9857e..616a0c77e7 100644
--- a/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
+++ b/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
@@ -369,6 +369,80 @@ export interface CategoryModel {
*/
readonly links?: LinkModel[]
}
+/**
+ * Model to expose company address info
+ */
+export interface CompanyAddressModel {
+ /**
+ * The building name
+ */
+ buildingName?: string
+ /**
+ * The building number
+ */
+ buildingNumber?: string
+ /**
+ * The first line of the address
+ */
+ line1?: string
+ /**
+ * The second line of the address
+ */
+ line2?: string
+ /**
+ * The third line of the address
+ */
+ line3?: string
+ /**
+ * The fourth line of the address
+ */
+ line4?: string
+ /**
+ * The postcode
+ */
+ postcode?: string
+ /**
+ * The ISO-3166 country code that the address resides within
+ */
+ countryId?: string
+}
+/**
+ * Request body used to set the address details
+ */
+export interface CreateAddressModel {
+ /**
+ * The building name
+ */
+ buildingName?: string
+ /**
+ * The building number
+ */
+ buildingNumber?: string
+ /**
+ * The first line of the address
+ */
+ line1?: string
+ /**
+ * The second line of the address
+ */
+ line2?: string
+ /**
+ * The third line of the address
+ */
+ line3?: string
+ /**
+ * The fourth line of the address
+ */
+ line4?: string
+ /**
+ * The postcode
+ */
+ postcode?: string
+ /**
+ * The ISO-3166 country code that the address resides within
+ */
+ countryId?: string
+}
/**
* The model responsible for creation of an app definition
*/
@@ -629,7 +703,27 @@ export interface CreateDeveloperModel {
/**
* Sets the date the developer agreed to the terms
*/
- readonly agreedTerms?: string // date-time
+ agreedTerms?: string // date-time
+ /**
+ * Sets a brief description for the developers organisation
+ */
+ about?: string
+ /**
+ * Sets the website of the developers organisation
+ */
+ website?: string
+ /**
+ * Sets the tax number of the developers organisation
+ */
+ taxNumber?: string
+ /**
+ * Sets the registration number of the developers organisation
+ */
+ registrationNumber?: string
+ /**
+ * Sets the address of the developers organisation
+ */
+ companyAddress?: CreateAddressModel
}
/**
* The model responsible for creation of an installation between a specific client and app
@@ -703,49 +797,85 @@ export interface DesktopIntegrationTypeModel {
*/
export interface DeveloperModel {
/**
- * Gets the id of this developer
+ * The id of this developer
*/
- readonly id?: string // uuid
+ id?: string // uuid
/**
- * Gets the id of this developer held in the gateway
+ * The id of this developer held in the gateway
*/
- readonly externalId?: string
+ externalId?: string
/**
- * Gets the full name of this developer
+ * The full name of this developer
*/
- readonly name?: string
+ name?: string
/**
- * Gets the company to which this developer is acting on behalf of
+ * The company to which this developer is acting on behalf of
*/
- readonly company?: string
+ company?: string
/**
- * Gets the job title for this developer
+ * The job title for this developer
*/
- readonly jobTitle?: string
+ jobTitle?: string
/**
- * Gets the email address of the developer
+ * The email address of the developer
*/
- readonly email?: string
+ email?: string
/**
- * Gets the telephone number of the developer
+ * The telephone number of the developer
*/
- readonly telephone?: string
+ telephone?: string
/**
- * Gets the date the developer agreed to the terms
+ * The date the developer agreed to the terms
*/
- readonly agreedTerms?: string // date-time
+ agreedTerms?: string // date-time
/**
- * Gets the flag determining if the developer is inactive
+ * The flag determining if the developer is inactive
*/
isInactive?: boolean
/**
- * Gets the timestamp of entity creation
+ * A brief description of the developers organisation
*/
- readonly created?: string // date-time
+ about?: string
/**
- * Gets the timestamp of entity modification
+ * The website for the developers organisation
*/
- readonly modified?: string // date-time
+ website?: string
+ /**
+ * The tax number of the developers organisation
+ */
+ taxNumber?: string
+ /**
+ * The registration number of the developers organisation
+ */
+ registrationNumber?: string
+ /**
+ * The email of the accounts department for the developer
+ */
+ billingEmail?: string
+ /**
+ * The telephone number for the accounts department for the developer
+ */
+ billingTelephone?: string
+ /**
+ * The name of the member of staff dealing with billing
+ */
+ billingKeyContact?: string
+ /**
+ * The reapit account reference used for this company
+ */
+ reapitReference?: string
+ /**
+ * The timestamp of entity creation
+ */
+ created?: string // date-time
+ /**
+ * The timestamp of entity modification
+ */
+ modified?: string // date-time
+ /**
+ * The address of the developers organisation
+ */
+ companyAddress?: CompanyAddressModel
/**
* Gets the links associated to this model
*/
@@ -1047,6 +1177,43 @@ export interface TerminateInstallationModel {
*/
terminatesOn?: string // date-time
}
+/**
+ * Request body used to set the address details
+ */
+export interface UpdateAddressModel {
+ /**
+ * The building name
+ */
+ buildingName?: string
+ /**
+ * The building number
+ */
+ buildingNumber?: string
+ /**
+ * The first line of the address
+ */
+ line1?: string
+ /**
+ * The second line of the address
+ */
+ line2?: string
+ /**
+ * The third line of the address
+ */
+ line3?: string
+ /**
+ * The fourth line of the address
+ */
+ line4?: string
+ /**
+ * The postcode
+ */
+ postcode?: string
+ /**
+ * The ISO-3166 country code that the address resides within
+ */
+ countryId?: string
+}
/**
* The model responsible for updating a desktop integration type
*/
@@ -1092,4 +1259,40 @@ export interface UpdateDeveloperModel {
* Sets the flag specifying if the developer is inactive
*/
isInactive?: boolean
+ /**
+ * Sets a brief description for the developers organisation
+ */
+ about?: string
+ /**
+ * Sets the website of the developers organisation
+ */
+ website?: string
+ /**
+ * Sets the tax number of the developers organisation
+ */
+ taxNumber?: string
+ /**
+ * Sets the registration number of the developers organisation
+ */
+ registrationNumber?: string
+ /**
+ * Sets the email of the accounts department for the developer
+ */
+ billingEmail?: string
+ /**
+ * Sets the telephone number for the accounts department for the developer
+ */
+ billingTelephone?: string
+ /**
+ * Sets the name of the member of staff dealing with billing
+ */
+ billingKeyContact?: string
+ /**
+ * Sets reapits account reference used for this company
+ */
+ reapitReference?: string
+ /**
+ * Sets the address of the developers organisation
+ */
+ companyAddress?: UpdateAddressModel
}
diff --git a/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts b/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
index e51608c49a..8aa3aa2145 100644
--- a/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
+++ b/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
@@ -1,5 +1,4 @@
import { css } from 'linaria'
-import { white } from '@/core/__styles__'
export const loginPageContainer = css`
min-width: 100vw;
@@ -8,7 +7,6 @@ export const loginPageContainer = css`
justify-content: flex-end;
align-items: center;
flex-direction: row;
- background-color: ${white};
@media screen and (max-width: 900px) {
flex-direction: column-reverse;
@@ -16,7 +14,6 @@ export const loginPageContainer = css`
`
export const loginPageFormContainer = css`
- background-color: ${white};
width: 33.33%;
padding: 1rem;
pointer-events: auto;
diff --git a/packages/marketplace/src/actions/submit-app.ts b/packages/marketplace/src/actions/submit-app.ts
index 11e51d2b17..3abc6a7024 100644
--- a/packages/marketplace/src/actions/submit-app.ts
+++ b/packages/marketplace/src/actions/submit-app.ts
@@ -13,7 +13,7 @@ export type CustomCreateAppModel = Pick &
+ Pick &
Pick, 'setErrors' | 'setFieldValue'>
export type WizardChangeStepModel = {
diff --git a/packages/marketplace/src/actions/submit-revision.ts b/packages/marketplace/src/actions/submit-revision.ts
index 1831917771..24269323fe 100644
--- a/packages/marketplace/src/actions/submit-revision.ts
+++ b/packages/marketplace/src/actions/submit-revision.ts
@@ -2,7 +2,11 @@ import { actionCreator } from '../utils/actions'
import ActionTypes from '../constants/action-types'
import { CreateAppRevisionModel } from '@reapit/foundations-ts-definitions'
-export const submitRevision = actionCreator(
- ActionTypes.DEVELOPER_SUBMIT_REVISION,
-)
+export type SubmitRevisionParams = {
+ params: CreateAppRevisionModel & { id: string }
+ onSuccess: () => void
+ onError: () => void
+}
+
+export const submitRevision = actionCreator(ActionTypes.DEVELOPER_SUBMIT_REVISION)
export const submitRevisionSetFormState = actionCreator(ActionTypes.DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE)
diff --git a/packages/marketplace/src/assets/files/developer-edition-guide.pdf b/packages/marketplace/src/assets/files/developer-edition-guide.pdf
new file mode 100644
index 0000000000..db9c0bf388
Binary files /dev/null and b/packages/marketplace/src/assets/files/developer-edition-guide.pdf differ
diff --git a/packages/marketplace/src/assets/files/foundation-pricing-0720.pdf b/packages/marketplace/src/assets/files/foundation-pricing-0720.pdf
new file mode 100644
index 0000000000..fe87b1dae1
Binary files /dev/null and b/packages/marketplace/src/assets/files/foundation-pricing-0720.pdf differ
diff --git a/packages/marketplace/src/assets/images/developer-desktop/video-clip.jpg b/packages/marketplace/src/assets/images/developer-desktop/video-clip.jpg
deleted file mode 100644
index e012dc6f60..0000000000
Binary files a/packages/marketplace/src/assets/images/developer-desktop/video-clip.jpg and /dev/null differ
diff --git a/packages/marketplace/src/components/pages/__tests__/__snapshots__/developer-help.test.tsx.snap b/packages/marketplace/src/components/pages/__tests__/__snapshots__/developer-help.test.tsx.snap
index c1b0a5f06a..86a6105e31 100644
--- a/packages/marketplace/src/components/pages/__tests__/__snapshots__/developer-help.test.tsx.snap
+++ b/packages/marketplace/src/components/pages/__tests__/__snapshots__/developer-help.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`DeveloperHelpPage should match a snapshot 1`] = `
"buttonText": "START CHAT",
"header": "Need Help?",
"imgSrc": "",
- "text": "If you need any support, we are here to help. Why not talk to one of our Developers or Product Owners directly.",
+ "text": "If you have a question that is not covered in the documentation you can ask here. Please note we don’t provide chat support for Agency Cloud Developer Edition.",
},
Object {
"buttonOnClick": [Function],
@@ -104,7 +104,9 @@ exports[`DeveloperHelpPage should match a snapshot 1`] = `
className=""
data-test=""
>
-
+
-
+
-
+
-
+
-
+
- If you need any support, we are here to help. Why not talk to one of our Developers or Product Owners directly.
+ If you have a question that is not covered in the documentation you can ask here. Please note we don’t provide chat support for Agency Cloud Developer Edition.
{helperText}
} + {helperText && (React.isValidElement(helperText) ? helperText :{helperText}
)} `; diff --git a/packages/elements/src/components/Modal/index.tsx b/packages/elements/src/components/Modal/index.tsx index 87ef5a1c0c..1960cbebb9 100644 --- a/packages/elements/src/components/Modal/index.tsx +++ b/packages/elements/src/components/Modal/index.tsx @@ -39,6 +39,7 @@ export const ModalHeader: React.SFC{status}
} diff --git a/packages/marketplace/src/components/pages/admin-dev-management/__tests__/__snapshots__/admin-dev-management.test.tsx.snap b/packages/marketplace/src/components/pages/admin-dev-management/__tests__/__snapshots__/admin-dev-management.test.tsx.snap index f67d5d8d7e..68a8097af3 100644 --- a/packages/marketplace/src/components/pages/admin-dev-management/__tests__/__snapshots__/admin-dev-management.test.tsx.snap +++ b/packages/marketplace/src/components/pages/admin-dev-management/__tests__/__snapshots__/admin-dev-management.test.tsx.snap @@ -239,7 +239,7 @@ exports[`AdminDevManagement should match a snapshot when LOADING false 1`] = ` name="registeredFrom" reactDatePickerProps={ Object { - "maxDate": 2019-10-09T22:39:51.389Z, + "maxDate": 2019-10-10T22:39:51.389Z, } } > @@ -248,7 +248,7 @@ exports[`AdminDevManagement should match a snapshot when LOADING false 1`] = ` validate={null} >- You do not currently have an Agency Cloud User License so you can't visit the Reapit Marketplace, - if you would like more information on Agency Cloud please visit + To access the Reapit Marketplace, you will need to have an Agency Cloud User License. To obtain a license, please visit the - - our public site. - + Desktop + - Alternatively, if you are a developer on the Reapit Platfom, one of your clients may be willing to sponsor with a paid user license. + page within the Developers Portal, where you can subscribe to a Developer Edition of Agency Cloud.
- {`You do not currently have an Agency Cloud User License so you can't visit the Reapit Marketplace, - if you would like more information on Agency Cloud please visit `} + To access the Reapit Marketplace, you will need to have an Agency Cloud User License. To obtain a license, + please visit the - our public site. + Desktop - Alternatively, if you are a developer on the Reapit Platfom, one of your clients may be willing to sponsor - with a paid user license. + page within the Developers Portal, where you can subscribe to a Developer Edition of Agency Cloud.
+ Desktop +
+
+
+ + Reapit's Agency Cloud is a desktop application that offers estate agencies a comprehensive range of market leading agency products, including a Sales CRM, Lettings CRM, Client Accounts, Property Management and real-time Analytics. +
++ Developers that would like to integrate with or extend the functionality of Agency Cloud can use the Foundations Desktop API to build web applications for Reapit's app Marketplace that trigger events in the Agency Cloud desktop application, as well as associating their apps with common actions in Agency Cloud to replace default behaviours and screens. +
++ For example, a developer building a Marketplace app that provides AML and ID checking, can use the Desktop API to associate their app with the default ID checking screen in Agency Cloud. When a customer clicks the default button to launch the ID check screen, the developer's associated app would be presented instead. +
++ To learn more about what’s possible with the Desktop API, please visit the + + + documentation. + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Developer Edition +
++ The Developer Edition of Agency Cloud allows developers using the Desktop API to test their apps within the desktop application using sandbox data. +
++ There is no charge for the Developer Edition licence during the Beta phase, however, developers are required to confirm the subscription to proceed. When the Beta phase comes to an end, we will automatically cancel all subscriptions, and developers will need to sign-up again should they wish to subscribe and pay for a Developer Edition license. +
++ The application is licenced per user/developer of an organisation and will require a Windows machine to install it. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Developer Edition +
+
+
+ £0
+
+
+
+ / Beta phase
+
+
+
+ Become familiar with our CRM software using sandbox data
+
+
+ Test your Marketplace application inside Agency Cloud
+
+
+ Understand how customers will interact with your application
+
+ What is Reapit’s Agency Cloud Desktop CRM?
-- Reapit’s Agency Cloud solution offers estate agencies a comprehensive range of market leading agency products, - with powerful features that will help an agency grow whilst improving overall efficiency. -
-What is the Desktop API?
-- Applications that are built on our Foundations Platform are able to communicate with Reapit's Agency Cloud - CRM system. Using a well-defined API, you are able to trigger a wide variety of actions in our award-winning - desktop application to augment your own applications and build a rich integration between systems. -
-How does it work?
-- Depending on what screens you want to launch and how you want to interact with Agency Cloud, you are able to use - a custom URL scheme which when triggered, Agency Cloud will interpret that action and perform the corresponding - action. -
-For example, if you wanted to load a property record from your app you would follow the following format:
-{'agencycloud://properties/{id}'}
- - Another example would be if you wanted to load a property search with specific parameters, the URL scheme would - look something like this: -
-{'agencycloud://properties?address=MK43&mode=s'}
- - For more information on URL Schemes please visit the documentation - - here - -
-Agency Cloud Interaction API
-- Not only can Applications built on the Foundations Platform trigger events in the Agency Cloud CRM system, but - installed apps can also be associated with common actions in Agency Cloud to replace the default behaviour. -
-- The most common way that this will manifest itself is by replacing a screen in Agency Cloud with an application. - For example if you want to use an App to manage all of your AML and ID checking then you can associate the app - with this action in Agency Cloud and every time you click to launch the ID check screen, the associated App will - be presented instead. -
-- All apps should be able to be launched from the Installed Apps screen and be ran standalone without the need to - be linked to an action. They will just be hosted in the marketplace and launched in Agency Cloud – for example - the Geo Diary application. -
-Desktop Integration Types
-- To be able to associate an application with an action in Agency Cloud the application will need to be given - a desktop type. This will be required so that Agency Cloud can be confident of the way the application will - behave and that the application is agreeing to accept certain parameters when launched. These parameters - will be available inside a global javascript object which is used to identify that a page is in{' '} - Desktop mode, example below. -
-{`window.__REAPIT_MARKETPLACE_GLOBALS__ = {
- prpCode: 'MK010201'
- }`}
- - We currently support several application types and we are continuing to build as apps are developed. To show - you an example, you can view the video below. It demonstrates an application that was built with a Desktop - Type of 'Property', this means that the application will be available whenever a user interacts with - a property: -
-- More information on 'Desktop Integration Types', please visit the documentation - - here - -
-
-
- 
-
-
- Developer Edition
-- We understand the need to be able to test your application end to end and therefore have provided a Developer - Edition of Agency Cloud for you to download and test with Sandbox data. The application is licenced per - user/developer of your organisation and you will require a Windows machine to install it. -
-- The application is licenced per user/developer of your organisation and you will require a - Windows machine to install it. -
-- During the Beta phase, there will be no charge for the Developer Edition licence. However, you will still be - required to confirm the subscription to proceed. If you would like further information on Agency Cloud, please - click here. -
-Support
-- If you should need support with the Developer Edition or perhaps have a question regarding desktop types or URL - schemes, please first visit our desktop Milestone. You will be able to view and search any issues or requests - that have been raised. If you cannot find what you are looking for, please raise a - - feature request - - or - - report a bug. - -
-+ Reapit's Agency Cloud is a desktop application that offers estate agencies a comprehensive range of market + leading agency products, including a Sales CRM, Lettings CRM, Client Accounts, Property Management and real-time + Analytics. +
++ Developers that would like to integrate with or extend the functionality of Agency Cloud can use the Foundations + Desktop API to build web applications for Reapit's app Marketplace that trigger events in the Agency Cloud + desktop application, as well as associating their apps with common actions in Agency Cloud to replace default + behaviours and screens. +
++ For example, a developer building a Marketplace app that provides AML and ID checking, can use the Desktop API + to associate their app with the default ID checking screen in Agency Cloud. When a customer clicks the default + button to launch the ID check screen, the developer's associated app would be presented instead. +
++ To learn more about what’s possible with the Desktop API, please visit the{' '} + + documentation. + +
+Desktop
- -Developer Edition
++ The Developer Edition of Agency Cloud allows developers using the Desktop API to test their apps within the + desktop application using sandbox data. +
++ There is no charge for the Developer Edition licence during the Beta phase, however, developers are required + to confirm the subscription to proceed. When the Beta phase comes to an end, we will automatically cancel + all subscriptions, and developers will need to sign-up again should they wish to subscribe and pay for a + Developer Edition license. +
++ The application is licenced per user/developer of an organisation and will require a Windows machine to + install it. +
+
+
+
+
+
+
+
+
+
+ + Developer Edition +
+
+ £0
+ / Beta phase
+
+ Become familiar with our CRM software using sandbox data
+ Test your Marketplace application inside Agency Cloud
+ Understand how customers will interact with your application
+ Desktop
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ For more information on how to complete this form, please view our "Step-by-step" guide
+
+ here
+
+
+
+ App Listing
+
+
+ The section below relates to the fields that comprise the listing of your application as it will appear to a user in the Marketplace. It also includes details we will use to enable us to contact you about your submitted application, how best to make your app discoverable to users and to determine where to launch it from the marketplace.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ H5",
+ "name": "test",
+ "result": [Function],
+ "title": "Add heading 5",
+ },
+ ]
+ }
+ dataTest="submit-app-description"
+ id="description"
+ labelText="Description"
+ name="description"
+ placeholder="A detailed description for your app listing. Must be between 150 and 1000 characters. Please note: As this field supports HTML, special characters will be included in the character count"
+ required={false}
+ >
+
+
+
+
+
+
+ H5",
+ "name": "test",
+ "result": [Function],
+ "title": "Add heading 5",
+ },
+ ]
+ }
+ dataTest="submit-app-description"
+ hasError={false}
+ onBlur={[Function]}
+ onChange={[Function]}
+ onPaste={[Function]}
+ placeholder="A detailed description for your app listing. Must be between 150 and 1000 characters. Please note: As this field supports HTML, special characters will be included in the character count"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Screenshot 1 *
+ Feature Image
+ *
- Screenshot 2
+ Screenshot 1
- Screenshot 3
+ Screenshot 2
- Screenshot 4
+ Screenshot 3
- Screenshot 5
+ Screenshot 4
{
const appModel = { redirectUris: '' } as CreateAppModel
afterEach(() => jest.clearAllMocks())
it('should call submitRevision when have appId', () => {
- const fn = handleSubmitApp({ appId: 'testAppId', dispatch: spyDispatch })
+ const onSuccess = jest.fn()
+ const onError = jest.fn()
+ const fn = handleSubmitApp({
+ appId: 'testAppId',
+ dispatch: spyDispatch,
+ setSubmitting: jest.fn(),
+ onSuccess: onSuccess,
+ onError: onError,
+ })
fn(appModel)
expect(spyDispatch).toBeCalledWith(
submitRevision({
- redirectUris: [],
- signoutUris: [],
- id: 'testAppId',
+ params: {
+ redirectUris: [],
+ signoutUris: [],
+ id: 'testAppId',
+ },
+ onSuccess: onSuccess,
+ onError: onError,
}),
)
})
@@ -210,4 +225,60 @@ describe('DeveloperSubmitApp', () => {
expect(spyOpenUrl).toBeCalledWith('developer/apps/appId/preview', '_blank')
})
})
+
+ describe('handleSubmitAppSuccess', () => {
+ const setSubmitting = jest.fn()
+ const { history } = getMockRouterProps({})
+ const fn = handleSubmitAppSuccess(setSubmitting, history)
+ fn()
+ expect(setSubmitting).toBeCalled()
+ expect(history.push).toBeCalledWith(Routes.DEVELOPER_MY_APPS)
+ })
+
+ describe('handleSubmitAppError', () => {
+ const setSubmitting = jest.fn()
+ const fn = handleSubmitAppError(setSubmitting)
+ fn()
+ expect(setSubmitting).toBeCalled()
+ expect(setSubmitting).toBeCalledWith(false)
+ })
+
+ describe('sanitizeAppData', () => {
+ it('should run correctly', () => {
+ const input = {
+ description: '',
+ developerId: '7a96e6b2-3778-4118-9c9b-6450851e5608',
+ homePage: '',
+ telephone: '',
+ supportEmail: '',
+ summary: '',
+ launchUri: '',
+ isListed: false,
+ isDirectApi: false,
+ scopes: ['agencyCloud/applicants.read'],
+ isPrivateApp: 'no',
+ desktopIntegrationTypeIds: [],
+ redirectUris: ['http://localhost:8080'],
+ signoutUris: ['http://localhost:8080/login'],
+ limitToClientIds: [],
+ iconImageUrl: '',
+ name: 'Test new App',
+ }
+ const output = {
+ developerId: '7a96e6b2-3778-4118-9c9b-6450851e5608',
+ isListed: false,
+ isDirectApi: false,
+ scopes: ['agencyCloud/applicants.read'],
+ isPrivateApp: 'no',
+ desktopIntegrationTypeIds: [],
+ redirectUris: ['http://localhost:8080'],
+ signoutUris: ['http://localhost:8080/login'],
+ limitToClientIds: [],
+ name: 'Test new App',
+ iconImageUrl: '',
+ }
+ const result = sanitizeAppData(input)
+ expect(result).toEqual(output)
+ })
+ })
})
diff --git a/packages/marketplace/src/components/pages/developer-edit-app/__test__/general-information-section.test.tsx b/packages/marketplace/src/components/pages/developer-edit-app/__test__/general-information-section.test.tsx
index 328528e38c..258d524c35 100644
--- a/packages/marketplace/src/components/pages/developer-edit-app/__test__/general-information-section.test.tsx
+++ b/packages/marketplace/src/components/pages/developer-edit-app/__test__/general-information-section.test.tsx
@@ -15,13 +15,27 @@ describe('GeneralInformationSection', () => {
store = mockStore(appState)
})
- it('should match a snapshot', () => {
+ it('should match a snapshot when isListed equal to true', () => {
expect(
mount(
{}}>
+
+ ,
+ ),
+ ).toMatchSnapshot()
+ })
+
+ it('should match a snapshot when isListed equal to false', () => {
+ expect(
+ mount(
+
+ {}}>
+
,
diff --git a/packages/marketplace/src/components/pages/developer-edit-app/__test__/upload-image-section.test.tsx b/packages/marketplace/src/components/pages/developer-edit-app/__test__/upload-image-section.test.tsx
index 08df86baf1..29f7edf91a 100644
--- a/packages/marketplace/src/components/pages/developer-edit-app/__test__/upload-image-section.test.tsx
+++ b/packages/marketplace/src/components/pages/developer-edit-app/__test__/upload-image-section.test.tsx
@@ -3,7 +3,10 @@ import { shallow } from 'enzyme'
import UploadImageSection from '../upload-image-section'
describe('MarketplaceStatusSection', () => {
- it('should match a snapshot', () => {
- expect(shallow(>
+ onSuccess: () => void
+ onError: () => void
+}) => (appModel: CustomCreateRevisionModal) => {
+ setSubmitting(true)
+
const appPreFormat = { ...appModel }
delete appPreFormat.authFlow
const { limitToClientIds, redirectUris, signoutUris, ...otherData } = appPreFormat
@@ -202,7 +237,19 @@ export const handleSubmitApp = ({ appId, dispatch }: { appId: string; dispatch:
if (appModel.isPrivateApp === 'no') {
appToSubmit.limitToClientIds = []
}
- dispatch(submitRevision({ ...appToSubmit, id: appId }))
+ dispatch(submitRevision({ params: { ...sanitizeAppData(appToSubmit), id: appId }, onSuccess, onError }))
+}
+
+export const handleSubmitAppSuccess = (
+ setSubmitting: React.Dispatch>,
+ history: History,
+) => () => {
+ setSubmitting(false)
+ history.push(Routes.DEVELOPER_MY_APPS)
+}
+
+export const handleSubmitAppError = (setSubmitting: React.Dispatch>) => () => {
+ setSubmitting(false)
}
export const handleGoBackToApps = (history: History) => {
@@ -252,25 +299,18 @@ export const handleOpenAppPreview = ({
}
export const DeveloperEditApp: React.FC = () => {
+ const [submitting, setSubmitting] = React.useState(false)
const dispatch = useDispatch()
const history = useHistory()
- const { appid } = useParams()
+ const { appid } = useParams<{ appid: string }>()
const developerId = useSelector(selectDeveloperId)
const appDetailState = useSelector(selectAppDetailState)
const submitAppState = useSelector(selectSubmitAppState)
- const submitRevisionState = useSelector(selectSubmitAppRevisionState)
const appCategories = useSelector(selectCategories)
const goBackToApps = React.useCallback(handleGoBackToApps(history), [history])
- const isPendingRevisionsExist = appDetailState.appDetailData?.data?.pendingRevisions
- if (isPendingRevisionsExist) {
- return = () => {
return null
}
+ const isPendingRevisionsExist = appDetailState.appDetailData?.data?.pendingRevisions
+ /**
+ * When navigate to edit page, we still may have appDetailState data of previous editted app in redux
+ * store so we need to check the current app and the old app must have same id. If not don't redirect
+ * to DEVELOPER_MY_APPS route.
+ */
+ const hasOldAppDetailData =
+ appDetailState.appDetailData?.data?.id !== null && appid !== appDetailState.appDetailData?.data?.id
+ if (isPendingRevisionsExist && !hasOldAppDetailData) {
+ return
{({ setFieldValue, values, errors }) => {
const { authFlow, isPrivateApp } = values
+ const isListed = values.isListed
return (
}
/>
- Edit App
-
)
}
diff --git a/packages/marketplace/src/constants/error-messages.ts b/packages/marketplace/src/constants/error-messages.ts
index 80ad8b25ca..97c1fbfe05 100644
--- a/packages/marketplace/src/constants/error-messages.ts
+++ b/packages/marketplace/src/constants/error-messages.ts
@@ -3,7 +3,7 @@ const errorMessages = {
DEFAULT_COMPONENT_ERROR: 'Something went wrong with this component',
FIELD_REQUIRED: 'Required',
FIELD_WRONG_EMAIL_FORMAT: 'Invalid email format',
- FIELD_WRONG_URI_FORMAT: 'Invalid uri format',
+ FIELD_WRONG_URI_FORMAT: 'Invalid URI format',
MINIMUM_CHARACTER_LENGTH: (min: number) => `The minimum length is ${min} characters`,
MAXIMUM_CHARACTER_LENGTH: (max: number) => `The maximum length is ${max} characters`,
BETWEEN_MIN_MAX_CHARACTER_LENGTH: (min: number, max: number) => `Must be between ${min} and ${max} characters`,
diff --git a/packages/marketplace/src/core/index.tsx b/packages/marketplace/src/core/index.tsx
index 1b59d26742..37a6e3c7ac 100644
--- a/packages/marketplace/src/core/index.tsx
+++ b/packages/marketplace/src/core/index.tsx
@@ -46,6 +46,9 @@ export const renderApp = (Component: React.ComponentType) => {
if (refreshSessionFromCookie) {
store.dispatch(authSetRefreshSession(refreshSessionFromCookie))
}
+ if (window.location.href.includes('developer')) {
+ document.title = 'Developers'
+ }
if (rootElement) {
render(