@abgov/jsonforms-components 2.39.0 → 2.41.0

package/index.esm.js

@@ -14,7 +14,7 @@ import isEmpty from 'lodash/isEmpty';
 import range from 'lodash/range';
 import pluralize from 'pluralize';
 import { evaluateSync, compileSync } from '@mdx-js/mdx';
-import { Parser } from 'expr-eval';
+import { Parser } from 'expr-eval-fork';
 import Ajv from 'ajv';
 import addErrors from 'ajv-errors';
 import addFormats from 'ajv-formats';
@@ -6601,8 +6601,32 @@ const CheckBoxGroupDiv = styled.div(_t$8 || (_t$8 = _$8`
   }
 `));
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getEnumOptions = schema => {
+  var _a, _b;
+  if (((_a = schema === null || schema === void 0 ? void 0 : schema.items) === null || _a === void 0 ? void 0 : _a.oneOf) && Array.isArray(schema.items.oneOf)) {
+    return schema.items.oneOf;
+  }
+  if ((schema === null || schema === void 0 ? void 0 : schema.oneOf) && Array.isArray(schema.oneOf)) {
+    return schema.oneOf;
+  }
+  const newSchema = schema;
+  return (schema === null || schema === void 0 ? void 0 : schema.enum) || ((_b = newSchema === null || newSchema === void 0 ? void 0 : newSchema.items) === null || _b === void 0 ? void 0 : _b.enum) || [];
+};
+const getOptionValue = option => {
+  return typeof option === 'string' ? option : option.const;
+};
+const getOptionLabel = option => {
+  if (typeof option === 'string') {
+    return option;
+  }
+  return option.title || option.const;
+};
+const getOptionDescription = option => {
+  return typeof option === 'string' ? undefined : option.description;
+};
 const CheckboxGroup = props => {
-  var _a, _b, _c;
+  var _a, _b;
   const {
     data,
     id,
@@ -6615,20 +6639,23 @@ const CheckboxGroup = props => {
     label,
     enabled
   } = props;
-  const newSchema = schema;
-  const enumData = (schema === null || schema === void 0 ? void 0 : schema.enum) || ((_a = newSchema === null || newSchema === void 0 ? void 0 : newSchema.items) === null || _a === void 0 ? void 0 : _a.enum) || [];
+  const enumOptions = getEnumOptions(schema);
   const appliedUiSchemaOptions = merge({}, config, props.uischema.options, options);
   return jsx(Checkboxes, {
-    orientation: ((_b = uischema.options) === null || _b === void 0 ? void 0 : _b.orientation) ? (_c = uischema.options) === null || _c === void 0 ? void 0 : _c.orientation : 'vertical',
+    orientation: ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.orientation) ? (_b = uischema.options) === null || _b === void 0 ? void 0 : _b.orientation : 'vertical',
     testId: `${label || id}-jsonforms-checkboxes`,
-    children: enumData.map(enumValue => {
+    children: enumOptions.map(enumOption => {
+      const enumValue = getOptionValue(enumOption);
+      const enumLabel = getOptionLabel(enumOption);
+      const enumDescription = getOptionDescription(enumOption);
       return jsx(GoACheckbox, Object.assign({
         name: enumValue,
         disabled: !enabled,
         checked: data ? data.includes(enumValue) : false,
         value: `${enumValue}`
       }, appliedUiSchemaOptions, {
-        text: enumValue,
+        text: enumLabel,
+        description: enumDescription,
         testId: `${enumValue}-checkbox`,
         onChange: (name, value) => {
           let newData = Array.isArray(data) ? [...data] : [];
@@ -6639,7 +6666,7 @@ const CheckboxGroup = props => {
           }
           handleChange(path, newData.length === 0 ? undefined : newData);
         }
-      }));
+      }), enumValue);
     })
   });
 };
@@ -9079,14 +9106,12 @@ const TaskList = ({
       "data-testid": testid,
       children: [title && jsx(GoAText, {
         size: "heading-xl",
-        ml: "xl",
         mb: "xl",
         children: title
       }), subtitle && jsx(GoAText, {
         size: "heading-l",
         mt: "none",
         mb: "xl",
-        ml: "xl",
         children: subtitle
       }), jsx(ApplicationStatus, {
         completedGroups: completedPages,
@@ -11062,6 +11087,13 @@ $$1({ target: 'Iterator', proto: true, real: true, forced: IS_PURE }, {
 });
 
 const _excluded$1 = ["label", "path", "schema", "rootSchema", "uischema", "errors", "openDeleteDialog", "visible", "enabled", "cells", "data", "config"];
+const getItemsTitle = schema => {
+  const items = schema === null || schema === void 0 ? void 0 : schema.items;
+  if (items && !Array.isArray(items) && typeof items === 'object') {
+    return items.title;
+  }
+  return undefined;
+};
 // eslint-disable-next-line
 const extractScopesFromUISchema = uischema => {
   var _a, _b, _c, _d, _e, _f;
@@ -11486,7 +11518,7 @@ const ObjectArrayList = ({
           ref: rightRef,
           tabIndex: -1,
           children: [jsx(ObjectArrayTitle, {
-            children: pluralize.singular(listTitle || '')
+            children: listTitle
           }), jsx(NonEmptyList, {
             childPath: Paths.compose(path, `${currentIndex}`),
             rowIndex: currentIndex,
@@ -11551,7 +11583,7 @@ class ListWithDetailControl extends React.Component {
     };
   }
   render() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const _this$props = this.props,
       {
         label,
@@ -11570,7 +11602,7 @@ class ListWithDetailControl extends React.Component {
       additionalProps = _objectWithoutPropertiesLoose(_this$props, _excluded$1);
     const controlElement = uischema;
     // eslint-disable-next-line
-    const listTitle = label || ((_a = uischema.options) === null || _a === void 0 ? void 0 : _a.title);
+    const listTitle = (_e = (_d = (_c = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.label) !== null && _a !== void 0 ? _a : (_b = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : getItemsTitle(schema)) !== null && _d !== void 0 ? _d : schema === null || schema === void 0 ? void 0 : schema.title) !== null && _e !== void 0 ? _e : label;
     return jsxs(Visible, {
       visible: visible,
       "data-testid": "jsonforms-object-list-wrapper",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.39.0",
+  "version": "2.41.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",
@@ -13,7 +13,7 @@
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^3.0.1",
     "@mdx-js/mdx": "^3.1.0",
-    "expr-eval": "^2.0.2",
+    "expr-eval-fork": "^3.0.1",
     "pluralize": "^8.0.0"
   },
   "dependencies": {