rerobe-js-orm 2.9.4 → 2.9.5

package/lib/form-states/Product/ProductFormState.d.ts

@@ -17,7 +17,13 @@ export default class ProductFormState extends FormState {
         clothingSizes: string[];
         jeanSizes: string[];
         shoeSizes: string[];
-        conditions: string[];
+        conditions: {
+            label: string;
+            value: string;
+            description: string;
+        }[];
+        majorDefects: string[];
+        minorDefects: string[];
     };
     constructor(props?: any, opts?: any);
     autoCreateTitle(): string;

package/lib/form-states/Product/ProductFormState.js

@@ -413,7 +413,7 @@ class ProductFormState extends FormState_1.default {
         }
     }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         let options = fieldOptions || [];
         let hidden = false;
         if (fieldType === 'singleSelect') {
@@ -533,7 +533,11 @@ class ProductFormState extends FormState_1.default {
             }
             if (fieldKey === 'condition') {
                 if ((_k = (_j = this.opts) === null || _j === void 0 ? void 0 : _j.conditions) === null || _k === void 0 ? void 0 : _k.length) {
-                    const conditionsOptions = this.opts.conditions.map((t) => ({ label: t, value: t }));
+                    const conditionsOptions = this.opts.conditions.map((t) => ({
+                        label: t.label || '',
+                        value: t.value || '',
+                        description: t.description || '',
+                    }));
                     options = this.utilities.uniqObjArray(conditionsOptions, 'value');
                 }
                 onChangeHandler = (val) => this.conditionSelectHandler(val);
@@ -589,6 +593,28 @@ class ProductFormState extends FormState_1.default {
                 }
                 hidden = this.props.productCategory !== 'Clothing' || this.props.productType === 'Jeans';
             }
+            if (fieldKey === 'majorDefects') {
+                let selectedMajorDefectsOptions = [];
+                if (this.props.majorDefects && Array.isArray(this.props.majorDefects) && this.props.majorDefects.length > 0) {
+                    selectedMajorDefectsOptions = this.props.majorDefects.map((t) => ({ label: t, value: t }));
+                }
+                let majorDefectsOptions = [];
+                if ((_p = (_o = this.opts) === null || _o === void 0 ? void 0 : _o.majorDefects) === null || _p === void 0 ? void 0 : _p.length) {
+                    majorDefectsOptions = this.opts.majorDefects.map((t) => ({ label: t, value: t }));
+                }
+                options = this.utilities.uniqObjArray([...selectedMajorDefectsOptions, ...majorDefectsOptions], 'value');
+            }
+            if (fieldKey === 'minorDefects') {
+                let selectedMinorDefectsOptions = [];
+                if (this.props.minorDefects && Array.isArray(this.props.minorDefects) && this.props.minorDefects.length > 0) {
+                    selectedMinorDefectsOptions = this.props.minorDefects.map((t) => ({ label: t, value: t }));
+                }
+                let minorDefectsOptions = [];
+                if ((_r = (_q = this.opts) === null || _q === void 0 ? void 0 : _q.minorDefects) === null || _r === void 0 ? void 0 : _r.length) {
+                    minorDefectsOptions = this.opts.minorDefects.map((t) => ({ label: t, value: t }));
+                }
+                options = this.utilities.uniqObjArray([...selectedMinorDefectsOptions, ...minorDefectsOptions], 'value');
+            }
             if (fieldKey === 'inventoryLocations') {
                 onChangeHandler = (val) => this.inventoryLocationsChangeHandler(val);
             }

package/lib/types/rerobe-form-types.d.ts

@@ -26,9 +26,7 @@ interface FormFieldOption {
     label: string;
     value: string | boolean;
     description?: string;
-    color?: string;
     key?: string;
-    [key: string]: any;
 }
 interface FileObj {
     uri: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",