@abgov/jsonforms-components 1.55.1 → 1.56.1

package/index.esm.js

@@ -4458,8 +4458,6 @@ const GoAInputText = props => {
         if (schema && schema.title === sinTitle && value !== '') {
           formattedValue = formatSin(value);
         }
-        /* TODO: add the unit test, when the solution is used */
-        /* istanbul ignore next */
         if (isVisited === false && setIsVisited) {
           setIsVisited();
         }
@@ -4470,11 +4468,9 @@ const GoAInputText = props => {
         });
       },
       onBlur: (name, value) => {
-        /* istanbul ignore next */
         if (isVisited === false && setIsVisited) {
           setIsVisited();
         }
-        /* istanbul ignore next */
         onBlurForTextControl({
           name,
           controlProps: props,
@@ -4528,8 +4524,6 @@ const MultiLineText = props => {
     // maxCount={schema.maxLength || 256}
     onKeyPress: (name, value, key) => {
       const newValue = autoCapitalize ? value.toUpperCase() : value;
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4548,8 +4542,6 @@ const MultiLineText = props => {
       });
     },
     onChange: (name, value) => {
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4642,8 +4634,6 @@ const GoADateInput = props => {
     disabled: !enabled,
     readonly: readOnly,
     onChange: (name, value) => {
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4662,11 +4652,9 @@ const GoADateInput = props => {
       });
     },
     onBlur: (name, value) => {
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
-      /* istanbul ignore next */
       onBlurForDateControl({
         name,
         value,
@@ -4719,11 +4707,9 @@ const GoANumberInput = props => {
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
     onBlur: (name, value) => {
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
-      /* istanbul ignore next */
       onBlurForNumericControl({
         name,
         value,
@@ -4731,8 +4717,6 @@ const GoANumberInput = props => {
       });
     },
     onChange: (name, value) => {
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4787,10 +4771,7 @@ const GoAInputInteger = props => {
     placeholder: placeholder,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
-    /* istanbul ignore next */
     onBlur: (name, value) => {
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4801,8 +4782,6 @@ const GoAInputInteger = props => {
       });
     },
     onChange: (name, value) => {
-      /* TODO: add the unit test, when the solution is used */
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
@@ -4822,7 +4801,6 @@ const GoAInputIntegerControl = withJsonFormsControlProps(GoAIntegerControl);
 
 const GoADateTimeInput = props => {
   var _a, _b, _c, _d, _e, _f, _g;
-  // eslint-disable-next-line
   const {
     data,
     config,
@@ -4865,11 +4843,9 @@ const GoADateTimeInput = props => {
       });
     },
     onBlur: (name, value) => {
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
-      /* istanbul ignore next */
       onBlurForDateControl({
         name,
         value,
@@ -4915,16 +4891,11 @@ const GoATimeInput = props => {
     readonly: readOnly,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
     onBlur: (name, value) => {
-      /* istanbul ignore next */
       if (isVisited === false && setIsVisited) {
         setIsVisited();
       }
-      /* istanbul ignore next */
       handleChange(path, value === '' ? undefined : value);
     },
-    // Dont use handleChange in the onChange event, use the keyPress or onBlur.
-    // If you use it onChange along with keyPress event it will cause a
-    // side effect that causes the validation to render when it shouldnt.
     onChange: (name, value) => {},
     onKeyPress: (name, value, key) => {
       onKeyPressForTimeControl({
@@ -6498,12 +6469,15 @@ const FormPagesView = props => {
                     disabled: !(category.isValid && category.isCompleted),
                     testId: "pages-save-continue-btn",
                     children: "Save and continue"
-                  }) : jsx(GoAButton, {
-                    type: 'primary',
-                    onClick: handleSubmit,
-                    disabled: !isValid,
-                    testId: "pages-submit-btn",
-                    children: "Submit"
+                  }) : jsx(GoAButtonGroup, {
+                    alignment: "end",
+                    children: jsx(GoAButton, {
+                      type: 'primary',
+                      onClick: handleSubmit,
+                      disabled: !isValid,
+                      testId: "pages-submit-btn",
+                      children: "Submit"
+                    })
                   })
                 })]
               }, `${category.label}`);
@@ -6549,8 +6523,8 @@ const categoriesAreValid = uischema => {
   return isValid;
 };
 const CategorizationStepperRendererTester = rankWith(2, and(uiTypeIs('Categorization'), categoriesAreValid, uischema => {
-  var _a;
-  return ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.variant) === 'stepper';
+  var _a, _b;
+  return ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.variant) === 'stepper' || ((_b = uischema.options) === null || _b === void 0 ? void 0 : _b.variant) === undefined;
 }));
 const CategorizationPagesRendererTester = rankWith(2, and(uiTypeIs('Categorization'), categoriesAreValid, uischema => {
   var _a;
@@ -8769,11 +8743,7 @@ const AddressLookUpControl = props => {
   const [open, setOpen] = useState(false);
   const label = typeof (uischema === null || uischema === void 0 ? void 0 : uischema.label) === 'string' && uischema.label ? uischema.label : '';
   const defaultAddress = {
-    addressLine1: '',
-    addressLine2: '',
-    municipality: '',
     subdivisionCode: isAlbertaAddress ? 'AB' : '',
-    postalCode: '',
     country: 'CA'
   };
   const [address, setAddress] = useState(data || defaultAddress);
@@ -8810,6 +8780,9 @@ const AddressLookUpControl = props => {
       });
       delete errors[field];
     }
+    if (value === '' && field in newAddress) {
+      delete newAddress[field];
+    }
     setAddress(newAddress);
     updateFormData(newAddress);
   };
@@ -8976,7 +8949,7 @@ const AddressViews = ({
   data,
   isAlbertaAddress
 }) => {
-  var _a, _b, _c, _d;
+  var _a;
   const provinces = [{
     value: 'AB',
     label: 'Alberta'
@@ -9030,7 +9003,7 @@ const AddressViews = ({
         gap: "s",
         children: [jsx(GoAFormItem, {
           label: "Address line 1",
-          error: ((_a = data === null || data === void 0 ? void 0 : data.addressLine1) === null || _a === void 0 ? void 0 : _a.length) === 0 ? 'addressLine1 is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.addressLine1) === undefined ? 'addressLine1 is required' : '',
           children: jsx(TextWrap, {
             children: data === null || data === void 0 ? void 0 : data.addressLine1
           })
@@ -9044,13 +9017,13 @@ const AddressViews = ({
         minChildWidth: "0ch",
         gap: "s",
         children: [jsx(GoAFormItem, {
-          error: ((_b = data === null || data === void 0 ? void 0 : data.municipality) === null || _b === void 0 ? void 0 : _b.length) === 0 ? 'city is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.municipality) === undefined ? 'city is required' : '',
           label: "City",
           children: jsx(TextWrap, {
             children: data === null || data === void 0 ? void 0 : data.municipality
           })
         }), jsx(GoAFormItem, {
-          error: ((_c = data === null || data === void 0 ? void 0 : data.postalCode) === null || _c === void 0 ? void 0 : _c.length) === 0 ? 'postalCode is required' : '',
+          error: (data === null || data === void 0 ? void 0 : data.postalCode) === undefined ? 'postalCode is required' : '',
           label: "Postal Code",
           children: jsx(TextWrap, {
             children: data === null || data === void 0 ? void 0 : data.postalCode
@@ -9066,7 +9039,7 @@ const AddressViews = ({
             children: "Alberta"
           }), !isAlbertaAddress && jsx("div", {
             "data-testid": "address-form-province-view",
-            children: (_d = provinces.find(p => p.value === (data === null || data === void 0 ? void 0 : data.subdivisionCode))) === null || _d === void 0 ? void 0 : _d.label
+            children: (_a = provinces.find(p => p.value === (data === null || data === void 0 ? void 0 : data.subdivisionCode))) === null || _a === void 0 ? void 0 : _a.label
           })]
         }), jsx(GoAFormItem, {
           label: "Country",
@@ -9704,14 +9677,10 @@ const hasElements = schema => {
 const isEmptyElements = schema => {
   return 'elements' in schema && schema.elements !== undefined && schema.elements !== null && Object.keys(schema.elements).length === 0;
 };
-const hasVariant = schema => {
-  return 'options' in schema && schema.options !== undefined && schema.options !== null;
-};
 
 const errCategorizationHasNonCategories = "Each element of 'Categorizations' must be of type 'Category'";
 const errCategorizationHasNoElements = 'A Categorization must contain Categories.';
 const errNoElements = type => `A ${type} must contain elements.`;
-const errCategorizationHasNoVariant = 'A Categorization must contain Options with a variant.';
 const errMissingScope = 'A Control must have a scope';
 const errMalformedScope = scope => `Scope ${scope} must be prefixed with '#/'.`;
 const errUnknownScope = scope => `Failed to render: unknown scope ${scope}`;
@@ -9756,9 +9725,6 @@ const getUISchemaErrors = (uiSchema, schema) => {
     if (!hasElements(uiSchema)) {
       return errCategorizationHasNoElements;
     }
-    if (!hasVariant(uiSchema)) {
-      return errCategorizationHasNoVariant;
-    }
     // ensure each element has type Category, and that each category
     // has elements
     if (isLayout(uiSchema)) {
@@ -9840,8 +9806,9 @@ const createDefaultAjv = (...schemas) => {
   });
   ajv.addSchema(schemas);
   addErrors(ajv);
-  ajv.addFormat('file-urn', /^urn:ads:platform:file-service:v[0-9]:\/files\/[a-zA-Z0-9.-]*$/);
   addFormats(ajv);
+  ajv.addFormat('file-urn', /^urn:ads:platform:file-service:v[0-9]:\/files\/[a-zA-Z0-9.-]*$/);
+  ajv.addFormat('time', /^([01]\d|2[0-3]):[0-5]\d(:[0-5]\d)?$/);
   return ajv;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.55.1",
+  "version": "1.56.1",
   "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/ErrorHandling/schemaValidation.d.ts

@@ -2,7 +2,6 @@ import { JsonSchema, UISchemaElement } from '@jsonforms/core';
 export declare const errCategorizationHasNonCategories = "Each element of 'Categorizations' must be of type 'Category'";
 export declare const errCategorizationHasNoElements = "A Categorization must contain Categories.";
 export declare const errNoElements: (type: string) => string;
-export declare const errCategorizationHasNoVariant = "A Categorization must contain Options with a variant.";
 export declare const errMissingScope = "A Control must have a scope";
 export declare const errMalformedScope: (scope: string) => string;
 export declare const errUnknownScope: (scope: string) => string;