[JN-1536] more typescript fixes

broadinstitute · Jan 3, 2025 · b0bb65e · b0bb65e
1 parent 9632762
commit b0bb65e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/child2Family2.json b/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/child2Family2.json
@@ -57,6 +57,7 @@
     "answerPopDtos": [
       {"questionStableId": "hd_hd_basic_firstName", "stringValue": "Child 2"},
       {"questionStableId": "hd_hd_basic_lastName", "stringValue": "Family 2"},
+      {"questionStableId": "hd_hd_basic_dateOfBirth", "stringValue": "08/24/2019"},
       {"questionStableId": "hd_hd_basic_streetAddress", "stringValue": "105 Broadway"},
       {"questionStableId": "hd_hd_basic_mghPatient", "stringValue": "yes"}
     ],

diff --git a/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/invited.json b/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/invited.json
@@ -11,6 +11,7 @@
       "answerPopDtos": [
         {"questionStableId": "hd_hd_basic_firstName", "stringValue": "Invited"},
         {"questionStableId": "hd_hd_basic_lastName", "stringValue": "PriorUser"},
+        {"questionStableId": "hd_hd_basic_dateOfBirth", "stringValue": "05/04/1990"},
         {"questionStableId": "hd_hd_basic_streetAddress", "stringValue": "465 Spruce Street"},
         {"questionStableId": "hd_hd_basic_mghPatient", "stringValue": "yes"},
         {"questionStableId": "hd_hd_basic_sexualOrientation", "stringValue": "preferNoAnswer"}

diff --git a/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/jsalk.json b/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/jsalk.json
@@ -82,6 +82,7 @@
       "answerPopDtos": [
         {"questionStableId": "hd_hd_basic_firstName", "stringValue": "Jonas", "viewedLanguage": "en"},
         {"questionStableId": "hd_hd_basic_lastName", "stringValue": "Salk", "viewedLanguage": "en"},
+        {"questionStableId": "hd_hd_basic_dateOfBirth", "stringValue": "11/13/1983", "viewedLanguage": "en"},
         {"questionStableId": "hd_hd_basic_streetAddress", "stringValue": "1223 Walnut Street", "viewedLanguage": "es"},
         {"questionStableId": "hd_hd_basic_mghPatient", "stringValue": "yes", "viewedLanguage": "es"},
         {"questionStableId": "hd_hd_basic_languages", "objectValue": "[{\"language\": \"English\", \"proficiency\": \"native\", \"workUse\": [\"yes\"]}, {\"language\": \"Dutch\", \"proficiency\": \"fluent\", \"workUse\": []}]", "viewedLanguage": "es"}

diff --git a/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/lostInterest.json b/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/lostInterest.json
@@ -22,6 +22,7 @@
       "answerPopDtos": [
         {"questionStableId": "hd_hd_basic_firstName", "stringValue": "Lost"},
         {"questionStableId": "hd_hd_basic_lastName", "stringValue": "Interest"},
+        {"questionStableId": "hd_hd_basic_dateOfBirth", "stringValue": "02/24/2000"},
         {"questionStableId": "hd_hd_basic_streetAddress", "stringValue": "857 Spruce Street"},
         {"questionStableId": "hd_hd_basic_mghPatient", "stringValue": "yes"}
       ],

diff --git a/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/recurrenceDue.json b/populate/src/main/resources/seed/portals/demo/studies/heartdemo/enrollees/recurrenceDue.json
@@ -22,6 +22,7 @@
       "answerPopDtos": [
         {"questionStableId": "hd_hd_basic_firstName", "stringValue": "Recurrence"},
         {"questionStableId": "hd_hd_basic_lastName", "stringValue": "Due"},
+        {"questionStableId": "hd_hd_basic_dateOfBirth", "stringValue": "05/07/1983"},
         {"questionStableId": "hd_hd_basic_streetAddress", "stringValue": "99 Spruce Street"},
         {"questionStableId": "hd_hd_basic_mghPatient", "stringValue": "yes"}
       ],

diff --git a/ui-admin/src/forms/designer/split/QuestionDesigner.tsx b/ui-admin/src/forms/designer/split/QuestionDesigner.tsx
@@ -1,6 +1,12 @@
 import React, { useState } from 'react'
 
-import { HtmlQuestion, PortalEnvironmentLanguage, Question, QuestionType } from '@juniper/ui-core'
+import {
+  HtmlQuestion,
+  PortalEnvironmentLanguage,
+  Question,
+  SimpleQuestion,
+  SimpleQuestionType
+} from '@juniper/ui-core'
 
 import { Textarea } from 'components/forms/Textarea'
 import { i18nSurveyText, updateI18nSurveyText } from 'util/juniperSurveyUtils'
@@ -59,14 +65,15 @@ export const QuestionDesigner = (props: QuestionDesignerProps) => {
         </div>
         { (!isTemplated && question.type !== 'html') &&
             <IconButton
-              className={classNames('mb-2', 'ms-1', 'border', question.isRequired ? 'text-danger' : 'text-muted')}
+              className={classNames('mb-2', 'ms-1', 'border',
+                (question as SimpleQuestion).isRequired ? 'text-danger' : 'text-muted')}
               icon={faAsterisk}
               aria-label={'Toggle required'}
               onClick={() => {
-                onChange({
+                onChange(({
                   ...question,
-                  isRequired: !question.isRequired
-                })
+                  isRequired: !(question as SimpleQuestion).isRequired
+                }) as SimpleQuestion)
               }}
             /> }
       </div>
@@ -75,7 +82,7 @@ export const QuestionDesigner = (props: QuestionDesignerProps) => {
         questionType={question.type}
         onChange={newType => {
           onChange({
-            ...baseQuestions[newType as QuestionType],
+            ...baseQuestions[newType as SimpleQuestionType],
             ...question,
             // @ts-ignore
             type: newType
@@ -99,7 +106,7 @@ export const QuestionDesigner = (props: QuestionDesignerProps) => {
         disabled={readOnly}
         currentLanguage={currentLanguage}
         supportedLanguages={supportedLanguages}
-        question={question}
+        question={question as SimpleQuestion}
         onChange={onChange}
       />
 
@@ -143,7 +150,7 @@ export const QuestionDesigner = (props: QuestionDesignerProps) => {
         >
           <VisibilityFields
             disabled={readOnly}
-            question={question}
+            question={question as SimpleQuestion}
             onChange={onChange}
           />
         </Tab>
@@ -184,17 +191,17 @@ export const QuestionDesigner = (props: QuestionDesignerProps) => {
                 label="Description"
                 labelClassname={'mb-0'}
                 rows={2}
-                value={i18nSurveyText(question.description, currentLanguage.languageCode)}
+                value={i18nSurveyText((question as SimpleQuestion).description, currentLanguage.languageCode)}
                 onChange={value => {
-                  onChange({
+                  onChange(({
                     ...question,
                     description: updateI18nSurveyText({
                       valueText: value,
-                      oldValue: question.description,
+                      oldValue: (question as SimpleQuestion).description,
                       languageCode: currentLanguage.languageCode,
                       supportedLanguages
                     })
-                  })
+                  }) as SimpleQuestion)
                 }}
               />
             </div>