Browse Source

Merge pull request #8484 from nocodb/nc-chore/lint

Linting
pull/8485/head
Pranav C 7 months ago committed by GitHub
parent
commit
358d8ef70d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue
  2. 8
      packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
  3. 4
      packages/nocodb/src/helpers/webhookHelpers.ts

8
packages/nc-gui/components/smartsheet/toolbar/ColumnFilterMenu.vue

@ -61,7 +61,13 @@ eventBus.on(async (event, column: ColumnType) => {
overlay-class-name="nc-dropdown-filter-menu nc-toolbar-dropdown" overlay-class-name="nc-dropdown-filter-menu nc-toolbar-dropdown"
class="!xs:hidden" class="!xs:hidden"
> >
<NcButton v-e="['c:filter']" :disabled="isLocked" class="nc-filter-menu-btn nc-toolbar-btn !border-0 !h-7" size="small" type="secondary"> <NcButton
v-e="['c:filter']"
:disabled="isLocked"
class="nc-filter-menu-btn nc-toolbar-btn !border-0 !h-7"
size="small"
type="secondary"
>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<component :is="iconMap.filter" class="h-4 w-4" /> <component :is="iconMap.filter" class="h-4 w-4" />

8
packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue

@ -311,7 +311,13 @@ useMenuCloseOnEsc(open)
overlay-class-name="nc-dropdown-fields-menu nc-toolbar-dropdown" overlay-class-name="nc-dropdown-fields-menu nc-toolbar-dropdown"
> >
<div :class="{ 'nc-active-btn': numberOfHiddenFields }"> <div :class="{ 'nc-active-btn': numberOfHiddenFields }">
<NcButton v-e="['c:fields']" :disabled="isLocked" class="nc-fields-menu-btn nc-toolbar-btn !h-7 !border-0" size="small" type="secondary"> <NcButton
v-e="['c:fields']"
:disabled="isLocked"
class="nc-fields-menu-btn nc-toolbar-btn !h-7 !border-0"
size="small"
type="secondary"
>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<GeneralIcon <GeneralIcon

4
packages/nocodb/src/helpers/webhookHelpers.ts

@ -70,7 +70,9 @@ export async function validateCondition(
UITypes.CreatedTime, UITypes.CreatedTime,
UITypes.LastModifiedTime, UITypes.LastModifiedTime,
].includes(column.uidt) && ].includes(column.uidt) &&
!['empty', 'blank', 'notempty', 'notblank'].includes(filter.comparison_op) !['empty', 'blank', 'notempty', 'notblank'].includes(
filter.comparison_op,
)
) { ) {
const dateFormat = const dateFormat =
client === 'mysql2' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ'; client === 'mysql2' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ';

Loading…
Cancel
Save