[JN-1536] more typescript fixes (#1363)

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"}
     ],

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"}

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"}

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"}
       ],

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"}
       ],

ui-admin/src/forms/FormContentEditor.test.tsx

@@ -31,7 +31,8 @@ describe('FormContentEditor', () => {
       initialAnswerMappings={[]}
       currentLanguage={{ languageCode: 'en', languageName: 'English', id: '' }}
       supportedLanguages={[]}
-      initialContent={formContent} visibleVersionPreviews={[]} readOnly={false}
+      initialContent={formContent}
+      readOnly={false}
       onFormContentChange={jest.fn()}
       onAnswerMappingChange={jest.fn()}
     />)

ui-admin/src/forms/FormPreviewOptions.tsx

@@ -7,7 +7,7 @@ type FormPreviewOptions = {
   ignoreValidation: boolean
   showInvisibleElements: boolean
   locale: string
-  profile?: Profile
+  profile: Profile
   proxyProfile?: Profile
   isGovernedUser: boolean
 }
@@ -117,7 +117,7 @@ export const FormPreviewOptions = (props: FormPreviewOptionsProps) => {
           <TextInput onChange={text => onChange({
             ...value,
             proxyProfile: {
-              ...value.proxyProfile,
+              ...value.proxyProfile!,
               givenName: text
             }
           })}
@@ -128,7 +128,7 @@ export const FormPreviewOptions = (props: FormPreviewOptionsProps) => {
           <TextInput onChange={text => onChange({
             ...value,
             proxyProfile: {
-              ...value.proxyProfile,
+              ...value.proxyProfile!,
               familyName: text
             }
           })}

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>

ui-admin/src/navbar/StudySidebar.test.tsx

@@ -10,6 +10,7 @@ test('renders the study selector and sub menus', async () => {
   const { study } = mockStudyEnvContext()
   const portal = mockPortal()
   portal.portalStudies.push({
+    createdAt: 0,
     study
   })
   const { RoutedComponent } = setupRouterTest(

ui-admin/src/portal/dashboard/widgets/StudyTrendsWidget.tsx

@@ -31,7 +31,7 @@ export const StudyTrendsWidget = ({ portal, study }: { portal: Portal, study: St
       const lastWeek = new Date()
       lastWeek.setDate(lastWeek.getDate() - 7)
       return new Date((datum.time || 0) * 1000) > lastWeek
-    }))
+    }), 'live')
   }
 
   return (

ui-admin/src/portal/publish/PortalChangeHistoryView.test.tsx

@@ -21,6 +21,7 @@ test('renders a list of changes', async () => {
   }])
   const portal = mockPortal()
   renderInPortalRouter(portal, <PortalChangeHistoryView portal={portal}/>, {
+    user: mockAdminUser(true),
     adminUsers: [{
       ...mockAdminUser(false), id: 'admin1', username: 'staffPerson'
     }]

ui-admin/src/search/SearchQueryBuilder.tsx

@@ -372,17 +372,17 @@ const CustomValueEditor = (props: ValueEditorProps) => {
 }
 
 const OperatorSelector = (props: OperatorSelectorProps) => {
-  const options = props.options as { name: string, label: string }[]
+  const options = (props.options as { name: string, label: string }[])
+    .map(option => ({ ...option, value: option.name }))
 
   const selectedOptions = options.find(o => o.name === props.value)
-
   return <div className="w-50">
     <Select
       options={options}
       value={selectedOptions ? { value: selectedOptions.name, label: selectedOptions.label } : undefined}
       onChange={newVal => {
-        if (newVal?.name != props.value) {
-          props.handleOnChange(newVal?.name || '')
+        if (newVal?.value != props.value) {
+          props.handleOnChange(newVal?.value || '')
         }
       }}
     />

ui-admin/src/study/CreateNewCohortModal.tsx

@@ -29,7 +29,7 @@ export default function CreateNewCohortModal({ onDismiss }: {onDismiss: () => vo
     const response = await Api.exportEnrollees(
       selectedPortal.shortcode,
       selectedStudy.study.shortcode,
-      'live', { fileFormat: 'JSON', rowLimit: 0 })
+      'live', { fileFormat: 'JSON', rowLimit: 0, includeFields: [] })
     const result = await response.json()
     setParticipantFields(result)
   }, [selectedStudy], 'Failed to load cohort criteria options')

ui-admin/src/study/StudyEnvironmentRouter.tsx

@@ -332,7 +332,7 @@ export const studyEnvMailingListPath = (studyEnvParams: OptionalStudyEnvParams)
   if (!studyEnvParams.studyShortcode || !studyEnvParams.envName) {
     return `/${mailingListPath(studyEnvParams.portalShortcode, 'live')}`
   }
-  return `${baseStudyEnvPath(studyEnvParams)}/mailingList`
+  return `${baseStudyEnvPath(studyEnvParams as StudyEnvParams)}/mailingList`
 }
 
 export const studyEnvSiteContentPath = (studyEnvParams: StudyEnvParams) => {

ui-admin/src/study/families/FamilyRelations.tsx

@@ -126,7 +126,7 @@ export const FamilyRelations = ({
       }
 
       const enrollee = row.original.enrollee || family.members?.find(m => m.id === row.original.targetEnrolleeId)
-      return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={enrollee}/>
+      return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={enrollee!}/>
     }
   }, {
     header: 'Relation',
@@ -169,7 +169,7 @@ export const FamilyRelations = ({
       }
 
       const enrollee = row.original.targetEnrollee || family.members?.find(m => m.id === row.original.targetEnrolleeId)
-      return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={enrollee}/>
+      return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={enrollee!}/>
     }
   },
   {

ui-admin/src/study/families/FamilyStructureTable.tsx

@@ -34,7 +34,7 @@ import LoadingSpinner from 'util/LoadingSpinner'
 import { EnrolleeLink } from 'study/participants/enrolleeView/EnrolleeLink'
 
 type FamilyMemberWithSubrows = {
-  member: Enrollee,
+  member?: Enrollee,
   relationToParentRow?: EnrolleeRelation
   subrows: FamilyMemberWithSubrows[]
 }
@@ -74,15 +74,15 @@ export const FamilyStructureTable = (
       id: 'enrollee',
       header: 'Enrollee',
       cell: ({ row }) => {
-        return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={row.original.member}/>
+        return <EnrolleeLink studyEnvContext={studyEnvContext} enrollee={row.original.member!}/>
       }
     },
     {
       id: 'proxyRelation',
       header: 'Proxies',
       cell: ({ row }) => {
         return <ProxyList
-          member={row.original.member}
+          member={row.original.member!}
           family={family}
           studyEnvContext={studyEnvContext}/>
       }
@@ -108,7 +108,7 @@ export const FamilyStructureTable = (
     if (!isNil(parentRow)) {
       const parent = parentRow.original
       const relation = row.original.relationToParentRow?.familyRelationship
-      const subRowIdx = parent.subrows.findIndex(s => s.member.id === row.original.member.id)
+      const subRowIdx = parent.subrows.findIndex(s => s.member!.id === row.original.member!.id)
       const showHeader = (
         subRowIdx === 0 || parent.subrows[subRowIdx - 1].relationToParentRow?.familyRelationship != relation
       )
@@ -148,7 +148,7 @@ const groupFamilyMembersWithSubrows = (family: Family): FamilyMemberWithSubrows[
   // sort relations by number of parent relations
   // to ensure that parents are created before children
   const relations = (family.relations || []).sort(
-    (a, b) => getNumParentRelations(a, family) - getNumParentRelations(b, family)
+    (a, b) => getNumParentRelations(a.enrollee!, family) - getNumParentRelations(b.enrollee!, family)
   ).filter(r => {
     return family.members?.find(m => m.id === r.enrolleeId) && family.members?.find(m => m.id === r.targetEnrolleeId)
   })
@@ -195,7 +195,7 @@ const getNumParentRelations = (member: Enrollee, family: Family): number => {
 
 const findRowOrSubrow = (data: FamilyMemberWithSubrows[], id: string): FamilyMemberWithSubrows | undefined => {
   return data.find(d => {
-    if (d.member.id === id) {
+    if (d.member!.id === id) {
       return d
     }
     return findRowOrSubrow(d.subrows, id)
@@ -226,7 +226,7 @@ const ProxyList = ({ member, family, studyEnvContext }: {
       .filter(r => r.targetEnrolleeId === member.id && r.relationshipType === 'PROXY')
       .map(async r => {
         // see if the proxy is in the family, if so we already have it loaded
-        const familyProxy: Enrollee = family.members?.find(m => m.id === r.enrolleeId)
+        const familyProxy: Enrollee | undefined = family.members?.find(m => m.id === r.enrolleeId)
         if (!isNil(familyProxy)) {
           return Promise.resolve(familyProxy)
         }

ui-admin/src/study/families/ProbandEditor.tsx

@@ -29,7 +29,7 @@ export const ProbandEditor = (
     studyEnvContext: StudyEnvContextT,
     reloadFamily: () => void
   }) => {
-  const [proband, setProband] = React.useState<Enrollee>(family.proband)
+  const [proband, setProband] = React.useState<Enrollee>(family.proband!)
   const [editMode, setEditMode] = React.useState<boolean>(false)
   const [openSaveNewProbandModal, setOpenSaveNewProbandModal] = React.useState<boolean>(false)
 
@@ -56,7 +56,7 @@ export const ProbandEditor = (
           disabled={!editMode}
           selectedEnrollee={proband}
           studyEnvContext={studyEnvContext}
-          onEnrolleeSelected={newProband => setProband(newProband || family.proband)}
+          onEnrolleeSelected={newProband => setProband(newProband || family.proband!)}
           searchExpFilter={`{family.shortcode} = '${family.shortcode}'`}
         />
       </div>
@@ -67,7 +67,7 @@ export const ProbandEditor = (
         onClick={() => {
           setEditMode(!editMode)
           if (!editMode) {
-            setProband(family.proband)
+            setProband(family.proband!)
           }
         }}>
         <FontAwesomeIcon icon={faPencil} />
@@ -83,7 +83,7 @@ export const ProbandEditor = (
         <button
           className="btn btn-secondary"
           onClick={() => {
-            setProband(family.proband)
+            setProband(family.proband!)
             setEditMode(false)
           }}>
           <FontAwesomeIcon icon={faX}/>

ui-admin/src/study/kits/KitEnrolleeSelection.tsx

@@ -12,7 +12,7 @@ import {
   VisibilityState
 } from '@tanstack/react-table'
 
-import Api from 'api/api'
+import Api, { ParticipantTask } from 'api/api'
 import { StudyEnvContextT } from 'study/StudyEnvironmentRouter'
 import {
   basicTableLayout,
@@ -60,7 +60,7 @@ export default function KitEnrolleeSelection({ studyEnvContext }: { studyEnvCont
     const enrolleeRows = enrollees.map(enrollee => {
       const taskCompletionStatus = _mapValues(
         _keyBy(enrollee.participantTasks, task => task.targetStableId),
-        task => task.status === 'COMPLETE'
+        task => (task as ParticipantTask).status === 'COMPLETE'
       )
 
       return { ...enrollee, taskCompletionStatus }

ui-admin/src/study/notifications/TriggerList.test.tsx

@@ -12,19 +12,19 @@ import {
 } from 'test-utils/mocking-utils'
 import TriggerList from './TriggerList'
 import { userEvent } from '@testing-library/user-event'
-import Api from 'api/api'
+import Api, { Trigger } from 'api/api'
 import { ReactNotifications } from 'react-notifications-component'
 import { setupRouterTest } from '@juniper/ui-core'
 
 test('renders routable trigger list', async () => {
   const studyEnvContext = mockStudyEnvContext()
-  const enrollEmailConfig = {
+  const enrollEmailConfig: Trigger = {
     ...mockTrigger(),
     id: 'event1',
     triggerType: 'EVENT',
     eventType: 'STUDY_ENROLLMENT'
   }
-  const triggers = [
+  const triggers: Trigger[] = [
     enrollEmailConfig,
     {
       ...mockTrigger(),
@@ -61,13 +61,13 @@ test('renders routable trigger list', async () => {
 
 test('allows deletion of notification config', async () => {
   const studyEnvContext = mockStudyEnvContext()
-  const consentConfig = {
+  const consentConfig: Trigger = {
     ...mockTrigger(),
     id: 'reminder1',
     triggerType: 'TASK_REMINDER',
     taskType: 'CONSENT'
   }
-  const notificationConfigs = [
+  const notificationConfigs: Trigger[] = [
     {
       ...mockTrigger(),
       id: 'event1',