From 0c83be638b8fad0f4fc8da9016f15e0b6017faf9 Mon Sep 17 00:00:00 2001 From: Nikita Melnikov Date: Sun, 2 Oct 2022 13:53:22 +0800 Subject: [PATCH] fix eslint --- src/backend/controllers/pages.ts | 19 +++++++++++++------ src/backend/controllers/pagesOrder.ts | 2 +- src/backend/models/pageOrder.ts | 4 ++-- src/backend/routes/api/pages.ts | 4 ++-- src/backend/routes/middlewares/pages.ts | 2 +- src/backend/utils/database/index.ts | 9 +++++++++ src/backend/utils/twig.ts | 2 +- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/backend/controllers/pages.ts b/src/backend/controllers/pages.ts index 97df668..b80347f 100644 --- a/src/backend/controllers/pages.ts +++ b/src/backend/controllers/pages.ts @@ -1,11 +1,11 @@ -import Page, {PageData} from '../models/page.js'; +import Page, { PageData } from '../models/page.js'; import Alias from '../models/alias.js'; import PagesOrder from './pagesOrder.js'; import PageOrder from '../models/pageOrder.js'; import HttpException from '../exceptions/httpException.js'; import PagesFlatArray from '../models/pagesFlatArray.js'; -import {EntityId} from '../utils/database/types.js'; -import {isEqualIds} from "../utils/database/index.js"; +import { EntityId } from '../utils/database/types.js'; +import { isEqualIds } from '../utils/database/index.js'; type PageDataFields = keyof PageData; @@ -68,6 +68,9 @@ class Pages { return nullFilteredPages; } + /** + * + */ private static async getPagesMap(): Promise> { const pages = await Pages.getAllPages(); const pagesMap = new Map(); @@ -106,18 +109,22 @@ class Pages { const getChildrenOrder = (pageId: EntityId): EntityId[] => { const order = childPageOrder.find((order) => isEqualIds(order.page, pageId))?.order || []; + if (order.length === 0) { return []; } - const expandedOrder = order.map((id) => [id,...getChildrenOrder(id)]); + const expandedOrder = order.map((id) => [id, ...getChildrenOrder(id)]); + return expandedOrder.flat(); - } + }; const orderGroupedByParent = idsOfRootPages.reduce((acc, curr) => { const pageOrder = getChildrenOrder(curr); + acc[curr.toString()] = [curr, ...pageOrder]; + return acc; - }, {} as Record) + }, {} as Record); /** * It converts grouped pages(object) to array diff --git a/src/backend/controllers/pagesOrder.ts b/src/backend/controllers/pagesOrder.ts index 4ced89c..313fa60 100644 --- a/src/backend/controllers/pagesOrder.ts +++ b/src/backend/controllers/pagesOrder.ts @@ -2,7 +2,7 @@ import PageOrder from '../models/pageOrder.js'; import Page from '../models/page.js'; import PagesFlatArray from '../models/pagesFlatArray.js'; import { EntityId } from '../utils/database/types.js'; -import {isEqualIds} from "../utils/database/index.js"; +import { isEqualIds } from '../utils/database/index.js'; /** * @class PagesOrder diff --git a/src/backend/models/pageOrder.ts b/src/backend/models/pageOrder.ts index 6acd6d8..aef09ec 100644 --- a/src/backend/models/pageOrder.ts +++ b/src/backend/models/pageOrder.ts @@ -1,4 +1,4 @@ -import database, {isEntityId, isEqualIds} from '../utils/database/index.js'; +import database, { isEntityId, isEqualIds } from '../utils/database/index.js'; import { ObjectId } from 'mongodb'; import { EntityId } from '../utils/database/types.js'; @@ -165,7 +165,7 @@ class PageOrder { } const found1 = this.order.findIndex(order => isEqualIds(order, putAbovePageId)); - const found2 = this.order.findIndex(order => isEqualIds(order,currentPageId)); + const found2 = this.order.findIndex(order => isEqualIds(order, currentPageId)); if (found1 === -1 || found2 === -1) { return; diff --git a/src/backend/routes/api/pages.ts b/src/backend/routes/api/pages.ts index 0ace2d7..f1e6320 100644 --- a/src/backend/routes/api/pages.ts +++ b/src/backend/routes/api/pages.ts @@ -3,7 +3,7 @@ import multerFunc from 'multer'; import Pages from '../../controllers/pages.js'; import PagesOrder from '../../controllers/pagesOrder.js'; import { EntityId } from '../../utils/database/types.js'; -import {isEntityId, isEqualIds, toEntityId} from "../../utils/database/index.js"; +import { isEntityId, isEqualIds, toEntityId } from '../../utils/database/index.js'; const router = express.Router(); const multer = multerFunc(); @@ -202,7 +202,7 @@ router.delete('/page/:id', async (req: Request, res: Response) => { } }; - const id = toEntityId(req.params.id) + const id = toEntityId(req.params.id); await deleteRecursively(id); diff --git a/src/backend/routes/middlewares/pages.ts b/src/backend/routes/middlewares/pages.ts index 222cd84..bb8ee03 100644 --- a/src/backend/routes/middlewares/pages.ts +++ b/src/backend/routes/middlewares/pages.ts @@ -5,7 +5,7 @@ import Page from '../../models/page.js'; import asyncMiddleware from '../../utils/asyncMiddleware.js'; import PageOrder from '../../models/pageOrder.js'; import { EntityId } from '../../utils/database/types.js'; -import {isEqualIds} from "../../utils/database/index.js"; +import { isEqualIds } from '../../utils/database/index.js'; /** * Process one-level pages list to parent-children list diff --git a/src/backend/utils/database/index.ts b/src/backend/utils/database/index.ts index f80ef43..2601bad 100644 --- a/src/backend/utils/database/index.ts +++ b/src/backend/utils/database/index.ts @@ -18,10 +18,19 @@ export function toEntityId(id: string): EntityId { return (appConfig.database.driver === 'mongodb' ? new ObjectId(id) : id) as EntityId; } +/** + * + * @param id1 + * @param id2 + */ export function isEqualIds(id1?: EntityId, id2?: EntityId): boolean { return id1?.toString() === id2?.toString(); } +/** + * + * @param id + */ export function isEntityId(id?: EntityId): id is EntityId { return typeof id === 'string' || id instanceof ObjectId; } diff --git a/src/backend/utils/twig.ts b/src/backend/utils/twig.ts index 05434e0..c2ec4f2 100644 --- a/src/backend/utils/twig.ts +++ b/src/backend/utils/twig.ts @@ -57,5 +57,5 @@ export default (function () { twig.extendFilter('json_stringify', function (data: any): string { return JSON.stringify(data); - }) + }); }());