code review

Author: NethmiRodrigo

src/components/interactive-builder/modals/question/question-form/question/question.component.tsx

@@ -97,7 +97,9 @@ const Question: React.FC<QuestionProps> = ({ checkIfQuestionIdExists }) => {
         {!formField.questionOptions?.rendering && (
           <SelectItem text={t('chooseRenderingType', 'Choose a rendering type')} value="" />
         )}
-        {formField.type && formField.type !== 'obs' && questionTypes.includes(formField.type)
+        {formField.type &&
+        formField.type !== 'obs' &&
+        questionTypes.includes(formField.type as keyof typeof renderTypeOptions)
           ? renderTypeOptions[formField?.type].map((type, key) => (
               <SelectItem key={`${type}-${key}`} text={type} value={type} />
             ))

src/constants.ts

@@ -11,7 +11,9 @@ export const questionTypes = [
   'patientIdentifier',
   'testOrder',
   'programState',
-];
+] as const;
+
+export type QuestionType = (typeof questionTypes)[number];
 
 export const renderingTypes: Array<RenderType> = [
   'checkbox',
@@ -41,7 +43,7 @@ export const renderingTypes: Array<RenderType> = [
   'select-concept-answers',
 ];
 
-export const renderTypeOptions: Record<string, Array<RenderType>> = {
+export const renderTypeOptions: Record<Exclude<QuestionType, 'obs'>, Array<RenderType>> = {
   control: ['text', 'markdown'],
   encounterDatetime: ['date', 'datetime'],
   encounterLocation: ['ui-select-extended'],

src/types.ts

@@ -8,6 +8,7 @@ import type {
   RequiredFieldProps,
 } from '@openmrs/esm-form-engine-lib';
 import type { AuditInfo } from './components/audit-details/audit-details.component';
+import type { questionTypes } from '@constants';
 
 export interface Form {
   uuid: string;
@@ -44,19 +45,7 @@ export interface Resource {
   valueReference: string;
 }
 
-export type QuestionType =
-  | 'complex-obs'
-  | 'control'
-  | 'encounterDatetime'
-  | 'encounterLocation'
-  | 'encounterProvider'
-  | 'encounterRole'
-  | 'obs'
-  | 'obsGroup'
-  | 'patientIdentifier'
-  | 'personAttribute'
-  | 'testOrder'
-  | 'programState';
+export type QuestionType = (typeof questionTypes)[number];
 
 export type DatePickerType = 'both' | 'calendar' | 'timer';