Merge branch 'master' into 1223-fix-active-path

onaio · Jul 4, 2023 · 17e0820 · 17e0820
2 parents d0667b8 + c6bc48c
commit 17e0820
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/packages/fhir-location-management/src/components/LocationForm/index.tsx b/packages/fhir-location-management/src/components/LocationForm/index.tsx
@@ -233,6 +233,7 @@ const LocationForm = (props: LocationFormProps) => {
         <FormItem
           hidden={isHidden('isJurisdiction')}
           label={t('Physical type')}
+          name="isJurisdiction"
           id="isJurisdiction"
           rules={validationRules.isJurisdiction}
         >

diff --git a/...r-location-management/src/components/LocationForm/tests/__snapshots__/index.test.tsx.snap b/...r-location-management/src/components/LocationForm/tests/__snapshots__/index.test.tsx.snap
@@ -71,7 +71,7 @@ exports[`LocationForm renders correctly: description label 1`] = `
 exports[`LocationForm renders correctly: isJurisdiction field 1`] = `
 Array [
   <input
-    checked={false}
+    checked={true}
     className="ant-radio-input"
     disabled={false}
     onChange={[Function]}
@@ -92,6 +92,7 @@ Array [
 exports[`LocationForm renders correctly: isJurisdiction label 1`] = `
 <label
   className=""
+  htmlFor="location-form_isJurisdiction"
   title="Physical type"
 >
   Physical type
@@ -125,7 +126,35 @@ exports[`LocationForm renders correctly: name label 1`] = `
 </label>
 `;
 
-exports[`LocationForm renders correctly: parentId field 1`] = `null`;
+exports[`LocationForm renders correctly: parentId field 1`] = `
+<input
+  aria-autocomplete="list"
+  aria-controls="location-form_parentId_list"
+  aria-expanded={false}
+  aria-haspopup="listbox"
+  aria-owns="location-form_parentId_list"
+  autoComplete="off"
+  className="ant-select-selection-search-input"
+  disabled={false}
+  id="location-form_parentId"
+  onChange={[Function]}
+  onCompositionEnd={[Function]}
+  onCompositionStart={[Function]}
+  onKeyDown={[Function]}
+  onMouseDown={[Function]}
+  onPaste={[Function]}
+  readOnly={true}
+  role="combobox"
+  style={
+    Object {
+      "opacity": 0,
+    }
+  }
+  type="search"
+  unselectable="on"
+  value=""
+/>
+`;
 
 exports[`LocationForm renders correctly: parentId label 1`] = `
 <label

diff --git a/packages/fhir-location-management/src/components/LocationForm/tests/index.test.tsx b/packages/fhir-location-management/src/components/LocationForm/tests/index.test.tsx
@@ -106,7 +106,7 @@ describe('LocationForm', () => {
     });
 
     expect(toJson(wrapper.find('#parentId label'))).toMatchSnapshot('parentId label');
-    expect(toJson(wrapper.find('#parentId select'))).toMatchSnapshot('parentId field');
+    expect(toJson(wrapper.find('#parentId input'))).toMatchSnapshot('parentId field');
 
     expect(toJson(wrapper.find('#name label'))).toMatchSnapshot('name label');
     expect(toJson(wrapper.find('#name input'))).toMatchSnapshot('name field');