rerobe-js-orm 3.0.12 → 3.0.14

package/lib/factories/ProductCollection/ProductCollectionFromFormState.js

@@ -19,6 +19,7 @@ class ProductCollectionFromFormState extends ProductCollectionFactory_1.default
             description: fs.fields.description.inputValue || '',
             type: fs.fields.type.selectedValue || '',
             imgUrl: fs.fields.imgUrl.inputValue || '',
+            imageUrls: fs.fields.imageUrls.selectedValues || [],
             refinements: fs.fields.refinements.selectedValue || {},
             tags: fs.fields.tags.selectedValues || [],
             collectionId,

package/lib/form-states/ProductCollection/ProductCollectionFormState.js

@@ -16,6 +16,7 @@ class ProductCollectionFormState extends FormState_1.default {
         this.fields.description = this.fieldFactory('textInput', 'description');
         this.fields.type = this.fieldFactory('singleSelect', 'type');
         this.fields.imgUrl = this.fieldFactory('textInput', 'imgUrl');
+        this.fields.imageUrls = this.fieldFactory('multiSelect', 'imageUrls', []);
         this.fields.refinements = this.fieldFactory('singleSelect', 'refinements');
         this.fields.tags = this.fieldFactory('multiSelect', 'tags', []);
         this.fields.collectionId = this.fieldFactory('textInput', 'collectionId');
@@ -65,6 +66,14 @@ class ProductCollectionFormState extends FormState_1.default {
                 }
                 valid = true;
             }
+            if (fieldKey === 'imageUrls') {
+                if (this.props.imageUrls) {
+                    if (Array.isArray(this.props.imageUrls)) {
+                        selectedValues = this.props.imageUrls;
+                    }
+                }
+                valid = true;
+            }
             return {
                 options,
                 selectedValues,

package/lib/helpers/Utilities.d.ts

@@ -22,8 +22,9 @@ export default class Utilities {
         lastName: string;
     };
     formatTimestamp(timestampMillis: number): {
+        createdAtHour: string;
         createdAtDay: string;
         createdAtMonth: string;
-        createdAtHour: string;
+        createdAtYear: string;
     };
 }

package/lib/helpers/Utilities.js

@@ -149,9 +149,10 @@ class Utilities {
     formatTimestamp(timestampMillis) {
         if (typeof timestampMillis !== 'number' || Number.isNaN(new Date(timestampMillis).valueOf())) {
             return {
+                createdAtHour: '',
                 createdAtDay: '',
                 createdAtMonth: '',
-                createdAtHour: '',
+                createdAtYear: '',
             };
         }
         const dateObj = new Date(timestampMillis);
@@ -159,13 +160,15 @@ class Utilities {
         const month = (dateObj.getUTCMonth() + 1).toString().padStart(2, '0'); // Months are 0-indexed in JS
         const day = dateObj.getUTCDate().toString().padStart(2, '0');
         const hour = dateObj.getUTCHours().toString().padStart(2, '0');
+        const createdAtHour = `${year}-${month}-${day} ${hour}`;
         const createdAtDay = `${year}-${month}-${day}`;
         const createdAtMonth = `${year}-${month}`;
-        const createdAtHour = `${year}-${month}-${day} ${hour}`;
+        const createdAtYear = `${year}`;
         return {
+            createdAtHour,
             createdAtDay,
             createdAtMonth,
-            createdAtHour,
+            createdAtYear,
         };
     }
 }

package/lib/models/Order.js

@@ -326,6 +326,12 @@ class Order extends Base_1.default {
                     type: 'string',
                     optional: true,
                 },
+                {
+                    facet: true,
+                    name: 'createdAtYear',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name: 'dev_orders_20220809',
         };
@@ -335,7 +341,7 @@ class Order extends Base_1.default {
             ? this.lineItems[0].image.originalSrc
             : 'https://res.cloudinary.com/ribbn/image/fetch/e_blur:1000,o_20,q_50/https://cdn.shopify.com/s/files/1/0261/9686/9172/products/7AC16810-F519-4665-8891-7163EB29FBB7_1000x1000.jpg%3Fv%3D1634827512';
         const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp);
-        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth, createdAtYear } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             id: this.utilities.sanitizeString(this.documentId),
             documentId: this.utilities.sanitizeString(this.documentId),
@@ -344,6 +350,7 @@ class Order extends Base_1.default {
             createdAtHour,
             createdAtDay,
             createdAtMonth,
+            createdAtYear,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.updatedAtTimestamp),
             merchantId: this.utilities.sanitizeString(this.merchantId),
             image: this.utilities.sanitizeString(image),

package/lib/models/Product.js

@@ -262,7 +262,7 @@ class Product extends Base_1.default {
     }
     toObjForTypesense() {
         const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.createdAtTimestamp);
-        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth, createdAtYear } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             brand: this.utilities.sanitizeString(this.filterAttributes.brand),
             size: this.utilities.sanitizeString(this.filterAttributes.size),
