@abgov/jsonforms-components 2.28.1 → 2.29.0

package/index.esm.js

@@ -5,10 +5,10 @@ import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputD
 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, isControl, schemaMatches, getAjv, isVisible, toDataPath, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, or, isObjectArrayControl, isPrimitiveArrayControl, Paths, hasType, isCategorization, isLayout } from '@jsonforms/core';
+import { rankWith, isStringControl, and, optionIs, uiTypeIs, isDateControl, isNumberControl, isIntegerControl, isDateTimeControl, isTimeControl, isControl, isEnumControl, isBooleanControl, schemaMatches, getAjv, isVisible, toDataPath, isEnabled, deriveLabelForUISchemaElement, schemaTypeIs, formatIs, createDefaultValue, or, isObjectArrayControl, isPrimitiveArrayControl, Paths, hasType, isCategorization, isLayout } from '@jsonforms/core';
 import { withJsonFormsControlProps, withJsonFormsEnumProps, withTranslateProps, JsonFormsDispatch, useJsonForms, withJsonFormsLayoutProps, withJsonFormsArrayLayoutProps, withJsonFormsAllOfProps, withJsonFormsCellProps } from '@jsonforms/react';
 import * as _$c from 'lodash';
-import { isEqual, isEmpty as isEmpty$1, isObject as isObject$f } from 'lodash';
+import ___default, { isEqual, isEmpty as isEmpty$1, isObject as isObject$f } from 'lodash';
 import merge from 'lodash/merge';
 import isEmpty from 'lodash/isEmpty';
 import range from 'lodash/range';
@@ -6367,7 +6367,7 @@ function fetchRegisterConfigFromOptions(options) {
   return config;
 }
 const EnumSelect = props => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     data,
     enabled,
