Browse Source

chore: lint

pull/8367/head
Pranav C 5 months ago
parent
commit
88668cb48d
  1. 2
      packages/nc-gui/components/smartsheet/grid/GroupBy.vue
  2. 4
      packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
  3. 2
      packages/nocodb/src/controllers/users/users.controller.ts
  4. 5
      packages/nocodb/src/db/BaseModelSqlv2.ts
  5. 2
      packages/nocodb/src/db/generateLookupSelectQuery.ts

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

@ -398,7 +398,7 @@ const bgColor = computed(() => {
@change="findAndLoadSubGroup" @change="findAndLoadSubGroup"
> >
<a-collapse-panel <a-collapse-panel
v-for="[i, grp] of Object.entries(vGroup?.children ?? [])" v-for="[_, grp] of Object.entries(vGroup?.children ?? [])"
:key="`group-panel-${grp.key}`" :key="`group-panel-${grp.key}`"
class="!border-1 border-gray-300 nc-group rounded-[8px] mb-2" class="!border-1 border-gray-300 nc-group rounded-[8px] mb-2"
:style="`background: ${bgColor};`" :style="`background: ${bgColor};`"

4
packages/nc-gui/components/smartsheet/grid/GroupByTable.vue

@ -46,10 +46,10 @@ const reloadViewDataHook = inject(ReloadViewDataHookInj, createEventHook())
const { eventBus } = useSmartsheetStoreOrThrow() const { eventBus } = useSmartsheetStoreOrThrow()
const routeQuery = computed(() => route.value.query as Record<string, string>)
const route = router.currentRoute const route = router.currentRoute
const routeQuery = computed(() => route.value.query as Record<string, string>)
const expandedFormDlg = ref(false) const expandedFormDlg = ref(false)
const expandedFormRow = ref<Row>() const expandedFormRow = ref<Row>()
const expandedFormRowState = ref<Record<string, any>>() const expandedFormRowState = ref<Record<string, any>>()

2
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 { AppHooksService } from '~/services/app-hooks/app-hooks.service';
import { UsersService } from '~/services/users/users.service'; import { UsersService } from '~/services/users/users.service';
import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard'; import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard';
import { TenantContext } from '~/decorators/tenant-context.decorator';
import { NcContext, NcRequest } from '~/interface/config';
@Controller() @Controller()
export class UsersController { export class UsersController {

5
packages/nocodb/src/db/BaseModelSqlv2.ts

@ -2476,12 +2476,7 @@ class BaseModelSqlv2 {
dbDriver: this.dbDriver, dbDriver: this.dbDriver,
model: childTable, 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); const childView = await relColOptions.getChildView(this.context);
let listArgs: any = {}; let listArgs: any = {};
if (childView) { if (childView) {

2
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 LookupColumn from '../models/LookupColumn';
import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2'; import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
import type { import type {

Loading…
Cancel
Save