From fd94f177c8217e7f75361c2b0df9fc4d55c17c78 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sat, 17 Jun 2023 11:24:18 +0530 Subject: [PATCH] fix: revert commit changes made on ncFilterUpgrader_0104004.ts - #d466c2342eebda4a21482fb608b02b2a38a98eea Signed-off-by: Pranav C --- .../ncFilterUpgrader_0104004.ts | 384 ++++++++++++++++-- 1 file changed, 350 insertions(+), 34 deletions(-) diff --git a/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts b/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts index f3e69083f8..1aecb3eb32 100644 --- a/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts +++ b/packages/nocodb/src/version-upgrader/ncFilterUpgrader_0104004.ts @@ -1,43 +1,359 @@ -import { OrgUserRoles } from 'nocodb-sdk'; -import { NC_APP_SETTINGS } from '../constants'; -import Store from '../models/Store'; +import { UITypes } from 'nocodb-sdk'; import { MetaTable } from '../utils/globals'; +import Column from '../models/Column'; +import Filter from '../models/Filter'; +import Project from '../models/Project'; +import type { MetaService } from '../meta/meta.service'; import type { NcUpgraderCtx } from './NcUpgrader'; +import type { SelectOptionsType } from 'nocodb-sdk'; -/** Upgrader for upgrading roles */ -export default async function ({ ncMeta }: NcUpgraderCtx) { - const users = await ncMeta.metaList2(null, null, MetaTable.USERS); - - for (const user of users) { - user.roles = user.roles - .split(',') - .map((r) => { - // update old role names with new roles - if (r === 'user') { - return OrgUserRoles.CREATOR; - } else if (r === 'user-new') { - return OrgUserRoles.VIEWER; - } - return r; - }) - .join(','); - await ncMeta.metaUpdate( - null, - null, - MetaTable.USERS, - { roles: user.roles }, - user.id, +// 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 + +// 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 = (filter, ncMeta) => { + const actions = []; + // remove `is equal`, `is not equal` + if (['eq', 'neq'].includes(filter.comparison_op)) { + actions.push(Filter.delete(filter.id, ncMeta)); + } + return actions; +}; + +const removeArithmeticFilters = (filter, ncMeta) => { + const actions = []; + // remove `>`, `<`, `>=`, `<=` + if (['gt', 'lt', 'gte', 'lte'].includes(filter.comparison_op)) { + actions.push(Filter.delete(filter.id, ncMeta)); + } + return actions; +}; + +const removeLikeFilters = (filter, ncMeta) => { + const actions = []; + // remove `is like`, `is not like` + if (['like', 'nlike'].includes(filter.comparison_op)) { + actions.push(Filter.delete(filter.id, ncMeta)); + } + return actions; +}; + +const migrateNullAndEmptyToBlankFilters = (filter, ncMeta) => { + const actions = []; + if (['empty', 'null'].includes(filter.comparison_op)) { + // migrate to blank + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'blank', + }, + ncMeta, + ), + ); + } else if (['notempty', 'notnull'].includes(filter.comparison_op)) { + // migrate to not blank + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'notblank', + }, + ncMeta, + ), + ); + } + return actions; +}; + +const migrateMultiSelectEq = async (filter, col: Column, ncMeta) => { + // only allow eq / neq + if (!['eq', 'neq'].includes(filter.comparison_op)) return; + // if there is no value -> delete this filter + if (!filter.value) { + return await Filter.delete(filter.id, ncMeta); + } + // options inputted from users + const options = filter.value.split(','); + // retrieve the possible col options + const colOptions = (await col.getColOptions()) as SelectOptionsType; + // only include valid options as the input value becomes dropdown type now + const validOptions = []; + for (const option of options) { + if (colOptions.options.includes(option)) { + validOptions.push(option); + } + } + const newFilterValue = validOptions.join(','); + // if all inputted options are invalid -> delete this filter + if (!newFilterValue) { + return await Filter.delete(filter.id, ncMeta); + } + const actions = []; + if (filter.comparison_op === 'eq') { + // migrate to `contains all of` + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'anyof', + value: newFilterValue, + }, + ncMeta, + ), + ); + } else if (filter.comparison_op === 'neq') { + // migrate to `doesn't contain all of` + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'nanyof', + value: newFilterValue, + }, + ncMeta, + ), + ); + } + return await Promise.all(actions); +}; + +const migrateToCheckboxFilter = (filter, ncMeta) => { + const actions = []; + const possibleTrueValues = ['true', 'True', '1', 'T', 'Y']; + const possibleFalseValues = ['false', 'False', '0', 'F', 'N']; + if (['empty', 'null'].includes(filter.comparison_op)) { + // migrate to not checked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'notchecked', + }, + ncMeta, + ), + ); + } else if (['notempty', 'notnull'].includes(filter.comparison_op)) { + // migrate to checked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'checked', + }, + ncMeta, + ), ); + } else if (filter.comparison_op === 'eq') { + if (possibleTrueValues.includes(filter.value)) { + // migrate to checked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'checked', + value: '', + }, + ncMeta, + ), + ); + } else if (possibleFalseValues.includes(filter.value)) { + // migrate to notchecked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'notchecked', + value: '', + }, + ncMeta, + ), + ); + } else { + // invalid value - good to delete + actions.push(Filter.delete(filter.id, ncMeta)); + } + } else if (filter.comparison_op === 'neq') { + if (possibleFalseValues.includes(filter.value)) { + // migrate to checked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'checked', + value: '', + }, + ncMeta, + ), + ); + } else if (possibleTrueValues.includes(filter.value)) { + // migrate to not checked + actions.push( + Filter.update( + filter.id, + { + comparison_op: 'notchecked', + value: '', + }, + ncMeta, + ), + ); + } else { + // invalid value - good to delete + actions.push(Filter.delete(filter.id, ncMeta)); + } + } + return actions; +}; + +async function migrateFilters(ncMeta: MetaService) { + const filters = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP); + for (const filter of filters) { + if (!filter.fk_column_id || filter.is_group) { + continue; + } + const col = await Column.get({ colId: filter.fk_column_id }, ncMeta); + if ( + [ + UITypes.SingleLineText, + UITypes.LongText, + UITypes.PhoneNumber, + UITypes.Email, + UITypes.URL, + ].includes(col.uidt) + ) { + await Promise.all(removeArithmeticFilters(filter, ncMeta)); + } else if ( + [ + // numeric fields + UITypes.Duration, + UITypes.Currency, + UITypes.Percent, + UITypes.Number, + UITypes.Decimal, + UITypes.Rating, + UITypes.Rollup, + // select fields + UITypes.SingleSelect, + ].includes(col.uidt) + ) { + await Promise.all([ + ...removeLikeFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + } else if (col.uidt === UITypes.Checkbox) { + await Promise.all(migrateToCheckboxFilter(filter, ncMeta)); + } else if (col.uidt === UITypes.MultiSelect) { + await Promise.all([ + ...removeLikeFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + await migrateMultiSelectEq(filter, col, ncMeta); + } else if (col.uidt === UITypes.Attachment) { + await Promise.all([ + ...removeArithmeticFilters(filter, ncMeta), + ...removeEqualFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + } else if (col.uidt === UITypes.LinkToAnotherRecord) { + await Promise.all([ + ...removeArithmeticFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + } else if (col.uidt === UITypes.Lookup) { + await Promise.all([ + ...removeArithmeticFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + } else if (col.uidt === UITypes.Duration) { + await Promise.all([ + ...removeLikeFilters(filter, ncMeta), + ...migrateNullAndEmptyToBlankFilters(filter, ncMeta), + ]); + } + } +} + +async function updateProjectMeta(ncMeta: MetaService) { + const projectHasEmptyOrFilters: Record = {}; + + const filters = await ncMeta.metaList2(null, null, MetaTable.FILTER_EXP); + + const actions = []; + + for (const filter of filters) { + if ( + ['notempty', 'notnull', 'empty', 'null'].includes(filter.comparison_op) + ) { + projectHasEmptyOrFilters[filter.project_id] = true; + } } - // set invite only signup if user have environment variable set - if (process.env.NC_INVITE_ONLY_SIGNUP) { - await Store.saveOrUpdate( - { - value: '{ "invite_only_signup": true }', - key: NC_APP_SETTINGS, - }, - ncMeta, + const projects = await ncMeta.metaList2(null, null, MetaTable.PROJECT); + + const defaultProjectMeta = { + showNullAndEmptyInFilter: false, + }; + + for (const project of projects) { + const oldProjectMeta = project.meta; + let newProjectMeta = defaultProjectMeta; + try { + newProjectMeta = + (typeof oldProjectMeta === 'string' + ? JSON.parse(oldProjectMeta) + : oldProjectMeta) ?? defaultProjectMeta; + } catch {} + + newProjectMeta = { + ...newProjectMeta, + showNullAndEmptyInFilter: projectHasEmptyOrFilters[project.id] ?? false, + }; + + actions.push( + Project.update( + project.id, + { + meta: JSON.stringify(newProjectMeta), + }, + ncMeta, + ), ); } + await Promise.all(actions); +} + +export default async function ({ ncMeta }: NcUpgraderCtx) { + // fix the existing filter behaviours or + // migrate `null` or `empty` filters to `blank` + await migrateFilters(ncMeta); + // enrich `showNullAndEmptyInFilter` in project meta + // if there is empty / null filters in existing projects, + // then set `showNullAndEmptyInFilter` to true + // else set to false + await updateProjectMeta(ncMeta); }