Browse Source

fix(nc-gui): updated sidebar filters

pull/7611/head
DarkPhoenix2704 8 months ago
parent
commit
1f87837554
  1. 24
      packages/nc-gui/composables/useCalendarViewStore.ts

24
packages/nc-gui/composables/useCalendarViewStore.ts

@ -114,21 +114,29 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
if (fromCol) { if (fromCol) {
filters.push({ filters.push({
fk_column_id: fromCol.id, fk_column_id: fromCol.id,
comparison_op: 'is', logical_op: 'or',
value: 'blank', comparison_op: 'blank',
}) })
} }
if (toCol) { if (toCol) {
filters.push({ filters.push({
fk_column_id: toCol.id, fk_column_id: toCol.id,
comparison_op: 'is', logical_op: 'or',
value: 'blank', comparison_op: 'blank',
}) })
} }
// Combine the filters for this range with the overall filter array // Combine the filters for this range with the overall filter array
combinedFilters = combinedFilters.concat(filters) combinedFilters = [...combinedFilters, ...filters]
}) })
// Wrap the combined filters in a group
combinedFilters = [
{
is_group: true,
logical_op: 'or',
children: combinedFilters,
},
]
} else if ( } else if (
sideBarFilterOption.value === 'week' || sideBarFilterOption.value === 'week' ||
sideBarFilterOption.value === 'month' || sideBarFilterOption.value === 'month' ||
@ -284,6 +292,12 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
}, },
], ],
}) })
} else {
combinedFilters.push({
fk_column_id: displayField.value.id,
comparison_op: 'like',
value: searchQuery.value,
})
} }
} }

Loading…
Cancel
Save