diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue index b46d9ef27c..4e70ba73bb 100644 --- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue +++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue @@ -398,7 +398,7 @@ const bgColor = computed(() => { @change="findAndLoadSubGroup" > route.value.query as Record) - const route = router.currentRoute +const routeQuery = computed(() => route.value.query as Record) + const expandedFormDlg = ref(false) const expandedFormRow = ref() const expandedFormRowState = ref>() diff --git a/packages/nocodb/src/controllers/users/users.controller.ts b/packages/nocodb/src/controllers/users/users.controller.ts index 2204aedec7..9ea6c9655b 100644 --- a/packages/nocodb/src/controllers/users/users.controller.ts +++ b/packages/nocodb/src/controllers/users/users.controller.ts @@ -15,8 +15,6 @@ import { GlobalGuard } from '~/guards/global/global.guard'; import { AppHooksService } from '~/services/app-hooks/app-hooks.service'; import { UsersService } from '~/services/users/users.service'; import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard'; -import { TenantContext } from '~/decorators/tenant-context.decorator'; -import { NcContext, NcRequest } from '~/interface/config'; @Controller() export class UsersController { diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 1e20c527d2..ac057e1e17 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -2476,12 +2476,7 @@ class BaseModelSqlv2 { dbDriver: this.dbDriver, model: childTable, }); - const childBaseModel = await Model.getBaseModelSQL(this.context, { - dbDriver: this.dbDriver, - model: childTable, - }); - const childTn = childBaseModel.getTnPath(childTable); const childView = await relColOptions.getChildView(this.context); let listArgs: any = {}; if (childView) { diff --git a/packages/nocodb/src/db/generateLookupSelectQuery.ts b/packages/nocodb/src/db/generateLookupSelectQuery.ts index 35c87aca76..f40f5499c2 100644 --- a/packages/nocodb/src/db/generateLookupSelectQuery.ts +++ b/packages/nocodb/src/db/generateLookupSelectQuery.ts @@ -1,4 +1,4 @@ -import { isVirtualCol, RelationTypes, UITypes } from 'nocodb-sdk'; +import { RelationTypes, UITypes } from 'nocodb-sdk'; import type LookupColumn from '../models/LookupColumn'; import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2'; import type {