feat: #6084 update listing modal (#6099)

reapit · Feb 7, 2022 · ead3b87 · ead3b87
1 parent 85e6c35
commit ead3b87
Show file tree

Hide file tree

Showing 36 changed files with 1,281 additions and 138 deletions.
diff --git a/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx b/packages/admin-portal/src/components/pages/devs-management/devs-management.tsx
@@ -207,7 +207,11 @@ export const DevsManagement: React.FC = () => {
     {
       Header: 'Agreed Terms Date',
       id: 'agreedTerms',
-      Cell: ({ row }: { row: { original: DeveloperModel } }) => dayjs(row.original.agreedTerms).format('DD/MM/YYYY'),
+      Cell: ({ row }: { row: { original: DeveloperModel & { isMember: boolean } } }) => {
+        return row.original.isMember && row.original.agreedTerms
+          ? dayjs(row.original.agreedTerms).format('DD/MM/YYYY')
+          : '-'
+      },
     },
     !hasLimitedAccess && {
       Header: '',

diff --git a/...admin-portal/src/components/pages/usage/__tests__/__snapshots__/usage-table.test.tsx.snap b/...admin-portal/src/components/pages/usage/__tests__/__snapshots__/usage-table.test.tsx.snap
@@ -200,7 +200,7 @@ Object {
                 class="el-table-cell-content"
                 data-narrow-label="Total Cost"
               >
-                £1.9625
+                £1.96
               </div>
             </div>
             <div
@@ -498,7 +498,7 @@ Object {
               class="el-table-cell-content"
               data-narrow-label="Total Cost"
             >
-              £1.9625
+              £1.96
             </div>
           </div>
           <div

diff --git a/packages/admin-portal/src/components/pages/usage/usage-table.tsx b/packages/admin-portal/src/components/pages/usage/usage-table.tsx
@@ -21,7 +21,7 @@ export const UsageTable: FC<UsageTableProps> = ({ billing }) => {
   return apiCalls.length ? (
     <>
       <Subtitle>Monthly Total</Subtitle>
-      <BodyText hasGreyText>£{billing?.totalCost}</BodyText>
+      <BodyText hasGreyText>£{billing?.totalCost?.toFixed(2).padStart(2, '0')}</BodyText>
       <Subtitle>Breakdown</Subtitle>
       <Table
         rows={apiCalls.map(({ name, amount, cost, itemCount, items }) => ({
@@ -46,7 +46,7 @@ export const UsageTable: FC<UsageTableProps> = ({ billing }) => {
             },
             {
               label: 'Total Cost',
-              value: cost ? `£${cost}` : '£0',
+              value: cost ? `£${cost.toFixed(2).padStart(2, '0')}` : '£0',
               icon: 'homeSystem',
               cellHasDarkText: true,
               narrowTable: {

diff --git a/packages/admin-portal/src/tests/badges/badge-functions.svg b/packages/admin-portal/src/tests/badges/badge-functions.svg
diff --git a/packages/admin-portal/src/tests/badges/badge-lines.svg b/packages/admin-portal/src/tests/badges/badge-lines.svg
diff --git a/packages/admin-portal/src/tests/badges/badge-statements.svg b/packages/admin-portal/src/tests/badges/badge-statements.svg
diff --git a/packages/auto-bump/action/index.js b/packages/auto-bump/action/index.js
diff --git a/packages/connect-session/src/__mocks__/session.ts b/packages/connect-session/src/__mocks__/session.ts
@@ -26,6 +26,7 @@ export const mockLoginIdentity = {
   offGroupName: 'Cool Office Group',
   officeId: 'MVK',
   orgProduct: 'agencyCloud',
+  agencyCloudId: 'SOME_AC_ID',
 }
 
 export const mockBrowserSession: ReapitConnectSession = {

diff --git a/packages/connect-session/src/types.ts b/packages/connect-session/src/types.ts
@@ -23,6 +23,7 @@ export interface ReapitConnectSession {
 export interface LoginIdentity {
   email: string
   name: string
+  agencyCloudId: string | null
   developerId: string | null
   clientId: string | null
   adminId: string | null

diff --git a/packages/connect-session/src/utils/verify-decode-id-token.ts b/packages/connect-session/src/utils/verify-decode-id-token.ts
@@ -64,6 +64,7 @@ export const connectSessionVerifyDecodeIdTokenWithPublicKeys = async (
     return {
       name: claim['name'],
       email: claim['email'],
+      agencyCloudId: claim['custom:reapit:agencyCloudId'] || null,
       developerId: claim['custom:reapit:developerId'] || null,
       clientId: claim['custom:reapit:clientCode'] || null,
       adminId: claim['custom:reapit:marketAdmin'] || null,
@@ -78,7 +79,8 @@ export const connectSessionVerifyDecodeIdTokenWithPublicKeys = async (
       orgProduct: claim['custom:reapit:orgProduct'] || null,
     }
   } catch (error) {
-    console.error('Reapit Connect Session error:', error.message)
+    const err = error as Error
+    console.error('Reapit Connect Session error:', err.message)
   }
 }
 

diff --git a/packages/cra-template-foundations/template/src/platform-api/__mocks__/session.ts b/packages/cra-template-foundations/template/src/platform-api/__mocks__/session.ts
@@ -15,6 +15,7 @@ export const mockLoginIdentity = {
   offGroupName: 'Cool Office Group',
   officeId: 'MVK',
   orgProduct: 'agencyCloud',
+  agencyCloudId: 'SOME_AC_ID',
 }
 export const mockBrowserSession: ReapitConnectSession = {
   accessToken: JSON.stringify({

diff --git a/packages/data-warehouse/src/services/__mocks__/session.ts b/packages/data-warehouse/src/services/__mocks__/session.ts
@@ -15,6 +15,7 @@ export const mockLoginIdentity = {
   offGroupName: 'Cool Office Group',
   officeId: 'MVK',
   orgProduct: 'agencyCloud',
+  agencyCloudId: 'SOME_AC_ID',
 }
 
 export const mockBrowserSession: ReapitConnectSession = {

diff --git a/.../src/components/pages/app-detail/app-revision-modal/__tests__/app-revision-modal.test.tsx b/.../src/components/pages/app-detail/app-revision-modal/__tests__/app-revision-modal.test.tsx
@@ -114,6 +114,7 @@ describe('DeveloperAppRevisionModal', () => {
         offGroupName: 'Cool Office Group',
         officeId: 'MVK',
         orgProduct: 'agencyCloud',
+        agencyCloudId: 'SOME_AC_ID',
       }
       const fn = handleCancelPendingRevisionsButtonClick(spyDispatch, appId, appRevisionId, loginIdentity)
       fn()

diff --git a/...al/src/components/pages/edit-app/__tests__/__snapshots__/developer-edit-app.test.tsx.snap b/...al/src/components/pages/edit-app/__tests__/__snapshots__/developer-edit-app.test.tsx.snap
@@ -3655,49 +3655,28 @@ exports[`DeveloperSubmitApp should match a snapshot when pendingRevisions = fals
             </form>
           </Form>
         </Formik>
-        <ModalV2
-          footer={
-            Array [
-              <Button
-                onClick={[Function]}
-              >
-                Close
-              </Button>,
-            ]
-          }
-          isCentered={true}
-          onClose={[Function]}
-          title="Account Information Required"
-          visible={false}
+        <SubmitAppModal
+          Modal={[Function]}
+          closeModal={[Function]}
         >
-          <Dialog
-            className="m36ncwu-modal-container"
-            closeIcon={
-              <span
-                aria-label="close"
-                className="delete"
-              />
-            }
-            destroyOnClose={true}
-            footer={
-              Array [
-                <Button
-                  onClick={[Function]}
-                >
-                  Close
-                </Button>,
-              ]
-            }
-            onClose={[Function]}
-            title={
-              <ModalHeaderV2>
-                Account Information Required
-              </ModalHeaderV2>
-            }
-            visible={false}
-            wrapClassName="m140lwlu-modal-centered"
-          />
-        </ModalV2>
+          <ModalComponent
+            title="Account Information Required"
+          >
+            <Portal
+              id="root"
+            >
+              <Portal
+                containerInfo={<div />}
+              >
+                <Modal
+                  isOpen={false}
+                  onModalClose={[Function]}
+                  title="Account Information Required"
+                />
+              </Portal>
+            </Portal>
+          </ModalComponent>
+        </SubmitAppModal>
       </DeveloperEditApp>
     </Router>
   </MemoryRouter>