Merge branch 'main' into dependabot/npm_and_yarn/app/aws-sdk/client-s…

…3-3.592.0
bcgov · Jun 13, 2024 · d8af76c · d8af76c
2 parents d8c322a + cbe2e3d
commit d8af76c
Show file tree

Hide file tree

Showing 17 changed files with 397 additions and 52 deletions.
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # tag=v3.25.7
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # tag=v3.25.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-checks.yaml b/.github/workflows/test-checks.yaml
@@ -41,7 +41,7 @@ jobs:
           ignore-unfixed: false
           severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           sarif_file: 'trivy-results.sarif'
 
@@ -61,13 +61,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251
 
   cocogitto:
     runs-on: ubuntu-latest
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: ./.bin/install-gitleaks-linux-x64.sh
       - run: ./gitleaks detect --exit-code 0 --report-format sarif --report-path "gitleaks.sarif"
-      - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
+      - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           sarif_file: 'gitleaks.sarif'
 

diff --git a/.github/workflows/test-code.yaml b/.github/workflows/test-code.yaml
@@ -59,7 +59,7 @@ jobs:
           fs.writeFileSync('results.sarif', JSON.stringify(sarifJson, null, 2));
           EOF
         working-directory: ./app
-      - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
+      - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           sarif_file: app/results.sarif
 

diff --git a/.github/workflows/test-containers.yaml b/.github/workflows/test-containers.yaml
@@ -37,7 +37,7 @@ jobs:
           severity: CRITICAL
           timeout: 10m0s
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Get Results Length From Sarif
@@ -64,7 +64,7 @@ jobs:
           severity: CRITICAL
           timeout: 10m0s
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Get Results Length From Sarif

diff --git a/app/Dockerfile b/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/s2i-base@sha256:9af1318d4d016b4aab0723aafdaf739972065919559107eadaccac4c8f350f37
+FROM registry.access.redhat.com/ubi9/s2i-base@sha256:798d3d983bde082429eaced15475722585c994612ba062dbce6428877ee3ca32
 
 ENV SUMMARY="An image for the CONN-CCBC-portal app" \
   DESCRIPTION="This image contains the compiled CONN-CCBC-portal node app"

diff --git a/app/components/Analyst/RFI/RFIAnalystUpload.tsx b/app/components/Analyst/RFI/RFIAnalystUpload.tsx
@@ -13,13 +13,19 @@ import styled from 'styled-components';
 import { useCreateNewFormDataMutation } from 'schema/mutations/application/createNewFormData';
 import useHHCountUpdateEmail from 'lib/helpers/useHHCountUpdateEmail';
 import useRfiCoverageMapKmzUploadedEmail from 'lib/helpers/useRfiCoverageMapKmzUploadedEmail';
+import { useToast } from 'components/AppProvider';
+import Link from 'next/link';
 
 const Flex = styled('header')`
   display: flex;
   justify-content: space-between;
   width: 100%;
 `;
 
