@infrab4a/connect 4.3.9-beta.14 → 4.3.9-beta.2

package/index.cjs.js

@@ -4114,7 +4114,9 @@ const withFindHasuraGraphQL = (MixinBase) => {
                 ...acc,
                 {
                     [AttributeOptionHelper.FindByAttribute(current, fields)
-                        .columnName]: orderBy[current],
+                        .columnName]: orderBy[current] === 'asc'
+                        ? 'asc_nulls_last'
+                        : 'desc_nulls_last',
                 },
             ], []);
             this.bindAggretageAttributes = (aggregates, fields) => {
@@ -4753,7 +4755,7 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         }
     }
     async getChildren(parentId) {
-        const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id'], {
+        const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id', 'slug', 'reference'], {
             args: {
                 type: 'category_tree_args',
                 value: { parentid: parentId },
@@ -5175,12 +5177,7 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         ], []);
     }
     async findCatalog(params, mainGender) {
-        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign(Object.assign({}, lodash.omit(params.orderBy, ['hasStock', 'intGender'])), { hasStock: 'desc' }), (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })) }));
-        // order by stock tbm maior menor
-        // sempre duas condições
-        // verificar se tem empate
-        // null tá aparecendo primeiro no melhor rating
-        // testear com desc null last e verificar empate
+        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign({ hasStock: 'desc' }, (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })), lodash.omit(params.orderBy, ['hasStock', 'intGender'])) }));
     }
     async updateCategories(productId, { categories }) {
         if ('action' in categories && categories.action === 'remove') {

package/index.esm.js

@@ -4090,7 +4090,9 @@ const withFindHasuraGraphQL = (MixinBase) => {
                 ...acc,
                 {
                     [AttributeOptionHelper.FindByAttribute(current, fields)
-                        .columnName]: orderBy[current],
+                        .columnName]: orderBy[current] === 'asc'
+                        ? 'asc_nulls_last'
+                        : 'desc_nulls_last',
                 },
             ], []);
             this.bindAggretageAttributes = (aggregates, fields) => {
@@ -4729,7 +4731,7 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         }
     }
     async getChildren(parentId) {
-        const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id'], {
+        const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id', 'slug', 'reference'], {
             args: {
                 type: 'category_tree_args',
                 value: { parentid: parentId },
@@ -5151,12 +5153,7 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         ], []);
     }
     async findCatalog(params, mainGender) {
-        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign(Object.assign({}, omit(params.orderBy, ['hasStock', 'intGender'])), { hasStock: 'desc' }), (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })) }));
-        // order by stock tbm maior menor
-        // sempre duas condições
-        // verificar se tem empate
-        // null tá aparecendo primeiro no melhor rating
-        // testear com desc null last e verificar empate
+        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign({ hasStock: 'desc' }, (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })), omit(params.orderBy, ['hasStock', 'intGender'])) }));
     }
     async updateCategories(productId, { categories }) {
         if ('action' in categories && categories.action === 'remove') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.3.9-beta.14",
+  "version": "4.3.9-beta.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/domain/generic/repository/types/repository-order-by-list.type.d.ts

@@ -1,5 +1,5 @@
 import { NonFunctionAndIdentifierPropertyNames } from '../../model/types/non-function-property-name.type';
 export type RepositoryOrderBy<Model> = {
-    [key in NonFunctionAndIdentifierPropertyNames<Model>]?: 'asc' | 'desc' | 'desc_nulls_last' | 'asc_nulls_last';
+    [key in NonFunctionAndIdentifierPropertyNames<Model>]?: 'asc' | 'desc';
 };
 export type RepositoryOrderByList<Model> = RepositoryOrderBy<Model>[];

package/src/domain/shop-settings/models/shop-menu.d.ts

@@ -1,7 +1,9 @@
+import { Shops } from '../../catalog';
 import { BaseModel, GenericIdentifier } from '../../generic/model';
 import { MenuNav } from './types/menu-nav.type';
 export declare class ShopMenu extends BaseModel<ShopMenu> {
     menuNav: MenuNav[];
+    shop: Shops;
     id: string;
     static get identifiersFields(): GenericIdentifier[];
 }

package/src/domain/shop-settings/models/types/menu-nav.type.d.ts

@@ -1,8 +1,9 @@
 import { SubMenu } from './sub-menu.type';
 export type MenuNav = {
-    image: string;
+    image?: string;
     label: string;
     path: string;
     position: string;
     subMenu: SubMenu[];
+    static: boolean;
 };