@abgov/jsonforms-components 1.31.1 → 1.32.1

package/index.esm.js

@@ -3469,7 +3469,7 @@ const JsonFormRegisterProvider = ({
         return [];
       },
       fetchErrors: criteria => {
-        var _a;
+        var _a, _b;
         if (criteria === null || criteria === void 0 ? void 0 : criteria.url) {
           const matchFound = registers === null || registers === void 0 ? void 0 : registers.registerData.some(listItem => {
             var _a;
@@ -3480,7 +3480,7 @@ const JsonFormRegisterProvider = ({
           });
           return matchFound ? '' : `${((_a = registers.errors[criteria === null || criteria === void 0 ? void 0 : criteria.url]) === null || _a === void 0 ? void 0 : _a.message) || ''}`;
         } else if (criteria === null || criteria === void 0 ? void 0 : criteria.urn) {
-          if (registers === null || registers === void 0 ? void 0 : registers.nonExistent) {
+          if (((_b = registers === null || registers === void 0 ? void 0 : registers.nonExistent) === null || _b === void 0 ? void 0 : _b.length) > 0) {
             const matchFound = registers === null || registers === void 0 ? void 0 : registers.nonExistent.some(listItem => {
               var _a;
               if ((_a = criteria === null || criteria === void 0 ? void 0 : criteria.urn) === null || _a === void 0 ? void 0 : _a.toString().includes(listItem)) {
@@ -4869,7 +4869,7 @@ class ContextProviderClass {
       this.enumValues.set(key, () => data);
     };
     this.setup = props => {
-      var _a, _b, _c;
+      var _a, _b;
       this.selfProps = props;
       if (props.fileManagement) {
         const {
@@ -4892,17 +4892,17 @@ class ContextProviderClass {
       }
       if (props.data) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (_a = props.data) === null || _a === void 0 ? void 0 : _a.forEach(item => {
-          this.enumValues.set(Object.keys(item)[0], () => item);
+        Object.keys(props.data).forEach(item => {
+          this.enumValues.set(item, () => props.data[item]);
         });
       }
       if (!props.children) {
         return null;
       }
-      this.baseEnumerator.isFormSubmitted = (_b = props.isFormSubmitted) !== null && _b !== void 0 ? _b : false;
+      this.baseEnumerator.isFormSubmitted = (_a = props.isFormSubmitted) !== null && _a !== void 0 ? _a : false;
       return jsx(JsonFormContext.Provider, {
         value: this.baseEnumerator,
-        children: (_c = this.selfProps) === null || _c === void 0 ? void 0 : _c.children
+        children: (_b = this.selfProps) === null || _b === void 0 ? void 0 : _b.children
       });
     };
     this.getContextProvider = () => {
@@ -4925,8 +4925,6 @@ class ContextProviderClass {
      * Grabs data stored under a given key
      *
      */
-    // FIXME give some clue as to what data is being fetched.
-    // e.g.is it getFormContextData?
     this.getFormContextData = key => {
       const dataFunction = this.baseEnumerator.data.get(key);
       return dataFunction && dataFunction();
@@ -5321,7 +5319,7 @@ const categoriesAreValid = uischema => {
   }
   return isValid;
 };
-const CategorizationRendererTester = rankWith(2, and(uiTypeIs('Categorization'), categoriesAreValid, optionIs('variant', 'stepper')));
+const CategorizationRendererTester = rankWith(2, and(uiTypeIs('Categorization'), categoriesAreValid));
 
 let _$3 = t => t,
   _t$3;
@@ -5412,6 +5410,7 @@ const FileUploader = _a => {
   const fileListValue = enumerators.data.get('file-list');
   const countries = ['Argentina', 'Brazil', 'Canada', 'Denmark', 'Egypt', 'France', 'Greece', 'India', 'Japan', 'Kenya'];
   enumerators.addFormContextData('countries', countries);
+  const user = enumerators === null || enumerators === void 0 ? void 0 : enumerators.getFormContextData('user');
   // eslint-disable-next-line
   const fileList = fileListValue && fileListValue();
   const {
@@ -5460,7 +5459,7 @@ const FileUploader = _a => {
     const timeoutId = setTimeout(delayedFunction, 1);
     return () => clearTimeout(timeoutId);
   }, [handleChange, fileList, propertyId]);
-  const readOnly = ((_d = (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.componentProps) === null || _d === void 0 ? void 0 : _d.readOnly) === true || (props === null || props === void 0 ? void 0 : props.isStepperReview) === true;
+  const readOnly = ((_d = (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.componentProps) === null || _d === void 0 ? void 0 : _d.readOnly) === true || (props === null || props === void 0 ? void 0 : props.isStepperReview) === true || user === null;
   const maxFileSize = (_g = (_f = (_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.componentProps) === null || _f === void 0 ? void 0 : _f.maxFileSize) !== null && _g !== void 0 ? _g : '';
   const accept = (_k = (_j = (_h = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _h === void 0 ? void 0 : _h.componentProps) === null || _j === void 0 ? void 0 : _j.accept) !== null && _k !== void 0 ? _k : '';
   return jsxs(FileUploaderStyle, {
@@ -6603,7 +6602,8 @@ const GoAGroupControlComponent = props => {
     enabled,
     renderers,
     cells,
-    visible
+    visible,
+    isStepperReview
   } = props;
   const group = uischema;
   return jsxs(Visible, {
@@ -6627,7 +6627,9 @@ const GoAGroupControlComponent = props => {
     }), !((_o = group.options) === null || _o === void 0 ? void 0 : _o.componentProps) && jsxs("div", {
       children: [group.label && jsx("h3", {
         children: group.label
-      }), jsx(GoAContainer, {
+      }), isStepperReview && jsx(Fragment, {
+        children: renderLayoutElements(group.elements, schema, path, enabled, renderers, cells)
+      }), !isStepperReview && jsx(GoAContainer, {
         children: renderLayoutElements(group.elements, schema, path, enabled, renderers, cells)
       })]
     })]
@@ -6865,7 +6867,7 @@ 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 && 'variant' in schema.options;
+  return 'options' in schema && schema.options !== undefined && schema.options !== null;
 };
 
 const errCategorizationHasNonCategories = "Each element of 'Categorizations' must be of type 'Category'";
@@ -6984,6 +6986,14 @@ const GoAErrorControlTester = rankWith(1000, (uischema, schema, context) => {
 });
 var GoAErrorControl = withJsonFormsControlProps(ErrorControl);
 
+const GoAGroupReviewControlComponent = props => {
+  return jsx(GoAGroupControlComponent, Object.assign({}, props, {
+    isStepperReview: true
+  }));
+};
+const GoAGroupReviewLayoutTester = rankWith(1, uiTypeIs('Group'));
+const GoAGroupReviewControl = withJsonFormsLayoutProps(GoAGroupReviewControlComponent, true);
+
 const createDefaultAjv = (...schemas) => {
   const ajv = new Ajv({
     allErrors: true,
@@ -8312,8 +8322,8 @@ const GoABaseReviewRenderers = [
   tester: GoAlVerticalLayoutTester,
   renderer: GoAVerticalLayout
 }, {
-  tester: GoAGroupLayoutTester,
-  renderer: GoAGroupControl
+  tester: GoAGroupReviewLayoutTester,
+  renderer: GoAGroupReviewControl
 }, {
   tester: HelpContentTester,
   renderer: HelpReviewContent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.31.1",
+  "version": "1.32.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/layouts/GroupControl.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { LayoutProps, RankedTester } from '@jsonforms/core';
-export declare const GoAGroupControlComponent: (props: LayoutProps) => JSX.Element;
+export interface withIsStepper {
+    isStepperReview: boolean;
+}
+export declare const GoAGroupControlComponent: (props: LayoutProps & withIsStepper) => JSX.Element;
 export declare const GoAGroupLayoutTester: RankedTester;
-export declare const GoAGroupControl: React.ComponentType<LayoutProps & import("@jsonforms/core").OwnPropsOfLayout>;
+export declare const GoAGroupControl: React.ComponentType<LayoutProps & withIsStepper & import("@jsonforms/core").OwnPropsOfLayout>;

package/src/lib/layouts/GroupReviewControl.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { LayoutProps, RankedTester } from '@jsonforms/core';
+export declare const GoAGroupReviewControlComponent: (props: LayoutProps) => JSX.Element;
+export declare const GoAGroupReviewLayoutTester: RankedTester;
+export declare const GoAGroupReviewControl: React.ComponentType<LayoutProps & import("@jsonforms/core").OwnPropsOfLayout>;