Browse Source

fix: lint errors and some review changes

pull/7173/head
Ramesh Mane 12 months ago
parent
commit
0bf3688244
  1. 2
      packages/nc-gui/components/dashboard/settings/DataSources.vue
  2. 2
      packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
  3. 2
      packages/nc-gui/components/smartsheet/details/Fields.vue
  4. 2
      packages/nc-gui/components/smartsheet/grid/Table.vue
  5. 2
      packages/nc-gui/components/tabs/Smartsheet.vue
  6. 1
      packages/nc-gui/helpers/parsers/parserHelpers.ts
  7. 2
      packages/nc-gui/lang/en.json

2
packages/nc-gui/components/dashboard/settings/DataSources.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import Draggable from 'vuedraggable' import Draggable from 'vuedraggable'
import type { SourceType } from 'nocodb-sdk' import type { SourceType } from 'nocodb-sdk'
import { ClientType, DataSourcesSubTab, storeToRefs, useBase, useCommandPalette, useNuxtApp, isEeUI } from '#imports' import { ClientType, DataSourcesSubTab, isEeUI, storeToRefs, useBase, useCommandPalette, useNuxtApp } from '#imports'
interface Props { interface Props {
state: string state: string

2
packages/nc-gui/components/smartsheet/column/EditOrAdd.vue

@ -160,7 +160,7 @@ onMounted(() => {
message.info(t('msg.info.editingPKnotSupported')) message.info(t('msg.info.editingPKnotSupported'))
emit('cancel') emit('cancel')
} else if (isSystemColumn(formState.value)) { } else if (isSystemColumn(formState.value)) {
message.info(t('msg.info.editingSystemKeynotSupported')) message.info(t('msg.info.editingSystemKeyNotSupported'))
emit('cancel') emit('cancel')
} }
} }

2
packages/nc-gui/components/smartsheet/details/Fields.vue

@ -1081,7 +1081,7 @@ const onFieldOptionUpdate = () => {
</Draggable> </Draggable>
</div> </div>
<Transition v-if="!changingField" name="slide-fade"> <Transition v-if="!changingField" name="slide-fade">
<div class="border-gray-200 border-l-1 nc-scrollbar-md nc-fields-height !overflow-y-auto"> <div v-if="!changingField" class="border-gray-200 border-l-1 nc-scrollbar-md nc-fields-height !overflow-y-auto">
<SmartsheetColumnEditOrAddProvider <SmartsheetColumnEditOrAddProvider
v-if="activeField" v-if="activeField"
class="p-4 w-[25rem]" class="p-4 w-[25rem]"

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

@ -1716,8 +1716,8 @@ onKeyStroke('ArrowDown', onDown)
<NcMenuItem <NcMenuItem
v-else-if="contextMenuTarget && hasEditPermission" v-else-if="contextMenuTarget && hasEditPermission"
class="nc-base-menu-item" class="nc-base-menu-item"
@click="clearSelectedRangeOfCells()"
:disabled="isSystemColumn(fields[contextMenuTarget.col])" :disabled="isSystemColumn(fields[contextMenuTarget.col])"
@click="clearSelectedRangeOfCells()"
> >
<div v-e="['a:row:clear-range']" class="flex gap-2 items-center"> <div v-e="['a:row:clear-range']" class="flex gap-2 items-center">
<GeneralIcon icon="closeBox" class="text-gray-500" /> <GeneralIcon icon="closeBox" class="text-gray-500" />

2
packages/nc-gui/components/tabs/Smartsheet.vue

@ -171,7 +171,7 @@ watch([activeViewTitleOrId, activeTableId], () => {
<LazySmartsheetToolbar v-if="!isForm" /> <LazySmartsheetToolbar v-if="!isForm" />
<div class="flex flex-row w-full" style="height: calc(100% - var(--topbar-height))"> <div class="flex flex-row w-full" style="height: calc(100% - var(--topbar-height))">
<Transition name="layout" mode="out-in"> <Transition name="layout" mode="out-in">
<div class="flex flex-1 min-h-0 w-3/4"> <div v-if="openedViewsTab === 'view'" class="flex flex-1 min-h-0 w-3/4">
<div class="h-full flex-1 min-w-0 min-h-0 bg-white"> <div class="h-full flex-1 min-w-0 min-h-0 bg-white">
<LazySmartsheetGrid v-if="isGrid || !meta || !activeView" ref="grid" /> <LazySmartsheetGrid v-if="isGrid || !meta || !activeView" ref="grid" />

1
packages/nc-gui/helpers/parsers/parserHelpers.ts

@ -211,6 +211,7 @@ export const extractNextDefaultName = (namesData: string[], defaultName: string,
if (_defaultName === defaultName && !isNaN(Number(number?.trim()))) { if (_defaultName === defaultName && !isNaN(Number(number?.trim()))) {
return Number(number?.trim()) return Number(number?.trim())
} }
return undefined
}) })
.filter((e) => e) .filter((e) => e)
.sort((a, b) => { .sort((a, b) => {

2
packages/nc-gui/lang/en.json

@ -1210,7 +1210,7 @@
"goToNext": "Go to next", "goToNext": "Go to next",
"thankYou": "Thank you!", "thankYou": "Thank you!",
"submittedFormData": "You have successfully submitted the form data.", "submittedFormData": "You have successfully submitted the form data.",
"editingSystemKeynotSupported": "Editing system key not supported" "editingSystemKeyNotSupported": "Editing system key not supported"
}, },
"error": { "error": {

Loading…
Cancel
Save