|
@@ -1,5 +1,4 @@
|
|
|
import { templateChecker, pagePathUtils } from '@growi/core';
|
|
import { templateChecker, pagePathUtils } from '@growi/core';
|
|
|
-import { SORT_AXIS, SORT_ORDER } from '~/interfaces/search';
|
|
|
|
|
import loggerFactory from '~/utils/logger';
|
|
import loggerFactory from '~/utils/logger';
|
|
|
|
|
|
|
|
// disable no-return-await for model functions
|
|
// disable no-return-await for model functions
|
|
@@ -30,18 +29,6 @@ const PAGE_GRANT_ERROR = 1;
|
|
|
const STATUS_PUBLISHED = 'published';
|
|
const STATUS_PUBLISHED = 'published';
|
|
|
const STATUS_DELETED = 'deleted';
|
|
const STATUS_DELETED = 'deleted';
|
|
|
|
|
|
|
|
-const { CREATED_AT, UPDATED_AT } = SORT_AXIS;
|
|
|
|
|
-const { DESC, ASC } = SORT_ORDER;
|
|
|
|
|
-
|
|
|
|
|
-const OBSOLETE_SEARCH_SORT_AXIS = {
|
|
|
|
|
- [CREATED_AT]: 'createdAt',
|
|
|
|
|
- [UPDATED_AT]: 'updatedAt',
|
|
|
|
|
-};
|
|
|
|
|
-const OBSOLETE_SEARCH_SORT_ORDER = {
|
|
|
|
|
- [DESC]: { desc: 1 },
|
|
|
|
|
- [ASC]: { desc: -1 },
|
|
|
|
|
-};
|
|
|
|
|
-
|
|
|
|
|
// schema definition has moved to page.ts
|
|
// schema definition has moved to page.ts
|
|
|
const pageSchema = {
|
|
const pageSchema = {
|
|
|
statics: {},
|
|
statics: {},
|
|
@@ -232,11 +219,6 @@ export class PageQueryBuilder {
|
|
|
return this;
|
|
return this;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- addConditionToSort(sortAxis, sortOrder) {
|
|
|
|
|
- const sortCondition = { sort: OBSOLETE_SEARCH_SORT_AXIS[sortAxis], desc: OBSOLETE_SEARCH_SORT_ORDER[sortOrder] };
|
|
|
|
|
- this.query = this.query.sort(sortCondition);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
addConditionAsNonRootPage() {
|
|
addConditionAsNonRootPage() {
|
|
|
this.query = this.query.and({ path: { $ne: '/' } });
|
|
this.query = this.query.and({ path: { $ne: '/' } });
|
|
|
|
|
|