rerobe-js-orm 3.0.25 → 3.0.27

package/lib/factories/Product/ProductFromFormState.js

@@ -37,7 +37,7 @@ class ProductFromFormState extends ProductFactory_1.default {
         const productFilterAttributes = {
             documentId: (_o = props.props) === null || _o === void 0 ? void 0 : _o.documentId,
             brand: props.fields.brand.selectedValue,
-            sizeCategory: props.fields.sizeCategory.selectedValue,
+            measurementCategory: props.fields.measurementCategory.selectedValue,
             size: props.fields.size.selectedValue,
             clothingSize: props.fields.clothingSize.selectedValues,
             jeanSize: props.fields.jeanSize.selectedValue,

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

@@ -42,7 +42,7 @@ export default class ProductFormState extends FormState {
     private productTypeSelectHandler;
     private setPriceRangeFromPrice;
     private setGenderFromPassedOptions;
-    private setProductCategoreisFromGender;
+    private setProductCategoriesFromGender;
     private setProductTypesFromCategory;
     private setProductTypesFromPassedOptions;
     private setProductStylesFromCategoryAndType;

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

@@ -29,13 +29,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.sizeCategory = this.fieldFactory('singleSelect', 'sizeCategory', options_1.sizeCategoryOptions);
+        this.fields.measurementCategory = this.fieldFactory('singleSelect', 'measurementCategory', options_1.measurementCategoryOptions);
         this.fields.size = this.fieldFactory('singleSelect', 'size', options_1.clothingSizeOptions);
         this.fields.color = this.fieldFactory('singleSelect', 'color', options_1.colors);
         this.fields.condition = this.fieldFactory('singleSelect', 'condition', options_1.conditions);
         this.fields.majorDefects = this.fieldFactory('multiSelect', 'majorDefects', options_1.majorDefectOptions);
         this.fields.minorDefects = this.fieldFactory('multiSelect', 'minorDefects', options_1.minorDefectOptions);
-        this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.gender);
+        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);
@@ -105,7 +105,7 @@ 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.options = this.setProductCategoriesFromGender(value);
         this.fields.productCategory.hidden = true;
         this.fields.productCategory.valid = false;
         this.fields.productCategory.selectedValue = '';
@@ -256,25 +256,35 @@ class ProductFormState extends FormState_1.default {
         return '1000+';
     }
     setGenderFromPassedOptions() {
+        let options = options_1.genderOptions;
+        let selectedGenderOptions = [];
+        if (this.props.gender) {
+            selectedGenderOptions = [{ label: this.props.gender, value: this.props.gender }];
+            if (!options.map((o) => o.value).includes(this.props.gender)) {
+                options.splice(0, 0, ...selectedGenderOptions);
+            }
+        }
         if (this.opts && this.opts.taxonomy && Object.keys(this.opts.taxonomy).length > 0) {
-            return Object.keys(this.opts.taxonomy).map((t) => ({ label: t, value: t }));
+            const passedOptions = Object.keys(this.opts.taxonomy).map((t) => ({ label: t, value: t }));
+            options = this.utilities.uniqObjArray([...selectedGenderOptions, ...passedOptions], 'value');
         }
-        return options_1.gender;
+        return options;
     }
-    setProductCategoreisFromGender(genderSelected) {
-        let productCategoryOptions = [];
+    setProductCategoriesFromGender(genderSelected) {
+        let options = options_1.productCategories;
+        let selectedProductCategoryOptions = [];
+        if (this.props.productCategory) {
+            selectedProductCategoryOptions = [{ label: this.props.productCategory, value: this.props.productCategory }];
+            if (!options.map((o) => o.value).includes(this.props.productCategory)) {
+                options.splice(0, 0, ...selectedProductCategoryOptions);
+            }
+        }
         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 passedOptions = Object.keys(genderObj).map((k) => ({ label: k, value: k }));
+            options = this.utilities.uniqObjArray([...selectedProductCategoryOptions, ...passedOptions], 'value');
         }
-        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) {
@@ -324,6 +334,7 @@ class ProductFormState extends FormState_1.default {
         }
     }
     setProductTypesFromPassedOptions(productCategory, genderSelected) {
+        let options = this.setProductTypesFromCategory(productCategory, genderSelected);
         if (productCategory &&
             genderSelected &&
             this.opts &&
@@ -331,9 +342,16 @@ class ProductFormState extends FormState_1.default {
             Object.keys(this.opts.taxonomy).length > 0) {
             const t = this.opts.taxonomy;
             const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
-            return productTypeArr;
+            options = productTypeArr;
+        }
+        let selectedProductTypeOptions = [];
+        if (this.props.productType) {
+            selectedProductTypeOptions = [{ label: this.props.productType, value: this.props.productType, styles: [] }];
+            if (!options.map((o) => o.value).includes(this.props.productType)) {
+                options.splice(0, 0, ...selectedProductTypeOptions);
+            }
         }
-        return this.setProductTypesFromCategory(productCategory, genderSelected);
+        return options;
     }
     setProductStylesFromCategoryAndType(productCategory, productType) {
         switch (productCategory) {
@@ -397,6 +415,7 @@ class ProductFormState extends FormState_1.default {
         }
     }
     setProductStylesFromPassedOptions(productCategory, productType) {
+        let options = this.setProductStylesFromCategoryAndType(productCategory, productType);
         if (this.opts &&
             this.opts.taxonomy &&
             Object.keys(this.opts.taxonomy).length > 0 &&
@@ -407,11 +426,16 @@ class ProductFormState extends FormState_1.default {
             const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
             const [pType] = productTypeArr.filter((p) => p.value === productType);
             if (pType) {
-                return pType.styles.map((s) => ({ label: s, value: s }));
+                options = pType.styles.map((s) => ({ label: s, value: s }));
             }
-            return [];
         }
-        return this.setProductStylesFromCategoryAndType(productCategory, productType);
+        if (this.props.productStyle && Array.isArray(this.props.productStyle) && this.props.productStyle.length > 0) {
+            options = [...new Set([...this.props.productStyle, ...options.map((o) => o.value)])].map((s) => ({
+                label: s,
+                value: s,
+            }));
+        }
+        return options;
     }
     discountTypeChangeHandler(val) {
         const prevVal = this.fields.discountType.selectedValue;
@@ -521,7 +545,7 @@ class ProductFormState extends FormState_1.default {
                 onChangeHandler = (val) => this.genderSelectHandler(val);
             }
             if (fieldKey === 'productCategory') {
-                options = this.setProductCategoreisFromGender(this.props.gender);
+                options = this.setProductCategoriesFromGender(this.props.gender);
                 onChangeHandler = (val) => this.productCategorySelectHandler(val);
             }
             if (fieldKey === 'productType') {
@@ -606,11 +630,11 @@ class ProductFormState extends FormState_1.default {
                     }
                 }
             }
-            if (fieldKey === 'sizeCategory') {
+            if (fieldKey === 'measurementCategory') {
                 let selectedOptions = [];
-                if (this.props.sizeCategory) {
-                    selectedOptions = [{ label: this.props.sizeCategory, value: this.props.sizeCategory }];
-                    if (!options.map((o) => o.value).includes(this.props.sizeCategory)) {
+                if (this.props.measurementCategory) {
+                    selectedOptions = [{ label: this.props.measurementCategory, value: this.props.measurementCategory }];
+                    if (!options.map((o) => o.value).includes(this.props.measurementCategory)) {
                         options.splice(0, 0, ...selectedOptions);
                     }
                 }

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

@@ -59,7 +59,7 @@ export const conditions: ({
     key: string;
     color?: undefined;
 })[];
-export const gender: {
+export const genderOptions: {
     label: string;
     value: string;
 }[];
@@ -79,7 +79,6 @@ export const clothingMaterials: {
 export const productCategories: {
     label: string;
     value: string;
-    color: string;
 }[];
 export const clothing: {
     label: string;
@@ -188,7 +187,7 @@ export const minorDefectOptions: {
     label: string;
     value: string;
 }[];
-export const sizeCategoryOptions: {
+export const measurementCategoryOptions: {
     label: string;
     value: string;
     measurementFields: string[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sizeCategoryOptions = exports.minorDefectOptions = exports.majorDefectOptions = exports.productOptions = exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = exports.weightUnits = exports.productWeightRanges = exports.unisexShoes = exports.mensShoes = exports.shoes = exports.unisexClothing = exports.mensClothing = exports.clothing = exports.productCategories = exports.clothingMaterials = exports.shoeSizes = exports.jeanSizes = exports.gender = exports.conditions = exports.colors = exports.brands = exports.sizeCommentOptions = exports.manClothingSizeOptions = exports.womanClothingSizeOptions = exports.clothingSizeOptions = exports.sizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
+exports.measurementCategoryOptions = exports.minorDefectOptions = exports.majorDefectOptions = exports.productOptions = exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = exports.weightUnits = exports.productWeightRanges = exports.unisexShoes = exports.mensShoes = exports.shoes = exports.unisexClothing = exports.mensClothing = exports.clothing = exports.productCategories = exports.clothingMaterials = exports.shoeSizes = exports.jeanSizes = exports.genderOptions = exports.conditions = exports.colors = exports.brands = exports.sizeCommentOptions = exports.manClothingSizeOptions = exports.womanClothingSizeOptions = exports.clothingSizeOptions = exports.sizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
 const product_constants_1 = require("../../constants/product-constants");
 const lodash_1 = require("lodash");
 const availableForSaleOptions = [
@@ -34,7 +34,7 @@ const statusOptions = Object.values(product_constants_1.PRODUCT_STATES).map((val
     value: val,
 }));
 exports.statusOptions = statusOptions;
-const sizeCategoryOptions = [
+const measurementCategoryOptions = [
     {
         label: 'Suits & Blazers',
         value: 'Suits & Blazers',
@@ -98,7 +98,7 @@ const sizeCategoryOptions = [
         measurementFields: ['width', 'height', 'depth'],
     },
 ];
-exports.sizeCategoryOptions = sizeCategoryOptions;
+exports.measurementCategoryOptions = measurementCategoryOptions;
 const sizeOptions = [
     {
         label: 'No Size',
@@ -1816,7 +1816,7 @@ const minorDefectOptions = [
     { label: 'Other minor Issue', value: 'Other minor issue' },
 ];
 exports.minorDefectOptions = minorDefectOptions;
-const gender = [
+const genderOptions = [
     {
         label: 'Woman',
         value: 'Woman',
@@ -1842,7 +1842,7 @@ const gender = [
         value: 'NA',
     },
 ];
-exports.gender = gender;
+exports.genderOptions = genderOptions;
 const jeanSizes = [
     { label: '24', value: '24' },
     { label: '25', value: '25' },
@@ -2089,27 +2089,22 @@ const productCategories = [
     {
         label: 'Clothing',
         value: 'Clothing',
-        color: '#cfdfff',
     },
     {
         label: 'Shoes',
         value: 'Shoes',
-        color: '#d0f0fd',
     },
     {
         label: 'Bags',
         value: 'Bags',
-        color: '#d0f0fd',
     },
     {
         label: 'Accessories',
         value: 'Accessories',
-        color: '#d0f0fd',
     },
     {
         label: 'Jewelry',
         value: 'Jewelry',
-        color: '#d0f0fd',
     },
 ];
 exports.productCategories = productCategories;

package/lib/models/Product.js

@@ -44,7 +44,7 @@ class Product extends Base_1.default {
             jeanSize: (props === null || props === void 0 ? void 0 : props.jeanSize) || '',
             shoeSize: (props === null || props === void 0 ? void 0 : props.shoeSize) || '',
             size: (props === null || props === void 0 ? void 0 : props.size) || '',
-            sizeCategory: (props === null || props === void 0 ? void 0 : props.sizeCategory) || '',
+            measurementCategory: (props === null || props === void 0 ? void 0 : props.measurementCategory) || '',
             productCategory: (props === null || props === void 0 ? void 0 : props.productCategory) || '',
             productType: (props === null || props === void 0 ? void 0 : props.productType) || '',
             productStyle: (props === null || props === void 0 ? void 0 : props.productStyle) || [],
@@ -285,7 +285,7 @@ class Product extends Base_1.default {
             compareAtPrice: this.utilities.sanitizeNumber(this.attributes.compareAtPrice),
             costPerItem: this.utilities.sanitizeNumber(this.attributes.costPerItem),
             priceRange: this.utilities.sanitizeString(this.filterAttributes.priceRange),
-            sizeCategory: this.utilities.sanitizeString(this.filterAttributes.sizeCategory),
+            measurementCategory: this.utilities.sanitizeString(this.filterAttributes.measurementCategory),
             productCategory: this.utilities.sanitizeString(this.filterAttributes.productCategory),
             productType: this.utilities.sanitizeString(this.filterAttributes.productType),
             productStyle: this.utilities.sanitzeStringArr(this.filterAttributes.productStyle),
@@ -567,7 +567,7 @@ class Product extends Base_1.default {
                 {
                     facet: true,
                     optional: true,
-                    name: 'sizeCategory',
+                    name: 'measurementCategory',
                     type: 'string',
                 },
                 {

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

@@ -39,7 +39,7 @@ declare type ProductFilterAttributes = {
     gender: string;
     materialComposition: MaterialComposition;
     priceRange: string;
-    sizeCategory: string;
+    measurementCategory: string;
     productCategory: string;
     productType: string;
     productStyle: string[];
@@ -170,7 +170,7 @@ declare type ProductFilterAttributesFormFields = {
     gender: SingleSelectFormField<string>;
     materialComposition: SingleSelectFormField<MaterialComposition>;
     priceRange: TextInputFormField<string>;
-    sizeCategory: SingleSelectFormField<string>;
+    measurementCategory: SingleSelectFormField<string>;
     productCategory: SingleSelectFormField<string>;
     productType: SingleSelectFormField<string>;
     productStyle: MultiSelectFormField<string>;
@@ -259,7 +259,7 @@ declare type TypesenseProductObj = {
     compareAtPrice: number;
     costPerItem: number;
     priceRange: string;
-    sizeCategory: string;
+    measurementCategory: string;
     productCategory: string;
     productType: string;
     productStyle: string[];

package/package.json

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