rerobe-js-orm 2.4.89 → 2.4.93

package/README.md

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

package/lib/factories/Product/ProductFromFormState.js

@@ -22,7 +22,7 @@ class ProductFromFormState extends ProductFactory_1.default {
             weight: props.fields.weight.inputValue,
             variantId: ((_j = props.props) === null || _j === void 0 ? void 0 : _j.variantId) || '',
             reservedBy: ((_k = props.props) === null || _k === void 0 ? void 0 : _k.reservedBy) || [],
-            variants: props.fields.variants.selectedValue,
+            options: props.fields.options.selectedValue,
             costPerItem: props.fields.costPerItem.inputValue,
             compareAtPrice: props.fields.compareAtPrice.inputValue,
             quantity: props.fields.quantity.inputValue,

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

@@ -9,19 +9,26 @@ export default class ProductFormState extends FormState {
             value: string;
         }[];
         tags: string[];
+        taxonomy: {
+            [key: string]: any;
+        };
     };
     constructor(props?: any, opts?: any);
     autoCreateTitle(): string;
     autoCreateDescription(): string;
     createProduct(): Product;
     private priceInputChangeHandler;
+    private setGenderFromPassedOptions;
     private genderSelectHandler;
     private conditionSelectHandler;
     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

@@ -20,7 +20,7 @@ class ProductFormState extends FormState_1.default {
             valid: false,
             onChangeHandler: (fileArr) => this.multiSelectMediaChangeHandler('officialFilesToUpload', fileArr),
         };
-        this.fields.variants = this.fieldFactory('singleSelect', 'variants');
+        this.fields.options = this.fieldFactory('singleSelect', 'options', options_1.productOptions);
         this.fields.costPerItem = this.fieldFactory('textInput', 'costPerItem');
         this.fields.compareAtPrice = this.fieldFactory('textInput', 'compareAtPrice');
         this.fields.quantity = this.fieldFactory('textInput', 'quantity');
@@ -96,16 +96,23 @@ class ProductFormState extends FormState_1.default {
         // Recalculates salePrice
         this.props.salePrice = this.calculateSalePrice();
     }
+    setGenderFromPassedOptions() {
+        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 }));
+        }
+        return options_1.gender;
+    }
     genderSelectHandler(value) {
         // Mutate gender selectedValue and valid prop
         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 +227,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 +255,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 +281,22 @@ 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 +343,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 +416,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) {
@@ -465,14 +517,20 @@ class ProductFormState extends FormState_1.default {
                 selectedValue = this.props[fieldKey] || {};
                 valid = Object.keys(this.props[fieldKey]).length > 0;
             }
+            if (fieldKey === 'options') {
+                selectedValue = this.props[fieldKey] || {};
+                valid = Object.keys(this.props[fieldKey]).length > 0;
+            }
             if (fieldKey === 'gender') {
+                options = this.setGenderFromPassedOptions();
                 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);
             }
@@ -520,7 +578,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.d.ts

@@ -156,3 +156,7 @@ export const productIsOnSaleOptions: {
     label: string;
     value: string;
 }[];
+export const productOptions: {
+    value: string;
+    label: string;
+}[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.conditionTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = 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.clothingSizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
+exports.productOptions = exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.conditionTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = 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.clothingSizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
 const availableForSaleOptions = [
     {
         label: 'Zero',
@@ -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 = [
@@ -3453,3 +3465,10 @@ const productIsOnSaleOptions = [
     },
 ];
 exports.productIsOnSaleOptions = productIsOnSaleOptions;
+const productOptions = [
+    { value: 'size', label: 'Size' },
+    { value: 'color', label: 'Color' },
+    { value: 'style', label: 'Style' },
+    { value: 'material', label: 'Material' },
+];
+exports.productOptions = productOptions;

package/lib/models/Product.js

@@ -23,7 +23,7 @@ class Product extends Base_1.default {
             vendorName: (props === null || props === void 0 ? void 0 : props.vendorName) || '',
             variantId: (props === null || props === void 0 ? void 0 : props.variantId) || '',
             reservedBy: (props === null || props === void 0 ? void 0 : props.reservedBy) || [],
-            variants: (props === null || props === void 0 ? void 0 : props.variants) || {},
+            options: (props === null || props === void 0 ? void 0 : props.options) || {},
             costPerItem: (props === null || props === void 0 ? void 0 : props.costPerItem) || '',
             compareAtPrice: (props === null || props === void 0 ? void 0 : props.compareAtPrice) || '',
             quantity: (props === null || props === void 0 ? void 0 : props.quantity) || 0,

package/lib/models/ProductStateManager.d.ts

@@ -5,6 +5,7 @@ export default class ProductStateManager extends Base {
         sellRequestReviewDraft: string;
         rejected: string;
         hold: string;
+        draft: string;
         accepted: string;
         sellerToDropOff: string;
         sellerToShip: string;

package/lib/models/ProductStateManager.js

@@ -351,6 +351,7 @@ ProductStateManager.PRODUCT_STATES = {
     sellRequestReviewDraft: 'SELL_REQUEST_REVIEW_DRAFT',
     rejected: 'REJECTED',
     hold: 'HOLD',
+    draft: 'DRAFT',
     accepted: 'ACCEPTED',
     sellerToDropOff: 'DROP_OFF_AT_REROBE',
     sellerToShip: 'SHIP_TO_REROBE',

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

@@ -15,7 +15,7 @@ declare type ProductAttributes = {
     vendorName?: string;
     variantId: string;
     reservedBy: string[];
-    variants?: Variants | null;
+    options?: ProductOptions | null;
     costPerItem?: string;
     compareAtPrice?: string;
     quantity?: number | string;
@@ -140,7 +140,7 @@ declare type ProductAttributesFormFields = {
     price: TextInputFormField<string>;
     weight: TextInputFormField<string>;
     officialFilesToUpload: MultiMediaSelectFormField;
-    variants: SingleSelectFormField<Variants>;
+    options: SingleSelectFormField<ProductOptions>;
     costPerItem: TextInputFormField<string>;
     compareAtPrice: TextInputFormField<string>;
     quantity: TextInputFormField<string | number>;
@@ -199,7 +199,7 @@ interface ParamsForBuildProductInputObjForShopify {
     productShopifyId?: string;
 }
 declare type ConditionTypes = 'NEW' | 'USED';
-declare type Variants = {
+declare type ProductOptions = {
     size?: string[];
     color?: string[];
     material?: string[];

package/package.json

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