@abgov/jsonforms-components 2.13.4 → 2.14.0

package/index.esm.js

@@ -6,7 +6,7 @@ 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, getControlPath, toDataPath, deriveLabelForUISchemaElement, isEnabled, schemaTypeIs, formatIs, createDefaultValue, or, isObjectArrayControl, isPrimitiveArrayControl, Paths, schemaMatches, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
-import { withJsonFormsControlProps, withJsonFormsRendererProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, useJsonForms, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsAllOfProps, withJsonFormsCellProps } from '@jsonforms/react';
+import { withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, useJsonForms, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsAllOfProps, withJsonFormsCellProps } from '@jsonforms/react';
 import * as _$b from 'lodash';
 import { isEqual, isEmpty as isEmpty$1, isObject as isObject$f } from 'lodash';
 import merge from 'lodash/merge';
@@ -5237,7 +5237,7 @@ styled.h4(_t8$2 || (_t8$2 = _$9`
 `));
 
 const GoAInputBaseControl = props => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
   const {
     uischema,
     visible,
@@ -5262,11 +5262,11 @@ const GoAInputBaseControl = props => {
       visible: visible,
       children: jsx(FormFieldWrapper, {
         children: jsx(GoAFormItem, {
-          requirement: required || getRequiredIfThen(props).length > 0 ? 'required' : undefined,
+          requirement: (_c = (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.componentProps) === null || _b === void 0 ? void 0 : _b.requirement) !== null && _c !== void 0 ? _c : required || getRequiredIfThen(props).length > 0 ? 'required' : undefined,
           error: isVisited === true ? modifiedErrors : undefined,
           testId: `${isStepperReview === true && 'review-base-'}${path}`,
           label: (props === null || props === void 0 ? void 0 : props.noLabel) === true ? '' : labelToUpdate,
-          helpText: typeof ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.help) === 'string' && !isStepperReview ? (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.help : '',
+          helpText: typeof ((_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.help) === 'string' && !isStepperReview ? (_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.help : '',
           children: jsx(InnerComponent, Object.assign({}, props, {
             isVisited,
             errors: modifiedErrors,
@@ -5867,7 +5867,8 @@ const GoAInputText = props => {
       width: width,
       readonly: readOnly,
       maxLength: isSinField ? 11 : '',
-      placeholder: placeholder
+      placeholder: placeholder,
+      ariaLabel: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`
     }, (_p = uischema.options) === null || _p === void 0 ? void 0 : _p.componentProps, {
       // maxLength={appliedUiSchemaOptions?.maxLength}
       name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
@@ -5988,15 +5989,30 @@ const callout = props => {
     children: componentProps.message
   }));
 };
-const CalloutControl = props => {
-  var _a, _b;
-  return callout(((_b = (_a = props === null || props === void 0 ? void 0 : props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.componentProps) || {});
+const GoACalloutController = props => {
+  var _a;
+  const {
+    uischema,
+    visible,
+    data
+  } = props;
+  let showCallout;
+  if (data === undefined || Array.isArray(data) && data.length === 0) {
+    showCallout = false;
+  } else {
+    showCallout = visible === true;
+  }
+  const calloutProps = ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.componentProps) || {};
+  return jsx(Visible, {
+    visible: showCallout,
+    children: callout(calloutProps)
+  });
 };
 const CalloutReviewControl = () => {
   return jsx(Fragment, {});
 };
 const GoACalloutControlTester = rankWith(1, uiTypeIs('Callout'));
-var GoACalloutControl = withJsonFormsRendererProps(CalloutControl);
+const GoACalloutControl = withJsonFormsControlProps(GoACalloutController);
 
 const errMalformedDate = (scope, type) => {
   return `${type}-date for variable '${scope}' has an incorrect format.`;
@@ -7035,6 +7051,8 @@ class ContextProviderClass {
     this.enumFunctions = new Map();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     this.enumSubmitFunctions = new Map();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.enumSaveFunctions = new Map();
     this.addFormContextData = (key, data) => {
       this.enumValues.set(key, () => data);
     };
@@ -7055,10 +7073,13 @@ class ContextProviderClass {
       }
       if (props.submit) {
         const {
-          submitForm
+          submitForm,
+          saveForm
         } = props.submit;
         const submitFunction = submitForm;
+        const saveFormFunction = saveForm;
         this.enumSubmitFunctions.set('submit-form', () => submitFunction);
+        this.enumSaveFunctions.set('save-form', () => saveFormFunction);
       }
       if (props.data) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -7123,6 +7144,7 @@ class ContextProviderClass {
       data: this.enumValues,
       functions: this.enumFunctions,
       submitFunction: this.enumSubmitFunctions,
+      saveFunction: this.enumSaveFunctions,
       addFormContextData: this.addFormContextData,
       getFormContextData: this.getFormContextData,
       getAllFormContextData: this.getAllFormContextData,
@@ -8292,6 +8314,7 @@ const BackButton = ({
 };
 
 const RenderPages = props => {
+  var _a, _b;
   const {
     data,
     schema,
@@ -8314,8 +8337,11 @@ const RenderPages = props => {
     isValid,
     activeId
   } = formStepperCtx.selectStepperState();
+  const hideSubmit = (_b = (_a = props.categoryProps.uischema.options) === null || _a === void 0 ? void 0 : _a.hideSubmit) !== null && _b !== void 0 ? _b : false;
   const submitFormFunction = enumerators === null || enumerators === void 0 ? void 0 : enumerators.submitFunction.get('submit-form');
   const submitForm = submitFormFunction && submitFormFunction();
+  const saveFormFunction = enumerators === null || enumerators === void 0 ? void 0 : enumerators.saveFunction.get('save-form');
+  const saveForm = saveFormFunction && saveFormFunction();
   const [isOpen, setIsOpen] = useState(false);
   const handleSubmit = () => {
     if (submitForm) {
@@ -8324,6 +8350,11 @@ const RenderPages = props => {
       setIsOpen(true);
     }
   };
+  const handleSave = () => {
+    if (saveForm) {
+      saveForm(data);
+    }
+  };
   const onCloseModal = () => {
     setIsOpen(false);
   };
@@ -8368,7 +8399,10 @@ const RenderPages = props => {
                     alignment: "start",
                     children: [jsx(GoAButton, {
                       type: "submit",
-                      onClick: () => goToPage(activeId + 1),
+                      onClick: () => {
+                        handleSave();
+                        goToPage(activeId + 1);
+                      },
                       disabled: !(category.isValid && category.isCompleted),
                       testId: "pages-save-continue-btn",
                       children: "Save and continue"
@@ -8400,13 +8434,13 @@ const RenderPages = props => {
             })), jsx(PageRenderPadding, {
               children: jsx(GoAButtonGroup, {
                 alignment: "end",
-                children: jsx(GoAButton, {
+                children: !hideSubmit ? jsx(GoAButton, {
                   type: 'primary',
                   onClick: handleSubmit,
                   disabled: !isValid,
                   testId: "pages-submit-btn",
                   children: "Submit"
-                })
+                }) : null
               })
             })]
           })]
@@ -9477,7 +9511,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                           }
                         });
                       },
-                      "aria-label": schemaName,
+                      ariaLabel: schemaName,
                       width: "100%"
                     }) : jsx(GoACallout, {
                       type: "important",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.13.4",
+  "version": "2.14.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/Additional/GoACalloutControl.d.ts

@@ -9,5 +9,5 @@ export interface CalloutProps {
 export declare const callout: (props: CalloutProps) => JSX.Element;
 export declare const CalloutReviewControl: () => import("react/jsx-runtime").JSX.Element;
 export declare const GoACalloutControlTester: RankedTester;
-declare const _default: React.ComponentType<import("@jsonforms/core").OwnPropsOfJsonFormsRenderer>;
-export default _default;
+export declare const GoACalloutControl: React.ComponentType<import("@jsonforms/core").OwnPropsOfControl>;
+export default GoACalloutControl;

package/src/lib/Context/ContextProvider.d.ts

@@ -7,6 +7,7 @@ export interface enumerators {
     data: Map<string, () => any>;
     functions: Map<string, () => (file: File, propertyId: string) => void | undefined>;
     submitFunction: Map<string, () => (id: string) => void | undefined>;
+    saveFunction: Map<string, () => (id: string) => void | undefined>;
     addFormContextData: (key: string, data: Record<string, unknown> | unknown[]) => void;
     getFormContextData: (key: string) => Record<string, any>;
     getAllFormContextData: () => AllData;
@@ -21,6 +22,7 @@ interface FileManagement {
 }
 interface SubmitManagement {
     submitForm?: (any: any) => void;
+    saveForm?: (any: any) => void;
 }
 type Props = {
     children?: React.ReactNode;
@@ -35,10 +37,12 @@ export declare class ContextProviderClass {
     enumValues: Map<string, () => Record<string, any>>;
     enumFunctions: Map<string, () => ((file: File, propertyId: string) => void) | undefined>;
     enumSubmitFunctions: Map<string, () => ((data: any) => void) | undefined>;
+    enumSaveFunctions: Map<string, () => ((data: any) => void) | undefined>;
     baseEnumerator: {
         data: Map<string, () => Record<string, any>>;
         functions: Map<string, () => ((file: File, propertyId: string) => void) | undefined>;
         submitFunction: Map<string, () => ((data: any) => void) | undefined>;
+        saveFunction: Map<string, () => ((data: any) => void) | undefined>;
         addFormContextData: (key: string, data: Record<string, unknown> | unknown[]) => void;
         getFormContextData: (key: string) => Record<string, any> | undefined;
         getAllFormContextData: () => AllData;