@abgov/jsonforms-components 2.25.0 → 2.27.0

package/index.esm.js

@@ -7990,7 +7990,10 @@ const JsonFormsStepperContextProvider = ({
         return category === undefined ? false : !(category === null || category === void 0 ? void 0 : category.isEnabled);
       },
       selectNumberOfCompletedCategories: () => {
-        return stepperState === null || stepperState === void 0 ? void 0 : stepperState.categories.reduce((acc, cat) => acc + (cat.isValid && cat.isCompleted && cat.isVisited && (cat === null || cat === void 0 ? void 0 : cat.uischema) && (cat === null || cat === void 0 ? void 0 : cat.uischema) && isVisible(cat.uischema, data, '', ajv) ? 1 : 0), 0);
+        return stepperState === null || stepperState === void 0 ? void 0 : stepperState.categories.reduce((acc, cat) => {
+          var _a, _b, _c, _d;
+          return acc + (cat.isValid && cat.isCompleted && cat.isVisited && (cat === null || cat === void 0 ? void 0 : cat.uischema) && (((_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) && (cat === null || cat === void 0 ? void 0 : cat.uischema) && isVisible(cat.uischema, data, '', ajv) ? 1 : 0);
+        }, 0);
       },
       selectIsActive: id => {
         return id === stepperState.activeId;
@@ -8289,7 +8292,10 @@ const ApplicationStatus = () => {
   const {
     categories: allCategories
   } = formStepperCtx.selectStepperState();
-  const categories = allCategories.filter(c => (c === null || c === void 0 ? void 0 : c.visible) === true);
+  const categories = allCategories.filter(c => {
+    var _a, _b, _c, _d;
+    return (c === null || c === void 0 ? void 0 : c.visible) === true && (((_b = (_a = c.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.showInTaskList) || ((_d = (_c = c === null || c === void 0 ? void 0 : c.uischema) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.showInTaskList) === undefined);
+  });
   const total = categories.length;
   const completed = selectNumberOfCompletedCategories();
   const type = total === completed ? 'success' : 'important';
@@ -8422,6 +8428,10 @@ const TaskList = ({
 }) => {
   const testid = 'table-of-contents';
   const sectioned = getCategorySections(categories);
+  const showInTaskListList = 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;
+  });
   let globalIndex = 0;
   let sectionIndex = 1;
   return jsx(PageBorder, {
@@ -8445,16 +8455,29 @@ const TaskList = ({
             sectionTitle,
             categories: group
           }) => jsxs(Fragment, {
-            children: [sectionTitle && jsx(SectionHeaderRow, {
+            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;
+              });
+              const showCurrent = showInTaskListList[globalIndex];
               const index = globalIndex++;
-              return jsx(CategoryRow, {
-                category: category,
-                index: index,
-                onClick: onClick
-              }, `cat-${category.label}`);
+              const modifyCategory = JSON.parse(JSON.stringify(category));
+              modifyCategory.isCompleted = group.length === group.filter(category => category.isCompleted).length;
+              let currentCategory = category;
+              if (showGroupTaskListList.length > showGroupTaskListList.filter(item => item === true).length) {
+                currentCategory = modifyCategory;
+              }
+              if (showCurrent) {
+                return jsx(CategoryRow, {
+                  category: currentCategory,
+                  index: index,
+                  onClick: onClick
+                }, `cat-${category.label}`);
+              }
             })]
           })), jsx(SummaryRow, {
             index: globalIndex,
@@ -9490,9 +9513,10 @@ const ObjectArrayToolBar = /*#__PURE__*/React.memo(function TableToolbar({
       children: jsx(GoAButton, Object.assign({
         disabled: !enabled,
         testId: `object-array-toolbar-${label}`,
+        leadingIcon: "add",
         "aria-label": `Add to button to ${(label === null || label === void 0 ? void 0 : label.toLowerCase()) || ''}`,
         onClick: addItem(path, createDefaultValue(schema, rootSchema)),
-        type: (_d = (_c = uischema.options) === null || _c === void 0 ? void 0 : _c.addButtonType) !== null && _d !== void 0 ? _d : 'primary'
+        type: (_d = (_c = uischema.options) === null || _c === void 0 ? void 0 : _c.addButtonType) !== null && _d !== void 0 ? _d : 'secondary'
       }, buttonUIProps, {
         children: ((_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.addButtonText) || capitalizeFirstLetter(`Add ${arrayLabel}`)
       }))

package/package.json

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