rerobe-js-orm 2.4.88 → 2.4.89

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/form-states/Product/ProductFormState.d.ts

@@ -8,6 +8,7 @@ export default class ProductFormState extends FormState {
             label: string;
             value: string;
         }[];
+        tags: string[];
     };
     constructor(props?: any, opts?: any);
     autoCreateTitle(): string;

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

@@ -531,13 +531,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/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

@@ -563,12 +563,12 @@ class Product extends Base_1.default {
                     type: 'int32',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     name: 'availableForSale',
                     type: 'bool',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     name: 'selectedForClearance',
                     type: 'string',
                 },

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/package.json

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