@@ -6378,18 +6378,20 @@ const EnumSelect = props => {
     uischema,
     required,
     setIsVisited,
-    isVisited
+    isVisited,
+    schema
   } = props;
   const registerCtx = useContext(JsonFormsRegisterContext);
   const registerConfig = fetchRegisterConfigFromOptions((_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.register);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const labelPath = ((_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.label) || 'label';
+  const valuePath = ((_d = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _d === void 0 ? void 0 : _d.value) || 'value';
   let registerData = [];
   let error = '';
   if (registerConfig) {
     registerData = registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.selectRegisterData(registerConfig);
     error = (registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.fetchErrors(registerConfig)) || '';
   }
-  const autoCompletion = ((_d = (_c = props.uischema) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.autoComplete) === true;
+  const autoCompletion = ((_f = (_e = props.uischema) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.autoComplete) === true;
   const mergedOptions = useMemo(() => {
     const newOptions = [...(options || []), ...((registerData === null || registerData === void 0 ? void 0 : registerData.map(d => {
       if (typeof d === 'string') {
@@ -6397,9 +6399,16 @@ const EnumSelect = props => {
           value: d,
           label: d
         };
-      } else {
-        return Object.assign({}, d);
+      } else if (typeof d === 'object' && d !== null) {
+        return {
+          value: ___default.get(d, valuePath) || '',
+          label: ___default.get(d, labelPath) || ''
+        };
       }
+      return {
+        label: '',
+        value: ''
+      };
     })) || [])];
     const hasNonEmptyOptions = newOptions.some(option => option.value !== '');
     if (!hasNonEmptyOptions && newOptions.length === 1 && newOptions[0].value === '') {
@@ -6413,7 +6422,7 @@ const EnumSelect = props => {
     }
     return newOptions.filter(option => option.value !== '');
   }, [registerData, options]);
-  const width = ((_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.width) || '100%';
+  const width = ((_h = (_g = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _g === void 0 ? void 0 : _g.componentProps) === null || _h === void 0 ? void 0 : _h.width) || '100%';
   useEffect(() => {
     if (registerConfig) {
       registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.fetchRegisterByUrl(registerConfig);
@@ -6425,13 +6434,19 @@ const EnumSelect = props => {
     }) : jsx(Dropdown, {
       items: mergedOptions,
       enabled: enabled,
-      selected: data,
+      selected: typeof data === 'object' ? ___default.get(data, valuePath) : data,
       width: width,
       id: `jsonforms-${label}-dropdown`,
       label: label,
       isAutoCompletion: autoCompletion,
       onChange: value => {
-        handleChange(path, value);
+        if (schema.type === 'object') {
+          handleChange(path, registerData.find(o => {
+            return ___default.get(o, valuePath) === value;
+          }));
+        } else {
+          handleChange(path, value);
+        }
       }
     }, `jsonforms-${label}-dropdown`)
   });
@@ -6441,8 +6456,10 @@ const enumControl = props => {
     input: EnumSelect
   }));
 };
-const GoAEnumControlTester = rankWith(2, isEnumControl);
-// HOC order can be reversed with https://github.com/eclipsesource/jsonforms/issues/1987
+const GoAEnumControlTester = rankWith(4, (uischema, schema, context) => {
+  var _a;
+  return (schema === null || schema === void 0 ? void 0 : schema.type) === 'object' && isControl(uischema) && ((_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.format) === 'enum' || isEnumControl(uischema, schema, context);
+});
 const GoAEnumControl = withJsonFormsEnumProps(withTranslateProps(enumControl), true);
 
 const RadioGroup = props => {
@@ -8450,15 +8467,26 @@ const TaskList = ({
             children: [sectionTitle && showInTaskListList[globalIndex] && jsx(SectionHeaderRow, {
               title: sectionTitle,
               index: sectionIndex++
-            }, `section-${sectionTitle}`), group.map(category => {
-              const showGroupTaskListList = categories.map(cat => {
-                var _a, _b, _c, _d;
-                return ((_b = (_a = cat === null || cat === void 0 ? void 0 : cat.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.showInTaskList) || ((_d = (_c = cat === null || cat === void 0 ? void 0 : cat.uischema) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.showInTaskList) === undefined;
-              });
+            }, `section-${sectionTitle}`), group.map((category, groupIndex) => {
+              //eslint-disable-next-line
+              const shouldShow = cat => {
+                var _a, _b;
+                return ((_b = (_a = cat === null || cat === void 0 ? void 0 : cat.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.showInTaskList) !== false;
+              };
+              let leftIndex = groupIndex;
+              while (leftIndex > 0 && !shouldShow(group[leftIndex - 1])) {
+                leftIndex--;
+              }
+              let rightIndex = groupIndex;
+              while (rightIndex < group.length - 1 && !shouldShow(group[rightIndex + 1])) {
+                rightIndex++;
+              }
+              const currentLocalGroup = group.slice(leftIndex, rightIndex + 1);
+              const showGroupTaskListList = categories.map(cat => shouldShow(cat));
               const showCurrent = showInTaskListList[globalIndex];
               const index = globalIndex++;
               const modifyCategory = JSON.parse(JSON.stringify(category));
-              modifyCategory.isCompleted = group.length === group.filter(category => category.isCompleted).length;
+              modifyCategory.isCompleted = currentLocalGroup.length === currentLocalGroup.filter(category => category.isCompleted).length;
               let currentCategory = category;
               if (showGroupTaskListList.length > showGroupTaskListList.filter(item => item === true).length) {
                 currentCategory = modifyCategory;
@@ -8592,11 +8620,6 @@ const BackButtonWrapper = styled.span(_t$5 || (_t$5 = _$5`
 
   .back-link {
     margin-top: var(--goa-space-m);
-    color: #0070c4;
-    text-decoration: underline;
-    text-underline-offset: 2px;
-    text-decoration-color: currentColor;
-    display: inline-block;
   }
   display: inline-block;
   color: #0070c4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.28.1",
+  "version": "2.29.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",