@abgov/jsonforms-components 2.42.0 → 2.42.2

package/index.esm.js

@@ -7138,7 +7138,7 @@ let _$6 = t => t,
   _t22$1,
   _t23$1,
   _t24$1,
-  _t25,
+  _t25$1,
   _t26,
   _t27,
   _t28;
@@ -7303,7 +7303,7 @@ const CategoryStatus = styled.td(_t23$1 || (_t23$1 = _$6`
 const Center = styled.div(_t24$1 || (_t24$1 = _$6`
   padding-top: 5px;
 `));
-const PageStepperRow = styled.tr(_t25 || (_t25 = _$6`
+const PageStepperRow = styled.tr(_t25$1 || (_t25$1 = _$6`
   ${0}
 `), ({
   disabled
@@ -10084,7 +10084,8 @@ let _$3 = t => t,
   _t21,
   _t22,
   _t23,
-  _t24;
+  _t24,
+  _t25;
 const DeleteDialogContent = styled.div(_t$3 || (_t$3 = _$3`
   margin-bottom: var(--goa-space-m);
 `));
@@ -10153,44 +10154,47 @@ const Trash = styled.div(_t12 || (_t12 = _$3`
 const ListContainer = styled.div(_t13 || (_t13 = _$3`
   padding: 0 0 0 0;
 `));
-const IconPadding = styled.div(_t14 || (_t14 = _$3`
+styled.div(_t14 || (_t14 = _$3`
+  padding: 0 0 var(--goa-space-l) 0;
+`));
+const IconPadding = styled.div(_t15 || (_t15 = _$3`
   padding: 0.9rem 0.5rem 0 0;
 `));
-const UpdateListContainer = styled.div(_t15 || (_t15 = _$3`
+const UpdateListContainer = styled.div(_t16 || (_t16 = _$3`
   width: 100%;
   border: 1px solid #dcdcdc;
   padding: var(--goa-space-xl);
 `));
-styled.div(_t16 || (_t16 = _$3`
+styled.div(_t17 || (_t17 = _$3`
   padding: 0 1.5rem 0 0;
   border: 1px solid #dcdcdc;
 `));
-const TableTHHeader = styled.th(_t17 || (_t17 = _$3`
+const TableTHHeader = styled.th(_t18 || (_t18 = _$3`
   background-color: var(--goa-color-greyscale-100) !important;
   vertical-align: top;
 `));
-const ObjectArrayWarningIconDiv = styled.div(_t18 || (_t18 = _$3`
+const ObjectArrayWarningIconDiv = styled.div(_t19 || (_t19 = _$3`
   display: inline-flex;
   align-items: flex-start;
   gap: 0.25rem;
   font-size: var(--goa-font-size-2);
   color: var(--goa-color-interactive-error);
 `));
-const ListWithDetailWarningIconDiv = styled.div(_t19 || (_t19 = _$3`
+const ListWithDetailWarningIconDiv = styled.div(_t20 || (_t20 = _$3`
   display: inline-flex;
   align-items: flex-start;
   gap: 0.25rem;
   font-size: var(--goa-font-size-3);
   color: var(--goa-color-interactive-error);
 `));
-styled.label(_t20 || (_t20 = _$3`
+styled.label(_t21 || (_t21 = _$3`
   color: var(--goa-color-interactive-error);
   font-weight: var(--goa-font-weight-regular);
   font-size: var(--goa-font-size-3);
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-styled.div(_t21 || (_t21 = _$3`
+styled.div(_t22 || (_t22 = _$3`
   margin-top: var(--goa-space-m);
   color: var(--goa-color-interactive-error);
   font-weight: var(--goa-font-weight-regular);
@@ -10198,10 +10202,10 @@ styled.div(_t21 || (_t21 = _$3`
   line-height: var(--goa-line-height-1);
   font-style: normal;
 `));
-const HilightCellWarning = styled.div(_t22 || (_t22 = _$3`
+const HilightCellWarning = styled.div(_t23 || (_t23 = _$3`
   background-color: var(--goa-color-warning-default);
 `));
-const FixTableHeaderAlignment = styled.div(_t23 || (_t23 = _$3`
+const FixTableHeaderAlignment = styled.div(_t24 || (_t24 = _$3`
   table thead th:nth-child(3) {
     text-align: center;
   }
@@ -10210,7 +10214,7 @@ const FixTableHeaderAlignment = styled.div(_t23 || (_t23 = _$3`
     text-align: center;
   }
 `));
-const ListWithDetailsReviewCellDiv = styled.div(_t24 || (_t24 = _$3`
+const ListWithDetailsReviewCellDiv = styled.div(_t25 || (_t25 = _$3`
   display: 'flex';
   flex-direction: 'column';
   text-align: 'start';
@@ -11522,17 +11526,24 @@ const MainTab = ({
   } = useJsonForms();
   const rowData = getDataAtPath(core === null || core === void 0 ? void 0 : core.data, childPath);
   const orderedRowData = orderRowData(rowData, (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.detail);
-  const rowErrors = (_b = core === null || core === void 0 ? void 0 : core.errors) === null || _b === void 0 ? void 0 : _b.filter(e => {
-    const base = `/${childPath.replace(/\./g, '/')}`;
-    return e.instancePath === base || e.instancePath.startsWith(base + '/');
-  }).filter(e => {
-    var _a;
-    return (((_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.length) || 0) > 0;
-  }).map(e => humanizeAjvError(e, core.schema, core.uischema)).map((msg, index, arr) => `${msg}${index < arr.length - 1 ? ', ' : ''}`);
+  function resolveField(e) {
+    if (e.keyword === 'required') {
+      return e.params.missingProperty;
+    }
+    const path = e.instancePath.split('/');
+    return path[path.length - 1];
+  }
+  const rowBase = `/${childPath.replace(/\./g, '/')}`;
+  const fieldErrors = (_b = core === null || core === void 0 ? void 0 : core.errors) === null || _b === void 0 ? void 0 : _b.filter(e => e.instancePath === rowBase || e.instancePath.startsWith(rowBase + '/')).reduce((acc, e) => {
+    const field = resolveField(e);
+    acc[field] = humanizeAjvError(e, core.schema, core.uischema); //e.message;
+    return acc;
+  }, {});
+  const errorText = fieldErrors && Object.values(fieldErrors).length > 0 ? Object.values(fieldErrors).join(', ') : undefined;
   return jsx("div", {
     "data-testid": `object-array-main-item-${rowIndex}`,
-    children: (rowErrors === null || rowErrors === void 0 ? void 0 : rowErrors.length) ? jsx(GoabFormItem, {
-      error: (rowErrors === null || rowErrors === void 0 ? void 0 : rowErrors.length) ? rowErrors : null,
+    children: errorText ? jsx(GoabFormItem, {
+      error: errorText,
       children: jsx(MainItemComponent, {
         rowData: orderedRowData,
         childPath: childPath,
@@ -11575,7 +11586,7 @@ const ObjectArrayList = ({
   listTitle,
   errors
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const isEmptyList = data === 0;
   const rightRef = useRef(null);
   const current = rightRef.current;
@@ -11607,6 +11618,7 @@ const ObjectArrayList = ({
   const selectCurrentTab = index => {
     setCurrentIndex(index);
   };
+  const continueButtonTitle = (_d = (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.componentProps) === null || _d === void 0 ? void 0 : _d.listWithDetailsContinueButtonTitle;
   return jsx(ListContainer, {
     children: jsxs(RowFlex, {
       children: [currentListPage === 0 && jsx(FlexTabs, {
@@ -11624,7 +11636,8 @@ const ObjectArrayList = ({
             enabled: enabled,
             current: current,
             setCurrentListPage: index => setCurrentListPage(index),
-            uischema: uischema
+            uischema: uischema,
+            schema: schema
           }, childPath);
         })
       }), currentListPage > 0 && jsxs(UpdateListContainer, {
@@ -11651,7 +11664,7 @@ const ObjectArrayList = ({
             setCurrentListPage(0);
           },
           testId: "next-list-button",
-          children: "Continue"
+          children: continueButtonTitle ? continueButtonTitle : 'Continue'
         })]
       })]
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.42.0",
+  "version": "2.42.2",
   "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/ObjectArray/styled-components.d.ts

@@ -13,6 +13,7 @@ export declare const FlexForm: import("styled-components/dist/types").IStyledCom
 export declare const TabName: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export declare const Trash: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export declare const ListContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
+export declare const DetailMargin: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export declare const IconPadding: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export declare const UpdateListContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
 export declare const CompleteContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;