@abgov/jsonforms-components 1.13.0 → 1.14.1

package/index.esm.js

@@ -1,12 +1,11 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import React, { createContext, useContext, useEffect, useMemo, useState, useCallback } from 'react';
-import { GoACallout, GoAInputDate, GoAFormItem, GoAInput, GoATextArea, GoAInputDateTime, GoAInputTime, GoADropdown, GoADropdownItem, GoARadioGroup, GoARadioItem, GoACheckbox, GoAFormStepper, GoAFormStep, GoAPages, GoAGrid, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoADetails } from '@abgov/react-components';
+import { GoACallout, GoAInputDate, GoAFormItem, GoAInput, GoATextArea, GoAInputDateTime, GoAInputTime, GoADropdown, GoADropdownItem, GoARadioGroup, GoARadioItem, GoACheckbox, GoAGrid, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoADetails } from '@abgov/react-components';
 import styled from 'styled-components';
-import { rankWith, uiTypeIs, isDateControl, isStringControl, and, optionIs, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, isDescriptionHidden, isVisible, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, withIncreasedRank, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
-import { withJsonFormsRendererProps, withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, withJsonFormsLayoutProps, useJsonForms, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
+import { rankWith, uiTypeIs, isDateControl, isStringControl, and, optionIs, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isEnumControl, isBooleanControl, isDescriptionHidden, getAjv, isVisible, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, Paths, or, isObjectArrayControl, isPrimitiveArrayControl, withIncreasedRank, hasType, isControl, isCategorization, isLayout } from '@jsonforms/core';
+import { withJsonFormsRendererProps, withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, useJsonForms, JsonFormsDispatch, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsCellProps } from '@jsonforms/react';
 import merge from 'lodash/merge';
 import axios from 'axios';
-import { withAjvProps } from '@jsonforms/material-renderers';
 import isEmpty$1 from 'lodash/isEmpty';
 import range from 'lodash/range';
 import Ajv from 'ajv';
@@ -3684,6 +3683,57 @@ const BooleanRadioControl = props => jsx(GoAInputBaseControl, Object.assign({},
 const GoABooleanRadioControlTester = rankWith(3, and(isBooleanControl, optionIs('radio', true)));
 const GoABooleanRadioControl = withJsonFormsControlProps(BooleanRadioControl);
 
+const renderLayoutElements = (elements, schema, path, enabled, renderers, cells) => {
+  return elements.map((child, index) => jsx("div", {
+    children: jsx(JsonFormsDispatch, {
+      uischema: child,
+      schema: schema,
+      path: path,
+      enabled: enabled,
+      renderers: renderers,
+      cells: cells
+    }, path)
+  }, index));
+};
+const withAjvProps = Component => function WithAjvProps(props) {
+  const ctx = useJsonForms();
+  const ajv = getAjv({
+    jsonforms: Object.assign({}, ctx)
+  });
+  return jsx(Component, Object.assign({}, props, {
+    ajv: ajv
+  }));
+};
+const LayoutRenderer = ({
+  elements,
+  schema,
+  path,
+  enabled,
+  direction,
+  renderers,
+  cells,
+  visible
+}) => {
+  if (isEmpty$1(elements)) {
+    return null;
+  } else {
+    if (direction === 'row') {
+      return jsx(Visible, {
+        visible: visible,
+        children: jsx(GoAGrid, {
+          minChildWidth: "10ch",
+          children: renderLayoutElements(elements, schema, path, enabled, renderers, cells)
+        })
+      });
+    } else {
+      return jsx(Visible, {
+        visible: visible,
+        children: renderLayoutElements(elements, schema, path, enabled, renderers, cells)
+      });
+    }
+  }
+};
+
 let _$5 = t => t,
   _t$5,
   _t2$3;
@@ -3949,6 +3999,24 @@ const RenderStepElements = props => {
   );
 };
 
+const validateData = (jsonSchema, data, ajv) => {
+  const newSchema = JSON.parse(JSON.stringify(jsonSchema));
+  Object.keys(newSchema.properties || {}).forEach(propertyName => {
+    var _a;
+    const property = newSchema.properties || {};
+    property[propertyName].enum = getData(propertyName);
+    if (((_a = property[propertyName]) === null || _a === void 0 ? void 0 : _a.format) === 'file-urn') {
+      delete property[propertyName].format;
+    }
+  });
+  try {
+    const validate = ajv.compile(newSchema);
+    return validate(data).valueOf();
+  } catch (e) {
+    return false;
+  }
+};
+
 const FormStepper = props => {
   var _a, _b, _c, _d;
   const {
@@ -4002,17 +4070,8 @@ const FormStepper = props => {
     setStepStatuses(statuses);
   }, [inputStatuses, categories]);
   useEffect(() => {
-    const newSchema = JSON.parse(JSON.stringify(schema));
-    Object.keys(newSchema.properties || {}).forEach(propertyName => {
-      var _a;
-      const property = newSchema.properties || {};
-      property[propertyName].enum = getData(propertyName);
-      if (((_a = property[propertyName]) === null || _a === void 0 ? void 0 : _a.format) === 'file-urn') {
-        delete property[propertyName].format;
-      }
-    });
-    const validate = ajv.compile(newSchema);
-    setIsFormValid(validate(data));
+    const isValid = validateData(schema, data, ajv);
+    setIsFormValid(isValid);
   }, [ajv, data, schema]);
   useEffect(() => {
     var _a, _b;
@@ -4176,6 +4235,7 @@ const FormStepper = props => {
                 type: "primary",
                 onClick: handleSubmit,
                 disabled: !isFormValid || !enabled,
+                testId: "stepper-submit-btn",
                 children: "Submit"
               })
             })]
@@ -4922,48 +4982,6 @@ const InputCells = [{
   cell: withJsonFormsCellProps(GoAIntegerCell)
 }];
 
-const renderLayoutElements = (elements, schema, path, enabled, renderers, cells) => {
-  return elements.map((child, index) => jsx("div", {
-    children: jsx(JsonFormsDispatch, {
-      uischema: child,
-      schema: schema,
-      path: path,
-      enabled: enabled,
-      renderers: renderers,
-      cells: cells
-    }, path)
-  }, index));
-};
-const LayoutRenderer = ({
-  elements,
-  schema,
-  path,
-  enabled,
-  direction,
-  renderers,
-  cells,
-  visible
-}) => {
-  if (isEmpty$1(elements)) {
-    return null;
-  } else {
-    if (direction === 'row') {
-      return jsx(Visible, {
-        visible: visible,
-        children: jsx(GoAGrid, {
-          minChildWidth: "10ch",
-          children: renderLayoutElements(elements, schema, path, enabled, renderers, cells)
-        })
-      });
-    } else {
-      return jsx(Visible, {
-        visible: visible,
-        children: renderLayoutElements(elements, schema, path, enabled, renderers, cells)
-      });
-    }
-  }
-};
-
 const GoAHorizontalLayoutTester = rankWith(2, uiTypeIs('HorizontalLayout'));
 const GoAHorizontalLayoutComponent = ({
   uischema,

package/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.13.0",
+  "version": "1.14.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",
   "peerDependencies": {
     "@abgov/react-components": "^4.18.1",
     "@jsonforms/core": "^3.1.0",
-    "@jsonforms/material-renderers": "^3.1.0",
     "@jsonforms/react": "^3.1.0",
-    "@mui/material": "^5.15.10",
     "react": "^18.0.0",
     "ajv": "^6.12.6",
     "ajv8": "npm:ajv@^8.6.1"

package/src/lib/Controls/FormStepper/FormStepperControl.d.ts

@@ -1,11 +1,9 @@
-import React from 'react';
 import { StatePropsOfLayout } from '@jsonforms/core';
 import { TranslateProps } from '@jsonforms/react';
-import { AjvProps } from '@jsonforms/material-renderers';
+import { AjvProps } from '../../util/layout';
 export interface CategorizationStepperLayoutRendererProps extends StatePropsOfLayout, AjvProps, TranslateProps {
     data: unknown;
 }
 export declare const FormStepper: (props: CategorizationStepperLayoutRendererProps) => JSX.Element;
-export declare const flattenObject: (obj: Record<string, string>) => Record<string, string>;
-export declare const FormStepperControl: (props: CategorizationStepperLayoutRendererProps & import("@jsonforms/core").OwnPropsOfLayout) => React.JSX.Element;
+export declare const FormStepperControl: (props: CategorizationStepperLayoutRendererProps & import("@jsonforms/core").OwnPropsOfLayout) => import("react/jsx-runtime").JSX.Element;
 export default FormStepper;

package/src/lib/Controls/FormStepper/util/validateData.d.ts

@@ -0,0 +1,3 @@
+import { JsonSchema } from '@jsonforms/core';
+import Ajv from 'ajv8';
+export declare const validateData: (jsonSchema: JsonSchema, data: unknown, ajv: Ajv) => boolean;

package/src/lib/Controls/Inputs/InputEnum.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { ControlProps, OwnPropsOfEnum, RankedTester } from '@jsonforms/core';
 import { TranslateProps } from '@jsonforms/react';
 import { WithInputProps } from './type';
-import { WithOptionLabel } from '@jsonforms/material-renderers';
+import { WithOptionLabel } from '../../util';
 import { EnumCellProps, WithClassname } from '@jsonforms/core';
 type EnumSelectProp = EnumCellProps & WithClassname & TranslateProps & WithInputProps;
 export declare const EnumSelect: (props: EnumSelectProp) => JSX.Element;

package/src/lib/Controls/Inputs/InputEnumRadios.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { ControlProps, OwnPropsOfEnum, RankedTester } from '@jsonforms/core';
 import { TranslateProps } from '@jsonforms/react';
 import { WithInputProps } from './type';
-import { WithOptionLabel } from '@jsonforms/material-renderers';
+import { WithOptionLabel } from '../../util';
 import { EnumCellProps, WithClassname } from '@jsonforms/core';
 type RadioGroupProp = EnumCellProps & WithClassname & TranslateProps & WithInputProps;
 export declare const RadioGroup: (props: RadioGroupProp) => JSX.Element;

package/src/lib/util/index.d.ts

@@ -1,2 +1,4 @@
 export * from './inputControlUtils';
 export * from './style-component';
+export * from './type';
+export * from './stringUtils';

package/src/lib/util/layout.d.ts

@@ -1,3 +1,4 @@
+import React, { ComponentType } from 'react';
 import type { UISchemaElement } from '@jsonforms/core';
 import { JsonFormsCellRendererRegistryEntry, JsonFormsRendererRegistryEntry, JsonSchema, OwnPropsOfRenderer } from '@jsonforms/core';
 import Ajv from 'ajv8';
@@ -10,4 +11,5 @@ export interface LayoutRendererProps extends OwnPropsOfRenderer {
 export interface AjvProps {
     ajv: Ajv;
 }
+export declare const withAjvProps: <P extends object>(Component: React.ComponentType<AjvProps & P>) => (props: P) => import("react/jsx-runtime").JSX.Element;
 export declare const LayoutRenderer: ({ elements, schema, path, enabled, direction, renderers, cells, visible, }: LayoutRendererProps) => import("react/jsx-runtime").JSX.Element | null;

package/src/lib/util/type.d.ts

@@ -0,0 +1,6 @@
+import React, { ReactNode } from 'react';
+import { EnumOption } from '@jsonforms/core';
+export interface WithOptionLabel {
+    getOptionLabel?(option: EnumOption): string;
+    renderOption?(props: React.HTMLAttributes<HTMLLIElement>, option: EnumOption): ReactNode;
+}