@openmrs/esm-form-engine-lib 3.1.3-pre.1729 → 3.1.3-pre.1738

package/.eslintrc

@@ -8,9 +8,10 @@
     "project": true,
     "tsconfigRootDir": "__dirname"
   },
-  "plugins": ["@typescript-eslint", "react-hooks"],
+  "plugins": ["@typescript-eslint", "import", "react-hooks"],
   "root": true,
   "rules": {
+    "import/no-duplicates": "error",
     "react-hooks/rules-of-hooks": "error",
     "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/no-explicit-any": "off",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "3.1.3-pre.1729",
+  "version": "3.1.3-pre.1738",
   "description": "React Form Engine for O3",
   "browser": "dist/openmrs-esm-form-engine-lib.js",
   "main": "src/index.ts",
@@ -70,6 +70,7 @@
     "css-loader": "^6.11.0",
     "dayjs": "^1.11.11",
     "eslint": "^8.57.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react-hooks": "^4.6.2",
     "fork-ts-checker-webpack-plugin": "^6.5.3",

package/src/adapters/encounter-diagnosis-adapter.ts

@@ -1,7 +1,12 @@
 import { type OpenmrsResource } from '@openmrs/esm-framework';
-import { type OpenmrsObs, type FormFieldValueAdapter, type FormProcessorContextProps } from '../types';
+import {
+  type OpenmrsObs,
+  type FormFieldValueAdapter,
+  type FormProcessorContextProps,
+  type OpenmrsEncounter,
+  type FormField,
+} from '../types';
 import { type FormContextProps } from '../provider/form-provider';
-import { type OpenmrsEncounter, type FormField } from '../types';
 import { gracefullySetSubmission } from '../utils/common-utils';
 import { isEmpty } from '../validators/form-validator';
 import { isTrue } from '../utils/boolean-utils';

package/src/datasources/select-concept-answers-datasource.ts

@@ -1,15 +1,25 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { openmrsFetch, OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
 import { BaseOpenMRSDataSource } from './data-source';
 
 export class SelectConceptAnswersDatasource extends BaseOpenMRSDataSource {
   constructor() {
-    super(`${restBaseUrl}/concept/conceptUuid?v=custom:(uuid,setMembers:(uuid,display),answers:(uuid,display))`);
+    super(
+      `${restBaseUrl}/concept/:conceptUuid?v=custom:(uuid,display,setMembers:(uuid,display),answers:(uuid,display))`,
+    );
+  }
+
+  fetchSingleItem(uuid: string): Promise<OpenmrsResource | null> {
+    return openmrsFetch(this.buildUrl(uuid)).then(({ data }) => data);
   }
 
   fetchData(searchTerm: string, config?: Record<string, any>): Promise<any[]> {
-    const apiUrl = this.url.replace('conceptUuid', config.referencedValue || config.concept);
+    const apiUrl = this.buildUrl(config.referencedValue || config.concept);
     return openmrsFetch(apiUrl).then(({ data }) => {
       return data['setMembers'].length ? data['setMembers'] : data['answers'];
     });
   }
+
+  private buildUrl(conceptUuid: string): string {
+    return this.url.replace(':conceptUuid', conceptUuid);
+  }
 }

package/src/hooks/useFormFieldValueAdapters.ts

@@ -1,6 +1,5 @@
 import { useState, useEffect } from 'react';
-import { type FormField } from '../types';
-import { type FormFieldValueAdapter } from '../types';
+import { type FormField, type FormFieldValueAdapter } from '../types';
 import { getRegisteredFieldValueAdapter } from '../registry/registry';
 
 export const useFormFieldValueAdapters = (fields: FormField[]) => {

package/src/processors/form-processor.ts

@@ -1,7 +1,6 @@
 import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { type FormContextProps } from '../provider/form-provider';
-import { type ValueAndDisplay, type FormField, type FormSchema } from '../types';
-import { type FormProcessorContextProps } from '../types';
+import { type ValueAndDisplay, type FormField, type FormSchema, type FormProcessorContextProps } from '../types';
 
 export type FormProcessorConstructor = new (...args: ConstructorParameters<typeof FormProcessor>) => FormProcessor;