@abgov/jsonforms-components 2.32.7 → 2.34.0

package/index.esm.js

@@ -8959,7 +8959,8 @@ const TaskList = ({
   onClick,
   title,
   subtitle,
-  isValid
+  isValid,
+  hideSummary
 }) => {
   const testid = 'table-of-contents';
   const sectioned = getCategorySections(categories);
@@ -9057,11 +9058,11 @@ const TaskList = ({
               }
               return null;
             })]
-          }, index)), jsx(SummaryRow, {
+          }, index)), !hideSummary ? jsx(SummaryRow, {
             index: globalIndex,
             isValid: isValid,
             onClick: onClick
-          }, "task-list-table-summary")]
+          }, "task-list-table-summary") : null]
         })
       })]
     })
@@ -9214,7 +9215,7 @@ const BackButton = ({
 };
 
 const RenderPages = props => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g;
   const {
     data,
     schema,
@@ -9240,6 +9241,8 @@ const RenderPages = props => {
   } = 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 toAppOverviewLabel = (_d = (_c = props.categoryProps.uischema.options) === null || _c === void 0 ? void 0 : _c.toAppOverviewLabel) !== null && _d !== void 0 ? _d : 'Back to application overview';
+  const submissionLabel = (_f = (_e = props.categoryProps.uischema.options) === null || _e === void 0 ? void 0 : _e.submissionLabel) !== null && _f !== void 0 ? _f : 'Next';
+  const hideSummary = (_g = props.categoryProps.uischema.options) === null || _g === void 0 ? void 0 : _g.hideSummary;
   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');
@@ -9287,6 +9290,8 @@ const RenderPages = props => {
               data
             };
             if (index === activeId && !isOnReview) {
+              const currentStep = index + 1 - categories.filter(c => !c.visible && c.id < index).length;
+              const totalSteps = categories.filter(c => c.visible).length;
               return jsxs("div", {
                 "data-testid": `step_${index}-content-pages`,
                 style: {
@@ -9294,7 +9299,7 @@ const RenderPages = props => {
                 },
                 children: [jsxs(PageRenderPadding, {
                   children: [jsxs("h3", {
-                    children: ["Step ", index + 1 - categories.filter(c => !c.visible && c.id < index).length, " of", ' ', categories.filter(c => c.visible).length]
+                    children: ["Step ", currentStep, " of ", totalSteps]
                   }), jsx(RenderStepElements, Object.assign({}, categoryProps))]
                 }), jsx(PageRenderPadding, {
                   children: jsxs(GoAGrid, {
@@ -9327,11 +9332,13 @@ const RenderPages = props => {
                           while (nextId < categories.length && categories[nextId].visible === false) {
                             nextId = nextId + 1;
                           }
-                          goToPage(nextId);
+                          if (!(currentStep === totalSteps && hideSummary)) {
+                            goToPage(nextId);
+                          }
                         },
                         disabled: !enabled,
                         testId: "pages-save-continue-btn",
-                        children: "Next"
+                        children: currentStep === totalSteps ? submissionLabel : "Next"
                       })
                     })]
                   })
@@ -9438,7 +9445,7 @@ const FormPageStepper = props => {
   });
 };
 const FormPagesView = props => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const data = props.data;
   const formStepperCtx = useContext(JsonFormsStepperContext);
   const {
@@ -9472,7 +9479,8 @@ const FormPagesView = props => {
       onClick: handleGoToPage,
       title: (_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.title,
       subtitle: (_d = (_c = props.uischema) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.subtitle,
-      isValid: completedCount === visibleCats.length
+      isValid: completedCount === visibleCats.length,
+      hideSummary: (_f = (_e = props.uischema) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.hideSummary
     };
     return jsx(TaskList, Object.assign({}, tocProps));
   }
@@ -10401,10 +10409,11 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
         children: [jsx("thead", {
           children: jsxs("tr", {
             children: [Object.entries(tableKeys).map(([value, index]) => {
+              const currentProperty = properties[value];
               if (!isInReview) {
                 return jsx("th", {
                   children: jsxs("p", {
-                    children: [convertToSentenceCase(index), (required === null || required === void 0 ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
+                    children: [(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || convertToSentenceCase(index), (required === null || required === void 0 ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
                       children: "(required)"
                     })]
                   })
@@ -10412,7 +10421,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
               }
               return jsx(TableTHHeader, {
                 children: jsxs("p", {
-                  children: [`${convertToSentenceCase(index)}`, (required === null || required === void 0 ? void 0 : required.includes(value)) && jsxs(RequiredSpan, {
+                  children: [`${(currentProperty === null || currentProperty === void 0 ? void 0 : currentProperty.title) || convertToSentenceCase(index)}`, (required === null || required === void 0 ? void 0 : required.includes(value)) && jsxs(RequiredSpan, {
                     children: [jsx("br", {}), " (required)"]
                   })]
                 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.32.7",
+  "version": "2.34.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/Controls/FormStepper/TaskList/TaskList.d.ts

@@ -6,6 +6,7 @@ export interface TocProps {
     title?: string;
     subtitle?: string;
     isValid: boolean;
+    hideSummary: boolean;
 }
-export declare const TaskList: ({ categories, onClick, title, subtitle, isValid }: TocProps) => JSX.Element;
+export declare const TaskList: ({ categories, onClick, title, subtitle, isValid, hideSummary, }: TocProps) => JSX.Element;
 export declare const TableOfContentsTester: RankedTester;

package/src/lib/Controls/ObjectArray/ObjectListControlTypes.d.ts

@@ -12,6 +12,7 @@ export interface DataProperty {
     required?: string[];
     enum: string[];
     items?: Record<string, unknown>;
+    title?: string;
 }
 export interface DataObject {
     [key: string]: DataProperty;