diff --git a/packages/nc-gui/components/smartsheet/grid/newFile.ts b/packages/nc-gui/components/smartsheet/grid/newFile.ts index ceda4f5dc6..9e14f5881f 100644 --- a/packages/nc-gui/components/smartsheet/grid/newFile.ts +++ b/packages/nc-gui/components/smartsheet/grid/newFile.ts @@ -1,4 +1,4 @@ -import { JsonExpandInj, provide } from '#imports'; -import { isJsonExpand } from './Table.vue'; +import { isJsonExpand } from './Table.vue' +import { JsonExpandInj, provide } from '#imports' -provide(JsonExpandInj, isJsonExpand); +provide(JsonExpandInj, isJsonExpand) diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts index 40c718d319..996e68ee7f 100644 --- a/packages/nc-gui/composables/useViewFilters.ts +++ b/packages/nc-gui/composables/useViewFilters.ts @@ -1,7 +1,7 @@ import type { ColumnType, FilterType, LinkToAnotherRecordType, LookupType, ViewType } from 'nocodb-sdk' import type { ComputedRef, Ref } from 'vue' import type { SelectProps } from 'ant-design-vue' -import { RelationTypes, UITypes, isSystemColumn } from 'nocodb-sdk' +import { UITypes, isSystemColumn } from 'nocodb-sdk' import { ActiveViewInj, IsPublicInj, @@ -440,10 +440,9 @@ export function useViewFilters( for (const col of meta.value?.columns || []) { if (col.uidt !== UITypes.Lookup) continue let nextCol = col - let btLookup = true // check all the relation of nested lookup columns is bt or not // include the column only if all only if all relations are bt - while (btLookup && nextCol && nextCol.uidt === UITypes.Lookup) { + while (nextCol && nextCol.uidt === UITypes.Lookup) { const lookupRelation = (await getMeta(nextCol.fk_model_id))?.columns?.find( (c) => c.id === (nextCol.colOptions as LookupType).fk_relation_column_id, ) diff --git a/packages/nc-gui/composables/useViewGroupBy.ts b/packages/nc-gui/composables/useViewGroupBy.ts index 3b522007d1..8f2ef759ac 100644 --- a/packages/nc-gui/composables/useViewGroupBy.ts +++ b/packages/nc-gui/composables/useViewGroupBy.ts @@ -164,7 +164,7 @@ export const useViewGroupBy = (view: Ref, where?: Computed const groupby = groupBy.value[group.nestedIn.length] const nestedWhere = calculateNestedWhere(group.nestedIn, where?.value) - if (!groupby || !(groupby.column.title)) return + if (!groupby || !groupby.column.title) return if (isPublic.value && !sharedView.value?.uuid) { return @@ -203,16 +203,16 @@ export const useViewGroupBy = (view: Ref, where?: Computed } if (groupby.column.title && groupby.column.uidt) { acc.push({ - key: valueToTitle(curr[(groupby.column.title)!], groupby.column), + key: valueToTitle(curr[groupby.column.title!], groupby.column), column: groupby.column, count: +curr.count, - color: findKeyColor(curr[(groupby.column.title)!], groupby.column), + color: findKeyColor(curr[groupby.column.title!], groupby.column), nestedIn: [ ...group!.nestedIn, { title: groupby.column.title, - column_name: (groupby.column.title)!, - key: valueToTitle(curr[(groupby.column.title)!], groupby.column), + column_name: groupby.column.title!, + key: valueToTitle(curr[groupby.column.title!], groupby.column), column_uidt: groupby.column.uidt, }, ], diff --git a/packages/nc-gui/pages/reset/[id].vue b/packages/nc-gui/pages/reset/[id].vue index 41530eb037..40fa92c1d5 100644 --- a/packages/nc-gui/pages/reset/[id].vue +++ b/packages/nc-gui/pages/reset/[id].vue @@ -8,7 +8,6 @@ import { reactive, ref, useApi, - useI18n, useRoute, useRouter, } from '#imports' @@ -27,8 +26,6 @@ const form = reactive({ newPassword: '', }) -const { t } = useI18n() - const formValidator = ref() async function resetPassword() { @@ -71,13 +68,11 @@ function resetError() {

{{ $t('title.resetPassword') }}

- + {{ $t('general.signIn') }}