(fix): Add min and max values to the JSON schema

package.json

@@ -116,9 +116,5 @@
     "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
     "*.{css,scss,ts,tsx}": "prettier --write --list-different"
   },
-  "packageManager": "[email protected]",
-  "resolutions": {
-    "@openmrs/openmrs-form-engine-lib": "portal:/Users/denniskigen/Code/openmrs/openmrs-form-engine-lib",
-    "@carbon/react": ">1.47.0 <1.50.0"
-  }
+  "packageManager": "[email protected]"
 }

src/components/interactive-builder/add-question.modal.tsx

@@ -217,6 +217,8 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
           datePickerType && { datePickerFormat: datePickerType }),
         questionOptions: {
           rendering: renderingType,
+          ...(min && { min }),
+          ...(max && { max }),
           ...(selectedConcept && { concept: selectedConcept?.uuid }),
           ...(conceptMappings.length && { conceptMappings }),
           ...(selectedAnswers.length && {
@@ -476,13 +478,25 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
                         id="min"
                         labelText="Min"
                         value={min || ''}
+                        invalid={parseInt(min) > parseInt(max)}
+                        invalidText={
+                          parseInt(min) > parseInt(max)
+                            ? t('invalidMinMax', 'Min value cannot be greater than max')
+                            : ''
+                        }
                         onChange={(event: React.ChangeEvent<HTMLInputElement>) => setMin(event.target.value)}
                         required
                       />
                       <TextInput
                         id="max"
                         labelText="Max"
                         value={max || ''}
+                        invalid={parseInt(min) > parseInt(max)}
+                        invalidText={
+                          parseInt(min) > parseInt(max)
+                            ? t('invalidMinMax', 'Min value cannot be greater than max')
+                            : ''
+                        }
                         onChange={(event: React.ChangeEvent<HTMLInputElement>) => setMax(event.target.value)}
                         required
                       />

src/components/interactive-builder/edit-question.modal.tsx

@@ -101,8 +101,8 @@ const EditQuestionModal: React.FC<EditQuestionModalProps> = ({
   const [patientIdentifierTypeToLookup, setPatientIdentifierTypeToLookup] = useState('');
   const [fieldType, setFieldType] = useState<RenderType | null>(questionToEdit.questionOptions.rendering);
   const [isQuestionRequired, setIsQuestionRequired] = useState(false);
-  const [max, setMax] = useState('');
-  const [min, setMin] = useState('');
+  const [max, setMax] = useState(questionToEdit.questionOptions.max ?? '');
+  const [min, setMin] = useState(questionToEdit.questionOptions.min ?? '');
   const [questionId, setQuestionId] = useState('');
   const [questionLabel, setQuestionLabel] = useState('');
   const [questionType, setQuestionType] = useState<QuestionType | null>(null);
@@ -277,6 +277,8 @@ const EditQuestionModal: React.FC<EditQuestionModalProps> = ({
         }),
         questionOptions: {
           rendering: fieldType ? fieldType : questionToEdit.questionOptions.rendering,
+          ...(min && { min }),
+          ...(max && { max }),
           ...((selectedConcept || questionToEdit.questionOptions.concept) && {
             concept: selectedConcept ? selectedConcept.uuid : questionToEdit.questionOptions.concept,
             conceptMappings: conceptMappings?.length ? conceptMappings : questionToEdit.questionOptions.conceptMappings,
@@ -444,13 +446,21 @@ const EditQuestionModal: React.FC<EditQuestionModalProps> = ({
                   id="min"
                   labelText="Min"
                   value={min || ''}
+                  invalid={parseInt(min) > parseInt(max)}
+                  invalidText={
+                    parseInt(min) > parseInt(max) ? t('invalidMinMax', 'Min value cannot be greater than max') : ''
+                  }
                   onChange={(event: React.ChangeEvent<HTMLInputElement>) => setMin(event.target.value)}
                   required
                 />
                 <TextInput
                   id="max"
                   labelText="Max"
                   value={max || ''}
+                  invalid={parseInt(min) > parseInt(max)}
+                  invalidText={
+                    parseInt(min) > parseInt(max) ? t('invalidMinMax', 'Min value cannot be greater than max') : ''
+                  }
                   onChange={(event: React.ChangeEvent<HTMLInputElement>) => setMax(event.target.value)}
                   required
                 />

translations/en.json

@@ -111,6 +111,7 @@
   "inputDummySchema": "Input dummy schema",
   "interactiveBuilder": "Interactive Builder",
   "interactiveBuilderHelperText": "The Interactive Builder lets you build your form schema without writing JSON code. The Preview tab automatically updates as you build your form. When done, click Save Form to save your form.",
+  "invalidMinMax": "Min value cannot be greater than max",
   "invalidVersionWarning": "Version can only start with with a number",
   "isQuestionRequiredOrOptional": "Is this question a required or optional field? Required fields must be answered before the form can be submitted.",
   "labelPlaceholder": "e.g. Type of Anaesthesia",