rerobe-js-orm 3.0.7 → 3.0.8

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -4,9 +4,8 @@ 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;
-        const merchantAttributes = {
-            id: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.id) || '',
+        var _a;
+        const MerchantMutableData = {
             name: fs.fields.name.inputValue,
             type: fs.fields.type.selectedValue,
             contactEmail: fs.fields.contactEmail.inputValue,
@@ -18,22 +17,13 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             currency: fs.fields.currency.selectedValue,
             timeZone: fs.fields.timeZone.selectedValue,
             unitSystem: fs.fields.unitSystem.selectedValue,
-            paymentTier: fs.fields.paymentTier.selectedValue,
             defaultWeightUnit: fs.fields.defaultWeightUnit.selectedValue,
-            defaultLocation: (_b = fs.props) === null || _b === void 0 ? void 0 : _b.defaultLocation,
-            documentId: (_c = fs.props) === null || _c === void 0 ? void 0 : _c.documentId,
-            numCustomers: (_d = fs.props) === null || _d === void 0 ? void 0 : _d.numCustomers,
-            numFiles: (_e = fs.props) === null || _e === void 0 ? void 0 : _e.numFiles,
-            numOrders: (_f = fs.props) === null || _f === void 0 ? void 0 : _f.numOrders,
-            numProducts: (_g = fs.props) === null || _g === void 0 ? void 0 : _g.numProducts,
-            webshopTenantId: (_h = fs.props) === null || _h === void 0 ? void 0 : _h.webshopTenantId,
+            defaultLocation: (_a = fs.props) === null || _a === void 0 ? void 0 : _a.defaultLocation,
             webhooks: fs.fields.webhooks.selectedValues,
-            sharedSecret: (_j = fs.props) === null || _j === void 0 ? void 0 : _j.sharedSecret,
-            ribbnId: fs.fields.ribbnId.inputValue,
             primaryDomain: fs.fields.primaryDomain.inputValue,
-            webshopHomePageId: (_k = fs.props) === null || _k === void 0 ? void 0 : _k.webshopHomePageId,
+            socialLinks: fs.fields.socialLinks.selectedValue,
         };
-        return new Merchant_1.default(Object.assign({}, merchantAttributes));
+        return new Merchant_1.default(Object.assign(Object.assign({}, fs.props), MerchantMutableData));
     }
 }
 exports.default = MerchantFromFormState;

package/lib/form-states/Merchant/MerchantFormState.js

