Merge pull request #9142 from nocodb/nc-fix/sub-group

fix: Sub-group loading issue

packages/nc-gui/components/smartsheet/grid/GroupBy.vue

@@ -133,10 +133,16 @@ const activeGroups = computed<string[]>(() => {
 
 const oldActiveGroups = ref<string[]>([])
 
-const findAndLoadSubGroup = (key: any) => {
+const findAndLoadSubGroup = async (key: any) => {
   key = Array.isArray(key) ? key : [key]
   if (key.length > 0 && vGroup.value.children) {
     if (!oldActiveGroups.value.includes(key[key.length - 1])) {
+      // wait until children loads since it may be still loading in background
+      // todo: implement a better way to handle this
+      await until(() => vGroup.value.children?.length > 0).toBeTruthy({
+        timeout: 10000,
+      })
+
       const k = key[key.length - 1].replace('group-panel-', '')
       const grp = vGroup.value.children.find((g) => `${g.key}` === k)
       if (grp) {
@@ -278,13 +284,13 @@ const shouldRenderCell = (column) =>
     UITypes.LastModifiedBy,
   ].includes(column?.uidt)
 
-const expandGroup = (key: string) => {
+const expandGroup = async (key: string) => {
   if (Array.isArray(_activeGroupKeys.value)) {
     _activeGroupKeys.value.push(`group-panel-${key}`)
   } else {
     _activeGroupKeys.value = [`group-panel-${key}`]
   }
-  findAndLoadSubGroup(`group-panel-${key}`)
+  await findAndLoadSubGroup(`group-panel-${key}`)
 }
 
 const collapseGroup = (key: string) => {
@@ -299,13 +305,15 @@ const collapseAllGroup = () => {
   _activeGroupKeys.value = []
 }
 
-const expandAllGroup = () => {
+const expandAllGroup = async () => {
   _activeGroupKeys.value = vGroup.value.children?.map((g) => `group-panel-${g.key}`) ?? []
 
   if (vGroup.value.children) {
-    vGroup.value.children.forEach((g) => {
+    await Promise.all(
-      findAndLoadSubGroup(`group-panel-${g.key}`)
+      vGroup.value.children.map((g) => {
-    })
+        return findAndLoadSubGroup(`group-panel-${g.key}`)
+      }),
+    )
   }
 }
 

packages/nc-gui/components/workspace/CollaboratorsList.vue

@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+/* eslint-disable @typescript-eslint/consistent-type-imports */
 import { OrderedWorkspaceRoles, WorkspaceUserRoles } from 'nocodb-sdk'
 
 const props = defineProps<{

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -1011,10 +1011,7 @@ class BaseModelSqlv2 {
               )
               .from(count.as(getAlias()));
             selectors.push(
-              this.dbDriver.raw(`(??) as "??"`, [
+              this.dbDriver.raw(`(??) as ??`, [subQuery, `${f.alias}`]),
-                subQuery,
-                this.dbDriver.raw(f.alias),
-              ]),
             );
             break;
           case 'mysql2':
@@ -1391,10 +1388,7 @@ class BaseModelSqlv2 {
               )
               .from(tQb.as(getAlias()));
             selectors.push(
-              this.dbDriver.raw(`(??) as "??"`, [
+              this.dbDriver.raw(`(??) as ??`, [subQuery, `${f.alias}`]),
-                subQuery,
-                this.dbDriver.raw(f.alias),
-              ]),
             );
             break;
           case 'mysql2':
@@ -1597,12 +1591,7 @@ class BaseModelSqlv2 {
 
         tQb.select(jsonBuildObject);
 
-        selectors.push(
+        selectors.push(this.dbDriver.raw(`(??) as ??`, [tQb, `${f.alias}`]));
-          this.dbDriver.raw(`(??) as ??`, [
-            tQb,
-            this.dbDriver.raw(`"${f.alias}"`),
-          ]),
-        );
       }
 
       qb.select(...selectors);

packages/nocodb/src/services/meta-diffs.service.ts

@@ -448,7 +448,10 @@ export class MetaDiffsService {
     }
 
     for (const relation of relationList) {
-      if (!relation?.found?.[RelationTypes.BELONGS_TO] && !relation?.found?.[RelationTypes.ONE_TO_ONE]) {
+      if (
+        !relation?.found?.[RelationTypes.BELONGS_TO] &&
+        !relation?.found?.[RelationTypes.ONE_TO_ONE]
+      ) {
         changes
           .find((t) => t.table_name === relation.tn)
           ?.detectedChanges.push({
@@ -462,7 +465,10 @@ export class MetaDiffsService {
             cstn: relation.cstn,
           });
       }
-      if (!relation?.found?.[RelationTypes.HAS_MANY] && !relation?.found?.[RelationTypes.ONE_TO_ONE]) {
+      if (
+        !relation?.found?.[RelationTypes.HAS_MANY] &&
+        !relation?.found?.[RelationTypes.ONE_TO_ONE]
+      ) {
         changes
           .find((t) => t.table_name === relation.rtn)
           ?.detectedChanges.push({