rerobe-js-orm 2.4.90 → 2.4.91

package/README.md

@@ -1 +1 @@
-#ReRobe Product
+#Ribbn and ReRobe ORM

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

@@ -9,6 +9,9 @@ export default class ProductFormState extends FormState {
             value: string;
         }[];
         tags: string[];
+        taxonomy: {
+            [key: string]: any;
+        };
     };
     constructor(props?: any, opts?: any);
     autoCreateTitle(): string;
@@ -20,8 +23,11 @@ export default class ProductFormState extends FormState {
     private productCategorySelectHandler;
     private productTypeSelectHandler;
     private setPriceRangeFromPrice;
+    private setProductCategoreisFromGender;
     private setProductTypesFromCategory;
+    private setProductTypesFromPassedOptions;
     private setProductStylesFromCategoryAndType;
+    private setProductStylesFromPassedOptions;
     private discountTypeChangeHandler;
     private discountValueChangeHandler;
     private calculateSalePrice;

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

@@ -101,11 +101,12 @@ class ProductFormState extends FormState_1.default {
         this.fields.gender.selectedValue = value;
         this.fields.gender.valid = !!value;
         // Reset productCategory fields except options
+        this.fields.productCategory.options = this.setProductCategoreisFromGender(value);
         this.fields.productCategory.hidden = true;
         this.fields.productCategory.valid = false;
         this.fields.productCategory.selectedValue = '';
         // Resets productType fields
-        this.fields.productType.options = this.setProductTypesFromCategory(this.fields.productCategory.selectedValue, value);
+        this.fields.productType.options = this.setProductTypesFromPassedOptions(this.fields.productCategory.selectedValue, value);
         this.fields.productType.hidden = true;
         this.fields.productType.selectedValue = '';
         this.fields.productType.valid = false;
@@ -220,7 +221,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.productCategory.selectedValue = value;
         this.fields.productCategory.valid = !!value;
         // Update Product Type options based on new category value and selected gender
-        this.fields.productType.options = this.setProductTypesFromCategory(value, this.fields.gender.selectedValue);
+        this.fields.productType.options = this.setProductTypesFromPassedOptions(value, this.fields.gender.selectedValue);
         this.fields.productType.hidden = !value;
         this.fields.productType.valid = false;
         this.fields.productType.selectedValue = '';
@@ -248,7 +249,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.productType.valid = !!value;
         // Update productStyle options based on selected value and productCategory selected
         // and resets other props
-        this.fields.productStyle.options = this.setProductStylesFromCategoryAndType(this.fields.productCategory.selectedValue, value);
+        this.fields.productStyle.options = this.setProductStylesFromPassedOptions(this.fields.productCategory.selectedValue, value);
         this.fields.productStyle.selectedValues = [];
         this.fields.productStyle.valid = false;
         this.fields.productStyle.hidden = !value;
@@ -274,6 +275,20 @@ class ProductFormState extends FormState_1.default {
         }
         return '1000+ SEK';
     }
+    setProductCategoreisFromGender(genderSelected) {
+        let productCategoryOptions = [];
+        if (this.opts && this.opts.taxonomy && Object.keys(this.opts.taxonomy).length > 0 && genderSelected) {
+            const t = this.opts.taxonomy;
+            const { [genderSelected]: genderObj = {} } = t;
+            productCategoryOptions = Object.keys(genderObj).map((k) => ({ label: k, value: k }));
+        }
+        else {
+            productCategoryOptions = options_1.productCategories;
+        }
+        const selectedCategoryOptions = this.props.productCategory ? [{ label: this.props.productCategory, value: this.props.productCategory }] : [];
+        const options = this.utilities.uniqObjArray([...productCategoryOptions, ...selectedCategoryOptions], 'value');
+        return options;
+    }
     setProductTypesFromCategory(productCategory, genderSelected) {
         switch (productCategory) {
             case 'Clothing':
@@ -320,6 +335,18 @@ class ProductFormState extends FormState_1.default {
                 return [];
         }
     }
+    setProductTypesFromPassedOptions(productCategory, genderSelected) {
+        if (productCategory &&
+            genderSelected &&
+            this.opts &&
+            this.opts.taxonomy &&
+            Object.keys(this.opts.taxonomy).length > 0) {
+            const t = this.opts.taxonomy;
+            const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
+            return productTypeArr;
+        }
+        return this.setProductTypesFromCategory(productCategory, genderSelected);
+    }
     setProductStylesFromCategoryAndType(productCategory, productType) {
         switch (productCategory) {
             case 'Clothing':
@@ -381,6 +408,23 @@ class ProductFormState extends FormState_1.default {
                 return [];
         }
     }
+    setProductStylesFromPassedOptions(productCategory, productType) {
+        if (this.opts &&
+            this.opts.taxonomy &&
+            Object.keys(this.opts.taxonomy).length > 0 &&
+            productCategory &&
+            productType) {
+            const t = this.opts.taxonomy;
+            const genderSelected = this.fields.gender.selectedValue;
+            const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
+            const [pType] = productTypeArr.filter((p) => p.value === productType);
+            if (pType) {
+                return pType.styles.map((s) => ({ label: s, value: s }));
+            }
+            return [];
+        }
+        return this.setProductStylesFromCategoryAndType(productCategory, productType);
+    }
     discountTypeChangeHandler(val) {
         const prevVal = this.fields.discountType.selectedValue;
         if (val === 'amount' && prevVal === 'percentage' && this.fields.discountValue.inputValue) {
@@ -473,10 +517,11 @@ class ProductFormState extends FormState_1.default {
                 onChangeHandler = (val) => this.genderSelectHandler(val);
             }
             if (fieldKey === 'productCategory') {
+                options = this.setProductCategoreisFromGender(this.props.gender);
                 onChangeHandler = (val) => this.productCategorySelectHandler(val);
             }
             if (fieldKey === 'productType') {
-                options = this.setProductTypesFromCategory(this.props.productCategory, this.props.gender);
+                options = this.setProductTypesFromPassedOptions(this.props.productCategory, this.props.gender);
                 hidden = !this.props.productCategory;
                 onChangeHandler = (val) => this.productTypeSelectHandler(val);
             }
@@ -524,7 +569,7 @@ class ProductFormState extends FormState_1.default {
         if (fieldType === 'multiSelect') {
             let onChangeHandler = (val) => this.multiSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'productStyle') {
-                options = this.setProductStylesFromCategoryAndType(this.props.productCategory, this.props.productType);
+                options = this.setProductStylesFromPassedOptions(this.props.productCategory, this.props.productType);
                 if (this.props.productStyle && this.props.productStyle.length > 0) {
                     this.props.productStyle.forEach((productStyle) => {
                         if (!options.map((o) => o.value).includes(productStyle)) {

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

@@ -1672,14 +1672,26 @@ const gender = [
         label: 'Woman',
         value: 'Woman',
     },
+    {
+        label: 'Girl',
+        value: 'Girl',
+    },
     {
         label: 'Man',
         value: 'Man',
     },
+    {
+        label: 'Boy',
+        value: 'Boy',
+    },
     {
         label: 'Unisex',
         value: 'Unisex',
     },
+    {
+        label: 'NA',
+        value: 'NA',
+    },
 ];
 exports.gender = gender;
 const jeanSizes = [

package/package.json

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