Merge pull request #4830 from bcgov/refactor/4793

chore(4793): update dependency react to latest
bcgov · Feb 3, 2025 · a8a8107 · a8a8107
2 parents ccdb66d + 0b0923f
commit a8a8107
Show file tree

Hide file tree

Showing 17 changed files with 893 additions and 1,040 deletions.
diff --git a/.github/actions/setup-npm/action.yml b/.github/actions/setup-npm/action.yml
@@ -17,10 +17,10 @@ runs:
         ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
 
   - name: Install Root NPM packages
-    run: pnpm install
+    run: pnpm install --no-frozen-lockfile
     shell: bash
 
   - name: Install App NPM packages
-    run: pnpm install
+    run: pnpm install --no-frozen-lockfile
     shell: bash
     working-directory: app
diff --git a/.github/workflows/localdev-test.yml b/.github/workflows/localdev-test.yml
@@ -22,7 +22,7 @@ jobs:
       uses: ./.github/actions/setup-tools
 
     - name: Install Dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
       working-directory: localdev/m365mock
 
     - name: Build the Application

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,4 @@
+; This is false to avoid issues in GitHub actions
+git-checks = false
+
+auto-install-peers=true
diff --git a/app/app/api/public-cloud/emails.test.ts b/app/app/api/public-cloud/emails.test.ts
@@ -43,24 +43,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );
@@ -89,24 +89,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );
@@ -151,24 +151,24 @@ describe('Public Cloud Emails', () => {
     expect(sendEmail).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        subject: 'Your provisioning request has been approved',
-        to: expect.arrayContaining([
-          decisionData.projectOwner.email,
-          decisionData.primaryTechnicalLead.email,
-          decisionData.secondaryTechnicalLead?.email,
-        ]),
+        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
+        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
         body: expect.compareEmailText(
-          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
+          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
         ),
       }),
     );
     expect(sendEmail).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        subject: `You have been added as the Expense Authority for ${decisionData.name}`,
-        to: expect.arrayContaining([decisionData.expenseAuthority.email]),
+        subject: 'Your provisioning request has been approved',
+        to: expect.arrayContaining([
+          decisionData.projectOwner.email,
+          decisionData.primaryTechnicalLead.email,
+          decisionData.secondaryTechnicalLead?.email,
+        ]),
         body: expect.compareEmailText(
-          `You are now the Expense Authority for the the product ${decisionData.name} on the Public Cloud.`,
+          `We are pleased to inform you that your request to create the product ${decisionData.name} has been approved on the Public Cloud Landing Zone ${decisionData.provider}.`,
         ),
       }),
     );

diff --git a/app/core/modal.tsx b/app/core/modal.tsx
@@ -1,9 +1,12 @@
-import { ScrollArea } from '@mantine/core';
+import { ScrollArea, ModalProps } from '@mantine/core';
 import { randomId } from '@mantine/hooks';
 import { modals } from '@mantine/modals';
-import { ModalSettings } from '@mantine/modals/lib/context';
 import _isString from 'lodash-es/isString';
-import React, { useMemo } from 'react';
+import React, { JSX } from 'react';
+
+type ModalSettings = Partial<Omit<ModalProps, 'opened'>> & {
+  modalId?: string;
+};
 
 // Interface for extra props to be passed to the modal component
 interface ExtraModalProps {

diff --git a/app/package.json b/app/package.json
@@ -35,7 +35,7 @@
     "@mantine/colors-generator": "^7.11.2",
     "@mantine/core": "^7.10.2",
     "@mantine/hooks": "^7.10.2",
-    "@mantine/modals": "^7.9.2",
+    "@mantine/modals": "^7.16.2",
     "@mantine/notifications": "^7.9.2",
     "@mantine/tiptap": "^7.10.2",
     "@prisma/client": "^6.0.0",
@@ -58,9 +58,9 @@
     "@tiptap/extension-underline": "^2.4.0",
     "@tiptap/react": "^2.4.0",
     "@tiptap/starter-kit": "^2.4.0",
-    "@tremor/react": "^3.13.1",
-    "@types/react": "18.3.18",
-    "@types/react-dom": "18.3.5",
+    "@tremor/react": "^3.18.7",
+    "@types/react": "19.0.8",
+    "@types/react-dom": "19.0.3",
     "autoprefixer": "10.4.20",
     "axios": "^1.5.1",
     "clsx": "^2.1.1",
@@ -75,11 +75,11 @@
     "jws": "^4.0.0",
     "lodash-es": "^4.17.21",
     "nats": "^2.17.0",
-    "next": "^15.0.1",
+    "next": "^15.1.6",
     "next-auth": "^4.23.1",
     "postcss": "8.5.1",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-email": "^3.0.0",
     "react-hook-form": "^7.45.1",
     "react-imask": "^7.6.1",