From 14757d6b0d4fc4069857b63c83ee9af88562de74 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 21 Jun 2023 16:40:22 +0530 Subject: [PATCH] chore: lint Signed-off-by: Pranav C --- .../nc-gui/components/cell/MultiSelect.vue | 4 +-- .../nc-gui/components/cell/SingleSelect.vue | 6 ++--- .../nc-gui/components/dashboard/TreeView.vue | 2 +- .../nc-gui/components/smartsheet/Form.vue | 11 +++++--- .../nc-gui/components/smartsheet/Grid.vue | 2 +- .../column/LinkedToAnotherRecordOptions.vue | 8 +++--- .../composables/useColumnCreateStore.ts | 2 +- .../form/[viewId]/index/index.vue | 10 +++---- .../form/[viewId]/index/survey.vue | 12 ++++----- .../nocodb/src/db/sql-mgr/v2/ProjectMgrv2.ts | 27 ++++++++++--------- .../nocodb/src/services/tables.service.ts | 1 - .../src/services/users/users.service.ts | 5 +++- 12 files changed, 48 insertions(+), 42 deletions(-) diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index e6f8570d68..e2569578cc 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -8,6 +8,7 @@ import { ActiveCellInj, CellClickHookInj, ColumnInj, + EditModeInj, IsKanbanInj, ReadonlyInj, RowHeightInj, @@ -27,7 +28,6 @@ import { useRoles, useSelectedCellKeyupListener, watch, - EditModeInj } from '#imports' import MdiCloseCircle from '~icons/mdi/close-circle' @@ -101,7 +101,7 @@ const isOptionMissing = computed(() => { const hasEditRoles = computed(() => hasRole('owner', true) || hasRole('creator', true) || hasRole('editor', true)) -const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && (active.value)) +const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && active.value) const vModel = computed({ get: () => { diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index 1086ba0993..3b9dafbadb 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -8,6 +8,7 @@ import { ActiveCellInj, CellClickHookInj, ColumnInj, + EditModeInj, IsFormInj, IsKanbanInj, ReadonlyInj, @@ -23,7 +24,6 @@ import { useRoles, useSelectedCellKeyupListener, watch, - EditModeInj } from '#imports' interface Props { @@ -96,7 +96,7 @@ const isOptionMissing = computed(() => { const hasEditRoles = computed(() => hasRole('owner', true) || hasRole('creator', true) || hasRole('editor', true)) -const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && (active.value)) +const editAllowed = computed(() => (hasEditRoles.value || isForm.value) && active.value) const vModel = computed({ get: () => tempSelectedOptState.value ?? modelValue, @@ -257,7 +257,7 @@ const selectedOpt = computed(() => { @@ -861,7 +863,8 @@ watch(view, (nextView) => { } } -.nc-form-help-text, .nc-input-required-error { +.nc-form-help-text, +.nc-input-required-error { max-width: 100%; word-break: break-all; white-space: pre-line; diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue index 1940aada59..3673c818a3 100644 --- a/packages/nc-gui/components/smartsheet/Grid.vue +++ b/packages/nc-gui/components/smartsheet/Grid.vue @@ -746,7 +746,7 @@ const saveOrUpdateRecords = async (args: { metaValue?: TableType; viewMetaValue? async function reloadViewDataHandler(shouldShowLoading: boolean | void) { // save any unsaved data before reload - await saveOrUpdateRecords(); + await saveOrUpdateRecords() // set value if spinner should be hidden showLoading.value = !!shouldShowLoading diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue index f285026379..368aebec78 100644 --- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue @@ -129,11 +129,9 @@ const filterOption = (value: string, option: { key: string }) => option.key.toLo
- Virtual Relation - + Virtual Relation +
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts index a6b99847be..af638da694 100644 --- a/packages/nc-gui/composables/useColumnCreateStore.ts +++ b/packages/nc-gui/composables/useColumnCreateStore.ts @@ -291,7 +291,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState isMssql, isPg, isMysql, - isXcdbBase + isXcdbBase, } }, ) diff --git a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue index 795c0f7fe2..0572f7c77f 100644 --- a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue +++ b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue @@ -75,10 +75,7 @@ const onDecode = async (scannedCodeValue: string) => { class="color-transition relative flex flex-col justify-center gap-2 w-full max-w-[max(33%,600px)] m-auto py-4 pb-8 px-16 md:(bg-white dark:bg-slate-700 rounded-lg border-1 border-gray-200 shadow-xl)" >