rerobe-js-orm 2.4.87 → 2.4.91

package/README.md

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

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -4,7 +4,7 @@ const MerchantFactory_1 = require("./MerchantFactory");
 const Merchant_1 = require("../../models/Merchant");
 class MerchantFromFormState extends MerchantFactory_1.default {
     createMerchant(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const merchantAttributes = {
             id: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.id) || '',
             name: fs.fields.name.inputValue,
@@ -27,10 +27,11 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             numOrders: (_f = fs.props) === null || _f === void 0 ? void 0 : _f.numOrders,
             numProducts: (_g = fs.props) === null || _g === void 0 ? void 0 : _g.numProducts,
             orderTags: (_h = fs.props) === null || _h === void 0 ? void 0 : _h.orderTags,
-            theme: (_j = fs.props) === null || _j === void 0 ? void 0 : _j.theme,
-            webshopTenantId: (_k = fs.props) === null || _k === void 0 ? void 0 : _k.webshopTenantId,
+            productTags: (_j = fs.props) === null || _j === void 0 ? void 0 : _j.productTags,
+            theme: (_k = fs.props) === null || _k === void 0 ? void 0 : _k.theme,
+            webshopTenantId: (_l = fs.props) === null || _l === void 0 ? void 0 : _l.webshopTenantId,
             webhooks: fs.fields.webhooks.selectedValues,
-            sharedSecret: (_l = fs.props) === null || _l === void 0 ? void 0 : _l.sharedSecret,
+            sharedSecret: (_m = fs.props) === null || _m === void 0 ? void 0 : _m.sharedSecret,
         };
         return new Merchant_1.default(Object.assign({}, merchantAttributes));
     }

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

@@ -8,6 +8,10 @@ export default class ProductFormState extends FormState {
             label: string;
             value: string;
         }[];
+        tags: string[];
+        taxonomy: {
+            [key: string]: any;
+        };
     };
     constructor(props?: any, opts?: any);
     autoCreateTitle(): string;
@@ -19,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

@@ -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');
@@ -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) {
@@ -465,14 +509,19 @@ 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') {
                 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 +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)) {
@@ -531,13 +580,15 @@ class ProductFormState extends FormState_1.default {
                 hidden = this.props.productStyle.length < 1;
             }
             if (fieldKey === 'tags') {
+                let selectedTagOptions = [];
                 if (this.props.tags && Array.isArray(this.props.tags) && this.props.tags.length > 0) {
-                    this.props.tags.forEach((tag) => {
-                        if (!options.map((o) => o.value).includes(tag)) {
-                            options.splice(0, 0, { label: tag, value: tag });
-                        }
-                    });
+                    selectedTagOptions = this.props.tags.map((t) => ({ label: t, value: t }));
+                }
+                let tagOptions = [];
+                if (this.opts && this.opts.tags && this.opts.tags.length > 0) {
+                    tagOptions = this.opts.tags.map((t) => ({ label: t, value: t }));
                 }
+                options = this.utilities.uniqObjArray([...selectedTagOptions, ...tagOptions], 'value');
                 hidden = Boolean(this.props.tags && Array.isArray(this.props.tags) && this.props.tags.length < 1);
             }
             if (fieldKey === 'featuredCollections') {

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/Merchant.d.ts

@@ -57,6 +57,7 @@ export default class Merchant extends Base {
     numOrders: number;
     numProducts: number;
     orderTags: string[];
+    productTags: string[];
     theme: MerchantTheme;
     webshopTenantId: string;
     webhooks: MerchantWebHook[];

package/lib/models/Merchant.js

@@ -34,6 +34,7 @@ class Merchant extends Base_1.default {
         this.numOrders = (props === null || props === void 0 ? void 0 : props.numOrders) || 0;
         this.numProducts = (props === null || props === void 0 ? void 0 : props.numProducts) || 0;
         this.orderTags = (props === null || props === void 0 ? void 0 : props.orderTags) || [];
+        this.productTags = (props === null || props === void 0 ? void 0 : props.productTags) || [];
         this.theme = (props === null || props === void 0 ? void 0 : props.theme) || {
             layoutType: 'StandardNavLayout',
             bgColor: '#fff',
@@ -74,6 +75,7 @@ class Merchant extends Base_1.default {
             numOrders: this.numOrders,
             numProducts: this.numProducts,
             orderTags: this.orderTags,
+            productTags: this.productTags,
             theme: this.theme,
             webshopTenantId: this.webshopTenantId,
             webhooks: this.webhooks,

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,
@@ -277,6 +277,7 @@ class Product extends Base_1.default {
             sellerSelfRejectTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellerSelfRejectTimestamp),
             liquidationRequestedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.liquidationRequestedTimestamp),
             sellerLiquidatedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellerLiquidatedTimestamp),
+            selectedForClearance: this.utilities.sanitizeString(this.consignmentAttributes.selectedForClearance),
             availableForSale: !!this.attributes.availableForSale,
             color: this.utilities.sanitizeString(this.filterAttributes.color),
             description: this.utilities.sanitizeString(this.attributes.description),
@@ -284,6 +285,7 @@ class Product extends Base_1.default {
             discountValue: this.utilities.sanitizeNumber(this.consignmentAttributes.discountValue, 0),
             id: this.utilities.sanitizeString(this.filterAttributes.documentId),
             documentId: this.utilities.sanitizeString(this.filterAttributes.documentId),
+            shopifyId: this.utilities.sanitizeString(this.attributes.shopifyId),
             gender: this.utilities.sanitizeString(this.filterAttributes.gender),
             handle: this.utilities.sanitizeString(this.attributes.handle),
             imageUrls: this.utilities.sanitzeStringArr(this.attributes.imageUrls),
@@ -405,7 +407,7 @@ class Product extends Base_1.default {
             return acc;
         }, '');
     }
-    generateSchemaForTypesense(name = 'prod_products_202101061') {
+    generateSchemaForTypesense(name = 'prod_products_20210108') {
         return {
             default_sorting_field: 'createdAtTimestamp',
             fields: [
@@ -561,10 +563,15 @@ class Product extends Base_1.default {
                     type: 'int32',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     name: 'availableForSale',
                     type: 'bool',
                 },
+                {
+                    facet: true,
+                    name: 'selectedForClearance',
+                    type: 'string',
+                },
                 {
                     facet: true,
                     name: 'color',
@@ -597,6 +604,11 @@ class Product extends Base_1.default {
                     name: 'documentId',
                     type: 'string',
                 },
+                {
+                    facet: false,
+                    name: 'shopifyId',
+                    type: 'string',
+                },
                 {
                     facet: true,
                     name: 'gender',

package/lib/types/merchant-types.d.ts

@@ -20,6 +20,7 @@ declare type MerchantObj = {
     numOrders: number;
     numProducts: number;
     orderTags: string[];
+    productTags: string[];
     theme: MerchantTheme;
     webhooks: MerchantWebHook[];
     webshopTenantId: string;

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.87",
+  "version": "2.4.91",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",