@abgov/jsonforms-components 1.35.5 → 1.36.0

package/index.esm.js

@@ -4,9 +4,9 @@ import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputD
 import styled from 'styled-components';
 import axios from 'axios';
 import get$1 from 'lodash/get';
-import { rankWith, isStringControl, and, optionIs, uiTypeIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, getAjv, isVisible, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, isObjectControl, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
+import { rankWith, isStringControl, and, optionIs, uiTypeIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, getAjv, isVisible, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, isControl, isScoped, hasType, isCategorization, isLayout } from '@jsonforms/core';
 import { withJsonFormsControlProps, withJsonFormsRendererProps, withJsonFormsEnumProps, withTranslateProps, useJsonForms, JsonFormsDispatch, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
-import { isEqual } from 'lodash';
+import { isEqual, isObject as isObject$e } from 'lodash';
 import merge from 'lodash/merge';
 import isEmpty$1 from 'lodash/isEmpty';
 import range from 'lodash/range';
@@ -7718,7 +7718,7 @@ const AddressLookUpControl = props => {
     setErrors({});
   };
   const handleRequiredFieldBlur = name => {
-    if ((!(data === null || data === void 0 ? void 0 : data[name]) || (data === null || data === void 0 ? void 0 : data[name]) === '') && requiredFields.includes(name)) {
+    if ((!(data === null || data === void 0 ? void 0 : data[name]) || (data === null || data === void 0 ? void 0 : data[name]) === '') && (requiredFields === null || requiredFields === void 0 ? void 0 : requiredFields.includes(name))) {
       const err = Object.assign({}, errors);
       err[name] = name === 'municipality' ? `city is required` : `${name} is required`;
       setErrors(err);
@@ -7765,7 +7765,29 @@ const AddressLookUpControl = props => {
   });
 };
 
-const AddressLookUpTester = rankWith(3, isObjectControl);
+const isAddressSchema = obj => {
+  if (isObject$e(obj)) {
+    const keys = Object.keys(obj);
+    return ['addressLine2', 'municipality', 'addressLine1', 'subdivisionCode', 'postalCode'].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;
+      }
+    }
+  }
+  return false;
+};
+const AddressLookUpTester = rankWith(3, 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.35.5",
+  "version": "1.36.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,2 +1,3 @@
-import { RankedTester } from '@jsonforms/core';
+import { RankedTester, UISchemaElement, JsonSchema, TesterContext } from '@jsonforms/core';
+export declare const isAddressLookup: (uischema: UISchemaElement, schema: JsonSchema, context: TesterContext) => boolean;
 export declare const AddressLookUpTester: RankedTester;