github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #8479 from nocodb/nc-fix/misc-oss 

Miscellaneous bug fixes
pull/8484/head
Pranav C 2 months ago committed by GitHub
parent
844507e01f 472431217b
commit
da186b74ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 281 additions and 247 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
  2. 44
      packages/nc-gui/composables/useViewFilters.ts
  3. 3
      packages/nc-gui/store/bases.ts
  4. 438
      packages/nocodb/src/helpers/webhookHelpers.ts
  5. 4
      packages/nocodb/src/models/Filter.ts

39
packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
Unescape View File

@ -12,6 +12,7 @@ interface Props {
webHook?: boolean
draftFilter?: Partial<FilterType>
}
const props = withDefaults(defineProps<Props>(), {
nestedLevel: 0,
autoSave: true,
@ -21,13 +22,14 @@ const props = withDefaults(defineProps<Props>(), {
webHook: false,
})
const emit = defineEmits(['update:filtersLength', 'update:draftFilter'])
const emit = defineEmits(['update:filtersLength', 'update:draftFilter', 'update:modelValue'])
const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]
const draftFilter = useVModel(props, 'draftFilter', emit)
const modelValue = useVModel(props, 'modelValue', emit)
const { nestedLevel, parentId, autoSave, hookId, modelValue, showLoading, webHook } = toRefs(props)
const { nestedLevel, parentId, autoSave, hookId, showLoading, webHook } = toRefs(props)
const nested = computed(() => nestedLevel.value > 0)
@ -66,7 +68,7 @@ const {
types,
} = useViewFilters(
activeView,
parentId?.value,
parentId,
computed(() => autoSave.value),
() => reloadDataHook.trigger({ shouldShowLoading: showLoading.value, offset: 0 }),
modelValue.value || nestedFilters.value,
@ -250,7 +252,7 @@ const updateFilterValue = (value: string, filter: Filter, index: number) => {
defineExpose({
applyChanges,
parentId: parentId?.value,
parentId,
})
const scrollToBottom = () => {
@ -355,22 +357,35 @@ watch(
},
)
const visibleFilters = computed(() => filters.value.filter((filter) => filter.status !== 'delete'))
const isLogicalOpChangeAllowed = computed(() => {
return new Set(filters.value.slice(1).map((filter) => filter.logical_op)).size > 1
return new Set(visibleFilters.value.slice(1).map((filter) => filter.logical_op)).size > 1
})
// when logical operation is updated, update all the siblings with the same logical operation only if it's in locked state
const onLogicalOpUpdate = async (filter: Filter, index: number) => {
if (index === 1 && filters.value.slice(2).every((siblingFilter) => siblingFilter.logical_op !== filter.logical_op)) {
if (index === 1 && visibleFilters.value.slice(2).every((siblingFilter) => siblingFilter.logical_op !== filter.logical_op)) {
await Promise.all(
filters.value.slice(2).map(async (siblingFilter, i) => {
visibleFilters.value.slice(2).map(async (siblingFilter, i) => {
siblingFilter.logical_op = filter.logical_op
await saveOrUpdate(siblingFilter, i + 2, false, false, true)
}),
)
}
await filterUpdateCondition(filter, index)
await saveOrUpdate(filter, index)
}
// watch for changes in filters and update the modelValue
watch(
filters,
() => {
if (modelValue.value !== filters.value) modelValue.value = filters.value
},
{
immediate: true,
},
)
</script>
<template>
@ -403,9 +418,9 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
class="min-w-20 capitalize"
placeholder="Group op"
dropdown-class-name="nc-dropdown-filter-logical-op-group"
:disabled="i > 1 && !isLogicalOpChangeAllowed"
:disabled="visibleFilters.indexOf(filter) > 1 && !isLogicalOpChangeAllowed"
@click.stop
@change="saveOrUpdate(filter, i)"
@change="onLogicalOpUpdate(filter, i)"
>
<a-select-option v-for="op in logicalOps" :key="op.value" :value="op.value">
<div class="flex items-center w-full justify-between w-full gap-2">
@ -434,7 +449,7 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
</div>
<div class="flex border-1 rounded-lg p-2 w-full" :class="nestedLevel % 2 !== 0 ? 'bg-white' : 'bg-gray-100'">
<LazySmartsheetToolbarColumnFilter
v-if="filter.id || filter.children"
v-if="filter.id || filter.children || !autoSave"
:key="filter.id ?? i"
ref="localNestedFilters"
v-model="filter.children"
@ -456,7 +471,7 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
:dropdown-match-select-width="false"
class="h-full !min-w-20 !max-w-20 capitalize"
hide-details
:disabled="filter.readOnly || (i > 1 && !isLogicalOpChangeAllowed)"
:disabled="filter.readOnly || (visibleFilters.indexOf(filter) > 1 && !isLogicalOpChangeAllowed)"
dropdown-class-name="nc-dropdown-filter-logical-op"
@change="onLogicalOpUpdate(filter, i)"
@click.stop

44
packages/nc-gui/composables/useViewFilters.ts
Unescape View File

@ -12,13 +12,15 @@ import { UITypes, isSystemColumn } from 'nocodb-sdk'
export function useViewFilters(
view: Ref<ViewType | undefined>,
parentId?: string,
_parentId: Ref<string | null> | null | string,
autoApply?: ComputedRef<boolean>,
reloadData?: () => void,
_currentFilters?: Filter[],
isNestedRoot?: boolean,
isWebhook?: boolean,
) {
const parentId = ref(_parentId)
const currentFilters = ref(_currentFilters)
const btLookupTypesMap = ref({})
@ -192,6 +194,16 @@ export function useViewFilters(
}
}
const placeholderGroupFilter = (): Filter => {
const logicalOps = new Set(filters.value.slice(1).map((filter) => filter.logical_op))
return {
is_group: true,
status: 'create',
logical_op: logicalOps.size === 1 ? logicalOps.values().next().value : 'and',
}
}
const loadAllChildFilters = async (filters: Filter[]) => {
// Array to store promises of child filter loading
const promises = []
@ -230,14 +242,14 @@ export function useViewFilters(
try {
if (isWebhook || hookId) {
if (parentId) {
filters.value = (await $api.dbTableFilter.childrenRead(parentId)).list as Filter[]
if (parentId.value) {
filters.value = (await $api.dbTableFilter.childrenRead(parentId.value)).list as Filter[]
} else if (hookId) {
filters.value = (await $api.dbTableWebhookFilter.read(hookId)).list as Filter[]
}
} else {
if (parentId) {
filters.value = (await $api.dbTableFilter.childrenRead(parentId)).list as Filter[]
if (parentId.value) {
filters.value = (await $api.dbTableFilter.childrenRead(parentId.value)).list as Filter[]
} else {
filters.value = (await $api.dbTableFilter.read(view.value!.id!)).list as Filter[]
if (loadAllFilters) {
@ -265,21 +277,25 @@ export function useViewFilters(
} else if (filter.status === 'update') {
await $api.dbTableFilter.update(filter.id as string, {
...filter,
fk_parent_id: parentId,
fk_parent_id: parentId.value,
})
} else if (filter.status === 'create') {
// extract children value if found to restore
const children = filters.value[+i]?.children
if (hookId) {
filters.value[+i] = (await $api.dbTableWebhookFilter.create(hookId, {
...filter,
fk_parent_id: parentId,
fk_parent_id: parentId.value,
})) as unknown as FilterType
} else {
filters.value[+i] = await $api.dbTableFilter.create(view?.value?.id as string, {
...filter,
fk_parent_id: parentId,
fk_parent_id: parentId.value,
})
}
if (children) filters.value[+i].children = children
allFilters.value.push(filters.value[+i])
}
}
@ -335,7 +351,7 @@ export function useViewFilters(
} else if (filter.id && filter.status !== 'create') {
await $api.dbTableFilter.update(filter.id, {
...filter,
fk_parent_id: parentId,
fk_parent_id: parentId.value,
})
$e('a:filter:update', {
logical: filter.logical_op,
@ -344,7 +360,7 @@ export function useViewFilters(
} else {
filters.value[i] = await $api.dbTableFilter.create(view.value.id!, {
...filter,
fk_parent_id: parentId,
fk_parent_id: parentId.value,
})
allFilters.value.push(filters.value[+i])
@ -464,11 +480,7 @@ export function useViewFilters(
const addFilterGroup = async () => {
const child = placeholderFilter()
const placeHolderGroupFilter: Filter = {
is_group: true,
status: 'create',
logical_op: 'and',
}
const placeHolderGroupFilter: Filter = placeholderGroupFilter()
if (nestedMode.value) placeHolderGroupFilter.children = [child]
@ -476,7 +488,7 @@ export function useViewFilters(
const index = filters.value.length - 1
await saveOrUpdate(filters.value[index], index, true)
await saveOrUpdate(filters.value[index], index)
lastFilters.value = clone(filters.value)

3
packages/nc-gui/store/bases.ts
Unescape View File

@ -43,6 +43,8 @@ export const useBases = defineStore('basesStore', () => {
return basesMap
})
const isDataSourceLimitReached = computed(() => Number(openedProject.value?.sources?.length) > 9)
const workspaceStore = useWorkspace()
const tableStore = useTablesStore()
@ -389,6 +391,7 @@ export const useBases = defineStore('basesStore', () => {
toggleStarred,
basesUser,
clearBasesUser,
isDataSourceLimitReached,
}
})

438
packages/nocodb/src/helpers/webhookHelpers.ts
Unescape View File

@ -51,9 +51,6 @@ export async function validateCondition(
for (const _filter of filters) {
const filter = _filter instanceof Filter ? _filter : new Filter(_filter);
let res;
const column = await filter.getColumn();
const field = column.title;
let val = data[field];
if (filter.is_group) {
res = await validateCondition(
filter.children || (await filter.getChildren()),
@ -62,239 +59,244 @@ export async function validateCondition(
client,
},
);
} else if (
[
UITypes.Date,
UITypes.DateTime,
UITypes.CreatedTime,
UITypes.LastModifiedTime,
].includes(column.uidt) &&
!['empty', 'blank', 'notempty', 'notblank'].includes(filter.comparison_op)
) {
const dateFormat =
client === 'mysql2' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ';
let now = dayjs(new Date());
const dateFormatFromMeta = column?.meta?.date_format;
const dataVal: any = val;
let filterVal: any = filter.value;
if (dateFormatFromMeta && isDateMonthFormat(dateFormatFromMeta)) {
// reset to 1st
now = dayjs(now).date(1);
if (val) val = dayjs(val).date(1);
}
if (filterVal) res = dayjs(filterVal).isSame(dataVal, 'day');
// handle sub operation
switch (filter.comparison_sub_op) {
case 'today':
filterVal = now;
break;
case 'tomorrow':
filterVal = now.add(1, 'day');
break;
case 'yesterday':
filterVal = now.add(-1, 'day');
break;
case 'oneWeekAgo':
filterVal = now.add(-1, 'week');
break;
case 'oneWeekFromNow':
filterVal = now.add(1, 'week');
break;
case 'oneMonthAgo':
filterVal = now.add(-1, 'month');
break;
case 'oneMonthFromNow':
filterVal = now.add(1, 'month');
break;
case 'daysAgo':
if (!filterVal) return;
filterVal = now.add(-filterVal, 'day');
break;
case 'daysFromNow':
if (!filterVal) return;
filterVal = now.add(filterVal, 'day');
break;
case 'exactDate':
if (!filterVal) return;
break;
// sub-ops for `isWithin` comparison
case 'pastWeek':
filterVal = now.add(-1, 'week');
break;
case 'pastMonth':
filterVal = now.add(-1, 'month');
break;
case 'pastYear':
filterVal = now.add(-1, 'year');
break;
case 'nextWeek':
filterVal = now.add(1, 'week');
break;
case 'nextMonth':
filterVal = now.add(1, 'month');
break;
case 'nextYear':
filterVal = now.add(1, 'year');
break;
case 'pastNumberOfDays':
if (!filterVal) return;
filterVal = now.add(-filterVal, 'day');
break;
case 'nextNumberOfDays':
if (!filterVal) return;
filterVal = now.add(filterVal, 'day');
break;
}
} else {
const column = await filter.getColumn();
const field = column.title;
let val = data[field];
if (
[
UITypes.Date,
UITypes.DateTime,
UITypes.CreatedTime,
UITypes.LastModifiedTime,
].includes(column.uidt) &&
!['empty', 'blank', 'notempty', 'notblank'].includes(filter.comparison_op)
) {
const dateFormat =
client === 'mysql2' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ';
let now = dayjs(new Date());
const dateFormatFromMeta = column?.meta?.date_format;
const dataVal: any = val;
let filterVal: any = filter.value;
if (dateFormatFromMeta && isDateMonthFormat(dateFormatFromMeta)) {
// reset to 1st
now = dayjs(now).date(1);
if (val) val = dayjs(val).date(1);
}
if (filterVal) res = dayjs(filterVal).isSame(dataVal, 'day');
// handle sub operation
switch (filter.comparison_sub_op) {
case 'today':
filterVal = now;
break;
case 'tomorrow':
filterVal = now.add(1, 'day');
break;
case 'yesterday':
filterVal = now.add(-1, 'day');
break;
case 'oneWeekAgo':
filterVal = now.add(-1, 'week');
break;
case 'oneWeekFromNow':
filterVal = now.add(1, 'week');
break;
case 'oneMonthAgo':
filterVal = now.add(-1, 'month');
break;
case 'oneMonthFromNow':
filterVal = now.add(1, 'month');
break;
case 'daysAgo':
if (!filterVal) return;
filterVal = now.add(-filterVal, 'day');
break;
case 'daysFromNow':
if (!filterVal) return;
filterVal = now.add(filterVal, 'day');
break;
case 'exactDate':
if (!filterVal) return;
break;
// sub-ops for `isWithin` comparison
case 'pastWeek':
filterVal = now.add(-1, 'week');
break;
case 'pastMonth':
filterVal = now.add(-1, 'month');
break;
case 'pastYear':
filterVal = now.add(-1, 'year');
break;
case 'nextWeek':
filterVal = now.add(1, 'week');
break;
case 'nextMonth':
filterVal = now.add(1, 'month');
break;
case 'nextYear':
filterVal = now.add(1, 'year');
break;
case 'pastNumberOfDays':
if (!filterVal) return;
filterVal = now.add(-filterVal, 'day');
break;
case 'nextNumberOfDays':
if (!filterVal) return;
filterVal = now.add(filterVal, 'day');
break;
}
if (dataVal) {
switch (filter.comparison_op) {
case 'eq':
res = dayjs(dataVal).isSame(filterVal, 'day');
break;
case 'neq':
res = !dayjs(dataVal).isSame(filterVal, 'day');
break;
case 'gt':
res = dayjs(dataVal).isAfter(filterVal, 'day');
break;
case 'lt':
res = dayjs(dataVal).isBefore(filterVal, 'day');
break;
case 'lte':
case 'le':
res = dayjs(dataVal).isSameOrBefore(filterVal, 'day');
break;
case 'gte':
case 'ge':
res = dayjs(dataVal).isSameOrAfter(filterVal, 'day');
break;
case 'empty':
case 'blank':
res = dataVal === '' || dataVal === null || dataVal === undefined;
break;
case 'notempty':
case 'notblank':
res = !(
dataVal === '' ||
dataVal === null ||
dataVal === undefined
);
break;
case 'isWithin': {
let now = dayjs(new Date()).format(dateFormat).toString();
now = column.uidt === UITypes.Date ? now.substring(0, 10) : now;
switch (filter.comparison_sub_op) {
case 'pastWeek':
case 'pastMonth':
case 'pastYear':
case 'pastNumberOfDays':
res = dayjs(dataVal).isBetween(filterVal, now, 'day');
break;
case 'nextWeek':
case 'nextMonth':
case 'nextYear':
case 'nextNumberOfDays':
res = dayjs(dataVal).isBetween(now, filterVal, 'day');
break;
}
}
}
}
} else {
switch (typeof filter.value) {
case 'boolean':
val = !!data[field];
break;
case 'number':
val = +data[field];
break;
}
if (dataVal) {
switch (filter.comparison_op) {
case 'eq':
res = dayjs(dataVal).isSame(filterVal, 'day');
res = val == filter.value;
break;
case 'neq':
res = !dayjs(dataVal).isSame(filterVal, 'day');
res = val != filter.value;
break;
case 'gt':
res = dayjs(dataVal).isAfter(filterVal, 'day');
case 'like':
res =
data[field]
?.toString?.()
?.toLowerCase()
?.indexOf(filter.value?.toLowerCase()) > -1;
break;
case 'lt':
res = dayjs(dataVal).isBefore(filterVal, 'day');
break;
case 'lte':
case 'le':
res = dayjs(dataVal).isSameOrBefore(filterVal, 'day');
break;
case 'gte':
case 'ge':
res = dayjs(dataVal).isSameOrAfter(filterVal, 'day');
case 'nlike':
res =
data[field]
?.toString?.()
?.toLowerCase()
?.indexOf(filter.value?.toLowerCase()) === -1;
break;
case 'empty':
case 'blank':
res = dataVal === '' || dataVal === null || dataVal === undefined;
res =
data[field] === '' ||
data[field] === null ||
data[field] === undefined;
break;
case 'notempty':
case 'notblank':
res = !(
dataVal === '' ||
dataVal === null ||
dataVal === undefined
data[field] === '' ||
data[field] === null ||
data[field] === undefined
);
break;
case 'isWithin': {
let now = dayjs(new Date()).format(dateFormat).toString();
now = column.uidt === UITypes.Date ? now.substring(0, 10) : now;
switch (filter.comparison_sub_op) {
case 'pastWeek':
case 'pastMonth':
case 'pastYear':
case 'pastNumberOfDays':
res = dayjs(dataVal).isBetween(filterVal, now, 'day');
break;
case 'nextWeek':
case 'nextMonth':
case 'nextYear':
case 'nextNumberOfDays':
res = dayjs(dataVal).isBetween(now, filterVal, 'day');
break;
}
}
case 'checked':
res = !!data[field];
break;
case 'notchecked':
res = !data[field];
break;
case 'null':
res = res = data[field] === null;
break;
case 'notnull':
res = data[field] !== null;
break;
case 'allof':
res = (
filter.value?.split(',').map((item) => item.trim()) ?? []
).every((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'anyof':
res = (
filter.value?.split(',').map((item) => item.trim()) ?? []
).some((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'nallof':
res = !(
filter.value?.split(',').map((item) => item.trim()) ?? []
).every((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'nanyof':
res = !(
filter.value?.split(',').map((item) => item.trim()) ?? []
).some((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'lt':
res = +data[field] < +filter.value;
break;
case 'lte':
case 'le':
res = +data[field] <= +filter.value;
break;
case 'gt':
res = +data[field] > +filter.value;
break;
case 'gte':
case 'ge':
res = +data[field] >= +filter.value;
break;
}
}
} else {
switch (typeof filter.value) {
case 'boolean':
val = !!data[field];
break;
case 'number':
val = +data[field];
break;
}
switch (filter.comparison_op) {
case 'eq':
res = val == filter.value;
break;
case 'neq':
res = val != filter.value;
break;
case 'like':
res =
data[field]
?.toString?.()
?.toLowerCase()
?.indexOf(filter.value?.toLowerCase()) > -1;
break;
case 'nlike':
res =
data[field]
?.toString?.()
?.toLowerCase()
?.indexOf(filter.value?.toLowerCase()) === -1;
break;
case 'empty':
case 'blank':
res =
data[field] === '' ||
data[field] === null ||
data[field] === undefined;
break;
case 'notempty':
case 'notblank':
res = !(
data[field] === '' ||
data[field] === null ||
data[field] === undefined
);
break;
case 'checked':
res = !!data[field];
break;
case 'notchecked':
res = !data[field];
break;
case 'null':
res = res = data[field] === null;
break;
case 'notnull':
res = data[field] !== null;
break;
case 'allof':
res = (
filter.value?.split(',').map((item) => item.trim()) ?? []
).every((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'anyof':
res = (
filter.value?.split(',').map((item) => item.trim()) ?? []
).some((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'nallof':
res = !(
filter.value?.split(',').map((item) => item.trim()) ?? []
).every((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'nanyof':
res = !(
filter.value?.split(',').map((item) => item.trim()) ?? []
).some((item) => (data[field]?.split(',') ?? []).includes(item));
break;
case 'lt':
res = +data[field] < +filter.value;
break;
case 'lte':
case 'le':
res = +data[field] <= +filter.value;
break;
case 'gt':
res = +data[field] > +filter.value;
break;
case 'gte':
case 'ge':
res = +data[field] >= +filter.value;
break;
}
}
switch (filter.logical_op) {

4
packages/nocodb/src/models/Filter.ts
Unescape View File

@ -515,7 +515,9 @@ export default class Filter implements FilterType {
});
await NocoCache.setList(CacheScope.FILTER_EXP, [hookId], filterObjs);
}
return filterObjs?.map((f) => this.castType(f));
return filterObjs
?.filter((f) => !f.fk_parent_id)
?.map((f) => this.castType(f));
}
static async parentFilterList(

Write Preview
Loading…
Cancel
Save