@arquimedes.co/eureka-forms 1.9.61-test → 1.9.62-test

package/dist/@Types/Form.d.ts

@@ -11,7 +11,7 @@ export interface Form {
     hasCaptcha?: boolean;
     isStandAlone?: boolean;
     style?: FormStyle;
-    classifiers?: Record<string, ParentClassifier>;
+    classifiers?: Record<string, Classifier>;
     terms?: Term[];
 }
 export interface FormSize {
@@ -36,9 +36,7 @@ interface TermLink {
 export interface Classifier {
     _id: string;
     name: string;
-}
-export interface ParentClassifier extends Classifier {
-    children: Classifier[];
+    children: string[];
 }
 export type FormStyle = MaterialStyle;
 export type StyleKeys = keyof Omit<FormStyle, 'type'>;

package/dist/App.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { Form } from './@Types/Form';
+import { Classifier, Form } from './@Types/Form';
 export interface AppProps {
     /** If the app is currently a widget */
     isWidget?: boolean;
@@ -25,6 +25,8 @@ export interface AppProps {
     valuesData?: Record<string, unknown>;
     /** Custom steps to display */
     customSteps?: Record<string, CustomStep>;
+    /** Classifiers dict */
+    classifiers?: Record<string, Classifier>;
     /** Custom function to call on send */
     customSend?: (values: any, reload: Function) => Promise<void>;
     /** Custom submit buttons */
@@ -39,7 +41,7 @@ export interface CustomStep {
     component: ReactNode;
     calcValue?: (step: any, value: any) => any;
 }
-declare function App({ apiKey, domain, preview, partial, formData, postview, editable, isWidget, internal, valuesData, customSend, customSteps, handleConfirmed, ...others }: AppProps): JSX.Element;
+declare function App({ apiKey, domain, preview, partial, formData, postview, editable, isWidget, internal, valuesData, customSend, customSteps, classifiers, handleConfirmed, ...others }: AppProps): JSX.Element;
 export default App;
 export declare enum SIZES {
     SMALL = "SMALL",

package/dist/App.js

@@ -74,12 +74,12 @@ import { stringToDraft, getRawText, } from './FormComponents/Step/TextAreaStep/M
 function App(_a) {
     var _this = this;
     var _b, _c, _d, _e;
-    var apiKey = _a.apiKey, domain = _a.domain, preview = _a.preview, partial = _a.partial, formData = _a.formData, postview = _a.postview, _f = _a.editable, editable = _f === void 0 ? true : _f, isWidget = _a.isWidget, internal = _a.internal, valuesData = _a.valuesData, customSend = _a.customSend, customSteps = _a.customSteps, handleConfirmed = _a.handleConfirmed, others = __rest(_a, ["apiKey", "domain", "preview", "partial", "formData", "postview", "editable", "isWidget", "internal", "valuesData", "customSend", "customSteps", "handleConfirmed"]);
+    var apiKey = _a.apiKey, domain = _a.domain, preview = _a.preview, partial = _a.partial, formData = _a.formData, postview = _a.postview, _f = _a.editable, editable = _f === void 0 ? true : _f, isWidget = _a.isWidget, internal = _a.internal, valuesData = _a.valuesData, customSend = _a.customSend, customSteps = _a.customSteps, classifiers = _a.classifiers, handleConfirmed = _a.handleConfirmed, others = __rest(_a, ["apiKey", "domain", "preview", "partial", "formData", "postview", "editable", "isWidget", "internal", "valuesData", "customSend", "customSteps", "classifiers", "handleConfirmed"]);
     var _g = useState(undefined), form = _g[0], setForm = _g[1];
     var _h = useState({}), originalValues = _h[0], setOriginalValues = _h[1];
     var _j = useState(undefined), organizationInfo = _j[0], setOrganizationInfo = _j[1];
     var migrateFormData = function (formData, valuesData) {
-        var form = migrateForm(formData);
+        var form = migrateForm(formData, classifiers);
         var steps = Object.values(form.steps);
         var hasCBR = steps.find(function (step) {
             return step.type.startsWith('CBR');
@@ -289,7 +289,7 @@ export var SizesToNum = (_a = {},
     _a[SIZES.MEDIUM] = 2,
     _a[SIZES.SMALL] = 1,
     _a);
-var migrateForm = function (form) {
+var migrateForm = function (form, classifiers) {
     var steps = __assign({}, form.steps);
     for (var _i = 0, _a = Object.keys(form.steps); _i < _a.length; _i++) {
         var idStep = _a[_i];
@@ -333,6 +333,32 @@ var migrateForm = function (form) {
     if (form.style === undefined) {
         newForm.style = InternalFormStyle;
     }
+    if (form.classifiers) {
+        var mappedClassifiers = {};
+        for (var _b = 0, _c = Object.keys(form.classifiers); _b < _c.length; _b++) {
+            var idClassifier = _c[_b];
+            var classifer = __assign({}, form.classifiers[idClassifier]);
+            mappedClassifiers[idClassifier] = classifer;
+            if (classifer.children &&
+                classifer.children.find(function (child) { return typeof child !== 'string'; })) {
+                var children = [];
+                for (var _d = 0, _e = classifer.children; _d < _e.length; _d++) {
+                    var child = _e[_d];
+                    if (typeof child === 'string') {
+                        children.push(child);
+                    }
+                    else if (child._id) {
+                        mappedClassifiers[child._id] = child;
+                        children.push(child._id);
+                    }
+                }
+            }
+        }
+        newForm.classifiers = mappedClassifiers;
+    }
+    else if (classifiers) {
+        newForm.classifiers = classifiers;
+    }
     return newForm;
 };
 function getStaticWidth(step) {
@@ -400,7 +426,7 @@ var mapOriginalValues = function (originalValues, form) {
     return newValues;
 };
 var mapOriginalValue = function (step, value, form) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     switch (step === null || step === void 0 ? void 0 : step.type) {
         case StepTypes.TEXTAREA: {
             if (step.hasTextEditor) {
@@ -415,11 +441,11 @@ var mapOriginalValue = function (step, value, form) {
             return value;
         }
         case StepTypes.CLASSIFIER_SELECTOR: {
-            var classifier = (_b = form.classifiers) === null || _b === void 0 ? void 0 : _b[(_c = step.idClassifier) !== null && _c !== void 0 ? _c : ''];
-            if (classifier) {
-                var option = classifier.children.find(function (child) { return child._id == value; });
+            var stepClassifier = (_b = form.classifiers) === null || _b === void 0 ? void 0 : _b[(_c = step.idClassifier) !== null && _c !== void 0 ? _c : ''];
+            if (stepClassifier) {
+                var classifier = (_d = form.classifiers) === null || _d === void 0 ? void 0 : _d[value];
                 if (!(value === null || value === void 0 ? void 0 : value.value))
-                    return { value: value, label: option === null || option === void 0 ? void 0 : option.name };
+                    return { value: value, label: classifier === null || classifier === void 0 ? void 0 : classifier.name };
             }
             break;
         }

package/dist/FormComponents/Step/ClassifierSelectorStep/MaterialClassifierSelectorStep/MaterialClassifierSelectorStep.js

@@ -43,20 +43,13 @@ function ClassifierSelector(_a) {
         return _jsx("div", {});
     }
     var options = classifier.children
-        .filter(function (classifier) {
+        .filter(function (idClassifier) { var _a; return ((_a = step.options[idClassifier]) === null || _a === void 0 ? void 0 : _a.type) !== ClassifierOptionTypes.HIDE; })
+        .map(function (idClassifier) {
         var _a;
-        return ((_a = step.options[typeof classifier === 'string'
-            ? classifier
-            : classifier === null || classifier === void 0 ? void 0 : classifier._id]) === null || _a === void 0 ? void 0 : _a.type) !== ClassifierOptionTypes.HIDE;
-    })
-        .map(function (classifier) {
-        var _a, _b;
-        return typeof classifier === 'string'
-            ? {
-                value: classifier,
-                label: (_b = (_a = form.classifiers) === null || _a === void 0 ? void 0 : _a[classifier]) === null || _b === void 0 ? void 0 : _b.name,
-            }
-            : { value: classifier._id, label: classifier.name };
+        var classifier = (_a = form.classifiers) === null || _a === void 0 ? void 0 : _a[idClassifier];
+        if (!classifier)
+            return _jsx("div", {});
+        return { value: classifier._id, label: classifier.name };
     });
     var sizeChange = function () {
         handleSizeChange === null || handleSizeChange === void 0 ? void 0 : handleSizeChange();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"1.9.61-test",
+    "version":"1.9.62-test",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",