rerobe-js-orm 2.4.69 → 2.4.73

package/lib/factories/FormState/ProductCollection/ProductCollectionFormStateFactory.js

@@ -4,7 +4,7 @@ const FormStateFactory_1 = require("../FormStateFactory");
 const ProductCollectionFormState_1 = require("../../../form-states/ProductCollection/ProductCollectionFormState");
 class ProductCollectionFormStateFactory extends FormStateFactory_1.default {
     createFormState(props, opts) {
-        return new ProductCollectionFormState_1.default(props);
+        return new ProductCollectionFormState_1.default(props, opts);
     }
 }
 exports.default = ProductCollectionFormStateFactory;

package/lib/factories/Order/OrderFromFormState.js

@@ -4,7 +4,7 @@ const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
 class OrderFromFormState extends OrderFactory_1.default {
     createOrder(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const firstName = fs.fields.firstName.inputValue;
@@ -17,13 +17,14 @@ class OrderFromFormState extends OrderFactory_1.default {
             documentId: ((_c = fs.props) === null || _c === void 0 ? void 0 : _c.documentId) || '',
             name: ((_d = fs.props) === null || _d === void 0 ? void 0 : _d.name) || '',
             orderNumber: (_e = fs.props) === null || _e === void 0 ? void 0 : _e.orderNumber,
-            state: ((_f = fs.props) === null || _f === void 0 ? void 0 : _f.state) || Order_1.default.ORDER_STATES.draft,
+            ribbnOrderNumber: (_f = fs.props) === null || _f === void 0 ? void 0 : _f.ribbnOrderNumber,
+            state: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.state) || Order_1.default.ORDER_STATES.draft,
             currencyCode: fs.fields.currencyCode.inputValue,
-            statusUrl: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.statusUrl) || '',
-            processedAt: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.processedAt) || new Date().toUTCString(),
+            statusUrl: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.statusUrl) || '',
+            processedAt: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.processedAt) || new Date().toUTCString(),
             financialStatus: fs.fields.financialStatus.selectedValue,
             fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
-            fulfillments: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.fulfillments) || [],
+            fulfillments: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.fulfillments) || [],
             shippingAddress: fs.fields.shippingAddress.selectedValue || {
                 id: '',
                 address1: '',
@@ -34,7 +35,7 @@ class OrderFromFormState extends OrderFactory_1.default {
                 province: '',
                 zip: '',
             },
-            shippingDiscountAllocations: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.shippingDiscountAllocations) || [],
+            shippingDiscountAllocations: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.shippingDiscountAllocations) || [],
             shippingLine: fs.fields.shippingLine
                 ? fs.fields.shippingLine.selectedValue
                 : {
@@ -55,9 +56,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             originalTotalPrice: { amount: fs.fields.originalTotalPrice.inputValue || 0, currencyCode },
             lineItems: fs.fields.lineItems.selectedValues || [],
             cancelReason: fs.fields.cancelReason.selectedValue || '',
-            canceledAt: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.canceledAt) || '',
-            customerUrl: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.customerUrl) || '',
-            discountApplications: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.discountApplications) || [],
+            canceledAt: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.canceledAt) || '',
+            customerUrl: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.customerUrl) || '',
+            discountApplications: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.discountApplications) || [],
             physicalLocation: fs.fields.physicalLocation.selectedValue || {
                 id: '',
                 activatable: true,
@@ -76,7 +77,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             },
             notes: fs.fields.notes.inputValue || '',
             userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || '',
-            customerName: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.customerName) ||
+            customerName: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.customerName) ||
                 (customer.displayName ? customer.displayName : '') ||
                 (customer.firstName && customer.lastName ? `${customer.firstName} ${customer.lastName}` : '') ||
                 (firstName && lastName ? `${firstName} ${lastName}` : ''),
@@ -84,9 +85,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             phone: (customer === null || customer === void 0 ? void 0 : customer.phone) || fs.fields.phone.inputValue || '',
             paymentMethod: fs.fields.paymentMethod.selectedValue || '',
             paymentDetails: fs.fields.paymentDetails.selectedValue || {},
-            merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '',
+            merchantId: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.merchantId) || '',
             tags: fs.fields.tags.selectedValues || [],
-            refunds: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.refunds) || [],
+            refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [],
         };
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

package/lib/factories/Product/ProductFromFormState.js

