rerobe-js-orm 3.7.6 → 3.7.7

package/lib/factories/Product/ProductFromFormState.js

@@ -84,6 +84,7 @@ class ProductFromFormState extends ProductFactory_1.default {
             inventoryLocations: props.fields.inventoryLocations.selectedValues || [],
             majorDefects: props.fields.majorDefects.selectedValues || [],
             minorDefects: props.fields.minorDefects.selectedValues || [],
+            careInstructions: props.fields.careInstructions.inputValue || '',
         };
         const timestampAttributes = {
             createdAtTimestamp: (_u = props.props) === null || _u === void 0 ? void 0 : _u.createdAtTimestamp,

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

@@ -34,18 +34,19 @@ class ProductFormState extends FormState_1.default {
         this.fields.size = this.fieldFactory('singleSelect', 'size', options_1.clothingSizeOptions);
         this.fields.color = this.fieldFactory('singleSelect', 'color', options_1.colors);
         this.fields.condition = this.fieldFactory('singleSelect', 'condition', options_1.conditions);
-        this.fields.majorDefects = this.fieldFactory('multiSelect', 'majorDefects', options_1.majorDefectOptions);
-        this.fields.minorDefects = this.fieldFactory('multiSelect', 'minorDefects', options_1.minorDefectOptions);
         this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.genderOptions);
         this.fields.materialComposition = this.fieldFactory('singleSelect', 'materialComposition', options_1.clothingMaterials);
         this.fields.priceRange = this.fieldFactory('textInput', 'priceRange');
         this.fields.productCategory = this.fieldFactory('singleSelect', 'productCategory', options_1.productCategories);
         this.fields.productType = this.fieldFactory('singleSelect', 'productType');
         this.fields.productStyle = this.fieldFactory('multiSelect', 'productStyle');
+        this.fields.careInstructions = this.fieldFactory('textInput', 'careInstructions');
         // Deprecated soon
         this.fields.clothingSize = this.fieldFactory('multiSelect', 'clothingSize', options_1.clothingSizeOptions);
         this.fields.shoeSize = this.fieldFactory('singleSelect', 'shoeSize', options_1.shoeSizes);
         this.fields.jeanSize = this.fieldFactory('singleSelect', 'jeanSize', options_1.jeanSizes);
+        this.fields.majorDefects = this.fieldFactory('multiSelect', 'majorDefects', options_1.majorDefectOptions);
+        this.fields.minorDefects = this.fieldFactory('multiSelect', 'minorDefects', options_1.minorDefectOptions);
         // ProductConsignmentAttributesFormFields
         this.fields.publishType = this.fieldFactory('singleSelect', 'publishType', options_1.publishTypeOptions);
         this.fields.conditionRemarks = this.fieldFactory('textInput', 'conditionRemarks');
@@ -740,6 +741,7 @@ class ProductFormState extends FormState_1.default {
                 }
                 hidden = this.props.productCategory !== 'Clothing' || this.props.productType === 'Jeans';
             }
+            // ToDo: Deprecate
             if (fieldKey === 'majorDefects') {
                 let selectedMajorDefectsOptions = [];
                 if (this.props.majorDefects && Array.isArray(this.props.majorDefects) && this.props.majorDefects.length > 0) {
@@ -751,6 +753,7 @@ class ProductFormState extends FormState_1.default {
                 }
                 options = this.utilities.uniqObjArray([...selectedMajorDefectsOptions, ...majorDefectsOptions], 'value');
             }
+            // ToDo: Deprecate
             if (fieldKey === 'minorDefects') {
                 let selectedMinorDefectsOptions = [];
                 if (this.props.minorDefects && Array.isArray(this.props.minorDefects) && this.props.minorDefects.length > 0) {

package/lib/models/Product.js

@@ -86,6 +86,7 @@ class Product extends Base_1.default {
             inventoryLocations: this.validateInventoryLocation(props === null || props === void 0 ? void 0 : props.inventoryLocations) || [],
             majorDefects: (props === null || props === void 0 ? void 0 : props.majorDefects) || [],
             minorDefects: (props === null || props === void 0 ? void 0 : props.minorDefects) || [],
+            careInstructions: (props === null || props === void 0 ? void 0 : props.careInstructions) || '',
         };
         this.timestampAttributes = {
             createdAtTimestamp: (props === null || props === void 0 ? void 0 : props.createdAtTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.createdAtTimestamp) : null,
@@ -469,13 +470,11 @@ class Product extends Base_1.default {
         var _a;
         const { compareAtPrice } = this.attributes;
         const { color, productCategory, productType, productStyle, condition, gender, size } = this.filterAttributes;
-        const { productRemarks, conditionRemarks, purchasePrice, yearPurchased, sizeComment, majorDefects, minorDefects } = this.consignmentAttributes;
+        const { productRemarks, conditionRemarks, purchasePrice, yearPurchased, sizeComment, careInstructions } = this.consignmentAttributes;
         const measurements = this.measurementsJoinedString(this.filterAttributes.measurements);
         const materials = this.materialCompJoinedString();
         const fit = ((_a = options_1.sizeCommentOptions.find((option) => option.value === sizeComment)) === null || _a === void 0 ? void 0 : _a.label) || '';
         const joinedProductStyle = productStyle.join(', ');
-        const joinedMajorDefects = majorDefects.join(', ');
-        const joinedMinorDefects = minorDefects.join(', ');
         const numberFormatter = new Intl.NumberFormat(locale, {
             style: 'currency',
             currency,
@@ -527,8 +526,7 @@ class Product extends Base_1.default {
                 title: 'Additional Remarks',
                 attributes: [
                     productRemarks && `${t('Remarks')}: ${t(productRemarks)}`,
-                    majorDefects.length > 0 && `${t('Major Defects')}: ${t(joinedMajorDefects)}`,
-                    minorDefects.length > 0 && `${t('Minor Defects')}: ${t(joinedMinorDefects)}`,
+                    careInstructions && `${t('Care instrutions')}: ${t(careInstructions)}`,
                 ].filter(Boolean),
             },
         ];

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

@@ -77,6 +77,7 @@ type ProductConsignmentAttributes = {
     inventoryLocations: InventoryLocation[];
     majorDefects: string[];
     minorDefects: string[];
+    careInstructions: string;
 };
 type ProductTimestampAttributes = {
     createdAtTimestamp: number | null;
@@ -211,6 +212,7 @@ type ProductConsignmentAttributesFormFields = {
     inventoryLocations: MultiSelectFormField<InventoryLocation>;
     majorDefects: MultiSelectFormField<string>;
     minorDefects: MultiSelectFormField<string>;
+    careInstructions: TextInputFormField<string>;
 };
 type ProductFormFields = ProductAttributesFormFields & ProductFilterAttributesFormFields & ProductConsignmentAttributesFormFields;
 interface ParamsForBuildProductInputObjForShopify {

package/package.json

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