@@ -296,6 +296,7 @@ class Product extends Base_1.default {
             createdAtHour,
             createdAtDay,
             createdAtMonth,
+            createdAtYear,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.updatedAtTimestamp),
             sellRequestReviewTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellRequestReviewTimestamp),
             sellRequestReviewDraftTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellRequestReviewDraftTimestamp),
@@ -762,6 +763,12 @@ class Product extends Base_1.default {
                     type: 'string',
                     optional: true,
                 },
+                {
+                    facet: true,
+                    name: 'createdAtYear',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name,
         };

package/lib/models/ProductCollection.d.ts

@@ -9,6 +9,7 @@ export default class ProductCollection extends Base {
     description: string;
     type: CollectionType;
     imgUrl: string;
+    imageUrls: string[];
     refinements: ProductRefinements;
     tags: string[];
     collectionId: string;

package/lib/models/ProductCollection.js

@@ -16,6 +16,7 @@ class ProductCollection extends Base_1.default {
         this.refinements = (props === null || props === void 0 ? void 0 : props.refinements) || {};
         this.tags = (props === null || props === void 0 ? void 0 : props.tags) || [];
         this.collectionId = (props === null || props === void 0 ? void 0 : props.collectionId) || '';
+        this.imageUrls = (props === null || props === void 0 ? void 0 : props.imageUrls) || [];
     }
     toObj() {
         const productCollectionObj = {
@@ -31,6 +32,7 @@ class ProductCollection extends Base_1.default {
             refinements: this.refinements,
             tags: this.tags,
             collectionId: this.collectionId,
+            imageUrls: this.imageUrls,
         };
         return productCollectionObj;
     }
@@ -79,10 +81,16 @@ class ProductCollection extends Base_1.default {
                     type: 'string',
                 },
                 {
+                    // deprecate soon, will be migrated into imageUrls
                     facet: false,
                     name: 'imgUrl',
                     type: 'string',
                 },
+                {
+                    facet: false,
+                    name: 'imageUrls',
+                    type: 'string[]',
+                },
                 {
                     facet: true,
                     optional: true,
@@ -208,6 +216,7 @@ class ProductCollection extends Base_1.default {
             'refinements.statusRefinement': this.utilities.sanitzeStringArr(this.refinements.statusRefinement),
             'refinements.salesChannelRefinement': this.utilities.sanitzeStringArr(this.refinements.salesChannelRefinement),
             tags: this.utilities.sanitzeStringArr(this.tags),
+            imageUrls: this.utilities.sanitzeStringArr(this.imageUrls),
             collectionId: this.utilities.sanitizeString(this.collectionId),
         };
         return stagedObj;

package/lib/models/User.js

@@ -313,13 +313,19 @@ class User extends Base_1.default {
                     type: 'string',
                     optional: true,
                 },
+                {
+                    facet: true,
+                    name: 'createdAtYear',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name: 'prod_customers_20220907',
         };
     }
     toObjForTypesense(merchantId) {
         const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp);
-        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth, createdAtYear } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             id: this.utilities.sanitizeString(this.documentId),
             documentId: this.utilities.sanitizeString(this.documentId),
@@ -328,6 +334,7 @@ class User extends Base_1.default {
             createdAtHour,
             createdAtDay,
             createdAtMonth,
+            createdAtYear,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.updatedAtTimestamp),
             merchantId: this.utilities.sanitizeString(merchantId),
             firstName: this.utilities.sanitizeString(this.firstName),

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

@@ -48,6 +48,7 @@ declare type ProductCollectionType = {
     refinements: ProductRefinements;
     tags: string[];
     collectionId: string;
+    imageUrls: string[];
 };
 declare type CompleteProductCollection = ProductCollectionType & {
     [key: string]: any;
@@ -61,6 +62,7 @@ declare type ProductCollectionFormFields = {
     imgUrl: TextInputFormField<string>;
     refinements: SingleSelectFormField<ProductRefinements>;
     tags: MultiSelectFormField<string>;
+    imageUrls: MultiSelectFormField<string>;
     collectionId: TextInputFormField<string>;
 };
 declare type TypesenseProductCollectionObj = {
@@ -89,5 +91,6 @@ declare type TypesenseProductCollectionObj = {
     'refinements.statusRefinement': string[];
     'refinements.salesChannelRefinement': string[];
     tags: string[];
+    imageUrls: string[];
     collectionId: string;
 };

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

@@ -766,4 +766,5 @@ declare type TypesenseOrderObj = {
     createdAtDay: string;
     createdAtMonth: string;
     createdAtHour: string;
+    createdAtYear: string;
 };

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

@@ -302,5 +302,6 @@ declare type TypesenseProductObj = {
     createdAtDay: string;
     createdAtMonth: string;
     createdAtHour: string;
+    createdAtYear: string;
     [key: string]: any;
 };

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

@@ -164,7 +164,8 @@ declare type TypesenseUserObj = {
     lastOrderTimestamp: number;
     lastUploadTimestamp: number;
     registrationSource: string;
+    createdAtHour: string;
     createdAtDay: string;
     createdAtMonth: string;
-    createdAtHour: string;
+    createdAtYear: string;
 };

package/package.json

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