Merge into staging

.env.example

@@ -1,4 +1,6 @@
 AEM_GRAPHQL_ENDPOINT = "test.com"
+# Code suggests this is optional but it is actually not because of changes in the structure of the response
+AEM_GRAPHQL_FOLDER = "test_folder/path"
 LOGGING_LEVEL = " info or debug" 
 MSCA_BASE_URL = "MSCA base url"
 MSCA_EQ_BASE_URL = "MSCA base url with eq extension"

.github/workflows/dast.yml

@@ -19,16 +19,18 @@ jobs:
           CI: true
 
       - name: Docker Build
-        run: docker build --build-arg AEM_GRAPHQL_ENDPOINT=${{secrets.AEM_GRAPHQL_ENDPOINT}} -t secure-client-hub .
+        run: docker build --build-arg AEM_GRAPHQL_ENDPOINT=${{secrets.AEM_GRAPHQL_ENDPOINT}} AEM_GRAPHQL_FOLDER=${{secrets.AEM_GRAPHQL_FOLDER}} -t secure-client-hub .
         env:
           CI: true
           AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
+          AEM_GRAPHQL_FOLDER: ${{secrets.AEM_GRAPHQL_FOLDER}}
 
       - name: Docker run
         run: docker run -d -p 3000:3000 secure-client-hub
         env:
           CI: true
           AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
+          AEM_GRAPHQL_FOLDER: ${{secrets.AEM_GRAPHQL_FOLDER}}
 
       - name: OWASP ZAP FULL Scan
         uses: zaproxy/[email protected]

.github/workflows/default-tests.yml

@@ -51,7 +51,7 @@ jobs:
           AUTH_DISABLED: true
 
       - name: Store Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: unit-test-results
           path: coverage
@@ -78,6 +78,7 @@ jobs:
         env:
           CI: true
           AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
+          AEM_GRAPHQL_FOLDER: ${{secrets.AEM_GRAPHQL_FOLDER}}
           AUTH_DISABLED: true
 
       - name: Cypress end-to-end 🧪
@@ -86,6 +87,7 @@ jobs:
           CI: true
           NODE_ENV: production
           AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
+          AEM_GRAPHQL_FOLDER: ${{secrets.AEM_GRAPHQL_FOLDER}}
           NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
           NEXTAUTH_URL: ${{secrets.NEXTAUTH_URL}}
           CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}

Dockerfile

@@ -17,6 +17,8 @@ ARG LOGGING_LEVEL=info
 ENV LOGGING_LEVEL=$LOGGING_LEVEL
 ARG AEM_GRAPHQL_ENDPOINT=https://www.canada.ca/graphql/execute.json/decd-endc/
 ENV AEM_GRAPHQL_ENDPOINT=$AEM_GRAPHQL_ENDPOINT
+ARG AEM_GRAPHQL_FOLDER
+ENV AEM_GRAPHQL_FOLDER=$AEM_GRAPHQL_FOLDER
 ARG AUTH_ECAS_BASE_URL
 ENV AUTH_ECAS_BASE_URL=$AUTH_ECAS_BASE_URL
 ARG MSCA_BASE_URL
@@ -99,6 +101,8 @@ ARG LOGGING_LEVEL=info
 ENV LOGGING_LEVEL=$LOGGING_LEVEL
 ARG AEM_GRAPHQL_ENDPOINT
 ENV AEM_GRAPHQL_ENDPOINT=$AEM_GRAPHQL_ENDPOINT
+ARG AEM_GRAPHQL_FOLDER
+ENV AEM_GRAPHQL_FOLDER=$AEM_GRAPHQL_FOLDER
 ARG MSCA_BASE_URL
 ENV MSCA_BASE_URL=$MSCA_BASE_URL
 ARG MSCA_EQ_BASE_URL

components/BenefitTasks.tsx

@@ -11,12 +11,10 @@ interface Tasks {
   id: string
 }
 
-interface TaskListProps {
+export interface TaskListProps {
   title: string
-  dataCy: string
   tasks: Tasks[]
 }
-
 interface BenefitTasksProps {
   locale: string
   taskList: TaskListProps
@@ -81,7 +79,7 @@ const BenefitTasks = ({
                     ? 'noopener noreferrer'
                     : undefined
                 }
-                data-gc-analytics-customclick={`${refPageAA} ${acronym} ${taskList.title}:${task.id}`}
+                data-gc-analytics-customclick={`${refPageAA} ${acronym}:${task.id}`}
                 className="flex items-center rounded-sm py-1 text-deep-blue-dark underline hover:text-blue-hover focus:outline-1 focus:outline-blue-hover"
               >
                 <span className="static text-xl font-normal">

components/Button.tsx

@@ -10,7 +10,7 @@ interface ButtonProps {
   iconEnd?: boolean
   href?: string
   type?: 'submit' | 'reset' | 'button'
-  onClick: MouseEventHandler<HTMLElement>
+  onClick?: MouseEventHandler<HTMLElement>
   disabled?: boolean
   className?: string
   attributes?: { [key: string]: string }
@@ -27,7 +27,7 @@ const Button = ({
   iconEnd,
   href = 'no ref',
   type,
-  onClick,
+  onClick = () => {},
   disabled,
   className,
   attributes,

components/Card.tsx

@@ -9,8 +9,6 @@ interface AlertProps {
   type: string
   alertHeading: string
   alertBody: string
-  alert_icon_alt_text: string
-  alert_icon_id: string
 }
 interface CardProps {
   cardTitle: string
@@ -31,8 +29,6 @@ const Card = ({
       type: '',
       alertHeading: '',
       alertBody: '',
-      alert_icon_alt_text: '',
-      alert_icon_id: '',
     },
   ],
   locale,

components/Footer.tsx

@@ -10,24 +10,24 @@ interface Links {
   id: string
   text: string
   href: string
-  onClick: () => void
+  onClick?: () => void
 }
 
 interface FooterProps {
   id: string
   lang: 'en' | 'fr' | 'und'
   btnLink: string
-  error: boolean
+  error?: boolean
   contactLink: string
   brandLinks: Links[]
-  target: string
+  target?: string
 }
 
 const Footer = ({
   id = 'mscaPlaceholder',
   lang = 'en',
   btnLink,
-  error,
+  error = false,
   contactLink = 'https://www.canada.ca/en/contact.html',
   brandLinks = [
     {

components/Header.tsx

@@ -12,7 +12,7 @@ interface SearchProps {
 }
 
 interface MenuProps {
-  onSignOut: () => void
+  onSignOut?: () => void
   menuList: MenuList[]
 }
 
@@ -21,8 +21,8 @@ interface MenuList {
   key: string
   value: string
   path: string
-  showIcon: boolean
-  onSignOut: () => void
+  showIcon?: boolean
+  onSignOut?: () => void
 }
 
 interface TopNavProps {
@@ -32,7 +32,7 @@ interface TopNavProps {
   displayAlternateLink: boolean
 }
 
-interface BreadcrumbItemProps {
+export interface BreadcrumbItemProps {
   text: string
   link: string
 }