chore: #1997 rebase master

reapit · Jul 14, 2020 · 5469a94 · 5469a94
1 parent e98c101
commit 5469a94
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 96 deletions.
diff --git a/...l/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap b/...l/src/components/pages/__tests__/__snapshots__/developer-submit-app-successfully.tsx.snap
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
@@ -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
@@ -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/.../src/components/ui/developer-edition-modal/__tests__/__snapshots__/error-content.tsx.snap b/.../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 
         <a
           className={[Function]}
-          href="https://marketplace.reapit.cloud/developer/help"
+          href="/help"
           rel="noopener noreferrer"
           target="_blank"
         >

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
@@ -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<ModalProps, 'afterClose'>
 
@@ -17,7 +16,7 @@ export const ErrorContent: React.FC<ErrorContentProps> = ({ 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&nbsp;
-            <a className={linkStyles.link} target="_blank" rel="noopener noreferrer" href={HELP_PAGE_LINK}>
+            <a className={linkStyles.link} target="_blank" rel="noopener noreferrer" href={routes.HELP}>
               &apos;Help&apos;
             </a>
             &nbsp;page.

diff --git 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
@@ -113,7 +113,7 @@ exports[`Router should match a snapshot 1`] = `
               }
               exact={true}
               fetcher={true}
-              path="/developer/apps"
+              path="/apps"
             />
             <Component
               allow="DEVELOPER"
@@ -127,7 +127,7 @@ exports[`Router should match a snapshot 1`] = `
               }
               exact={true}
               fetcher={true}
-              path="/apps"
+              path="/apps/:appid"
             />
             <Component
               allow="DEVELOPER"
@@ -141,7 +141,7 @@ exports[`Router should match a snapshot 1`] = `
               }
               exact={true}
               fetcher={true}
-              path="/apps/:appid"
+              path="/apps/:appid/edit"
             />
             <Component
               allow="DEVELOPER"
@@ -153,9 +153,7 @@ exports[`Router should match a snapshot 1`] = `
                   "_status": -1,
                 }
               }
-              exact={true}
-              fetcher={true}
-              path="/apps/:appid/edit"
+              path="/api-docs"
             />
             <Component
               allow="DEVELOPER"
@@ -167,7 +165,8 @@ exports[`Router should match a snapshot 1`] = `
                   "_status": -1,
                 }
               }
-              path="/api-docs"
+              fetcher={true}
+              path="/webhooks"
             />
             <Component
               allow="DEVELOPER"
@@ -179,8 +178,8 @@ exports[`Router should match a snapshot 1`] = `
                   "_status": -1,
                 }
               }
-              fetcher={true}
-              path="/webhooks"
+              exact={true}
+              path="/swagger"
             />
             <Component
               allow="DEVELOPER"
@@ -193,7 +192,7 @@ exports[`Router should match a snapshot 1`] = `
                 }
               }
               exact={true}
-              path="/swagger"
+              path="/desktop"
             />
             <Component
               allow="DEVELOPER"
@@ -206,7 +205,8 @@ exports[`Router should match a snapshot 1`] = `
                 }
               }
               exact={true}
-              path="/desktop"
+              fetcher={true}
+              path="/analytics/:activeTab?"
             />
             <Component
               allow="DEVELOPER"
@@ -220,7 +220,7 @@ exports[`Router should match a snapshot 1`] = `
               }
               exact={true}
               fetcher={true}
-              path="/analytics/:activeTab?"
+              path="/settings/"
             />
             <Component
               allow="DEVELOPER"