+const StyledLink = styled(Link)`
+  color: ${(props) => props.theme.color.white};
+`;
+
 const RfiAnalystUpload = ({ query }) => {
   const queryFragment = useFragment(
     graphql`
@@ -52,6 +58,7 @@ const RfiAnalystUpload = ({ query }) => {
     rowId: applicationId,
     ccbcNumber,
   } = applicationByRowId;
+  const { showToast, hideToast } = useToast();
 
   const { rfiNumber } = rfiDataByRowId;
 
@@ -94,9 +101,30 @@ const RfiAnalystUpload = ({ query }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [templateData]);
 
+  const getToastMessage = () => {
+    return (
+      <>
+        {' '}
+        `Template {templateData?.templateNumber} data changed successfully, new
+        values for{' '}
+        {templateData?.templateNumber === 1
+          ? 'Total Households and Indigenous Households'
+          : 'Total eligible costs and Total project costs'}{' '}
+        data in the application now reflect template uploads. Please see{' '}
+        <StyledLink
+          href={`/analyst/application/${router.query.applicationId}/history`}
+        >
+          history page
+        </StyledLink>{' '}
+        for details.`
+      </>
+    );
+  };
+
   const handleSubmit = () => {
     const updatedExcelFields = excelImportFields.join(', ');
     const reasonForChange = `Auto updated from upload of ${updatedExcelFields} for RFI: ${rfiNumber}`;
+    hideToast();
     updateRfi({
       variables: {
         input: {
@@ -129,6 +157,12 @@ const RfiAnalystUpload = ({ query }) => {
                   }
                 );
               }
+              if (
+                templateData?.templateNumber === 1 ||
+                templateData?.templateNumber === 2
+              ) {
+                showToast(getToastMessage(), 'success', 100000000);
+              }
             },
           });
         }

diff --git a/app/components/AppProvider.tsx b/app/components/AppProvider.tsx
@@ -0,0 +1,63 @@
+import React, {
+  createContext,
+  useContext,
+  useState,
+  useCallback,
+  useMemo,
+  ReactNode,
+} from 'react';
+import Toast, { ToastType } from 'components/Toast';
+
+type AppContextType = {
+  showToast?: (message: ReactNode, type?: ToastType, timeout?: number) => void;
+  hideToast?: () => void;
+};
+
+const AppContext = createContext<AppContextType>({});
+
+export const useToast = () => {
+  return useContext(AppContext);
+};
+
+export const AppProvider = ({ children }) => {
+  /**
+   * handling global toast messages
+   */
+  const [toast, setToast] = useState<{
+    visible: boolean;
+    message?: ReactNode;
+    type?: ToastType;
+    timeout?: number;
+  }>({ visible: false });
+
+  const showToast = useCallback(
+    (
+      message: ReactNode,
+      type: ToastType = 'success',
+      timeout: number = 10000
+    ) => {
+      setToast({ visible: true, message, type, timeout });
+    },
+    []
+  );
+
+  const hideToast = useCallback(() => {
+    setToast({ visible: false });
+  }, []);
+
+  const contextValue = useMemo(
+    () => ({ showToast, hideToast }),
+    [showToast, hideToast]
+  );
+
+  return (
+    <AppContext.Provider value={contextValue}>
+      {children}
+      {toast?.visible && (
+        <Toast type={toast?.type} onClose={hideToast} timeout={toast.timeout}>
+          {toast.message}
+        </Toast>
+      )}
+    </AppContext.Provider>
+  );
+};
diff --git a/app/components/Toast.tsx b/app/components/Toast.tsx
@@ -9,7 +9,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { theme } from 'styles/GlobalTheme';
 
-type ToastType = 'success' | 'warning' | 'error';
+export type ToastType = 'success' | 'warning' | 'error';
 
 type ToastDirection = 'left' | 'right';
 

diff --git a/app/lib/theme/widgets/FileWidget.tsx b/app/lib/theme/widgets/FileWidget.tsx
@@ -13,6 +13,8 @@ import bytesToSize from 'utils/bytesToText';
 import FileComponent from 'lib/theme/components/FileComponent';
 import useDisposeOnRouteChange from 'lib/helpers/useDisposeOnRouteChange';
 import { DateTime } from 'luxon';
+import { useToast } from 'components/AppProvider';
+import { ToastType } from 'components/Toast';
 
 type File = {
   id: string | number;
@@ -65,6 +67,7 @@ const FileWidget: React.FC<FileWidgetProps> = ({
   const maxFileSizeInBytes = 104857600;
   const fileId = isFiles && value[0].id;
   const { setTemplateData } = formContext;
+  const { showToast, hideToast } = useToast();
 
   useEffect(() => {
     if (rawErrors?.length > 0) {
@@ -73,6 +76,7 @@ const FileWidget: React.FC<FileWidgetProps> = ({
   }, [rawErrors, setErrors]);
 
   const getValidatedFile = async (file: any, formId: number) => {
+    let isTemplateValid = true;
     if (templateValidate) {
       const fileFormData = new FormData();
       if (file) {
@@ -92,6 +96,8 @@ const FileWidget: React.FC<FileWidgetProps> = ({
                   data,
                 });
               });
+            } else {
+              isTemplateValid = false;
             }
           });
         }
@@ -109,6 +115,7 @@ const FileWidget: React.FC<FileWidgetProps> = ({
     }
 
     return {
+      isTemplateValid,
       input: {
         attachment: {
           file,
@@ -153,6 +160,19 @@ const FileWidget: React.FC<FileWidgetProps> = ({
     });
   };
 
+  const showToastMessage = (files, type: ToastType = 'success') => {
+    const fields =
+      templateNumber === 1
+        ? 'Total Households and Indigenous Households data'
+        : 'Total eligible costs and Total project costs data';
+    const message =
+      type === 'success'
+        ? `Template ${templateNumber} validation successful, new values for ${fields} data in the application will update upon 'Save'`
+        : `Template ${templateNumber} validation failed: ${files.join(', ')} did not validate due to formatting issues. ${fields} in the application will not update.`;
+
+    showToast(message, type, 100000000);
+  };
+
   const handleChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const transaction = Sentry.startTransaction({ name: 'ccbc.function' });
     const span = transaction.startChild({
@@ -161,6 +181,7 @@ const FileWidget: React.FC<FileWidgetProps> = ({
     });
 
     if (loading) return;
+    hideToast();
     const formId =
       parseInt(router?.query?.id as string, 10) ||
       parseInt(router?.query?.applicationId as string, 10);
@@ -177,6 +198,8 @@ const FileWidget: React.FC<FileWidgetProps> = ({
     const validatedFiles = resp.filter((file) => file.input);
     setErrors(resp.filter((file) => file.error));
 
+    const validationErrors = resp.filter((file) => !file.isTemplateValid);
+
     const uploadResponse = await Promise.all(
       validatedFiles.map(async (payload) => handleUpload(payload))
     );
@@ -190,6 +213,20 @@ const FileWidget: React.FC<FileWidgetProps> = ({
     } else {
       span.setStatus('ok');
     }
+
+    if (templateValidate) {
+      if (validationErrors.length > 0) {
+        showToastMessage(
+          validationErrors.map(
+            (error) => error.fileName || error.input?.attachment?.fileName
+          ),
+          'error'
+        );
+      } else if (validationErrors.length === 0 && uploadErrors.length === 0) {
+        showToastMessage(fileDetails.map((file) => file.name));
+      }
+    }
+
     span.finish();
     transaction.finish();
 

diff --git a/app/package.json b/app/package.json
@@ -65,7 +65,7 @@
     "connect-pg-simple": "^7.0.0",
     "convict": "^6.2.4",
     "cookie-parser": "^1.4.6",
-    "dayjs": "^1.11.8",
+    "dayjs": "^1.11.11",
     "debug": "^4.1.7",
     "delay": "^5.0.0",
     "dotenv": "^16.3.1",
@@ -151,7 +151,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-relay": "^1.8.3",
     "fse": "^4.0.1",
-    "happo-cypress": "^4.1.1",
+    "happo-cypress": "^4.2.0",
     "happo-e2e": "^2.6.0",
     "happo.io": "^8.3.3",
     "jest": "^28.1.0",

diff --git a/app/pages/_app.tsx b/app/pages/_app.tsx
@@ -18,6 +18,7 @@ import GlobalStyle from 'styles/GobalStyles';
 import GlobalTheme from 'styles/GlobalTheme';
 import BCGovTypography from 'components/BCGovTypography';
 import { SessionExpiryHandler } from 'components';
+import { AppProvider } from 'components/AppProvider';
 
 config.autoAddCss = false;
 
@@ -94,8 +95,10 @@ const MyApp = ({ Component, pageProps }: AppProps) => {
           <BCGovTypography />
           <Sentry.ErrorBoundary fallback={<Error500 />}>
             <RelayEnvironmentProvider environment={env}>
-              {typeof window !== 'undefined' && <SessionExpiryHandler />}
-              {component}
+              <AppProvider>
+                {typeof window !== 'undefined' && <SessionExpiryHandler />}
+                {component}
+              </AppProvider>
             </RelayEnvironmentProvider>
           </Sentry.ErrorBoundary>
         </ThemeProvider>