Merge pull request #112 from githbq/feature/page-tree-code-style

Feature/page tree code style
This commit is contained in:
DarkSky 2022-08-06 19:06:54 +08:00 committed by GitHub
commit 34d30d9e43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
import type { BlockClientInstance } from '@toeverything/datasource/jwt';
import { PAGE_TREE } from '../../utils';
import { PAGE_TREE as pageTreeName } from '../../utils';
import type { ReturnUnobserve } from '../database/observer';
import { ServiceBaseClass } from '../base';
import { TreeItem } from './types';
@ -7,22 +7,22 @@ import { TreeItem } from './types';
export type ObserveCallback = () => void;
export class PageTree extends ServiceBaseClass {
private async fetch_page_tree<TreeItem>(workspace: string) {
const workspace_db_block = await this.getWorkspaceDbBlock(workspace);
const page_tree_config =
workspace_db_block.getDecoration<TreeItem[]>(PAGE_TREE);
return page_tree_config;
private async _fetchPageTree<TreeItem>(workspace: string) {
const workspaceDbBlock = await this.getWorkspaceDbBlock(workspace);
const pageTreeConfig =
workspaceDbBlock.getDecoration<TreeItem[]>(pageTreeName);
return pageTreeConfig;
}
async getPageTree<TreeItem>(workspace: string): Promise<TreeItem[]> {
try {
const page_tree = await this.fetch_page_tree(workspace);
if (page_tree && page_tree.length) {
const pageTree = await this._fetchPageTree(workspace);
if (pageTree && pageTree.length) {
const db = await this.database.getDatabase(workspace);
const pages = await update_tree_items_title(
const pages = await _updateTreeItemsTitle(
db,
page_tree as [],
pageTree as [],
{}
);
return pages;
@ -36,8 +36,8 @@ export class PageTree extends ServiceBaseClass {
/** @deprecated should implement more fine-grained crud methods instead of replacing each time with a new array */
async setPageTree<TreeItem>(workspace: string, treeData: TreeItem[]) {
const workspace_db_block = await this.getWorkspaceDbBlock(workspace);
workspace_db_block.setDecoration(PAGE_TREE, treeData);
const workspaceDbBlock = await this.getWorkspaceDbBlock(workspace);
workspaceDbBlock.setDecoration(pageTreeName, treeData);
}
async addPage<TreeItem>(workspace: string, treeData: TreeItem[] | string) {
@ -51,110 +51,107 @@ export class PageTree extends ServiceBaseClass {
await dbBlock?.remove();
}
async addPageToWorkspacee(
target_workspace_id: string,
new_page_id: string
) {
const items = await this.getPageTree<TreeItem>(target_workspace_id);
await this.setPageTree(target_workspace_id, [
{ id: new_page_id, children: [] },
async addPageToWorkspacee(targetWorkspaceId: string, newPageId: string) {
const items = await this.getPageTree<TreeItem>(targetWorkspaceId);
await this.setPageTree(targetWorkspaceId, [
{ id: newPageId, children: [] },
...items,
]);
}
async addChildPageToWorkspace(
target_workspace_id: string,
parent_page_id: string,
new_page_id: string
targetWorkspaceId: string,
parentPageId: string,
newPageId: string
) {
const pages = await this.getPageTree<TreeItem>(target_workspace_id);
this.build_items_for_child_page(parent_page_id, new_page_id, pages);
const pages = await this.getPageTree<TreeItem>(targetWorkspaceId);
this._buildItemsForChildPage(parentPageId, newPageId, pages);
await this.setPageTree<TreeItem>(target_workspace_id, [...pages]);
await this.setPageTree<TreeItem>(targetWorkspaceId, [...pages]);
}
async addPrevPageToWorkspace(
target_workspace_id: string,
parent_page_id: string,
new_page_id: string
targetWorkspaceId: string,
parentPageId: string,
newPageId: string
) {
const pages = await this.getPageTree<TreeItem>(target_workspace_id);
this.build_items_for_prev_page(parent_page_id, new_page_id, pages);
await this.setPageTree<TreeItem>(target_workspace_id, [...pages]);
const pages = await this.getPageTree<TreeItem>(targetWorkspaceId);
this._buildItemsForPrevPage(parentPageId, newPageId, pages);
await this.setPageTree<TreeItem>(targetWorkspaceId, [...pages]);
}
async addNextPageToWorkspace(
target_workspace_id: string,
parent_page_id: string,
new_page_id: string
targetWorkspaceId: string,
parentPageId: string,
newPageId: string
) {
const pages = await this.getPageTree<TreeItem>(target_workspace_id);
this.build_items_for_next_page(parent_page_id, new_page_id, pages);
await this.setPageTree<TreeItem>(target_workspace_id, [...pages]);
const pages = await this.getPageTree<TreeItem>(targetWorkspaceId);
this._buildItemsForNextPage(parentPageId, newPageId, pages);
await this.setPageTree<TreeItem>(targetWorkspaceId, [...pages]);
}
private build_items_for_next_page(
parent_page_id: string,
new_page_id: string,
private _buildItemsForNextPage(
parentPageId: string,
newPageId: string,
children: TreeItem[]
) {
for (let i = 0; i < children.length; i++) {
const child_page = children[i];
if (child_page.id === parent_page_id) {
const new_page = {
id: new_page_id,
const childPage = children[i];
if (childPage.id === parentPageId) {
const newPage = {
id: newPageId,
title: 'Untitled',
children: [] as TreeItem[],
};
children = children.splice(i + 1, 0, new_page);
} else if (child_page.children && child_page.children.length) {
this.build_items_for_next_page(
parent_page_id,
new_page_id,
child_page.children
children = children.splice(i + 1, 0, newPage);
} else if (childPage.children && childPage.children.length) {
this._buildItemsForNextPage(
parentPageId,
newPageId,
childPage.children
);
}
}
}
private build_items_for_prev_page(
parent_page_id: string,
new_page_id: string,
private _buildItemsForPrevPage(
parentPageId: string,
newPageId: string,
children: TreeItem[]
) {
for (let i = 0; i < children.length; i++) {
const child_page = children[i];
if (child_page.id === parent_page_id) {
const new_page = {
id: new_page_id,
const childPage = children[i];
if (childPage.id === parentPageId) {
const newPage = {
id: newPageId,
title: 'Untitled',
children: [] as TreeItem[],
};
children = children.splice(i - 1, 0, new_page);
} else if (child_page.children && child_page.children.length) {
this.build_items_for_prev_page(
parent_page_id,
new_page_id,
child_page.children
children = children.splice(i - 1, 0, newPage);
} else if (childPage.children && childPage.children.length) {
this._buildItemsForPrevPage(
parentPageId,
newPageId,
childPage.children
);
}
}
}
private build_items_for_child_page(
parent_page_id: string,
new_page_id: string,
private _buildItemsForChildPage(
parentPageId: string,
newPageId: string,
children: TreeItem[]
) {
for (let i = 0; i < children.length; i++) {
const child_page = children[i];
if (child_page.id === parent_page_id) {
child_page.children = child_page.children || [];
child_page.children.push({
id: new_page_id,
const childPage = children[i];
if (childPage.id === parentPageId) {
childPage.children = childPage.children || [];
childPage.children.push({
id: newPageId,
title: 'Untitled',
children: [],
});
} else if (child_page.children && child_page.children.length) {
this.build_items_for_child_page(
parent_page_id,
new_page_id,
child_page.children
} else if (childPage.children && childPage.children.length) {
this._buildItemsForChildPage(
parentPageId,
newPageId,
childPage.children
);
}
}
@ -164,10 +161,10 @@ export class PageTree extends ServiceBaseClass {
{ workspace, page }: { workspace: string; page: string },
callback: ObserveCallback
): Promise<ReturnUnobserve> {
const workspace_db_block = await this.getWorkspaceDbBlock(workspace);
const workspaceDbBlock = await this.getWorkspaceDbBlock(workspace);
const unobserveWorkspace = await this._observe(
workspace,
workspace_db_block.id,
workspaceDbBlock.id,
(states, block) => {
callback();
}
@ -187,12 +184,12 @@ export class PageTree extends ServiceBaseClass {
}
async unobserve({ workspace }: { workspace: string }) {
const workspace_db_block = await this.getWorkspaceDbBlock(workspace);
await this._unobserve(workspace, workspace_db_block.id);
const workspaceDbBlock = await this.getWorkspaceDbBlock(workspace);
await this._unobserve(workspace, workspaceDbBlock.id);
}
}
async function update_tree_items_title<
async function _updateTreeItemsTitle<
TreeItem extends { id: string; title: string; children: TreeItem[] }
>(
db: BlockClientInstance,
@ -213,7 +210,7 @@ async function update_tree_items_title<
}
if (item.children.length) {
item.children = await update_tree_items_title(
item.children = await _updateTreeItemsTitle(
db,
item.children,
cache