From 5469a94ccec9f176f40a24022bb04b3aeaa3ae5c Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 13 Jul 2020 17:49:06 +0700 Subject: [PATCH] chore: #1997 rebase master --- ...developer-submit-app-successfully.tsx.snap | 77 ------------------- .../pages/app-detail/app-content.tsx | 2 +- .../pages/edit-app/developer-edit-app.tsx | 2 +- .../__snapshots__/error-content.tsx.snap | 2 +- .../developer-edition-modal/error-content.tsx | 5 +- .../src/constants/developer-help-links.ts | 2 +- .../__tests__/__snapshots__/router.tsx.snap | 24 +++--- 7 files changed, 18 insertions(+), 96 deletions(-) delete mode 100644 packages/developer-portal/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap diff --git a/packages/developer-portal/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap b/packages/developer-portal/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap deleted file mode 100644 index 7a4e1c3cc5..0000000000 --- a/packages/developer-portal/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap +++ /dev/null @@ -1,77 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`DeveloperSubmitAppSuccessfully renders correctly 1`] = ` - - - - - My Apps - - - Submit another app - - - } - isCard={true} - title="Success" - > -

- Your App has now been registered and can be accessed by clicking on ‘My Apps’ below. -

-
-

- You will be directed to the ‘My Apps’ page where you will be able to access the ‘Client ID’ of your App (required for authentication) and or make any changes to your App by clicking ‘Edit Details’. -

-
-

- - Currently, your App is only visible to you - - and will not be available in the Marketplace until you have made it ‘Listed’. When you are ready to do this, click on ‘Edit Detail’ and tick the ‘Is Listed’ check box located in the ‘Marketplace Status’ section. -

-
-

- - Please note: - - Any changes you make now to your App (including making it ‘Listed’) will require approval. These are called ‘Revisions’. All revisions will be sent to our Admin department and whilst your App is being reviewed, you will not be able to make any further changes and the App will be marked as ‘Pending Revision’. -

-
-

- Once you have ‘Listed’ your application, and any revisions have been approved, your app will be live in the Marketplace and available for install by customers. -

-
-

- For any issues or support, please visit the - - ‘Help’ - - page. -

-
- - - -`; diff --git a/packages/developer-portal/src/components/pages/app-detail/app-content.tsx b/packages/developer-portal/src/components/pages/app-detail/app-content.tsx index d94e525282..9452010808 100644 --- a/packages/developer-portal/src/components/pages/app-detail/app-content.tsx +++ b/packages/developer-portal/src/components/pages/app-detail/app-content.tsx @@ -55,7 +55,7 @@ export const handleUninstallSuccess = ({ } export const handleOpenAppPreview = (appId: string) => () => { - const url = routes.DEVELOPER_APP_PREVIEW.replace(':appId', appId) + const url = routes.APP_PREVIEW.replace(':appId', appId) window.open(url, '_blank') } diff --git a/packages/developer-portal/src/components/pages/edit-app/developer-edit-app.tsx b/packages/developer-portal/src/components/pages/edit-app/developer-edit-app.tsx index 5487169733..e084f86b1a 100644 --- a/packages/developer-portal/src/components/pages/edit-app/developer-edit-app.tsx +++ b/packages/developer-portal/src/components/pages/edit-app/developer-edit-app.tsx @@ -294,7 +294,7 @@ export const handleOpenAppPreview = ({ media, } - const url = routes.DEVELOPER_APP_PREVIEW.replace(':appId', appId) + const url = routes.APP_PREVIEW.replace(':appId', appId) localStorage.setItem('developer-preview-app', JSON.stringify(appDetailState)) window.open(url, '_blank') } diff --git a/packages/developer-portal/src/components/ui/developer-edition-modal/__tests__/__snapshots__/error-content.tsx.snap b/packages/developer-portal/src/components/ui/developer-edition-modal/__tests__/__snapshots__/error-content.tsx.snap index fcb919e41a..71ebeeafa9 100644 --- a/packages/developer-portal/src/components/ui/developer-edition-modal/__tests__/__snapshots__/error-content.tsx.snap +++ b/packages/developer-portal/src/components/ui/developer-edition-modal/__tests__/__snapshots__/error-content.tsx.snap @@ -11,7 +11,7 @@ exports[`ErrorContent should match snapshot 1`] = ` It looks as though you already have a subscription in place for the Developer Edition of Agency Cloud. If you have not received your email with instructions on how to download, please let us know using the live chat feature on the  diff --git a/packages/developer-portal/src/components/ui/developer-edition-modal/error-content.tsx b/packages/developer-portal/src/components/ui/developer-edition-modal/error-content.tsx index 497b45657a..e8cbe054a8 100644 --- a/packages/developer-portal/src/components/ui/developer-edition-modal/error-content.tsx +++ b/packages/developer-portal/src/components/ui/developer-edition-modal/error-content.tsx @@ -2,8 +2,7 @@ import * as React from 'react' import { Button, SubTitleH6, ModalHeader, ModalBody, ModalFooter, ModalProps } from '@reapit/elements' import linkStyles from '@/styles/elements/link.scss?mod' import developerEditionStyles from '@/styles/blocks/developer-edition-modal.scss?mod' - -const HELP_PAGE_LINK = 'https://marketplace.reapit.cloud/developer/help' +import routes from '@/constants/routes' export type ErrorContentProps = Pick @@ -17,7 +16,7 @@ export const ErrorContent: React.FC = ({ afterClose }) => { It looks as though you already have a subscription in place for the Developer Edition of Agency Cloud. If you have not received your email with instructions on how to download, please let us know using the live chat feature on the  - + 'Help'  page. diff --git a/packages/developer-portal/src/constants/developer-help-links.ts b/packages/developer-portal/src/constants/developer-help-links.ts index 332228a65e..511fa8acb0 100644 --- a/packages/developer-portal/src/constants/developer-help-links.ts +++ b/packages/developer-portal/src/constants/developer-help-links.ts @@ -1,7 +1,7 @@ import routes from '@/constants/routes' export const HelpLinks = { - WHATS_NEW: `${routes.DEVELOPER_API_DOCS}/whats-new`, + WHATS_NEW: `${routes.API_DOCS}/whats-new`, BUG_REPORT: 'https://github.com/reapit/foundations/issues/new?assignees=&labels=bug%2C+needs-triage&template=bug_report.md&title=', API_REQUEST: diff --git a/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap b/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap index 0c57e4ed5d..9b130c0157 100644 --- a/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap +++ b/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap @@ -113,7 +113,7 @@ exports[`Router should match a snapshot 1`] = ` } exact={true} fetcher={true} - path="/developer/apps" + path="/apps" />