feat: #1917 Merge master and fix conflicts

.gitignore

@@ -80,3 +80,7 @@ scripts/jest/.jest-cache
 
 # credentials file to load
 credentials.json
+# Locally I have had to add these because of: https://github.com/yarnpkg/yarn/issues/7807
+# May need to include globally if other people experienece installing issues
+.yarnrc
+.yarn

package.json

@@ -179,6 +179,6 @@
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.2",
     "webpack-dev-server": "^3.4.1",
-    "workbox-webpack-plugin": "^4.3.1"
+    "workbox-webpack-plugin": "^5.1.3"
   }
 }

packages/developer-portal/src/components/hocs/__tests__/route-fetcher.tsx

@@ -12,7 +12,7 @@ const props = {
   Component,
   routerProps: {
     match: {
-      path: Routes.CLIENT,
+      path: Routes.DEVELOPER,
       params: { page: 1 },
     },
     location: {

packages/developer-portal/src/components/pages/__tests__/api-docs.tsx → packages/developer-portal/src/components/pages/api-docs/__tests__/api-docs.test.tsx

@@ -20,7 +20,7 @@ describe('ApiDocs', () => {
 
   describe('parseIframeUrl', () => {
     it('should run correctly', () => {
-      const pathname = `${Routes.DEVELOPER_API_DOCS}/platform-glossary`
+      const pathname = `${Routes.API_DOCS}/platform-glossary`
       const hash = '#company'
       const result = parseIframeUrl(pathname, hash)
       expect(result).toEqual('/platform-glossary#company')

packages/developer-portal/src/components/pages/api-docs.tsx → packages/developer-portal/src/components/pages/api-docs/api-docs.tsx

@@ -2,13 +2,13 @@ import * as React from 'react'
 import { useHistory } from 'react-router'
 import ErrorBoundary from '@/components/hocs/error-boundary'
 import { UnsupportBrowserPopUp } from '@/components/ui/unsupport-browser-pop-up'
-import { IFRAME_URLS } from '../../constants/iframe-urls'
-import Routes from '../../constants/routes'
 import { isIE } from '@/utils/browser'
+import Routes from '@/constants/routes'
+import { IFRAME_URLS } from '@/constants/iframe-urls'
 
 export const parseIframeUrl = (pathname: string, hash: string): string => {
-  const path = pathname.split(Routes.DEVELOPER_API_DOCS)[1]
-  return `${path}${hash}`
+  const documentPagePath = pathname.split(Routes.API_DOCS)[1]
+  return `${documentPagePath}${hash}`
 }
 
 const ApiDocsPage: React.FC = () => {

packages/developer-portal/src/components/pages/api-docs/index.ts

@@ -0,0 +1,2 @@
+import APIDocs from './api-docs'
+export default APIDocs

packages/developer-portal/src/components/pages/app-detail/__tests__/app-detail.test.tsx

@@ -35,7 +35,7 @@ describe('DeveloperAppDetail', () => {
     expect(
       mount(
         <ReactRedux.Provider store={store}>
-          <MemoryRouter initialEntries={[{ pathname: Routes.DEVELOPER_APP_DETAIL, key: 'developerAppDetailRoute' }]}>
+          <MemoryRouter initialEntries={[{ pathname: Routes.APP_DETAIL, key: 'developerAppDetailRoute' }]}>
             <DeveloperAppDetail />
           </MemoryRouter>
         </ReactRedux.Provider>,

packages/developer-portal/src/components/pages/app-detail/__tests__/app-management.test.tsx

@@ -43,7 +43,7 @@ describe('ManageApp', () => {
     expect(
       mount(
         <Provider store={store}>
-          <MemoryRouter initialEntries={[{ pathname: Routes.DEVELOPER_APP_DETAIL, key: 'developerAppDetailRoute' }]}>
+          <MemoryRouter initialEntries={[{ pathname: Routes.APP_DETAIL, key: 'developerAppDetailRoute' }]}>
             <DeveloperManageApp
               id="test"
               pendingRevisions={false}

packages/developer-portal/src/components/pages/authentication/__test__/authentication.test.tsx

@@ -60,7 +60,7 @@ describe('Authentication', () => {
     it('should run correctly', () => {
       const fn = onMarketplaceButtonClick(history)
       fn()
-      expect(history.replace).toBeCalledWith(Routes.CLIENT)
+      expect(history.replace).toBeCalledWith(Routes.DEVELOPER)
     })
   })
   describe('onRegisterButtonClick', () => {
@@ -74,7 +74,7 @@ describe('Authentication', () => {
     it('should run correctly', () => {
       const fn = onDevelopersButtonClick(history)
       fn()
-      expect(history.replace).toBeCalledWith(Routes.DEVELOPER_DESKTOP)
+      expect(history.replace).toBeCalledWith(Routes.DESKTOP)
     })
   })
 })

packages/developer-portal/src/components/pages/authentication/authentication.tsx

@@ -17,7 +17,7 @@ export interface AuthenticationParamTypes {
 
 export const onDevelopersButtonClick = (history: History) => {
   return () => {
-    history.replace(Routes.DEVELOPER_DESKTOP)
+    history.replace(Routes.DESKTOP)
   }
 }
 
@@ -58,7 +58,7 @@ export const renderClientModal = (history, dispatch) => {
           please visit the 
         </span>
         <span>
-          <Link to={Routes.DEVELOPER_DESKTOP}>Desktop</Link>
+          <Link to={Routes.DESKTOP}>Desktop</Link>
         </span>
         <span>
           &nbsp;page within the Developers Portal, where you can subscribe to a Developer Edition of Agency Cloud.

packages/developer-portal/src/components/pages/developer-desktop/__tests__/developer-desktop.tsx → packages/developer-portal/src/components/pages/desktop/__tests__/desktop.test.tsx

@@ -3,7 +3,7 @@ import { mount } from 'enzyme'
 import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
 import appState from '@/reducers/__stubs__/app-state'
-import { DeveloperDesktopPage, handleToggleVisibleModal } from '../developer-desktop'
+import { DeveloperDesktopPage, handleToggleVisibleModal } from '../desktop'
 
 describe('DeveloperDesktopPage', () => {
   let store

packages/developer-portal/src/components/pages/developer-desktop/developer-desktop.tsx → packages/developer-portal/src/components/pages/desktop/desktop.tsx

@@ -31,7 +31,7 @@ export const DeveloperDesktopContentPartOne: React.FC = () => {
       </p>
       <p>
         To learn more about what’s possible with the Desktop API, please visit the{' '}
-        <a target="_blank" rel="noreferrer" href={`${Routes.DEVELOPER_API_DOCS}/api/desktop-api`}>
+        <a target="_blank" rel="noreferrer" href={`${Routes.API_DOCS}/api/desktop-api`}>
           documentation.
         </a>
       </p>

packages/developer-portal/src/components/pages/desktop/index.ts

@@ -0,0 +1 @@
+export { default } from './desktop'

packages/developer-portal/src/components/pages/__tests__/developer-help.test.tsx → packages/developer-portal/src/components/pages/help/__tests__/help.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import initChatBot from '../../../scripts/chat-bot'
+import initChatBot from '../../../../scripts/chat-bot'
 import { mount } from 'enzyme'
 import * as ReactRedux from 'react-redux'
 import {
@@ -10,17 +10,17 @@ import {
   handleFaq,
   handleViewRoadmap,
   handleWhatsNew,
-} from '../developer-help'
+} from '../help'
 import Routes from '@/constants/routes'
 import configureStore from 'redux-mock-store'
 import { history } from '@/core/router'
 import { HelpLinks } from '@/constants/developer-help-links'
-import { mockLoginSession } from '../../../sagas/__tests__/auth'
 import appState from '@/reducers/__stubs__/app-state'
+import { mockLoginSession } from '@/sagas/__tests__/auth'
 
-jest.mock('../../../scripts/chat-bot')
+jest.mock('../../../../scripts/chat-bot')
 
-jest.mock('../../../core/router', () => ({
+jest.mock('../../../../core/router', () => ({
   history: {
     push: jest.fn(),
   },
@@ -53,7 +53,7 @@ describe('handleGotoWelcomeGuide', () => {
   it('should called with correct props', () => {
     const spy = jest.spyOn(history, 'push')
     handleGotoWelcomeGuide()
-    expect(spy).toHaveBeenCalledWith(Routes.DEVELOPER_WELCOME)
+    expect(spy).toHaveBeenCalledWith(Routes.WELCOME)
   })
 })
 

packages/developer-portal/src/components/pages/developer-help.tsx → packages/developer-portal/src/components/pages/help/help.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useSelector } from 'react-redux'
-import initChatBot from '../../scripts/chat-bot'
+import initChatBot from '../../../scripts/chat-bot'
 import { history } from '@/core/router'
 import { H3 } from '@reapit/elements'
 import Routes from '@/constants/routes'
@@ -17,7 +17,7 @@ import { LoginIdentity } from '@reapit/cognito-auth'
 import { selectLoginIdentity } from '@/selector/auth'
 
 export const handleGotoWelcomeGuide = () => {
-  history.push(Routes.DEVELOPER_WELCOME)
+  history.push(Routes.WELCOME)
 }
 
 export const handleReportBug = () => {

packages/developer-portal/src/components/pages/help/index.ts

@@ -0,0 +1,2 @@
+import Help from './help'
+export default Help

packages/developer-portal/src/components/pages/register-confirm/index.ts

@@ -0,0 +1,2 @@
+import RegisterConfirm from './register-confirm'
+export default RegisterConfirm

packages/developer-portal/src/components/pages/settings/__tests__/__snapshots__/settings.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DeveloperSettingsPage should match snapshot 1`] = `
+exports[`SettingsPage should match snapshot 1`] = `
 <ContextProvider
   value={
     Object {

packages/developer-portal/src/components/pages/settings/__tests__/settings.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import DeveloperSettingsPage from '../settings'
+import SettingsPage from '../settings'
 import { ReduxState } from '@/types/core'
 import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
@@ -17,14 +17,14 @@ const mockState = {
   },
 } as ReduxState
 
-describe('DeveloperSettingsPage', () => {
+describe('SettingsPage', () => {
   it('should match snapshot', () => {
     const mockStore = configureStore()
     const store = mockStore(mockState)
 
     const wrapper = shallow(
       <Provider store={store}>
-        <DeveloperSettingsPage />
+        <SettingsPage />
       </Provider>,
     )
     expect(wrapper).toMatchSnapshot()