rerobe-js-orm 4.1.1 → 4.1.2

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

@@ -30,13 +30,13 @@ class ProductFormState extends FormState_1.default {
         this.fields.measurements = this.fieldFactory('singleSelect', 'measurements');
         // ProductFilterAttributesFormFields
         this.fields.brand = this.fieldFactory('singleSelect', 'brand', options_1.brands);
+        this.fields.color = this.fieldFactory('singleSelect', 'color', options_1.colors);
+        this.fields.condition = this.fieldFactory('singleSelect', 'condition', options_1.conditions);
+        this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.genderOptions);
         this.fields.measurementCategory = this.fieldFactory('singleSelect', 'measurementCategory', options_1.measurementCategoryOptions);
         this.fields.size = this.fieldFactory('singleSelect', 'size', options_1.clothingSizeOptions);
         this.fields.standardSize = this.fieldFactory('singleSelect', 'standardSize', options_1.clothingSizeOptions);
         this.fields.internationalSize = this.fieldFactory('singleSelect', 'internationalSize', []);
-        this.fields.color = this.fieldFactory('singleSelect', 'color', options_1.colors);
-        this.fields.condition = this.fieldFactory('singleSelect', 'condition', options_1.conditions);
-        this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.genderOptions);
         this.fields.materialComposition = this.fieldFactory('singleSelect', 'materialComposition', options_1.clothingMaterials);
         this.fields.priceRange = this.fieldFactory('textInput', 'priceRange');
         this.fields.productCategory = this.fieldFactory('singleSelect', 'productCategory', options_1.productCategories);
@@ -436,11 +436,12 @@ class ProductFormState extends FormState_1.default {
         return options;
     }
     measurementCategorySelectHandler(value) {
+        var _a;
         // Mutate measurementCategory selectedValue and valid prop
         this.fields.measurementCategory.selectedValue = value;
         this.fields.measurementCategory.valid = !!value;
         // Update standardSize fields based on new measurementCategory value and selected gender
-        this.fields.standardSize.options = this.setStandardSizeOptionsFromGenderAndMeasurementCategory(value, this.fields.gender.selectedValue);
+        this.fields.standardSize.options = this.setStandardSizeOptionsFromGenderAndMeasurementCategory(value, ((_a = this.fields.gender) === null || _a === void 0 ? void 0 : _a.selectedValue) || '');
         this.fields.standardSize.hidden = !value;
         this.fields.standardSize.valid = false;
         this.fields.standardSize.selectedValue = '';
@@ -451,17 +452,12 @@ class ProductFormState extends FormState_1.default {
         this.fields.internationalSize.hidden = !value;
     }
     setStandardSizeOptionsFromGenderAndMeasurementCategory(measurementCategory, genderSelected) {
-        let options = [
-            'One Size',
-            'Adjustable',
-            'XS',
-            'S',
-            'M',
-            'L',
-            'XL',
-            'XXL',
-            '3XL',
-        ].map((v) => ({ label: v, value: v, internationalSizes: [] }));
+        const standardSizeOptions = ['One Size', 'Adjustable', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL'];
+        let options = standardSizeOptions.map((v) => ({
+            label: v,
+            value: v,
+            internationalSizes: [],
+        }));
         if (measurementCategory &&
             genderSelected &&
             this.opts &&
@@ -469,7 +465,7 @@ class ProductFormState extends FormState_1.default {
             Object.keys(this.opts.sizeTaxonomy).length > 0) {
             const t = this.opts.sizeTaxonomy;
             const { [genderSelected]: { [measurementCategory]: standardSizeArr = [] } = {} } = t;
-            options = standardSizeArr;
+            options = standardSizeArr.length > 0 ? standardSizeArr : options;
         }
         let selectedStandardSizeOptions = [];
         if (this.props.standardSize) {
@@ -483,25 +479,28 @@ class ProductFormState extends FormState_1.default {
         return options;
     }
     standardSizeSelectHandler(value) {
+        var _a;
         // Mutate standardSize selectedValue and valid prop
         this.fields.standardSize.selectedValue = value;
         this.fields.standardSize.valid = !!value;
         // Update internationalSizes fields based on selected value and measurementCategory selected
         // and resets other props
-        this.fields.internationalSize.options = this.setInternationalSizeOptionsFromPassedOptions(this.fields.measurementCategory.selectedValue, value);
+        this.fields.internationalSize.options = this.setInternationalSizeOptionsFromPassedOptions(((_a = this.fields.measurementCategory) === null || _a === void 0 ? void 0 : _a.selectedValue) || '', value);
         this.fields.internationalSize.selectedValue = '';
         this.fields.internationalSize.valid = false;
         this.fields.internationalSize.hidden = false;
     }
     setInternationalSizeOptionsFromPassedOptions(measurementCategory, standardSize) {
+        var _a;
         let options = [];
         if (this.opts &&
             this.opts.sizeTaxonomy &&
             Object.keys(this.opts.sizeTaxonomy).length > 0 &&
             measurementCategory &&
-            standardSize) {
+            standardSize &&
+            this.fields.gender) {
             const t = this.opts.sizeTaxonomy;
-            const genderSelected = this.fields.gender.selectedValue;
+            const genderSelected = ((_a = this.fields.gender) === null || _a === void 0 ? void 0 : _a.selectedValue) || '';
             const { [genderSelected]: { [measurementCategory]: standardSizeArr = [] } = {} } = t;
             const [sSize] = standardSizeArr.filter((p) => p.value === standardSize);
             if (sSize) {

package/lib/models/Product.js

@@ -293,7 +293,7 @@ class Product extends Base_1.default {
             brand: this.utilities.sanitizeString(this.filterAttributes.brand),
             size: this.utilities.sanitizeString(this.filterAttributes.size),
             standardSize: this.utilities.sanitizeString(this.filterAttributes.standardSize),
-            internationalSize: this.utilities.sanitizeString(this.filterAttributes.standardSize),
+            internationalSize: this.utilities.sanitizeString(this.filterAttributes.internationalSize),
             clothingSize: this.utilities.sanitzeStringArr(this.filterAttributes.clothingSize),
             jeanSize: this.utilities.sanitizeString(this.filterAttributes.jeanSize),
             shoeSize: this.utilities.sanitizeString(this.filterAttributes.shoeSize),

package/package.json

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