From bd4a072ce35c9d8f40a2ebb5c86ce53f5b99e878 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 14 Feb 2023 18:33:55 +0800 Subject: [PATCH] refactor(nocodb): update comments & remove removeEqualFilters from Duration --- .../ncFilterUpgrader_0104004.ts | 77 ++++++++++++++----- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts index cca1847c85..7023a8bf96 100644 --- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts +++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader_0104004.ts @@ -9,16 +9,30 @@ import { UITypes, SelectOptionsType } from 'nocodb-sdk'; // as of 0.104.3, almost all filter operators are available to all column types // while some of them aren't supposed to be shown // this upgrader is to remove those unsupported filters / migrate to the correct filter -// changes: -// - remove `>`, `<`, `>=`, `<=` for text-based columns -// - remove `like`; migrate `null`, and `empty` for numeric-based / singleSelect columns to`blank` -// - remove `equal`; migrate `null` to `checked` for checkbox columns -// - remove `like`; migrate `equal`, `null`, `empty` for multiSelect columns -// - remove `>`, `<`, `>=`, `<=`; migrate `empty`, `equal`, `null` for attachment -// - remove `>`, `<`, `>=`, `<=`; migrate `empty`, `null` for LTAR columns -// - migrate `empty`, `null` for Lookup columns -// - remove `>`, `<`, `>=`, `<=`, `like`, `equal`; migrate `empty`, `null` -// - remove `empty`, `like`, `equal`, `null` for duration columns + +// Change Summary: +// - Text-based columns: +// - remove `>`, `<`, `>=`, `<=` +// - Numeric-based / SingleSelect columns: +// - remove `like` +// - migrate `null`, and `empty` to `blank` +// - Checkbox columns: +// - remove `equal` +// - migrate `empty` and `null` to `notchecked` +// - MultiSelect columns: +// - remove `like` +// - migrate `equal`, `null`, `empty` +// - Attachment columns: +// - remove `>`, `<`, `>=`, `<=`, `equal` +// - migrate `empty`, `null` to `blank` +// - LTAR columns: +// - remove `>`, `<`, `>=`, `<=` +// - migrate `empty`, `null` to `blank` +// - Lookup columns: +// - migrate `empty`, `null` to `blank` +// - Duration columns: +// - remove `like` +// - migrate `empty`, `null` to `blank` const removeEqualFilters = async (filter, actions: any[], ncMeta) => { // remove `is equal`, `is not equal` @@ -44,7 +58,11 @@ const removeLikeFilters = async (filter, actions: any[], ncMeta) => { return actions; }; -const migrateToBlankFilter = async (filter, actions: any[], ncMeta) => { +const migrateNullAndEmptyToBlankFilters = async ( + filter, + actions: any[], + ncMeta +) => { if (['empty', 'null'].includes(filter.comparison_op)) { // migrate to blank actions.push( @@ -232,27 +250,50 @@ async function migrateFilters(ncMeta: NcMetaIO) { ].includes(col.uidt) ) { actions = await removeLikeFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); } else if (col.uidt === UITypes.Checkbox) { actions = await migrateToCheckboxFilter(filter, actions, ncMeta); } else if (col.uidt === UITypes.MultiSelect) { actions = await removeLikeFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); actions = await migrateMultiSelectEq(filter, actions, col, ncMeta); } else if (col.uidt === UITypes.Attachment) { actions = await removeArithmeticFilters(filter, actions, ncMeta); actions = await removeEqualFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); } else if (col.uidt === UITypes.LinkToAnotherRecord) { actions = await removeArithmeticFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); } else if (col.uidt === UITypes.Lookup) { actions = await removeArithmeticFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); } else if (col.uidt === UITypes.Duration) { actions = await removeLikeFilters(filter, actions, ncMeta); - actions = await removeEqualFilters(filter, actions, ncMeta); - actions = await migrateToBlankFilter(filter, actions, ncMeta); + actions = await migrateNullAndEmptyToBlankFilters( + filter, + actions, + ncMeta + ); } } await Promise.all(actions);