@infrab4a/connect 1.0.0-beta.18 → 1.0.0-beta.19

package/fesm2015/infrab4a-connect.js

@@ -1897,9 +1897,7 @@ GraphQLFieldHelper.ConvertFieldValueFrom = (data, fields) => Object.keys(data).r
 GraphQLFieldHelper.ConvertFieldValueTo = (instance, fields, update = false) => {
     var _a;
     const data = ((_a = instance.toPlain) === null || _a === void 0 ? void 0 : _a.call(instance)) || instance;
-    return Object.keys(data)
-        .filter((key) => !isNil(data[key]))
-        .reduce((result, attributeName) => {
+    return Object.keys(data).reduce((result, attributeName) => {
         const { columnName, fields: attributeFields, foreignKeyColumn, to, bindPersistData, } = AttributeOptionHelper.FindByAttribute(attributeName, fields);
         if (bindPersistData)
             return Object.assign(Object.assign({}, result), bindPersistData(data[attributeName], instance));
@@ -1907,8 +1905,8 @@ GraphQLFieldHelper.ConvertFieldValueTo = (instance, fields, update = false) => {
             return result;
         if (!!foreignKeyColumn &&
             !isEmpty(foreignKeyColumn) &&
-            !Object.keys(foreignKeyColumn).filter((key) => !data[attributeName][key]).length)
-            return Object.keys(foreignKeyColumn).reduce((object, current) => (Object.assign(Object.assign({}, object), { [foreignKeyColumn[current]]: data[attributeName][current] })), Object.assign({}, result));
+            !Object.keys(foreignKeyColumn).filter((key) => { var _a; return !((_a = data[attributeName]) === null || _a === void 0 ? void 0 : _a[key]); }).length)
+            return Object.keys(foreignKeyColumn).reduce((object, current) => { var _a; return (Object.assign(Object.assign({}, object), { [foreignKeyColumn[current]]: (_a = data[attributeName]) === null || _a === void 0 ? void 0 : _a[current] })); }, Object.assign({}, result));
         if (update && isObject(data[attributeName]) && !isNil(attributeFields) && !isDate(data[attributeName]))
             return result;
         if (!!columnName && Array.isArray(attributeFields) && isObject(data[attributeName])) {
@@ -1961,7 +1959,21 @@ const withCreateHasuraGraphQL = (MixinBase) => {
         }
         save(data) {
             return __awaiter(this, void 0, void 0, function* () {
-                const result = yield this.mutation(this.insertGraphQLOperation, this.model.identifiersFields.map((field) => AttributeOptionHelper.FindByAttribute(field, this.fields).columnName), {
+                const primaryKeyColumns = this.model.identifiersFields.map((field) => AttributeOptionHelper.FindByAttribute(field, this.fields).columnName);
+                const foreignKeyColumns = this.fields
+                    .map((field) => {
+                    const columnOptions = Object.values(field).shift();
+                    return (AttributeOptionHelper.CheckIsColumnOption(columnOptions) &&
+                        columnOptions.foreignKeyColumn && [
+                        ...Object.values(columnOptions.foreignKeyColumn),
+                        {
+                            [columnOptions.columnName]: Object.keys(columnOptions.foreignKeyColumn),
+                        },
+                    ]);
+                })
+                    .filter(Boolean)
+                    .reduce((keys, current) => [...keys, ...current], []);
+                const result = yield this.mutation(this.insertGraphQLOperation, [...primaryKeyColumns, ...foreignKeyColumns], {
                     object: { type: this.insertGraphQLObjectType, required: true, value: this.convertDataToHasura(data) },
                 });
                 return Object.assign(Object.assign({}, data.toPlain()), this.convertDataFromHasura(result[this.insertGraphQLOperation]).toPlain());
@@ -2091,7 +2103,7 @@ const withUpdateHasuraGraphQL = (MixinBase) => {
             return options.toPlain();
         if (isNil(options.action))
             return options;
-        if (options.action === UpdateOptionActions.REMOVE_FIELD)
+        if ([UpdateOptionActions.REMOVE_FIELD.toString(), UpdateOptionActions.NULL.toString()].includes(options.action))
             return null;
         return options.value;
     };
@@ -2121,7 +2133,7 @@ const withUpdateHasuraGraphQL = (MixinBase) => {
             const model = this.model;
             if (model.isModel(params))
                 return params.toPlain();
-            return Object.keys(params).reduce((data, currentKey) => (Object.assign(Object.assign({}, data), (params[currentKey] && { [currentKey]: getValueByAction(params[currentKey]) }))), {});
+            return Object.keys(params).reduce((data, currentKey) => (Object.assign(Object.assign({}, data), (params[currentKey] !== undefined && { [currentKey]: getValueByAction(params[currentKey]) }))), {});
         }
         getUpdateModelKeys(data) {
             const instance = this.model.toInstance(data);
@@ -2148,10 +2160,11 @@ const withGetHasuraGraphQL = (MixinBase) => {
             return __awaiter(this, void 0, void 0, function* () {
                 const instance = this.model.toInstance(identifiers);
                 const result = yield this.query(this.getGraphQLOperation, this.fields, this.model.identifiersFields.reduce((ids, identifier) => {
+                    var _a;
                     if (isNil(instance[identifier]))
                         return ids;
                     const columnOption = AttributeOptionHelper.FindByAttribute(identifier, this.fields);
-                    const value = columnOption.to(identifiers[identifier.toString()], instance);
+                    const value = ((_a = columnOption === null || columnOption === void 0 ? void 0 : columnOption.to) === null || _a === void 0 ? void 0 : _a.call(columnOption, identifiers[identifier.toString()], instance)) || identifiers[identifier.toString()];
                     return Object.assign(Object.assign({}, ids), { [columnOption.columnName]: {
                             type: this.getAttributeGraphQLTypeOf(columnOption.type || value),
                             value,
@@ -2335,11 +2348,12 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
                     conditions: {
                         columnName: 'tag_condition',
                         type: HasuraGraphQLColumnType.Jsonb,
-                        from: (tags, row) => ({ brand: row.brand_condition, tags }),
+                        from: (tags, row) => ({ brand: row.brand_condition, tags: Array.isArray(tags) ? tags : [] }),
                         bindPersistData: (value) => {
+                            var _a, _b;
                             return {
                                 brand_condition: value.brand,
-                                tag_condition: `{"${value.tags.join('","')}"}`,
+                                tag_condition: `{"${((_b = (_a = value === null || value === void 0 ? void 0 : value.tags) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '","')) || ''}"}`,
                             };
                         },
                         bindFindFilter: (sentence) => {
@@ -2434,8 +2448,8 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
                 },
             },
             { hasVariants: { columnName: 'has_variants' } },
-            { images: { columnName: 'images', to: (value) => `{"${value.join(`","`)}"}` } },
-            { miniatures: { columnName: 'miniatures', to: (value) => `{"${value.join(`","`)}"}` } },
+            { images: { columnName: 'images', to: (value) => { var _a; return `{"${((_a = value === null || value === void 0 ? void 0 : value.join) === null || _a === void 0 ? void 0 : _a.call(value, `","`)) || ''}"}`; } } },
+            { miniatures: { columnName: 'miniatures', to: (value) => { var _a; return `{"${((_a = value === null || value === void 0 ? void 0 : value.join) === null || _a === void 0 ? void 0 : _a.call(value, `","`)) || ''}"}`; } } },
             'name',
             {
                 price: {
@@ -2448,15 +2462,17 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
                         } })), {}),
                     bindFindFilter: (sentence) => {
                         const filters = Object.values(sentence).shift();
-                        return Object.assign(Object.assign(Object.assign(Object.assign({}, ((filters === null || filters === void 0 ? void 0 : filters.price) && { price: filters.price })), (filters.fullPrice && { full_price: filters.fullPrice })), (filters.subscriberDiscountPercentage && {
+                        return Object.assign(Object.assign(Object.assign(Object.assign({}, (((filters === null || filters === void 0 ? void 0 : filters.price) || (filters === null || filters === void 0 ? void 0 : filters.price) === 0) && { price: filters.price })), ((filters.fullPrice || filters.fullPrice === 0) && { full_price: filters.fullPrice })), ((filters.subscriberDiscountPercentage || filters.subscriberDiscountPercentage === 0) && {
                             subscriber_discount_percentage: filters.subscriberDiscountPercentage,
-                        })), (filters.subscriberPrice && { subscriber_price: filters.subscriberPrice }));
+                        })), ((filters.subscriberPrice || filters.subscriberPrice === 0) && {
+                            subscriber_price: filters.subscriberPrice,
+                        }));
                     },
                     bindPersistData: (value) => {
                         const priceData = Object.values(value).shift();
-                        return Object.assign(Object.assign(Object.assign(Object.assign({}, ((priceData === null || priceData === void 0 ? void 0 : priceData.price) && { price: priceData.price })), (priceData.fullPrice && { full_price: priceData.fullPrice })), (priceData.subscriberDiscountPercentage && {
+                        return Object.assign(Object.assign(Object.assign(Object.assign({}, ((priceData === null || priceData === void 0 ? void 0 : priceData.price) >= 0 && { price: priceData.price })), (priceData.fullPrice >= 0 && { full_price: priceData.fullPrice })), (priceData.subscriberDiscountPercentage >= 0 && {
                             subscriber_discount_percentage: priceData.subscriberDiscountPercentage,
-                        })), (priceData.subscriberPrice && { subscriber_price: priceData.subscriberPrice }));
+                        })), (priceData.subscriberPrice >= 0 && { subscriber_price: priceData.subscriberPrice }));
                     },
                 },
             },
@@ -2595,7 +2611,7 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
                     type: '[product_kit_insert_input!]',
                     required: true,
                     value: plainData.kitProducts.map((kitProduct) => ({
-                        kit_product_id: kitProduct.kitProductId,
+                        kit_product_id: kitProduct.productId || kitProduct.product.id,
                         product_id: productId,
                         quantity: kitProduct.quantity,
                     })),