Merge pull request #782 from DTS-STN/typescript-conversion

Covert library functions, document, and dashboard to typescript
DTS-STN · Dec 19, 2024 · 7ed55bf · 7ed55bf
2 parents 19b0e58 + dffa2b1
commit 7ed55bf
Show file tree

Hide file tree

Showing 12 changed files with 186 additions and 48 deletions.
diff --git a/components/BenefitTasks.tsx b/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

diff --git a/components/Card.tsx b/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,

diff --git a/graphql/mappers/decision-reviews.ts b/graphql/mappers/decision-reviews.ts
@@ -35,7 +35,7 @@ interface GetSchDecisionReviewsV1 {
             scDestinationURLEn: string
             scDestinationURLFr: string
             schBetaPopUp: boolean
-            schURLType: string
+            schURLType?: string
           }>
         }>
       }
@@ -95,7 +95,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: askFragment?.scFragments[0].scLinkTextAssistiveEn,
             link: buildLink(
               askFragment?.scFragments[0].schURLType,
-              askFragment?.scFragments[0].scDestinationURLEn,
+              askFragment?.scFragments[0].scDestinationURLEn ?? '',
             ),
             betaPopUp: askFragment?.scFragments[0].schBetaPopUp,
           },
@@ -108,7 +108,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: appealFragment?.scFragments[0].scLinkTextAssistiveEn,
             link: buildLink(
               appealFragment?.scFragments[0].schURLType,
-              appealFragment?.scFragments[0].scDestinationURLEn,
+              appealFragment?.scFragments[0].scDestinationURLEn ?? '',
             ),
             betaPopUp: appealFragment?.scFragments[0].schBetaPopUp,
           },
@@ -138,7 +138,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: askFragment?.scFragments[0].scLinkTextAssistiveFr,
             link: buildLink(
               askFragment?.scFragments[0].schURLType,
-              askFragment?.scFragments[0].scDestinationURLFr,
+              askFragment?.scFragments[0].scDestinationURLFr ?? '',
             ),
             betaPopUp: askFragment?.scFragments[0].schBetaPopUp,
           },
@@ -151,7 +151,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: appealFragment?.scFragments[0].scLinkTextAssistiveFr,
             link: buildLink(
               appealFragment?.scFragments[0].schURLType,
-              appealFragment?.scFragments[0].scDestinationURLFr,
+              appealFragment?.scFragments[0].scDestinationURLFr ?? '',
             ),
             betaPopUp: appealFragment?.scFragments[0].schBetaPopUp,
           },

diff --git a/graphql/mappers/my-dashboard.ts b/graphql/mappers/my-dashboard.ts
@@ -96,7 +96,7 @@ const getCachedContent = () => {
   })
 }
 
-export async function getMyDashboardContent() {
+export async function getMyDashboardContent(): Promise<MyDashboardContent> {
   const response = await getCachedContent()
   const pageAlertContent = response?.data.schPageV1ByPath.item.schAlerts
 
@@ -209,3 +209,88 @@ export async function getMyDashboardContent() {
   }
   return mappedHome
 }
+
+export interface MyDashboardContent {
+  err?: string
+  en?: {
+    pageName: string | undefined
+    heading: string | undefined
+    pageAlerts:
+      | {
+          id: string | undefined
+          alertHeading: string | undefined
+          alertBody: string | undefined
+          type: string[] | undefined
+        }[]
+      | undefined
+    cards:
+      | {
+          id: string
+          title: string
+          dropdownText: string
+          cardAlerts:
+            | {
+                id: string
+                alertHeading: string
+                alertBody: string | undefined
+                type: string[] | undefined
+              }[]
+            | undefined
+          lists: {
+            title: string
+            tasks: {
+              id: string
+              title: string
+              areaLabel: string
+              link: string
+              icon: string
+              betaPopUp: boolean
+            }[]
+          }[]
+        }[]
+      | undefined
+    exitBeta: { title: null | undefined; link: string | undefined }
+  }
+  fr?: {
+    pageName: string | undefined
+    heading: string | undefined
+    pageAlerts:
+      | {
+          id: string | undefined
+          alertHeading: string | undefined
+          alertBody: string | undefined
+          type: string[] | undefined
+        }[]
+      | undefined
+    cards:
+      | (
+          | {
+              id: string
+              title: string
+              dropdownText: string
+              cardAlerts:
+                | {
+                    id: string
+                    alertHeading: string
+                    alertBody: string | undefined
+                    type: string[] | undefined
+                  }[]
+                | undefined
+              lists: {
+                title: string
+                tasks: {
+                  id: string
+                  title: string
+                  areaLabel: string
+                  link: string
+                  icon: string
+                  betaPopUp: boolean
+                }[]
+              }[]
+            }
+          | undefined
+        )[]
+      | undefined
+    exitBeta: { title: null | undefined; link: string | undefined }
+  }
+}
diff --git a/graphql/mappers/security-settings.ts b/graphql/mappers/security-settings.ts
@@ -154,7 +154,7 @@ export async function getSecuritySettingsContent(): Promise<SecuritySettingsCont
           text: securityQuestions?.scLinkTextEn,
           link: buildLink(
             securityQuestions?.schURLType,
-            securityQuestions?.scDestinationURLEn,
+            securityQuestions?.scDestinationURLEn ?? '',
           ),
         },
         subTitle: securityQuestions?.scDescriptionEn.json[0].content[0].value,
@@ -186,7 +186,7 @@ export async function getSecuritySettingsContent(): Promise<SecuritySettingsCont
           text: securityQuestions?.scLinkTextFr,
           link: buildLink(
             securityQuestions?.schURLType,
-            securityQuestions?.scDestinationURLFr,
+            securityQuestions?.scDestinationURLFr ?? '',
           ),
         },
         subTitle: securityQuestions?.scDescriptionFr.json[0].content[0].value,

diff --git a/lib/links.js → lib/links.ts b/lib/links.js → lib/links.ts
@@ -1,5 +1,5 @@
 //build links is used to prepend links with their corresponding environment. ie MSCA with their test vs prod environment
-export function buildLink(linkType, link) {
+export function buildLink(linkType: string | undefined, link: string) {
   //If no type assume full or relative link
   if (linkType === undefined) {
     return link

diff --git a/lib/loadIcons.js → lib/loadIcons.ts b/lib/loadIcons.js → lib/loadIcons.ts
diff --git a/lib/programs.js → lib/programs.ts b/lib/programs.js → lib/programs.ts
@@ -1,4 +1,4 @@
-export const programs = (acronym) => {
+export const programs = (acronym: string) => {
   switch (acronym.toLowerCase()) {
     case 'ei':
       return 'Employment Insurance'

diff --git a/locales/en.js → locales/en.ts b/locales/en.js → locales/en.ts
diff --git a/locales/fr.js → locales/fr.ts b/locales/fr.js → locales/fr.ts
diff --git a/pages/_document.js → pages/_document.tsx b/pages/_document.js → pages/_document.tsx