@@ -10,7 +10,6 @@ class MerchantFormState extends FormState_1.default {
         this.props = new Merchant_1.default(props).toObj();
         this.fields.name = this.fieldFactory('textInput', 'name');
         this.fields.type = this.fieldFactory('singleSelect', 'type', options_1.merchantTypeOptions);
-        this.fields.paymentTier = this.fieldFactory('singleSelect', 'paymentTier', options_1.paymentTierOptions);
         this.fields.contactEmail = this.fieldFactory('textInput', 'contactEmail');
         this.fields.senderEmail = this.fieldFactory('textInput', 'senderEmail');
         this.fields.industry = this.fieldFactory('singleSelect', 'industry', options_1.industryOptions);
@@ -22,8 +21,8 @@ class MerchantFormState extends FormState_1.default {
         this.fields.unitSystem = this.fieldFactory('singleSelect', 'unitSystem', options_1.unitSystemOptions);
         this.fields.defaultWeightUnit = this.fieldFactory('singleSelect', 'defaultWeightUnit');
         this.fields.webhooks = this.fieldFactory('multiSelect', 'webhooks');
-        this.fields.ribbnId = this.fieldFactory('textInput', 'ribbnId');
         this.fields.primaryDomain = this.fieldFactory('textInput', 'primaryDomain');
+        this.fields.socialLinks = this.fieldFactory('singleSelect', 'socialLinks');
     }
     createMerchant() {
         const merchantFactory = new MerchantFromFormState_1.default();
@@ -31,7 +30,7 @@ class MerchantFormState extends FormState_1.default {
     }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
         const options = fieldOptions || [];
-        if (fieldType === 'textInput' && fieldKey !== 'address' && fieldKey !== 'webhooks') {
+        if (fieldType === 'textInput' && fieldKey !== 'address' && fieldKey !== 'webhooks' && fieldKey !== 'socialLinks') {
             const inputValue = this.props[fieldKey] || '';
             const valid = !!this.props[fieldKey];
             let onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
@@ -87,6 +86,20 @@ class MerchantFormState extends FormState_1.default {
                         !!Object.keys(this.props.address).length &&
                         !!Object.values(this.props.address).filter((item) => !!item).length;
             }
+            else if (fieldKey === 'socialLinks') {
+                selectedValue = this.props.socialLinks || {
+                    facebook: '',
+                    instagram: '',
+                    linkedIn: '',
+                    twitter: '',
+                    pintrest: '',
+                    tiktok: '',
+                };
+                valid =
+                    !!this.props.socialLinks &&
+                        !!Object.keys(this.props.socialLinks).length &&
+                        !!Object.values(this.props.socialLinks).filter((item) => !!item).length;
+            }
             else if (fieldKey === 'unitSystem') {
                 onChangeHandler = (val) => this.unitSystemSelectHandler(val);
                 selectedValue = this.props[fieldKey] || '';

package/lib/models/Merchant.d.ts

@@ -37,7 +37,6 @@ export default class Merchant extends Base {
         productDelete: string;
     };
     name: string;
-    id: string;
     type: MerchantTypes | string;
     paymentTier: RibbnPaymentTiers | string;
     contactEmail: string;
@@ -62,6 +61,8 @@ export default class Merchant extends Base {
     ribbnId: string;
     primaryDomain: string;
     webshopHomePageId: string;
+    socialLinks: SocialLinksType | null;
     constructor(props?: any);
     toObj(): MerchantObj;
+    toMerchantMutableData(): MerchantMutableData;
 }

package/lib/models/Merchant.js

@@ -5,7 +5,6 @@ class Merchant extends Base_1.default {
     constructor(props) {
         super();
         this.name = (props === null || props === void 0 ? void 0 : props.name) || '';
-        this.id = (props === null || props === void 0 ? void 0 : props.id) || '';
         this.type = (props === null || props === void 0 ? void 0 : props.type) || Merchant.MERCHANT_TYPES.individual;
         this.paymentTier = (props === null || props === void 0 ? void 0 : props.paymentTier) || Merchant.PAYMENT_TIERS.free;
         this.contactEmail = (props === null || props === void 0 ? void 0 : props.contactEmail) || '';
@@ -39,11 +38,18 @@ class Merchant extends Base_1.default {
         this.ribbnId = (props === null || props === void 0 ? void 0 : props.ribbnId) || '';
         this.primaryDomain = (props === null || props === void 0 ? void 0 : props.primaryDomain) || '';
         this.webshopHomePageId = (props === null || props === void 0 ? void 0 : props.webshopHomePageId) || 'home';
+        this.socialLinks = (props === null || props === void 0 ? void 0 : props.socialLinks) || {
+            facebook: '',
+            instagram: '',
+            linkedIn: '',
+            twitter: '',
+            pintrest: '',
+            tiktok: '',
+        };
     }
     toObj() {
         return {
             name: this.name,
-            id: this.id,
             type: this.type,
             paymentTier: this.paymentTier,
             contactEmail: this.contactEmail,
@@ -68,6 +74,27 @@ class Merchant extends Base_1.default {
             ribbnId: this.ribbnId,
             primaryDomain: this.primaryDomain,
             webshopHomePageId: this.webshopHomePageId,
+            socialLinks: this.socialLinks,
+        };
+    }
+    toMerchantMutableData() {
+        return {
+            name: this.name,
+            type: this.type,
+            contactEmail: this.contactEmail,
+            senderEmail: this.senderEmail,
+            industry: this.industry,
+            legalName: this.legalName,
+            phone: this.phone,
+            address: this.address,
+            currency: this.currency,
+            timeZone: this.timeZone,
+            unitSystem: this.unitSystem,
+            defaultWeightUnit: this.defaultWeightUnit,
+            defaultLocation: this.defaultLocation,
+            primaryDomain: this.primaryDomain,
+            webhooks: this.webhooks,
+            socialLinks: this.socialLinks,
         };
     }
 }

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

@@ -1,8 +1,14 @@
-declare type MerchantObj = {
+declare type SocialLinksType = {
+    facebook: string;
+    instagram: string;
+    linkedIn: string;
+    twitter: string;
+    pintrest: string;
+    tiktok: string;
+};
+declare type MerchantMutableData = {
     name: string;
-    id: string;
     type: MerchantTypes | string;
-    paymentTier: RibbnPaymentTiers | string;
     contactEmail: string;
     senderEmail: string;
     industry: MerchantIndustryTypes | string | null;
@@ -14,18 +20,23 @@ declare type MerchantObj = {
     unitSystem: UnitSystemTypes | string | null;
     defaultWeightUnit: MetricWeightTypes | ImperialWeightTypes | string | null;
     defaultLocation: string;
+    primaryDomain: string;
+    webhooks: MerchantWebHook[];
+    socialLinks: SocialLinksType | null;
+};
+declare type MerchantSystemOnlyMutableData = {
+    paymentTier: RibbnPaymentTiers | string;
     documentId: string;
     numCustomers: number;
     numFiles: number;
     numOrders: number;
     numProducts: number;
-    webhooks: MerchantWebHook[];
     webshopTenantId: string;
     sharedSecret: string;
     ribbnId: string;
-    primaryDomain: string;
     webshopHomePageId: string;
 };
+declare type MerchantObj = MerchantMutableData & MerchantSystemOnlyMutableData;
 declare type MerchantTypes = 'INDIVIDUAL' | 'BUSINESS';
 declare type RibbnPaymentTiers = 'FREE' | 'TIER_ONE';
 declare type MerchantIndustryTypes = 'BEAUTY' | 'CLOTHING' | 'ELECTRONICS' | 'FURNITURE' | 'HANDCRAFTS' | 'JEWELRY' | 'SPORTS' | 'TOYS' | 'OTHER';
@@ -52,7 +63,6 @@ declare type MerchantWebHook = {
 declare type MerchantFormFields = {
     name: TextInputFormField<string>;
     type: SingleSelectFormField<string>;
-    paymentTier: SingleSelectFormField<string>;
     contactEmail: TextInputFormField<string>;
     senderEmail: TextInputFormField<string>;
     industry: SingleSelectFormField<string>;
@@ -64,8 +74,8 @@ declare type MerchantFormFields = {
     unitSystem: SingleSelectFormField<string>;
     defaultWeightUnit: SingleSelectFormField<string>;
     webhooks: MultiSelectFormField<MerchantWebHook>;
-    ribbnId: TextInputFormField<string>;
     primaryDomain: TextInputFormField<string>;
+    socialLinks: SingleSelectFormField<SocialLinksType>;
 };
 declare type WebhookFormFields = {
     event: SingleSelectFormField<string>;

package/package.json

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