@abgov/jsonforms-components 1.19.2 → 1.19.3

package/index.esm.js

@@ -1,6 +1,6 @@
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import React, { createContext, useContext, useReducer, useMemo, useEffect, useState, useCallback } from 'react';
-import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputDateTime, GoAInputTime, GoADropdown, GoADropdownItem, GoARadioGroup, GoARadioItem, GoACheckbox, GoAGrid, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoADetails } from '@abgov/react-components';
+import { GoAFormItem, GoAInput, GoATextArea, GoACallout, GoAInputDate, GoAInputDateTime, GoAInputTime, GoADropdown, GoADropdownItem, GoARadioGroup, GoARadioItem, GoACheckbox, GoAGrid, GoADivider, GoAFormStepper, GoAFormStep, GoAPages, GoAButton, GoAModal, GoAButtonGroup, GoAIconButton, GoAFileUploadInput, GoACircularProgress, GoAContainer, GoADetails } from '@abgov/react-components';
 import styled from 'styled-components';
 import axios from 'axios';
 import get$1 from 'lodash/get';
@@ -4564,7 +4564,7 @@ const objToArray = obj => {
     if (typeof value === 'object' && !Array.isArray(value)) {
       return [key, objToArray(value)];
     }
-    return [key, value];
+    return [key, getValue(value)];
   });
 };
 // test for ['name', 'fred']
@@ -4575,13 +4575,16 @@ const isNameValuePair = value => {
 const isNestedValue = value => {
   return Array.isArray(value) && value.length === 2 && typeof value[0] === 'string' && Array.isArray(value[1]);
 };
+const isObjectArray = value => {
+  return Array.isArray(value) && value.length > 0 && typeof value[0] === 'object';
+};
 /*
  * Convert ['name', [['first', 'fred'], ['middle', 'jolly'], ['last', 'mcguire']]]
  * into [['first', 'fred'], ['middle', 'jolly'], ['last', 'mcguire']]
  */
 const flatten = arr => {
   return arr.reduce((acc, val) => {
-    if (typeof val === 'string') {
+    if (typeof val === 'string' || !val) {
       return acc;
     }
     if (isNestedValue(val)) {
@@ -4590,7 +4593,7 @@ const flatten = arr => {
     }
     // If the current value is a string, add it to the accumulator
     if (isNameValuePair(val)) {
-      return acc.concat([val]);
+      return acc.concat([[String(val[0]), getValue(val[1]) || '']]);
     }
     return acc;
   }, []);
@@ -4607,14 +4610,19 @@ const flatten = arr => {
  * page before messing with it.
  */
 const getFormFieldValue = (scope, data) => {
-  const pathArray = scope.replace('#/properties/', '').replace('properties/', '').split('/');
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let currentValue = data;
-  for (const key of pathArray) {
-    if (!currentValue) break;
-    currentValue = currentValue[key];
+  if (scope) {
+    const pathArray = scope.replace('#/properties/', '').replace('properties/', '').split('/');
+    for (const key of pathArray) {
+      if (!currentValue) break;
+      currentValue = currentValue[key];
+    }
   }
-  return typeof currentValue === 'object' ? {
+  return isObjectArray(currentValue) ? {
+    type: 'array',
+    value: objToArray(currentValue)
+  } : typeof currentValue === 'object' ? {
     type: 'object',
     value: flatten(objToArray(currentValue))
   } : {
@@ -4663,9 +4671,26 @@ fileList, downloadFile) => {
   return jsxs(React.Fragment, {
     children: [fieldValues.type === 'primitive' && renderValue(`${label}${asterisk}: `, `${index}`, fieldValues.value, fileUploaderElement, downloadFile), fieldValues.type === 'object' && values && values.length > 0 && values.map((v, i) => {
       return renderValue(`${v[0]}: `, `${index}:${i}`, v[1]);
-    })]
+    }), fieldValues.type === 'array' && values && values.length > 0 && renderListDetails(values)]
   }, index);
 };
+const renderListDetails = items => {
+  return jsx(React.Fragment, {
+    children: items.map((item, itemIndex) => {
+      const details = Array.isArray(item) ? item : [undefined, [undefined, undefined]];
+      return jsxs(Fragment, {
+        children: [jsx(Grid, {
+          children: details[1].map((detail, detailIndex) => {
+            const safeDetail = Array.isArray(detail) ? detail : [undefined, undefined];
+            return renderValue(`${safeDetail[0]}: `, `item-${itemIndex}-detail-${detailIndex}}`, safeDetail[1]);
+          })
+        }, `item-${itemIndex}`), itemIndex < items.length - 1 ? jsx(GoADivider, {
+          mb: "m"
+        }) : null]
+      });
+    })
+  });
+};
 
 const renderReviewListWithDetail = (element,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.19.2",
+  "version": "1.19.3",
   "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/util/GenerateFormFields.d.ts

@@ -2,8 +2,9 @@ import { LabelDescription } from '@jsonforms/core';
 type jsonformsLabel = string | boolean | LabelDescription | undefined;
 export declare const labelToString: (label: jsonformsLabel, scope: string) => string;
 export interface InputValue {
-    type: 'primitive' | 'object';
-    value?: string | string[][];
+    type: 'primitive' | 'object' | 'array';
+    value?: string | NestedStringArray;
 }
+export type NestedStringArray = (string | undefined | NestedStringArray)[];
 export declare const getFormFieldValue: (scope: string, data: unknown) => InputValue;
 export {};