diff --git a/client/src/app/quotes/hooks/useQuotes.tsx b/client/src/app/quotes/hooks/useQuotes.tsx index 07845ac..e4b0c7d 100644 --- a/client/src/app/quotes/hooks/useQuotes.tsx +++ b/client/src/app/quotes/hooks/useQuotes.tsx @@ -91,7 +91,13 @@ export const useQuotes = () => { value: status, }, ] - : undefined, + : [ + { + field: "status", + operator: "ne", + value: "archived", + }, + ], pagination, }); }, diff --git a/server/src/contexts/common/infrastructure/sequelize/queryBuilder/SequelizeParseFilter.ts b/server/src/contexts/common/infrastructure/sequelize/queryBuilder/SequelizeParseFilter.ts index 662512a..7cea286 100644 --- a/server/src/contexts/common/infrastructure/sequelize/queryBuilder/SequelizeParseFilter.ts +++ b/server/src/contexts/common/infrastructure/sequelize/queryBuilder/SequelizeParseFilter.ts @@ -11,6 +11,7 @@ export enum CONNECTING_OPERATORS { export enum OPERATORS { EQ = "EQ", + NE = "NE", NOT = "NOT", IN = "IN", NOTIN = "NOTIN", @@ -35,6 +36,7 @@ const SEQUELIZE_OP_MAP: { [CONNECTING_OPERATORS.OR]: Op.or, [CONNECTING_OPERATORS.AND]: Op.and, [OPERATORS.EQ]: Op.eq, + [OPERATORS.NE]: Op.ne, [OPERATORS.NOT]: Op.not, [OPERATORS.IN]: Op.in, [OPERATORS.NOTIN]: Op.notIn, @@ -54,13 +56,9 @@ const SEQUELIZE_FN_MAP: { } = { [FUNCTIONS.INCLUDES]: (field: string, val: string) => Sequelize.where( - Sequelize.fn( - "FIND_IN_SET", - Sequelize.literal(`'${val}'`), - Sequelize.col(field), - ), + Sequelize.fn("FIND_IN_SET", Sequelize.literal(`'${val}'`), Sequelize.col(field)), SEQUELIZE_OP_MAP[OPERATORS.GT], - 0, + 0 ), };