@@ -46,6 +46,7 @@ class ProductFromFormState extends ProductFactory_1.default {
             shoeSize: props.fields.shoeSize.selectedValue,
             measurements: props.fields.measurements.selectedValue || {},
             featuredCollections: props.fields.featuredCollections.selectedValues || [],
+            tags: props.fields.tags.selectedValues || [],
         };
         const consignmentAttributes = {
             previousSellers: props.fields.previousSellers.selectedValues,

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

@@ -3,7 +3,13 @@ import Product from '../../models/Product';
 export default class ProductFormState extends FormState {
     fields: ProductFormFields;
     props: CompleteProduct;
-    constructor(props?: any);
+    opts: {
+        featuredCollectionOpts: {
+            label: string;
+            value: string;
+        }[];
+    };
+    constructor(props?: any, opts?: any);
     autoCreateTitle(): string;
     autoCreateDescription(): string;
     createProduct(): Product;

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

@@ -5,9 +5,10 @@ const options_1 = require("./options");
 const Product_1 = require("../../models/Product");
 const ProductFromFormState_1 = require("../../factories/Product/ProductFromFormState");
 class ProductFormState extends FormState_1.default {
-    constructor(props) {
+    constructor(props, opts) {
         super();
         this.props = new Product_1.default(props).toObj();
+        this.opts = opts;
         // ProductAttributesFormFields
         this.fields.availableForSale = this.fieldFactory('singleSelect', 'availableForSale', options_1.availableForSaleOptions);
         this.fields.description = this.fieldFactory('textInput', 'description');
@@ -71,6 +72,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.rfidTag = this.fieldFactory('textInput', 'rfidTag');
         this.fields.locationIds = this.fieldFactory('multiSelect', 'locationIds');
         this.fields.featuredCollections = this.fieldFactory('multiSelect', 'featuredCollections');
+        this.fields.tags = this.fieldFactory('multiSelect', 'tags');
     }
     autoCreateTitle() {
         return this.createProduct().autoCreateTitle();
@@ -508,6 +510,23 @@ class ProductFormState extends FormState_1.default {
                 }
                 hidden = this.props.productStyle.length < 1;
             }
+            if (fieldKey === 'tags') {
+                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 });
+                        }
+                    });
+                }
+                hidden = Boolean(this.props.tags && Array.isArray(this.props.tags) && this.props.tags.length < 1);
+            }
+            if (fieldKey === 'featuredCollections') {
+                if (this.opts && this.opts.featuredCollectionOpts && this.opts.featuredCollectionOpts.length > 0) {
+                    options = this.utilities
+                        .uniqObjArray([...options, ...this.opts.featuredCollectionOpts.map((o) => ({ label: o.label, value: o.value }))], 'value')
+                        .filter((o) => { var _a; return !((_a = this.props.featuredCollections) === null || _a === void 0 ? void 0 : _a.includes(o.value)); });
+                }
+            }
             if (fieldKey === 'clothingSize') {
                 if (this.props.gender === 'Woman') {
                     options = [

package/lib/models/Product.js

@@ -50,6 +50,7 @@ class Product extends Base_1.default {
             condition: (props === null || props === void 0 ? void 0 : props.condition) || '',
             measurements: (props === null || props === void 0 ? void 0 : props.measurements) || {},
             featuredCollections: (props === null || props === void 0 ? void 0 : props.featuredCollections) || [],
+            tags: (props === null || props === void 0 ? void 0 : props.tags) || [],
         };
         this.consignmentAttributes = {
             sellRequestImageUrls: (props === null || props === void 0 ? void 0 : props.sellRequestImageUrls) || [],

package/lib/models/ProductCollection.js

@@ -4,7 +4,7 @@ const Base_1 = require("../Base");
 class ProductCollection extends Base_1.default {
     constructor(props) {
         super();
-        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || '';
+        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || this.utilities.makeRandId(28);
         this.preTitle = (props === null || props === void 0 ? void 0 : props.preTitle) || '';
         this.title = (props === null || props === void 0 ? void 0 : props.title) || '';
         this.subTitle = (props === null || props === void 0 ? void 0 : props.subTitle) || '';

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

@@ -39,6 +39,7 @@ declare type ProductFilterAttributes = {
     shoeSize: string;
     measurements: Measurements;
     featuredCollections?: string[];
+    tags?: string[];
 };
 declare type ProductConsignmentAttributes = {
     sellRequestImageUrls: string[];
@@ -138,6 +139,7 @@ declare type ProductFilterAttributesFormFields = {
     productStyle: MultiSelectFormField<string>;
     shoeSize: SingleSelectFormField<string>;
     featuredCollections: MultiSelectFormField<string>;
+    tags: MultiSelectFormField<string>;
 };
 declare type ProductConsignmentAttributesFormFields = {
     previousSellers: MultiSelectFormField<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "2.4.69",
+  "version": "2.4.73",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +14,8 @@
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
-    "postversion": "git push && git push --tags"
+    "postversion": "git push && git push --tags",
+    "clean": "npm run format && npm run lint"
   },
   "repository": {
     "type": "git",