feat: #1917 Purge unused code from settings page

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

@@ -32,6 +32,6 @@ exports[`DeveloperSettingsPage should match snapshot 1`] = `
     }
   }
 >
-  <DevelperSettingsPage />
+  <SettingsPage />
 </ContextProvider>
 `;

packages/developer-portal/src/components/pages/settings/developer-settings/__tests__/developer-settings.test.tsx → 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 '../developer-settings'
+import DeveloperSettingsPage from '../settings'
 import { ReduxState } from '@/types/core'
 import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'

packages/developer-portal/src/components/pages/settings/developer-settings/forms/contact-information-form.tsx → packages/developer-portal/src/components/pages/settings/forms/contact-information-form.tsx

@@ -15,7 +15,7 @@ import {
   GridItem,
 } from '@reapit/elements'
 import { DeveloperModel } from '@reapit/foundations-ts-definitions'
-import { validate } from '@/utils/form/developer-settings-contact-information'
+import { validate } from '@/utils/form/settings-contact-information'
 
 export type ContactInformationFormProps = FormikProps<ContactInformationValues>
 

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

@@ -0,0 +1,2 @@
+import Settings from './settings'
+export default Settings

packages/developer-portal/src/components/pages/settings/developer-settings-billing-tab/__tests__/developer-settings-billing-tab.tsx → packages/developer-portal/src/components/pages/settings/settings-billing-tab/__tests__/settings-billing-tab.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import DeveloperBillingTabPage from '../developer-settings-billing-tab'
+import DeveloperBillingTabPage from '../settings-billing-tab'
 
 describe('DeveloperBillingTabPage', () => {
   it('should match snapshot', () => {

packages/developer-portal/src/components/pages/settings/settings-billing-tab/index.ts

@@ -0,0 +1 @@
+export { default } from './settings-billing-tab'

packages/developer-portal/src/components/pages/settings/developer-settings-billing-tab/developer-settings-billing-tab.tsx → packages/developer-portal/src/components/pages/settings/settings-billing-tab/settings-billing-tab.tsx

@@ -2,9 +2,9 @@ import * as React from 'react'
 import { Section } from '@reapit/elements'
 import { Tabs } from '../tabs'
 import AccountsInformationForm from './accounts-information-form'
-import Subcriptions from '@/components/ui/developer-settings/billing/subscriptions'
+import Subcriptions from '@/components/pages/settings/billing/subscriptions'
 
-const DevelperSettingsBillingTabPage: React.FC<{}> = () => {
+const SettingsBillingTabPage: React.FC<{}> = () => {
   // FEATURE FLAG
   const isProd = window.reapit.config.appEnv === 'production'
 
@@ -20,4 +20,4 @@ const DevelperSettingsBillingTabPage: React.FC<{}> = () => {
   )
 }
 
-export default DevelperSettingsBillingTabPage
+export default SettingsBillingTabPage

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

@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import DeveloperOrganisationTabPage, { handleToggleVisibleModal } from '../developer-settings-organisation-tab'
+import DeveloperOrganisationTabPage, { handleToggleVisibleModal } from '../settings-organisation-tab'
 import * as ReactRedux from 'react-redux'
 
 describe('DeveloperOrganisationTabPage', () => {

packages/developer-portal/src/components/pages/settings/settings-organisation-tab/index.ts

@@ -0,0 +1 @@
+export { default } from './settings-organisation-tab'

packages/developer-portal/src/components/pages/settings/developer-settings-organisation-tab/members.tsx → packages/developer-portal/src/components/pages/settings/settings-organisation-tab/members.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { FlexContainerBasic, Table, Section, H5 } from '@reapit/elements'
-import SetAsAdminModal from '@/components/ui/developer-settings/set-as-admin-modal'
+import SetAsAdminModal from '@/components/pages/settings/set-as-admin-modal'
 import SetMemberStatusModal from '@/components/ui/organisation-set-member-status-modal'
 import styles from '@/styles/elements/link.scss?mod'
 import { developerStub } from '@/sagas/__stubs__/developer'

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

@@ -3,14 +3,14 @@ import { selectLoginIdentity } from '@/selector/auth'
 import { useSelector } from 'react-redux'
 import { Loader, Section } from '@reapit/elements'
 import { Forms } from './forms/forms'
-import { Tabs } from '../tabs'
+import { Tabs } from './tabs'
 
 /**
  * render one of:
  * developer version and admin version - profile tab
  * ^ they both sit on "/developer/settings" route which is so confusing atm
  */
-const DevelperSettingsPage: React.FC = () => {
+const SettingsPage: React.FC = () => {
   // it take a while to 'AUTH_LOGIN_SUCCESS' to fire. If you user is admin, they may exerience a flash
   // this make sure settings page don't render until 'loginIdentity' is availabe
   const loginIdentity = useSelector(selectLoginIdentity)
@@ -29,4 +29,4 @@ const DevelperSettingsPage: React.FC = () => {
   )
 }
 
-export default DevelperSettingsPage
+export default SettingsPage

packages/developer-portal/src/components/pages/settings/tabs.tsx

@@ -15,32 +15,32 @@ export type TabConfigsProps = {
 export const tabConfigs = ({ currentUrl, history, isAdmin, isProd }: TabConfigsProps): TabConfig[] => {
   const tabs = [
     {
-      tabIdentifier: Routes.DEVELOPER_SETTINGS,
+      tabIdentifier: Routes.SETTINGS,
       displayText: 'Profile',
       onTabClick: () => {
-        history.push(Routes.DEVELOPER_SETTINGS)
+        history.push(Routes.SETTINGS)
       },
-      active: currentUrl === Routes.DEVELOPER_SETTINGS,
+      active: currentUrl === Routes.SETTINGS,
     },
     {
-      tabIdentifier: Routes.DEVELOPER_SETTINGS_BILLING_TAB,
+      tabIdentifier: Routes.SETTINGS_BILLING_TAB,
       displayText: 'Billing',
       onTabClick: () => {
-        history.push(Routes.DEVELOPER_SETTINGS_BILLING_TAB)
+        history.push(Routes.SETTINGS_BILLING_TAB)
       },
-      active: currentUrl === Routes.DEVELOPER_SETTINGS_BILLING_TAB,
+      active: currentUrl === Routes.SETTINGS_BILLING_TAB,
     },
   ]
 
   if (isAdmin && !isProd) {
     // Use splice to make sure ORGANISATION_TAB is second tab
     tabs.splice(1, 0, {
-      tabIdentifier: Routes.DEVELOPER_SETTINGS_ORGANISATION_TAB,
+      tabIdentifier: Routes.SETTINGS_ORGANISATION_TAB,
       displayText: 'Organisation',
       onTabClick: () => {
-        history.push(Routes.DEVELOPER_SETTINGS_ORGANISATION_TAB)
+        history.push(Routes.SETTINGS_ORGANISATION_TAB)
       },
-      active: currentUrl === Routes.DEVELOPER_SETTINGS_ORGANISATION_TAB,
+      active: currentUrl === Routes.SETTINGS_ORGANISATION_TAB,
     })
   }
 

packages/developer-portal/src/components/ui/menu.tsx

@@ -148,7 +148,7 @@ export const generateMenuConfig = (
         {
           title: 'Settings',
           key: 'SETTINGS',
-          url: Routes.DEVELOPER_SETTINGS,
+          url: Routes.SETTINGS,
           icon: <FaCog className="nav-item-icon" />,
           type: 'SECONDARY',
         },

packages/developer-portal/src/constants/routes.ts

@@ -22,9 +22,9 @@ const Routes = {
   ANALYTICS_TAB: '/developer/analytics/:activeTab?',
   DEVELOPER_RESET_PASSWORD: '/developer/reset-password',
   DEVELOPER_WEBHOOKS: '/developer/webhooks',
-  DEVELOPER_SETTINGS: '/developer/settings/',
-  DEVELOPER_SETTINGS_ORGANISATION_TAB: '/developer/settings/organisation',
-  DEVELOPER_SETTINGS_BILLING_TAB: '/developer/settings/billing',
+  SETTINGS: '/developer/settings/',
+  SETTINGS_ORGANISATION_TAB: '/developer/settings/organisation',
+  SETTINGS_BILLING_TAB: '/developer/settings/billing',
   SUBMIT_APP: '/developer/submit-app',
   DEVELOPER_HELP: '/developer/help',
   DEVELOPER_APP_PREVIEW: '/developer/apps/:appId/preview',

packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap

@@ -181,20 +181,6 @@ exports[`Router should match a snapshot 1`] = `
               fetcher={true}
               path="/client/help"
             />
-            <Component
-              allow="CLIENT"
-              component={
-                Object {
-                  "$$typeof": Symbol(react.lazy),
-                  "_ctor": [Function],
-                  "_result": null,
-                  "_status": -1,
-                }
-              }
-              exact={true}
-              fetcher={true}
-              path="/client/settings"
-            />
             <Component
               allow="DEVELOPER"
               component={