@abgov/jsonforms-components 1.36.1 → 1.37.0

package/index.esm.js

@@ -7927,29 +7927,37 @@ const AddressLookUpControl = props => {
   });
 };
 
-const isAddressSchema = obj => {
+const isPropertiesMatch = (obj, props, isExactMatch) => {
   if (isObject$e(obj)) {
     const keys = Object.keys(obj);
-    return ['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode'].every(attr => keys.includes(attr));
+    if (isExactMatch) {
+      return props.every(attr => keys.includes(attr)) && keys.length === props.length;
+    } else {
+      return props.every(attr => keys.includes(attr));
+    }
   }
   return false;
 };
-const isAddressLookup = (uischema, schema, context) => {
-  if (!isControl(uischema) || !isScoped(uischema)) {
-    return false;
-  }
-  if ((schema === null || schema === void 0 ? void 0 : schema.properties) && isObject$e(schema === null || schema === void 0 ? void 0 : schema.properties)) {
-    const propertyFromScope = uischema['scope'].split('/').pop();
-    if (isObject$e(schema.properties[propertyFromScope]) && 'properties' in schema.properties[propertyFromScope]) {
-      const objToTest = schema.properties[propertyFromScope]['properties'];
-      if (objToTest && isAddressSchema(objToTest)) {
-        return true;
+const createSchemaMatchTester = (props, isExactMatch = false) => {
+  return (uischema, schema, context) => {
+    if (!isControl(uischema) || !isScoped(uischema)) {
+      return false;
+    }
+    if ((schema === null || schema === void 0 ? void 0 : schema.properties) && isObject$e(schema === null || schema === void 0 ? void 0 : schema.properties)) {
+      const propertyFromScope = uischema['scope'].split('/').pop();
+      if (isObject$e(schema.properties[propertyFromScope]) && 'properties' in schema.properties[propertyFromScope]) {
+        const objToTest = schema.properties[propertyFromScope]['properties'];
+        if (objToTest && isPropertiesMatch(objToTest, props, isExactMatch)) {
+          return true;
+        }
       }
     }
-  }
-  return false;
+    return false;
+  };
 };
-const AddressLookUpTester = rankWith(3, isAddressLookup);
+
+const isAddressLookup = createSchemaMatchTester(['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode']);
+const AddressLookUpTester = rankWith(4, isAddressLookup);
 
 const GoATextCell = props => jsx(GoAInputText, Object.assign({}, props));
 const GoATextCellTester = rankWith(1, isStringControl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.36.1",
+  "version": "1.37.0",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",

package/src/lib/Controls/AddressLookup/AddressLookupTester.d.ts

@@ -1,3 +1,3 @@
-import { RankedTester, UISchemaElement, JsonSchema, TesterContext } from '@jsonforms/core';
-export declare const isAddressLookup: (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) => boolean;
+import { RankedTester } from '@jsonforms/core';
+export declare const isAddressLookup: import("@jsonforms/core").Tester;
 export declare const AddressLookUpTester: RankedTester;

package/src/lib/common/tester.d.ts

@@ -0,0 +1,3 @@
+import { Tester, RankedTester } from '@jsonforms/core';
+export declare const createSchemaMatchTester: (props: string[], isExactMatch?: boolean) => Tester;
+export declare const createSchemaMatchRankedTester: (props: string[], isExactMatch?: boolean) => RankedTester;