@abgov/jsonforms-components 1.15.6 → 1.15.8

package/README.md

@@ -63,7 +63,7 @@ import { JsonFormContextInstance } from '@abgov/jsonforms-components';
       processCarBrands
     );
 
-    JsonFormContextInstance.addData(
+    JsonFormContextInstance.addFormContextData(
       'countries',
       Countries.map((country) => country.country)
     );

package/index.esm.js

@@ -3756,144 +3756,160 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const getAxiosInterceptorConfig = axios => {
-  const requestId = axios.interceptors.request.use(req => {
-    if (req.data === undefined) {
-      throw new Error(`The URL: ${req.url} encountered a CORS error.`);
-    }
-    return req;
-  });
-  return [requestId, axios];
-};
-const addDataByUrl = (key, url, processDataFunction, token) => __awaiter(void 0, void 0, void 0, function* () {
-  let header = {};
-  const [requestId, axiosWithConfig] = getAxiosInterceptorConfig(axios);
-  if (token) {
-    header = Object.assign(Object.assign({}, header), {
-      Authorization: `Bearer ${token}`
+class ContextProviderClass {
+  addDataByUrl(key, url, processDataFunction, token) {
+    return __awaiter(this, void 0, void 0, function* () {
+      let header = {};
+      const [requestId, axiosWithConfig] = this.getAxiosInterceptorConfig(axios);
+      if (token) {
+        header = Object.assign(Object.assign({}, header), {
+          Authorization: `Bearer ${token}`
+        });
+      }
+      yield axiosWithConfig.get(url, header).then(response => {
+        const processedData = processDataFunction(response.data);
+        this.enumValues.set(key, () => processedData);
+      }).catch(err => {
+        if (err.message.includes('CORS')) {
+          console.warn(err.message);
+        } else {
+          console.warn(`addDataByUrl: ${err.message}`);
+        }
+      });
+      axiosWithConfig.interceptors.request.eject(requestId);
     });
   }
-  yield axiosWithConfig.get(url, header).then(response => {
-    const processedData = processDataFunction(response.data);
-    enumValues.set(key, () => processedData);
-  }).catch(err => {
-    if (err.message.includes('CORS')) {
-      console.warn(err.message);
-    } else {
-      console.warn(`addDataByUrl: ${err.message}`);
-    }
-  });
-  axiosWithConfig.interceptors.request.eject(requestId);
-});
-function addDataByOptions(key, url, location, type, values = ['']) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const dataFunction = data => {
-    let dataLink = data;
-    let returnData = [''];
-    const locationArray = location && Array.isArray(location) ? location : [location];
-    const locationArrayTyped = locationArray;
-    locationArrayTyped === null || locationArrayTyped === void 0 ? void 0 : locationArrayTyped.forEach(attribute => {
-      dataLink = dataLink[attribute];
-    });
-    const valuesArray = Array.isArray(values) ? values : [values];
-    if (type === 'keys') {
-      returnData = Object.keys(dataLink);
-    } else {
+  constructor() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.enumValues = new Map();
+    this.enumFunctions = new Map();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.enumSubmitFunctions = new Map();
+    this.addFormContextData = (key, data) => {
+      this.enumValues.set(key, () => data);
+    };
+    this.setup = props => {
+      var _a, _b;
+      this.selfProps = props;
+      if (props.fileManagement) {
+        const {
+          fileList,
+          uploadFile,
+          downloadFile,
+          deleteFile
+        } = props.fileManagement;
+        this.enumValues.set('file-list', () => fileList);
+        this.enumFunctions.set('upload-file', () => uploadFile);
+        this.enumFunctions.set('download-file', () => downloadFile);
+        this.enumFunctions.set('delete-file', () => deleteFile);
+      }
+      if (props.submit) {
+        const {
+          submitForm
+        } = props.submit;
+        const submitFunction = submitForm;
+        this.enumSubmitFunctions.set('submit-form', () => submitFunction);
+      }
+      if (props.data) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (_a = props.data) === null || _a === void 0 ? void 0 : _a.forEach(item => {
+          this.enumValues.set(Object.keys(item)[0], () => item);
+        });
+      }
+      if (!props.children) {
+        return null;
+      }
+      return jsx(JsonFormContext.Provider, {
+        value: this.baseEnumerator,
+        children: (_b = this.selfProps) === null || _b === void 0 ? void 0 : _b.children
+      });
+    };
+    this.getContextProvider = () => {
+      var _a;
+      return jsx(JsonFormContext.Provider, {
+        value: this.baseEnumerator,
+        children: (_a = this.selfProps) === null || _a === void 0 ? void 0 : _a.children
+      });
+    };
+    this.getAxiosInterceptorConfig = axios => {
+      const requestId = axios.interceptors.request.use(req => {
+        if (req.data === undefined) {
+          throw new Error(`The URL: ${req.url} encountered a CORS error.`);
+        }
+        return req;
+      });
+      return [requestId, axios];
+    };
+    this.addDataByOptions = (key, url, location, type, values = ['']) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      returnData = dataLink.map(entry => {
-        let parse = '';
-        valuesArray.forEach((v, index) => {
-          parse += `${entry[v]}`;
-          if (index < valuesArray.length - 1) {
-            parse += ' ';
-          }
+      const dataFunction = data => {
+        let dataLink = data;
+        let returnData = [''];
+        const locationArray = location && Array.isArray(location) ? location : [location];
+        const locationArrayTyped = locationArray;
+        locationArrayTyped === null || locationArrayTyped === void 0 ? void 0 : locationArrayTyped.forEach(attribute => {
+          dataLink = dataLink[attribute];
+        });
+        const valuesArray = Array.isArray(values) ? values : [values];
+        if (type === 'keys') {
+          returnData = Object.keys(dataLink);
+        } else {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          returnData = dataLink.map(entry => {
+            let parse = '';
+            valuesArray.forEach((v, index) => {
+              parse += `${entry[v]}`;
+              if (index < valuesArray.length - 1) {
+                parse += ' ';
+              }
+            });
+            return parse;
+          });
+        }
+        return returnData;
+      };
+      this.addDataByUrl(key, url, dataFunction);
+    };
+    /**
+     * Grabs data stored under a given key
+     *
+     */
+    // FIXME give some clue as to what data is being fetched.
+    // e.g.is it getFormContextData?
+    this.getFormContextData = key => {
+      const dataFunction = this.baseEnumerator.data.get(key);
+      return dataFunction && dataFunction();
+    };
+    /**
+     * Grabs all data
+     *
+     */
+    this.getAllFormContextData = () => {
+      const allData = [];
+      this.baseEnumerator.data.forEach((d, key) => {
+        allData.push({
+          [key]: d()
         });
-        return parse;
       });
-    }
-    return returnData;
-  };
-  addDataByUrl(key, url, dataFunction);
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const enumValues = new Map();
-const enumFunctions = new Map();
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const enumSubmitFunctions = new Map();
-const baseEnumerator = {
-  data: enumValues,
-  functions: enumFunctions,
-  submitFunction: enumSubmitFunctions,
-  isFormSubmitted: false
-};
-const JsonFormContext = /*#__PURE__*/createContext(baseEnumerator);
-function ContextProvider(props) {
-  var _a, _b;
-  baseEnumerator.isFormSubmitted = (_a = props.isFormSubmitted) !== null && _a !== void 0 ? _a : false;
-  if (props.fileManagement) {
-    const {
-      fileList,
-      uploadFile,
-      downloadFile,
-      deleteFile
-    } = props.fileManagement;
-    enumValues.set('file-list', () => fileList);
-    enumFunctions.set('upload-file', () => uploadFile);
-    enumFunctions.set('download-file', () => downloadFile);
-    enumFunctions.set('delete-file', () => deleteFile);
-  }
-  if (props.submit) {
-    const {
-      submitForm
-    } = props.submit;
-    const submitFunction = submitForm;
-    enumSubmitFunctions.set('submit-form', () => submitFunction);
-  }
-  if (props.data) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (_b = props.data) === null || _b === void 0 ? void 0 : _b.forEach(item => {
-      enumValues.set(Object.keys(item)[0], () => item);
-    });
-  }
-  if (!props.children) {
-    return null;
+      return allData;
+    };
+    this.baseEnumerator = {
+      data: this.enumValues,
+      functions: this.enumFunctions,
+      submitFunction: this.enumSubmitFunctions,
+      addFormContextData: this.addFormContextData,
+      addDataByOptions: this.addDataByOptions,
+      addDataByUrl: this.addDataByUrl,
+      getFormContextData: this.getFormContextData,
+      getAllFormContextData: this.getAllFormContextData
+    };
+    this.selfProps = {};
   }
-  return jsx(JsonFormContext.Provider, {
-    value: baseEnumerator,
-    children: props.children
-  });
-}
-/**
- * Grabs data stored under a given key
- *
- */
-// FIXME give some clue as to what data is being fetched.
-// e.g.is it getFormContextData?
-function getData(key) {
-  const dataFunction = baseEnumerator.data.get(key);
-  return dataFunction && dataFunction();
-}
-/**
- * Grabs all data
- *
- */
-function getAllData() {
-  const allData = [];
-  baseEnumerator.data.forEach((d, key) => {
-    allData.push({
-      [key]: d()
-    });
-  });
-  return allData;
-}
-/**
- * Allows additional data to be added under a given key
- *
- * This data will then be available inside the context
- */
-function addData(key, data) {
-  enumValues.set(key, () => data);
 }
+const ContextProviderC = new ContextProviderClass();
+const ContextProvider = ContextProviderC.setup;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const JsonFormContext = /*#__PURE__*/createContext(null);
 
 const EnumSelect = props => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -3910,6 +3926,7 @@ const EnumSelect = props => {
     label,
     uischema
   } = props;
+  const enumerators = useContext(JsonFormContext);
   let enumData = (schema === null || schema === void 0 ? void 0 : schema.enum) || [];
   const appliedUiSchemaOptions = merge({}, config, props.uischema.options, options);
   const dataKey = (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.enumContext) === null || _b === void 0 ? void 0 : _b.key;
@@ -3920,11 +3937,11 @@ const EnumSelect = props => {
   const errorsFormInput = checkFieldValidity(props);
   useEffect(() => {
     if (dataKey && url) {
-      addDataByOptions(dataKey, url, location, type, values);
+      enumerators.addDataByOptions(dataKey, url, location, type, values);
     }
-  }, [url, location, type, values, dataKey]);
-  if (dataKey && getData(dataKey)) {
-    const newData = getData(dataKey);
+  }, [url, location, type, values, dataKey, enumerators]);
+  if (dataKey && enumerators.getFormContextData(dataKey)) {
+    const newData = enumerators.getFormContextData(dataKey);
     enumData = newData;
   }
   return jsx(GoADropdown, Object.assign({
@@ -3967,6 +3984,7 @@ const EnumSelectAutoComplete = props => {
     label
   } = props;
   let enumData = (schema === null || schema === void 0 ? void 0 : schema.enum) || [];
+  const enumerators = useContext(JsonFormContext);
   const dataKey = (_b = (_a = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _a === void 0 ? void 0 : _a.enumContext) === null || _b === void 0 ? void 0 : _b.key;
   const url = (_d = (_c = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _c === void 0 ? void 0 : _c.enumContext) === null || _d === void 0 ? void 0 : _d.url;
   const location = (_f = (_e = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _e === void 0 ? void 0 : _e.enumContext) === null || _f === void 0 ? void 0 : _f.location;
@@ -3974,11 +3992,11 @@ const EnumSelectAutoComplete = props => {
   const values = (_k = (_j = uischema === null || uischema === void 0 ? void 0 : uischema.options) === null || _j === void 0 ? void 0 : _j.enumContext) === null || _k === void 0 ? void 0 : _k.values;
   useEffect(() => {
     if (dataKey && url) {
-      addDataByOptions(dataKey, url, location, type, values);
+      enumerators.addDataByOptions(dataKey, url, location, type, values);
     }
-  }, [url, location, type, values, dataKey]);
-  if (dataKey && getData(dataKey)) {
-    const newData = getData(dataKey);
+  }, [url, location, type, values, dataKey, enumerators]);
+  if (dataKey && enumerators.getFormContextData(dataKey)) {
+    const newData = enumerators.getFormContextData(dataKey);
     // eslint-disable-next-line
     enumData = newData;
   }
@@ -4040,7 +4058,7 @@ const RadioGroup = props => {
   return jsx(GoARadioGroup, Object.assign({
     error: errorsFormInput.length > 0,
     name: `${options || appliedUiSchemaOptions.label}`,
-    testId: `${id || label}-jsonform-dropdown`,
+    testId: `${label || id}-jsonforms-radio`,
     value: data,
     disabled: !enabled
   }, appliedUiSchemaOptions, {
@@ -4548,10 +4566,12 @@ const RenderStepElements = props => {
 const validateData = (jsonSchema, data, ajv) => {
   const newSchema = JSON.parse(JSON.stringify(jsonSchema));
   Object.keys(newSchema.properties || {}).forEach(propertyName => {
-    var _a;
+    var _a, _b, _c, _d;
     const property = newSchema.properties || {};
-    property[propertyName].enum = getData(propertyName);
-    if (((_a = property[propertyName]) === null || _a === void 0 ? void 0 : _a.format) === 'file-urn') {
+    if (((_a = property[propertyName]) === null || _a === void 0 ? void 0 : _a.enum) && ((_b = property[propertyName]) === null || _b === void 0 ? void 0 : _b.enum[0]) === '') {
+      (_c = property[propertyName]) === null || _c === void 0 ? true : delete _c.enum;
+    }
+    if (((_d = property[propertyName]) === null || _d === void 0 ? void 0 : _d.format) === 'file-urn') {
       delete property[propertyName].format;
     }
   });
@@ -4603,7 +4623,7 @@ const FormStepper = props => {
     t
   } = props;
   const enumerators = useContext(JsonFormContext);
-  const submitFormFunction = enumerators.submitFunction.get('submit-form');
+  const submitFormFunction = enumerators === null || enumerators === void 0 ? void 0 : enumerators.submitFunction.get('submit-form');
   const submitForm = submitFormFunction && submitFormFunction();
   const categorization = uischema;
   const allCategories = JSON.parse(JSON.stringify(categorization));
@@ -4926,6 +4946,8 @@ const FileUploader = _a => {
   const deleteTriggerFunction = enumerators.functions.get('delete-file');
   const deleteTrigger = deleteTriggerFunction && deleteTriggerFunction();
   const fileListValue = enumerators.data.get('file-list');
+  const countries = ['Argentina', 'Brazil', 'Canada', 'Denmark', 'Egypt', 'France', 'Greece', 'India', 'Japan', 'Kenya'];
+  enumerators.addFormContextData('countries', countries);
   // eslint-disable-next-line
   const fileList = fileListValue && fileListValue();
   const {
@@ -5883,8 +5905,6 @@ const ajv = new Ajv({
 //Example format: urn:ads:platform:file-service:v1:/files/f6de737e-c5fc-42fe-963b-28bfe14597c4
 ajv.addFormat('file-urn', /^urn:ads:platform:file-service:v[0-9]:\/files\/[a-zA-Z0-9.-]*$/);
 
-const countries = ['Argentina', 'Brazil', 'Canada', 'Denmark', 'Egypt', 'France', 'Greece', 'India', 'Japan', 'Kenya'];
-addData('countries', countries);
 const GoABaseRenderers = [
 // controls
 {
@@ -5961,4 +5981,4 @@ const GoARenderers = [...GoABaseRenderers, {
 }];
 const GoACells = [...InputCells];
 
-export { ContextProvider, GoABaseRenderers, GoACells, GoARenderers, JsonFormContext, addData, addDataByOptions, addDataByUrl, ajv, getAllData, getAxiosInterceptorConfig, getData };
+export { ContextProvider, ContextProviderC, GoABaseRenderers, GoACells, GoARenderers, JsonFormContext, ajv };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.15.6",
+  "version": "1.15.8",
   "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/ContextProvider.d.ts

@@ -0,0 +1,69 @@
+import React from 'react';
+import { AxiosStatic } from 'axios';
+interface AllData {
+    [x: string]: any;
+}
+export interface enumerators {
+    data: Map<string, () => any>;
+    functions: Map<string, () => (file: File, propertyId: string) => void | undefined>;
+    submitFunction: Map<string, () => (id: string) => void | undefined>;
+    addFormContextData: (key: string, data: Record<string, unknown> | unknown[]) => void;
+    addDataByOptions: (key: string, url: string, location: string[] | string, type: string, values?: string[] | string) => string[];
+    addDataByUrl: (key: string, url: string, processDataFunction: (data: object) => string[], token?: string) => void;
+    getFormContextData: (key: string) => Record<string, any>;
+    getAllFormContextData: () => AllData;
+}
+interface FileManagement {
+    fileList?: any;
+    uploadFile?: (file: File, propertyId: string) => void;
+    downloadFile?: (file: File) => void;
+    deleteFile?: (file: File) => void;
+}
+interface SubmitManagement {
+    submitForm?: (any: any) => void;
+}
+type Props = {
+    children?: React.ReactNode;
+    fileManagement?: FileManagement;
+    submit?: SubmitManagement;
+    isFormSubmitted?: boolean;
+    data?: any;
+};
+declare class ContextProviderClass {
+    selfProps: Props | undefined;
+    enumValues: Map<string, () => Record<string, any>>;
+    enumFunctions: Map<string, () => ((file: File, propertyId: string) => void) | undefined>;
+    enumSubmitFunctions: Map<string, () => ((data: any) => void) | undefined>;
+    baseEnumerator: {
+        data: Map<string, () => Record<string, any>>;
+        functions: Map<string, () => ((file: File, propertyId: string) => void) | undefined>;
+        submitFunction: Map<string, () => ((data: any) => void) | undefined>;
+        addFormContextData: (key: string, data: Record<string, unknown> | unknown[]) => void;
+        addDataByOptions: (key: string, url: string, location: string[] | string, type: string, values?: string[] | string) => void;
+        addDataByUrl: (key: string, url: string, processDataFunction: (data: object) => string[], token?: string) => void;
+        getFormContextData: (key: string) => Record<string, any> | undefined;
+        getAllFormContextData: () => AllData;
+        isFormSubmitted?: boolean;
+    };
+    addFormContextData: (key: string, data: Record<string, unknown> | unknown[]) => void;
+    addDataByUrl(key: string, url: string, processDataFunction: (data: object) => string[], token?: string): Promise<void>;
+    constructor();
+    setup: (props: Props) => import("react/jsx-runtime").JSX.Element | null;
+    getContextProvider: () => import("react/jsx-runtime").JSX.Element;
+    getAxiosInterceptorConfig: (axios: AxiosStatic) => [number, AxiosStatic];
+    addDataByOptions: (key: string, url: string, location: string[] | string, type: string, values?: string[] | string) => void;
+    /**
+     * Grabs data stored under a given key
+     *
+     */
+    getFormContextData: (key: string) => Record<string, any> | undefined;
+    /**
+     * Grabs all data
+     *
+     */
+    getAllFormContextData: () => AllData;
+}
+export declare const ContextProviderC: ContextProviderClass;
+export declare const ContextProvider: (props: Props) => import("react/jsx-runtime").JSX.Element | null;
+export declare const JsonFormContext: React.Context<any>;
+export {};

package/src/lib/Context/index.d.ts

@@ -1,48 +1 @@
-import React from 'react';
-import { AxiosStatic } from 'axios';
-export interface AllData {
-    [x: string]: any;
-}
-export declare const getAxiosInterceptorConfig: (axios: AxiosStatic) => [number, AxiosStatic];
-export declare const addDataByUrl: (key: string, url: string, processDataFunction: (data: object) => string[], token?: string) => Promise<void>;
-export declare function addDataByOptions(key: string, url: string, location: string[] | string, type: string, values?: string[] | string): void;
-interface FileManagement {
-    fileList?: any;
-    uploadFile?: (file: File, propertyId: string) => void;
-    downloadFile?: (file: File) => void;
-    deleteFile?: (file: File) => void;
-}
-interface SubmitManagement {
-    submitForm?: (any: any) => void;
-}
-type Props = {
-    children?: React.ReactNode;
-    fileManagement?: FileManagement;
-    submit?: SubmitManagement;
-    isFormSubmitted?: boolean;
-    data?: any;
-};
-export declare const JsonFormContext: React.Context<{
-    data: Map<string, () => Record<string, any>>;
-    functions: Map<string, () => ((file: File, propertyId: string) => void) | undefined>;
-    submitFunction: Map<string, () => ((data: any) => void) | undefined>;
-    isFormSubmitted: boolean;
-}>;
-export declare function ContextProvider(props: Props): JSX.Element | null;
-/**
- * Grabs data stored under a given key
- *
- */
-export declare function getData(key: string): Record<string, any> | undefined;
-/**
- * Grabs all data
- *
- */
-export declare function getAllData(): AllData;
-/**
- * Allows additional data to be added under a given key
- *
- * This data will then be available inside the context
- */
-export declare function addData(key: string, data: Record<string, unknown> | unknown[]): void;
-export {};
+export * from './ContextProvider';