From e07be1ee5eec13b5b25f1e92311b3beeb7ec7f16 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sat, 6 Jul 2024 10:53:00 -0400 Subject: [PATCH] chore: Remove long deprecated filter options --- server/routes/api/documents/documents.ts | 14 +------------- server/routes/api/documents/schema.ts | 14 -------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/server/routes/api/documents/documents.ts b/server/routes/api/documents/documents.ts index cc454f1d0..f24173149 100644 --- a/server/routes/api/documents/documents.ts +++ b/server/routes/api/documents/documents.ts @@ -9,7 +9,7 @@ import uniq from "lodash/uniq"; import mime from "mime-types"; import { Op, ScopeOptions, Sequelize, WhereOptions } from "sequelize"; import { v4 as uuidv4 } from "uuid"; -import { StatusFilter, TeamPreference, UserRole } from "@shared/types"; +import { TeamPreference, UserRole } from "@shared/types"; import { subtractDate } from "@shared/utils/date"; import slugify from "@shared/utils/slugify"; import documentCreator from "@server/commands/documentCreator"; @@ -789,25 +789,13 @@ router.post( userId, dateFilter, statusFilter = [], - includeArchived, - includeDrafts, shareId, snippetMinWords, snippetMaxWords, } = ctx.input.body; const { offset, limit } = ctx.state.pagination; - - // Unfortunately, this still doesn't adequately handle cases when auth is optional const { user } = ctx.state.auth; - // TODO: Deprecated filter options, remove in a few versions - if (includeArchived && !statusFilter.includes(StatusFilter.Archived)) { - statusFilter.push(StatusFilter.Archived); - } - if (includeDrafts && !statusFilter.includes(StatusFilter.Draft)) { - statusFilter.push(StatusFilter.Draft); - } - let teamId; let response; let share; diff --git a/server/routes/api/documents/schema.ts b/server/routes/api/documents/schema.ts index ea7b4a6bc..0524e3d15 100644 --- a/server/routes/api/documents/schema.ts +++ b/server/routes/api/documents/schema.ts @@ -159,20 +159,6 @@ export const DocumentsSearchSchema = BaseSchema.extend({ /** Filter results based on content within a document and it's children */ documentId: z.string().uuid().optional(), - /** - * Whether to include archived documents in results - * - * @deprecated Use `statusFilter` instead - */ - includeArchived: z.boolean().optional(), - - /** - * Whether to include draft documents in results - * - * @deprecated Use `statusFilter` instead - */ - includeDrafts: z.boolean().optional(), - /** Document statuses to include in results */ statusFilter: z.nativeEnum(StatusFilter).array().optional(),