@abgov/jsonforms-components 1.18.0 → 1.19.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+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 styled from 'styled-components';
@@ -2883,9 +2883,15 @@ const JsonFormRegisterProvider = ({
     return {
       isProvided: true,
       registerDispatch: dispatch,
-      selectRegisterDataByUrl: url => {
-        var _a;
-        return ((_a = registers === null || registers === void 0 ? void 0 : registers.find(r => r.url === url)) === null || _a === void 0 ? void 0 : _a.data) || [];
+      selectRegisterData: criteria => {
+        var _a, _b;
+        if (criteria === null || criteria === void 0 ? void 0 : criteria.url) {
+          return ((_a = registers === null || registers === void 0 ? void 0 : registers.find(r => r.url === criteria.url)) === null || _a === void 0 ? void 0 : _a.data) || [];
+        }
+        if (criteria === null || criteria === void 0 ? void 0 : criteria.urn) {
+          return ((_b = registers === null || registers === void 0 ? void 0 : registers.find(r => r.urn === criteria.urn)) === null || _b === void 0 ? void 0 : _b.data) || [];
+        }
+        return [];
       },
       fetchRegisterByUrl: registerConfig => __awaiter(void 0, void 0, void 0, function* () {
         // Prevent re-freshing remote data
@@ -2932,7 +2938,10 @@ const JsonFormRegisterProvider = ({
   }, [dispatch, defaultRegisters]);
   /* The client might use the context outside of the Jsonform to provide custom register data */
   if (registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.isProvided) {
-    return children;
+    // eslint-disable-next-line
+    return jsx(Fragment, {
+      children: children
+    });
   }
   return jsx(JsonFormsRegisterContext.Provider, {
     value: context,
@@ -3623,7 +3632,7 @@ const GoATimeControlTester = rankWith(4, isTimeControl);
 const GoAInputTimeControl = withJsonFormsControlProps(GoATimeControl);
 
 function fetchRegisterConfigFromOptions(options) {
-  if (!(options === null || options === void 0 ? void 0 : options.url)) return undefined;
+  if (!(options === null || options === void 0 ? void 0 : options.url) && !(options === null || options === void 0 ? void 0 : options.urn)) return undefined;
   const config = Object.assign({}, options);
   return config;
 }
@@ -3647,7 +3656,7 @@ const EnumSelect = props => {
   const registerConfig = fetchRegisterConfigFromOptions((_b = (_a = props.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.register);
   let registerData = [];
   if (registerConfig) {
-    registerData = registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.selectRegisterDataByUrl(registerConfig.url);
+    registerData = registerCtx === null || registerCtx === void 0 ? void 0 : registerCtx.selectRegisterData(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 appliedUiSchemaOptions = merge({}, config, props.uischema.options);
@@ -4611,9 +4620,15 @@ const getFormFieldValue = (scope, data) => {
     value: flatten(objToArray(currentValue))
   } : {
     type: 'primitive',
-    value: currentValue
+    value: getValue(currentValue)
   };
 };
+const getValue = currentValue => {
+  if (typeof currentValue === 'boolean') {
+    return currentValue ? 'Yes' : 'No';
+  }
+  return currentValue ? String(currentValue) : undefined;
+};
 
 const renderValue = (label, key,
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -4956,7 +4971,7 @@ const FormStepper = props => {
                     })]
                   }), jsx(Grid, {
                     children: jsx(RenderFormReviewFields, {
-                      elements: category.elements,
+                      elements: category === null || category === void 0 ? void 0 : category.elements,
                       data: data,
                       requiredFields: requiredFields
                     })
@@ -4965,7 +4980,7 @@ const FormStepper = props => {
               })
             })]
           })]
-        }), step && step !== 0 && jsxs(GoAGrid, {
+        }), step !== 0 && jsxs(GoAGrid, {
           minChildWidth: "100px",
           children: [jsx("div", {
             children: step !== 1 ? jsx(GoAButton, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.18.0",
+  "version": "1.19.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/Context/register/registerContext.d.ts

@@ -3,7 +3,7 @@ import { RegisterConfig, RegisterData, JsonFormRegisterDispatch } from './action
 interface JsonFormsRegisterContextProps {
     registerDispatch: JsonFormRegisterDispatch;
     fetchRegisterByUrl: (registerConfig: RegisterConfig) => Promise<void>;
-    selectRegisterDataByUrl: (url: string) => string[];
+    selectRegisterData: (registerConfig: RegisterConfig) => string[];
     isProvided: boolean;
 }
 export declare const JsonFormsRegisterContext: import("react").Context<JsonFormsRegisterContextProps | undefined>;
@@ -11,5 +11,5 @@ interface JsonFormsRegisterProviderProps {
     children: ReactNode;
     defaultRegisters: RegisterConfig[] | RegisterData | undefined;
 }
-export declare const JsonFormRegisterProvider: ({ children, defaultRegisters, }: JsonFormsRegisterProviderProps) => JSX.Element | ReactNode;
+export declare const JsonFormRegisterProvider: ({ children, defaultRegisters, }: JsonFormsRegisterProviderProps) => JSX.Element;
 export {};

package/src/lib/Controls/FormStepper/util/GenerateFormFields.d.ts

@@ -3,7 +3,7 @@ type jsonformsLabel = string | boolean | LabelDescription | undefined;
 export declare const labelToString: (label: jsonformsLabel, scope: string) => string;
 export interface InputValue {
     type: 'primitive' | 'object';
-    value?: string[][];
+    value?: string | string[][];
 }
 export declare const getFormFieldValue: (scope: string, data: unknown) => InputValue;
 export {};