chore: Remove long deprecated filter options
This commit is contained in:
@@ -9,7 +9,7 @@ import uniq from "lodash/uniq";
|
|||||||
import mime from "mime-types";
|
import mime from "mime-types";
|
||||||
import { Op, ScopeOptions, Sequelize, WhereOptions } from "sequelize";
|
import { Op, ScopeOptions, Sequelize, WhereOptions } from "sequelize";
|
||||||
import { v4 as uuidv4 } from "uuid";
|
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 { subtractDate } from "@shared/utils/date";
|
||||||
import slugify from "@shared/utils/slugify";
|
import slugify from "@shared/utils/slugify";
|
||||||
import documentCreator from "@server/commands/documentCreator";
|
import documentCreator from "@server/commands/documentCreator";
|
||||||
@@ -789,25 +789,13 @@ router.post(
|
|||||||
userId,
|
userId,
|
||||||
dateFilter,
|
dateFilter,
|
||||||
statusFilter = [],
|
statusFilter = [],
|
||||||
includeArchived,
|
|
||||||
includeDrafts,
|
|
||||||
shareId,
|
shareId,
|
||||||
snippetMinWords,
|
snippetMinWords,
|
||||||
snippetMaxWords,
|
snippetMaxWords,
|
||||||
} = ctx.input.body;
|
} = ctx.input.body;
|
||||||
const { offset, limit } = ctx.state.pagination;
|
const { offset, limit } = ctx.state.pagination;
|
||||||
|
|
||||||
// Unfortunately, this still doesn't adequately handle cases when auth is optional
|
|
||||||
const { user } = ctx.state.auth;
|
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 teamId;
|
||||||
let response;
|
let response;
|
||||||
let share;
|
let share;
|
||||||
|
|||||||
@@ -159,20 +159,6 @@ export const DocumentsSearchSchema = BaseSchema.extend({
|
|||||||
/** Filter results based on content within a document and it's children */
|
/** Filter results based on content within a document and it's children */
|
||||||
documentId: z.string().uuid().optional(),
|
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 */
|
/** Document statuses to include in results */
|
||||||
statusFilter: z.nativeEnum(StatusFilter).array().optional(),
|
statusFilter: z.nativeEnum(StatusFilter).array().optional(),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user