rez_core 2.2.124 → 2.2.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.124",
+  "version": "2.2.125",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -194,16 +194,16 @@ export class FilterService {
 
     // layout preference query
     const layoutPreference = await this.dataSource.query(
-      `SELECT layout_json
+      `SELECT mapped_json 
       FROM cr_entity_layout_pref
-      WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ?`,
+      WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
       [user_id, entity_type, level_id, level_type],
     );
 
     console.log('found layoutPreference', layoutPreference);
 
     // Extract layout preference
-    const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
+    const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
 
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
@@ -366,10 +366,10 @@ export class FilterService {
     //   });
     // }
 
-    if (layoutPreference && layoutPreference[0]?.layout_json?.sorting) {
-      if (Array.isArray(layoutPreference[0]?.layout_json?.sorting?.tabs)) {
+    if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
+      if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
         let preferenceTabArray =
-          layoutPreference[0]?.layout_json?.sorting?.tabs;
+          layoutPreference[0]?.mapped_json?.sorting?.tabs;
         let tabFilter = preferenceTabArray.find(
           (tabData) => tabData.tab_name === tabs?.value,
         );
@@ -381,10 +381,10 @@ export class FilterService {
           );
         });
       } else if (
-        Array.isArray(layoutPreference[0]?.layout_json?.sorting?.sortby)
+        Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)
       ) {
         // Optional sorting
-        layoutPreference[0]?.layout_json?.sorting?.sortby?.forEach(
+        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
           ({ column, order }) => {
             qb.addOrderBy(
               `e.${column}`,