Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: support app router (#6366)
Kilu.He88df23213933
diff --git a/frontend/appflowy_web_app/.gitignore b/frontend/appflowy_web_app/.gitignoreindex 5ae4f07836..1b38f28edf 100644--- a/frontend/appflowy_web_app/.gitignore+++ b/frontend/appflowy_web_app/.gitignore@@ -32,4 +32,6 @@ src/application/services/tauri-services/backend/events/.envcoverage-.nyc_output\ No newline at end of file+.nyc_output++cypress/snapshots/**/__diff_output__/diff --git a/frontend/appflowy_web_app/cypress.config.ts b/frontend/appflowy_web_app/cypress.config.tsindex df9da9b91d..56197aa753 100644--- a/frontend/appflowy_web_app/cypress.config.ts+++ b/frontend/appflowy_web_app/cypress.config.ts@@ -1,6 +1,8 @@import { defineConfig } from 'cypress';import registerCodeCoverageTasks from '@cypress/code-coverage/task';+import { addMatchImageSnapshotPlugin } from 'cypress-image-snapshot/plugin';+export default defineConfig({env: {codeCoverage: {@@ -12,8 +14,9 @@ export default defineConfig({framework: 'react',bundler: 'vite',},- setupNodeEvents(on, config) {+ setupNodeEvents (on, config) {registerCodeCoverageTasks(on, config);+ addMatchImageSnapshotPlugin(on, config);return config;},supportFile: 'cypress/support/component.ts',diff --git a/frontend/appflowy_web_app/cypress/fixtures/editor/blocks/paragraph.json b/frontend/appflowy_web_app/cypress/fixtures/editor/blocks/paragraph.jsonnew file mode 100644index 0000000000..044d21a342--- /dev/null+++ b/frontend/appflowy_web_app/cypress/fixtures/editor/blocks/paragraph.json@@ -0,0 +1,104 @@+[+ {+ "type": "paragraph",+ "data": {},+ "children": [],+ "text": [+ {+ "insert": "This is a paragraph block with multiple lines.",+ "attributes": {+ "bold": true+ }+ },+ {+ "insert": "It has multiple lines of text.",+ "attributes": {+ "italic": true,+ "underline": true,+ "strikethrough": true,+ "font_color": "#ff0000",+ "bg_color": "#00ff00"+ }+ }+ ]+ },+ {+ "type": "paragraph",+ "data": {},+ "children": [],+ "text": [+ {+ "insert": "inline code",+ "attributes": {+ "code": true+ }+ },+ {+ "insert": "link",+ "attributes": {+ "href": "https://example.com"+ }+ },+ {+ "insert": "diff font",+ "attributes": {+ "font_family": "monospace"+ }+ }+ ]+ },+ {+ "type": "paragraph",+ "data": {},+ "text": [+ {+ "insert": "This is a nested block."+ }+ ],+ "children": [+ {+ "type": "paragraph",+ "data": {},+ "text": [+ {+ "insert": "This is a nested block."+ }+ ],+ "children": [+ {+ "type": "paragraph",+ "data": {},+ "text": [+ {+ "insert": "This is a nested block."+ }+ ],+ "children": [+ {+ "type": "paragraph",+ "data": {},+ "text": [+ {+ "insert": "This is a nested block."+ }+ ],+ "children": [+ {+ "type": "paragraph",+ "data": {},+ "text": [+ {+ "insert": "This is a nested block."+ }+ ],+ "children": []+ }+ ]+ }+ ]+ }+ ]+ }+ ]+ }+]\ No newline at end of filediff --git a/frontend/appflowy_web_app/cypress/support/component.ts b/frontend/appflowy_web_app/cypress/support/component.tsindex b86b3d71bb..76dbe83d71 100644--- a/frontend/appflowy_web_app/cypress/support/component.ts+++ b/frontend/appflowy_web_app/cypress/support/component.ts@@ -12,11 +12,13 @@// You can read more here:// https://on.cypress.io/configuration// ***********************************************************+import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';// Import commands.js using ES2015 syntax:import '@cypress/code-coverage/support';import './commands';import './document';+// Alternatively you can use CommonJS syntax:// require('./commands')@@ -69,3 +71,9 @@ Cypress.Commands.add('clickOutside', () => {// Example use:// cy.mount(<MyComponent />)+addMatchImageSnapshotCommand({+ failureThreshold: 0.03, // 允许 3% 的像素差异+ failureThresholdType: 'percent',+ customDiffConfig: { threshold: 0.1 },+ capture: 'viewport',+});diff --git a/frontend/appflowy_web_app/cypress/support/document.ts b/frontend/appflowy_web_app/cypress/support/document.tsindex 757974f14b..f660fae09e 100644--- a/frontend/appflowy_web_app/cypress/support/document.ts+++ b/frontend/appflowy_web_app/cypress/support/document.ts@@ -1,7 +1,15 @@-import { BlockId, BlockType, YBlocks, YChildrenMap, YjsEditorKey, YTextMap } from '@/application/collab.type';+import { BlockId, BlockType, YBlocks, YChildrenMap, YjsEditorKey, YTextMap } from '@/application/types';import { nanoid } from 'nanoid';+import { Op } from 'quill-delta';import * as Y from 'yjs';+export interface FromBlockJSON {+ type: string;+ children: FromBlockJSON[];+ data: Record<string, number | string | boolean>;+ text: Op[];+}+export class DocumentTest {public doc: Y.Doc;@@ -13,7 +21,7 @@ export class DocumentTest {private pageId: string;- constructor() {+ constructor () {const doc = new Y.Doc();this.doc = doc;@@ -48,7 +56,7 @@ export class DocumentTest {this.pageId = pageId;}- insertParagraph(text: string) {+ insertParagraph (text: string) {const blockId = nanoid(8);const block = new Y.Map();@@ -72,4 +80,44 @@ export class DocumentTest {return blockText;}++ fromJSON (json: FromBlockJSON[]) {++ this.fromJSONChildren(json, this.pageId);++ return this.doc;+ }++ private fromJSONChildren (children: FromBlockJSON[], parentId: BlockId) {+ const parentChildren = this.childrenMap.get(parentId) ?? new Y.Array<BlockId>();++ for (const child of children) {+ const blockId = nanoid(8);+ const block = new Y.Map();++ block.set(YjsEditorKey.block_id, blockId);+ block.set(YjsEditorKey.block_type, child.type);+ block.set(YjsEditorKey.block_children, blockId);+ block.set(YjsEditorKey.block_external_id, blockId);+ block.set(YjsEditorKey.block_external_type, YjsEditorKey.text);+ block.set(YjsEditorKey.block_parent, parentId);+ block.set(YjsEditorKey.block_data, JSON.stringify(child.data));+ this.blocks.set(blockId, block);++ parentChildren.push([blockId]);+ if (!this.childrenMap.has(parentId)) {+ this.childrenMap.set(parentId, parentChildren);+ }++ const blockText = new Y.Text();++ blockText.applyDelta(child.text);++ console.log(blockText.toJSON());++ this.textMap.set(blockId, blockText);++ this.fromJSONChildren(child.children, blockId);+ }+ }}diff --git a/frontend/appflowy_web_app/deploy/server.ts b/frontend/appflowy_web_app/deploy/server.tsindex 39a939e27b..8f41fc6f2d 100644--- a/frontend/appflowy_web_app/deploy/server.ts+++ b/frontend/appflowy_web_app/deploy/server.ts@@ -68,7 +68,17 @@ const createServer = async (req: Request) => {logger.info(`Request URL: ${hostname}${reqUrl.pathname}`);- if (['/after-payment', '/login', '/as-template', '/accept-invitation'].includes(reqUrl.pathname)) {+ if (reqUrl.pathname === '/') {+ timer();+ return new Response(null, {+ status: 302,+ headers: {+ Location: '/app',+ },+ });+ }++ if (['/after-payment', '/login', '/as-template', '/app', '/accept-invitation'].some(item => reqUrl.pathname.startsWith(item))) {timer();const htmlData = fs.readFileSync(indexPath, 'utf8');const $ = load(htmlData);diff --git a/frontend/appflowy_web_app/index.html b/frontend/appflowy_web_app/index.htmlindex 4c8514b049..48fa2a1b2b 100644--- a/frontend/appflowy_web_app/index.html+++ b/frontend/appflowy_web_app/index.html@@ -5,24 +5,29 @@<link rel="icon" type="image/svg+xml" href="/appflowy.svg" /><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>AppFlowy</title>- <meta name="description"- content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ <meta+ name="description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"/><meta property="og:title" content="AppFlowy" />- <meta property="og:description"- content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ <meta+ property="og:description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"/>- <meta property="og:image"- content="/_next/static/media/og-image.e347bfb5.png"+ <meta+ property="og:image"+ content="/og-image.png"/><meta property="og:url" content="https://appflowy.com" /><meta name="twitter:card" content="summary_large_image" /><meta name="twitter:title" content="AppFlowy" />- <meta name="twitter:description"- content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ <meta+ name="twitter:description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"/>- <meta name="twitter:image"- content="/_next/static/media/og-image.e347bfb5.png"+ <meta+ name="twitter:image"+ content="/og-image.png"/><meta name="twitter:site" content="@appflowy" /><meta name="twitter:creator" content="@appflowy" />diff --git a/frontend/appflowy_web_app/jest.config.cjs b/frontend/appflowy_web_app/jest.config.cjsindex b226459c4b..211176e5ee 100644--- a/frontend/appflowy_web_app/jest.config.cjs+++ b/frontend/appflowy_web_app/jest.config.cjs@@ -12,6 +12,7 @@ module.exports = {...pathsToModuleNameMapper(compilerOptions.paths),'^lodash-es(/(.*)|$)': 'lodash$1','^nanoid(/(.*)|$)': 'nanoid$1',+ '^dayjs$': '<rootDir>/node_modules/dayjs/dayjs.min.js',},'transform': {'^.+\\.(j|t)sx?$': 'ts-jest',diff --git a/frontend/appflowy_web_app/package.json b/frontend/appflowy_web_app/package.jsonindex 3c72bc1a26..d2ba26c297 100644--- a/frontend/appflowy_web_app/package.json+++ b/frontend/appflowy_web_app/package.json@@ -114,6 +114,7 @@"@svgr/plugin-svgo": "^8.0.1","@tauri-apps/cli": "^1.5.11","@testing-library/react": "^16.0.0",+ "@types/cypress-image-snapshot": "^3.1.9","@types/google-protobuf": "^3.15.12","@types/is-hotkey": "^0.1.7","@types/jest": "^29.5.3",@@ -148,6 +149,7 @@"cheerio": "1.0.0-rc.12","cross-env": "^7.0.3","cypress": "^13.7.2",+ "cypress-image-snapshot": "^4.0.1","eslint": "^8.57.0","eslint-plugin-react": "^7.32.2","eslint-plugin-react-hooks": "^4.6.0",diff --git a/frontend/appflowy_web_app/pnpm-lock.yaml b/frontend/appflowy_web_app/pnpm-lock.yamlindex d021b0ff7e..9fe4711846 100644--- a/frontend/appflowy_web_app/pnpm-lock.yaml+++ b/frontend/appflowy_web_app/pnpm-lock.yaml@@ -271,6 +271,9 @@ devDependencies:'@testing-library/react':specifier: ^16.0.0version: 16.0.0(@testing-library/[email protected])(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@types/cypress-image-snapshot':+ specifier: ^3.1.9+ version: 3.1.9'@types/google-protobuf':specifier: ^3.15.12version: 3.15.12@@ -373,6 +376,9 @@ devDependencies:cypress:specifier: ^13.7.2version: 13.7.2+ cypress-image-snapshot:+ specifier: ^4.0.1+ version: 4.0.1([email protected])([email protected])eslint:specifier: ^8.57.0version: 8.57.0@@ -4061,6 +4067,10 @@ packages:dependencies:'@babel/types': 7.24.0+ /@types/[email protected]:+ resolution: {integrity: sha512-vcFgB8AfuM0dtupCHAGgapUbjRNWmMDtpzzpXz5gexWOHW4y/n10XRi5/y5Xpi0Ztku+X4dnRVMqQa5IDcy3Ig==}+ dev: true+/@types/[email protected]:resolution: {integrity: sha512-p9eZ2X9B80iKiTW4ukVj8B4K6q9/+xFtQ5MGYA5HWToY9nL4EkhV9+6ftT2VHpVMEZb5Tv00Iel516bVdO+yRw==}dev: true@@ -4609,6 +4619,11 @@ packages:'@xtuc/long': 4.2.2dev: true+ /@xmldom/[email protected]:+ resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==}+ engines: {node: '>=10.0.0'}+ dev: true+/@xtuc/[email protected]:resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}dev: true@@ -4759,6 +4774,11 @@ packages:dependencies:type-fest: 0.21.3+ resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}+ engines: {node: '>=0.10.0'}+ dev: true+resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}engines: {node: '>=8'}@@ -4768,6 +4788,11 @@ packages:engines: {node: '>=12'}dev: true+ resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}+ engines: {node: '>=0.10.0'}+ dev: true+resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}engines: {node: '>=4'}@@ -4796,6 +4821,13 @@ packages:normalize-path: 3.0.0picomatch: 2.3.1+ resolution: {integrity: sha512-EAgEXkdcxH1cgEePOSsmUtw9ItPl0KTxnh/pj9ZbhvbKbij9x0oX6PWpGnorDr0DS5AosLgoa5n3T/hZmKQpYA==}+ engines: {node: '>=8'}+ dependencies:+ execa: 1.0.0+ dev: true+resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==}engines: {node: '>=8'}@@ -5313,6 +5345,17 @@ packages:resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}+ resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}+ engines: {node: '>=0.10.0'}+ dependencies:+ ansi-styles: 2.2.1+ escape-string-regexp: 1.0.5+ has-ansi: 2.0.0+ strip-ansi: 3.0.1+ supports-color: 2.0.0+ dev: true+resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}engines: {node: '>=4'}@@ -5645,6 +5688,17 @@ packages:cross-spawn: 7.0.3dev: true+ resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}+ engines: {node: '>=4.8'}+ dependencies:+ nice-try: 1.0.5+ path-key: 2.0.1+ semver: 5.7.2+ shebang-command: 1.2.0+ which: 1.3.1+ dev: true+resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}engines: {node: '>= 8'}@@ -5727,6 +5781,23 @@ packages:uniq: 1.0.1dev: false+ resolution: {integrity: sha512-PBpnhX/XItlx3/DAk5ozsXQHUi72exybBNH5Mpqj1DVmjq+S5Jd9WE5CRa4q5q0zuMZb2V2VpXHth6MjFpgj9Q==}+ engines: {node: '>=8'}+ peerDependencies:+ cypress: ^4.5.0+ dependencies:+ chalk: 2.4.2+ cypress: 13.7.2+ fs-extra: 7.0.1+ glob: 7.2.3+ jest-image-snapshot: 4.2.0([email protected])+ pkg-dir: 3.0.0+ term-img: 4.1.0+ transitivePeerDependencies:+ - jest+ dev: true+resolution: {integrity: sha512-FF5hFI5wlRIHY8urLZjJjj/YvfCBrRpglbZCLr/cYcL9MdDe0+5usa8kTIrDHthlEc9lwihbkb5dmwqBDNS2yw==}engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}@@ -6503,6 +6574,19 @@ packages:resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}engines: {node: '>=0.8.x'}+ resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}+ engines: {node: '>=6'}+ dependencies:+ cross-spawn: 6.0.5+ get-stream: 4.1.0+ is-stream: 1.1.0+ npm-run-path: 2.0.2+ p-finally: 1.0.0+ signal-exit: 3.0.7+ strip-eof: 1.0.0+ dev: true+resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}engines: {node: '>=10'}@@ -6801,6 +6885,15 @@ packages:universalify: 2.0.1dev: true+ resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}+ engines: {node: '>=6 <7 || >=8'}+ dependencies:+ graceful-fs: 4.2.11+ jsonfile: 4.0.0+ universalify: 0.1.2+ dev: true+resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}engines: {node: '>=10'}@@ -6879,6 +6972,18 @@ packages:through: 2.3.8dev: false+ resolution: {integrity: sha512-jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==}+ engines: {node: '>=0.12.0'}+ dev: true++ resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}+ engines: {node: '>=6'}+ dependencies:+ pump: 3.0.0+ dev: true+resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}engines: {node: '>=8'}@@ -6990,6 +7095,10 @@ packages:slash: 3.0.0dev: true+ resolution: {integrity: sha512-l+8esYHTKOx2G/Aao4lEQ0bnHWg4fWtJbVoZZT9Knxi01pB8C80BR85nONLFwkkQoFRCmXY+BUcGZN3yZ2QsRA==}+ dev: true+resolution: {integrity: sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg==}peerDependencies:@@ -7040,6 +7149,13 @@ packages:har-schema: 2.0.0dev: false+ resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}+ engines: {node: '>=0.10.0'}+ dependencies:+ ansi-regex: 2.1.1+ dev: true+resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}dev: true@@ -7452,6 +7568,11 @@ packages:call-bind: 1.0.7dev: true+ resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}+ engines: {node: '>=0.10.0'}+ dev: true+resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}engines: {node: '>=8'}@@ -7610,6 +7731,14 @@ packages:html-escaper: 2.0.2istanbul-lib-report: 3.0.1+ resolution: {integrity: sha512-IoiNVk4SMPu6uTcK+1nA5QaHNok2BMDLjSl5UomrOixe5g4GkylhPwuiGdw00ysSCrXAKNMfFTu+u/Lk5f6OLQ==}+ engines: {node: '>=8'}+ dependencies:+ app-path: 3.3.0+ plist: 3.1.0+ dev: true+resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}engines: {node: '>=14'}@@ -7802,6 +7931,24 @@ packages:optionalDependencies:fsevents: 2.3.3+ resolution: {integrity: sha512-6aAqv2wtfOgxiJeBayBCqHo1zX+A12SUNNzo7rIxiXh6W6xYVu8QyHWkada8HeRi+QUTHddp0O0Xa6kmQr+xbQ==}+ engines: {node: '>= 10.14.2'}+ peerDependencies:+ jest: '>=20 <=26'+ dependencies:+ chalk: 1.1.3+ get-stdin: 5.0.1+ glur: 1.1.2+ jest: 29.5.0(@types/[email protected])+ lodash: 4.17.21+ mkdirp: 0.5.6+ pixelmatch: 5.3.0+ pngjs: 3.4.0+ rimraf: 2.7.1+ ssim.js: 3.5.0+ dev: true+resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -8152,6 +8299,12 @@ packages:resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}dev: true+ resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}+ optionalDependencies:+ graceful-fs: 4.2.11+ dev: true+resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}dependencies:@@ -8514,6 +8667,13 @@ packages:engines: {node: '>=16 || 14 >=14.17'}dev: true+ resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}+ hasBin: true+ dependencies:+ minimist: 1.2.8+ dev: true+resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}engines: {node: '>=10'}@@ -8570,6 +8730,10 @@ packages:resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}dev: true+ resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}+ dev: true+resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}dependencies:@@ -8619,6 +8783,13 @@ packages:- csstypedev: false+ resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}+ engines: {node: '>=4'}+ dependencies:+ path-key: 2.0.1+ dev: true+resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}engines: {node: '>=8'}@@ -8796,6 +8967,11 @@ packages:resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}dev: true+ resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}+ engines: {node: '>=4'}+ dev: true+resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}engines: {node: '>=6'}@@ -8950,6 +9126,11 @@ packages:resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}+ engines: {node: '>=4'}+ dev: true+resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}engines: {node: '>=8'}@@ -9053,6 +9234,13 @@ packages:resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}engines: {node: '>= 6'}+ resolution: {integrity: sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==}+ hasBin: true+ dependencies:+ pngjs: 6.0.0+ dev: true+resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}engines: {node: '>=6'}@@ -9073,10 +9261,23 @@ packages:find-up: 6.3.0dev: true+ resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}+ engines: {node: '>=10.4.0'}+ dependencies:+ '@xmldom/xmldom': 0.8.10+ base64-js: 1.5.1+ xmlbuilder: 15.1.1+ dev: true+resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}engines: {node: '>=4.0.0'}- dev: false++ resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==}+ engines: {node: '>=12.13.0'}+ dev: trueresolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}@@ -10349,12 +10550,24 @@ packages:resolution: {integrity: sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==}dev: false+ resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}+ engines: {node: '>=0.10.0'}+ dependencies:+ shebang-regex: 1.0.0+ dev: true+resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}engines: {node: '>=8'}dependencies:shebang-regex: 3.0.0+ resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}+ engines: {node: '>=0.10.0'}+ dev: true+resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}engines: {node: '>=8'}@@ -10534,6 +10747,10 @@ packages:safer-buffer: 2.1.2tweetnacl: 0.14.5+ resolution: {integrity: sha512-Aj6Jl2z6oDmgYFFbQqK7fght19bXdOxY7Tj03nF+03M9gCBAjeIiO8/PlEGMfKDwYpw4q6iBqVq2YuREorGg/g==}+ dev: true+resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}engines: {node: '>=10'}@@ -10634,6 +10851,13 @@ packages:safe-buffer: 5.2.1dev: true+ resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}+ engines: {node: '>=0.10.0'}+ dependencies:+ ansi-regex: 2.1.1+ dev: true+resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}engines: {node: '>=8'}@@ -10656,6 +10880,11 @@ packages:resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}engines: {node: '>=8'}+ resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}+ engines: {node: '>=0.10.0'}+ dev: true+resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}engines: {node: '>=6'}@@ -10689,6 +10918,11 @@ packages:resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}dev: false+ resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}+ engines: {node: '>=0.8.0'}+ dev: true+resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}engines: {node: '>=4'}@@ -10780,6 +11014,14 @@ packages:streamx: 2.16.1dev: true+ resolution: {integrity: sha512-DFpBhaF5j+2f7kheKFc1ajsAUUDGOaNPpKPtiIMxlbfud6mvfFZuWGnTRpaujUa5J7yl6cIw/h6nyr4mSsENPg==}+ engines: {node: '>=8'}+ dependencies:+ ansi-escapes: 4.3.2+ iterm2-version: 4.2.0+ dev: true+resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}engines: {node: '>= 10.13.0'}@@ -11198,6 +11440,11 @@ packages:resolution: {integrity: sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==}dev: false+ resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}+ engines: {node: '>= 4.0.0'}+ dev: true+resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}engines: {node: '>= 4.0.0'}@@ -11563,6 +11810,13 @@ packages:has-tostringtag: 1.0.2dev: true+ resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}+ hasBin: true+ dependencies:+ isexe: 2.0.0+ dev: true+resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}engines: {node: '>= 8'}@@ -11633,6 +11887,11 @@ packages:engines: {node: '>=12'}dev: true+ resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}+ engines: {node: '>=8.0'}+ dev: true+resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}dev: truediff --git a/frontend/appflowy_web_app/src/application/collab.type.ts b/frontend/appflowy_web_app/src/application/collab.type.tsdeleted file mode 100644index 34a6c1094e..0000000000--- a/frontend/appflowy_web_app/src/application/collab.type.ts+++ /dev/null@@ -1,703 +0,0 @@-import { ViewMeta } from '@/application/db/tables/view_metas';-import * as Y from 'yjs';--export type BlockId = string;--export type ExternalId = string;--export type ChildrenId = string;--export type ViewId = string;--export type RowId = string;--export type CellId = string;--export enum BlockType {- Paragraph = 'paragraph',- Page = 'page',- HeadingBlock = 'heading',- TodoListBlock = 'todo_list',- BulletedListBlock = 'bulleted_list',- NumberedListBlock = 'numbered_list',- ToggleListBlock = 'toggle_list',- CodeBlock = 'code',- EquationBlock = 'math_equation',- QuoteBlock = 'quote',- CalloutBlock = 'callout',- DividerBlock = 'divider',- ImageBlock = 'image',- GridBlock = 'grid',- BoardBlock = 'board',- CalendarBlock = 'calendar',- OutlineBlock = 'outline',- TableBlock = 'table',- TableCell = 'table/cell',- LinkPreview = 'link_preview',- FileBlock = 'file',- GalleryBlock = 'multi_image',-}--export enum InlineBlockType {- Formula = 'formula',- Mention = 'mention',-}--export enum AlignType {- Left = 'left',- Center = 'center',- Right = 'right',-}--export interface BlockData {- bgColor?: string;- font_color?: string;- align?: AlignType;-}--export interface HeadingBlockData extends BlockData {- level: number;-}--export interface NumberedListBlockData extends BlockData {- number: number;-}--export interface TodoListBlockData extends BlockData {- checked: boolean;-}--export interface ToggleListBlockData extends BlockData {- collapsed: boolean;-}--export interface CodeBlockData extends BlockData {- language: string;-}--export interface CalloutBlockData extends BlockData {- icon: string;-}--export interface MathEquationBlockData extends BlockData {- formula?: string;-}--export interface LinkPreviewBlockData extends BlockData {- url?: string;-}--export enum FieldURLType {- Upload = 2,- Link = 1,-}--export interface FileBlockData extends BlockData {- name: string;- uploaded_at: number;- url: string;- url_type: FieldURLType;-}--export enum ImageType {- Local = 0,- Internal = 1,- External = 2,-}--export interface ImageBlockData extends BlockData {- url?: string;- width?: number;- align?: AlignType;- image_type?: ImageType;- height?: number;-}--export enum GalleryLayout {- Carousel = 0,- Grid = 1,-}--export interface GalleryBlockData extends BlockData {- images: {- type: ImageType,- url: string,- }[];- layout: GalleryLayout;-}--export interface OutlineBlockData extends BlockData {- depth?: number;-}--export interface TableBlockData extends BlockData {- colDefaultWidth: number;- colMinimumWidth: number;- colsHeight: number;- colsLen: number;- rowDefaultHeight: number;- rowsLen: number;-}--export interface TableCellBlockData extends BlockData {- colPosition: number;- height: number;- rowPosition: number;- width: number;- rowBackgroundColor: string;- colBackgroundColor: string;-}--export interface DatabaseNodeData extends BlockData {- view_id: ViewId;-}--export enum MentionType {- PageRef = 'page',- Date = 'date',-}--export interface Mention {- // inline page ref id- page_id?: string;- // reminder date ref id- date?: string;- reminder_id?: string;- reminder_option?: string;-- type: MentionType;-}--export interface FolderMeta {- current_view: ViewId;- current_workspace: string;-}--export enum DocCoverType {- Color = 'CoverType.color',- Image = 'CoverType.file',- Asset = 'CoverType.asset',-}--export type DocCover = {- image_type?: ImageType;- cover_selection_type?: DocCoverType;- cover_selection?: string;-} | null;--export enum ViewLayout {- Document = 0,- Grid = 1,- Board = 2,- Calendar = 3,-}--export enum YjsEditorKey {- data_section = 'data',- document = 'document',- database = 'database',- workspace_database = 'databases',- folder = 'folder',- // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values- database_row = 'data',- user_awareness = 'user_awareness',- empty = 'empty',-- // document- blocks = 'blocks',- page_id = 'page_id',- meta = 'meta',- children_map = 'children_map',- text_map = 'text_map',- text = 'text',- delta = 'delta',- block_id = 'id',- block_type = 'ty',- // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values- block_data = 'data',- block_parent = 'parent',- block_children = 'children',- block_external_id = 'external_id',- block_external_type = 'external_type',-}--export enum YjsFolderKey {- views = 'views',- relation = 'relation',- section = 'section',- private = 'private',- favorite = 'favorite',- recent = 'recent',- trash = 'trash',- meta = 'meta',- current_view = 'current_view',- current_workspace = 'current_workspace',- id = 'id',- name = 'name',- icon = 'icon',- extra = 'extra',- cover = 'cover',- line_height_layout = 'line_height_layout',- font_layout = 'font_layout',- type = 'ty',- value = 'value',- layout = 'layout',- bid = 'bid',-}--export enum YjsDatabaseKey {- views = 'views',- id = 'id',- metas = 'metas',- fields = 'fields',- is_primary = 'is_primary',- last_modified = 'last_modified',- created_at = 'created_at',- name = 'name',- type = 'ty',- type_option = 'type_option',- content = 'content',- data = 'data',- iid = 'iid',- database_id = 'database_id',- field_orders = 'field_orders',- field_settings = 'field_settings',- visibility = 'visibility',- wrap = 'wrap',- width = 'width',- filters = 'filters',- groups = 'groups',- layout = 'layout',- layout_settings = 'layout_settings',- modified_at = 'modified_at',- row_orders = 'row_orders',- sorts = 'sorts',- height = 'height',- cells = 'cells',- field_type = 'field_type',- end_timestamp = 'end_timestamp',- include_time = 'include_time',- is_range = 'is_range',- reminder_id = 'reminder_id',- time_format = 'time_format',- date_format = 'date_format',- calculations = 'calculations',- field_id = 'field_id',- calculation_value = 'calculation_value',- condition = 'condition',- format = 'format',- filter_type = 'filter_type',- visible = 'visible',- hide_ungrouped_column = 'hide_ungrouped_column',- collapse_hidden_groups = 'collapse_hidden_groups',- first_day_of_week = 'first_day_of_week',- show_week_numbers = 'show_week_numbers',- show_weekends = 'show_weekends',- layout_ty = 'layout_ty',-}--export interface YDoc extends Y.Doc {- // eslint-disable-next-line @typescript-eslint/no-explicit-any- getMap (key: YjsEditorKey.data_section): YSharedRoot | any;-}--export interface YDatabaseRow extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): RowId;-- get (key: YjsDatabaseKey.height): string;-- get (key: YjsDatabaseKey.visibility): boolean;-- get (key: YjsDatabaseKey.created_at): CreatedAt;-- get (key: YjsDatabaseKey.last_modified): LastModified;-- get (key: YjsDatabaseKey.cells): YDatabaseCells;-}--export interface YDatabaseCells extends Y.Map<unknown> {- get (key: FieldId): YDatabaseCell;-}--export type EndTimestamp = string;-export type ReminderId = string;--export interface YDatabaseCell extends Y.Map<unknown> {- get (key: YjsDatabaseKey.created_at): CreatedAt;-- get (key: YjsDatabaseKey.last_modified): LastModified;-- get (key: YjsDatabaseKey.field_type): string;-- get (key: YjsDatabaseKey.data): object | string | boolean | number;-- get (key: YjsDatabaseKey.end_timestamp): EndTimestamp;-- get (key: YjsDatabaseKey.include_time): boolean;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.is_range): boolean;-- get (key: YjsDatabaseKey.reminder_id): ReminderId;-}--export interface YSharedRoot extends Y.Map<unknown> {- get (key: YjsEditorKey.document): YDocument;-- get (key: YjsEditorKey.folder): YFolder;-- get (key: YjsEditorKey.database): YDatabase;-- get (key: YjsEditorKey.database_row): YDatabaseRow;-}--export interface YFolder extends Y.Map<unknown> {- get (key: YjsFolderKey.views): YViews;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.meta): YFolderMeta;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.relation): YFolderRelation;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.section): YFolderSection;-}--export interface YViews extends Y.Map<unknown> {- get (key: ViewId): YView;-}--export interface YView extends Y.Map<unknown> {- get (key: YjsFolderKey.id): ViewId;-- get (key: YjsFolderKey.bid): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.name): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.icon | YjsFolderKey.extra): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsFolderKey.layout): string;-}--export interface YFolderRelation extends Y.Map<unknown> {- get (key: ViewId): Y.Array<ViewId>;-}--export interface YFolderMeta extends Y.Map<unknown> {- get (key: YjsFolderKey.current_view | YjsFolderKey.current_workspace): string;-}--export interface YFolderSection extends Y.Map<unknown> {- get (key: YjsFolderKey.favorite | YjsFolderKey.private | YjsFolderKey.recent | YjsFolderKey.trash): YFolderSectionItem;-}--export interface YFolderSectionItem extends Y.Map<unknown> {- get (key: string): Y.Array<unknown>;-}--export interface YDocument extends Y.Map<unknown> {- get (key: YjsEditorKey.blocks | YjsEditorKey.page_id | YjsEditorKey.meta): YBlocks | YMeta | string;-}--export interface YBlocks extends Y.Map<unknown> {- get (key: BlockId): YBlock;-}--export interface YBlock extends Y.Map<unknown> {- get (key: YjsEditorKey.block_id | YjsEditorKey.block_parent): BlockId;-- get (key: YjsEditorKey.block_type): BlockType;-- get (key: YjsEditorKey.block_data): string;-- get (key: YjsEditorKey.block_children): ChildrenId;-- get (key: YjsEditorKey.block_external_id): ExternalId;-}--export interface YMeta extends Y.Map<unknown> {- get (key: YjsEditorKey.children_map | YjsEditorKey.text_map): YChildrenMap | YTextMap;-}--export interface YChildrenMap extends Y.Map<unknown> {- get (key: ChildrenId): Y.Array<BlockId>;-}--export interface YTextMap extends Y.Map<unknown> {- get (key: ExternalId): Y.Text;-}--export interface YDatabase extends Y.Map<unknown> {- get (key: YjsDatabaseKey.views): YDatabaseViews;-- get (key: YjsDatabaseKey.metas): YDatabaseMetas;-- get (key: YjsDatabaseKey.fields): YDatabaseFields;-- get (key: YjsDatabaseKey.id): string;-}--export interface YDatabaseViews extends Y.Map<YDatabaseView> {- get (key: ViewId): YDatabaseView;-}--export type DatabaseId = string;-export type CreatedAt = string;-export type LastModified = string;-export type ModifiedAt = string;-export type FieldId = string;--export enum DatabaseViewLayout {- Grid = 0,- Board = 1,- Calendar = 2,-}--export interface YDatabaseView extends Y.Map<unknown> {- get (key: YjsDatabaseKey.database_id): DatabaseId;-- get (key: YjsDatabaseKey.name): string;-- get (key: YjsDatabaseKey.created_at): CreatedAt;-- get (key: YjsDatabaseKey.modified_at): ModifiedAt;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.layout): string;-- get (key: YjsDatabaseKey.layout_settings): YDatabaseLayoutSettings;-- get (key: YjsDatabaseKey.filters): YDatabaseFilters;-- get (key: YjsDatabaseKey.groups): YDatabaseGroups;-- get (key: YjsDatabaseKey.sorts): YDatabaseSorts;-- get (key: YjsDatabaseKey.field_settings): YDatabaseFieldSettings;-- get (key: YjsDatabaseKey.field_orders): YDatabaseFieldOrders;-- get (key: YjsDatabaseKey.row_orders): YDatabaseRowOrders;-- get (key: YjsDatabaseKey.calculations): YDatabaseCalculations;-}--export type YDatabaseFieldOrders = Y.Array<unknown>; // [ { id: FieldId } ]--export type YDatabaseRowOrders = Y.Array<YDatabaseRowOrder>; // [ { id: RowId, height: number } ]--export type YDatabaseGroups = Y.Array<YDatabaseGroup>;--export type YDatabaseFilters = Y.Array<YDatabaseFilter>;--export type YDatabaseSorts = Y.Array<YDatabaseSort>;--export type YDatabaseCalculations = Y.Array<YDatabaseCalculation>;--export type SortId = string;--export type GroupId = string;--export interface YDatabaseLayoutSettings extends Y.Map<unknown> {- // DatabaseViewLayout.Board- get (key: '1'): YDatabaseBoardLayoutSetting;-- // DatabaseViewLayout.Calendar- get (key: '2'): YDatabaseCalendarLayoutSetting;-}--export interface YDatabaseBoardLayoutSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.hide_ungrouped_column | YjsDatabaseKey.collapse_hidden_groups): boolean;-}--export interface YDatabaseCalendarLayoutSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.first_day_of_week | YjsDatabaseKey.field_id | YjsDatabaseKey.layout_ty): string;-- get (key: YjsDatabaseKey.show_week_numbers | YjsDatabaseKey.show_weekends): boolean;-}--export interface YDatabaseGroup extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): GroupId;-- get (key: YjsDatabaseKey.field_id): FieldId;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.content): string;-- get (key: YjsDatabaseKey.groups): YDatabaseGroupColumns;-}--export type YDatabaseGroupColumns = Y.Array<YDatabaseGroupColumn>;--export interface YDatabaseGroupColumn extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): string;-- get (key: YjsDatabaseKey.visible): boolean;-}--export interface YDatabaseRowOrder extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): SortId;-- get (key: YjsDatabaseKey.height): number;-}--export interface YDatabaseSort extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): SortId;-- get (key: YjsDatabaseKey.field_id): FieldId;-- get (key: YjsDatabaseKey.condition): string;-}--export type FilterId = string;--export interface YDatabaseFilter extends Y.Map<unknown> {- get (key: YjsDatabaseKey.id): FilterId;-- get (key: YjsDatabaseKey.field_id): FieldId;-- get (key: YjsDatabaseKey.type | YjsDatabaseKey.condition | YjsDatabaseKey.content | YjsDatabaseKey.filter_type): string;-}--export interface YDatabaseCalculation extends Y.Map<unknown> {- get (key: YjsDatabaseKey.field_id): FieldId;-- get (key: YjsDatabaseKey.id | YjsDatabaseKey.type | YjsDatabaseKey.calculation_value): string;-}--export interface YDatabaseFieldSettings extends Y.Map<unknown> {- get (key: FieldId): YDatabaseFieldSetting;-}--export interface YDatabaseFieldSetting extends Y.Map<unknown> {- get (key: YjsDatabaseKey.visibility): string;-- get (key: YjsDatabaseKey.wrap): boolean;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.width): string;-}--export interface YDatabaseMetas extends Y.Map<unknown> {- get (key: YjsDatabaseKey.iid): string;-}--export interface YDatabaseFields extends Y.Map<YDatabaseField> {- get (key: FieldId): YDatabaseField;-}--export interface YDatabaseField extends Y.Map<unknown> {- get (key: YjsDatabaseKey.name): string;-- get (key: YjsDatabaseKey.id): FieldId;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.type): string;-- get (key: YjsDatabaseKey.type_option): YDatabaseFieldTypeOption;-- get (key: YjsDatabaseKey.is_primary): boolean;-- get (key: YjsDatabaseKey.last_modified): LastModified;-}--export interface YDatabaseFieldTypeOption extends Y.Map<unknown> {- // key is the field type- get (key: string): YMapFieldTypeOption;-}--export interface YMapFieldTypeOption extends Y.Map<unknown> {- get (key: YjsDatabaseKey.content): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.data): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.time_format): string;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.date_format): string;-- get (key: YjsDatabaseKey.database_id): DatabaseId;-- // eslint-disable-next-line @typescript-eslint/unified-signatures- get (key: YjsDatabaseKey.format): string;-}--export enum CollabType {- Document = 0,- Database = 1,- WorkspaceDatabase = 2,- Folder = 3,- DatabaseRow = 4,- UserAwareness = 5,- Empty = 6,-}--export enum CollabOrigin {- // from local changes and never sync to remote. used for read-only mode- Local = 'local',- // from remote changes and never sync to remote.- Remote = 'remote',- // from local changes and sync to remote. used for collaborative mode- LocalSync = 'local_sync',-}--export const layoutMap = {- [ViewLayout.Document]: 'document',- [ViewLayout.Grid]: 'grid',- [ViewLayout.Board]: 'board',- [ViewLayout.Calendar]: 'calendar',-};--export const databaseLayoutMap = {- [DatabaseViewLayout.Grid]: 'grid',- [DatabaseViewLayout.Board]: 'board',- [DatabaseViewLayout.Calendar]: 'calendar',-};--export enum FontLayout {- small = 'small',- normal = 'normal',- large = 'large',-}--export enum LineHeightLayout {- small = 'small',- normal = 'normal',- large = 'large',-}--export interface ViewMetaIcon {- ty: number;- value: string;-}--export interface PublishViewInfo {- view_id: string;- name: string;- icon: ViewMetaIcon | null;- extra: string | null;- layout: number;- created_at: string;- created_by: string;- last_edited_time: string;- last_edited_by: string;- child_views: PublishViewInfo[] | null;-}--export interface PublishViewMetaData {- view: PublishViewInfo;- child_views: PublishViewInfo[];- ancestor_views: PublishViewInfo[];-}--export type GetViewRowsMap = (viewId: string) => Promise<{ rows: Y.Map<YDoc>; destroy: () => void }>;--export type LoadView = (viewId: string) => Promise<YDoc>;--export type LoadViewMeta = (viewId: string, onChange?: (meta: ViewMeta) => void) => Promise<ViewMeta>;diff --git a/frontend/appflowy_web_app/src/application/constants.ts b/frontend/appflowy_web_app/src/application/constants.tsindex 36e31606ff..5880ff6326 100644--- a/frontend/appflowy_web_app/src/application/constants.ts+++ b/frontend/appflowy_web_app/src/application/constants.ts@@ -1,2 +1,3 @@export const databasePrefix = 'af_database';+export const HEADER_HEIGHT = 48;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/filter.test.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/filter.test.tsindex 979105a982..b07dc9beac 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/filter.test.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/filter.test.ts@@ -18,6 +18,7 @@ import {withUrlFilter,} from '@/application/database-yjs/__tests__/withTestingFilters';import { withTestingRows } from '@/application/database-yjs/__tests__/withTestingRows';+import { RowId, YDoc } from '@/application/types';import {textFilterCheck,numberFilterCheck,@@ -543,7 +544,7 @@ describe('Database filterBy', () => {it('should return all rows for empty rowMap', () => {const { filters, fields } = withTestingData();- const rowMap = new Y.Map() as Y.Map<Y.Doc>;+ const rowMap: Record<RowId, YDoc> = {};const result = filterBy(rows, filters, fields, rowMap).map((row) => row.id).join(',');diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/group.test.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/group.test.tsindex ab8a32beaa..a38ed139d6 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/group.test.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/group.test.ts@@ -10,7 +10,7 @@ import {YjsDatabaseKey,YjsEditorKey,YMapFieldTypeOption,-} from '@/application/collab.type';+} from '@/application/types';import { YjsEditor } from '@/application/slate-yjs';describe('Database group', () => {@@ -156,8 +156,7 @@ describe('Database group', () => {it('should handle empty selected ids', () => {const { fields, rowMap } = withTestingData();- const cell = rowMap- .get('1')+ const cell = rowMap['1']?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database_row)?.get(YjsDatabaseKey.cells)@@ -193,7 +192,7 @@ describe('Database group', () => {{ id: '10', height: 37 },],],- ])+ ]),);});});diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/parse.test.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/parse.test.tsindex 190a4846a1..23cc302a69 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/parse.test.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/parse.test.ts@@ -8,7 +8,7 @@ import {parseRelationTypeOption,parseNumberTypeOptions,} from '@/application/database-yjs';-import { YDatabaseField, YDatabaseFieldTypeOption, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseField, YDatabaseFieldTypeOption, YjsDatabaseKey } from '@/application/types';import { withNumberTestingField, withRelationTestingField } from '@/application/database-yjs/__tests__/withTestingField';describe('parseYDatabaseCellToCell', () => {diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/selector.test.tsx b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/selector.test.tsxindex abfdce9c91..c4c669079e 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/selector.test.tsx+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/selector.test.tsx@@ -1,6 +1,5 @@import { renderHook } from '@testing-library/react';import {- useCalendarEventsSelector,useCellSelector,useFieldSelector,useFieldsSelector,@@ -10,7 +9,6 @@ import {useGroupsSelector,usePrimaryFieldId,useRowDataSelector,- useRowDocMapSelector,useRowMetaSelector,useRowOrdersSelector,useRowsByGroup,@@ -21,24 +19,26 @@ import { useDatabaseViewId } from '../context';import { DatabaseContextProvider } from '@/components/database/DatabaseContext';import { withTestingDatabase } from '@/application/database-yjs/__tests__/withTestingData';import { expect } from '@jest/globals';-import { YDoc, YjsDatabaseKey, YjsEditorKey, YSharedRoot } from '@/application/collab.type';+import { YDoc, YjsDatabaseKey, YjsEditorKey, YSharedRoot } from '@/application/types';import * as Y from 'yjs';import { withNumberTestingField, withTestingFields } from '@/application/database-yjs/__tests__/withTestingField';import { withTestingRows } from '@/application/database-yjs/__tests__/withTestingRows';const wrapperCreator =- (viewId: string, doc: YDoc, rowDocMap: Y.Map<YDoc>) =>- ({ children }: { children: React.ReactNode }) => {- return (- <DatabaseContextProvider iidIndex={viewId} viewId={viewId} databaseDoc={doc} rowDocMap={rowDocMap} readOnly={true}>- {children}- </DatabaseContextProvider>- );- };+ (viewId: string, doc: YDoc, rowDocMap: Record<string, YDoc>) =>+ ({ children }: { children: React.ReactNode }) => {+ return (+ <DatabaseContextProvider+ iidIndex={viewId} viewId={viewId} databaseDoc={doc} rowDocMap={rowDocMap} readOnly={true}+ >+ {children}+ </DatabaseContextProvider>+ );+ };describe('Database selector', () => {let wrapper: ({ children }: { children: React.ReactNode }) => JSX.Element;- let rowDocMap: Y.Map<YDoc>;+ let rowDocMap: Record<string, YDoc>;let doc: YDoc;beforeEach(() => {@@ -168,7 +168,7 @@ describe('Database selector', () => {{ id: '6', height: 37 },],],- ])+ ]),);});@@ -178,18 +178,12 @@ describe('Database selector', () => {expect(result.current?.map((item) => item.id).join(',')).toEqual('9,2,3,1,6,8,5,7');});- it('should select all row doc map', () => {- const { result } = renderHook(() => useRowDocMapSelector(), { wrapper });-- expect(result.current.rows).toEqual(rowDocMap);- });-it('should select a row data', () => {const rows = withTestingRows();const { result } = renderHook(() => useRowDataSelector(rows[0].id), { wrapper });- expect(result.current.row.toJSON()).toEqual(- rowDocMap.get(rows[0].id)?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database_row)?.toJSON()+ expect(result.current.row?.toJSON()).toEqual(+ rowDocMap[rows[0].id]?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database_row)?.toJSON(),);});@@ -201,7 +195,7 @@ describe('Database selector', () => {rowId: rows[0].id,fieldId: 'number_field',}),- { wrapper }+ { wrapper },);expect(result.current).toEqual({@@ -225,13 +219,6 @@ describe('Database selector', () => {expect(result.current?.documentId).not.toBeNull();});- it('should select all calendar events', () => {- const { result } = renderHook(() => useCalendarEventsSelector(), { wrapper });-- expect(result.current.events.length).toEqual(8);- expect(result.current.emptyEvents.length).toEqual(0);- });-it('should select view id', () => {const { result } = renderHook(() => useDatabaseViewId(), { wrapper });diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/sort.test.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/sort.test.tsindex e790b05fdd..ce41777e26 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/sort.test.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/sort.test.ts@@ -26,7 +26,7 @@ import {import { sortBy, parseCellDataForSort } from '../sort';import * as Y from 'yjs';import { expect } from '@jest/globals';-import { YjsDatabaseKey, YjsEditorKey } from '@/application/collab.type';+import { RowId, YDoc, YjsDatabaseKey, YjsEditorKey } from '@/application/types';describe('parseCellDataForSort', () => {it('should parse data correctly based on field type', () => {@@ -162,7 +162,7 @@ describe('Database sortBy', () => {it('should not sort rows if no rows are provided', () => {const { sorts, fields } = withTestingData();- const rowMap = new Y.Map() as Y.Map<Y.Doc>;+ const rowMap: Record<RowId, YDoc> = {};const sortedRows = sortBy(rows, sorts, fields, rowMap).map((row) => row.id).join(',');@@ -173,7 +173,7 @@ describe('Database sortBy', () => {const { sorts, fields, rowMap } = withTestingData();const sort = withNumberSort();sorts.push([sort]);- rowMap.delete('1');+ delete rowMap['1'];const sortedRows = sortBy(rows, sorts, fields, rowMap).map((row) => row.id)@@ -185,7 +185,7 @@ describe('Database sortBy', () => {const { sorts, fields, rowMap } = withTestingData();const sort = withNumberSort();sorts.push([sort]);- const rowDoc = rowMap.get('1');+ const rowDoc = rowMap['1'];rowDoc?.getMap(YjsEditorKey.data_section).get(YjsEditorKey.database_row)diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingCell.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingCell.tsindex 4021903b36..de0f7d68e3 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingCell.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingCell.ts@@ -1,5 +1,5 @@import * as Y from 'yjs';-import { YDatabaseCell, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseCell, YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs';export function withTestingDateCell() {diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingData.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingData.tsindex 5c54bb658e..282590eb35 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingData.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingData.ts@@ -1,4 +1,5 @@import {+ RowId,YDatabase,YDatabaseFields,YDatabaseFilters,@@ -12,7 +13,7 @@ import {YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { withTestingFields } from '@/application/database-yjs/__tests__/withTestingField';import {withTestingRowData,@@ -24,7 +25,7 @@ import { withMultiSelectOptionFilter } from '@/application/database-yjs/__tests_import { withRichTextSort } from '@/application/database-yjs/__tests__/withTestingSorts';import { metaIdFromRowId, RowMetaKey } from '@/application/database-yjs';-export function withTestingData() {+export function withTestingData () {const doc = new Y.Doc();const sharedRoot = doc.getMap();const fields = withTestingFields() as YDatabaseFields;@@ -52,7 +53,7 @@ export function withTestingData() {};}-export function withTestingDatabase(viewId: string) {+export function withTestingDatabase (viewId: string) {const doc = new Y.Doc();const sharedRoot = doc.getMap(YjsEditorKey.data_section);const database = new Y.Map() as YDatabase;@@ -159,9 +160,7 @@ export function withTestingDatabase(viewId: string) {view.set(YjsDatabaseKey.field_orders, fieldOrder);view.set(YjsDatabaseKey.row_orders, rowOrders);- const rowMapDoc = new Y.Doc();-- const rowMapFolder = rowMapDoc.getMap();+ const rowMap: Record<RowId, YDoc> = {};rows.forEach((row, index) => {const rowDoc = new Y.Doc();@@ -172,11 +171,11 @@ export function withTestingDatabase(viewId: string) {rowMeta.set(parser(RowMetaKey.IconId), '😊');rowDoc.getMap(YjsEditorKey.data_section).set(YjsEditorKey.meta, rowMeta);rowDoc.getMap(YjsEditorKey.data_section).set(YjsEditorKey.database_row, rowData);- rowMapFolder.set(row.id, rowDoc);+ rowMap[row.id] = rowDoc;});return {- rowDocMap: rowMapFolder as Y.Map<YDoc>,+ rowDocMap: rowMap,doc: doc as YDoc,};}diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingField.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingField.tsindex 869acfe55e..e9329f341d 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingField.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingField.ts@@ -3,7 +3,7 @@ import {YDatabaseFieldTypeOption,YjsDatabaseKey,YMapFieldTypeOption,-} from '@/application/collab.type';+} from '@/application/types';import { FieldType } from '@/application/database-yjs';import { SelectOptionColor } from '@/application/database-yjs/fields/select-option';import * as Y from 'yjs';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingFilters.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingFilters.tsindex 540c298abf..57a64402f8 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingFilters.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingFilters.ts@@ -1,4 +1,4 @@-import { YDatabaseFilter, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseFilter, YjsDatabaseKey } from '@/application/types';import * as Y from 'yjs';import * as filtersJson from './fixtures/filters.json';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingRows.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingRows.tsindex 3ed75b409c..bffaccf28a 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingRows.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingRows.ts@@ -1,16 +1,17 @@import {+ RowId,YDatabaseCell,YDatabaseCells,YDatabaseRow,YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { FieldType, Row } from '@/application/database-yjs';import * as Y from 'yjs';import * as rowsJson from './fixtures/rows.json';-export function withTestingRows(): Row[] {+export function withTestingRows (): Row[] {return rowsJson.map((row) => {return {id: row.id,@@ -19,8 +20,8 @@ export function withTestingRows(): Row[] {});}-export function withTestingRowDataMap(): Y.Map<YDoc> {- const folder = new Y.Map();+export function withTestingRowDataMap (): Record<RowId, YDoc> {+ const folder: Record<RowId, YDoc> = {};const rows = withTestingRows();rows.forEach((row, index) => {@@ -28,13 +29,13 @@ export function withTestingRowDataMap(): Y.Map<YDoc> {const rowData = withTestingRowData(row.id, index);rowDoc.getMap(YjsEditorKey.data_section).set(YjsEditorKey.database_row, rowData);- folder.set(row.id, rowDoc);+ folder[row.id] = rowDoc;});- return folder as Y.Map<YDoc>;+ return folder;}-export function withTestingRowData(id: string, index: number) {+export function withTestingRowData (id: string, index: number) {const rowData = new Y.Map() as YDatabaseRow;rowData.set(YjsDatabaseKey.id, id);@@ -88,7 +89,7 @@ export function withTestingRowData(id: string, index: number) {return rowData;}-export function withTestingCell(cellData: string | number) {+export function withTestingCell (cellData: string | number) {const cell = new Y.Map() as YDatabaseCell;cell.set(YjsDatabaseKey.data, cellData);diff --git a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingSorts.ts b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingSorts.tsindex d97c6f4f71..d9421d5e7c 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingSorts.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/__tests__/withTestingSorts.ts@@ -1,4 +1,4 @@-import { YDatabaseSort, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseSort, YjsDatabaseKey } from '@/application/types';import * as Y from 'yjs';import * as sortsJson from './fixtures/sorts.json';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/cell.parse.ts b/frontend/appflowy_web_app/src/application/database-yjs/cell.parse.tsindex ab42f360e1..97bc5ca10d 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/cell.parse.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/cell.parse.ts@@ -1,4 +1,4 @@-import { YDatabaseCell, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseCell, YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs/database.type';import { YArray } from 'yjs/dist/src/types/YArray';import { Cell, CheckboxCell, DateTimeCell, FileMediaCell, FileMediaCellData } from './cell.type';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/cell.type.ts b/frontend/appflowy_web_app/src/application/database-yjs/cell.type.tsindex 41249cba7a..67b991dc03 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/cell.type.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/cell.type.ts@@ -1,4 +1,4 @@-import { FieldId, RowId } from '@/application/collab.type';+import { FieldId, RowId } from '@/application/types';import { DateFormat, TimeFormat } from '@/application/database-yjs/index';import { FieldType } from '@/application/database-yjs/database.type';import React from 'react';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/const.ts b/frontend/appflowy_web_app/src/application/database-yjs/const.tsindex 632642831e..12deaaa218 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/const.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/const.ts@@ -1,20 +1,19 @@-import { YDatabaseRow, YDoc, YjsDatabaseKey, YjsEditorKey } from '@/application/collab.type';+import { RowId, YDatabaseRow, YDoc, YjsDatabaseKey, YjsEditorKey } from '@/application/types';import { RowMetaKey } from '@/application/database-yjs/database.type';-import * as Y from 'yjs';import { v5 as uuidv5, parse as uuidParse } from 'uuid';export const DEFAULT_ROW_HEIGHT = 36;export const MIN_COLUMN_WIDTH = 150;-export const getCell = (rowId: string, fieldId: string, rowMetas: Y.Map<YDoc>) => {- const rowMeta = rowMetas.get(rowId);+export const getCell = (rowId: string, fieldId: string, rowMetas: Record<RowId, YDoc>) => {+ const rowMeta = rowMetas[rowId];const meta = rowMeta?.getMap(YjsEditorKey.data_section).get(YjsEditorKey.database_row) as YDatabaseRow;return meta?.get(YjsDatabaseKey.cells)?.get(fieldId);};-export const getCellData = (rowId: string, fieldId: string, rowMetas: Y.Map<YDoc>) => {+export const getCellData = (rowId: string, fieldId: string, rowMetas: Record<RowId, YDoc>) => {return getCell(rowId, fieldId, rowMetas)?.get(YjsDatabaseKey.data);};diff --git a/frontend/appflowy_web_app/src/application/database-yjs/context.ts b/frontend/appflowy_web_app/src/application/database-yjs/context.tsindex c74a718bd2..a5c873c92d 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/context.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/context.ts@@ -1,26 +1,25 @@import {- GetViewRowsMap,+ CreateRowDoc,LoadView,- LoadViewMeta,+ LoadViewMeta, RowId,YDatabase,YDatabaseRow,YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { createContext, useContext } from 'react';-import * as Y from 'yjs';export interface DatabaseContextState {readOnly: boolean;databaseDoc: YDoc;iidIndex: string;viewId: string;- rowDocMap: Y.Map<YDoc>;+ rowDocMap: Record<RowId, YDoc> | null;isDatabaseRowPage?: boolean;navigateToRow?: (rowId: string) => void;loadView?: LoadView;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;loadViewMeta?: LoadViewMeta;navigateToView?: (viewId: string) => Promise<void>;}@@ -35,7 +34,7 @@ export const useDatabase = () => {return database;};-export function useDatabaseViewId() {+export function useDatabaseViewId () {return useContext(DatabaseContext)?.viewId;}@@ -54,7 +53,7 @@ export const useIsDatabaseRowPage = () => {export const useRow = (rowId: string) => {const rows = useRowDocMap();- return rows?.get(rowId)?.getMap(YjsEditorKey.data_section);+ return rows?.[rowId]?.getMap(YjsEditorKey.data_section);};export const useRowData = (rowId: string) => {@@ -80,7 +79,7 @@ export const useDatabaseView = () => {return viewId ? database?.get(YjsDatabaseKey.views)?.get(viewId) : undefined;};-export function useDatabaseFields() {+export function useDatabaseFields () {const database = useDatabase();return database.get(YjsDatabaseKey.fields);diff --git a/frontend/appflowy_web_app/src/application/database-yjs/database.type.ts b/frontend/appflowy_web_app/src/application/database-yjs/database.type.tsindex 97da184fc5..c73ceb7bef 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/database.type.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/database.type.ts@@ -1,4 +1,4 @@-import { FieldId } from '@/application/collab.type';+import { FieldId } from '@/application/types';export enum FieldVisibility {AlwaysShown = 0,diff --git a/frontend/appflowy_web_app/src/application/database-yjs/fields/number/parse.ts b/frontend/appflowy_web_app/src/application/database-yjs/fields/number/parse.tsindex 9abac198b4..d96ea87962 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/fields/number/parse.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/fields/number/parse.ts@@ -1,4 +1,4 @@-import { YDatabaseField } from '@/application/collab.type';+import { YDatabaseField } from '@/application/types';import { getTypeOptions } from '../type_option';import { NumberFormat } from './number.type';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/fields/relation/parse.ts b/frontend/appflowy_web_app/src/application/database-yjs/fields/relation/parse.tsindex c5820576cd..42bbfe42e2 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/fields/relation/parse.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/fields/relation/parse.ts@@ -1,4 +1,4 @@-import { YDatabaseField } from '@/application/collab.type';+import { YDatabaseField } from '@/application/types';import { RelationTypeOption } from './relation.type';import { getTypeOptions } from '../type_option';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/fields/select-option/parse.ts b/frontend/appflowy_web_app/src/application/database-yjs/fields/select-option/parse.tsindex 7840278a34..83446338d2 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/fields/select-option/parse.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/fields/select-option/parse.ts@@ -1,4 +1,4 @@-import { YDatabaseField, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseField, YjsDatabaseKey } from '@/application/types';import { getTypeOptions } from '../type_option';import { SelectTypeOption } from './select_option.type';diff --git a/frontend/appflowy_web_app/src/application/database-yjs/fields/type_option.ts b/frontend/appflowy_web_app/src/application/database-yjs/fields/type_option.tsindex bf9c80706f..11da994873 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/fields/type_option.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/fields/type_option.ts@@ -1,4 +1,4 @@-import { YDatabaseField, YjsDatabaseKey } from '@/application/collab.type';+import { YDatabaseField, YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs';export function getTypeOptions(field: YDatabaseField) {diff --git a/frontend/appflowy_web_app/src/application/database-yjs/filter.ts b/frontend/appflowy_web_app/src/application/database-yjs/filter.tsindex 0bf25e4ca8..e3cb188cda 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/filter.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/filter.ts@@ -1,4 +1,5 @@import {+ RowId,YDatabaseFields,YDatabaseFilter,YDatabaseFilters,@@ -6,7 +7,7 @@ import {YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { FieldType } from '@/application/database-yjs/database.type';import {CheckboxFilter,@@ -24,10 +25,9 @@ import {} from '@/application/database-yjs/fields';import { Row } from '@/application/database-yjs/selector';import Decimal from 'decimal.js';-import * as Y from 'yjs';import { every, filter, some } from 'lodash-es';-export function parseFilter(fieldType: FieldType, filter: YDatabaseFilter) {+export function parseFilter (fieldType: FieldType, filter: YDatabaseFilter) {const fieldId = filter.get(YjsDatabaseKey.field_id);const filterType = Number(filter.get(YjsDatabaseKey.filter_type));const id = filter.get(YjsDatabaseKey.id);@@ -70,16 +70,16 @@ export function parseFilter(fieldType: FieldType, filter: YDatabaseFilter) {return value;}-function createPredicate(conditions: ((row: Row) => boolean)[]) {+function createPredicate (conditions: ((row: Row) => boolean)[]) {return function (item: Row) {return every(conditions, (condition) => condition(item));};}-export function filterBy(rows: Row[], filters: YDatabaseFilters, fields: YDatabaseFields, rowMetas: Y.Map<YDoc>) {+export function filterBy (rows: Row[], filters: YDatabaseFilters, fields: YDatabaseFields, rowMetas: Record<RowId, YDoc>) {const filterArray = filters.toArray();- if (filterArray.length === 0 || rowMetas.size === 0 || fields.size === 0) return rows;+ if (filterArray.length === 0 || Object.keys(rowMetas).length === 0 || fields.size === 0) return rows;const conditions = filterArray.map((filter) => {return (row: { id: string }) => {@@ -87,7 +87,7 @@ export function filterBy(rows: Row[], filters: YDatabaseFilters, fields: YDatabaconst field = fields.get(fieldId);const fieldType = Number(field.get(YjsDatabaseKey.type));const rowId = row.id;- const rowMeta = rowMetas.get(rowId);+ const rowMeta = rowMetas[rowId];if (!rowMeta) return false;const filterValue = parseFilter(fieldType, filter);@@ -124,7 +124,7 @@ export function filterBy(rows: Row[], filters: YDatabaseFilters, fields: YDatabareturn filter(rows, predicate);}-export function textFilterCheck(data: string, content: string, condition: TextFilterCondition) {+export function textFilterCheck (data: string, content: string, condition: TextFilterCondition) {switch (condition) {case TextFilterCondition.TextContains:return data.includes(content);@@ -143,7 +143,7 @@ export function textFilterCheck(data: string, content: string, condition: TextFi}}-export function numberFilterCheck(data: string, content: string, condition: number) {+export function numberFilterCheck (data: string, content: string, condition: number) {if (isNaN(Number(data)) || isNaN(Number(content)) || data === '' || content === '') {if (condition === NumberFilterCondition.NumberIsEmpty) {return data === '';@@ -177,7 +177,7 @@ export function numberFilterCheck(data: string, content: string, condition: numb}}-export function checkboxFilterCheck(data: string, condition: number) {+export function checkboxFilterCheck (data: string, condition: number) {switch (condition) {case CheckboxFilterCondition.IsChecked:return data === 'Yes';@@ -188,7 +188,7 @@ export function checkboxFilterCheck(data: string, condition: number) {}}-export function checklistFilterCheck(data: string, content: string, condition: number) {+export function checklistFilterCheck (data: string, content: string, condition: number) {const percentage = parseChecklistData(data)?.percentage ?? 0;if (condition === ChecklistFilterCondition.IsComplete) {@@ -198,7 +198,7 @@ export function checklistFilterCheck(data: string, content: string, condition: nreturn percentage !== 1;}-export function selectOptionFilterCheck(data: string, content: string, condition: number) {+export function selectOptionFilterCheck (data: string, content: string, condition: number) {if (SelectOptionFilterCondition.OptionIsEmpty === condition) {return data === '';}diff --git a/frontend/appflowy_web_app/src/application/database-yjs/group.ts b/frontend/appflowy_web_app/src/application/database-yjs/group.tsindex 7cd66ac9c6..461748605e 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/group.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/group.ts@@ -1,11 +1,10 @@-import { YDatabaseField, YDoc, YjsDatabaseKey } from '@/application/collab.type';+import { RowId, YDatabaseField, YDoc, YjsDatabaseKey } from '@/application/types';import { getCellData } from '@/application/database-yjs/const';import { FieldType } from '@/application/database-yjs/database.type';import { parseSelectOptionTypeOptions } from '@/application/database-yjs/fields';import { Row } from '@/application/database-yjs/selector';-import * as Y from 'yjs';-export function groupByField(rows: Row[], rowMetas: Y.Map<YDoc>, field: YDatabaseField) {+export function groupByField (rows: Row[], rowMetas: Record<RowId, YDoc>, field: YDatabaseField) {const fieldType = Number(field.get(YjsDatabaseKey.type));const isSelectOptionField = [FieldType.SingleSelect, FieldType.MultiSelect].includes(fieldType);@@ -20,7 +19,7 @@ export function groupByField(rows: Row[], rowMetas: Y.Map<YDoc>, field: YDatabasreturn;}-export function groupByCheckbox(rows: Row[], rowMetas: Y.Map<YDoc>, field: YDatabaseField) {+export function groupByCheckbox (rows: Row[], rowMetas: Record<RowId, YDoc>, field: YDatabaseField) {const fieldId = field.get(YjsDatabaseKey.id);const result = new Map<string, Row[]>();@@ -36,7 +35,7 @@ export function groupByCheckbox(rows: Row[], rowMetas: Y.Map<YDoc>, field: YDatareturn result;}-export function groupBySelectOption(rows: Row[], rowMetas: Y.Map<YDoc>, field: YDatabaseField) {+export function groupBySelectOption (rows: Row[], rowMetas: Record<RowId, YDoc>, field: YDatabaseField) {const fieldId = field.get(YjsDatabaseKey.id);const result = new Map<string, Row[]>();const typeOption = parseSelectOptionTypeOptions(field);diff --git a/frontend/appflowy_web_app/src/application/database-yjs/selector.ts b/frontend/appflowy_web_app/src/application/database-yjs/selector.tsindex c83873b7af..05a034a22d 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/selector.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/selector.ts@@ -2,11 +2,10 @@ import {FieldId,SortId,YDatabase,- YDatabaseField,- YDoc,+ YDatabaseField, YDatabaseMetas, YDatabaseRow,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { getCell, metaIdFromRowId, MIN_COLUMN_WIDTH } from '@/application/database-yjs/const';import {useDatabase,@@ -20,10 +19,9 @@ import { groupByField } from '@/application/database-yjs/group';import { sortBy } from '@/application/database-yjs/sort';import { parseYDatabaseCellToCell } from '@/application/database-yjs/cell.parse';import { DateTimeCell } from '@/application/database-yjs/cell.type';-import * as dayjs from 'dayjs';+import dayjs from 'dayjs';import { debounce } from 'lodash-es';import { useCallback, useEffect, useMemo, useState } from 'react';-import Y from 'yjs';import { CalendarLayoutSetting, FieldType, FieldVisibility, Filter, RowMetaKey, SortCondition } from './database.type';export interface Column {@@ -40,7 +38,7 @@ export interface Row {const defaultVisible = [FieldVisibility.AlwaysShown, FieldVisibility.HideWhenEmpty];-export function useDatabaseViewsSelector(_iidIndex: string, visibleViewIds?: string[]) {+export function useDatabaseViewsSelector (_iidIndex: string, visibleViewIds?: string[]) {const database = useDatabase();const views = database?.get(YjsDatabaseKey.views);@@ -72,7 +70,7 @@ export function useDatabaseViewsSelector(_iidIndex: string, visibleViewIds?: str.map(([key]) => key).filter((id) => {return !visibleViewIds || visibleViewIds.includes(id);- })+ }),);};@@ -90,7 +88,7 @@ export function useDatabaseViewsSelector(_iidIndex: string, visibleViewIds?: str};}-export function useFieldsSelector(visibilitys: FieldVisibility[] = defaultVisible) {+export function useFieldsSelector (visibilitys: FieldVisibility[] = defaultVisible) {const viewId = useViewId();const database = useDatabase();const [columns, setColumns] = useState<Column[]>([]);@@ -114,7 +112,7 @@ export function useFieldsSelector(visibilitys: FieldVisibility[] = defaultVisiblfieldId,width: parseInt(setting?.get(YjsDatabaseKey.width)) || MIN_COLUMN_WIDTH,visibility: Number(- setting?.get(YjsDatabaseKey.visibility) || FieldVisibility.AlwaysShown+ setting?.get(YjsDatabaseKey.visibility) || FieldVisibility.AlwaysShown,) as FieldVisibility,wrap: setting?.get(YjsDatabaseKey.wrap) ?? true,};@@ -140,7 +138,7 @@ export function useFieldsSelector(visibilitys: FieldVisibility[] = defaultVisiblreturn columns;}-export function useFieldSelector(fieldId: string) {+export function useFieldSelector (fieldId: string) {const database = useDatabase();const [field, setField] = useState<YDatabaseField | null>(null);const [clock, setClock] = useState<number>(0);@@ -166,7 +164,7 @@ export function useFieldSelector(fieldId: string) {};}-export function useFiltersSelector() {+export function useFiltersSelector () {const database = useDatabase();const viewId = useViewId();const [filters, setFilters] = useState<string[]>([]);@@ -196,7 +194,7 @@ export function useFiltersSelector() {return filters;}-export function useFilterSelector(filterId: string) {+export function useFilterSelector (filterId: string) {const database = useDatabase();const viewId = useViewId();const fields = database?.get(YjsDatabaseKey.fields);@@ -229,7 +227,7 @@ export function useFilterSelector(filterId: string) {return filterValue;}-export function useSortsSelector() {+export function useSortsSelector () {const database = useDatabase();const viewId = useViewId();const [sorts, setSorts] = useState<string[]>([]);@@ -265,7 +263,7 @@ export interface Sort {id: SortId;}-export function useSortSelector(sortId: SortId) {+export function useSortSelector (sortId: SortId) {const database = useDatabase();const viewId = useViewId();const [sortValue, setSortValue] = useState<Sort | null>(null);@@ -298,7 +296,7 @@ export function useSortSelector(sortId: SortId) {return sortValue;}-export function useGroupsSelector() {+export function useGroupsSelector () {const database = useDatabase();const viewId = useViewId();const [groups, setGroups] = useState<string[]>([]);@@ -334,7 +332,7 @@ export interface GroupColumn {visible: boolean;}-export function useGroup(groupId: string) {+export function useGroup (groupId: string) {const database = useDatabase();const viewId = useViewId() as string;const view = database?.get(YjsDatabaseKey.views)?.get(viewId);@@ -376,7 +374,7 @@ export function useGroup(groupId: string) {};}-export function useRowsByGroup(groupId: string) {+export function useRowsByGroup (groupId: string) {const { columns, fieldId } = useGroup(groupId);const rows = useRowDocMap();const rowOrders = useRowOrdersSelector();@@ -432,8 +430,8 @@ export function useRowsByGroup(groupId: string) {};}-export function useRowOrdersSelector() {- const { rows, clock } = useRowDocMapSelector();+export function useRowOrdersSelector () {+ const rows = useRowDocMap();const [rowOrders, setRowOrders] = useState<Row[]>();const view = useDatabaseView();const sorts = view?.get(YjsDatabaseKey.sorts);@@ -468,7 +466,7 @@ export function useRowOrdersSelector() {useEffect(() => {onConditionsChange();- }, [onConditionsChange, clock]);+ }, [onConditionsChange]);useEffect(() => {const throttleChange = debounce(onConditionsChange, 200);@@ -489,58 +487,25 @@ export function useRowOrdersSelector() {return rowOrders;}-export function useRowDocMapSelector() {+export function useRowDataSelector (rowId: string) {const rowMap = useRowDocMap();- const [clock, setClock] = useState<number>(0);+ const [row, setRow] = useState<YDatabaseRow | null>(null);useEffect(() => {- if (!rowMap) return;- const observerEvent = () => setClock((prev) => prev + 1);-- rowMap.observeDeep(observerEvent);-- return () => {- rowMap.unobserveDeep(observerEvent);- };- }, [rowMap]);-- return {- rows: rowMap,- clock,- };-}--export function observeDeepRow(- rowId: string,- rowMap: Y.Map<YDoc>,- observerEvent: () => void,- key: YjsEditorKey.meta | YjsEditorKey.database_row = YjsEditorKey.database_row-) {- const rowSharedRoot = rowMap?.get(rowId)?.getMap(YjsEditorKey.data_section);- const row = rowSharedRoot?.get(key);-- rowSharedRoot?.observe(observerEvent);- row?.observeDeep(observerEvent);- return () => {- rowSharedRoot?.unobserve(observerEvent);- row?.unobserveDeep(observerEvent);- };-}--export function useRowDataSelector(rowId: string) {- const rowMap = useRowDocMap();+ const rowDoc = rowMap?.[rowId];- const rowDoc = rowMap?.get(rowId);-- const rowSharedRoot = rowDoc?.getMap(YjsEditorKey.data_section);- const row = rowSharedRoot?.get(YjsEditorKey.database_row);+ if (!rowDoc || !rowDoc.share.has(YjsEditorKey.data_section)) return;+ const rowSharedRoot = rowDoc?.getMap(YjsEditorKey.data_section);+ const row = rowSharedRoot?.get(YjsEditorKey.database_row);+ setRow(row);+ }, [rowId, rowMap]);return {row,};}-export function useCellSelector({ rowId, fieldId }: { rowId: string; fieldId: string }) {+export function useCellSelector ({ rowId, fieldId }: { rowId: string; fieldId: string }) {const { row } = useRowDataSelector(rowId);const cell = row?.get(YjsDatabaseKey.cells)?.get(fieldId);@@ -567,7 +532,7 @@ export interface CalendarEvent {id: string;}-export function useCalendarEventsSelector() {+export function useCalendarEventsSelector () {const setting = useCalendarLayoutSetting();const filedId = setting.fieldId;const { field } = useFieldSelector(filedId);@@ -623,7 +588,7 @@ export function useCalendarEventsSelector() {return { events, emptyEvents };}-export function useCalendarLayoutSetting() {+export function useCalendarLayoutSetting () {const view = useDatabaseView();const layoutSetting = view?.get(YjsDatabaseKey.layout_settings)?.get('2');const [setting, setSetting] = useState<CalendarLayoutSetting>({@@ -655,7 +620,7 @@ export function useCalendarLayoutSetting() {return setting;}-export function getPrimaryFieldId(database: YDatabase) {+export function getPrimaryFieldId (database: YDatabase) {const fields = database?.get(YjsDatabaseKey.fields);return Array.from(fields?.keys() || []).find((fieldId) => {@@ -663,7 +628,7 @@ export function getPrimaryFieldId(database: YDatabase) {});}-export function usePrimaryFieldId() {+export function usePrimaryFieldId () {const database = useDatabase();const [primaryFieldId, setPrimaryFieldId] = useState<string | null>(null);@@ -683,7 +648,7 @@ export interface RowMeta {const metaIdMapFromRowIdMap = new Map<string, Map<RowMetaKey, string>>();-function getMetaIdMap(rowId: string) {+function getMetaIdMap (rowId: string) {const hasMetaIdMap = metaIdMapFromRowIdMap.has(rowId);if (!hasMetaIdMap) {@@ -706,20 +671,34 @@ export const useRowMetaSelector = (rowId: string) => {const rowMap = useRowDocMap();const updateMeta = useCallback(() => {++ const row = rowMap?.[rowId];++ if (!row || !row.share.has(YjsEditorKey.data_section)) return;++ const rowSharedRoot = row.getMap(YjsEditorKey.data_section);++ const yMeta = rowSharedRoot?.get(YjsEditorKey.meta);++ if (!yMeta) return;+const metaKeyMap = getMetaIdMap(rowId);const iconKey = metaKeyMap.get(RowMetaKey.IconId) ?? '';const coverKey = metaKeyMap.get(RowMetaKey.CoverId) ?? '';const documentId = metaKeyMap.get(RowMetaKey.DocumentId) ?? '';const isEmptyDocumentKey = metaKeyMap.get(RowMetaKey.IsDocumentEmpty) ?? '';- const rowSharedRoot = rowMap?.get(rowId)?.getMap(YjsEditorKey.data_section);- const yMeta = rowSharedRoot?.get(YjsEditorKey.meta);-- if (!yMeta) return;const metaJson = yMeta.toJSON();const icon = metaJson[iconKey];- const cover = metaJson[coverKey];+ let cover = '';++ try {+ cover = metaJson[coverKey] ? JSON.parse(metaJson[coverKey])?.url : '';+ } catch (e) {+ // do nothing+ }+const isEmptyDocument = metaJson[isEmptyDocumentKey];setMeta({@@ -733,13 +712,17 @@ export const useRowMetaSelector = (rowId: string) => {useEffect(() => {if (!rowMap) return;updateMeta();- const observer = observeDeepRow(rowId, rowMap, updateMeta, YjsEditorKey.meta);+ const observerEvent = () => updateMeta();++ const rowDoc = rowMap[rowId];- rowMap.observe(updateMeta);+ if (!rowDoc || !rowDoc.share.has(YjsEditorKey.data_section)) return;+ const rowSharedRoot = rowDoc.getMap(YjsEditorKey.data_section);+ const meta = rowSharedRoot?.get(YjsEditorKey.meta) as YDatabaseMetas;+ meta?.observeDeep(observerEvent);return () => {- rowMap.unobserve(updateMeta);- observer();+ meta?.unobserveDeep(observerEvent);};}, [rowId, rowMap, updateMeta]);diff --git a/frontend/appflowy_web_app/src/application/database-yjs/sort.ts b/frontend/appflowy_web_app/src/application/database-yjs/sort.tsindex d572440c53..5e6e078d89 100644--- a/frontend/appflowy_web_app/src/application/database-yjs/sort.ts+++ b/frontend/appflowy_web_app/src/application/database-yjs/sort.ts@@ -1,4 +1,5 @@import {+ RowId,YDatabaseField,YDatabaseFields,YDatabaseRow,@@ -6,17 +7,16 @@ import {YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';+} from '@/application/types';import { FieldType, SortCondition } from '@/application/database-yjs/database.type';import { parseChecklistData, parseSelectOptionCellData } from '@/application/database-yjs/fields';import { Row } from '@/application/database-yjs/selector';import { orderBy } from 'lodash-es';-import * as Y from 'yjs';-export function sortBy(rows: Row[], sorts: YDatabaseSorts, fields: YDatabaseFields, rowMetas: Y.Map<YDoc>) {+export function sortBy (rows: Row[], sorts: YDatabaseSorts, fields: YDatabaseFields, rowMetas: Record<RowId, YDoc>) {const sortArray = sorts.toArray();- if (sortArray.length === 0 || rowMetas.size === 0 || fields.size === 0) return rows;+ if (sortArray.length === 0 || Object.keys(rowMetas).length === 0 || fields.size === 0) return rows;const iteratees = sortArray.map((sort) => {return (row: { id: string }) => {const fieldId = sort.get(YjsDatabaseKey.field_id);@@ -24,7 +24,7 @@ export function sortBy(rows: Row[], sorts: YDatabaseSorts, fields: YDatabaseFielconst fieldType = Number(field.get(YjsDatabaseKey.type));const rowId = row.id;- const rowMeta = rowMetas.get(rowId);+ const rowMeta = rowMetas[rowId];const defaultData = parseCellDataForSort(field, '');@@ -57,7 +57,7 @@ export function sortBy(rows: Row[], sorts: YDatabaseSorts, fields: YDatabaseFielreturn orderBy(rows, iteratees, orders);}-export function parseCellDataForSort(field: YDatabaseField, data: string | boolean | number | object) {+export function parseCellDataForSort (field: YDatabaseField, data: string | boolean | number | object) {const fieldType = Number(field.get(YjsDatabaseKey.type));switch (fieldType) {diff --git a/frontend/appflowy_web_app/src/application/db/index.ts b/frontend/appflowy_web_app/src/application/db/index.tsindex 9443352a87..6184cc5f51 100644--- a/frontend/appflowy_web_app/src/application/db/index.ts+++ b/frontend/appflowy_web_app/src/application/db/index.ts@@ -1,16 +1,18 @@-import { YDoc } from '@/application/collab.type';+import { userSchema, UserTable } from '@/application/db/tables/users';+import { YDoc } from '@/application/types';import { databasePrefix } from '@/application/constants';import { IndexeddbPersistence } from 'y-indexeddb';import * as Y from 'yjs';import BaseDexie from 'dexie';import { viewMetasSchema, ViewMetasTable } from '@/application/db/tables/view_metas';+import { rowSchema, rowTable } from '@/application/db/tables/rows';-type DexieTables = ViewMetasTable;+type DexieTables = ViewMetasTable & UserTable & rowTable;export type Dexie<T = DexieTables> = BaseDexie & T;export const db = new BaseDexie(`${databasePrefix}_cache`) as Dexie;-const schema = Object.assign({}, viewMetasSchema);+const schema = Object.assign({}, { ...viewMetasSchema, ...userSchema, ...rowSchema });db.version(1).stores(schema);@@ -19,7 +21,7 @@ const openedSet = new Set<string>();/*** Open the collaboration database, and return a function to close it*/-export async function openCollabDB(docName: string): Promise<YDoc> {+export async function openCollabDB (docName: string): Promise<YDoc> {const name = `${databasePrefix}_${docName}`;const doc = new Y.Doc({guid: docName,@@ -45,7 +47,7 @@ export async function openCollabDB(docName: string): Promise<YDoc> {return doc as YDoc;}-export async function closeCollabDB(docName: string) {+export async function closeCollabDB (docName: string) {const name = `${databasePrefix}_${docName}`;if (openedSet.has(name)) {@@ -59,38 +61,53 @@ export async function closeCollabDB(docName: string) {await provider.destroy();}-export async function clearData() {- try {- const databases = await indexedDB.databases();+export async function clearData () {+ const databases = await indexedDB.databases();++ const deleteDatabase = async (dbInfo: IDBDatabaseInfo): Promise<boolean> => {+ const dbName = dbInfo.name;++ if (!dbName) return false;- databases.forEach((dbInfo) => {- const dbName = dbInfo.name as string;+ return new Promise((resolve) => {const request = indexedDB.open(dbName);- request.onsuccess = function (event) {+ request.onsuccess = (event) => {const db = (event.target as IDBOpenDBRequest).result;db.close();+const deleteRequest = indexedDB.deleteDatabase(dbName);- deleteRequest.onsuccess = function () {+ deleteRequest.onsuccess = () => {console.log(`Database ${dbName} deleted successfully`);+ resolve(true);};- deleteRequest.onerror = function (event) {+ deleteRequest.onerror = (event) => {console.error(`Error deleting database ${dbName}`, event);+ resolve(false);};- deleteRequest.onblocked = function () {+ deleteRequest.onblocked = () => {console.warn(`Delete operation blocked for database ${dbName}`);+ resolve(false);};};- request.onerror = function (event) {+ request.onerror = (event) => {console.error(`Error opening database ${dbName}`, event);+ resolve(false);};});- } catch (e) {- console.error('Error listing databases:', e);+ };++ try {+ const results = await Promise.all(databases.map(deleteDatabase));++ return results.every(Boolean);+ } catch (error) {+ console.error('Error during database deletion process:', error);+ return false;}}diff --git a/frontend/appflowy_web_app/src/application/db/tables/rows.ts b/frontend/appflowy_web_app/src/application/db/tables/rows.tsnew file mode 100644index 0000000000..1275a347f4--- /dev/null+++ b/frontend/appflowy_web_app/src/application/db/tables/rows.ts@@ -0,0 +1,13 @@+import { Table } from 'dexie';++export type rowTable = {+ rows: Table<{+ row_id: string;+ row_key: string;+ version: number;+ }>;+};++export const rowSchema = {+ rows: 'row_key',+};\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/application/db/tables/users.ts b/frontend/appflowy_web_app/src/application/db/tables/users.tsnew file mode 100644index 0000000000..2b84d1ad0e--- /dev/null+++ b/frontend/appflowy_web_app/src/application/db/tables/users.ts@@ -0,0 +1,10 @@+import { User } from '@/application/types';+import { Table } from 'dexie';++export type UserTable = {+ users: Table<User>;+};++export const userSchema = {+ users: 'uuid',+};\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/application/db/tables/view_metas.ts b/frontend/appflowy_web_app/src/application/db/tables/view_metas.tsindex 98efb3a6ea..9c851e6fb1 100644--- a/frontend/appflowy_web_app/src/application/db/tables/view_metas.ts+++ b/frontend/appflowy_web_app/src/application/db/tables/view_metas.ts@@ -1,15 +1,15 @@import { Table } from 'dexie';-import { PublishViewInfo } from '@/application/collab.type';+import { ViewInfo } from '@/application/types';export type ViewMeta = {publish_name: string;- child_views: PublishViewInfo[];- ancestor_views: PublishViewInfo[];+ child_views: ViewInfo[];+ ancestor_views: ViewInfo[];visible_view_ids: string[];database_relations: Record<string, string>;-} & PublishViewInfo;+} & ViewInfo;export type ViewMetasTable = {view_metas: Table<ViewMeta>;diff --git a/frontend/appflowy_web_app/src/application/publish/context.tsx b/frontend/appflowy_web_app/src/application/publish/context.tsxindex aebfd10f92..b80dccb2f3 100644--- a/frontend/appflowy_web_app/src/application/publish/context.tsx+++ b/frontend/appflowy_web_app/src/application/publish/context.tsx@@ -1,12 +1,18 @@-import { GetViewRowsMap, LoadView, LoadViewMeta } from '@/application/collab.type';+import {+ AppendBreadcrumb,+ CreateRowDoc,+ LoadView,+ LoadViewMeta,+ View,+ ViewInfo,+} from '@/application/types';import { db } from '@/application/db';import { ViewMeta } from '@/application/db/tables/view_metas';-import { View } from '@/application/types';-import { useService } from '@/components/app/app.hooks';+import { findAncestors, findView } from '@/components/_shared/outline/utils';+import { useService } from '@/components/main/app.hooks';import { notify } from '@/components/_shared/notify';-import { findView } from '@/components/publish/header/utils';import { useLiveQuery } from 'dexie-react-hooks';-import { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react';+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';import { useNavigate } from 'react-router-dom';export interface PublishContextType {@@ -17,9 +23,13 @@ export interface PublishContextType {viewMeta?: ViewMeta;toView: (viewId: string) => Promise<void>;loadViewMeta: LoadViewMeta;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;loadView: LoadView;- outline?: View;+ outline?: View[];+ appendBreadcrumb?: AppendBreadcrumb;+ breadcrumbs: View[];+ rendered?: boolean;+ onRendered?: () => void;}export const PublishContext = createContext<PublishContextType | null>(null);@@ -37,8 +47,9 @@ export const PublishProvider = ({isTemplateThumb?: boolean;isTemplate?: boolean;}) => {-- const [outline, setOutline] = useState<View>();+ const [outline, setOutline] = useState<View[]>([]);+ const createdRowKeys = useRef<string[]>([]);+ const [rendered, setRendered] = useState(false);const [subscribers, setSubscribers] = useState<Map<string, (meta: ViewMeta) => void>>(new Map());@@ -57,10 +68,66 @@ export const PublishProvider = ({return {...view,- name: findView(outline?.children || [], view.view_id)?.name || view.name,+ name: findView(outline, view.view_id)?.name || view.name,};}, [namespace, publishName, outline]);+ const originalCrumbs = useMemo(() => {+ if (!viewMeta || !outline) return [];+ const ancestors = findAncestors(outline, viewMeta?.view_id);++ if (ancestors) return ancestors;+ if (!viewMeta?.ancestor_views) return [];+ const parseToView = (ancestor: ViewInfo): View => {+ let extra = null;++ try {+ extra = ancestor.extra ? JSON.parse(ancestor.extra) : null;+ } catch (e) {+ // do nothing+ }++ return {+ view_id: ancestor.view_id,+ name: ancestor.name,+ icon: ancestor.icon,+ layout: ancestor.layout,+ extra,+ is_published: true,+ children: [],+ is_private: false,+ };+ };++ const currentView = parseToView(viewMeta);++ return viewMeta?.ancestor_views.slice(1).map(item => findView(outline, item.view_id) || parseToView(item)) || [currentView];+ }, [viewMeta, outline]);++ const [breadcrumbs, setBreadcrumbs] = useState<View[]>([]);++ useEffect(() => {+ setBreadcrumbs(originalCrumbs);+ }, [originalCrumbs]);++ const appendBreadcrumb = useCallback((view?: View) => {+ setBreadcrumbs((prev) => {+ if (!view) {+ return prev.slice(0, -1);+ }++ const index = prev.findIndex((v) => v.view_id === view.view_id);++ if (index === -1) {+ return [...prev, view];+ }++ const rest = prev.slice(0, index);++ return [...rest, view];+ });+ }, []);+useEffect(() => {db.view_metas.hook('creating', (primaryKey, obj) => {const subscriber = subscribers.get(primaryKey);@@ -92,6 +159,21 @@ export const PublishProvider = ({const service = useService();+ useEffect(() => {+ const rowKeys = createdRowKeys.current;++ createdRowKeys.current = [];++ if (!rowKeys.length) return;+ rowKeys.forEach((rowKey) => {+ try {+ service?.deleteRowDoc(rowKey);+ } catch (e) {+ console.error(e);+ }+ });++ }, [service, publishName]);const navigate = useNavigate();const toView = useCallback(async (viewId: string) => {@@ -132,7 +214,7 @@ export const PublishProvider = ({}, [namespace, service]);const loadViewMeta = useCallback(- async (viewId: string, callback?: (meta: ViewMeta) => void) => {+ async (viewId: string, callback?: (meta: View) => void) => {try {const info = await service?.getPublishInfo(viewId);@@ -150,17 +232,35 @@ export const PublishProvider = ({return Promise.reject(new Error('View meta has not been published yet'));}- callback?.(meta);+ const parseMetaToView = (meta: ViewInfo | ViewMeta): View => {+ return {+ is_private: false,+ view_id: meta.view_id,+ name: meta.name,+ layout: meta.layout,+ extra: meta.extra ? JSON.parse(meta.extra) : undefined,+ icon: meta.icon,+ children: meta.child_views?.map(parseMetaToView) || [],+ is_published: true,+ database_relations: 'database_relations' in meta ? meta.database_relations : undefined,+ };+ };++ const res = parseMetaToView(meta);++ callback?.(res);if (callback) {setSubscribers((prev) => {- prev.set(name, callback);+ prev.set(name, (meta) => {+ return callback?.(parseMetaToView(meta));+ });return prev;});}- return meta;+ return res;} catch (e) {return Promise.reject(e);}@@ -168,23 +268,17 @@ export const PublishProvider = ({[service],);- const getViewRowsMap = useCallback(- async (viewId: string, rowIds?: string[]) => {+ const createRowDoc = useCallback(+ async (rowKey: string) => {try {- const info = await service?.getPublishInfo(viewId);+ const doc = await service?.createRowDoc(rowKey);- if (!info) {- throw new Error('View has not been published yet');+ if (!doc) {+ throw new Error('Failed to create row doc');}- const { namespace, publishName } = info;- const res = await service?.getPublishDatabaseViewRows(namespace, publishName, rowIds);-- if (!res) {- throw new Error('View has not been published yet');- }-- return res;+ createdRowKeys.current.push(rowKey);+ return doc;} catch (e) {return Promise.reject(e);}@@ -193,7 +287,17 @@ export const PublishProvider = ({);const loadView = useCallback(- async (viewId: string) => {+ async (viewId: string, isSubDocument?: boolean) => {+ if (isSubDocument) {+ const data = await service?.getPublishRowDocument(viewId);++ if (!data) {+ return Promise.reject(new Error('View has not been published yet'));+ }++ return data;+ }+try {const res = await service?.getPublishInfo(viewId);@@ -217,6 +321,10 @@ export const PublishProvider = ({[service],);+ const onRendered = useCallback(() => {+ setRendered(true);+ }, []);+useEffect(() => {if (!viewMeta && prevViewMeta.current) {window.location.reload();@@ -235,13 +343,17 @@ export const PublishProvider = ({value={{loadView,viewMeta,- getViewRowsMap,+ createRowDoc,loadViewMeta,toView,namespace,publishName,isTemplateThumb,outline,+ breadcrumbs,+ appendBreadcrumb,+ onRendered,+ rendered,}}>{children}diff --git a/frontend/appflowy_web_app/src/application/services/index.ts b/frontend/appflowy_web_app/src/application/services/index.tsindex 21d401d0da..70c63ed3cd 100644--- a/frontend/appflowy_web_app/src/application/services/index.ts+++ b/frontend/appflowy_web_app/src/application/services/index.ts@@ -3,7 +3,7 @@ import { AFClientService } from '$client-services';let service: AFService;-export async function getService (config: AFServiceConfig) {+export function getService (config: AFServiceConfig) {if (service) return service;service = new AFClientService(config);diff --git a/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts b/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.tsindex 0b0fe59cf3..2acb4a8b3b 100644--- a/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts+++ b/frontend/appflowy_web_app/src/application/services/js-services/cache/__tests__/cache.test.ts@@ -1,4 +1,4 @@-import { CollabType } from '@/application/collab.type';+import { Types } from '@/application/types';import { withTestingYDoc } from '@/application/slate-yjs/__tests__/withTestingYjsEditor';import { expect } from '@jest/globals';import { collabTypeToDBType, getPublishView, getPublishViewMeta } from '@/application/services/js-services/cache';@@ -22,25 +22,25 @@ jest.mock('@/application/db', () => ({const normalDoc = withTestingYDoc('1');const mockFetcher = jest.fn();-async function runTestWithStrategy(strategy: StrategyType) {+async function runTestWithStrategy (strategy: StrategyType) {return getPublishView(mockFetcher,{namespace: 'appflowy',publishName: 'test',},- strategy+ strategy,);}-async function runGetPublishViewMetaWithStrategy(strategy: StrategyType) {+async function runGetPublishViewMetaWithStrategy (strategy: StrategyType) {return getPublishViewMeta(mockFetcher,{namespace: 'appflowy',publishName: 'test',},- strategy+ strategy,);}@@ -68,14 +68,14 @@ describe('Cache functions', () => {(db.view_metas.get as jest.Mock).mockResolvedValue({ view_id: '1' });mockFetcher.mockResolvedValue({ data: [1, 2, 3], meta: { metadata: { view: { id: '1' } } } });await runTestWithStrategy(StrategyType.CACHE_ONLY);- expect(openCollabDB).toBeCalledTimes(2);+ expect(openCollabDB).toBeCalledTimes(1);await runTestWithStrategy(StrategyType.CACHE_FIRST);- expect(openCollabDB).toBeCalledTimes(4);+ expect(openCollabDB).toBeCalledTimes(2);expect(mockFetcher).toBeCalledTimes(0);await runTestWithStrategy(StrategyType.CACHE_AND_NETWORK);- expect(openCollabDB).toBeCalledTimes(6);+ expect(openCollabDB).toBeCalledTimes(3);expect(mockFetcher).toBeCalledTimes(1);});});@@ -115,12 +115,12 @@ describe('Cache functions', () => {describe('collabTypeToDBType', () => {it('should return correct DB type', () => {- expect(collabTypeToDBType(CollabType.Document)).toBe('document');- expect(collabTypeToDBType(CollabType.Folder)).toBe('folder');- expect(collabTypeToDBType(CollabType.Database)).toBe('database');- expect(collabTypeToDBType(CollabType.WorkspaceDatabase)).toBe('databases');- expect(collabTypeToDBType(CollabType.DatabaseRow)).toBe('database_row');- expect(collabTypeToDBType(CollabType.UserAwareness)).toBe('user_awareness');- expect(collabTypeToDBType(CollabType.Empty)).toBe('');+ expect(collabTypeToDBType(Types.Document)).toBe('document');+ expect(collabTypeToDBType(Types.Folder)).toBe('folder');+ expect(collabTypeToDBType(Types.Database)).toBe('database');+ expect(collabTypeToDBType(Types.WorkspaceDatabase)).toBe('databases');+ expect(collabTypeToDBType(Types.DatabaseRow)).toBe('database_row');+ expect(collabTypeToDBType(Types.UserAwareness)).toBe('user_awareness');+ expect(collabTypeToDBType(Types.Empty)).toBe('');});});diff --git a/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts b/frontend/appflowy_web_app/src/application/services/js-services/cache/index.tsindex 2c8c39f57a..ba34ebbfaa 100644--- a/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts+++ b/frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts@@ -1,33 +1,32 @@+import { closeCollabDB, db, openCollabDB } from '@/application/db';+import { Fetcher, StrategyType } from '@/application/services/js-services/cache/types';import {- CollabType,DatabaseId,- PublishViewInfo,PublishViewMetaData,RowId,+ Types,+ User,ViewId,+ ViewInfo,YDoc,YjsEditorKey,YSharedRoot,-} from '@/application/collab.type';+} from '@/application/types';import { applyYDoc } from '@/application/ydoc/apply';-import { closeCollabDB, db, openCollabDB } from '@/application/db';-import { Fetcher, StrategyType } from '@/application/services/js-services/cache/types';-// import { IndexeddbPersistence } from 'y-indexeddb';-import * as Y from 'yjs';-export function collabTypeToDBType (type: CollabType) {+export function collabTypeToDBType (type: Types) {switch (type) {- case CollabType.Folder:+ case Types.Folder:return 'folder';- case CollabType.Document:+ case Types.Document:return 'document';- case CollabType.Database:+ case Types.Database:return 'database';- case CollabType.WorkspaceDatabase:+ case Types.WorkspaceDatabase:return 'databases';- case CollabType.DatabaseRow:+ case Types.DatabaseRow:return 'database_row';- case CollabType.UserAwareness:+ case Types.UserAwareness:return 'user_awareness';default:return '';@@ -35,13 +34,13 @@ export function collabTypeToDBType (type: CollabType) {}const collabSharedRootKeyMap = {- [CollabType.Folder]: YjsEditorKey.folder,- [CollabType.Document]: YjsEditorKey.document,- [CollabType.Database]: YjsEditorKey.database,- [CollabType.WorkspaceDatabase]: YjsEditorKey.workspace_database,- [CollabType.DatabaseRow]: YjsEditorKey.database_row,- [CollabType.UserAwareness]: YjsEditorKey.user_awareness,- [CollabType.Empty]: YjsEditorKey.empty,+ [Types.Folder]: YjsEditorKey.folder,+ [Types.Document]: YjsEditorKey.document,+ [Types.Database]: YjsEditorKey.database,+ [Types.WorkspaceDatabase]: YjsEditorKey.workspace_database,+ [Types.DatabaseRow]: YjsEditorKey.database_row,+ [Types.UserAwareness]: YjsEditorKey.user_awareness,+ [Types.Empty]: YjsEditorKey.empty,};export function hasCollabCache (doc: YDoc) {@@ -58,11 +57,17 @@ export async function hasViewMetaCache (name: string) {return !!data;}+export async function hasUserCache (userId: string) {+ const data = await db.users.get(userId);++ return !!data;+}+export async function getPublishViewMeta<T extends {- view: PublishViewInfo;- child_views: PublishViewInfo[];- ancestor_views: PublishViewInfo[];+ view: ViewInfo;+ child_views: ViewInfo[];+ ancestor_views: ViewInfo[];}> (fetcher: Fetcher<T>,@@ -112,16 +117,60 @@ export async function getPublishViewMeta<}}+export async function getUser<+ T extends User+> (+ fetcher: Fetcher<T>,+ userId?: string,+ strategy: StrategyType = StrategyType.CACHE_AND_NETWORK,+) {+ const exist = userId && (await hasUserCache(userId));+ const data = await db.users.get(userId);++ switch (strategy) {+ case StrategyType.CACHE_ONLY: {+ if (!exist) {+ throw new Error('No cache found');+ }++ return data;+ }++ case StrategyType.CACHE_FIRST: {+ if (!exist) {+ return revalidateUser(fetcher);+ }++ return data;+ }++ case StrategyType.CACHE_AND_NETWORK: {+ if (!exist) {+ return revalidateUser(fetcher);+ } else {+ void revalidateUser(fetcher);+ }++ return data;+ }++ default: {+ return revalidateUser(fetcher);+ }+ }+}+export async function getPublishView<T extends {data: Uint8Array;rows?: Record<RowId, number[]>;visibleViewIds?: ViewId[];relations?: Record<DatabaseId, ViewId>;+ subDocuments?: Record<string, number[]>;meta: {- view: PublishViewInfo;- child_views: PublishViewInfo[];- ancestor_views: PublishViewInfo[];+ view: ViewInfo;+ child_views: ViewInfo[];+ ancestor_views: ViewInfo[];};}> (@@ -136,22 +185,8 @@ export async function getPublishView<strategy: StrategyType = StrategyType.CACHE_AND_NETWORK,) {const name = `${namespace}_${publishName}`;+const doc = await openCollabDB(name);- const rowMapDoc = (await openCollabDB(`${name}_rows`)) as Y.Doc;-- // const subdocs = Array.from(rowMapDoc.getSubdocs());- //- // for (const subdoc of subdocs) {- // const promise = new Promise((resolve) => {- // const persistence = new IndexeddbPersistence(subdoc.guid, subdoc);- //- // persistence.on('synced', () => {- // resolve(true);- // });- // });- //- // await promise;- // }const exist = (await hasViewMetaCache(name)) && hasCollabCache(doc);@@ -166,7 +201,7 @@ export async function getPublishView<case StrategyType.CACHE_FIRST: {if (!exist) {- await revalidatePublishView(name, fetcher, doc, rowMapDoc);+ await revalidatePublishView(name, fetcher, doc);}break;@@ -174,28 +209,113 @@ export async function getPublishView<case StrategyType.CACHE_AND_NETWORK: {if (!exist) {- await revalidatePublishView(name, fetcher, doc, rowMapDoc);+ await revalidatePublishView(name, fetcher, doc);} else {- void revalidatePublishView(name, fetcher, doc, rowMapDoc);+ void revalidatePublishView(name, fetcher, doc);}break;}default: {- await revalidatePublishView(name, fetcher, doc, rowMapDoc);+ await revalidatePublishView(name, fetcher, doc);break;}}- return { doc, rowMapDoc };+ return { doc };+}++export async function getPageDoc<T extends {+ data: Uint8Array;+ rows?: Record<RowId, number[]>;+}> (fetcher: Fetcher<T>, name: string, strategy: StrategyType = StrategyType.CACHE_AND_NETWORK) {++ const doc = await openCollabDB(name);++ const exist = hasCollabCache(doc);++ switch (strategy) {+ case StrategyType.CACHE_ONLY: {+ if (!exist) {+ throw new Error('No cache found');+ }++ break;+ }++ case StrategyType.CACHE_FIRST: {+ if (!exist) {+ await revalidateView(fetcher, doc);+ }++ break;+ }++ case StrategyType.CACHE_AND_NETWORK: {+ if (!exist) {+ await revalidateView(fetcher, doc);+ } else {+ void revalidateView(fetcher, doc);+ }++ break;+ }++ default: {+ await revalidateView(fetcher, doc);+ break;+ }+ }++ return { doc };+}++async function updateRows (collab: YDoc, rows: Record<RowId, number[]>) {+ const bulkData = [];++ for (const [key, value] of Object.entries(rows)) {+ const rowKey = `${collab.guid}_rows_${key}`;+ const doc = await createRowDoc(rowKey);++ const dbRow = await db.rows.get(key);++ applyYDoc(doc, new Uint8Array(value));++ bulkData.push({+ row_id: key,+ version: (dbRow?.version || 0) + 1,+ row_key: rowKey,+ });+ }++ await db.rows.bulkPut(bulkData);+}++export async function revalidateView<+ T extends {+ data: Uint8Array;+ rows?: Record<RowId, number[]>;+ }> (fetcher: Fetcher<T>, collab: YDoc) {+ try {+ const { data, rows } = await fetcher();++ if (rows) {+ await updateRows(collab, rows);+ }++ applyYDoc(collab, data);+ } catch (e) {+ return Promise.reject(e);+ }+}export async function revalidatePublishViewMeta<T extends {- view: PublishViewInfo;- child_views: PublishViewInfo[];- ancestor_views: PublishViewInfo[];+ view: ViewInfo;+ child_views: ViewInfo[];+ ancestor_views: ViewInfo[];}> (name: string, fetcher: Fetcher<T>) {const { view, child_views, ancestor_views } = await fetcher();@@ -223,10 +343,11 @@ export async function revalidatePublishView<rows?: Record<RowId, number[]>;visibleViewIds?: ViewId[];relations?: Record<DatabaseId, ViewId>;+ subDocuments?: Record<string, number[]>;meta: PublishViewMetaData;}-> (name: string, fetcher: Fetcher<T>, collab: YDoc, rowMapDoc: Y.Doc) {- const { data, meta, rows, visibleViewIds = [], relations = {} } = await fetcher();+> (name: string, fetcher: Fetcher<T>, collab: YDoc) {+ const { data, meta, rows, visibleViewIds = [], relations = {}, subDocuments } = await fetcher();await db.view_metas.put({@@ -241,22 +362,14 @@ export async function revalidatePublishView<);if (rows) {- for (const [key, value] of Object.entries(rows)) {- const subdoc = new Y.Doc({- guid: key,- });-- applyYDoc(subdoc, new Uint8Array(value));- rowMapDoc.getMap().delete(subdoc.guid);- rowMapDoc.getMap().set(subdoc.guid, subdoc);-- // const persistence = new IndexeddbPersistence(subdoc.guid, subdoc);- //- // persistence.on('synced', () => {- // applyYDoc(subdoc, new Uint8Array(value));- // rowMapDoc.getMap().delete(subdoc.guid);- // rowMapDoc.getMap().set(subdoc.guid, subdoc);- // });+ await updateRows(collab, rows);+ }++ if (subDocuments) {+ for (const [key, value] of Object.entries(subDocuments)) {+ const doc = await openCollabDB(key);++ applyYDoc(doc, new Uint8Array(value));}}@@ -264,22 +377,45 @@ export async function revalidatePublishView<}export async function deleteViewMeta (name: string) {- await db.view_metas.delete(name);+ try {+ await db.view_metas.delete(name);++ } catch (e) {+ console.error(e);+ }}export async function deleteView (name: string) {console.log('deleteView', name);await deleteViewMeta(name);await closeCollabDB(name);- // const rowMapDoc = (await openCollabDB(`${name}_rows`)) as Y.Doc;- //- // const subdocs = Array.from(rowMapDoc.getSubdocs());- //- // for (const subdoc of subdocs) {- // const persistence = new IndexeddbPersistence(subdoc.guid, subdoc);- //- // await persistence.destroy();- // }await closeCollabDB(`${name}_rows`);}++export async function revalidateUser<+ T extends User> (fetcher: Fetcher<T>) {+ const data = await fetcher();++ await db.users.put(data, data.uuid);++ return data;+}++const rowDocs = new Map<string, YDoc>();++export async function createRowDoc (rowKey: string) {+ if (rowDocs.has(rowKey)) {+ return rowDocs.get(rowKey) as YDoc;+ }++ const doc = await openCollabDB(rowKey);++ rowDocs.set(rowKey, doc);++ return doc;+}++export function deleteRowDoc (rowKey: string) {+ rowDocs.delete(rowKey);+}diff --git a/frontend/appflowy_web_app/src/application/services/js-services/fetch.ts b/frontend/appflowy_web_app/src/application/services/js-services/fetch.tsindex 4725195ead..783ba76475 100644--- a/frontend/appflowy_web_app/src/application/services/js-services/fetch.ts+++ b/frontend/appflowy_web_app/src/application/services/js-services/fetch.ts@@ -2,7 +2,7 @@ import { APIService } from '@/application/services/js-services/http';const pendingRequests = new Map();-function generateRequestKey<T>(url: string, params: T) {+function generateRequestKey<T> (url: string, params: T) {if (!params) return url;try {@@ -15,7 +15,7 @@ function generateRequestKey<T>(url: string, params: T) {// Deduplication fetch requests// When multiple requests are made to the same URL with the same params, only one request is made// and the result is shared with all the requests-function fetchWithDeduplication<Req, Res>(url: string, params: Req, fetchFunction: () => Promise<Res>): Promise<Res> {+function fetchWithDeduplication<Req, Res> (url: string, params: Req, fetchFunction: () => Promise<Res>): Promise<Res> {const requestKey = generateRequestKey<Req>(url, params);if (pendingRequests.has(requestKey)) {@@ -30,19 +30,25 @@ function fetchWithDeduplication<Req, Res>(url: string, params: Req, fetchFunctioreturn fetchPromise;}-export function fetchPublishView(namespace: string, publishName: string) {+export function fetchPublishView (namespace: string, publishName: string) {const fetchFunction = () => APIService.getPublishView(namespace, publishName);return fetchWithDeduplication(`fetchPublishView_${namespace}`, { publishName }, fetchFunction);}-export function fetchViewInfo(viewId: string) {+export function fetchPageCollab (workspaceId: string, viewId: string) {+ const fetchFunction = () => APIService.getPageCollab(workspaceId, viewId);++ return fetchWithDeduplication(`fetchPageCollab_${workspaceId}`, { viewId }, fetchFunction);+}++export function fetchViewInfo (viewId: string) {const fetchFunction = () => APIService.getPublishInfoWithViewId(viewId);return fetchWithDeduplication(`fetchViewInfo`, { viewId }, fetchFunction);}-export function fetchPublishViewMeta(namespace: string, publishName: string) {+export function fetchPublishViewMeta (namespace: string, publishName: string) {const fetchFunction = () => APIService.getPublishViewMeta(namespace, publishName);return fetchWithDeduplication(`fetchPublishViewMeta_${namespace}`, { publishName }, fetchFunction);diff --git a/frontend/appflowy_web_app/src/application/services/js-services/http/http_api.ts b/frontend/appflowy_web_app/src/application/services/js-services/http/http_api.tsindex 670c0423d9..31c35adc70 100644--- a/frontend/appflowy_web_app/src/application/services/js-services/http/http_api.ts+++ b/frontend/appflowy_web_app/src/application/services/js-services/http/http_api.ts@@ -1,4 +1,14 @@-import { DatabaseId, RowId, ViewId, ViewLayout } from '@/application/collab.type';+import {+ DatabaseId,+ FolderView,+ RowId,+ User,+ View,+ ViewId,+ ViewLayout,+ Workspace,+ Invitation, Types,+} from '@/application/types';import { GlobalComment, Reaction } from '@/application/comment.type';import { initGrantService, refreshToken } from '@/application/services/js-services/http/gotrue';import { blobToBytes } from '@/application/services/js-services/http/utils';@@ -11,7 +21,6 @@ import {TemplateCreator, TemplateCreatorFormValues, TemplateSummary,UploadTemplatePayload,} from '@/application/template.type';-import { FolderView, Invitation, User, View, Workspace } from '@/application/types';import axios, { AxiosInstance } from 'axios';import dayjs from 'dayjs';@@ -175,6 +184,87 @@ export async function getCurrentUser (): Promise<User> {email,name,avatar: metadata.icon_url,+ latestWorkspaceId: data.data.latest_workspace_id,+ };+ }++ return Promise.reject(data);+}++interface AFWorkspace {+ workspace_id: string,+ owner_uid: number,+ owner_name: string,+ workspace_name: string,+ icon: string,+ created_at: string,+ member_count: number,+ database_storage_id: string,+}++export async function openWorkspace (workspaceId: string) {+ const url = `/api/workspace/${workspaceId}/open`;+ const response = await axiosInstance?.put<{+ code: number;+ message: string;+ }>(url);++ if (response?.data.code === 0) {+ return;+ }++ return Promise.reject(response?.data);+}++export async function getUserWorkspaceInfo (): Promise<{+ user_id: string;+ selected_workspace: Workspace;+ workspaces: Workspace[];+}> {+ const url = '/api/user/workspace';+ const response = await axiosInstance?.get<{+ code: number,+ message: string,+ data: {+ user_profile: {+ uuid: string;+ },+ visiting_workspace: AFWorkspace,+ workspaces: AFWorkspace[]+ }++ }>(url);++ const data = response?.data;++ if (data?.code === 0) {+ const { visiting_workspace, workspaces, user_profile } = data.data;++ return {+ user_id: user_profile.uuid,+ selected_workspace: {+ id: visiting_workspace.workspace_id,+ name: visiting_workspace.workspace_name,+ icon: visiting_workspace.icon,+ memberCount: visiting_workspace.member_count,+ databaseStorageId: visiting_workspace.database_storage_id,+ owner: {+ uid: visiting_workspace.owner_uid,+ name: visiting_workspace.owner_name,+ },+ },+ workspaces: workspaces.map(workspace => ({+ id: workspace.workspace_id,+ name: workspace.workspace_name,+ icon: workspace.icon,+ memberCount: workspace.member_count,+ createdAt: workspace.created_at,+ databaseStorageId: workspace.database_storage_id,+ owner: {+ uid: workspace.owner_uid,+ name: workspace.owner_name,+ },+ })),};}@@ -197,6 +287,66 @@ export async function getPublishViewBlob (namespace: string, publishName: stringreturn blobToBytes(response?.data);}+export async function getCollab (workspaceId: string, objectId: string, collabType: Types) {+ const url = `/api/workspace/v1/${workspaceId}/collab/${objectId}`;+ const response = await axiosInstance?.get<{+ code: number;+ data: {+ doc_state: number[];+ object_id: string;+ };+ message: string;+ }>(url, {+ params: {+ collab_type: collabType,+ },+ });++ if (response?.data.code !== 0) {+ return Promise.reject(response?.data);+ }++ const docState = response?.data.data.doc_state;++ return {+ data: new Uint8Array(docState),+ };+}++export async function getPageCollab (workspaceId: string, viewId: string) {+ const url = `/api/workspace/${workspaceId}/page-view/${viewId}`;+ const response = await axiosInstance?.get<{+ code: number;+ data: {+ view: View;+ data: {+ encoded_collab: number[];+ row_data: Record<RowId, number[]>;+ owner?: User;+ last_editor?: User;+ }+ };+ message: string;+ }>(url);++ if (!response) {+ return Promise.reject('No response');+ }++ if (response.data.code !== 0) {+ return Promise.reject(response?.data);+ }++ const { encoded_collab, row_data, owner, last_editor } = response.data.data.data;++ return {+ data: new Uint8Array(encoded_collab),+ rows: row_data,+ owner,+ lastEditor: last_editor,+ };+}+export async function getPublishView (publishNamespace: string, publishName: string) {const meta = await getPublishViewMeta(publishNamespace, publishName);const blob = await getPublishViewBlob(publishNamespace, publishName);@@ -226,6 +376,7 @@ export async function getPublishView (publishNamespace: string, publishName: strrows: res.database_row_collabs,visibleViewIds: res.visible_database_view_ids,relations: res.database_relations,+ subDocuments: res.database_row_document_collabs,meta,};} catch (e) {@@ -253,6 +404,98 @@ export async function getPublishInfoWithViewId (viewId: string) {return Promise.reject(data);}+export async function getAppFavorites (workspaceId: string) {+ const url = `/api/workspace/${workspaceId}/favorite`;+ const response = await axiosInstance?.get<{+ code: number;+ data?: {+ views: View[]+ };+ message: string;+ }>(url);++ const data = response?.data;++ if (data?.code === 0 && data.data) {+ return data.data.views;+ }++ return Promise.reject(data);+}++export async function getAppTrash (workspaceId: string) {+ const url = `/api/workspace/${workspaceId}/trash`;+ const response = await axiosInstance?.get<{+ code: number;+ data?: {+ views: View[]+ };+ message: string;+ }>(url);++ const data = response?.data;++ if (data?.code === 0 && data.data) {+ return data.data.views;+ }++ return Promise.reject(data);+}++export async function getAppRecent (workspaceId: string) {+ const url = `/api/workspace/${workspaceId}/recent`;+ const response = await axiosInstance?.get<{+ code: number;+ data?: {+ views: View[]+ };+ message: string;+ }>(url);++ const data = response?.data;++ if (data?.code === 0 && data.data) {+ return data.data.views;+ }++ return Promise.reject(data);+}++export async function getAppOutline (workspaceId: string) {+ const url = `/api/workspace/${workspaceId}/folder?depth=10`;++ const response = await axiosInstance?.get<{+ code: number;+ data?: View;+ message: string;+ }>(url);++ const data = response?.data;++ if (data?.code === 0 && data.data) {+ return data.data.children;+ }++ return Promise.reject(data);+}++export async function getView (workspaceId: string, viewId: string, depth: number = 1) {+ const url = `/api/workspace/${workspaceId}/folder?depth=${depth}&root_view_id=${viewId}`;+ const response = await axiosInstance?.get<{+ code: number;+ data?: View;+ message: string;+ }>(url);++ const data = response?.data;++ if (data?.code === 0 && data.data) {+ return data.data;+ }++ return Promise.reject(data);+}+export async function getPublishOutline (publishNamespace: string) {const url = `/api/workspace/published-outline/${publishNamespace}`;const response = await axiosInstance?.get<{@@ -264,7 +507,7 @@ export async function getPublishOutline (publishNamespace: string) {const data = response?.data;if (data?.code === 0 && data.data) {- return data.data;+ return data.data.children;}return Promise.reject(data);@@ -442,6 +685,7 @@ export async function getWorkspaces (): Promise<Workspace[]> {workspace_name: string;member_count: number;icon: string;+ database_storage_id?: string;}[];message: string;}>(url);@@ -455,6 +699,7 @@ export async function getWorkspaces (): Promise<Workspace[]> {name: workspace.workspace_name,memberCount: workspace.member_count,icon: workspace.icon,+ databaseStorageId: workspace.database_storage_id || '',};});}@@ -748,7 +993,6 @@ export async function uploadFileToCDN (file: File) {const url = '/api/template-center/avatar';const formData = new FormData();- console.log(file);formData.append('avatar', file);const response = await axiosInstance?.request<{diff --git a/frontend/appflowy_web_app/src/application/services/js-services/index.ts b/frontend/appflowy_web_app/src/application/services/js-services/index.tsindex 8b1fc0616a..05831dc402 100644--- a/frontend/appflowy_web_app/src/application/services/js-services/index.ts+++ b/frontend/appflowy_web_app/src/application/services/js-services/index.ts@@ -1,32 +1,44 @@-import { YDoc } from '@/application/collab.type';import { GlobalComment, Reaction } from '@/application/comment.type';+import { openCollabDB } from '@/application/db';import {+ createRowDoc, deleteRowDoc,deleteView,+ getPageDoc,getPublishView,getPublishViewMeta,+ getUser, hasCollabCache,hasViewMetaCache,} from '@/application/services/js-services/cache';import { StrategyType } from '@/application/services/js-services/cache/types';-import { fetchPublishView, fetchPublishViewMeta, fetchViewInfo } from '@/application/services/js-services/fetch';+import {+ fetchPageCollab,+ fetchPublishView,+ fetchPublishViewMeta,+ fetchViewInfo,+} from '@/application/services/js-services/fetch';import { APIService } from '@/application/services/js-services/http';import { AFService, AFServiceConfig } from '@/application/services/services.type';import { emit, EventType } from '@/application/session';import { afterAuth, AUTH_CALLBACK_URL, withSignIn } from '@/application/session/sign_in';+import { getTokenParsed } from '@/application/session/token';import {TemplateCategoryFormValues,TemplateCreatorFormValues,UploadTemplatePayload,} from '@/application/template.type';+import { DatabaseRelations, DuplicatePublishView, Types, YjsEditorKey } from '@/application/types';+import { applyYDoc } from '@/application/ydoc/apply';import { nanoid } from 'nanoid';import * as Y from 'yjs';-import { DuplicatePublishView } from '@/application/types';export class AFClientService implements AFService {private deviceId: string = nanoid(8);private clientId: string = 'web';+ private viewLoaded: Set<string> = new Set();+private publishViewLoaded: Set<string> = new Set();private publishViewInfo: Map<@@ -37,10 +49,6 @@ export class AFClientService implements AFService {}> = new Map();- private cacheDatabaseRowDocMap: Map<string, Y.Doc> = new Map();-- private cacheDatabaseRowFolder: Map<string, Y.Map<YDoc>> = new Map();-constructor (config: AFServiceConfig) {APIService.initAPIService(config.cloudConfig);}@@ -76,7 +84,7 @@ export class AFClientService implements AFService {const isLoaded = this.publishViewLoaded.has(name);- const { doc, rowMapDoc } = await getPublishView(+ const { doc } = await getPublishView(async () => {try {return await fetchPublishView(namespace, publishName);@@ -103,39 +111,45 @@ export class AFClientService implements AFService {this.publishViewLoaded.add(name);}- this.cacheDatabaseRowDocMap.set(name, rowMapDoc);-return doc;}- async getPublishDatabaseViewRows (namespace: string, publishName: string) {- const name = `${namespace}_${publishName}`;+ async getPublishRowDocument (viewId: string) {+ const doc = await openCollabDB(viewId);- if (!this.publishViewLoaded.has(name) || !this.cacheDatabaseRowDocMap.has(name)) {- await this.getPublishView(namespace, publishName);+ if (hasCollabCache(doc)) {+ return doc;}- const rootRowsDoc = this.cacheDatabaseRowDocMap.get(name);+ return Promise.reject(new Error('Document not found'));- if (!rootRowsDoc) {- return Promise.reject(new Error('Root rows doc not found'));- }+ }- if (!this.cacheDatabaseRowFolder.has(name)) {- const rowsFolder: Y.Map<YDoc> = rootRowsDoc.getMap();+ async createRowDoc (rowKey: string) {+ return createRowDoc(rowKey);+ }- this.cacheDatabaseRowFolder.set(name, rowsFolder);- }+ deleteRowDoc (rowKey: string) {+ return deleteRowDoc(rowKey);+ }- const rowsFolder = this.cacheDatabaseRowFolder.get(name)!;+ async getAppDatabaseViewRelations (workspaceId: string, databaseStorageId: string) {- return {- rows: rowsFolder,- destroy: () => {- this.cacheDatabaseRowFolder.delete(name);- this.cacheDatabaseRowDocMap.delete(name);- },- };+ const res = await APIService.getCollab(workspaceId, databaseStorageId, Types.WorkspaceDatabase);+ const doc = new Y.Doc();++ applyYDoc(doc, res.data);++ const { databases } = doc.getMap(YjsEditorKey.data_section).toJSON();+ const result: DatabaseRelations = {};++ databases.forEach((database: {+ database_id: string;+ views: string[]+ }) => {+ result[database.database_id] = database.views[0];+ });+ return result;}async getPublishInfo (viewId: string) {@@ -168,6 +182,26 @@ export class AFClientService implements AFService {return APIService.getPublishOutline(namespace);}+ async getAppOutline (workspaceId: string) {+ return APIService.getAppOutline(workspaceId);+ }++ async getAppView (workspaceId: string, viewId: string) {+ return APIService.getView(workspaceId, viewId);+ }++ async getAppFavorites (workspaceId: string) {+ return APIService.getAppFavorites(workspaceId);+ }++ async getAppRecent (workspaceId: string) {+ return APIService.getAppRecent(workspaceId);+ }++ async getAppTrash (workspaceId: string) {+ return APIService.getAppTrash(workspaceId);+ }+async loginAuth (url: string) {try {await APIService.signInWithUrl(url);@@ -218,9 +252,38 @@ export class AFClientService implements AFService {}async getCurrentUser () {- const data = await APIService.getCurrentUser();+ const token = getTokenParsed();+ const userId = token?.user?.id;- return data;+ const user = await getUser(+ () => APIService.getCurrentUser(),+ userId,+ StrategyType.CACHE_AND_NETWORK,+ );++ if (!user) {+ return Promise.reject(new Error('User not found'));+ }++ return user;+ }++ async openWorkspace (workspaceId: string) {+ return APIService.openWorkspace(workspaceId);+ }++ async getUserWorkspaceInfo () {+ const workspaceInfo = await APIService.getUserWorkspaceInfo();++ if (!workspaceInfo) {+ return Promise.reject(new Error('Workspace info not found'));+ }++ return {+ userId: workspaceInfo.user_id,+ selectedWorkspace: workspaceInfo.selected_workspace,+ workspaces: workspaceInfo.workspaces,+ };}async duplicatePublishView (params: DuplicatePublishView) {@@ -314,6 +377,49 @@ export class AFClientService implements AFService {return APIService.uploadFileToCDN(file);}+ async getPageDoc (workspaceId: string, viewId: string, errorCallback?: (error: {+ code: number;+ }) => void) {++ const token = getTokenParsed();+ const userId = token?.user.id;++ if (!userId) {+ throw new Error('User not found');+ }++ const name = `${userId}_${workspaceId}_${viewId}`;++ const isLoaded = this.viewLoaded.has(name);++ const { doc } = await getPageDoc(+ async () => {+ try {+ return await fetchPageCollab(workspaceId, viewId);+ // eslint-disable-next-line+ } catch (e: any) {+ console.error(e);++ errorCallback?.(e);+ void (async () => {+ this.viewLoaded.delete(name);+ void deleteView(name);+ })();++ return Promise.reject(e);+ }+ },+ name,+ isLoaded ? StrategyType.CACHE_FIRST : StrategyType.CACHE_AND_NETWORK,+ );++ if (!isLoaded) {+ this.viewLoaded.add(name);+ }++ return doc;+ }+async getInvitation (invitationId: string) {return APIService.getInvitation(invitationId);}diff --git a/frontend/appflowy_web_app/src/application/services/services.type.ts b/frontend/appflowy_web_app/src/application/services/services.type.tsindex 11eac0d903..5dbf8a5949 100644--- a/frontend/appflowy_web_app/src/application/services/services.type.ts+++ b/frontend/appflowy_web_app/src/application/services/services.type.ts@@ -1,4 +1,13 @@-import { YDoc } from '@/application/collab.type';+import {+ Invitation,+ DuplicatePublishView,+ FolderView,+ User,+ UserWorkspaceInfo,+ View,+ Workspace,+ YDoc, DatabaseRelations,+} from '@/application/types';import { GlobalComment, Reaction } from '@/application/comment.type';import { ViewMeta } from '@/application/db/tables/view_metas';import {@@ -8,8 +17,6 @@ import {TemplateCreator, TemplateCreatorFormValues, TemplateSummary,UploadTemplatePayload,} from '@/application/template.type';-import * as Y from 'yjs';-import { DuplicatePublishView, FolderView, Invitation, User, View, Workspace } from '@/application/types';export type AFService = PublishService;@@ -25,19 +32,25 @@ export interface AFCloudConfig {export interface PublishService {getClientId: () => string;+ getPageDoc: (workspaceId: string, viewId: string, errorCallback?: (error: {+ code: number;+ }) => void) => Promise<YDoc>;getPublishViewMeta: (namespace: string, publishName: string) => Promise<ViewMeta>;getPublishView: (namespace: string, publishName: string) => Promise<YDoc>;+ getPublishRowDocument: (viewId: string) => Promise<YDoc>;getPublishInfo: (viewId: string) => Promise<{ namespace: string; publishName: string }>;- getPublishDatabaseViewRows: (- namespace: string,- publishName: string,- rowIds?: string[],- ) => Promise<{- rows: Y.Map<YDoc>;- destroy: () => void;- }>;+ createRowDoc: (rowKey: string) => Promise<YDoc>;+ deleteRowDoc: (rowKey: string) => void;+ getAppDatabaseViewRelations: (workspaceId: string, databaseStorageId: string) => Promise<DatabaseRelations>;+ openWorkspace: (workspaceId: string) => Promise<void>;++ getPublishOutline (namespace: string): Promise<View[]>;- getPublishOutline (namespace: string): Promise<View>;+ getAppOutline: (workspaceId: string) => Promise<View[]>;+ getAppView: (workspaceId: string, viewId: string) => Promise<View>;+ getAppFavorites: (workspaceId: string) => Promise<View[]>;+ getAppRecent: (workspaceId: string) => Promise<View[]>;+ getAppTrash: (workspaceId: string) => Promise<View[]>;getPublishViewGlobalComments: (viewId: string) => Promise<GlobalComment[]>;createCommentOnPublishView: (viewId: string, content: string, replyCommentId?: string) => Promise<void>;@@ -56,6 +69,7 @@ export interface PublishService {getWorkspaces: () => Promise<Workspace[]>;getWorkspaceFolder: (workspaceId: string) => Promise<FolderView>;getCurrentUser: () => Promise<User>;+ getUserWorkspaceInfo: () => Promise<UserWorkspaceInfo>;duplicatePublishView: (params: DuplicatePublishView) => Promise<void>;getTemplateCategories: () => Promise<TemplateCategory[]>;diff --git a/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts b/frontend/appflowy_web_app/src/application/services/tauri-services/index.tsindex 153293ca26..c6ad9a50ed 100644--- a/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts+++ b/frontend/appflowy_web_app/src/application/services/tauri-services/index.ts@@ -1,4 +1,13 @@-import { YDoc } from '@/application/collab.type';+import {+ DuplicatePublishView,+ FolderView,+ Invitation,+ User,+ UserWorkspaceInfo,+ Workspace,+ YDoc,+ View, DatabaseRelations,+} from '@/application/types';import { GlobalComment, Reaction } from '@/application/comment.type';import { AFService } from '@/application/services/services.type';import {@@ -9,7 +18,6 @@ import {} from '@/application/template.type';import { nanoid } from 'nanoid';import { YMap } from 'yjs/dist/src/types/YMap';-import { DuplicatePublishView, FolderView, Invitation, User, Workspace } from '@/application/types';export class AFClientService implements AFService {private deviceId: string = nanoid(8);@@ -173,4 +181,57 @@ export class AFClientService implements AFService {getInvitation (_invitationId: string): Promise<Invitation> {return Promise.reject('Method not implemented');}++ getAppOutline (_workspaceId: string): Promise<View[]> {+ return Promise.reject('Method not implemented');+ }++ getDatabasePageRows (_workspaceId: string, _viewId: string): Promise<{ rows: YMap<YDoc>; destroy: () => void }> {+ return Promise.reject('Method not implemented');+ }++ getPageDoc (_workspaceId: string, _viewId: string): Promise<YDoc> {+ return Promise.reject('Method not implemented');+ }++ getUserWorkspaceInfo (): Promise<UserWorkspaceInfo> {+ return Promise.reject('Method not implemented');+ }++ getAppDatabaseViewRelations (_workspaceId: string, _databaseStorageId: string): Promise<DatabaseRelations> {+ return Promise.reject('Method not implemented');+ }++ openWorkspace (_workspaceId: string): Promise<void> {+ return Promise.reject('Method not implemented');+ }++ getAppFavorites (_workspaceId: string): Promise<View[]> {+ return Promise.reject('Method not implemented');+ }++ getAppRecent (_workspaceId: string): Promise<View[]> {+ return Promise.reject('Method not implemented');+ }++ getAppTrash (_workspaceId: string): Promise<View[]> {+ return Promise.reject('Method not implemented');+ }++ getAppView (_workspaceId: string, _viewId: string): Promise<View> {+ return Promise.reject('Method not implemented');+ }++ createRowDoc (_rowKey: string): Promise<YDoc> {+ return Promise.reject('Method not implemented');+ }++ deleteRowDoc (_rowKey: string): void {+ return;+ }++ getPublishRowDocument (_viewId: string): Promise<YDoc> {+ return Promise.reject('Method not implemented');+ }+}diff --git a/frontend/appflowy_web_app/src/application/session/token.ts b/frontend/appflowy_web_app/src/application/session/token.tsindex 56f7a1c145..2d43a9aba7 100644--- a/frontend/appflowy_web_app/src/application/session/token.ts+++ b/frontend/appflowy_web_app/src/application/session/token.ts@@ -1,28 +1,32 @@import { emit, EventType } from '@/application/session/event';-export function refreshToken(token: string) {+export function refreshToken (token: string) {localStorage.removeItem('token');localStorage.setItem('token', token);emit(EventType.SESSION_REFRESH, token);}-export function invalidToken() {+export function invalidToken () {localStorage.removeItem('token');emit(EventType.SESSION_INVALID);}-export function isTokenValid() {+export function isTokenValid () {return !!localStorage.getItem('token');}-export function getToken() {+export function getToken () {return localStorage.getItem('token');}-export function getTokenParsed(): {+export function getTokenParsed (): {access_token: string;expires_at: number;refresh_token: string;+ user: {+ id: string;+ email: string;+ }} | null {const token = getToken();diff --git a/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/applyRemoteEvents.ts b/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/applyRemoteEvents.tsindex 62c24c12b8..83322476ac 100644--- a/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/applyRemoteEvents.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/applyRemoteEvents.ts@@ -1,4 +1,4 @@-import { CollabOrigin } from '@/application/collab.type';+import { CollabOrigin } from '@/application/types';import { yDocToSlateContent } from '@/application/slate-yjs/utils/convert';import { generateId, insertBlock, withTestingYDoc, withTestingYjsEditor } from './withTestingYjsEditor';import { createEditor } from 'slate';diff --git a/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/withTestingYjsEditor.ts b/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/withTestingYjsEditor.tsindex 81ffce4f9e..beca0a82b8 100644--- a/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/withTestingYjsEditor.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/__tests__/withTestingYjsEditor.ts@@ -6,7 +6,7 @@ import {YMeta,YSharedRoot,YTextMap,-} from '@/application/collab.type';+} from '@/application/types';import { withYjs } from '@/application/slate-yjs';import { YDelta } from '@/application/slate-yjs/utils/convert';import { Editor } from 'slate';diff --git a/frontend/appflowy_web_app/src/components/editor/command/index.ts b/frontend/appflowy_web_app/src/application/slate-yjs/command/index.tssimilarity index 69%rename from frontend/appflowy_web_app/src/components/editor/command/index.tsrename to frontend/appflowy_web_app/src/application/slate-yjs/command/index.tsindex d4ee1a6e28..6cbe63e0f2 100644--- a/frontend/appflowy_web_app/src/components/editor/command/index.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/command/index.ts@@ -1,23 +1,20 @@-import { InlineBlockType, Mention, MentionType } from '@/application/collab.type';+import { InlineBlockType, Mention, MentionType } from '@/application/types';import { FormulaNode } from '@/components/editor/editor.type';import { renderDate } from '@/utils/time';-import { Editor, Transforms, Element, Text, Node } from 'slate';+import { Editor, Element, Text, Node, NodeEntry } from 'slate';import { ReactEditor } from 'slate-react';export const CustomEditor = {- setDocumentTitle: (editor: ReactEditor, title: string) => {- const length = Editor.string(editor, [0, 0]).length;-- Transforms.insertText(editor, title, {- at: {- anchor: { path: [0, 0, 0], offset: 0 },- focus: { path: [0, 0, 0], offset: length },- },+ findTextNode (editor: ReactEditor, path: number[]): NodeEntry<Element> {+ const [node] = editor.nodes({+ at: path,+ match: (n) => !Editor.isEditor(n) && Element.isElement(n) && n.textId !== undefined,});- },+ return node as NodeEntry<Element>;+ },// Get the text content of a block node, including the text content of its children and formula nodes- getBlockTextContent(node: Node): string {+ getBlockTextContent (node: Node): string {if (Element.isElement(node)) {if (node.type === InlineBlockType.Formula) {return (node as FormulaNode).data || '';diff --git a/frontend/appflowy_web_app/src/application/slate-yjs/plugins/withYjs.ts b/frontend/appflowy_web_app/src/application/slate-yjs/plugins/withYjs.tsindex 499c9f8065..036b17671e 100644--- a/frontend/appflowy_web_app/src/application/slate-yjs/plugins/withYjs.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/plugins/withYjs.ts@@ -1,4 +1,4 @@-import { CollabOrigin, YjsEditorKey, YSharedRoot } from '@/application/collab.type';+import { CollabOrigin, YjsEditorKey, YSharedRoot } from '@/application/types';import { applyToYjs } from '@/application/slate-yjs/utils/applyToYjs';import { Editor, Operation, Descendant } from 'slate';import Y, { YEvent, Transaction } from 'yjs';@@ -74,6 +74,7 @@ export function withYjs<T extends Editor> (return;}+ console.log('===', content.children);if (readSummary) {e.children = content.children.slice(0, 10);} else {@@ -146,7 +147,7 @@ export function withYjs<T extends Editor> (// parse changes and apply to ydocdoc.transact(() => {changes.forEach((change) => {- applyToYjs(doc, { children: change.slateContent }, change.op);+ applyToYjs(doc, editor, change.op);});}, localOrigin);};diff --git a/frontend/appflowy_web_app/src/application/slate-yjs/utils/applyToYjs.ts b/frontend/appflowy_web_app/src/application/slate-yjs/utils/applyToYjs.tsindex 98daed4817..36287c6c10 100644--- a/frontend/appflowy_web_app/src/application/slate-yjs/utils/applyToYjs.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/utils/applyToYjs.ts@@ -1,8 +1,55 @@-import { Operation, Node } from 'slate';+import { CustomEditor } from '@/application/slate-yjs/command';+import { YjsEditorKey, YMeta, YSharedRoot, YTextMap } from '@/application/types';+import { Operation, Element, Editor, InsertTextOperation, RemoveTextOperation } from 'slate';import * as Y from 'yjs';// transform slate op to yjs op and apply it to ydoc-export function applyToYjs(_ydoc: Y.Doc, _slateRoot: Node, op: Operation) {+export function applyToYjs (ydoc: Y.Doc, editor: Editor, op: Operation) {if (op.type === 'set_selection') return;console.log('applySlateOp', op);++ switch (op.type) {+ case 'insert_text':+ return applyInsertText(ydoc, editor, op);+ case 'remove_text':+ return applyRemoveText(ydoc, editor, op);+ default:+ return;+ }+}++function applyInsertText (ydoc: Y.Doc, editor: Editor, op: InsertTextOperation) {+ const { path, offset, text } = op;+ const node = findSlateNode(editor, path);+ const textMap = getTextMap(ydoc);+ const textId = node.textId as string;+ const yText = textMap.get(textId);++ yText.insert(offset, text);+}++function applyRemoveText (ydoc: Y.Doc, editor: Editor, op: RemoveTextOperation) {+ const { path, offset, text } = op;+ const node = findSlateNode(editor, path);+ const textMap = getTextMap(ydoc);+ const textId = node.textId as string;+ const yText = textMap.get(textId);++ yText.delete(offset, text.length);}++function getTextMap (doc: Y.Doc) {+ const sharedRoot = doc.getMap(YjsEditorKey.data_section) as YSharedRoot;++ const document = sharedRoot.get(YjsEditorKey.document);++ const meta = document.get(YjsEditorKey.meta) as YMeta;++ return meta.get(YjsEditorKey.text_map) as YTextMap;+}++function findSlateNode (editor: Editor, path: number[]): Element {+ const entry = CustomEditor.findTextNode(editor, path);++ return entry[0];+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/application/slate-yjs/utils/convert.ts b/frontend/appflowy_web_app/src/application/slate-yjs/utils/convert.tsindex 87215e2df3..9a2e025952 100644--- a/frontend/appflowy_web_app/src/application/slate-yjs/utils/convert.ts+++ b/frontend/appflowy_web_app/src/application/slate-yjs/utils/convert.ts@@ -9,7 +9,7 @@ import {YTextMap,BlockData,BlockType,-} from '@/application/collab.type';+} from '@/application/types';import { sortTableCells } from '@/application/slate-yjs/utils/table';import { BlockJson } from '@/application/slate-yjs/utils/types';import { TableCellNode } from '@/components/editor/editor.type';diff --git a/frontend/appflowy_web_app/src/application/types.ts b/frontend/appflowy_web_app/src/application/types.tsindex 50d0e17931..75a458bc1f 100644--- a/frontend/appflowy_web_app/src/application/types.ts+++ b/frontend/appflowy_web_app/src/application/types.ts@@ -1,10 +1,727 @@-import { CollabType, ViewLayout } from '@/application/collab.type';+import * as Y from 'yjs';++export type BlockId = string;++export type ExternalId = string;++export type ChildrenId = string;++export type ViewId = string;++export type RowId = string;++export type CellId = string;++export enum BlockType {+ Paragraph = 'paragraph',+ Page = 'page',+ HeadingBlock = 'heading',+ TodoListBlock = 'todo_list',+ BulletedListBlock = 'bulleted_list',+ NumberedListBlock = 'numbered_list',+ ToggleListBlock = 'toggle_list',+ CodeBlock = 'code',+ EquationBlock = 'math_equation',+ QuoteBlock = 'quote',+ CalloutBlock = 'callout',+ DividerBlock = 'divider',+ ImageBlock = 'image',+ GridBlock = 'grid',+ BoardBlock = 'board',+ CalendarBlock = 'calendar',+ OutlineBlock = 'outline',+ TableBlock = 'table',+ TableCell = 'table/cell',+ LinkPreview = 'link_preview',+ FileBlock = 'file',+ GalleryBlock = 'multi_image',+}++export enum InlineBlockType {+ Formula = 'formula',+ Mention = 'mention',+}++export enum AlignType {+ Left = 'left',+ Center = 'center',+ Right = 'right',+}++export interface BlockData {+ bgColor?: string;+ font_color?: string;+ align?: AlignType;+}++export interface HeadingBlockData extends BlockData {+ level: number;+}++export interface NumberedListBlockData extends BlockData {+ number: number;+}++export interface TodoListBlockData extends BlockData {+ checked: boolean;+}++export interface ToggleListBlockData extends BlockData {+ collapsed: boolean;+}++export interface CodeBlockData extends BlockData {+ language: string;+}++export interface CalloutBlockData extends BlockData {+ icon: string;+}++export interface MathEquationBlockData extends BlockData {+ formula?: string;+}++export interface LinkPreviewBlockData extends BlockData {+ url?: string;+}++export enum FieldURLType {+ Upload = 2,+ Link = 1,+}++export interface FileBlockData extends BlockData {+ name: string;+ uploaded_at: number;+ url: string;+ url_type: FieldURLType;+}++export enum ImageType {+ Local = 0,+ Internal = 1,+ External = 2,+}++export interface ImageBlockData extends BlockData {+ url?: string;+ width?: number;+ align?: AlignType;+ image_type?: ImageType;+ height?: number;+}++export enum GalleryLayout {+ Carousel = 0,+ Grid = 1,+}++export interface GalleryBlockData extends BlockData {+ images: {+ type: ImageType,+ url: string,+ }[];+ layout: GalleryLayout;+}++export interface OutlineBlockData extends BlockData {+ depth?: number;+}++export interface TableBlockData extends BlockData {+ colDefaultWidth: number;+ colMinimumWidth: number;+ colsHeight: number;+ colsLen: number;+ rowDefaultHeight: number;+ rowsLen: number;+}++export interface TableCellBlockData extends BlockData {+ colPosition: number;+ height: number;+ rowPosition: number;+ width: number;+ rowBackgroundColor: string;+ colBackgroundColor: string;+}++export interface DatabaseNodeData extends BlockData {+ view_id: ViewId;+}++export enum MentionType {+ PageRef = 'page',+ Date = 'date',+}++export interface Mention {+ // inline page ref id+ page_id?: string;+ // reminder date ref id+ date?: string;+ reminder_id?: string;+ reminder_option?: string;++ type: MentionType;+}++export interface FolderMeta {+ current_view: ViewId;+ current_workspace: string;+}++export enum DocCoverType {+ Color = 'CoverType.color',+ Image = 'CoverType.file',+ Asset = 'CoverType.asset',+}++export type DocCover = {+ image_type?: ImageType;+ cover_selection_type?: DocCoverType;+ cover_selection?: string;+} | null;++export enum ViewLayout {+ Document = 0,+ Grid = 1,+ Board = 2,+ Calendar = 3,+ AIChat = 4,+}++export enum YjsEditorKey {+ data_section = 'data',+ document = 'document',+ database = 'database',+ workspace_database = 'databases',+ folder = 'folder',+ // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values+ database_row = 'data',+ user_awareness = 'user_awareness',+ empty = 'empty',++ // document+ blocks = 'blocks',+ page_id = 'page_id',+ meta = 'meta',+ children_map = 'children_map',+ text_map = 'text_map',+ text = 'text',+ delta = 'delta',+ block_id = 'id',+ block_type = 'ty',+ // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values+ block_data = 'data',+ block_parent = 'parent',+ block_children = 'children',+ block_external_id = 'external_id',+ block_external_type = 'external_type',+}++export enum YjsFolderKey {+ views = 'views',+ relation = 'relation',+ section = 'section',+ private = 'private',+ favorite = 'favorite',+ recent = 'recent',+ trash = 'trash',+ meta = 'meta',+ current_view = 'current_view',+ current_workspace = 'current_workspace',+ id = 'id',+ name = 'name',+ icon = 'icon',+ extra = 'extra',+ cover = 'cover',+ line_height_layout = 'line_height_layout',+ font_layout = 'font_layout',+ type = 'ty',+ value = 'value',+ layout = 'layout',+ bid = 'bid',+}++export enum YjsDatabaseKey {+ views = 'views',+ id = 'id',+ metas = 'metas',+ fields = 'fields',+ is_primary = 'is_primary',+ last_modified = 'last_modified',+ created_at = 'created_at',+ name = 'name',+ type = 'ty',+ type_option = 'type_option',+ content = 'content',+ data = 'data',+ iid = 'iid',+ database_id = 'database_id',+ field_orders = 'field_orders',+ field_settings = 'field_settings',+ visibility = 'visibility',+ wrap = 'wrap',+ width = 'width',+ filters = 'filters',+ groups = 'groups',+ layout = 'layout',+ layout_settings = 'layout_settings',+ modified_at = 'modified_at',+ row_orders = 'row_orders',+ sorts = 'sorts',+ height = 'height',+ cells = 'cells',+ field_type = 'field_type',+ end_timestamp = 'end_timestamp',+ include_time = 'include_time',+ is_range = 'is_range',+ reminder_id = 'reminder_id',+ time_format = 'time_format',+ date_format = 'date_format',+ calculations = 'calculations',+ field_id = 'field_id',+ calculation_value = 'calculation_value',+ condition = 'condition',+ format = 'format',+ filter_type = 'filter_type',+ visible = 'visible',+ hide_ungrouped_column = 'hide_ungrouped_column',+ collapse_hidden_groups = 'collapse_hidden_groups',+ first_day_of_week = 'first_day_of_week',+ show_week_numbers = 'show_week_numbers',+ show_weekends = 'show_weekends',+ layout_ty = 'layout_ty',+}++export interface YDoc extends Y.Doc {+ // eslint-disable-next-line @typescript-eslint/no-explicit-any+ getMap (key: YjsEditorKey.data_section): YSharedRoot | any;+}++export interface YDatabaseRow extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): RowId;++ get (key: YjsDatabaseKey.height): string;++ get (key: YjsDatabaseKey.visibility): boolean;++ get (key: YjsDatabaseKey.cells): YDatabaseCells;++ get (key: YjsDatabaseKey.created_at): CreatedAt;++ get (key: YjsDatabaseKey.last_modified): LastModified;++}++export interface YDatabaseCells extends Y.Map<unknown> {+ get (key: FieldId): YDatabaseCell;+}++export type EndTimestamp = string;+export type ReminderId = string;++export interface YDatabaseCell extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.created_at): CreatedAt;++ get (key: YjsDatabaseKey.last_modified): LastModified;++ get (key: YjsDatabaseKey.field_type): string;++ get (key: YjsDatabaseKey.data): object | string | boolean | number;++ get (key: YjsDatabaseKey.end_timestamp): EndTimestamp;++ get (key: YjsDatabaseKey.include_time): boolean;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.is_range): boolean;++ get (key: YjsDatabaseKey.reminder_id): ReminderId;+}++export interface YSharedRoot extends Y.Map<unknown> {+ get (key: YjsEditorKey.document): YDocument;++ get (key: YjsEditorKey.folder): YFolder;++ get (key: YjsEditorKey.database): YDatabase;++ get (key: YjsEditorKey.database_row): YDatabaseRow;+}++export interface YFolder extends Y.Map<unknown> {+ get (key: YjsFolderKey.views): YViews;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.meta): YFolderMeta;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.relation): YFolderRelation;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.section): YFolderSection;+}++export interface YViews extends Y.Map<unknown> {+ get (key: ViewId): YView;+}++export interface YView extends Y.Map<unknown> {+ get (key: YjsFolderKey.id): ViewId;++ get (key: YjsFolderKey.bid): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.name): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.icon | YjsFolderKey.extra): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsFolderKey.layout): string;+}++export interface YFolderRelation extends Y.Map<unknown> {+ get (key: ViewId): Y.Array<ViewId>;+}++export interface YFolderMeta extends Y.Map<unknown> {+ get (key: YjsFolderKey.current_view | YjsFolderKey.current_workspace): string;+}++export interface YFolderSection extends Y.Map<unknown> {+ get (key: YjsFolderKey.favorite | YjsFolderKey.private | YjsFolderKey.recent | YjsFolderKey.trash): YFolderSectionItem;+}++export interface YFolderSectionItem extends Y.Map<unknown> {+ get (key: string): Y.Array<unknown>;+}++export interface YDocument extends Y.Map<unknown> {+ get (key: YjsEditorKey.blocks | YjsEditorKey.page_id | YjsEditorKey.meta): YBlocks | YMeta | string;+}++export interface YBlocks extends Y.Map<unknown> {+ get (key: BlockId): YBlock;+}++export interface YBlock extends Y.Map<unknown> {+ get (key: YjsEditorKey.block_id | YjsEditorKey.block_parent): BlockId;++ get (key: YjsEditorKey.block_type): BlockType;++ get (key: YjsEditorKey.block_data): string;++ get (key: YjsEditorKey.block_children): ChildrenId;++ get (key: YjsEditorKey.block_external_id): ExternalId;+}++export interface YMeta extends Y.Map<unknown> {+ get (key: YjsEditorKey.children_map | YjsEditorKey.text_map): YChildrenMap | YTextMap;+}++export interface YChildrenMap extends Y.Map<unknown> {+ get (key: ChildrenId): Y.Array<BlockId>;+}++export interface YTextMap extends Y.Map<unknown> {+ get (key: ExternalId): Y.Text;+}++export interface YDatabase extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.views): YDatabaseViews;++ get (key: YjsDatabaseKey.metas): YDatabaseMetas;++ get (key: YjsDatabaseKey.fields): YDatabaseFields;++ get (key: YjsDatabaseKey.id): string;+}++export interface YDatabaseViews extends Y.Map<YDatabaseView> {+ get (key: ViewId): YDatabaseView;+}++export type DatabaseId = string;+export type CreatedAt = string;+export type LastModified = string;+export type ModifiedAt = string;+export type FieldId = string;++export enum DatabaseViewLayout {+ Grid = 0,+ Board = 1,+ Calendar = 2,+}++export interface YDatabaseView extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.database_id): DatabaseId;++ get (key: YjsDatabaseKey.name): string;++ get (key: YjsDatabaseKey.created_at): CreatedAt;++ get (key: YjsDatabaseKey.modified_at): ModifiedAt;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.layout): string;++ get (key: YjsDatabaseKey.layout_settings): YDatabaseLayoutSettings;++ get (key: YjsDatabaseKey.filters): YDatabaseFilters;++ get (key: YjsDatabaseKey.groups): YDatabaseGroups;++ get (key: YjsDatabaseKey.sorts): YDatabaseSorts;++ get (key: YjsDatabaseKey.field_settings): YDatabaseFieldSettings;++ get (key: YjsDatabaseKey.field_orders): YDatabaseFieldOrders;++ get (key: YjsDatabaseKey.row_orders): YDatabaseRowOrders;++ get (key: YjsDatabaseKey.calculations): YDatabaseCalculations;+}++export type YDatabaseFieldOrders = Y.Array<unknown>; // [ { id: FieldId } ]++export type YDatabaseRowOrders = Y.Array<YDatabaseRowOrder>; // [ { id: RowId, height: number } ]++export type YDatabaseGroups = Y.Array<YDatabaseGroup>;++export type YDatabaseFilters = Y.Array<YDatabaseFilter>;++export type YDatabaseSorts = Y.Array<YDatabaseSort>;++export type YDatabaseCalculations = Y.Array<YDatabaseCalculation>;++export type SortId = string;++export type GroupId = string;++export interface YDatabaseLayoutSettings extends Y.Map<unknown> {+ // DatabaseViewLayout.Board+ get (key: '1'): YDatabaseBoardLayoutSetting;++ // DatabaseViewLayout.Calendar+ get (key: '2'): YDatabaseCalendarLayoutSetting;+}++export interface YDatabaseBoardLayoutSetting extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.hide_ungrouped_column | YjsDatabaseKey.collapse_hidden_groups): boolean;+}++export interface YDatabaseCalendarLayoutSetting extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.first_day_of_week | YjsDatabaseKey.field_id | YjsDatabaseKey.layout_ty): string;++ get (key: YjsDatabaseKey.show_week_numbers | YjsDatabaseKey.show_weekends): boolean;+}++export interface YDatabaseGroup extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): GroupId;++ get (key: YjsDatabaseKey.field_id): FieldId;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.content): string;++ get (key: YjsDatabaseKey.groups): YDatabaseGroupColumns;+}++export type YDatabaseGroupColumns = Y.Array<YDatabaseGroupColumn>;++export interface YDatabaseGroupColumn extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): string;++ get (key: YjsDatabaseKey.visible): boolean;+}++export interface YDatabaseRowOrder extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): SortId;++ get (key: YjsDatabaseKey.height): number;+}++export interface YDatabaseSort extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): SortId;++ get (key: YjsDatabaseKey.field_id): FieldId;++ get (key: YjsDatabaseKey.condition): string;+}++export type FilterId = string;++export interface YDatabaseFilter extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.id): FilterId;++ get (key: YjsDatabaseKey.field_id): FieldId;++ get (key: YjsDatabaseKey.type | YjsDatabaseKey.condition | YjsDatabaseKey.content | YjsDatabaseKey.filter_type): string;+}++export interface YDatabaseCalculation extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.field_id): FieldId;++ get (key: YjsDatabaseKey.id | YjsDatabaseKey.type | YjsDatabaseKey.calculation_value): string;+}++export interface YDatabaseFieldSettings extends Y.Map<unknown> {+ get (key: FieldId): YDatabaseFieldSetting;+}++export interface YDatabaseFieldSetting extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.visibility): string;++ get (key: YjsDatabaseKey.wrap): boolean;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.width): string;+}++export interface YDatabaseMetas extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.iid): string;+}++export interface YDatabaseFields extends Y.Map<YDatabaseField> {+ get (key: FieldId): YDatabaseField;+}++export interface YDatabaseField extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.name): string;++ get (key: YjsDatabaseKey.id): FieldId;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.type): string;++ get (key: YjsDatabaseKey.type_option): YDatabaseFieldTypeOption;++ get (key: YjsDatabaseKey.is_primary): boolean;++ get (key: YjsDatabaseKey.last_modified): LastModified;+}++export interface YDatabaseFieldTypeOption extends Y.Map<unknown> {+ // key is the field type+ get (key: string): YMapFieldTypeOption;+}++export interface YMapFieldTypeOption extends Y.Map<unknown> {+ get (key: YjsDatabaseKey.content): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.data): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.time_format): string;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.date_format): string;++ get (key: YjsDatabaseKey.database_id): DatabaseId;++ // eslint-disable-next-line @typescript-eslint/unified-signatures+ get (key: YjsDatabaseKey.format): string;+}++export enum Types {+ Document = 0,+ Database = 1,+ WorkspaceDatabase = 2,+ Folder = 3,+ DatabaseRow = 4,+ UserAwareness = 5,+ Empty = 6,+}++export enum CollabOrigin {+ // from local changes and never sync to remote. used for read-only mode+ Local = 'local',+ // from remote changes and never sync to remote.+ Remote = 'remote',+ // from local changes and sync to remote. used for collaborative mode+ LocalSync = 'local_sync',+}++export const layoutMap = {+ [ViewLayout.Document]: 'document',+ [ViewLayout.Grid]: 'grid',+ [ViewLayout.Board]: 'board',+ [ViewLayout.Calendar]: 'calendar',+};++export const databaseLayoutMap = {+ [DatabaseViewLayout.Grid]: 'grid',+ [DatabaseViewLayout.Board]: 'board',+ [DatabaseViewLayout.Calendar]: 'calendar',+};++export enum FontLayout {+ small = 'small',+ normal = 'normal',+ large = 'large',+}++export enum LineHeightLayout {+ small = 'small',+ normal = 'normal',+ large = 'large',+}++export interface ViewMetaIcon {+ ty: number;+ value: string;+}++export interface ViewInfo {+ view_id: string;+ name: string;+ icon: ViewMetaIcon | null;+ extra: string | null;+ layout: number;+ created_at: string;+ created_by: string;+ last_edited_time: string;+ last_edited_by: string;+ child_views: ViewInfo[] | null;+}++export interface PublishViewMetaData {+ view: ViewInfo;+ child_views: ViewInfo[];+ ancestor_views: ViewInfo[];+}++export type AppendBreadcrumb = (view?: View) => void;++export type CreateRowDoc = (rowKey: string) => Promise<YDoc>;+export type LoadView = (viewId: string, isSubDocument?: boolean) => Promise<YDoc>;++export type LoadViewMeta = (viewId: string, onChange?: (meta: View | null) => void) => Promise<View>;++export type DatabaseRelations = Record<DatabaseId, ViewId>;export interface Workspace {icon: string;id: string;name: string;memberCount: number;+ owner?: {+ uid: number;+ name: string;+ };+ databaseStorageId: string;+}++export interface UserWorkspaceInfo {+ userId: string;+ selectedWorkspace: Workspace;+ workspaces: Workspace[];}export interface SpaceView {@@ -30,12 +747,13 @@ export interface User {uid: string;avatar: string | null;uuid: string;+ latestWorkspaceId: string;}export interface DuplicatePublishView {workspaceId: string;spaceViewId: string;- collabType: CollabType;+ collabType: Types;viewId: string;}@@ -55,6 +773,11 @@ export interface ViewExtra {space_icon?: string;space_icon_color?: string;space_permission?: number;+ is_pinned?: boolean;+ cover?: {+ type: CoverType;+ value: string;+ };}export interface View {@@ -65,6 +788,10 @@ export interface View {extra: ViewExtra | null;children: View[];is_published: boolean;+ is_private: boolean;+ last_edited_time?: string;+ created_at?: string;+ database_relations?: DatabaseRelations;}export interface Invitation {@@ -77,4 +804,21 @@ export interface Invitation {workspace_icon: string;member_count: number;status: 'Accepted' | 'Pending';+}++export enum CoverType {+ NormalColor = 'color',+ GradientColor = 'gradient',+ BuildInImage = 'built_in',+ CustomImage = 'custom',+ LocalImage = 'local',+ UpsplashImage = 'unsplash',+ None = 'none',+}++export enum UIVariant {+ Publish = 'publish',+ App = 'app',+ Recent = 'recent',+ Favorite = 'favorite',}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/application/ydoc/apply/__tests__/document.test.ts b/frontend/appflowy_web_app/src/application/ydoc/apply/__tests__/document.test.tsindex 8a332f4b60..ac7cc490d9 100644--- a/frontend/appflowy_web_app/src/application/ydoc/apply/__tests__/document.test.ts+++ b/frontend/appflowy_web_app/src/application/ydoc/apply/__tests__/document.test.ts@@ -1,4 +1,4 @@-import { YjsEditorKey } from '@/application/collab.type';+import { YjsEditorKey } from '@/application/types';import { applyYDoc } from '@/application/ydoc/apply';import * as Y from 'yjs';import * as docJson from '../../../../../cypress/fixtures/simple_doc.json';diff --git a/frontend/appflowy_web_app/src/application/ydoc/apply/index.ts b/frontend/appflowy_web_app/src/application/ydoc/apply/index.tsindex 1a0eb39c78..d4d7188e96 100644--- a/frontend/appflowy_web_app/src/application/ydoc/apply/index.ts+++ b/frontend/appflowy_web_app/src/application/ydoc/apply/index.ts@@ -1,4 +1,4 @@-import { CollabOrigin } from '@/application/collab.type';+import { CollabOrigin } from '@/application/types';import * as Y from 'yjs';/**diff --git a/frontend/appflowy_web_app/src/assets/close_error.svg b/frontend/appflowy_web_app/src/assets/close_error.svgnew file mode 100644index 0000000000..6e1321a6ec--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/close_error.svg@@ -0,0 +1,9 @@++<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<mask id="mask0_4030_10552" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="16" height="16">+<rect width="16" height="16" fill="#D9D9D9"/>+</mask>+<g mask="url(#mask0_4030_10552)">+<path d="M4.26659 12.7942L3.20572 11.7333L6.93905 8.00001L3.20572 4.26668L4.26659 3.20581L7.99992 6.93914L11.7333 3.20581L12.7941 4.26668L9.06078 8.00001L12.7941 11.7333L11.7333 12.7942L7.99992 9.06088L4.26659 12.7942Z" fill="#900000"/>+</g>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/debug.svg b/frontend/appflowy_web_app/src/assets/debug.svgnew file mode 100644index 0000000000..643edfbd23--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/debug.svg@@ -0,0 +1,20 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<g clip-path="url(#clip0_51_8)">+<path d="M12.7861 10.0512V7.95725C12.7861 6.47044 11.5807 5.26513 10.0939 5.26513H5.90618C4.4193 5.26513 3.21399 6.47044 3.21399 7.95725V10.0512C3.21399 12.6944 5.3568 14.8372 8.00005 14.8372C10.6433 14.8372 12.7861 12.6944 12.7861 10.0512Z" stroke="black"/>+<path d="M11.0767 5.607V4.92325C11.0767 3.224 9.69922 1.8465 7.99997 1.8465C6.30072 1.8465 4.92322 3.224 4.92322 4.92325V5.607" stroke="black"/>+<path d="M12.786 9.36744H14.8371" stroke="black" stroke-linecap="round"/>+<path d="M3.21397 9.36744H1.16284" stroke="black" stroke-linecap="round"/>+<path d="M9.70935 2.18837L11.4187 1.16281" stroke="black" stroke-linecap="round"/>+<path d="M6.29073 2.18837L4.58142 1.16281" stroke="black" stroke-linecap="round"/>+<path d="M13.8117 13.4699L12.4442 12.9229" stroke="black" stroke-linecap="round"/>+<path d="M13.8117 5.265L12.4442 5.81194" stroke="black" stroke-linecap="round"/>+<path d="M2.18835 13.4699L3.55579 12.9229" stroke="black" stroke-linecap="round"/>+<path d="M2.18835 5.265L3.55579 5.81194" stroke="black" stroke-linecap="round"/>+<path d="M8 14.4954V10.0512" stroke="black" stroke-linecap="round"/>+</g>+<defs>+<clipPath id="clip0_51_8">+<rect width="16" height="16" fill="white"/>+</clipPath>+</defs>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/favorite.svg b/frontend/appflowy_web_app/src/assets/favorite.svgnew file mode 100644index 0000000000..addd7d4915--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/favorite.svg@@ -0,0 +1,3 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M9.15132 2.33977L10.3247 4.68643C10.4847 5.0131 10.9113 5.32643 11.2713 5.38643L13.398 5.73977C14.758 5.96643 15.078 6.9531 14.098 7.92643L12.4447 9.57977C12.1647 9.85977 12.0113 10.3998 12.098 10.7864L12.5713 12.8331C12.9447 14.4531 12.0847 15.0798 10.6513 14.2331L8.65799 13.0531C8.29799 12.8398 7.70465 12.8398 7.33799 13.0531L5.34465 14.2331C3.91799 15.0798 3.05132 14.4464 3.42465 12.8331L3.89799 10.7864C3.98465 10.3998 3.83132 9.85977 3.55132 9.57977L1.89799 7.92643C0.924653 6.9531 1.23799 5.96643 2.59799 5.73977L4.72465 5.38643C5.07799 5.32643 5.50465 5.0131 5.66465 4.68643L6.83799 2.33977C7.47799 1.06643 8.51799 1.06643 9.15132 2.33977Z" stroke="#171717" stroke-linecap="round" stroke-linejoin="round"/>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/favorited.svg b/frontend/appflowy_web_app/src/assets/favorited.svgnew file mode 100644index 0000000000..a17f7548cd--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/favorited.svg@@ -0,0 +1,3 @@+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M10.2967 2.63248L11.6167 5.27248C11.7967 5.63998 12.2767 5.99248 12.6817 6.05998L15.0742 6.45748C16.6042 6.71248 16.9642 7.82248 15.8617 8.91748L14.0017 10.7775C13.6867 11.0925 13.5142 11.7 13.6117 12.135L14.1442 14.4375C14.5642 16.26 13.5967 16.965 11.9842 16.0125L9.7417 14.685C9.3367 14.445 8.6692 14.445 8.2567 14.685L6.0142 16.0125C4.4092 16.965 3.4342 16.2525 3.8542 14.4375L4.3867 12.135C4.4842 11.7 4.3117 11.0925 3.9967 10.7775L2.1367 8.91748C1.0417 7.82248 1.3942 6.71248 2.9242 6.45748L5.3167 6.05998C5.7142 5.99248 6.1942 5.63998 6.3742 5.27248L7.6942 2.63248C8.4142 1.19998 9.5842 1.19998 10.2967 2.63248Z" fill="#FFBA00"/>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/gallery.svg b/frontend/appflowy_web_app/src/assets/gallery.svgnew file mode 100644index 0000000000..59f3c6f474--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/gallery.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="currentColor">+ <path d="M360-384h384L618-552l-90 120-66-88-102 136Zm-48 144q-29.7 0-50.85-21.15Q240-282.3 240-312v-480q0-29.7 21.15-50.85Q282.3-864 312-864h480q29.7 0 50.85 21.15Q864-821.7 864-792v480q0 29.7-21.15 50.85Q821.7-240 792-240H312Zm0-72h480v-480H312v480ZM168-96q-29.7 0-50.85-21.15Q96-138.3 96-168v-552h72v552h552v72H168Zm144-696v480-480Z"/>+</svg>\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/assets/help.svg b/frontend/appflowy_web_app/src/assets/help.svgnew file mode 100644index 0000000000..b16340a6cf--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/help.svg@@ -0,0 +1,5 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path d="M4.55676 4.62532C4.55676 0.243068 11.4431 0.24313 11.4431 4.62532C11.4431 7.75538 8.31295 7.12932 8.31295 10.8854"+ stroke="black" stroke-linecap="round" stroke-linejoin="round"/>+ <path d="M8.32104 14.6614L8.33023 14.6512" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>+</svg>\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/assets/image.svg b/frontend/appflowy_web_app/src/assets/image.svgnew file mode 100644index 0000000000..0e2aafe0ec--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/image.svg@@ -0,0 +1,5 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<rect x="1.5" y="3" width="13" height="10" rx="1.5" stroke="#333333"/>+<circle cx="5.5" cy="6.5" r="1" stroke="#333333"/>+<path d="M5 13L10.112 8.45603C10.4211 8.18126 10.8674 8.12513 11.235 8.31482L14.5 10" stroke="#333333"/>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/message_support.svg b/frontend/appflowy_web_app/src/assets/message_support.svgnew file mode 100644index 0000000000..03e72384d7--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/message_support.svg@@ -0,0 +1,12 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<g clip-path="url(#clip0_51_4)">+<path d="M5.47817 13.2508C9.79161 15.4635 14.8829 12.177 14.6424 7.33506C14.4019 2.49313 9.01011 -0.272812 4.93711 2.35644C2.21798 4.11169 1.27198 7.64219 2.74917 10.5218L1.34973 14.6503L5.47817 13.2508Z" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M6.31091 5.55369C6.84716 4.02931 8.83254 3.65706 9.88454 4.88369C10.2117 5.265 10.3911 5.75106 10.3904 6.25344C10.3904 7.65294 8.29116 8.35262 8.29116 8.35262" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>+<path d="M8.34705 11.1516H8.35405" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>+</g>+<defs>+<clipPath id="clip0_51_4">+<rect width="16" height="16" fill="white"/>+</clipPath>+</defs>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/star.svg b/frontend/appflowy_web_app/src/assets/star.svgnew file mode 100644index 0000000000..f4d6f7ae3c--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/star.svg@@ -0,0 +1,10 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<g clip-path="url(#clip0_51_2)">+<path d="M6.0536 3.49319C6.9196 1.93962 7.3526 1.16281 8.00004 1.16281C8.64748 1.16281 9.08048 1.93956 9.94648 3.49319L10.1705 3.89512C10.4167 4.33656 10.5397 4.55731 10.7315 4.703C10.9234 4.84862 11.1623 4.90269 11.6402 5.01081L12.0754 5.10925C13.757 5.48975 14.5979 5.68 14.798 6.32331C14.998 6.96662 14.4248 7.637 13.2783 8.97762L12.9817 9.3245C12.6559 9.7055 12.493 9.89594 12.4197 10.1316C12.3464 10.3673 12.371 10.6214 12.4203 11.1298L12.4651 11.5926C12.6385 13.3813 12.7252 14.2757 12.2014 14.6732C11.6776 15.0708 10.8903 14.7083 9.31573 13.9834L8.90835 13.7957C8.46092 13.5897 8.23723 13.4867 8.00004 13.4867C7.76285 13.4867 7.5391 13.5897 7.09173 13.7957L6.68435 13.9834C5.10973 14.7083 4.32242 15.0708 3.79867 14.6732C3.27492 14.2757 3.3616 13.3813 3.53492 11.5926L3.57973 11.1298C3.62904 10.6214 3.65367 10.3673 3.58035 10.1316C3.5071 9.89594 3.34417 9.7055 3.01835 9.3245L2.72179 8.97762C1.57529 7.637 1.00204 6.96662 1.2021 6.32331C1.4021 5.68 2.24298 5.48975 3.92473 5.10925L4.35979 5.01081C4.83773 4.90269 5.07667 4.84862 5.26854 4.703C5.46042 4.55737 5.58342 4.33656 5.82954 3.89512L6.0536 3.49319Z" stroke="black"/>+</g>+<defs>+<clipPath id="clip0_51_2">+<rect width="16" height="16" fill="white"/>+</clipPath>+</defs>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/template.svg b/frontend/appflowy_web_app/src/assets/template.svgindex c82a7ee026..887b30a756 100644--- a/frontend/appflowy_web_app/src/assets/template.svg+++ b/frontend/appflowy_web_app/src/assets/template.svg@@ -1,6 +1,10 @@-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">- <path d="M11.8889 3H4.11111C3.49746 3 3 3.49746 3 4.11111V11.8889C3 12.5025 3.49746 13 4.11111 13H11.8889C12.5025 13 13 12.5025 13 11.8889V4.11111C13 3.49746 12.5025 3 11.8889 3Z"- stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>- <path d="M3 6.33203H13" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>- <path d="M7 12.9987V6.33203" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>+<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20' fill='none'>+ <g opacity='1'>+ <path+ d='M10.4469 2.8263L10.3987 2.81336L10.3857 2.86166L8.66025 9.30116L8.64731 9.34946L8.69561 9.3624L10.2392 9.776L10.2763 9.78593L10.2954 9.75271L11.1005 8.35836C11.7227 7.28058 13.2784 7.28058 13.9006 8.35836L15.2183 10.6407L15.2787 10.7452L15.3099 10.6286L16.9218 4.613L16.9348 4.5647L16.8865 4.55176L10.4469 2.8263ZM16.203 12.2648L16.1716 12.2918L16.1923 12.3277L18.2307 15.8584C18.853 16.9361 18.0752 18.2834 16.8307 18.2834H8.17041C7.22595 18.2834 6.54962 17.5072 6.55126 16.6611L6.55136 16.6087L6.49899 16.611C6.41664 16.6148 6.33381 16.6167 6.25053 16.6167C3.2866 16.6167 0.883862 14.214 0.883862 11.25C0.883862 8.2861 3.2866 5.88336 6.25053 5.88336C6.80273 5.88336 7.33536 5.96674 7.83657 6.12157L7.88618 6.1369L7.89962 6.08674L8.87243 2.45618C9.10352 1.59374 9.99 1.08193 10.8524 1.31302L17.2919 3.03848C18.1544 3.26957 18.6662 4.15605 18.4351 5.01848L16.7096 11.458C16.6222 11.7842 16.4411 12.0602 16.203 12.2648ZM9.43271 11.247L9.46529 11.1906L9.40235 11.1737L8.29013 10.8757C7.42769 10.6446 6.91588 9.75812 7.14697 8.89568L7.46769 7.69872L7.47994 7.65301L7.43497 7.63827C7.06218 7.51609 6.66402 7.45003 6.25053 7.45003C4.15185 7.45003 2.45053 9.15135 2.45053 11.25C2.45053 13.3487 4.15185 15.05 6.25053 15.05C6.61697 15.05 6.97138 14.9981 7.30677 14.9013L7.32613 14.8957L7.3362 14.8783L9.43271 11.247ZM16.9173 16.7167L16.874 16.6417L12.5438 9.14169L12.5005 9.06669L12.4572 9.14169L8.12711 16.6417L8.08381 16.7167H8.17041H16.8307H16.9173Z'+ fill='currentColor'+ stroke='currentColor'+ stroke-width='0.1'+ />+ </g></svg>\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/assets/warning.svg b/frontend/appflowy_web_app/src/assets/warning.svgnew file mode 100644index 0000000000..7ac605dffc--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/warning.svg@@ -0,0 +1,5 @@+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<circle cx="8.00033" cy="7.99984" r="7.33333" fill="#FF811A"/>+<path d="M7.99967 4.6665C7.63148 4.6665 7.33301 4.96498 7.33301 5.33317V8.6665C7.33301 9.03469 7.63148 9.33317 7.99967 9.33317C8.36786 9.33317 8.66634 9.03469 8.66634 8.6665V5.33317C8.66634 4.96498 8.36786 4.6665 7.99967 4.6665Z" fill="white"/>+<path d="M7.99967 11.3332C8.36786 11.3332 8.66634 11.0347 8.66634 10.6665C8.66634 10.2983 8.36786 9.99984 7.99967 9.99984C7.63148 9.99984 7.33301 10.2983 7.33301 10.6665C7.33301 11.0347 7.63148 11.3332 7.99967 11.3332Z" fill="white"/>+</svg>diff --git a/frontend/appflowy_web_app/src/assets/x_circle.svg b/frontend/appflowy_web_app/src/assets/x_circle.svgnew file mode 100644index 0000000000..518585573d--- /dev/null+++ b/frontend/appflowy_web_app/src/assets/x_circle.svg@@ -0,0 +1,5 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">+ <path fill-rule="evenodd"+ d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"+ clip-rule="evenodd"/>+</svg>\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/appflowy-power/AppFlowyPower.tsx b/frontend/appflowy_web_app/src/components/_shared/appflowy-power/AppFlowyPower.tsxindex e7bf84761c..22fb0c8da9 100644--- a/frontend/appflowy_web_app/src/components/_shared/appflowy-power/AppFlowyPower.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/appflowy-power/AppFlowyPower.tsx@@ -13,7 +13,6 @@ function AppFlowyPower ({<divstyle={{width,- boxShadow: 'var(--bg-footer) 0px -4px 14px 13px',}}className={'flex rounded-[16px] transform-gpu bg-bg-body sticky bottom-[-0.5px] w-full flex-col items-center justify-center'}>diff --git a/frontend/appflowy_web_app/src/components/publish/header/Breadcrumb.tsx b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/Breadcrumb.tsxsimilarity index 60%rename from frontend/appflowy_web_app/src/components/publish/header/Breadcrumb.tsxrename to frontend/appflowy_web_app/src/components/_shared/breadcrumb/Breadcrumb.tsxindex 1a1fcb4830..332de0c457 100644--- a/frontend/appflowy_web_app/src/components/publish/header/Breadcrumb.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/Breadcrumb.tsx@@ -1,23 +1,28 @@-import { View } from '@/application/types';+import { UIVariant, View } from '@/application/types';import { AFScroller } from '@/components/_shared/scroller';-import BreadcrumbItem from '@/components/publish/header/BreadcrumbItem';-import React, { useMemo } from 'react';+import BreadcrumbItem from '@/components/_shared/breadcrumb/BreadcrumbItem';+import React, { memo, useMemo } from 'react';import { ReactComponent as RightIcon } from '@/assets/arrow_right.svg';-export function Breadcrumb ({ crumbs }: { crumbs: View[] }) {+export function Breadcrumb ({ crumbs, toView, variant }: {+ crumbs: View[];+ toView?: (viewId: string) => Promise<void>;+ variant?: UIVariant;+}) {const renderCrumb = useMemo(() => {+return crumbs?.map((crumb, index) => {const isLast = index === crumbs.length - 1;const key = `${crumb.view_id}-${index}`;return (<div className={`${isLast ? 'text-text-title' : 'text-text-caption'} flex items-center gap-2`} key={key}>- <BreadcrumbItem crumb={crumb} disableClick={isLast} />+ <BreadcrumbItem variant={variant} toView={toView} crumb={crumb} disableClick={isLast} />{!isLast && <RightIcon className={'h-4 w-4'} />}</div>);});- }, [crumbs]);+ }, [crumbs, toView, variant]);return (<div className={'relative h-full w-full flex-1 overflow-hidden'}>@@ -28,4 +33,4 @@ export function Breadcrumb ({ crumbs }: { crumbs: View[] }) {);}-export default Breadcrumb;+export default memo(Breadcrumb);diff --git a/frontend/appflowy_web_app/src/components/publish/header/BreadcrumbItem.tsx b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/BreadcrumbItem.tsxsimilarity index 57%rename from frontend/appflowy_web_app/src/components/publish/header/BreadcrumbItem.tsxrename to frontend/appflowy_web_app/src/components/_shared/breadcrumb/BreadcrumbItem.tsxindex 216824e87a..789cba4cfa 100644--- a/frontend/appflowy_web_app/src/components/publish/header/BreadcrumbItem.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/BreadcrumbItem.tsx@@ -1,32 +1,49 @@-import { ReactComponent as PublishIcon } from '@/assets/publish.svg';-import { usePublishContext } from '@/application/publish';-import { View } from '@/application/types';+import { UIVariant, View } from '@/application/types';+import PublishIcon from '@/components/_shared/view-icon/PublishIcon';import { notify } from '@/components/_shared/notify';import { ViewIcon } from '@/components/_shared/view-icon';-import SpaceIcon from '@/components/publish/header/SpaceIcon';+import SpaceIcon from '@/components/_shared/breadcrumb/SpaceIcon';import { renderColor } from '@/utils/color';import { isFlagEmoji } from '@/utils/emoji';import { Tooltip } from '@mui/material';import React, { useMemo } from 'react';import { useTranslation } from 'react-i18next';-function BreadcrumbItem ({ crumb, disableClick = false }: { crumb: View; disableClick?: boolean }) {+function BreadcrumbItem ({ crumb, disableClick = false, toView, variant }: {+ crumb: View;+ disableClick?: boolean;+ toView?: (viewId: string) => Promise<void>;+ variant?: UIVariant+}) {const { view_id, icon, name, layout, extra, is_published } = crumb;const { t } = useTranslation();- const onNavigateToView = usePublishContext()?.toView;const isFlag = useMemo(() => {return icon ? isFlagEmoji(icon.value) : false;}, [icon]);+ const className = useMemo(() => {+ const classList = ['flex', 'items-center', 'gap-1.5', 'text-sm'];++ if (!disableClick && !extra?.is_space) {+ if ((is_published && variant === 'publish') || variant === 'app') {+ classList.push('cursor-pointer hover:text-text-title hover:underline');+ } else {+ classList.push('flex-1', 'overflow-hidden');+ }+ }++ return classList.join(' ');+ }, [disableClick, extra?.is_space, is_published, variant]);+return (<div- className={`flex items-center gap-1.5 text-sm ${!disableClick && is_published ? 'cursor-pointer' : 'flex-1 overflow-hidden'}`}+ className={className}onClick={async () => {- if (disableClick || !is_published) return;+ if (disableClick || extra?.is_space || (!is_published && variant === 'publish')) return;try {- await onNavigateToView?.(view_id);+ await toView?.(view_id);// eslint-disable-next-line @typescript-eslint/no-explicit-any} catch (e: any) {notify.error(e.message);@@ -51,24 +68,13 @@ function BreadcrumbItem ({ crumb, disableClick = false }: { crumb: View; disable<Tooltip title={name} placement={'bottom'} enterDelay={1000} enterNextDelay={1000}><spanclassName={- 'max-w-[250px] overflow-hidden truncate ' +- (!disableClick && is_published ? 'hover:text-text-title hover:underline' : 'flex-1')+ 'max-w-[250px] overflow-hidden truncate '}>{name || t('menuAppHeader.defaultNewPageName')}</span></Tooltip>- {!is_published && !extra?.is_space && (<Tooltip- disableInteractive- title={extra?.is_space ? t('publish.spaceHasNotBeenPublished') : t('publish.hasNotBeenPublished')}- >- <div- className={'text-text-caption cursor-pointer hover:bg-fill-list-hover rounded h-5 w-5 flex items-center justify-center'}- >- <PublishIcon className={'h-4 w-4'} />- </div>- </Tooltip>)}-+ <PublishIcon variant={variant} view={crumb} /></div>);}diff --git a/frontend/appflowy_web_app/src/components/publish/header/SpaceIcon.tsx b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/SpaceIcon.tsxsimilarity index 100%rename from frontend/appflowy_web_app/src/components/publish/header/SpaceIcon.tsxrename to frontend/appflowy_web_app/src/components/_shared/breadcrumb/SpaceIcon.tsxdiff --git a/frontend/appflowy_web_app/src/components/_shared/breadcrumb/index.ts b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/index.tsnew file mode 100644index 0000000000..dddd5f3e99--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/breadcrumb/index.ts@@ -0,0 +1 @@+export * from './Breadcrumb';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/help/Help.tsx b/frontend/appflowy_web_app/src/components/_shared/help/Help.tsxnew file mode 100644index 0000000000..b7c46fab01--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/help/Help.tsx@@ -0,0 +1,119 @@+import { notify } from '@/components/_shared/notify';+import { Popover } from '@/components/_shared/popover';+import { copyTextToClipboard } from '@/utils/copy';+import { Button, Divider, Portal, Tooltip } from '@mui/material';+import { PopoverProps } from '@mui/material/Popover';+import * as React from 'react';+import Box from '@mui/material/Box';+import { ReactComponent as SpeedDialIcon } from '@/assets/help.svg';+import { useTranslation } from 'react-i18next';+import { ReactComponent as WhatsNewIcon } from '@/assets/star.svg';+import { ReactComponent as SupportIcon } from '@/assets/message_support.svg';+import { ReactComponent as DebugIcon } from '@/assets/debug.svg';+import { ReactComponent as FeedbackIcon } from '@/assets/report.svg';++const popoverProps: Partial<PopoverProps> = {+ anchorOrigin: {+ vertical: 'top',+ horizontal: 'right',+ },+ transformOrigin: {+ vertical: 'bottom',+ horizontal: 'right',+ },+};++export default function Help () {+ const ref = React.useRef<HTMLDivElement | null>(null);+ const [open, setOpen] = React.useState(false);+ const { t } = useTranslation();++ return (+ <Portal>+ <Box className={'fixed bottom-6 right-6'} sx={{ transform: 'translateZ(0px)', flexGrow: 1 }}>+ <Tooltip title={t('questionBubble.help')}>+ <div+ ref={ref}+ onClick={() => setOpen(!open)}+ className={'w-9 h-9 rounded-full flex items-center justify-center border border-line-divider bg-bg-body hover:bg-fill-list-hover cursor-pointer shadow'}+ >+ <SpeedDialIcon className={'w-4 h-4'} />+ </div>+ </Tooltip>+ <Popover {...popoverProps} open={open} anchorEl={ref.current} onClose={() => setOpen(false)}>+ <div className={'flex flex-col gap-1 w-[240px] h-fit p-2'}>+ <Button+ component={'a'}+ target="_blank"+ href={'https://www.appflowy.io/what-is-new'}+ className={'justify-start'}+ color={'inherit'} startIcon={<WhatsNewIcon />} variant={'text'}+ >{t('questionBubble.whatsNew')}+ </Button>+ <Button+ component={'a'}+ href={'https://discord.gg/9Q2xaN37tV'}+ className={'justify-start'}+ target="_blank"+ color={'inherit'} startIcon={<SupportIcon />} variant={'text'}+ >{t('questionBubble.help')}+ </Button>+ <Button+ onClick={() => {+ const info = {+ platform: 'web',+ url: window.location.href,+ userAgent: navigator.userAgent,++ };++ void copyTextToClipboard(JSON.stringify(info, null, 2));+ notify.success(t('questionBubble.debug.success'));+ }}+ className={'justify-start'}+ color={'inherit'} startIcon={<DebugIcon />} variant={'text'}+ >{t('questionBubble.debug.name')}+ </Button>+ <Button+ component={'a'}+ target="_blank"+ href={'https://github.com/AppFlowy-IO/AppFlowy/issues/new/choose'}+ className={'justify-start'}+ color={'inherit'} startIcon={<FeedbackIcon />} variant={'text'}+ >{t('questionBubble.feedback')}+ </Button>+ <Divider />+ <Button+ size={'small'}+ target="_blank"+ component={'a'}+ href={'https://forum.appflowy.io/'}+ className={'justify-start text-text-caption'}+ color={'inherit'} variant={'text'}+ >Community Forum+ </Button>+ <Button+ size={'small'}+ component={'a'}+ target="_blank"+ href={'https://x.com/appflowy'}+ className={'justify-start text-text-caption'}+ color={'inherit'} variant={'text'}+ >Twitter - @appflowy+ </Button>+ <Button+ size={'small'}+ component={'a'}+ target="_blank"+ href={'https://www.reddit.com/r/AppFlowy/'}+ className={'justify-start text-text-caption'}+ color={'inherit'} variant={'text'}+ >Reddit - r/appflowy+ </Button>+ </div>+ </Popover>+ </Box>+ </Portal>++ );+}diff --git a/frontend/appflowy_web_app/src/components/_shared/help/index.ts b/frontend/appflowy_web_app/src/components/_shared/help/index.tsnew file mode 100644index 0000000000..3197cfa9ac--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/help/index.ts@@ -0,0 +1 @@+export * from './Help';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/modal/CacheClearingDialog.tsx b/frontend/appflowy_web_app/src/components/_shared/modal/CacheClearingDialog.tsxnew file mode 100644index 0000000000..cf0f58ef00--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/modal/CacheClearingDialog.tsx@@ -0,0 +1,68 @@+import IndexedDBCleaner from '@/components/_shared/modal/IndexedDBCleaner';+import NormalModal from '@/components/_shared/modal/NormalModal';+import React from 'react';+import {+ DialogContent,+ DialogContentText,+ List,+ ListItem,+ ListItemText,+} from '@mui/material';+import { useTranslation } from 'react-i18next';+import { ReactComponent as ErrorIcon } from '@/assets/error.svg';++const CacheClearingDialog = ({ open, onClose }: { open: boolean; onClose: () => void }) => {+ const { t } = useTranslation();++ return (+ <NormalModal+ title={<div className={'text-left font-semibold'}>{t('settings.manageDataPage.cache.title')}</div>+ }+ open={open} onClose={onClose}+ onOk={onClose}+ cancelButtonProps={{+ className: 'hidden',+ }}+ >+ <DialogContent>+ <DialogContentText>+ You are about to clear the IndexedDB cache. This action may have the following effects:+ </DialogContentText>+ <List>+ <ListItem className={'gap-2'}>+ <ErrorIcon className={'text-function-error'} />+ <ListItemText className={'flex-1'} primary="Slower document loading times initially" />+ </ListItem>+ <ListItem className={'gap-2'}>+ <ErrorIcon className={'text-function-error w-4 h-4'} />+ <ListItemText className={'flex-1'} primary="Temporary decrease in application performance" />+ </ListItem>+ <ListItem className={'gap-2'}>+ <ErrorIcon className={'text-function-error w-4 h-4'} />+ <ListItemText className={'flex-1'} primary="Need to re-download and re-process some data" />+ </ListItem>+ <ListItem className={'gap-2'}>+ <ErrorIcon className={'text-function-error w-4 h-4'} />+ <ListItemText+ className={'flex-1'} primary="Possible loss of offline functionality until data is re-cached"+ />+ </ListItem>+ <ListItem className={'gap-2'}>+ <ErrorIcon className={'text-function-error w-4 h-4'} />+ <ListItemText+ className={'flex-1'}+ primary="Frequent deletions may cause the browser to crash. If the data cannot be loaded, please try restarting the browser."+ />+ </ListItem>+ </List>+ <DialogContentText>+ Are you sure you want to proceed?+ </DialogContentText>+ {open && <IndexedDBCleaner />}++ </DialogContent>+ </NormalModal>+ );+};++export default CacheClearingDialog;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/modal/IndexedDBCleaner.tsx b/frontend/appflowy_web_app/src/components/_shared/modal/IndexedDBCleaner.tsxnew file mode 100644index 0000000000..9bddafa199--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/modal/IndexedDBCleaner.tsx@@ -0,0 +1,142 @@+import { notify } from '@/components/_shared/notify';+import { TaskAltRounded } from '@mui/icons-material';+import React, { useState, useEffect } from 'react';+import {+ Box,+ Button,+ Checkbox,+ List,+ ListItem,+ ListItemIcon,+ ListItemText,+ Typography,+} from '@mui/material';+import DeleteIcon from '@mui/icons-material/Delete';++const MAX_DELETE = 50;+const IndexedDBCleaner = () => {+ const [databases, setDatabases] = useState<string[]>([]);+ const [selectedDbs, setSelectedDbs] = useState<string[]>([]);+ const [countdown, setCountdown] = useState(0);++ useEffect(() => {+ const fetchDatabases = async () => {+ const dbs = await window.indexedDB.databases();++ setDatabases(dbs.map(db => db.name || '').filter(Boolean));+ };++ void fetchDatabases();+ }, []);++ const handleToggle = (dbName: string) => {+ const currentIndex = selectedDbs.indexOf(dbName);+ const newChecked = [...selectedDbs];++ if (currentIndex === -1) {+ if (newChecked.length < MAX_DELETE) {+ newChecked.push(dbName);+ } else {+ notify.warning('You can select a maximum of 10 databases.');+ return;+ }+ } else {+ newChecked.splice(currentIndex, 1);+ }++ setSelectedDbs(newChecked);+ };++ const handleDelete = async () => {+ if (selectedDbs.length === 0) {+ notify.warning('Please select at least one database to delete.');+ return;+ }++ for (const dbName of selectedDbs) {+ indexedDB.deleteDatabase(dbName);+ }++ setDatabases(databases.filter(db => !selectedDbs.includes(db)));+ setSelectedDbs([]);+ notify.success('Selected databases deleted successfully.');++ setCountdown(15);++ const reduceCountdown = () => {+ setTimeout(() => {+ setCountdown(prev => {+ if (prev === 0) return 0;+ return prev - 1;+ });+ reduceCountdown();+ }, 1000);+ };++ reduceCountdown();++ };++ if (databases.length === 0) return null;+ return (+ <div className={'w-full max-h-[360px] appflowy-scroller overflow-x-hidden overflow-y-auto'}>++ <List sx={{ width: '100%' }}>+ {databases.map((dbName) => {+ const labelId = `checkbox-list-label-${dbName}`;++ return (+ <ListItem+ key={dbName}+ dense+ button+ onClick={() => handleToggle(dbName)}+ >+ <ListItemIcon>+ <Checkbox+ edge="start"+ checked={selectedDbs.indexOf(dbName) !== -1}+ tabIndex={-1}+ disableRipple+ inputProps={{ 'aria-labelledby': labelId }}+ />+ </ListItemIcon>+ <ListItemText id={labelId} primary={dbName} />+ </ListItem>+ );+ })}+ </List>+ <Box+ className={'sticky bottom-0 p-2 bg-bg-body z-10'}+ sx={{ mt: 2, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}+ >+ <Typography variant="body2">+ Total: {databases.length}+ </Typography>+ <Typography variant="body2">+ Selected: {selectedDbs.length}/{MAX_DELETE}+ </Typography>+ <div className={'flex items-center gap-2'}>+ <Button+ startIcon={+ <TaskAltRounded />+ } variant="contained" onClick={() => setSelectedDbs(databases.slice(0, MAX_DELETE))}+ >+ Select All+ </Button>+ <Button+ variant="contained"+ color="error"+ startIcon={<DeleteIcon />}+ onClick={handleDelete}+ disabled={selectedDbs.length === 0 || countdown !== 0}+ >+ Delete Selected{countdown ? ` (${countdown}s)` : ''}+ </Button>+ </div>+ </Box>+ </div>+ );+};++export default IndexedDBCleaner;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/modal/NormalModal.tsx b/frontend/appflowy_web_app/src/components/_shared/modal/NormalModal.tsxindex 858b6e3341..1bbdecb6fa 100644--- a/frontend/appflowy_web_app/src/components/_shared/modal/NormalModal.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/modal/NormalModal.tsx@@ -80,7 +80,7 @@ export function NormalModal ({}}{...okButtonProps}>- {okLoading ? <CircularProgress size={24} /> : modalOkText}+ {okLoading ? <CircularProgress color={'inherit'} size={24} /> : modalOkText}</Button></div></div>diff --git a/frontend/appflowy_web_app/src/components/publish/header/MoreActions.tsx b/frontend/appflowy_web_app/src/components/_shared/more-actions/MoreActions.tsxsimilarity index 85%rename from frontend/appflowy_web_app/src/components/publish/header/MoreActions.tsxrename to frontend/appflowy_web_app/src/components/_shared/more-actions/MoreActions.tsxindex 66125dbd6b..49d741e216 100644--- a/frontend/appflowy_web_app/src/components/publish/header/MoreActions.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/more-actions/MoreActions.tsx@@ -1,8 +1,8 @@import { invalidToken } from '@/application/session/token';+import CacheClearingDialog from '@/components/_shared/modal/CacheClearingDialog';import { Popover } from '@/components/_shared/popover';-import { AFConfigContext } from '@/components/app/app.hooks';-import { ThemeModeContext } from '@/components/app/useAppThemeMode';-import AsTemplateButton from '@/components/as-template/AsTemplateButton';+import { AFConfigContext } from '@/components/main/app.hooks';+import { ThemeModeContext } from '@/components/main/useAppThemeMode';import { openUrl } from '@/utils/url';import { IconButton } from '@mui/material';import React, { useCallback, useContext, useMemo } from 'react';@@ -11,6 +11,7 @@ import { ReactComponent as MoonIcon } from '@/assets/moon.svg';import { ReactComponent as SunIcon } from '@/assets/sun.svg';import { ReactComponent as LoginIcon } from '@/assets/login.svg';import { ReactComponent as ReportIcon } from '@/assets/report.svg';+import { ReactComponent as TrashIcon } from '@/assets/trash.svg';import { useTranslation } from 'react-i18next';import { useNavigate } from 'react-router-dom';@@ -21,6 +22,8 @@ function MoreActions () {setAnchorEl(event.currentTarget);};+ const [openConfirm, setOpenConfirm] = React.useState(false);+const handleClose = () => {setAnchorEl(null);};@@ -66,6 +69,13 @@ function MoreActions () {void openUrl('https://report.appflowy.io/', '_blank');},},+ {+ Icon: TrashIcon,+ label: t('settings.files.clearCache'),+ onClick: () => {+ setOpenConfirm(true);+ },+ },];}, [isAuthenticated, t, handleLogin, isDark, setDark]);@@ -89,7 +99,6 @@ function MoreActions () {onClose={handleClose}><div className={'flex w-[240px] flex-col gap-2 px-2 py-2'}>- <AsTemplateButton />{actions.map((action, index) => (<button@@ -110,6 +119,7 @@ function MoreActions () {</div></Popover>)}+ <CacheClearingDialog open={openConfirm} onClose={() => setOpenConfirm(false)} /></>);}diff --git a/frontend/appflowy_web_app/src/components/_shared/notify/CustomSnackbar.tsx b/frontend/appflowy_web_app/src/components/_shared/notify/CustomSnackbar.tsxnew file mode 100644index 0000000000..1e1a77adcd--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/notify/CustomSnackbar.tsx@@ -0,0 +1,52 @@+import {+ ErrorOutline,+ HighlightOff,+ PowerSettingsNew,+ TaskAltRounded,+} from '@mui/icons-material';+import React from 'react';+import { useSnackbar, SnackbarContent, CustomContentProps } from 'notistack';+import { ReactComponent as CloseIcon } from '@/assets/close.svg';++const CustomSnackbar = React.forwardRef<HTMLDivElement, CustomContentProps>((props, ref) => {+ const { id, message, variant } = props;+ const { closeSnackbar } = useSnackbar();++ const icons = {+ success: <TaskAltRounded className="w-6 h-6 text-green-500" />,+ error: <HighlightOff className="w-6 h-6 text-red-500" />,+ warning: <ErrorOutline className="w-6 h-6 text-yellow-500" />,+ info: <PowerSettingsNew className="w-6 h-6 text-blue-500" />,+ default: null,+ };++ const colors = {+ success: 'bg-green-100 bg-opacity-70 border-green-300',+ error: 'bg-red-100 bg-opacity-70 border-red-300',+ warning: 'bg-yellow-100 bg-opacity-70 border-yellow-300',+ info: 'bg-blue-100 bg-opacity-70 border-blue-300',+ default: 'bg-gray-100 bg-opacity-70 border-gray-300',+ };++ return (+ <SnackbarContent ref={ref} className={`${colors[variant]} rounded-lg shadow-lg`}>+ <div className="flex items-center p-4">+ <div className="flex-shrink-0">+ {icons[variant]}+ </div>+ <div className="ml-3 flex-1">+ <p className="text-sm font-medium text-gray-900">{message}</p>+ </div>+ <button+ onClick={() => closeSnackbar(id)}+ className="ml-4 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"+ >+ <span className="sr-only">Close</span>+ <CloseIcon className="h-5 w-5" />+ </button>+ </div>+ </SnackbarContent>+ );+});++export default CustomSnackbar;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/outline/Outline.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/Outline.tsxnew file mode 100644index 0000000000..157cce78d2--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/Outline.tsx@@ -0,0 +1,36 @@+import { UIVariant, View } from '@/application/types';+import { DirectoryStructure } from '@/components/_shared/skeleton/DirectoryStructure';+import OutlineItem from '@/components/_shared/outline/OutlineItem';+import React, { memo } from 'react';++export function Outline ({ outline, width, selectedViewId, navigateToView, variant }: {+ width: number;+ outline?: View[];+ selectedViewId?: string;+ navigateToView?: (viewId: string) => Promise<void>+ variant?: UIVariant;+}) {++ return (+ <div className={'flex w-full flex-1 flex-col gap-1 py-[10px] px-[10px]'}>+ {!outline || outline.length === 0 ? <div+ style={{+ width: width - 20,+ }}+ ><DirectoryStructure /></div> :+ outline.map((view) =>+ <OutlineItem+ variant={variant}+ key={view.view_id}+ selectedViewId={selectedViewId}+ view={view}+ width={width - 20}+ navigateToView={navigateToView}+ />,+ )+ }+ </div>+ );+}++export default memo(Outline);diff --git a/frontend/appflowy_web_app/src/components/publish/outline/OutlineDrawer.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineDrawer.tsxsimilarity index 57%rename from frontend/appflowy_web_app/src/components/publish/outline/OutlineDrawer.tsxrename to frontend/appflowy_web_app/src/components/_shared/outline/OutlineDrawer.tsxindex 7c75ea6ac0..05d279c057 100644--- a/frontend/appflowy_web_app/src/components/publish/outline/OutlineDrawer.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineDrawer.tsx@@ -1,14 +1,25 @@import { ReactComponent as AppFlowyLogo } from '@/assets/appflowy.svg';import { ReactComponent as SideOutlined } from '@/assets/side_outlined.svg';-import AppFlowyPower from '@/components/_shared/appflowy-power/AppFlowyPower';-import Outline from '@/components/publish/outline/Outline';+import Resizer from '@/components/_shared/outline/Resizer';+import { useNavigate } from 'react-router-dom';+import AppFlowyPower from '../appflowy-power/AppFlowyPower';import { createHotKeyLabel, HOT_KEY_NAME } from '@/utils/hotkeys';import { Drawer, IconButton, Tooltip } from '@mui/material';import { useTranslation } from 'react-i18next';-export function OutlineDrawer ({ open, width, onClose }: { open: boolean; width: number; onClose: () => void }) {+export function OutlineDrawer ({ header, variant, open, width, onClose, children, onResizeWidth }: {+ open: boolean;+ width: number;+ onClose: () => void;+ children: React.ReactNode;+ onResizeWidth: (width: number) => void;+ header?: React.ReactNode;+ variant?: 'app' | 'publish';+}) {const { t } = useTranslation();+ const navigate = useNavigate();+return (<Drawersx={{@@ -33,19 +44,22 @@ export function OutlineDrawer ({ open, width, onClose }: { open: boolean; width:},}}>+<div className={'flex h-full relative min-h-full flex-col overflow-y-auto overflow-x-hidden appflowy-scroller'}>- <div style={{- backdropFilter: 'blur(4px)',- }} className={'flex transform-gpu z-10 h-[48px] sticky top-0 items-center justify-between p-4'}+ <div+ style={{+ backdropFilter: 'blur(4px)',+ }} className={'flex transform-gpu z-10 h-[48px] sticky top-0 items-center justify-between'}>- <div- className={'flex cursor-pointer items-center gap-1 text-text-title'}+ {header ? header : <div+ className={'flex p-4 cursor-pointer items-center gap-1 text-text-title'}onClick={() => {- window.open('https://appflowy.io', '_blank');+ navigate('/app');}}><AppFlowyLogo className={'w-[88px]'} />- </div>+ </div>}+<Tooltiptitle={<div className={'flex flex-col'}>@@ -54,16 +68,20 @@ export function OutlineDrawer ({ open, width, onClose }: { open: boolean; width:</div>}>- <IconButton onClick={onClose}>- <SideOutlined className={'h-4 w-4 rotate-180 transform'} />+ <IconButton onClick={onClose} className={'m-4'}>+ <SideOutlined className={'h-4 w-4 text-text-caption rotate-180 transform'} /></IconButton></Tooltip></div><div className={'flex h-fit flex-1 flex-col'}>- <Outline width={width} />+ {children}</div>- <AppFlowyPower width={width} />+ {variant === 'publish' && <AppFlowyPower width={width} />}++</div>+ <Resizer drawerWidth={width} onResize={onResizeWidth} />+</Drawer>);}diff --git a/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItem.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItem.tsxnew file mode 100644index 0000000000..78b10b771b--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItem.tsx@@ -0,0 +1,138 @@+import { UIVariant, View } from '@/application/types';+import OutlineItemContent from '@/components/_shared/outline/OutlineItemContent';+import React, { useCallback, useEffect, useMemo } from 'react';+import { ReactComponent as ChevronDownIcon } from '@/assets/chevron_down.svg';+import { ReactComponent as PrivateIcon } from '@/assets/lock.svg';++function getOutlineExpands () {+ const expandView = localStorage.getItem('outline_expanded');++ try {+ return JSON.parse(expandView || '{}');+ } catch (e) {+ return {};+ }+}++function setOutlineExpands (viewId: string, isExpanded: boolean) {+ const expands = getOutlineExpands();++ if (isExpanded) {+ expands[viewId] = true;+ } else {+ delete expands[viewId];+ }++ localStorage.setItem('outline_expanded', JSON.stringify(expands));+}++function OutlineItem ({ view, level = 0, width, navigateToView, selectedViewId, variant }: {+ view: View;+ width?: number;+ level?: number;+ selectedViewId?: string;+ navigateToView?: (viewId: string) => Promise<void>+ variant?: UIVariant;++}) {+ const selected = selectedViewId === view.view_id;+ const [isExpanded, setIsExpanded] = React.useState(() => {+ return getOutlineExpands()[view.view_id] || false;+ });++ useEffect(() => {+ setOutlineExpands(view.view_id, isExpanded);+ }, [isExpanded, view.view_id]);++ const getIcon = useCallback(() => {+ if (isExpanded) {+ return (+ <button+ style={{+ paddingLeft: 1.125 * level + 'rem',+ }}+ onClick={() => {+ setIsExpanded(false);+ }}+ className={'opacity-50 hover:opacity-100'}+ >+ <ChevronDownIcon className={'h-4 w-4'} />+ </button>+ );+ }++ return (+ <button+ style={{+ paddingLeft: 1.125 * level + 'rem',+ }}+ className={'opacity-50 hover:opacity-100'}+ onClick={() => {+ setIsExpanded(true);+ }}+ >+ <ChevronDownIcon className={'h-4 w-4 -rotate-90 transform'} />+ </button>+ );+ }, [isExpanded, level]);++ const renderItem = useCallback((item: View) => {+ return (+ <div className={'flex h-fit my-0.5 w-full flex-col gap-2'}>+ <div+ style={{+ width,+ backgroundColor: selected ? 'var(--fill-list-hover)' : undefined,+ }}+ className={+ 'flex items-center w-full gap-0.5 rounded-[8px] py-1.5 px-0.5 text-sm hover:bg-content-blue-50 focus:bg-content-blue-50 focus:outline-none'+ }+ >+ {item.children?.length ? getIcon() : null}++ <OutlineItemContent+ variant={variant}+ item={item}+ navigateToView={navigateToView}+ level={level}+ setIsExpanded={setIsExpanded}+ />+ {item.is_private && <PrivateIcon className={'h-4 w-4 text-text-caption'} />}+ </div>+ </div>+ );+ }, [getIcon, level, navigateToView, variant, selected, width]);++ const children = useMemo(() => view.children || [], [view.children]);++ const renderChildren = useMemo(() => {+ return <div+ className={'flex transform flex-col gap-2 transition-all'}+ style={{+ display: isExpanded ? 'block' : 'none',+ }}+ >+ {children+ .map((item, index) => (+ <OutlineItem+ selectedViewId={selectedViewId}+ navigateToView={navigateToView}+ level={level + 1}+ width={width}+ key={index}+ view={item}+ variant={variant}+ />+ ))}+ </div>;+ }, [children, isExpanded, level, navigateToView, selectedViewId, width, variant]);++ return (+ <div className={'flex h-fit w-full flex-col'}>+ {renderItem(view)}+ {renderChildren}+ </div>+ );+}++export default OutlineItem;diff --git a/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItemContent.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItemContent.tsxnew file mode 100644index 0000000000..7f8364a5fc--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/OutlineItemContent.tsx@@ -0,0 +1,78 @@+import { UIVariant, View, ViewLayout } from '@/application/types';+import SpaceIcon from '@/components/_shared/breadcrumb/SpaceIcon';+import { ViewIcon } from '@/components/_shared/view-icon';+import PublishIcon from '@/components/_shared/view-icon/PublishIcon';+import { renderColor } from '@/utils/color';+import { isFlagEmoji } from '@/utils/emoji';+import { Tooltip } from '@mui/material';+import React, { memo } from 'react';++function OutlineItemContent ({+ item,+ setIsExpanded,+ navigateToView,+ level,+ variant,+}: {+ item: View;+ setIsExpanded: React.Dispatch<React.SetStateAction<boolean>>;+ navigateToView?: (viewId: string) => Promise<void>;+ level: number;+ variant?: UIVariant;++}) {+ const { icon, layout, name, view_id, extra } = item;+ const [hovered, setHovered] = React.useState(false);+ const isSpace = extra?.is_space;++ return (+ <div+ onClick={async () => {+ if (isSpace || (!item.is_published && variant === 'publish') || item.layout === ViewLayout.AIChat) {+ setIsExpanded(prev => !prev);+ return;+ }++ try {+ await navigateToView?.(view_id);+ } catch (e) {+ // do nothing+ }+ }}+ onMouseEnter={() => setHovered(true)}+ onMouseLeave={() => setHovered(false)}+ style={{+ cursor: item.layout === ViewLayout.AIChat ? 'not-allowed' : 'pointer',+ paddingLeft: variant === 'favorite' || variant === 'recent' ? '8px' : item.children?.length ? 0 : 1.125 * (level + 1) + 'rem',+ }}+ className={`flex flex-1 select-none items-center gap-1.5 overflow-hidden`}+ >+ {isSpace && extra ?+ <span+ className={'icon h-4 w-4'}+ style={{+ backgroundColor: extra.space_icon_color ? renderColor(extra.space_icon_color) : 'rgb(163, 74, 253)',+ borderRadius: '4px',+ }}+ >+ <SpaceIcon+ value={extra.space_icon || ''}+ char={extra.space_icon ? undefined : name.slice(0, 1)}+ />+ </span> :+ <div+ className={`${icon && isFlagEmoji(icon.value) ? 'icon' : ''}`}+ >+ {icon?.value || <ViewIcon layout={layout} size={'medium'} />}+ </div>+ }++ <Tooltip title={name} enterDelay={1000} enterNextDelay={1000}>+ <div className={'flex-1 truncate'}>{name}</div>+ </Tooltip>+ {hovered && variant === UIVariant.Publish && <PublishIcon variant={variant} view={item} />}+ </div>+ );+}++export default memo(OutlineItemContent);\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/publish/outline/OutlinePopover.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/OutlinePopover.tsxsimilarity index 58%rename from frontend/appflowy_web_app/src/components/publish/outline/OutlinePopover.tsxrename to frontend/appflowy_web_app/src/components/_shared/outline/OutlinePopover.tsxindex e435e6e01c..7afe9c204e 100644--- a/frontend/appflowy_web_app/src/components/publish/outline/OutlinePopover.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/outline/OutlinePopover.tsx@@ -1,6 +1,4 @@-import { usePublishContext } from '@/application/publish';import AppFlowyPower from '@/components/_shared/appflowy-power/AppFlowyPower';-import Outline from '@/components/publish/outline/Outline';import { PopperPlacementType } from '@mui/material';import React, { ReactElement, useMemo } from 'react';import { RichTooltip } from '@/components/_shared/popover';@@ -12,7 +10,8 @@ export function OutlinePopover ({placement,onMouseEnter,onMouseLeave,- drawerWidth,+ content,+ variant = 'app',}: {open: boolean;onClose: () => void;@@ -20,27 +19,29 @@ export function OutlinePopover ({placement?: PopperPlacementType;onMouseEnter?: () => void;onMouseLeave?: () => void;- drawerWidth: number;+ drawerWidth?: number;+ content: React.ReactNode;+ variant?: 'app' | 'publish';}) {- const viewMeta = usePublishContext()?.viewMeta;- const content = useMemo(() => {+ const popoverContent = useMemo(() => {return (<divonMouseEnter={onMouseEnter}onMouseLeave={onMouseLeave}className={'flex h-fit max-h-[590px] flex-col overflow-y-auto overflow-x-hidden appflowy-scroller'}>- <Outline width={drawerWidth} />+ {content}+ {variant === 'publish' && <AppFlowyPower />}- <AppFlowyPower divider={Boolean(viewMeta?.child_views?.length)} /></div>);- }, [onMouseEnter, onMouseLeave, viewMeta, drawerWidth]);+ }, [variant, onMouseEnter, onMouseLeave, content]);return (- <RichTooltip PaperProps={{- className: 'rounded-[14px] border border-tint-purple bg-bg-body m-2 overflow-hidden',- }} open={open} onClose={onClose} content={content} placement={placement}+ <RichTooltip+ PaperProps={{+ className: 'rounded-[14px] border border-tint-purple bg-bg-body m-2 overflow-hidden',+ }} open={open} onClose={onClose} content={popoverContent} placement={placement}>{children}</RichTooltip>diff --git a/frontend/appflowy_web_app/src/components/_shared/outline/Resizer.tsx b/frontend/appflowy_web_app/src/components/_shared/outline/Resizer.tsxnew file mode 100644index 0000000000..66c526d648--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/Resizer.tsx@@ -0,0 +1,58 @@+import React, { useState, useCallback, useEffect } from 'react';++const Resizer = ({+ minWidth = Math.min(268, window.innerWidth / 4),+ maxWidth = Math.max(268, window.innerWidth / 2),+ onResize,+}: {+ drawerWidth: number;+ minWidth?: number;+ maxWidth?: number;+ onResize?: (width: number) => void;+}) => {+ const [isResizing, setIsResizing] = useState(false);++ const startResizing = useCallback((e: React.MouseEvent) => {+ e.stopPropagation();+ e.preventDefault();+ setIsResizing(true);+ }, []);++ const stopResizing = useCallback(() => {+ setIsResizing(false);+ }, []);++ const resize = useCallback(+ (mouseMoveEvent: MouseEvent) => {+ if (isResizing) {+ mouseMoveEvent.stopPropagation();+ mouseMoveEvent.preventDefault();+ const newWidth = mouseMoveEvent.clientX;++ if (newWidth >= minWidth && newWidth <= maxWidth && newWidth + 768 < window.innerWidth) {+ onResize?.(newWidth);+ }+ }+ },+ [isResizing, minWidth, maxWidth, onResize],+ );++ useEffect(() => {+ window.addEventListener('mousemove', resize);+ window.addEventListener('mouseup', stopResizing);+ return () => {+ window.removeEventListener('mousemove', resize);+ window.removeEventListener('mouseup', stopResizing);+ };+ }, [resize, stopResizing]);++ return (+ <div+ className="absolute top-0 h-full w-1 border-r-4 border-transparent hover:border-content-blue-300 cursor-col-resize"+ style={{ right: 0, zIndex: 100, borderColor: isResizing ? 'var(--content-blue-300)' : undefined }}+ onMouseDown={startResizing}+ />+ );+};++export default Resizer;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/outline/index.ts b/frontend/appflowy_web_app/src/components/_shared/outline/index.tsnew file mode 100644index 0000000000..eb12f07f9a--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/index.ts@@ -0,0 +1,2 @@+export * from './OutlineDrawer';+export * from './OutlinePopover';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/outline/outline.hooks.ts b/frontend/appflowy_web_app/src/components/_shared/outline/outline.hooks.tsnew file mode 100644index 0000000000..6721b34939--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/outline.hooks.ts@@ -0,0 +1,124 @@+import { createHotkey, HOT_KEY_NAME } from '@/utils/hotkeys';+import { debounce } from 'lodash-es';+import React, { useCallback, useEffect, useMemo } from 'react';++export interface OutlineProps {+ onOpenDrawer: () => void;+ openDrawer: boolean;+ onCloseDrawer: () => void;+}++export function useOutlinePopover ({+ onOpenDrawer, openDrawer, onCloseDrawer,+}: OutlineProps) {+ const [openPopover, setOpenPopover] = React.useState(false);++ const onKeyDown = useCallback((e: KeyboardEvent) => {+ switch (true) {+ case createHotkey(HOT_KEY_NAME.TOGGLE_SIDEBAR)(e):+ e.preventDefault();+ if (openDrawer) {+ onCloseDrawer();+ } else {+ onOpenDrawer();+ }++ break;+ default:+ break;+ }+ }, [onCloseDrawer, onOpenDrawer, openDrawer]);++ useEffect(() => {+ window.addEventListener('keydown', onKeyDown);+ return () => {+ window.removeEventListener('keydown', onKeyDown);+ };+ }, [onKeyDown]);++ const debounceClosePopover = useMemo(() => {+ return debounce(() => {+ setOpenPopover(false);+ }, 200);+ }, []);++ const handleOpenPopover = useCallback(() => {+ debounceClosePopover.cancel();+ if (openDrawer) {+ return;+ }++ setOpenPopover(true);+ }, [openDrawer, debounceClosePopover]);++ const handleClosePopover = useCallback(() => {+ setOpenPopover(false);+ }, []);++ const debounceOpenPopover = useMemo(() => {+ debounceClosePopover.cancel();+ return debounce(handleOpenPopover, 100);+ }, [handleOpenPopover, debounceClosePopover]);++ return {+ openPopover,+ debounceClosePopover,+ debounceOpenPopover,+ handleClosePopover,+ handleOpenPopover,+ };+}++export function useOutlineDrawer () {+ const [drawerWidth, setDrawerWidth] = React.useState(() => {+ return parseInt(localStorage.getItem('outline_width') || '268', 10);+ });++ const [drawerOpened, setDrawerOpened] = React.useState(() => {+ if (window.innerWidth - drawerWidth <= 768) {+ return false;+ }++ return localStorage.getItem('outline_open') === 'true';+ });++ useEffect(() => {+ const onResize = () => {+ if (window.innerWidth - drawerWidth <= 768) {+ setDrawerOpened(false);+ } else if (localStorage.getItem('outline_open') !== 'false') {+ setDrawerOpened(true);+ }+ };++ onResize();++ window.addEventListener('resize', onResize);++ return () => {+ window.removeEventListener('resize', onResize);+ };+ }, [drawerWidth]);++ const handleResize = useCallback((width: number) => {+ localStorage.setItem('outline_width', width.toString());+ setDrawerWidth(width);+ }, []);++ const toggleOpenDrawer = useCallback((status: boolean) => {+ if (status && window.innerWidth - drawerWidth <= 768) {+ handleResize(268);+ }++ localStorage.setItem('outline_open', status.toString());+ setDrawerOpened(status);+ }, [handleResize, drawerWidth]);++ return {+ toggleOpenDrawer,+ drawerWidth,+ setDrawerWidth: handleResize,+ drawerOpened,+ };++}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/outline/utils.ts b/frontend/appflowy_web_app/src/components/_shared/outline/utils.tsnew file mode 100644index 0000000000..f1f7dcb8a1--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/outline/utils.ts@@ -0,0 +1,97 @@+import { View, ViewLayout } from '@/application/types';++export function filterViews (views: View[], keyword: string): View[] {+ const filterAndFlatten = (views: View[]): View[] => {+ let result: View[] = [];++ for (const view of views) {+ if (view.name.toLowerCase().includes(keyword.toLowerCase())) {+ result.push(view);+ } else if (view.children) {+ const filteredChildren = filterAndFlatten(view.children);++ result = result.concat(filteredChildren);+ }+ }++ return result;+ };++ return filterAndFlatten(views);+}++export function findViewByLayout (views: View[], layout: ViewLayout[]): View | null {+ for (const view of views) {+ if (layout.includes(view.layout) && !view.extra?.is_space) {+ return view;+ }++ if (view.children) {+ const result = findViewByLayout(view.children, layout);++ if (result) {+ return result;+ }+ }+ }++ return null;+}++export function filterOutViewsByLayout (views: View[], layout: ViewLayout): View[] {+ const filterOut = (views: View[]): View[] => {+ const result: View[] = [];++ for (const view of views) {+ if (view.layout !== layout) {+ const newView = { ...view };++ newView.children = filterOut(view.children);+ result.push(newView);+ }++ }++ return result;+ };++ return filterOut(views);+}++export function findAncestors (data: View[], targetId: string, currentPath: View[] = []): View[] | null {+ for (const item of data) {+ const newPath = [...currentPath, item];++ if (item.view_id === targetId) {+ return newPath;+ }++ if (item.children && item.children.length > 0) {+ const result = findAncestors(item.children, targetId, newPath);++ if (result) {+ return result;+ }+ }+ }++ return null;+}++export function findView (data: View[], targetId: string): View | null {+ for (const item of data) {+ if (item.view_id === targetId) {+ return item;+ }++ if (item.children && item.children.length > 0) {+ const result = findView(item.children, targetId);++ if (result) {+ return result;+ }+ }+ }++ return null;+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/BreadcrumbSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/BreadcrumbSkeleton.tsxindex fa61d8e7de..01edae564c 100644--- a/frontend/appflowy_web_app/src/components/_shared/skeleton/BreadcrumbSkeleton.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/BreadcrumbSkeleton.tsx@@ -1,19 +1,18 @@import React from 'react';-import { Skeleton, Box } from '@mui/material';import { ReactComponent as RightIcon } from '@/assets/arrow_right.svg';export const BreadcrumbsSkeleton = () => {return (- <Box display="flex" alignItems="center" gap={1}>- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" width={60} height={20} />- <RightIcon className={'h-5 w-5 text-text-caption'} />- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" width={80} height={20} />- <RightIcon className={'h-5 w-5 text-text-caption'} />- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" width={100} height={20} />- </Box>+ <div className="flex items-center gap-1">+ <div className="w-5 h-5 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="w-15 h-5 bg-fill-list-hover rounded animate-pulse"></div>+ <RightIcon className="h-5 w-5 text-gray-400" />+ <div className="w-5 h-5 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="w-20 h-5 bg-fill-list-hover rounded animate-pulse"></div>+ <RightIcon className="h-5 w-5 text-gray-400" />+ <div className="w-5 h-5 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="w-24 h-5 bg-fill-list-hover rounded animate-pulse"></div>+ </div>);};diff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/CalendarSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/CalendarSkeleton.tsxnew file mode 100644index 0000000000..3d8b084304--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/CalendarSkeleton.tsx@@ -0,0 +1,61 @@+import React from 'react';+import TabbarSkeleton from '@/components/_shared/skeleton/TabbarSkeleton';+import TitleSkeleton from '@/components/_shared/skeleton/TitleSkeleton';++function CalendarSkeleton ({ includeTitle = true, includeTabs = true }: {+ includeTitle?: boolean;+ includeTabs?: boolean+}) {+ const daysInWeek = 7;+ const weeksInMonth = 4;++ return (+ <div className={`w-full overflow-x-auto ${includeTitle ? 'py-2 px-6' : ''}`}>+ {includeTitle && (+ <>+ <div className="w-full my-6 flex items-center h-20 mb-2">+ <TitleSkeleton />+ </div>+ </>+ )}++ {includeTabs && <div className="w-full flex items-center h-10 mb-2">+ <TabbarSkeleton />+ </div>}+ {/* Calendar Header */}+ <div className="flex justify-between items-center mb-2">+ <div className="w-24 h-10 bg-fill-list-hover rounded animate-pulse"></div>+ <div className="flex gap-1">+ <div className="w-10 h-10 bg-fill-list-hover rounded animate-pulse"></div>+ <div className="w-10 h-10 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+ </div>++ {/* Weekday Names */}+ <div className="grid grid-cols-7 gap-1 mb-1">+ {[...Array(daysInWeek)].map((_, index) => (+ <div key={index} className="h-8 bg-fill-list-hover rounded animate-pulse"></div>+ ))}+ </div>++ {/* Calendar Grid */}+ <div className="border border-line-divider rounded shadow">+ <div className="grid grid-cols-7">+ {[...Array(weeksInMonth * daysInWeek)].map((_, index) => (+ <div key={index} className="aspect-square p-1 border-r border-b border-line-divider">+ <div className="h-full flex flex-col">+ <div className="w-1/3 h-5 bg-fill-list-hover rounded animate-pulse self-end"></div>+ <div className="flex-1 flex flex-col justify-center mt-1">+ <div className="w-4/5 h-4 bg-fill-list-hover rounded animate-pulse mb-0.5"></div>+ <div className="w-3/5 h-4 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+ </div>+ </div>+ ))}+ </div>+ </div>+ </div>+ );+}++export default CalendarSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/DirectoryStructure.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/DirectoryStructure.tsxnew file mode 100644index 0000000000..d5eff44410--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/DirectoryStructure.tsx@@ -0,0 +1,31 @@+import React from 'react';++export const DirectoryStructure = () => {+ return (+ <div className="w-full">+ <DirectoryItem />+ <div className="pl-6">+ <DirectoryItem />+ <div className="pl-6">+ <DirectoryItem />+ <DirectoryItem />+ </div>+ <DirectoryItem />+ </div>+ <DirectoryItem />+ <div className="pl-6">+ <DirectoryItem />+ <DirectoryItem />+ </div>+ </div>+ );+};++const DirectoryItem = () => (+ <div className="flex items-center space-x-2 mb-2">+ <div className="w-5 h-5 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="flex-1 h-5 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+);++export default DirectoryStructure;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/DocumentSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/DocumentSkeleton.tsxindex 3f0951c6de..e7d873b2b4 100644--- a/frontend/appflowy_web_app/src/components/_shared/skeleton/DocumentSkeleton.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/DocumentSkeleton.tsx@@ -1,17 +1,29 @@-import Skeleton from '@mui/material/Skeleton';import React from 'react';+import TitleSkeleton from '@/components/_shared/skeleton/TitleSkeleton';function DocumentSkeleton () {return (- <div- style={{- minHeight: '50vh',- }}- className={'mx-16 w-[964px] min-w-0 max-w-full max-xl:px-8 max-lg:px-6'}- >- <Skeleton variant="rectangular" width={'100%'} height={'100%'} />+ <div className="flex flex-col items-center w-full max-w-full mx-auto">+ <div+ className="w-full h-[40vh] max-h-[288px] min-h-[130px] max-sm:h-[180px] bg-fill-list-hover animate-pulse"+ ></div>++ <div className="h-[60px]"></div>++ <div className="w-full max-w-[964px] px-6 flex items-center h-20 mb-2">+ <TitleSkeleton />+ </div>++ <div className="w-full max-w-[964px] px-6 mt-2">+ <div className="h-10 bg-fill-list-hover w-full mb-4 animate-pulse"></div>+ <div className="h-6 bg-fill-list-hover w-1/2 mb-4 animate-pulse"></div>+ <div className="h-8 bg-fill-list-hover w-3/5 mb-4 animate-pulse"></div>+ <div className="h-7 bg-fill-list-hover w-4/5 mb-4 animate-pulse"></div>+ <div className="h-5 bg-fill-list-hover w-full mb-2 animate-pulse"></div>+ <div className="h-5 bg-fill-list-hover w-full animate-pulse"></div>+ </div></div>);}-export default DocumentSkeleton;+export default DocumentSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/EditorSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/EditorSkeleton.tsxnew file mode 100644index 0000000000..b831d7b5d1--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/EditorSkeleton.tsx@@ -0,0 +1,16 @@+import React from 'react';++function EditorSkeleton () {+ return (+ <div className="w-full max-w-[964px] px-6 mt-2">+ <div className="h-10 bg-fill-list-hover w-full mb-4 animate-pulse"></div>+ <div className="h-6 bg-fill-list-hover w-1/2 mb-4 animate-pulse"></div>+ <div className="h-8 bg-fill-list-hover w-3/5 mb-4 animate-pulse"></div>+ <div className="h-7 bg-fill-list-hover w-4/5 mb-4 animate-pulse"></div>+ <div className="h-5 bg-fill-list-hover w-full mb-2 animate-pulse"></div>+ <div className="h-5 bg-fill-list-hover w-full animate-pulse"></div>+ </div>+ );+}++export default EditorSkeleton;diff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/GridSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/GridSkeleton.tsxnew file mode 100644index 0000000000..ae1a2370e4--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/GridSkeleton.tsx@@ -0,0 +1,63 @@+import React, { useEffect, useState } from 'react';+import TabbarSkeleton from '@/components/_shared/skeleton/TabbarSkeleton';+import TitleSkeleton from '@/components/_shared/skeleton/TitleSkeleton';++function GridSkeleton ({ includeTitle = true, includeTabs = true }: { includeTitle?: boolean; includeTabs?: boolean }) {+ const [rows, setRows] = useState(3);+ const columns = 10;++ useEffect(() => {+ const updateRows = () => {+ setRows(Math.max(Math.ceil(window.innerHeight / 100), 3));+ };++ updateRows();+ window.addEventListener('resize', updateRows);+ return () => window.removeEventListener('resize', updateRows);+ }, []);++ return (+ <div className={`w-full overflow-x-auto ${includeTitle ? 'py-2 px-6' : ''}`}>+ {includeTitle && (+ <>+ <div className="w-full my-6 flex items-center h-20 mb-2">+ <TitleSkeleton />+ </div>++ </>+ )}++ {includeTabs && <div className="w-full flex items-center h-10 mb-2">+ <TabbarSkeleton />+ </div>}+ <div className="w-full mt-2">+ <div className="overflow-x-auto">+ <table className="min-w-full">+ <thead>+ <tr>+ {[...Array(columns)].map((_, index) => (+ <th key={index} className="px-6 py-3 border-b border-line-divider bg-bg-base">+ <div className="h-6 bg-fill-list-hover rounded animate-pulse"></div>+ </th>+ ))}+ </tr>+ </thead>+ <tbody>+ {[...Array(rows)].map((_, rowIndex) => (+ <tr key={rowIndex}>+ {[...Array(columns)].map((_, colIndex) => (+ <td key={colIndex} className="px-6 py-4 border-b border-line-divider">+ <div className="h-5 bg-fill-list-hover rounded animate-pulse"></div>+ </td>+ ))}+ </tr>+ ))}+ </tbody>+ </table>+ </div>+ </div>+ </div>+ );+}++export default GridSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/KanbanSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/KanbanSkeleton.tsxnew file mode 100644index 0000000000..289bd6391e--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/KanbanSkeleton.tsx@@ -0,0 +1,55 @@+import TabbarSkeleton from '@/components/_shared/skeleton/TabbarSkeleton';+import TitleSkeleton from '@/components/_shared/skeleton/TitleSkeleton';+import React from 'react';++function KanbanSkeleton ({+ includeTitle = true,+ includeTabs = true,+}: {+ includeTitle?: boolean;+ includeTabs?: boolean;+}) {+ const columns = Math.max(Math.ceil(window.innerWidth / 420), 3);+ const cardsPerColumn = Math.max(Math.ceil(window.innerHeight / 300), 3);++ return (+ <div className={`w-full overflow-x-auto py-${includeTitle ? '2' : '0'} px-${includeTitle ? '6' : '0'}`}>+ {includeTitle && (+ <>+ <div className="w-full my-6 flex items-center h-20 mb-2">+ <TitleSkeleton />+ </div>++ </>+ )}+ {includeTabs && <div className="w-full flex items-center h-10 mb-2">+ <TabbarSkeleton />+ </div>}++ <div className="w-full mt-2">+ <div className="flex space-x-4">+ {[...Array(columns)].map((_, columnIndex) => (+ <div key={columnIndex} className="min-w-[280px] bg-bg-body shadow-md rounded-lg p-4 flex flex-col">+ {/* Column title */}+ <div className="h-8 bg-fill-list-hover rounded w-3/5 mb-4 animate-pulse"></div>++ {/* Cards */}+ {[...Array(cardsPerColumn)].map((_, cardIndex) => (+ <div key={cardIndex} className="bg-bg-base rounded-lg p-4 mb-4 shadow">+ <div className="h-5 bg-fill-list-hover rounded w-full mb-2 animate-pulse"></div>+ <div className="h-4 bg-fill-list-hover rounded w-4/5 animate-pulse"></div>+ <div className="mt-4 flex justify-between items-center">+ <div className="h-8 w-8 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="h-4 w-16 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+ </div>+ ))}+ </div>+ ))}+ </div>+ </div>+ </div>+ );+}++export default KanbanSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/OutlineSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/OutlineSkeleton.tsxdeleted file mode 100644index dcf0f19e8b..0000000000--- a/frontend/appflowy_web_app/src/components/_shared/skeleton/OutlineSkeleton.tsx+++ /dev/null@@ -1,47 +0,0 @@-import { Box, Skeleton } from '@mui/material';-import './skeleton.scss';--export const DirectoryStructure = () => {- return (- <Box className={'w-full'}>- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- <div className="nested">- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- <div className="nested">- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- </div>- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- </div>- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- <div className="nested">- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- <div className="directory-item">- <Skeleton variant="circular" width={20} height={20} />- <Skeleton variant="text" className={'flex-1'} />- </div>- </div>- </Box>- );-};\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/RecentListSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/RecentListSkeleton.tsxnew file mode 100644index 0000000000..a4a9ec6644--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/RecentListSkeleton.tsx@@ -0,0 +1,16 @@+import React from 'react';++const RecentListSkeleton = ({ rows = 5 }) => {+ return (+ <div className="w-full max-w-[360px] bg-bg-body">+ {[...Array(rows)].map((_, index) => (+ <div key={index} className="flex items-center my-1 mx-2 gap-2">+ <div className="w-5 h-5 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="flex-1 h-5 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+ ))}+ </div>+ );+};++export default RecentListSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/TabbarSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/TabbarSkeleton.tsxnew file mode 100644index 0000000000..da1ce1ccda--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/TabbarSkeleton.tsx@@ -0,0 +1,23 @@+import React from 'react';++function TabbarSkeleton () {+ const tabCount = 4;++ return (+ <div className="w-full mx-auto">+ <div className="border-b border-line-divider">+ <nav className="-mb-px flex">+ {[...Array(tabCount)].map((_, index) => (+ <div key={index} className="mr-2">+ <div className="border-b-2 border-transparent px-4 py-2 min-w-[100px]">+ <div className="h-5 bg-fill-list-hover rounded w-20 animate-pulse"></div>+ </div>+ </div>+ ))}+ </nav>+ </div>+ </div>+ );+}++export default TabbarSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/TableSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/TableSkeleton.tsxnew file mode 100644index 0000000000..07a887e42b--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/TableSkeleton.tsx@@ -0,0 +1,34 @@+import React from 'react';++const TableSkeleton = ({ rows = 5, columns = 4 }) => {+ return (+ <div className="overflow-x-auto shadow-md sm:rounded-lg mt-4">+ <table className="w-full text-sm text-left text-gray-500">+ <thead className="text-xs text-gray-700 uppercase bg-fill-list-hover dark:text-gray-400">+ <tr>+ {[...Array(columns)].map((_, index) => (+ <th key={`header-${index}`} scope="col" className="px-6 py-3">+ <div className="h-6 bg-fill-list-hover rounded w-24 animate-pulse"></div>+ </th>+ ))}+ </tr>+ </thead>+ <tbody>+ {[...Array(rows)].map((_, rowIndex) => (+ <tr key={`row-${rowIndex}`} className="bg-bg-body border-b border-line-divider">+ {[...Array(columns)].map((_, colIndex) => (+ <td key={`cell-${rowIndex}-${colIndex}`} className="px-6 py-4">+ <div+ className={`h-5 bg-fill-list-hover rounded ${colIndex === 0 ? 'w-14' : 'w-24'} animate-pulse`}+ ></div>+ </td>+ ))}+ </tr>+ ))}+ </tbody>+ </table>+ </div>+ );+};++export default TableSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/TitleSkeleton.tsx b/frontend/appflowy_web_app/src/components/_shared/skeleton/TitleSkeleton.tsxnew file mode 100644index 0000000000..82136e3d9d--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/skeleton/TitleSkeleton.tsx@@ -0,0 +1,14 @@+import React from 'react';++function TitleSkeleton () {+ return (+ <div className="w-full flex gap-2 items-center h-20 mb-2">+ <div className="flex-shrink-0 w-16 h-16 bg-fill-list-hover rounded-full animate-pulse"></div>+ <div className="ml-4 flex-grow">+ <div className="h-10 bg-fill-list-hover rounded animate-pulse"></div>+ </div>+ </div>+ );+}++export default TitleSkeleton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/skeleton/skeleton.scss b/frontend/appflowy_web_app/src/components/_shared/skeleton/skeleton.scssdeleted file mode 100644index 37e86ff1db..0000000000--- a/frontend/appflowy_web_app/src/components/_shared/skeleton/skeleton.scss+++ /dev/null@@ -1,14 +0,0 @@-.directory-item {- display: flex;- align-items: center;- margin-bottom: 8px;--}--.directory-item .MuiSkeleton-root {- margin-right: 8px;-}--.nested {- margin-left: 24px;-}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/tabs/ViewTabs.tsx b/frontend/appflowy_web_app/src/components/_shared/tabs/ViewTabs.tsxindex 64faab7949..da7b15cc8a 100644--- a/frontend/appflowy_web_app/src/components/_shared/tabs/ViewTabs.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/tabs/ViewTabs.tsx@@ -16,6 +16,7 @@ export const ViewTab = styled((props: TabProps) => <Tab disableRipple {...props}minWidth: 'unset',margin: '4px 0',borderRadius: 0,+'&:hover': {backgroundColor: 'transparent !important',color: 'inherit',@@ -28,18 +29,18 @@ export const ViewTab = styled((props: TabProps) => <Tab disableRipple {...props}interface TabPanelProps extends HTMLAttributes<HTMLDivElement> {children?: React.ReactNode;- index: number;- value: number;+ index: number | string;+ value: number | string;}-export function TabPanel(props: TabPanelProps) {+export function TabPanel (props: TabPanelProps) {const { children, value, index, ...other } = props;const isActivated = value === index;return (<div- role='tabpanel'+ role="tabpanel"hidden={!isActivated}id={`full-width-tabpanel-${index}`}aria-labelledby={`full-width-tab-${index}`}diff --git a/frontend/appflowy_web_app/src/components/_shared/view-icon/PublishIcon.tsx b/frontend/appflowy_web_app/src/components/_shared/view-icon/PublishIcon.tsxnew file mode 100644index 0000000000..4d5bb23bab--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/view-icon/PublishIcon.tsx@@ -0,0 +1,42 @@+import { UIVariant, View } from '@/application/types';+import { Tooltip } from '@mui/material';+import React from 'react';+import { ReactComponent as PublishSvg } from '@/assets/publish.svg';+import { useTranslation } from 'react-i18next';++function PublishIcon ({+ variant,+ view,+}: {+ variant?: UIVariant,+ view: View;+}) {+ const { extra, is_published } = view;+ const { t } = useTranslation();++ if (extra?.is_space) {+ return null;+ }++ if (is_published && variant === 'app') {+ return (+ <PublishSvg className="h-5 w-5 text-function-success" />+ );+ }++ if (variant === 'publish' && !is_published) {+ return (+ <Tooltip title={t('publish.hasNotBeenPublished')}>+ <div+ className={'text-text-caption cursor-pointer hover:bg-fill-list-hover rounded h-5 w-5 flex items-center justify-center'}+ >+ <PublishSvg className={`h-4 w-4`} />+ </div>+ </Tooltip>+ );+ }++ return null;+}++export default PublishIcon;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/_shared/view-icon/ViewIcon.tsx b/frontend/appflowy_web_app/src/components/_shared/view-icon/ViewIcon.tsxindex 4a802a174d..0ca4e7435f 100644--- a/frontend/appflowy_web_app/src/components/_shared/view-icon/ViewIcon.tsx+++ b/frontend/appflowy_web_app/src/components/_shared/view-icon/ViewIcon.tsx@@ -1,18 +1,19 @@-import { ViewLayout } from '@/application/collab.type';+import { ViewLayout } from '@/application/types';import React, { useMemo } from 'react';import { ReactComponent as BoardSvg } from '@/assets/board.svg';import { ReactComponent as CalendarSvg } from '@/assets/calendar.svg';import { ReactComponent as DocumentSvg } from '@/assets/document.svg';import { ReactComponent as GridSvg } from '@/assets/grid.svg';+import { ReactComponent as ChatSvg } from '@/assets/chat_ai.svg';-export function ViewIcon({ layout, size }: { layout: ViewLayout; size: number | 'small' | 'medium' | 'large' }) {+export function ViewIcon ({ layout, size }: { layout: ViewLayout; size: number | 'small' | 'medium' | 'large' }) {const iconSize = useMemo(() => {if (size === 'small') {return 'h-4 w-4';}if (size === 'medium') {- return 'h-6 w-6';+ return 'h-5 w-5';}if (size === 'large') {@@ -22,23 +23,21 @@ export function ViewIcon({ layout, size }: { layout: ViewLayout; size: number |return `h-${size} w-${size}`;}, [size]);- if (layout === ViewLayout.Grid) {- return <GridSvg className={iconSize} />;+ switch (layout) {+ case ViewLayout.AIChat:+ return <ChatSvg className={iconSize} />;+ case ViewLayout.Grid:+ return <GridSvg className={iconSize} />;+ case ViewLayout.Board:+ return <BoardSvg className={iconSize} />;+ case ViewLayout.Calendar:+ return <CalendarSvg className={iconSize} />;+ case ViewLayout.Document:+ return <DocumentSvg className={iconSize} />;+ default:+ return null;}- if (layout === ViewLayout.Board) {- return <BoardSvg className={iconSize} />;- }-- if (layout === ViewLayout.Calendar) {- return <CalendarSvg className={iconSize} />;- }-- if (layout === ViewLayout.Document) {- return <DocumentSvg className={iconSize} />;- }-- return null;}export default ViewIcon;diff --git a/frontend/appflowy_web_app/src/components/_shared/view-icon/utils.tsx b/frontend/appflowy_web_app/src/components/_shared/view-icon/utils.tsxnew file mode 100644index 0000000000..4caeb39087--- /dev/null+++ b/frontend/appflowy_web_app/src/components/_shared/view-icon/utils.tsx@@ -0,0 +1,21 @@+import { stringAvatar } from '@/utils/color';+import { isFlagEmoji } from '@/utils/emoji';++export function getAvatar (item: {+ icon?: string;+ name: string;+}) {+ if (item.icon) {+ const isFlag = isFlagEmoji(item.icon);++ return {+ children: <span className={isFlag ? 'icon' : ''}> {item.icon} </span>,+ sx: {+ bgcolor: 'var(--bg-body)',+ color: 'var(--text-title)',+ },+ };+ }++ return stringAvatar(item.name || '');+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/App.tsx b/frontend/appflowy_web_app/src/components/app/App.tsxdeleted file mode 100644index 9a69d29ad0..0000000000--- a/frontend/appflowy_web_app/src/components/app/App.tsx+++ /dev/null@@ -1,36 +0,0 @@-import { AUTH_CALLBACK_PATH } from '@/application/session/sign_in';-import NotFound from '@/components/error/NotFound';-import LoginAuth from '@/components/login/LoginAuth';-import AcceptInvitationPage from '@/pages/AcceptInvitationPage';-import AfterPaymentPage from '@/pages/AfterPaymentPage';-import AsTemplatePage from '@/pages/AsTemplatePage';-import LoginPage from '@/pages/LoginPage';-import PublishPage from '@/pages/PublishPage';-import { BrowserRouter, Route, Routes } from 'react-router-dom';-import withAppWrapper from '@/components/app/withAppWrapper';-import '@/styles/app.scss';--const AppMain = withAppWrapper(() => {- return (- <Routes>- <Route path={'/:namespace/:publishName'} element={<PublishPage />} />- <Route path={'/login'} element={<LoginPage />} />- <Route path={AUTH_CALLBACK_PATH} element={<LoginAuth />} />- <Route path="/404" element={<NotFound />} />- <Route path="/after-payment" element={<AfterPaymentPage />} />- <Route path="/as-template" element={<AsTemplatePage />} />- <Route path="/accept-invitation" element={<AcceptInvitationPage />} />- <Route path="*" element={<NotFound />} />- </Routes>- );-});--function App () {- return (- <BrowserRouter>- <AppMain />- </BrowserRouter>- );-}--export default App;diff --git a/frontend/appflowy_web_app/src/components/app/AppRouter.tsx b/frontend/appflowy_web_app/src/components/app/AppRouter.tsxnew file mode 100644index 0000000000..3f3ed14597--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/AppRouter.tsx@@ -0,0 +1,23 @@+import { AuthLayout } from '@/components/app/AuthLayout';+import RecordNotFound from '@/components/error/RecordNotFound';+import AppPage from '@/pages/AppPage';+import TrashPage from '@/pages/TrashPage';+import React from 'react';+import { Route, Routes } from 'react-router-dom';++function AppRouter () {+ return (+ <Routes>+ <Route element={<AuthLayout />}>+ <Route+ index element={<RecordNotFound noContent />}+ />+ <Route path={':workspaceId'} element={<AppPage />} />+ <Route path={':workspaceId/:viewId'} element={<AppPage />} />+ <Route path={'trash'} element={<TrashPage />} />+ </Route>+ </Routes>+ );+}++export default AppRouter;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/AuthLayout.tsx b/frontend/appflowy_web_app/src/components/app/AuthLayout.tsxnew file mode 100644index 0000000000..a22375dd0e--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/AuthLayout.tsx@@ -0,0 +1,13 @@+import { AppProvider } from '@/components/app/app.hooks';+import MainLayout from '@/components/app/MainLayout';+import React, { memo } from 'react';++export function AuthLayout () {+ return (+ <AppProvider>+ <MainLayout />+ </AppProvider>+ );+}++export default memo(AuthLayout);\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/DatabaseView.tsx b/frontend/appflowy_web_app/src/components/app/DatabaseView.tsxnew file mode 100644index 0000000000..46d2ab7f95--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/DatabaseView.tsx@@ -0,0 +1,117 @@+import {+ AppendBreadcrumb,+ CreateRowDoc,+ LoadView,+ LoadViewMeta, ViewLayout,+ YDatabase,+ YDoc,+ YjsEditorKey,+} from '@/application/types';+import { findView } from '@/components/_shared/outline/utils';+import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+import CalendarSkeleton from '@/components/_shared/skeleton/CalendarSkeleton';+import DocumentSkeleton from '@/components/_shared/skeleton/DocumentSkeleton';+import GridSkeleton from '@/components/_shared/skeleton/GridSkeleton';+import KanbanSkeleton from '@/components/_shared/skeleton/KanbanSkeleton';+import { useAppOutline } from '@/components/app/app.hooks';+import { Database } from '@/components/database';+import DatabaseHeader from '@/components/database/components/header/DatabaseHeader';+import { ViewMetaProps } from '@/components/view-meta';+import React, { Suspense, useCallback, useMemo } from 'react';+import { useSearchParams } from 'react-router-dom';++function DatabaseView ({ viewMeta, ...props }: {+ doc: YDoc;+ navigateToView?: (viewId: string) => Promise<void>;+ loadViewMeta?: LoadViewMeta;+ createRowDoc?: CreateRowDoc;+ loadView?: LoadView;+ viewMeta: ViewMetaProps;+ appendBreadcrumb?: AppendBreadcrumb;+ onRendered?: () => void;+}) {+ const [search, setSearch] = useSearchParams();+ const outline = useAppOutline();+ const iidIndex = viewMeta.viewId;+ const view = useMemo(() => {+ if (!outline || !iidIndex) return;+ return findView(outline || [], iidIndex);+ }, [outline, iidIndex]);++ const visibleViewIds = useMemo(() => {+ if (!view) return [];+ return [view.view_id, ...(view.children?.map(v => v.view_id) || [])];+ }, [view]);++ const viewId = useMemo(() => {+ return search.get('v') || iidIndex;+ }, [search, iidIndex]);++ const handleChangeView = useCallback(+ (viewId: string) => {+ setSearch(prev => {+ prev.set('v', viewId);+ return prev;+ });+ },+ [setSearch],+ );++ const handleNavigateToRow = useCallback(+ (rowId: string) => {+ setSearch(prev => {+ prev.set('r', rowId);+ return prev;+ });+ },+ [setSearch],+ );++ const rowId = search.get('r') || undefined;+ const doc = props.doc;+ const database = doc?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database) as YDatabase;+ const skeleton = useMemo(() => {+ if (rowId) {+ return <DocumentSkeleton />;+ }++ switch (viewMeta.layout) {+ case ViewLayout.Grid:+ return <GridSkeleton includeTitle={false} />;+ case ViewLayout.Board:+ return <KanbanSkeleton includeTitle={false} />;+ case ViewLayout.Calendar:+ return <CalendarSkeleton includeTitle={false} />;+ default:+ return <ComponentLoading />;+ }+ }, [rowId, viewMeta.layout]);++ if (!viewId || !doc || !database) return null;++ return (+ <div+ style={{+ minHeight: 'calc(100vh - 48px)',+ }}+ className={'relative flex h-full w-full flex-col px-6'}+ >+ {rowId ? null : <DatabaseHeader {...viewMeta} />}++ <Suspense fallback={skeleton}>+ <Database+ iidName={viewMeta.name || ''}+ iidIndex={iidIndex || ''}+ {...props}+ viewId={viewId}+ rowId={rowId}+ visibleViewIds={visibleViewIds}+ onChangeView={handleChangeView}+ onOpenRow={handleNavigateToRow}+ />+ </Suspense>+ </div>+ );+}++export default DatabaseView;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/Main.tsx b/frontend/appflowy_web_app/src/components/app/Main.tsxnew file mode 100644index 0000000000..b82498f04e--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/Main.tsx@@ -0,0 +1,12 @@+import React, { memo } from 'react';+import { Outlet } from 'react-router-dom';++function Main () {+ return (+ <main className={'flex-1'}>+ <Outlet />+ </main>+ );+}++export default memo(Main);\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/MainLayout.tsx b/frontend/appflowy_web_app/src/components/app/MainLayout.tsxnew file mode 100644index 0000000000..9ef62f1dca--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/MainLayout.tsx@@ -0,0 +1,60 @@+import { useOutlineDrawer } from '@/components/_shared/outline/outline.hooks';+import { AFScroller } from '@/components/_shared/scroller';+import { AppHeader } from '@/components/app/header';+import Main from '@/components/app/Main';+import SideBar from '@/components/app/SideBar';+import SomethingError from '@/components/error/SomethingError';+import React, { useMemo } from 'react';+import { ErrorBoundary } from 'react-error-boundary';++function MainLayout () {+ const {+ drawerOpened,+ drawerWidth,+ setDrawerWidth,+ toggleOpenDrawer,+ } = useOutlineDrawer();++ const main = useMemo(() => {+ return <Main />;+ }, []);++ return (+ <div className={'h-screen w-screen'}>+ <AFScroller+ overflowXHidden+ overflowYHidden={false}+ style={{+ transform: drawerOpened ? `translateX(${drawerWidth}px)` : 'none',+ width: drawerOpened ? `calc(100% - ${drawerWidth}px)` : '100%',+ transition: 'width 0.2s ease-in-out, transform 0.2s ease-in-out',+ }}+ className={'appflowy-layout flex flex-col appflowy-scroll-container h-full'}+ >+ <AppHeader+ onOpenDrawer={() => {+ toggleOpenDrawer(true);+ }}+ drawerWidth={drawerWidth}+ onCloseDrawer={() => {+ toggleOpenDrawer(false);+ }}+ openDrawer={drawerOpened}+ />+ <ErrorBoundary FallbackComponent={SomethingError}>+ {main}+ </ErrorBoundary>++ </AFScroller>+ {drawerOpened &&+ <SideBar+ onResizeDrawerWidth={setDrawerWidth}+ drawerWidth={drawerWidth} drawerOpened={drawerOpened}+ toggleOpenDrawer={toggleOpenDrawer}+ />+ }+ </div>+ );+}++export default MainLayout;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/RequestAccess.tsx b/frontend/appflowy_web_app/src/components/app/RequestAccess.tsxnew file mode 100644index 0000000000..08ab677b25--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/RequestAccess.tsx@@ -0,0 +1,94 @@+import { NormalModal } from '@/components/_shared/modal';+import { AFConfigContext, useCurrentUser } from '@/components/main/app.hooks';+import { Button, Divider, Typography } from '@mui/material';+import React, { useContext } from 'react';+import { useTranslation, Trans } from 'react-i18next';+import { ReactComponent as AppflowyLogo } from '@/assets/appflowy.svg';+import { useNavigate } from 'react-router-dom';+import { ReactComponent as WarningIcon } from '@/assets/warning.svg';++function RequestAccess () {+ const { t } = useTranslation();+ const currentUser = useCurrentUser();+ const email = currentUser?.email || '';+ const openLoginModal = useContext(AFConfigContext)?.openLoginModal;+ const [clicked, setClicked] = React.useState(false);+ const navigate = useNavigate();+ const [modalOpen, setModalOpen] = React.useState(false);++ return (+ <div className={'m-0 flex h-screen w-screen items-center justify-center bg-bg-body p-0'}>+ <div className={'flex flex-col px-6 items-center gap-3 text-center max-w-[660px] mb-10'}>+ <Typography+ variant="h3" className={'mb-[27px] flex items-center gap-4 text-text-title'} gutterBottom+ >+ <>+ <AppflowyLogo className={'w-48'} />+ </>+ </Typography>+ <div className={'mb-[16px] max-md:text-[24px] text-[52px] font-semibold leading-[128%] text-text-title'}>+ {t('requestAccess.title')}+ </div>+ <div className={'text-[20px] max-md:text-[16px] leading-[152%] text-text-caption'}>+ <div>{t('requestAccess.subtitle')}</div>+ </div>+ <div className={'flex items-center mt-4 w-full gap-4 justify-between'}>+ <Button+ onClick={() => {+ setModalOpen(true);+ setClicked(true);+ }}+ disabled={clicked}+ className={'flex-1 py-2 px-4 rounded-[8px] text-[20px] font-medium max-md:text-base max-sm:text-[14px] max-md:py-2'}+ variant={'contained'} color={'primary'}+ >+ {t('requestAccess.requestAccess')}+ </Button>+ <Button+ onClick={() => {+ navigate('/');+ }}+ className={'flex-1 py-2 px-4 rounded-[8px] max-sm:text-[14px] max-md:text-base text-[20px] font-medium max-md:py-2'}+ variant={'outlined'} color={'inherit'}+ >+ {t('requestAccess.backToHome')}+ </Button>+ </div>+ <Divider className={'w-full mb-3 mt-4'} />+ <div className={'max-w-[400px] flex flex-col text-text-caption'}>+ <span>+ <Trans+ i18nKey="requestAccess.tip"+ components={{ link: <span className={'underline text-fill-default'}>{email}</span> }}+ />+ </span>+ <span>+ <Trans+ i18nKey="requestAccess.mightBe"+ components={{+ login: <span+ onClick={() => openLoginModal?.()} className={'underline text-fill-default cursor-pointer'}+ >{t('signIn.logIn')}</span>,+ }}+ />+ </span>+ </div>+ </div>+ <NormalModal+ onCancel={() => {+ setModalOpen(false);+ }} onOk={() => {+ setModalOpen(false);+ }} title={+ <div className={'text-left font-semibold gap-1.5 flex items-center'}>+ <WarningIcon className={'w-4 h-4'} />+ Coming soon</div>+ } open={modalOpen} onClose={() => setModalOpen(false)}+ >+ This feature is coming soon. Please contact the owner of this workspace to request access.+ </NormalModal>+ </div>+ );+}++export default RequestAccess;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/SideBar.tsx b/frontend/appflowy_web_app/src/components/app/SideBar.tsxnew file mode 100644index 0000000000..b49e47b073--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/SideBar.tsx@@ -0,0 +1,54 @@+import { UIVariant } from '@/application/types';+import { OutlineDrawer } from '@/components/_shared/outline';+import Outline from '@/components/_shared/outline/Outline';+import { AppContext, useAppOutline, useAppViewId } from '@/components/app/app.hooks';+import React, { Suspense, useContext, lazy } from 'react';+import { Favorite } from '@/components/app/favorite';+import { Workspaces } from '@/components/app/workspaces';++const SideBarBottom = lazy(() => import('@/components/app/SideBarBottom'));++interface SideBarProps {+ drawerWidth: number;+ drawerOpened: boolean;+ toggleOpenDrawer: (status: boolean) => void;+ onResizeDrawerWidth: (width: number) => void;+}++function SideBar ({+ drawerWidth,+ drawerOpened,+ toggleOpenDrawer,+ onResizeDrawerWidth,+}: SideBarProps) {+ const outline = useAppOutline();++ const viewId = useAppViewId();+ const navigateToView = useContext(AppContext)?.toView;+ const rendered = useContext(AppContext)?.rendered;++ return (+ <OutlineDrawer+ onResizeWidth={onResizeDrawerWidth}+ width={drawerWidth}+ open={drawerOpened}+ onClose={() => toggleOpenDrawer(false)}+ header={<Workspaces />}+ >+ <div className={'flex w-full flex-1 flex-col'}>+ <Favorite />+ <Outline+ variant={UIVariant.App}+ navigateToView={navigateToView}+ selectedViewId={viewId}+ width={drawerWidth}+ outline={outline}+ />+ {rendered && <Suspense><SideBarBottom /></Suspense>}++ </div>+ </OutlineDrawer>+ );+}++export default SideBar;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/SideBarBottom.tsx b/frontend/appflowy_web_app/src/components/app/SideBarBottom.tsxnew file mode 100644index 0000000000..658ff25302--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/SideBarBottom.tsx@@ -0,0 +1,32 @@+import { Button, Divider } from '@mui/material';+import React from 'react';+import { useTranslation } from 'react-i18next';+import Trash from 'src/components/app/trash/Trash';+import { ReactComponent as TemplateIcon } from '@/assets/template.svg';++function SideBarBottom () {+ const { t } = useTranslation();++ return (+ <div+ className={'flex border-t border-line-divider py-4 px-4 gap-1 justify-between items-center sticky bottom-0 bg-bg-body'}+ >+ <Button+ startIcon={<TemplateIcon className={'h-5 w-5'} />}+ size={'small'}+ onClick={() => {+ window.open('https://appflowy.io/templates', '_blank');+ }}+ variant={'text'}+ className={'flex-1'}+ color={'inherit'}+ >+ {t('template.label')}+ </Button>+ <Divider orientation={'vertical'} flexItem />+ <Trash />+ </div>+ );+}++export default SideBarBottom;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/app.hooks.tsx b/frontend/appflowy_web_app/src/components/app/app.hooks.tsxnew file mode 100644index 0000000000..142e29a9d9--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/app.hooks.tsx@@ -0,0 +1,458 @@+import { invalidToken } from '@/application/session/token';+import {+ AppendBreadcrumb,+ CreateRowDoc,+ DatabaseRelations,+ LoadView,+ LoadViewMeta,+ UserWorkspaceInfo,+ View,+ ViewLayout,+} from '@/application/types';+import { filterOutViewsByLayout, findAncestors, findView, findViewByLayout } from '@/components/_shared/outline/utils';+import RequestAccess from '@/components/app/RequestAccess';+import { AFConfigContext, useCurrentUser, useService } from '@/components/main/app.hooks';+import { uniqBy } from 'lodash-es';+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';+import { useNavigate, useParams } from 'react-router-dom';++export interface AppContextType {+ toView: (viewId: string) => Promise<void>;+ loadViewMeta: LoadViewMeta;+ createRowDoc?: CreateRowDoc;+ loadView: LoadView;+ outline?: View[];+ viewId?: string;+ currentWorkspaceId?: string;+ onChangeWorkspace?: (workspaceId: string) => Promise<void>;+ userWorkspaceInfo?: UserWorkspaceInfo;+ breadcrumbs?: View[];+ appendBreadcrumb?: AppendBreadcrumb;+ loadFavoriteViews?: () => Promise<void>;+ loadRecentViews?: () => Promise<void>;+ favoriteViews?: View[];+ recentViews?: View[];+ rendered?: boolean;+ onRendered?: () => void;+}++const USER_NO_ACCESS_CODE = [1024, 1012];++export const AppContext = createContext<AppContextType | null>(null);++export const AppProvider = ({ children }: { children: React.ReactNode }) => {+ const isAuthenticated = useContext(AFConfigContext)?.isAuthenticated;+ const currentUser = useCurrentUser();+ const params = useParams();+ const pathname = window.location.pathname;+ const viewId = params.viewId as string;+ const currentWorkspaceId = useMemo(() => params.workspaceId || currentUser?.latestWorkspaceId, [params.workspaceId, currentUser]);+ const [userWorkspaceInfo, setUserWorkspaceInfo] = useState<UserWorkspaceInfo | undefined>(undefined);+ const [workspaceDatabases, setWorkspaceDatabases] = useState<DatabaseRelations | undefined>(undefined);+ const [outline, setOutline] = useState<View[]>();+ const [favoriteViews, setFavoriteViews] = useState<View[]>();+ const [recentViews, setRecentViews] = useState<View[]>();+ const createdRowKeys = useRef<string[]>([]);+ const [requestAccessOpened, setRequestAccessOpened] = useState(false);+ const [rendered, setRendered] = useState(false);+ const service = useService();+ const navigate = useNavigate();+ const onRendered = useCallback(() => {+ setRendered(true);+ }, []);+ const logout = useCallback(() => {+ invalidToken();+ navigate(`/login?redirectTo=${encodeURIComponent(window.location.pathname)}`);+ }, [navigate]);++ // If the user is not authenticated, log out the user+ useEffect(() => {+ if (!isAuthenticated) {+ logout();+ }+ }, [isAuthenticated, logout]);++ // If the user is logged in but the workspace is not found, log out the user+ useEffect(() => {+ if (currentUser && !currentWorkspaceId) {+ logout();+ }+ }, [currentWorkspaceId, currentUser, logout]);++ useEffect(() => {+ const rowKeys = createdRowKeys.current;++ createdRowKeys.current = [];+ if (!rowKeys.length) return;+ rowKeys.forEach((rowKey) => {+ try {+ service?.deleteRowDoc(rowKey);+ } catch (e) {+ console.error(e);+ }+ });++ }, [service, viewId]);++ const originalCrumbs = useMemo(() => {+ if (!outline || !viewId) return [];++ return findAncestors(outline, viewId) || [];+ }, [outline, viewId]);++ const [breadcrumbs, setBreadcrumbs] = useState<View[]>(originalCrumbs);++ useEffect(() => {+ setBreadcrumbs(originalCrumbs);+ }, [originalCrumbs]);++ const appendBreadcrumb = useCallback((view?: View) => {+ setBreadcrumbs((prev) => {+ if (!view) {+ return prev.slice(0, -1);+ }++ const index = prev.findIndex((v) => v.view_id === view.view_id);++ if (index === -1) {+ return [...prev, view];+ }++ const rest = prev.slice(0, index);++ return [...rest, view];+ });+ }, []);++ const toView = useCallback(async (viewId: string, keepSearch?: boolean) => {+ localStorage.setItem('last_view_id', viewId);+ let url = `/app/${currentWorkspaceId}/${viewId}`;++ if (keepSearch) {+ url += window.location.search;+ }++ navigate(url);+ }, [currentWorkspaceId, navigate]);++ useEffect(() => {+ if (!currentWorkspaceId) return;+ if (pathname === '/app/trash') return;++ const lastViewId = viewId || localStorage.getItem('last_view_id');+ const views = filterOutViewsByLayout(outline || [], ViewLayout.AIChat);++ if (!views || views.length === 0) return;+ if (lastViewId) {+ const view = findView(views, lastViewId);++ if (view) {+ void toView(lastViewId, true);+ return;+ }+ }++ const firstView = findViewByLayout(views, [ViewLayout.Document, ViewLayout.Grid, ViewLayout.Board, ViewLayout.Calendar]);++ if (firstView) {+ void toView(firstView.view_id);+ } else {+ localStorage.removeItem('last_view_id');+ }+ }, [viewId, currentWorkspaceId, outline, pathname, toView]);++ const loadViewMeta = useCallback(async (viewId: string, callback?: (meta: View) => void) => {+ const view = findView(outline || [], viewId);++ if (!view) {+ return Promise.reject('View not found');+ }++ if (callback) {+ callback({+ ...view,+ database_relations: workspaceDatabases,+ });+ }++ return {+ ...view,+ database_relations: workspaceDatabases,+ };+ }, [outline, workspaceDatabases]);++ const loadView = useCallback(async (id: string) => {++ const errorCallback = (e: {+ code: number;+ }) => {+ if (viewId === id && USER_NO_ACCESS_CODE.includes(e.code)) {+ setRequestAccessOpened(true);+ }+ };++ try {+ if (!service || !currentWorkspaceId) {+ throw new Error('Service or workspace not found');+ }++ const res = await service?.getPageDoc(currentWorkspaceId, id, errorCallback);++ if (!res) {+ throw new Error('View not found');+ }++ return res;+ // eslint-disable-next-line+ } catch (e: any) {+ errorCallback(e);++ return Promise.reject(e);+ }+ }, [viewId, currentWorkspaceId, service]);++ const createRowDoc = useCallback(+ async (rowKey: string) => {+ try {+ const doc = await service?.createRowDoc(rowKey);++ if (!doc) {+ throw new Error('Failed to create row doc');+ }++ createdRowKeys.current.push(rowKey);+ return doc;+ } catch (e) {+ return Promise.reject(e);+ }+ },+ [service],+ );++ const loadUserWorkspaceInfo = useCallback(async () => {+ if (!service || !currentWorkspaceId) return;+ try {+ const res = await service.getUserWorkspaceInfo();++ setUserWorkspaceInfo(res);+ return res;+ } catch (e) {+ console.error(e);+ }+ }, [currentWorkspaceId, service]);+ const loadDatabaseViewRelations = useCallback(async (workspaceId: string, databaseStorageId: string) => {+ if (!service) return;+ try {+ const res = await service.getAppDatabaseViewRelations(workspaceId, databaseStorageId);++ setWorkspaceDatabases(res);+ } catch (e) {+ console.error(e);+ }+ }, [service]);++ const loadOutline = useCallback(async (workspaceId: string) => {++ if (!service) return;+ try {+ const res = await service?.getAppOutline(workspaceId);++ if (!res) {+ throw new Error('App outline not found');+ }++ setOutline(res);+ // eslint-disable-next-line+ } catch (e: any) {+ console.error('App outline not found');+ if (USER_NO_ACCESS_CODE.includes(e.code)) {+ setRequestAccessOpened(true);+ }+ }+ }, [service]);++ const loadFavoriteViews = useCallback(async () => {+ if (!service || !currentWorkspaceId) return;+ try {+ const res = await service?.getAppFavorites(currentWorkspaceId);++ if (!res) {+ throw new Error('Favorite views not found');+ }++ setFavoriteViews(res);+ } catch (e) {+ console.error('Favorite views not found');+ }+ }, [currentWorkspaceId, service]);++ const loadRecentViews = useCallback(async () => {+ if (!service || !currentWorkspaceId) return;+ try {+ const res = await service?.getAppRecent(currentWorkspaceId);++ if (!res) {+ throw new Error('Recent views not found');+ }++ setRecentViews(uniqBy(res, 'view_id'));+ } catch (e) {+ console.error('Recent views not found');+ }+ }, [currentWorkspaceId, service]);++ useEffect(() => {+ if (!currentWorkspaceId) return;+ void loadOutline(currentWorkspaceId);++ }, [loadOutline, currentWorkspaceId]);++ useEffect(() => {+ void loadUserWorkspaceInfo().then(res => {+ const selectedWorkspace = res?.selectedWorkspace;++ if (!selectedWorkspace) return;++ void loadDatabaseViewRelations(selectedWorkspace.id, selectedWorkspace.databaseStorageId);+ });+ }, [loadDatabaseViewRelations, loadUserWorkspaceInfo]);++ const onChangeWorkspace = useCallback(async (workspaceId: string) => {+ if (!service) return;+ await service.openWorkspace(workspaceId);+ localStorage.removeItem('last_view_id');+ setOutline(undefined);+ navigate(`/app/${workspaceId}`);++ }, [navigate, service]);++ return <AppContext.Provider+ value={{+ currentWorkspaceId,+ outline,+ viewId,+ toView,+ loadViewMeta,+ createRowDoc,+ loadView,+ loadFavoriteViews,+ loadRecentViews,+ favoriteViews,+ recentViews,+ appendBreadcrumb,+ breadcrumbs,+ userWorkspaceInfo,+ onChangeWorkspace,+ rendered,+ onRendered,+ }}+ >+ {requestAccessOpened ? <RequestAccess /> : children}+ </AppContext.Provider>;+};++export function useBreadcrumb () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useBreadcrumb must be used within an AppProvider');+ }++ return context.breadcrumbs;+}++export function useUserWorkspaceInfo () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useUserWorkspaceInfo must be used within an AppProvider');+ }++ return context.userWorkspaceInfo;+}++export function useAppOutline () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useAppOutline must be used within an AppProvider');+ }++ return context.outline;+}++export function useAppViewId () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useAppViewId must be used within an AppProvider');+ }++ return context.viewId;+}++export function useAppView () {+ const viewId = useAppViewId();+ const outline = useAppOutline();+ const view = useMemo(() => viewId ? findView(outline || [], viewId) : null, [outline, viewId]);++ if (!viewId || !outline) {+ return;+ }++ return view;+}++export function useCurrentWorkspaceId () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useCurrentWorkspaceId must be used within an AppProvider');+ }++ return context.currentWorkspaceId;+}++export function useAppHandlers () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useAppHandlers must be used within an AppProvider');+ }++ return {+ toView: context.toView,+ loadViewMeta: context.loadViewMeta,+ createRowDoc: context.createRowDoc,+ loadView: context.loadView,+ appendBreadcrumb: context.appendBreadcrumb,+ onChangeWorkspace: context.onChangeWorkspace,+ onRendered: context.onRendered,+ };+}++export function useAppFavorites () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useAppFavorites must be used within an AppProvider');+ }++ return {+ loadFavoriteViews: context.loadFavoriteViews,+ favoriteViews: context.favoriteViews,+ };+}++export function useAppRecent () {+ const context = useContext(AppContext);++ if (!context) {+ throw new Error('useAppRecent must be used within an AppProvider');+ }++ return {+ loadRecentViews: context.loadRecentViews,+ recentViews: context.recentViews,+ };+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/favorite/Favorite.tsx b/frontend/appflowy_web_app/src/components/app/favorite/Favorite.tsxnew file mode 100644index 0000000000..f5dcc159eb--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/favorite/Favorite.tsx@@ -0,0 +1,161 @@+import { UIVariant } from '@/application/types';+import OutlineItem from '@/components/_shared/outline/OutlineItem';+import { Popover } from '@/components/_shared/popover';+import RecentListSkeleton from '@/components/_shared/skeleton/RecentListSkeleton';+import { useAppFavorites, useAppHandlers, useAppViewId } from '@/components/app/app.hooks';+import { Collapse } from '@mui/material';+import { PopoverProps } from '@mui/material/Popover';+import dayjs from 'dayjs';+import { groupBy, sortBy } from 'lodash-es';+import React, { useEffect, useMemo } from 'react';+import { ReactComponent as FavoritedIcon } from '@/assets/favorited.svg';+import { useTranslation } from 'react-i18next';+import { ReactComponent as MoreIcon } from '@/assets/more.svg';++const popoverOrigin: Partial<PopoverProps> = {+ transformOrigin: {+ vertical: 'top',+ horizontal: 'left',+ },+ anchorOrigin: {+ vertical: 'top',+ horizontal: 'right',+ },+};++enum FavoriteGroup {+ today = 'today',+ yesterday = 'yesterday',+ thisWeek = 'thisWeek',+ Others = 'Others',+}++export function Favorite () {+ const {+ favoriteViews,+ loadFavoriteViews,+ } = useAppFavorites();+ const navigateToView = useAppHandlers().toView;+ const viewId = useAppViewId();+ const { t } = useTranslation();+ const [isExpanded, setIsExpanded] = React.useState(() => {+ return localStorage.getItem('favorite_expanded') !== 'false';+ });+ const moreButtonRef = React.useRef<HTMLDivElement>(null);+ const [moreOpened, setMoreOpened] = React.useState(false);++ useEffect(() => {+ void loadFavoriteViews?.();+ }, [loadFavoriteViews]);++ const handleToggleExpand = () => {+ setIsExpanded(!isExpanded);+ localStorage.setItem('favorite_expanded', String(!isExpanded));+ };++ const { pinViews, unpinViews } = useMemo(() => {+ return groupBy(favoriteViews, (view) => view.extra?.is_pinned ? 'pinViews' : 'unpinViews');+ }, [favoriteViews]);++ const groupByViewsWithDay = useMemo(() => {+ return groupBy(favoriteViews, (view) => {+ const date = dayjs(view.last_edited_time);+ const today = date.isSame(dayjs(), 'day');+ const yesterday = date.isSame(dayjs().subtract(1, 'day'), 'day');+ const thisWeek = date.isSame(dayjs(), 'week');++ if (today) return FavoriteGroup.today;+ if (yesterday) return FavoriteGroup.yesterday;+ if (thisWeek) return FavoriteGroup.thisWeek;+ return FavoriteGroup.Others;+ });+ }, [favoriteViews]);++ const groupByViews = useMemo(() => {+ return sortBy(Object.entries(groupByViewsWithDay), ([key]) => {+ return key === FavoriteGroup.today ? 0 : key === FavoriteGroup.yesterday ? 1 : key === FavoriteGroup.thisWeek ? 2 : 3;+ }).map(([key, value]) => {+ const timeLabel: Record<string, string> = {+ [FavoriteGroup.today]: t('calendar.navigation.today'),+ [FavoriteGroup.yesterday]: t('relativeDates.yesterday'),+ [FavoriteGroup.thisWeek]: t('sideBar.thisWeek'),+ [FavoriteGroup.Others]: t('sideBar.others'),+ };++ return <div className={'flex flex-col gap-2'} key={key}>+ <div className={'text-xs text-text-caption py-1 px-1'}>{timeLabel[key]}</div>+ <div className={'px-1'}>+ {value.map((view) =>+ <OutlineItem+ variant={UIVariant.Favorite}+ key={view.view_id}+ view={view}+ navigateToView={navigateToView}+ />,+ )}+ </div>++ </div>;+ });+ }, [groupByViewsWithDay, navigateToView, t]);++ return (+ <div className={'flex w-full flex-col py-[10px] px-[10px]'}>+ <div onClick={handleToggleExpand} className={'flex h-fit my-0.5 w-full flex-col gap-2 cursor-pointer'}>+ <div+ className={+ 'flex items-center w-full gap-2 rounded-[8px] py-1.5 px-0.5 text-sm hover:bg-content-blue-50 focus:bg-content-blue-50 focus:outline-none'+ }+ >+ <FavoritedIcon className={'h-5 w-5'} />+ <div className={'flex-1 truncate'}>{t('sideBar.favorites')}</div>+ </div>+ </div>+ {!favoriteViews ? <RecentListSkeleton rows={3} /> : <Collapse+ in={isExpanded}+ className={'flex px-1 transform flex-col gap-2 transition-all'}+ >+ {+ pinViews?.map((view) =>+ <OutlineItem+ variant={UIVariant.Favorite}+ key={view.view_id}+ selectedViewId={viewId}+ view={view}+ navigateToView={navigateToView}+ />,+ )+ }+ {unpinViews?.length > 0 && <div+ onClick={() => {+ setMoreOpened(true);+ }}+ ref={moreButtonRef}+ className={'flex items-center w-full gap-2 rounded-[8px] px-2 py-1.5 text-sm cursor-pointer hover:bg-content-blue-50 focus:bg-content-blue-50 focus:outline-none'}+ >+ <MoreIcon className={'h-4 w-4 text-text-caption'} />+ <div>{t('button.more')}</div>++ </div>}+ </Collapse>+ }+ <Popover+ {...popoverOrigin}+ className={'appflowy-scroller'}+ sx={{+ maxHeight: '50vh',+ }}+ open={moreOpened} anchorEl={moreButtonRef.current}+ onClose={() => setMoreOpened(false)}+ >+ <div className={'flex w-[240px] flex-col gap-2 px-2 py-2'}>++ {groupByViews}+ </div>+ </Popover>++ </div>+ );+}++export default Favorite;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/favorite/index.ts b/frontend/appflowy_web_app/src/components/app/favorite/index.tsnew file mode 100644index 0000000000..3fd505a219--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/favorite/index.ts@@ -0,0 +1 @@+export * from './Favorite';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/header/AppHeader.tsx b/frontend/appflowy_web_app/src/components/app/header/AppHeader.tsxnew file mode 100644index 0000000000..fd41c6472d--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/header/AppHeader.tsx@@ -0,0 +1,100 @@+import { UIVariant } from '@/application/types';+import { Breadcrumb } from '@/components/_shared/breadcrumb';+import { useOutlinePopover } from '@/components/_shared/outline/outline.hooks';+import BreadcrumbSkeleton from '@/components/_shared/skeleton/BreadcrumbSkeleton';+import { AppContext, useAppHandlers, useBreadcrumb } from '@/components/app/app.hooks';+import { IconButton } from '@mui/material';+import { ReactComponent as SideOutlined } from '@/assets/side_outlined.svg';++import React, { memo, lazy, Suspense, useContext, useMemo } from 'react';+import Recent from 'src/components/app/recent/Recent';++import OutlinePopover from '@/components/_shared/outline/OutlinePopover';++const RightMenu = lazy(() => import('@/components/app/header/RightMenu'));++interface AppHeaderProps {+ onOpenDrawer: () => void;+ drawerWidth: number;+ openDrawer: boolean;+ onCloseDrawer: () => void;+}++const HEADER_HEIGHT = 48;++export function AppHeader ({+ onOpenDrawer, openDrawer, onCloseDrawer,+}: AppHeaderProps) {+ const {+ openPopover, debounceClosePopover, handleOpenPopover, debounceOpenPopover, handleClosePopover,+ } = useOutlinePopover({+ onOpenDrawer, openDrawer, onCloseDrawer,+ });++ const isTrash = window.location.pathname === '/app/trash';++ const crumbs = useBreadcrumb();++ const displayMenuButton = !openDrawer && window.innerWidth >= 480;++ const toView = useAppHandlers().toView;+ const rendered = useContext(AppContext)?.rendered;++ const recent = useMemo(() => <Recent />, []);++ return (+ <div+ style={{+ backdropFilter: 'saturate(180%) blur(16px)',+ background: 'var(--bg-header)',+ height: HEADER_HEIGHT,+ minHeight: HEADER_HEIGHT,+ }}+ className={'appflowy-top-bar transform-gpu sticky top-0 z-10 flex px-5'}+ >+ <div className={'flex w-full items-center justify-between gap-4 overflow-hidden'}>+ {displayMenuButton && (+ <OutlinePopover+ {...{+ onMouseEnter: handleOpenPopover,+ onMouseLeave: debounceClosePopover,+ }}+ open={openPopover}+ onClose={debounceClosePopover}+ content={recent}+ >+ <IconButton+ {...{+ onMouseEnter: debounceOpenPopover,+ onMouseLeave: debounceClosePopover,+ onClick: () => {+ handleClosePopover();+ onOpenDrawer();+ },+ }}++ >+ <SideOutlined className={'h-4 w-4 text-text-caption'} />+ </IconButton>+ </OutlinePopover>++ )}+ <div className={'h-full flex-1 overflow-hidden'}>+ {isTrash || crumbs && crumbs.length === 0 ? null :+ !crumbs ? <div className={'h-[48px] flex items-center'}><BreadcrumbSkeleton /></div> :+ <Breadcrumb+ toView={toView}+ variant={UIVariant.App}+ crumbs={crumbs}+ />}+ </div>+ {rendered && <Suspense fallback={null}>+ <RightMenu />+ </Suspense>}++ </div>+ </div>+ );+}++export default memo(AppHeader);\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/header/RightMenu.tsx b/frontend/appflowy_web_app/src/components/app/header/RightMenu.tsxnew file mode 100644index 0000000000..0fc3133694--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/header/RightMenu.tsx@@ -0,0 +1,30 @@+import MoreActions from '@/components/_shared/more-actions/MoreActions';+import { openOrDownload } from '@/utils/open_schema';+import { Divider, Tooltip } from '@mui/material';+import React from 'react';+import { useTranslation } from 'react-i18next';+import ShareButton from 'src/components/app/share/ShareButton';+import { ReactComponent as Logo } from '@/assets/logo.svg';++function RightMenu () {+ const { t } = useTranslation();++ return (+ <div className={'flex items-center gap-2'}>+ <MoreActions />+ <ShareButton />+ <Divider+ orientation={'vertical'}+ className={'mx-2'}+ flexItem+ />+ <Tooltip title={t('publish.downloadApp')}>+ <button onClick={() => openOrDownload()}>+ <Logo className={'h-6 w-6'} />+ </button>+ </Tooltip>+ </div>+ );+}++export default RightMenu;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/header/index.ts b/frontend/appflowy_web_app/src/components/app/header/index.tsnew file mode 100644index 0000000000..65731288dc--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/header/index.ts@@ -0,0 +1 @@+export * from './AppHeader';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/index.ts b/frontend/appflowy_web_app/src/components/app/index.tsnew file mode 100644index 0000000000..6a8b28e586--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/index.ts@@ -0,0 +1 @@+export * from 'src/components/app/AuthLayout';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/recent/Recent.tsx b/frontend/appflowy_web_app/src/components/app/recent/Recent.tsxnew file mode 100644index 0000000000..cbb5e642e9--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/recent/Recent.tsx@@ -0,0 +1,87 @@+import { UIVariant } from '@/application/types';+import OutlineItem from '@/components/_shared/outline/OutlineItem';+import RecentListSkeleton from '@/components/_shared/skeleton/RecentListSkeleton';+import { useAppHandlers, useAppRecent } from '@/components/app/app.hooks';+import dayjs from 'dayjs';+import { groupBy, sortBy } from 'lodash-es';+import React, { useEffect, useMemo } from 'react';+import { useTranslation } from 'react-i18next';++enum RecentGroup {+ today = 'today',+ thisWeek = 'thisWeek',+ Others = 'Others',+}++export function Recent () {+ const {+ recentViews,+ loadRecentViews,+ } = useAppRecent();+ const navigateToView = useAppHandlers().toView;+ const { t } = useTranslation();++ useEffect(() => {+ void loadRecentViews?.();+ }, [loadRecentViews]);++ const groupByViewsWithDay = useMemo(() => {+ return groupBy(recentViews, (view) => {+ const date = dayjs(view.last_edited_time);+ const today = date.isSame(dayjs(), 'day');+ const thisWeek = date.isSame(dayjs(), 'week');++ if (today) return RecentGroup.today;+ if (thisWeek) return RecentGroup.thisWeek;+ return RecentGroup.Others;+ });+ }, [recentViews]);++ const groupByViews = useMemo(() => {+ return sortBy(Object.entries(groupByViewsWithDay), ([key]) => {+ return key === RecentGroup.today ? 0 : key === RecentGroup.thisWeek ? 1 : 2;+ }).map(([key, value]) => {+ const timeLabel: Record<string, string> = {+ [RecentGroup.today]: t('sideBar.today'),+ [RecentGroup.thisWeek]: t('sideBar.thisWeek'),+ [RecentGroup.Others]: t('sideBar.earlier'),+ };++ return <div className={'flex flex-col gap-2'} key={key}>+ <div className={'text-xs text-text-caption py-1 px-1'}>{timeLabel[key]}</div>+ <div className={'px-1'}>+ {value.map((view) =>+ <OutlineItem+ variant={UIVariant.Recent}+ key={view.view_id}+ view={view}+ navigateToView={navigateToView}+ />,+ )}+ </div>++ </div>;+ });+ }, [groupByViewsWithDay, navigateToView, t]);++ return (+ <div className={'flex w-[268px] flex-col gap-1 py-[10px] px-[10px]'}>+ <div className={'flex h-fit my-0.5 w-full flex-col gap-2'}>+ <div+ className={+ 'flex items-center w-full gap-0.5 px-1 rounded-[8px] pb-1 text-sm'+ }+ >+ <div className={'flex-1 truncate text-text-caption'}>{t('sideBar.recent')}</div>+ </div>+ </div>++ {recentViews && recentViews.length > 0 ?+ groupByViews : <RecentListSkeleton />+ }++ </div>+ );+}++export default Recent;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/recent/index.ts b/frontend/appflowy_web_app/src/components/app/recent/index.tsnew file mode 100644index 0000000000..437bfa91b4--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/recent/index.ts@@ -0,0 +1 @@+export * from './Recent';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/LinkPreview.tsx b/frontend/appflowy_web_app/src/components/app/share/LinkPreview.tsxnew file mode 100644index 0000000000..6d3b225a69--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/LinkPreview.tsx@@ -0,0 +1,67 @@+import { notify } from '@/components/_shared/notify';+import { copyTextToClipboard } from '@/utils/copy';+import { Button, OutlinedInput, Tooltip } from '@mui/material';+import React from 'react';+import { ReactComponent as CopyIcon } from '@/assets/link.svg';+import { ReactComponent as CheckIcon } from '@/assets/check_circle.svg';+import { useTranslation } from 'react-i18next';++function LinkPreview ({+ url,+}: {+ url: string;+}) {+ const [clickCopy, setClickCopy] = React.useState(false);++ const { t } = useTranslation();++ return (+ <div className={'flex'}>+ <OutlinedInput+ readOnly+ size={'small'}+ style={{+ borderBottomRightRadius: 0,+ borderTopRightRadius: 0,+ }}+ value={url}+ className={'flex-1'}+ />++ <Tooltip+ title={clickCopy ?+ t('message.copy.success') : t('grid.url.copy')+ } placement={'top'}+ >+ <Button+ size={'small'}+ style={{+ borderBottomRightRadius: 8,+ borderTopRightRadius: 8,+ borderLeft: 'none',+ }}+ className={'rounded-none min-w-0'}+ variant={'outlined'}+ color={'inherit'}+ onMouseLeave={() => {+ setClickCopy(false);+ }}+ onClick={async () => {+ setClickCopy(true);+ try {+ await copyTextToClipboard(url);+ notify.success(t('grid.url.copy'));+ } catch (_) {+ //do nothing+ }+ }}+ >+ {clickCopy ? <CheckIcon className={'w-6 h-6 text-function-success'} /> :+ <CopyIcon className={'w-6 h-6'} />}+ </Button>+ </Tooltip>+ </div>+ );+}++export default LinkPreview;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/PublishPanel.tsx b/frontend/appflowy_web_app/src/components/app/share/PublishPanel.tsxnew file mode 100644index 0000000000..98a039f4f9--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/PublishPanel.tsx@@ -0,0 +1,54 @@+import { useAppView, useCurrentWorkspaceId } from '@/components/app/app.hooks';+import LinkPreview from '@/components/app/share/LinkPreview';+import { useLoadPublishInfo } from '@/components/app/share/publish.hooks';+import { openOrDownload } from '@/utils/open_schema';+import { openAppFlowySchema } from '@/utils/url';+import { Button, Typography } from '@mui/material';+import React, { useCallback } from 'react';+import { useTranslation } from 'react-i18next';+import { ReactComponent as PublishIcon } from '@/assets/publish.svg';++function PublishPanel () {+ const view = useAppView();+ const currentWorkspaceId = useCurrentWorkspaceId();+ const { t } = useTranslation();+ const {+ url,+ } = useLoadPublishInfo();++ const renderPublished = useCallback(() => {+ return <div className={'flex flex-col gap-2'}>+ <LinkPreview url={url} />+ <div className={'flex items-center gap-1.5 justify-end w-full'}>+ <Button+ className={'flex-1 max-w-[50%]'} onClick={() => {+ window.open(url, '_blank');+ }} variant={'contained'}+ >{t('shareAction.visitSite')}</Button>+ </div>+ </div>;+ }, [t, url]);++ const renderUnpublished = useCallback(() => {+ return <Button+ onClick={() => {+ openOrDownload(openAppFlowySchema + '#workspace_id=' + currentWorkspaceId + '&view_id=' + view?.view_id);+ }} variant={'contained'} color={'primary'}+ >{t('shareAction.publishOnAppFlowy')}</Button>;+ }, [currentWorkspaceId, t, view?.view_id]);++ return (+ <div className={'flex flex-col gap-2'}>+ <Typography className={'flex items-center gap-1.5'} variant={'body2'}>+ <PublishIcon className={'w-4 h-4'} />+ {t('shareAction.publishToTheWeb')}+ </Typography>+ <Typography+ className={'text-text-caption'} variant={'caption'}+ >{t('shareAction.publishToTheWebHint')}</Typography>+ {view?.is_published ? renderPublished() : renderUnpublished()}+ </div>+ );+}++export default PublishPanel;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/ShareButton.tsx b/frontend/appflowy_web_app/src/components/app/share/ShareButton.tsxnew file mode 100644index 0000000000..a2199417ec--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/ShareButton.tsx@@ -0,0 +1,30 @@+import { Popover } from '@/components/_shared/popover';+import ShareTabs from '@/components/app/share/ShareTabs';+import { Button } from '@mui/material';+import React, { useRef } from 'react';+import { useTranslation } from 'react-i18next';++export function ShareButton () {+ const { t } = useTranslation();++ const [opened, setOpened] = React.useState(false);+ const ref = useRef<HTMLButtonElement>(null);++ return (+ <>+ <Button+ className={'max-sm:hidden'}+ onClick={() => {+ setOpened(true);+ }} ref={ref} size={'small'} variant={'contained'} color={'primary'}+ >{t('shareAction.buttonText')}</Button>+ {opened && <Popover open={opened} anchorEl={ref.current} onClose={() => setOpened(false)}>+ <div className={'flex flex-col gap-2 w-fit p-2'}>+ <ShareTabs />+ </div>+ </Popover>}+ </>+ );+}++export default ShareButton;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/ShareTabs.tsx b/frontend/appflowy_web_app/src/components/app/share/ShareTabs.tsxnew file mode 100644index 0000000000..f7f5748e1a--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/ShareTabs.tsx@@ -0,0 +1,72 @@+import { useAppView } from '@/components/app/app.hooks';+import PublishPanel from '@/components/app/share/PublishPanel';+import TemplatePanel from '@/components/app/share/TemplatePanel';+import { useCurrentUser } from '@/components/main/app.hooks';+import React, { useCallback, useMemo } from 'react';+import { useTranslation } from 'react-i18next';+import { ViewTabs, ViewTab, TabPanel } from 'src/components/_shared/tabs/ViewTabs';+import { ReactComponent as Check } from '@/assets/check_circle.svg';+import { ReactComponent as Templates } from '@/assets/template.svg';++enum TabKey {+ PUBLISH = 'publish',+ TEMPLATE = 'template',+}++function ShareTabs () {+ const { t } = useTranslation();+ const view = useAppView();+ const [value, setValue] = React.useState<TabKey>(TabKey.PUBLISH);+ const currentUser = useCurrentUser();++ const options = useMemo(() => {+ return [{+ value: TabKey.PUBLISH,+ label: t('shareAction.publish'),+ icon: view?.is_published ? <Check className={'w-4 h-4 text-function-success mb-0'} /> : undefined,+ Panel: PublishPanel,+ }, currentUser?.email?.endsWith('appflowy.io') && view?.is_published && {+ value: TabKey.TEMPLATE,+ label: t('template.asTemplate'),+ icon: <Templates className={'w-4 h-4 mb-0'} />,+ Panel: TemplatePanel,+ }].filter(Boolean) as {+ value: TabKey;+ label: string;+ icon?: React.JSX.Element;+ Panel: React.FC+ }[];++ }, [currentUser?.email, t, view?.is_published]);++ const onChange = useCallback((_event: React.SyntheticEvent, newValue: TabKey) => {+ setValue(newValue);+ }, []);++ return (+ <>+ <ViewTabs className={'border-b border-line-divider'} onChange={onChange} value={value}>+ {options.map((option) => (+ <ViewTab+ className={'flex items-center flex-row justify-center gap-1.5'} key={option.value} value={option.value}+ label={option.label}+ icon={option.icon}+ />+ ))}+ </ViewTabs>+ <div className={'p-2'}>+ {options.map((option) => (+ <TabPanel+ className={'min-w-[360px] max-sm:min-w-[80vw]'} key={option.value} index={option.value} value={value}+ >+ <option.Panel />+ </TabPanel>+ ))}+ </div>++ </>++ );+}++export default ShareTabs;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/TemplatePanel.tsx b/frontend/appflowy_web_app/src/components/app/share/TemplatePanel.tsxnew file mode 100644index 0000000000..c8c3bdc900--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/TemplatePanel.tsx@@ -0,0 +1,103 @@+import { Template } from '@/application/template.type';+import { useAppView } from '@/components/app/app.hooks';+import LinkPreview from '@/components/app/share/LinkPreview';+import { useLoadPublishInfo } from '@/components/app/share/publish.hooks';+import AsTemplateButton from '@/components/as-template/AsTemplateButton';+import DeleteTemplate from '@/components/as-template/DeleteTemplate';+import { slugify } from '@/components/as-template/utils';+import { useService } from '@/components/main/app.hooks';+import { Button, Skeleton } from '@mui/material';+import React, { useCallback, useEffect, useMemo } from 'react';+import { useTranslation } from 'react-i18next';+import { ReactComponent as DeleteIcon } from '@/assets/trash.svg';+import { ReactComponent as EditIcon } from '@/assets/edit.svg';++function TemplatePanel () {+ const view = useAppView();+ const service = useService();+ const [loading, setLoading] = React.useState(false);+ const [deleteModalOpen, setDeleteModalOpen] = React.useState(false);+ const [template, setTemplateInfo] = React.useState<Template>();+ const loadTemplateInfo = useCallback(async () => {+ if (!service || !view?.view_id) return;+ setLoading(true);+ try {+ const res = await service.getTemplateById(view?.view_id);++ setTemplateInfo(res);+ // eslint-disable-next-line+ } catch (e: any) {+ // do nothing+ } finally {+ setLoading(false);+ }+ }, [service, view?.view_id]);+ const { t } = useTranslation();+ const {+ url: publishUrl,+ } = useLoadPublishInfo();++ const url = useMemo(() => {+ const origin = import.meta.env.AF_BASE_URL?.includes('test') ? 'https://test.appflowy.io' : 'https://appflowy.io';++ return template ? `${origin}/templates/${slugify(template.categories[0].name)}/${template.view_id}` : '';+ }, [template]);++ useEffect(() => {+ void loadTemplateInfo();+ }, [loadTemplateInfo]);++ const renderLoading = useCallback(() => {+ return <>+ <Skeleton variant={'rectangular'} height={40} />+ <div className={'flex items-center gap-1.5 justify-end w-full'}>+ <Skeleton variant={'rectangular'} height={32} className={'flex-1 max-w-[50%]'} />++ <Skeleton variant={'rectangular'} height={32} className={'flex-1 max-w-[50%]'} />+ </div>+ </>;+ }, []);+ const handleEditClick = useCallback(() => {++ window.open(`${window.origin}/as-template?viewUrl=${encodeURIComponent(publishUrl)}&viewName=${view?.name || ''}&viewId=${view?.view_id || ''}`, '_blank');+ }, [view, publishUrl]);++ const renderTemplateButtons = useCallback(() => {+ return <>+ <LinkPreview url={url} />+ <div className={'flex items-center gap-1.5 justify-end w-full'}>+ <Button+ color={'error'}+ variant={'contained'}+ startIcon={<DeleteIcon />}+ className={'flex-1'} onClick={() => {+ setDeleteModalOpen(true);+ }}+ >+ {t('button.delete')}+ </Button>+ <Button+ startIcon={<EditIcon />}+ className={'flex-1'} onClick={handleEditClick} variant={'outlined'} color={'inherit'}+ >{t('button.edit')}</Button>+ </div>+ </>;+ }, [handleEditClick, t, url]);++ return (+ <div className={'flex flex-col gap-2'}>+ {loading ? renderLoading() : template ? renderTemplateButtons() : <AsTemplateButton />}+ {deleteModalOpen && view &&+ <DeleteTemplate+ id={view.view_id}+ open={deleteModalOpen}+ onDeleted={() => {+ void loadTemplateInfo();+ }}+ onClose={() => setDeleteModalOpen(false)}+ />}+ </div>+ );+}++export default TemplatePanel;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/index.ts b/frontend/appflowy_web_app/src/components/app/share/index.tsnew file mode 100644index 0000000000..3e28749a96--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/index.ts@@ -0,0 +1 @@+export * from './ShareButton';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/share/publish.hooks.ts b/frontend/appflowy_web_app/src/components/app/share/publish.hooks.tsnew file mode 100644index 0000000000..582bcc7229--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/share/publish.hooks.ts@@ -0,0 +1,32 @@+import { useAppView } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';+import React, { useCallback, useEffect, useMemo } from 'react';++export function useLoadPublishInfo () {+ const view = useAppView();+ const [publishInfo, setPublishInfo] = React.useState<{ namespace: string, publishName: string }>();++ const service = useService();++ const loadPublishInfo = useCallback(async () => {+ if (!service || !view?.view_id) return;+ try {+ const res = await service.getPublishInfo(view?.view_id);++ setPublishInfo(res);+ // eslint-disable-next-line+ } catch (e: any) {+ // do nothing+ }+ }, [service, view?.view_id]);++ useEffect(() => {+ void loadPublishInfo();+ }, [loadPublishInfo]);++ const url = useMemo(() => {+ return `${window.origin}/${publishInfo?.namespace}/${publishInfo?.publishName}`;+ }, [publishInfo]);++ return { publishInfo, url };+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/trash/Trash.tsx b/frontend/appflowy_web_app/src/components/app/trash/Trash.tsxnew file mode 100644index 0000000000..6073f45905--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/trash/Trash.tsx@@ -0,0 +1,26 @@+import { Button } from '@mui/material';+import React from 'react';+import { useTranslation } from 'react-i18next';+import { useNavigate } from 'react-router-dom';+import { ReactComponent as TrashIcon } from '@/assets/trash.svg';++export function Trash () {+ const { t } = useTranslation();+ const navigate = useNavigate();++ return (+ <Button+ size={'small'} onClick={() => {+ navigate('/app/trash');+ }}+ variant={'text'}+ color={'inherit'}+ className={'flex-1'}+ startIcon={<TrashIcon className={'h-5 w-5'} />}+ >{+ t('trash.text')+ }</Button>+ );+}++export default Trash;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/trash/index.ts b/frontend/appflowy_web_app/src/components/app/trash/index.tsnew file mode 100644index 0000000000..28f95f704d--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/trash/index.ts@@ -0,0 +1 @@+export * from './Trash';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/workspaces/Workspaces.tsx b/frontend/appflowy_web_app/src/components/app/workspaces/Workspaces.tsxnew file mode 100644index 0000000000..b93318b83c--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/workspaces/Workspaces.tsx@@ -0,0 +1,144 @@+import { invalidToken } from '@/application/session/token';+import { Workspace } from '@/application/types';+import { notify } from '@/components/_shared/notify';+import { Popover, RichTooltip } from '@/components/_shared/popover';+import { getAvatar } from '@/components/_shared/view-icon/utils';+import { useAppHandlers, useCurrentWorkspaceId, useUserWorkspaceInfo } from '@/components/app/app.hooks';+import { useCurrentUser } from '@/components/main/app.hooks';+import { Avatar, Button, Divider, IconButton, Tooltip } from '@mui/material';+import CircularProgress from '@mui/material/CircularProgress';+import React, { useCallback, useMemo } from 'react';+import { ReactComponent as ArrowRightSvg } from '@/assets/arrow_right.svg';+import { ReactComponent as AppFlowyLogo } from '@/assets/appflowy.svg';+import { ReactComponent as SelectedSvg } from '@/assets/selected.svg';+import { ReactComponent as MoreSvg } from '@/assets/more.svg';+import { useTranslation } from 'react-i18next';+import { ReactComponent as LoginIcon } from '@/assets/login.svg';+import { useNavigate } from 'react-router-dom';++export function Workspaces () {+ const { t } = useTranslation();+ const userWorkspaceInfo = useUserWorkspaceInfo();+ const currentWorkspaceId = useCurrentWorkspaceId();+ const currentUser = useCurrentUser();+ const [hoveredHeader, setHoveredHeader] = React.useState<boolean>(false);+ const [open, setOpen] = React.useState(false);+ const ref = React.useRef<HTMLButtonElement | null>(null);+ const navigate = useNavigate();+ const [moreOpen, setMoreOpen] = React.useState(false);+ const [changeLoading, setChangeLoading] = React.useState<string | null>(null);+ const handleLogin = useCallback(() => {+ invalidToken();+ navigate('/login?redirectTo=' + encodeURIComponent(window.location.href));+ }, [navigate]);++ const {+ onChangeWorkspace: handleSelectedWorkspace,+ } = useAppHandlers();++ const selectedWorkspace = useMemo(() => {+ return userWorkspaceInfo?.workspaces.find((workspace) => workspace.id === currentWorkspaceId);+ }, [currentWorkspaceId, userWorkspaceInfo]);++ const getAvatarProps = useCallback((workspace: Workspace) => {+ return getAvatar({+ icon: workspace.icon,+ name: workspace.name,+ });++ }, []);++ const handleChange = useCallback(async (selectedId: string) => {+ setChangeLoading(selectedId);+ try {+ await handleSelectedWorkspace?.(selectedId);+ } catch (e) {+ notify.error('Failed to change workspace');+ }++ setChangeLoading(null);+ }, [handleSelectedWorkspace]);++ if (!userWorkspaceInfo || !selectedWorkspace) return <div+ className={'flex p-4 cursor-pointer items-center gap-1 text-text-title'}+ onClick={async () => {+ const selectedId = userWorkspaceInfo?.selectedWorkspace?.id || userWorkspaceInfo?.workspaces[0]?.id;++ if (!selectedId) return;++ void handleChange(selectedId);+ }}+ >+ <AppFlowyLogo className={'w-[88px]'} />+ </div>;++ return <>+ <Button+ ref={ref}+ onMouseLeave={() => setHoveredHeader(false)}+ onMouseEnter={() => setHoveredHeader(true)}+ onClick={() => setOpen(true)}+ className={'flex px-1 w-full cursor-pointer justify-start py-1 items-center gap-1 mx-2 text-text-title'}+ >+ <div className={'flex items-center gap-1.5 text-text-title overflow-hidden'}>+ <Avatar+ variant={'rounded'}+ className={`w-6 h-6 rounded-[8px] p-1 ${selectedWorkspace.icon ? 'bg-transparent' : ''}`}+ {...getAvatarProps(selectedWorkspace)}+ />+ <div className={'text-text-title flex-1 truncate font-semibold'}>{selectedWorkspace.name}</div>+ {hoveredHeader && <ArrowRightSvg className={'w-4 h-4 transform rotate-90'} />}+ </div>+ </Button>+ <Popover open={open} anchorEl={ref.current} onClose={() => setOpen(false)}>+ <div+ className={'flex min-w-[260px] flex-col gap-1 p-2 w-full max-h-[560px] overflow-y-auto overflow-x-hidden appflowy-scroller'}+ >+ <div className={'flex px-1 text-text-caption items-center justify-between'}>+ <span className={'font-medium flex-1 text-sm'}>{currentUser?.email}</span>+ <RichTooltip+ placement={'bottom-start'}+ content={+ <div className={'p-2 w-[160px]'}>+ <Button+ color={'inherit'} size={'small'} className={'w-full justify-start'} onClick={handleLogin}+ startIcon={<LoginIcon />}+ >+ {t('button.logout')}+ </Button>+ </div>++ } open={moreOpen} onClose={() => setMoreOpen(false)}+ >+ <IconButton onClick={() => setMoreOpen(prev => !prev)}>+ <MoreSvg className={'w-4 h-4'} />+ </IconButton>+ </RichTooltip>++ </div>+ <Divider className={'w-full mt-1'} />+ {userWorkspaceInfo.workspaces.map((workspace) => (+ <Button+ key={workspace.id}+ onClick={() => {+ void handleChange(workspace.id);+ }}+ className={'flex px-1.5 w-full cursor-pointer justify-start py-2 items-center gap-1.5 overflow-hidden text-text-title'}+ >+ <Avatar+ variant={'rounded'}+ className={'rounded-[8px] w-7 h-7 border border-line-divider'} {...getAvatarProps(workspace)} />++ <Tooltip title={workspace.name} enterDelay={1000} enterNextDelay={1000}>+ <div className={'text-text-title font-medium truncate flex-1 text-left'}>{workspace.name}</div>+ </Tooltip>+ {changeLoading === workspace.id ? <CircularProgress size={16} /> : workspace.id === selectedWorkspace.id &&+ <SelectedSvg className={'w-4 text-function-success h-4'} />}+ </Button>+ ))}+ </div>+ </Popover>+ </>;+}++export default Workspaces;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/app/workspaces/index.ts b/frontend/appflowy_web_app/src/components/app/workspaces/index.tsnew file mode 100644index 0000000000..bf57e76440--- /dev/null+++ b/frontend/appflowy_web_app/src/components/app/workspaces/index.ts@@ -0,0 +1 @@+export * from './Workspaces';\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/as-template/AsTemplate.tsx b/frontend/appflowy_web_app/src/components/as-template/AsTemplate.tsxindex fcb7ed7a0e..62af50e579 100644--- a/frontend/appflowy_web_app/src/components/as-template/AsTemplate.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/AsTemplate.tsx@@ -1,7 +1,7 @@import { UploadTemplatePayload } from '@/application/template.type';import { notify } from '@/components/_shared/notify';import { AFScroller } from '@/components/_shared/scroller';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import AsTemplateForm, { AsTemplateFormValue } from '@/components/as-template/AsTemplateForm';import Categories from '@/components/as-template/category/Categories';import Creator from '@/components/as-template/creator/Creator';@@ -10,7 +10,6 @@ import { useLoadTemplate } from '@/components/as-template/hooks';import { Button, CircularProgress, InputLabel, Paper, Switch } from '@mui/material';import React, { useCallback, useEffect, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';-import { ReactComponent as CloseIcon } from '@/assets/close.svg';import { ReactComponent as DeleteIcon } from '@/assets/trash.svg';import './template.scss';import { slugify } from '@/components/as-template/utils';@@ -38,9 +37,6 @@ function AsTemplate ({loading,} = useLoadTemplate(viewId);- const handleBack = useCallback(() => {- window.location.href = `${decodeURIComponent(viewUrl)}`;- }, [viewUrl]);const handleSubmit = useCallback(async (data: AsTemplateFormValue) => {if (!service || !selectedCreatorId || selectedCategoryIds.length === 0) return;const formData: UploadTemplatePayload = {@@ -58,18 +54,18 @@ function AsTemplate ({await service?.updateTemplate(template.view_id, formData);} else {await service?.createTemplate(formData);-}await loadTemplate();- handleBack();++ notify.success('Template saved successfully');} catch (error) {// eslint-disable-next-line// @ts-ignorenotify.error(error.toString());}- }, [service, selectedCreatorId, selectedCategoryIds, isNewTemplate, isFeatured, viewId, viewUrl, template, loadTemplate, handleBack]);+ }, [service, selectedCreatorId, selectedCategoryIds, isNewTemplate, isFeatured, viewId, viewUrl, template, loadTemplate]);const submitRef = React.useRef<HTMLInputElement>(null);useEffect(() => {@@ -102,22 +98,15 @@ function AsTemplate ({return (<div className={'flex flex-col gap-4 w-full h-full overflow-hidden'}>- <div className={'flex items-center justify-between'}>- <Button- onClick={handleBack}- variant={'outlined'}- color={'inherit'}- endIcon={<CloseIcon className={'w-4 h-4'} />}- >- {t('button.cancel')}- </Button>+ <div className={'flex items-center justify-end'}>+{template && <ButtonstartIcon={<WebsiteIcon />}variant={'text'}onClick={() => {- const url = import.meta.env.AF_BASE_URL?.includes('test') ? 'https://test.appflowy.io' : 'https://appflowy.io';+ const origin = import.meta.env.AF_BASE_URL?.includes('test') ? 'https://test.appflowy.io' : 'https://appflowy.io';- window.open(`${url}/templates/${slugify(template.categories[0].name)}/${template.view_id}`);+ window.open(`${origin}/templates/${slugify(template.categories[0].name)}/${template.view_id}`);}} color={'primary'}>{t('template.viewTemplate')}</Button>}<div className={'flex items-center gap-2'}>@@ -132,9 +121,10 @@ function AsTemplate ({{t('template.deleteTemplate')}</Button>}- <Button onClick={() => {- submitRef.current?.click();- }} variant={'contained'} color={'primary'}+ <Button+ onClick={() => {+ submitRef.current?.click();+ }} variant={'contained'} color={'primary'}>{t('button.save')}</Button>@@ -179,7 +169,9 @@ function AsTemplate ({{deleteModalOpen &&<DeleteTemplateid={viewId}- onDeleted={handleBack}+ onDeleted={() => {+ void loadTemplate();+ }}open={deleteModalOpen}onClose={() => setDeleteModalOpen(false)}/>}diff --git a/frontend/appflowy_web_app/src/components/as-template/AsTemplateButton.tsx b/frontend/appflowy_web_app/src/components/as-template/AsTemplateButton.tsxindex e0ec762ddd..fe50beea96 100644--- a/frontend/appflowy_web_app/src/components/as-template/AsTemplateButton.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/AsTemplateButton.tsx@@ -1,20 +1,23 @@-import { useCurrentUser } from '@/components/app/app.hooks';-import { useViewMeta } from '@/components/publish/useViewMeta';-import { Button, Divider } from '@mui/material';+import { useAppView } from '@/components/app/app.hooks';+import { useLoadPublishInfo } from '@/components/app/share/publish.hooks';+import { useCurrentUser } from '@/components/main/app.hooks';+import { Button } from '@mui/material';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';-import { useNavigate } from 'react-router-dom';import { ReactComponent as TemplateIcon } from '@/assets/template.svg';function AsTemplateButton () {const { t } = useTranslation();- const viewMeta = useViewMeta();- const navigate = useNavigate();++ const {+ url: publishUrl,+ } = useLoadPublishInfo();+ const view = useAppView();+const handleClick = useCallback(() => {- const url = encodeURIComponent(window.location.href.replace(window.location.search, ''));- navigate(`/as-template?viewUrl=${url}&viewName=${viewMeta?.name || ''}&viewId=${viewMeta?.viewId || ''}`);- }, [navigate, viewMeta]);+ window.open(`${window.origin}/as-template?viewUrl=${encodeURIComponent(publishUrl)}&viewName=${view?.name || ''}&viewId=${view?.view_id || ''}`, '_blank');+ }, [view, publishUrl]);const currentUser = useCurrentUser();@@ -23,16 +26,18 @@ function AsTemplateButton () {const isAppFlowyUser = currentUser.email?.endsWith('@appflowy.io');if (!isAppFlowyUser) return null;++ if (!view?.is_published) return null;return (<><Button- onClick={handleClick} className={'text-left justify-start'} variant={'text'}- color={'inherit'}+ onClick={handleClick}+ className={'text-left justify-start w-full'}+ variant={'contained'}startIcon={<TemplateIcon className={'w-4 h-4'} />}>{t('template.asTemplate')}</Button>- <Divider /></>);}diff --git a/frontend/appflowy_web_app/src/components/as-template/DeleteTemplate.tsx b/frontend/appflowy_web_app/src/components/as-template/DeleteTemplate.tsxindex 264b4a3cf1..2376dbc540 100644--- a/frontend/appflowy_web_app/src/components/as-template/DeleteTemplate.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/DeleteTemplate.tsx@@ -1,33 +1,34 @@import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';-function DeleteTemplate ({ id, onClose, onDeleted, open }: {+function DeleteTemplate ({ onDeleted, id, onClose, open }: {id: string;onClose: () => void;- onDeleted: () => void;open: boolean;+ onDeleted?: () => void;}) {const { t } = useTranslation();const service = useService();const onSubmit = useCallback(async () => {try {await service?.deleteTemplate(id);- onDeleted();onClose();+ onDeleted?.();+ notify.success(t('template.deleteSuccess'));} catch (error) {notify.error('Failed to delete template');}- }, [onDeleted, onClose, service, id]);+ }, [t, onClose, service, id, onDeleted]);return (<NormalModalonOk={onSubmit}dangerokText={t('button.delete')}- title={<div className={'text-left'}>{t('template.deleteTemplate')}</div>}+ title={<div className={'text-left font-semibold'}>{t('template.deleteFromTemplate')}</div>}onCancel={onClose}open={open}onClose={onClose}diff --git a/frontend/appflowy_web_app/src/components/as-template/category/AddCategory.tsx b/frontend/appflowy_web_app/src/components/as-template/category/AddCategory.tsxindex 00ac0be93f..f405c7a305 100644--- a/frontend/appflowy_web_app/src/components/as-template/category/AddCategory.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/category/AddCategory.tsx@@ -5,7 +5,7 @@ import {} from '@/application/template.type';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import CategoryForm from '@/components/as-template/category/CategoryForm';import MenuItem from '@mui/material/MenuItem';import React, { useCallback, useMemo, useState } from 'react';diff --git a/frontend/appflowy_web_app/src/components/as-template/category/DeleteCategory.tsx b/frontend/appflowy_web_app/src/components/as-template/category/DeleteCategory.tsxindex 82010fde4f..58b3fd8376 100644--- a/frontend/appflowy_web_app/src/components/as-template/category/DeleteCategory.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/category/DeleteCategory.tsx@@ -1,6 +1,6 @@import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/as-template/category/EditCategory.tsx b/frontend/appflowy_web_app/src/components/as-template/category/EditCategory.tsxindex 4b57df7c32..125934afc9 100644--- a/frontend/appflowy_web_app/src/components/as-template/category/EditCategory.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/category/EditCategory.tsx@@ -4,7 +4,7 @@ import {} from '@/application/template.type';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import CategoryForm from '@/components/as-template/category/CategoryForm';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/as-template/creator/AddCreator.tsx b/frontend/appflowy_web_app/src/components/as-template/creator/AddCreator.tsxindex 44c90e845d..830e6edd4e 100644--- a/frontend/appflowy_web_app/src/components/as-template/creator/AddCreator.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/creator/AddCreator.tsx@@ -3,7 +3,7 @@ import {} from '@/application/template.type';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import CreatorForm from '@/components/as-template/creator/CreatorForm';import MenuItem from '@mui/material/MenuItem';import React, { useCallback, useMemo, useState } from 'react';diff --git a/frontend/appflowy_web_app/src/components/as-template/creator/CreatorAvatar.tsx b/frontend/appflowy_web_app/src/components/as-template/creator/CreatorAvatar.tsxindex 769c7f526d..1d7a7263c4 100644--- a/frontend/appflowy_web_app/src/components/as-template/creator/CreatorAvatar.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/creator/CreatorAvatar.tsx@@ -8,58 +8,7 @@ import { ReactComponent as CloudUploadIcon } from '@/assets/cloud_add.svg';import { useTranslation } from 'react-i18next';-const colorArray = [- '#5287D8',- '#6E9DE3',- '#8BB3ED',- '#A7C9F7',- '#979EB6',- '#A2A8BF',- '#ACB2C8',- '#C1C7DA',- '#E8AF53',- '#E6C25A',- '#E6D26F',- '#E6E288',- '#589599',- '#68AD8E',- '#79C47F',- '#8CDB6A',- '#AA94DC',- '#C49EEB',- '#BAACEE',- '#D5C4FB',- '#F597D2',- '#FCB2E3',- '#FDC5E8',- '#F8D2E1',- '#D1D269',- '#C7C98D',- '#CED09B',- '#DAD9B6',- '#DDD2C6',- '#DDD6C7',- '#EADED3',- '#FED5C4',- '#72A7D8',- '#8FCAE3',- '#64B3DA',- '#52B2D4',- '#90A4FF',- '#A8BEF4',- '#AEBDFF',- '#C2CDFF',- '#86C1B7',- '#A6D8D0',- '#A7D7A8',- '#C8E4C9',- '#FF9494',- '#FFBDBD',- '#DCA8A8',- '#E3C4C4',-];--function CreatorAvatar({ src, name, enableUpload, onChange, size }: {+function CreatorAvatar ({ src, name, enableUpload, onChange, size }: {src: string;name: string;enableUpload?: boolean;@@ -71,7 +20,7 @@ function CreatorAvatar({ src, name, enableUpload, onChange, size }: {const [tab, setTab] = React.useState(0);const avatarProps = useMemo(() => {- return stringAvatar(name || '', colorArray);+ return stringAvatar(name || '');}, [name]);const [openModal, setOpenModal] = React.useState(false);@@ -136,7 +85,7 @@ function CreatorAvatar({ src, name, enableUpload, onChange, size }: {disabled: !imageUrl,}}onOk={() => {- if(!imageUrl) return;+ if (!imageUrl) return;onChange?.(imageUrl);setOpenModal(false);}}diff --git a/frontend/appflowy_web_app/src/components/as-template/creator/DeleteCreator.tsx b/frontend/appflowy_web_app/src/components/as-template/creator/DeleteCreator.tsxindex a10f5543e7..eaac31184f 100644--- a/frontend/appflowy_web_app/src/components/as-template/creator/DeleteCreator.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/creator/DeleteCreator.tsx@@ -1,6 +1,6 @@import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/as-template/creator/EditCreator.tsx b/frontend/appflowy_web_app/src/components/as-template/creator/EditCreator.tsxindex 0cd9d789b8..628dbbd829 100644--- a/frontend/appflowy_web_app/src/components/as-template/creator/EditCreator.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/creator/EditCreator.tsx@@ -1,7 +1,7 @@import { TemplateCreator, TemplateCreatorFormValues } from '@/application/template.type';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import CreatorForm from '@/components/as-template/creator/CreatorForm';import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/as-template/creator/UploadAvatar.tsx b/frontend/appflowy_web_app/src/components/as-template/creator/UploadAvatar.tsxindex aad78e0616..f0f55ce7ea 100644--- a/frontend/appflowy_web_app/src/components/as-template/creator/UploadAvatar.tsx+++ b/frontend/appflowy_web_app/src/components/as-template/creator/UploadAvatar.tsx@@ -1,5 +1,5 @@import FileDropzone from '@/components/_shared/file-dropzone/FileDropzone';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import { CircularProgress, IconButton, Tooltip } from '@mui/material';import React, { useCallback, useMemo } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/as-template/hooks.ts b/frontend/appflowy_web_app/src/components/as-template/hooks.tsindex 5cd8cee1c0..3055b57d10 100644--- a/frontend/appflowy_web_app/src/components/as-template/hooks.ts+++ b/frontend/appflowy_web_app/src/components/as-template/hooks.ts@@ -1,6 +1,6 @@import { Template, TemplateCategory, TemplateCreator, TemplateSummary } from '@/application/template.type';import { notify } from '@/components/_shared/notify';-import { useService } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';import { useCallback, useMemo, useState } from 'react';export function useLoadCategoryTemplates () {diff --git a/frontend/appflowy_web_app/src/components/database/Database.tsx b/frontend/appflowy_web_app/src/components/database/Database.tsxindex e2f2301826..7eef83b803 100644--- a/frontend/appflowy_web_app/src/components/database/Database.tsx+++ b/frontend/appflowy_web_app/src/components/database/Database.tsx@@ -1,37 +1,43 @@+import { db } from '@/application/db';import {- GetViewRowsMap,+ AppendBreadcrumb,+ CreateRowDoc,LoadView,- LoadViewMeta,+ LoadViewMeta, RowId,YDatabase,YDoc,YjsDatabaseKey,YjsEditorKey,-} from '@/application/collab.type';-import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+} from '@/application/types';import DatabaseRow from '@/components/database/DatabaseRow';import DatabaseViews from '@/components/database/DatabaseViews';-import React, { Suspense, useCallback, useEffect, useState } from 'react';-import * as Y from 'yjs';+import { useLiveQuery } from 'dexie-react-hooks';+import { debounce } from 'lodash-es';+import React, { useCallback, useEffect, useMemo, useState } from 'react';import { DatabaseContextProvider } from './DatabaseContext';export interface Database2Props {doc: YDoc;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;loadView?: LoadView;navigateToView?: (viewId: string) => Promise<void>;loadViewMeta?: LoadViewMeta;viewId: string;iidName: string;rowId?: string;+ appendBreadcrumb?: AppendBreadcrumb;onChangeView: (viewId: string) => void;onOpenRow?: (rowId: string) => void;visibleViewIds: string[];iidIndex: string;+ hideConditions?: boolean;+ variant?: 'publish' | 'app';+ onRendered?: () => void;}function Database ({doc,- getViewRowsMap,+ createRowDoc,navigateToView,loadViewMeta,loadView,@@ -42,22 +48,53 @@ function Database ({rowId,onChangeView,onOpenRow,+ hideConditions,+ appendBreadcrumb,+ onRendered,+ variant = 'app',}: Database2Props) {- const database = doc.getMap(YjsEditorKey.data_section).get(YjsEditorKey.database) as YDatabase;+ const database = doc.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database) as YDatabase;const view = database.get(YjsDatabaseKey.views).get(iidIndex);- const rowOrders = view.get(YjsDatabaseKey.row_orders);- const [rowDocMap, setRowDocMap] = useState<Y.Map<YDoc> | null>(null);+ const rowOrders = view?.get(YjsDatabaseKey.row_orders);+ const [rowIds, setRowIds] = useState<RowId[]>([]);+ const [rowDocMap, setRowDocMap] = useState<Record<RowId, YDoc> | null>(null);+ const dbRows = useLiveQuery(async () => {+ const rows = await db.rows.bulkGet(rowIds.map(id => `${doc.guid}_rows_${id}`));- const handleUpdateRowDocMap = useCallback(async () => {- if (!getViewRowsMap || !iidIndex) return;+ return rows;+ }, [rowIds, variant]);++ const updateRowMap = useCallback(async () => {+ const newRowMap: Record<RowId, YDoc> = {};++ if (!dbRows || !createRowDoc) return;++ for (const row of dbRows) {+ if (!row) {+ continue;+ }- const { rows, destroy } = await getViewRowsMap(iidIndex);+ newRowMap[row.row_id] = await createRowDoc(row.row_key);+ }- setRowDocMap(rows);- return destroy;- }, [getViewRowsMap, iidIndex]);+ setRowDocMap(newRowMap);+ }, [createRowDoc, dbRows]);++ const debounceUpdateRowMap = useMemo(() => {+ return debounce(updateRowMap, 200);+ }, [updateRowMap]);++ useEffect(() => {++ void debounceUpdateRowMap();++ }, [debounceUpdateRowMap]);++ const handleUpdateRowDocMap = useCallback(async () => {+ setRowIds(rowOrders?.toJSON().map(({ id }: { id: string }) => id) || []);+ }, [rowOrders]);useEffect(() => {void handleUpdateRowDocMap();@@ -68,42 +105,44 @@ function Database ({};}, [handleUpdateRowDocMap, rowOrders]);+ useEffect(() => {+ onRendered?.();+ }, [onRendered]);+if (!rowDocMap || !viewId) {return null;}return (<div className={'flex w-full flex-1 justify-center'}>- <Suspense fallback={<ComponentLoading />}>- <DatabaseContextProvider- isDatabaseRowPage={!!rowId}- navigateToRow={onOpenRow}- iidIndex={iidIndex}- viewId={viewId}- databaseDoc={doc}- rowDocMap={rowDocMap}- readOnly={true}- loadView={loadView}- navigateToView={navigateToView}- loadViewMeta={loadViewMeta}- getViewRowsMap={getViewRowsMap}- >- {rowId ? (- <DatabaseRow rowId={rowId} />- ) : (- <div className="appflowy-database relative flex w-full flex-1 select-text flex-col overflow-y-hidden">- <DatabaseViews- visibleViewIds={visibleViewIds}- iidIndex={iidIndex}- viewName={iidName}- onChangeView={onChangeView}- viewId={viewId}- hideConditions={true}- />- </div>- )}- </DatabaseContextProvider>- </Suspense>+ <DatabaseContextProvider+ isDatabaseRowPage={!!rowId}+ navigateToRow={onOpenRow}+ iidIndex={iidIndex}+ viewId={viewId}+ databaseDoc={doc}+ rowDocMap={rowDocMap}+ readOnly={true}+ loadView={loadView}+ navigateToView={navigateToView}+ loadViewMeta={loadViewMeta}+ createRowDoc={createRowDoc}+ >+ {rowId ? (+ <DatabaseRow appendBreadcrumb={appendBreadcrumb} rowId={rowId} />+ ) : (+ <div className="appflowy-database relative flex w-full flex-1 select-text flex-col overflow-y-hidden">+ <DatabaseViews+ visibleViewIds={visibleViewIds}+ iidIndex={iidIndex}+ viewName={iidName}+ onChangeView={onChangeView}+ viewId={viewId}+ hideConditions={hideConditions}+ />+ </div>+ )}+ </DatabaseContextProvider></div>);}diff --git a/frontend/appflowy_web_app/src/components/database/DatabaseRow.tsx b/frontend/appflowy_web_app/src/components/database/DatabaseRow.tsxindex 43549ba81a..df4c8f1205 100644--- a/frontend/appflowy_web_app/src/components/database/DatabaseRow.tsx+++ b/frontend/appflowy_web_app/src/components/database/DatabaseRow.tsx@@ -1,22 +1,25 @@-import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+import { AppendBreadcrumb } from '@/application/types';++import EditorSkeleton from '@/components/_shared/skeleton/EditorSkeleton';+import TableSkeleton from '@/components/_shared/skeleton/TableSkeleton';import { DatabaseRowProperties, DatabaseRowSubDocument } from '@/components/database/components/database-row';import DatabaseRowHeader from '@/components/database/components/header/DatabaseRowHeader';import { Divider } from '@mui/material';import React, { Suspense } from 'react';-export function DatabaseRow({ rowId }: { rowId: string }) {+export function DatabaseRow ({ appendBreadcrumb, rowId }: { rowId: string; appendBreadcrumb?: AppendBreadcrumb }) {return (<div className={'flex w-full justify-center'}><div className={'max-w-screen w-[964px] min-w-0'}><div className={' relative flex flex-col gap-4'}>- <DatabaseRowHeader rowId={rowId} />+ <DatabaseRowHeader appendBreadcrumb={appendBreadcrumb} rowId={rowId} /><div className={'flex flex-1 flex-col gap-4'}>- <Suspense>+ <Suspense fallback={<TableSkeleton columns={2} rows={4} />}><DatabaseRowProperties rowId={rowId} /></Suspense>- <Divider className={'mx-16 max-md:mx-4'} />- <Suspense fallback={<ComponentLoading />}>+ <Divider className={'w-full'} />+ <Suspense fallback={<EditorSkeleton />}><DatabaseRowSubDocument rowId={rowId} /></Suspense></div>diff --git a/frontend/appflowy_web_app/src/components/database/DatabaseViews.tsx b/frontend/appflowy_web_app/src/components/database/DatabaseViews.tsxindex 48bc16e44d..90976ed273 100644--- a/frontend/appflowy_web_app/src/components/database/DatabaseViews.tsx+++ b/frontend/appflowy_web_app/src/components/database/DatabaseViews.tsx@@ -1,6 +1,8 @@-import { DatabaseViewLayout, YjsDatabaseKey } from '@/application/collab.type';+import { DatabaseViewLayout, YjsDatabaseKey } from '@/application/types';import { useDatabaseViewsSelector } from '@/application/database-yjs';-import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+import CalendarSkeleton from '@/components/_shared/skeleton/CalendarSkeleton';+import GridSkeleton from '@/components/_shared/skeleton/GridSkeleton';+import KanbanSkeleton from '@/components/_shared/skeleton/KanbanSkeleton';import { Board } from '@/components/database/board';import { Calendar } from '@/components/database/calendar';import { DatabaseConditionsContext } from '@/components/database/components/conditions/context';@@ -11,7 +13,7 @@ import React, { Suspense, useCallback, useMemo, useState } from 'react';import { ErrorBoundary } from 'react-error-boundary';import DatabaseConditions from 'src/components/database/components/conditions/DatabaseConditions';-function DatabaseViews({+function DatabaseViews ({onChangeView,viewId,iidIndex,@@ -31,7 +33,7 @@ function DatabaseViews({const value = useMemo(() => {return Math.max(0,- viewIds.findIndex((id) => id === viewId)+ viewIds.findIndex((id) => id === viewId),);}, [viewId, viewIds]);@@ -60,6 +62,19 @@ function DatabaseViews({}}, [layout]);+ const skeleton = useMemo(() => {+ switch (layout) {+ case DatabaseViewLayout.Grid:+ return <GridSkeleton includeTitle={false} includeTabs={false} />;+ case DatabaseViewLayout.Board:+ return <KanbanSkeleton includeTitle={false} includeTabs={false} />;+ case DatabaseViewLayout.Calendar:+ return <CalendarSkeleton includeTitle={false} includeTabs={false} />;+ default:+ return null;+ }+ }, [layout]);+return (<><DatabaseConditionsContext.Provider@@ -79,7 +94,7 @@ function DatabaseViews({{layout === DatabaseViewLayout.Calendar || hideConditions ? null : <DatabaseConditions />}</DatabaseConditionsContext.Provider><div className={'flex h-full w-full flex-1 flex-col overflow-hidden'}>- <Suspense fallback={<ComponentLoading />}>+ <Suspense fallback={skeleton}><ErrorBoundary fallbackRender={ElementFallbackRender}>{view}</ErrorBoundary></Suspense></div>diff --git a/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseRow.cy.tsx b/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseRow.cy.tsxindex 44b07d08aa..e2bd93268f 100644--- a/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseRow.cy.tsx+++ b/frontend/appflowy_web_app/src/components/database/__tests__/DatabaseRow.cy.tsx@@ -1,6 +1,6 @@-import { YDoc } from '@/application/collab.type';+import { YDoc } from '@/application/types';import { applyYDoc } from '@/application/ydoc/apply';-import withAppWrapper from '@/components/app/withAppWrapper';+import withAppWrapper from '@/components/main/withAppWrapper';import { DatabaseRow } from 'src/components/database/DatabaseRow';import { DatabaseContextProvider } from 'src/components/database/DatabaseContext';import * as Y from 'yjs';@@ -21,13 +21,12 @@ describe('<DatabaseRow />', () => {applyYDoc(doc, databaseState);cy.fixture('database/rows/4c658817-20db-4f56-b7f9-0637a22dfeb6').then((rows) => {- const rootRowsDoc = new Y.Doc();- const rowsFolder: Y.Map<YDoc> = rootRowsDoc.getMap();+ const rowsFolder: Record<string, YDoc> = {};const data = rows['2f944220-9f45-40d9-96b5-e8c0888daf7c'];const rowDoc = new Y.Doc();applyYDoc(rowDoc, new Uint8Array(data));- rowsFolder.set('2f944220-9f45-40d9-96b5-e8c0888daf7c', rowDoc);+ rowsFolder['2f944220-9f45-40d9-96b5-e8c0888daf7c'] = rowDoc;cy.fixture('simple_doc').then((docJson) => {const subDoc = new Y.Doc();@@ -59,7 +58,7 @@ describe('<DatabaseRow />', () => {});});-function TestDatabaseRow({+function TestDatabaseRow ({rowId,databaseDoc,rows,@@ -68,7 +67,7 @@ function TestDatabaseRow({}: {rowId: string;databaseDoc: YDoc;- rows: Y.Map<YDoc>;+ rows: Record<string, YDoc>;viewId: string;loadView?: (viewId: string) => Promise<YDoc>;}) {diff --git a/frontend/appflowy_web_app/src/components/database/__tests__/withTestingDatabase.tsx b/frontend/appflowy_web_app/src/components/database/__tests__/withTestingDatabase.tsxindex 04af21e6af..1e6e152184 100644--- a/frontend/appflowy_web_app/src/components/database/__tests__/withTestingDatabase.tsx+++ b/frontend/appflowy_web_app/src/components/database/__tests__/withTestingDatabase.tsx@@ -1,12 +1,12 @@-import { YDoc } from '@/application/collab.type';+import { RowId, YDoc } from '@/application/types';import { applyYDoc } from '@/application/ydoc/apply';-import withAppWrapper from '@/components/app/withAppWrapper';+import withAppWrapper from '@/components/main/withAppWrapper';import { DatabaseContextProvider } from '@/components/database/DatabaseContext';import DatabaseViews from '@/components/database/DatabaseViews';import { useState } from 'react';import * as Y from 'yjs';-export function renderDatabase(+export function renderDatabase ({databaseId,viewId,@@ -16,13 +16,12 @@ export function renderDatabase(viewId: string;onNavigateToView: (viewId: string) => void;},- onAfterRender?: () => void+ onAfterRender?: () => void,) {cy.fixture(`database/${databaseId}`).then((database) => {cy.fixture(`database/rows/${databaseId}`).then((rows) => {const doc = new Y.Doc();- const rootRowsDoc = new Y.Doc();- const rowsFolder: Y.Map<YDoc> = rootRowsDoc.getMap();+ const rowsFolder: Record<RowId, YDoc> = {};const databaseState = new Uint8Array(database.data.doc_state);applyYDoc(doc, databaseState);@@ -32,7 +31,7 @@ export function renderDatabase(const rowDoc = new Y.Doc();applyYDoc(rowDoc, new Uint8Array(data));- rowsFolder.set(key, rowDoc);+ rowsFolder[key] = rowDoc;});const AppWrapper = withAppWrapper(() => {@@ -55,7 +54,7 @@ export function renderDatabase(});}-export function TestDatabase({+export function TestDatabase ({databaseDoc,rows,iidIndex,@@ -63,7 +62,7 @@ export function TestDatabase({onNavigateToView,}: {databaseDoc: YDoc;- rows: Y.Map<YDoc>;+ rows: Record<RowId, YDoc>;iidIndex: string;initialViewId: string;onNavigateToView: (viewId: string) => void;diff --git a/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx b/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsxindex d1933056aa..3bbcec188d 100644--- a/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx+++ b/frontend/appflowy_web_app/src/components/database/calendar/Calendar.tsx@@ -4,11 +4,11 @@ import React from 'react';import { Calendar as BigCalendar } from 'react-big-calendar';import './calendar.scss';-export function Calendar() {+export function Calendar () {const { dayPropGetter, localizer, formats, events, emptyEvents } = useCalendarSetup();return (- <div className={'database-calendar h-fit pb-4 pt-4 text-sm'}>+ <div className={'database-calendar z-[1] h-fit pb-4 pt-4 text-sm'}><BigCalendarcomponents={{toolbar: (props) => <Toolbar {...props} emptyEvents={emptyEvents} />,diff --git a/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss b/frontend/appflowy_web_app/src/components/database/calendar/calendar.scssindex 17c9eb82a6..0cdd62c730 100644--- a/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss+++ b/frontend/appflowy_web_app/src/components/database/calendar/calendar.scss@@ -9,7 +9,7 @@ $today-highlight-bg: transparent;}.rbc-button-link {- @apply rounded-full w-[20px] h-[20px] my-1.5;+ @apply rounded-full w-[20px] h-[20px] my-1.5 cursor-default;}diff --git a/frontend/appflowy_web_app/src/components/database/components/board/card/Card.tsx b/frontend/appflowy_web_app/src/components/database/components/board/card/Card.tsxindex f945908094..783912b3b9 100644--- a/frontend/appflowy_web_app/src/components/database/components/board/card/Card.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/board/card/Card.tsx@@ -1,6 +1,6 @@-import { useFieldsSelector } from '@/application/database-yjs';+import { DatabaseContext, useFieldsSelector, useRowMetaSelector } from '@/application/database-yjs';import CardField from '@/components/database/components/field/CardField';-import React, { memo, useEffect, useMemo } from 'react';+import React, { memo, useContext, useEffect, useMemo } from 'react';export interface CardProps {groupFieldId: string;@@ -11,6 +11,8 @@ export interface CardProps {export const Card = memo(({ groupFieldId, rowId, onResize, isDragging }: CardProps) => {const fields = useFieldsSelector();+ const meta = useRowMetaSelector(rowId);+ const cover = meta?.cover;const showFields = useMemo(() => fields.filter((field) => field.fieldId !== groupFieldId), [fields, groupFieldId]);const ref = React.useRef<HTMLDivElement | null>(null);@@ -32,22 +34,44 @@ export const Card = memo(({ groupFieldId, rowId, onResize, isDragging }: CardPro};}, [onResize, isDragging]);- // const navigateToRow = useNavigateToRow();+ const navigateToRow = useContext(DatabaseContext)?.navigateToRow;+ const className = useMemo(() => {+ const classList = ['relative shadow-sm flex flex-col gap-2 overflow-hidden rounded-[8px] border border-line-divider text-xs'];++ if (navigateToRow) {+ classList.push('cursor-pointer hover:bg-fill-list-hover');+ }++ return classList.join(' ');+ }, [navigateToRow]);return (<divonClick={() => {- // navigateToRow?.(rowId);+ navigateToRow?.(rowId);}}ref={ref}style={{minHeight: '38px',}}- className="relative shadow-sm flex flex-col gap-2 overflow-hidden rounded-[8px] border border-line-divider p-3 text-xs"+ className={className}>- {showFields.map((field, index) => {- return <CardField index={index} key={field.fieldId} rowId={rowId} fieldId={field.fieldId} />;- })}+ {cover && (+ <div+ className={'w-full h-[100px] bg-cover bg-center'}+ >+ <img+ className={'w-full h-full object-cover'}+ src={cover}+ />+ </div>+ )}+ <div className={'flex flex-col gap-2 py-2 px-3'}>+ {showFields.map((field, index) => {+ return <CardField index={index} key={field.fieldId} rowId={rowId} fieldId={field.fieldId} />;+ })}+ </div>+</div>);});diff --git a/frontend/appflowy_web_app/src/components/database/components/board/column/useRenderColumn.tsx b/frontend/appflowy_web_app/src/components/database/components/board/column/useRenderColumn.tsxindex e84e608cc4..e24b1bcb70 100644--- a/frontend/appflowy_web_app/src/components/database/components/board/column/useRenderColumn.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/board/column/useRenderColumn.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType, parseSelectOptionTypeOptions, useFieldSelector } from '@/application/database-yjs';import { Tag } from '@/components/_shared/tag';import { SelectOptionBadgeColorMap, SelectOptionColorMap } from '@/components/database/components/cell/cell.const';diff --git a/frontend/appflowy_web_app/src/components/database/components/calendar/event/Event.tsx b/frontend/appflowy_web_app/src/components/database/components/calendar/event/Event.tsxindex 96deb7b54c..f74bfb9085 100644--- a/frontend/appflowy_web_app/src/components/database/components/calendar/event/Event.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/calendar/event/Event.tsx@@ -1,8 +1,8 @@-import { CalendarEvent, useFieldsSelector } from '@/application/database-yjs';+import { CalendarEvent, DatabaseContext, useFieldsSelector } from '@/application/database-yjs';import { RichTooltip } from '@/components/_shared/popover';import EventPaper from '@/components/database/components/calendar/event/EventPaper';import CardField from '@/components/database/components/field/CardField';-import React from 'react';+import React, { useContext } from 'react';import { EventWrapperProps } from 'react-big-calendar';export function Event ({ event }: EventWrapperProps<CalendarEvent>) {@@ -10,7 +10,7 @@ export function Event ({ event }: EventWrapperProps<CalendarEvent>) {const [rowId] = id.split(':');const showFields = useFieldsSelector();- // const navigateToRow = useNavigateToRow();+ const navigateToRow = useContext(DatabaseContext)?.navigateToRow;const [open, setOpen] = React.useState(false);return (@@ -19,7 +19,7 @@ export function Event ({ event }: EventWrapperProps<CalendarEvent>) {<divonClick={() => {if (window.innerWidth < 768) {- // navigateToRow?.(rowId);+ navigateToRow?.(rowId);} else {setOpen((prev) => !prev);}diff --git a/frontend/appflowy_web_app/src/components/database/components/calendar/event/EventPaper.tsx b/frontend/appflowy_web_app/src/components/database/components/calendar/event/EventPaper.tsxindex 48d1bf0ff7..b4fbf04981 100644--- a/frontend/appflowy_web_app/src/components/database/components/calendar/event/EventPaper.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/calendar/event/EventPaper.tsx@@ -1,10 +1,10 @@import { useFieldsSelector, usePrimaryFieldId } from '@/application/database-yjs';import EventPaperTitle from '@/components/database/components/calendar/event/EventPaperTitle';-// import OpenAction from '@/components/database/components/database-row/OpenAction';+import OpenAction from '@/components/database/components/database-row/OpenAction';import { Property } from '@/components/database/components/property';import React from 'react';-function EventPaper({ rowId }: { rowId: string }) {+function EventPaper ({ rowId }: { rowId: string }) {const primaryFieldId = usePrimaryFieldId();const fields = useFieldsSelector().filter((column) => column.fieldId !== primaryFieldId);@@ -12,9 +12,9 @@ function EventPaper({ rowId }: { rowId: string }) {return (<div className={'max-h-[260px] w-[360px] overflow-y-auto'}><div className={'flex h-fit w-full flex-col items-center justify-center py-2 px-3'}>- {/*<div className={'flex w-full items-center justify-end'}>*/}- {/* <OpenAction rowId={rowId} />*/}- {/*</div>*/}+ <div className={'flex w-full items-center justify-end'}>+ <OpenAction rowId={rowId} />+ </div><div className={'event-properties flex w-full flex-1 flex-col gap-4 overflow-y-auto py-2'}>{primaryFieldId && <EventPaperTitle rowId={rowId} fieldId={primaryFieldId} />}{fields.map((field) => {diff --git a/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx b/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsxindex 0d4360ff73..e5b710b0f0 100644--- a/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/calendar/toolbar/Toolbar.tsx@@ -22,7 +22,7 @@ export function Toolbar ({const { t } = useTranslation();return (- <div className={'sticky left-0 flex items-center justify-between overflow-x-auto overflow-y-hidden'}>+ <div className={'flex items-center justify-between overflow-x-auto overflow-y-hidden'}><div className={'whitespace-nowrap text-sm font-medium'}>{dateStr}</div><div className={'flex items-center justify-end gap-2 max-sm:gap-1'}><IconButton size={'small'} onClick={() => onNavigate('PREV')}>diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/Cell.hooks.ts b/frontend/appflowy_web_app/src/components/database/components/cell/Cell.hooks.tsindex 2e752f8f6e..07fb0a8483 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/Cell.hooks.ts+++ b/frontend/appflowy_web_app/src/components/database/components/cell/Cell.hooks.ts@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs/database.type';import { useFieldSelector } from '@/application/database-yjs/selector';import { DateFormat, TimeFormat, getDateFormat, getTimeFormat } from '@/application/database-yjs';diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/Cell.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/Cell.tsxindex acd8f5858d..c8a7aa8517 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/Cell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/Cell.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs/database.type';import { useFieldSelector } from '@/application/database-yjs/selector';import { RowCreateModifiedTime } from '@/components/database/components/cell/created-modified';diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/created-modified/RowCreateModifiedTime.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/created-modified/RowCreateModifiedTime.tsxindex 16830ea201..af1fb2d0a8 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/created-modified/RowCreateModifiedTime.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/created-modified/RowCreateModifiedTime.tsx@@ -1,9 +1,9 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { useRowDataSelector } from '@/application/database-yjs';import { useDateTypeCellDispatcher } from '@/components/database/components/cell/Cell.hooks';import React, { useEffect, useMemo, useState } from 'react';-export function RowCreateModifiedTime({+export function RowCreateModifiedTime ({rowId,fieldId,attrName,@@ -21,6 +21,8 @@ export function RowCreateModifiedTime({useEffect(() => {if (!rowData) return;const observeHandler = () => {+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment+ // @ts-expect-errorsetValue(rowData.get(attrName));};diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/file-media/FileMediaCell.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/file-media/FileMediaCell.tsxindex e13803acb6..9f2df5895a 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/file-media/FileMediaCell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/file-media/FileMediaCell.tsx@@ -13,7 +13,7 @@ import React, { useCallback, useMemo, Suspense } from 'react';export function FileMediaCell ({ cell, style, placeholder }: CellProps<FileMediaCellType>) {const value = cell?.data;const className = useMemo(() => {- const classList = ['flex items-center gap-1.5', 'cursor-text'];+ const classList = ['flex items-center gap-1.5 flex-wrap', 'cursor-text'];return classList.join(' ');}, []);@@ -46,6 +46,23 @@ export function FileMediaCell ({ cell, style, placeholder }: CellProps<FileMedia}, []);const renderChildren = useMemo(() => {+ const length = value?.length || 0;++ if (length > 6) {+ return <>+ {value?.slice(0, 5).map(renderItem)}+ <div+ onClick={() => {+ previewIndexRef.current = 0;+ setOpenPreview(true);+ }}+ className={'flex items-center hover:scale-110 cursor-pointer justify-center w-fit aspect-square rounded-[8px] h-14 bg-gray-100 text-gray-500 text-sm'}+ >+ +{length - 5}+ </div>+ </>;+ }+return value?.map(renderItem);}, [renderItem, value]);diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/primary/PrimaryCell.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/primary/PrimaryCell.tsxindex 4e0af27757..0dea670c7f 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/primary/PrimaryCell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/primary/PrimaryCell.tsx@@ -1,8 +1,9 @@-import { useRowMetaSelector } from '@/application/database-yjs';+import { DatabaseContext, useRowMetaSelector } from '@/application/database-yjs';import { TextCell as CellType, CellProps } from '@/application/database-yjs/cell.type';import { TextCell } from '@/components/database/components/cell/text';-// import { getPlatform } from '@/utils/platform';-import React, { useEffect, useState } from 'react';+import OpenAction from '@/components/database/components/database-row/OpenAction';+import { getPlatform } from '@/utils/platform';+import React, { useContext, useEffect, useMemo, useState } from 'react';import { ReactComponent as DocumentSvg } from '@/assets/notes.svg';export function PrimaryCell (props: CellProps<CellType> & {@@ -10,10 +11,11 @@ export function PrimaryCell (props: CellProps<CellType> & {}) {const { rowId, showDocumentIcon } = props;const meta = useRowMetaSelector(rowId);+ const navigateToRow = useContext(DatabaseContext)?.navigateToRow;const hasDocument = meta?.isEmptyDocument === false;const icon = meta?.icon;- const [, setHover] = useState(false);+ const [hover, setHover] = useState(false);useEffect(() => {const table = document.querySelector('.grid-table');@@ -44,19 +46,17 @@ export function PrimaryCell (props: CellProps<CellType> & {};}, [rowId]);- // const isMobile = useMemo(() => {- // return getPlatform().isMobile;- // }, []);- //- // const navigateToRow = useNavigateToRow();+ const isMobile = useMemo(() => {+ return getPlatform()?.isMobile;+ }, []);return (<div- // onClick={() => {- // if (isMobile) {- // navigateToRow?.(rowId);- // }- // }}+ onClick={() => {+ if (isMobile) {+ navigateToRow?.(rowId);+ }+ }}className={'primary-cell relative flex min-h-full w-full gap-2'}>{icon ? <div@@ -68,11 +68,11 @@ export function PrimaryCell (props: CellProps<CellType> & {<TextCell {...props} /></div>- {/*{hover && (*/}- {/* <div className={'absolute right-0 top-1/2 min-w-0 -translate-y-1/2 transform '}>*/}- {/* <OpenAction rowId={rowId} />*/}- {/* </div>*/}- {/*)}*/}+ {hover && navigateToRow && (+ <div className={'absolute right-0 top-1/2 min-w-0 -translate-y-1/2 transform '}>+ <OpenAction rowId={rowId} />+ </div>+ )}</div>);}diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsxindex 275952621f..e01f84b8c1 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsx@@ -1,4 +1,4 @@-import { YDatabase, YDoc, YjsEditorKey } from '@/application/collab.type';+import { View, YDatabase, YDoc, YjsEditorKey } from '@/application/types';import {DatabaseContext,DatabaseContextState,@@ -7,7 +7,6 @@ import {useFieldSelector,} from '@/application/database-yjs';import { RelationCell, RelationCellData } from '@/application/database-yjs/cell.type';-import { ViewMeta } from '@/application/db/tables/view_metas';import { notify } from '@/components/_shared/notify';import { RelationPrimaryValue } from '@/components/database/components/cell/relation/RelationPrimaryValue';import React, { useCallback, useContext, useEffect, useState } from 'react';@@ -21,15 +20,17 @@ function RelationItems ({ style, cell, fieldId }: {const { field } = useFieldSelector(fieldId);const relatedDatabaseId = field ? parseRelationTypeOption(field).database_id : null;- const getViewRowsMap = useContext(DatabaseContext)?.getViewRowsMap;+ const createRowDoc = useContext(DatabaseContext)?.createRowDoc;const loadViewMeta = useContext(DatabaseContext)?.loadViewMeta;const loadView = useContext(DatabaseContext)?.loadView;+ const navigateToRow = useContext(DatabaseContext)?.navigateToRow;const [noAccess, setNoAccess] = useState(false);const [relations, setRelations] = useState<Record<string, string> | null>();const [rows, setRows] = useState<DatabaseContextState['rowDocMap'] | null>();const [relatedFieldId, setRelatedFieldId] = useState<string | undefined>();const relatedViewId = relatedDatabaseId ? relations?.[relatedDatabaseId] : null;+ const [docGuid, setDocGuid] = useState<string | null>(null);const [rowIds, setRowIds] = useState([] as string[]);@@ -38,7 +39,8 @@ function RelationItems ({ style, cell, fieldId }: {useEffect(() => {if (!viewId) return;- const update = (meta: ViewMeta) => {+ const update = (meta: View | null) => {+ if (!meta) return;setRelations(meta.database_relations);};@@ -50,34 +52,36 @@ function RelationItems ({ style, cell, fieldId }: {}, [loadViewMeta, viewId]);const handleUpdateRowIds = useCallback(- (rows: DatabaseContextState['rowDocMap']) => {+ () => {const ids = (cell.data?.toJSON() as RelationCellData) ?? [];- setRowIds(ids.filter((id) => rows?.has(id)));+ setRowIds(ids);},[cell.data],);useEffect(() => {- if (!relatedViewId || !getViewRowsMap || !relatedFieldId) return;+ if (!relatedViewId || !createRowDoc || !docGuid) return;void (async () => {try {- const { rows } = await getViewRowsMap(relatedViewId);+ const rows: Record<string, YDoc> = {};++ for (const rowId of rowIds) {+ const rowDoc = await createRowDoc(`${docGuid}_rows_${rowId}`);++ rows[rowId] = rowDoc;+ }setRows(rows);- handleUpdateRowIds(rows);} catch (e) {console.error(e);}})();- }, [getViewRowsMap, relatedViewId, relatedFieldId, handleUpdateRowIds]);+ }, [createRowDoc, relatedViewId, relatedFieldId, rowIds, docGuid]);useEffect(() => {- const observerHandler = () => (rows ? handleUpdateRowIds(rows) : setRowIds([]));-- rows?.observe(observerHandler);- return () => rows?.unobserve(observerHandler);- }, [rows, handleUpdateRowIds]);+ handleUpdateRowIds();+ }, [handleUpdateRowIds]);useEffect(() => {if (!relatedViewId) return;@@ -90,6 +94,7 @@ function RelationItems ({ style, cell, fieldId }: {throw new Error('No access');}+ setDocGuid(viewDoc.guid);const database = viewDoc.getMap(YjsEditorKey.data_section).get(YjsEditorKey.database) as YDatabase;const fieldId = getPrimaryFieldId(database);@@ -108,14 +113,20 @@ function RelationItems ({ style, cell, fieldId }: {<div className={'text-text-caption'}>No access</div>) : (rowIds.map((rowId) => {- const rowDoc = rows?.get(rowId) as YDoc;+ const rowDoc = rows?.[rowId];+ if (!rowDoc) return null;return (<divkey={rowId}onClick={async (e) => {if (!relatedViewId) return;e.stopPropagation();+ if (navigateToRow) {+ navigateToRow(rowId);+ return;+ }+try {await navigateToView?.(relatedViewId);// eslint-disable-next-linediff --git a/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsxindex d01e54f76a..ebbea8ac9c 100644--- a/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsx@@ -1,4 +1,4 @@-import { FieldId, YDatabaseCell, YDatabaseRow, YDoc, YjsDatabaseKey, YjsEditorKey } from '@/application/collab.type';+import { FieldId, YDatabaseCell, YDatabaseRow, YDoc, YjsDatabaseKey, YjsEditorKey } from '@/application/types';import { FieldType } from '@/application/database-yjs';import { parseYDatabaseCellToCell } from '@/application/database-yjs/cell.parse';import React, { useEffect, useState } from 'react';diff --git a/frontend/appflowy_web_app/src/components/database/components/conditions/DatabaseConditions.tsx b/frontend/appflowy_web_app/src/components/database/components/conditions/DatabaseConditions.tsxindex 7c74e0fb8a..8b2f243c73 100644--- a/frontend/appflowy_web_app/src/components/database/components/conditions/DatabaseConditions.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/conditions/DatabaseConditions.tsx@@ -5,7 +5,7 @@ import React from 'react';import Filters from 'src/components/database/components/filters/Filters';import Sorts from 'src/components/database/components/sorts/Sorts';-export function DatabaseConditions() {+export function DatabaseConditions () {const conditionsContext = useConditionsContext();const expanded = conditionsContext?.expanded ?? false;const sorts = useSortsSelector();@@ -18,12 +18,12 @@ export function DatabaseConditions() {borderTopWidth: expanded ? '1px' : '0',}}className={- 'database-conditions relative mx-16 transform overflow-hidden border-t border-line-divider transition-all max-md:mx-4'+ 'database-conditions relative transform overflow-hidden border-t border-line-divider transition-all'}><AFScroller overflowYHidden className={'flex items-center gap-2'}><Sorts />- {sorts.length > 0 && filters.length > 0 && <div className='h-[20px] w-0 border border-line-divider' />}+ {sorts.length > 0 && filters.length > 0 && <div className="h-[20px] w-0 border border-line-divider" />}<Filters /></AFScroller></div>diff --git a/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowProperties.tsx b/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowProperties.tsxindex 59405d6c15..f2dc779080 100644--- a/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowProperties.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowProperties.tsx@@ -2,12 +2,12 @@ import { useFieldsSelector, usePrimaryFieldId } from '@/application/database-yjsimport { Property } from '@/components/database/components/property';import React from 'react';-export function DatabaseRowProperties({ rowId }: { rowId: string }) {+export function DatabaseRowProperties ({ rowId }: { rowId: string }) {const primaryFieldId = usePrimaryFieldId();const fields = useFieldsSelector().filter((column) => column.fieldId !== primaryFieldId);return (- <div className={'row-properties flex w-full flex-1 flex-col gap-4 px-16 py-2 max-md:px-4'}>+ <div className={'row-properties px-6 flex w-full flex-1 flex-col gap-4 py-2'}>{fields.map((field) => {return <Property fieldId={field.fieldId} rowId={rowId} key={field.fieldId} />;})}diff --git a/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowSubDocument.tsx b/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowSubDocument.tsxindex bf761b5612..8f7479990a 100644--- a/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowSubDocument.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/database-row/DatabaseRowSubDocument.tsx@@ -1,14 +1,14 @@-import { YDoc } from '@/application/collab.type';+import { YDoc } from '@/application/types';import { DatabaseContext, useRowMetaSelector } from '@/application/database-yjs';+import EditorSkeleton from '@/components/_shared/skeleton/EditorSkeleton';import { Editor } from '@/components/editor';-import CircularProgress from '@mui/material/CircularProgress';import React, { useCallback, useContext, useEffect, useState } from 'react';-export function DatabaseRowSubDocument({ rowId }: { rowId: string }) {+export function DatabaseRowSubDocument ({ rowId }: { rowId: string }) {const meta = useRowMetaSelector(rowId);const documentId = meta?.documentId;const loadView = useContext(DatabaseContext)?.loadView;- const getViewRowsMap = useContext(DatabaseContext)?.getViewRowsMap;+ const createRowDoc = useContext(DatabaseContext)?.createRowDoc;const navigateToView = useContext(DatabaseContext)?.navigateToView;const loadViewMeta = useContext(DatabaseContext)?.loadViewMeta;@@ -19,9 +19,8 @@ export function DatabaseRowSubDocument({ rowId }: { rowId: string }) {if (!loadView || !documentId) return;try {setDoc(null);- const doc = await loadView(documentId);+ const doc = await loadView(documentId, true);- console.log('doc', doc);setDoc(doc);} catch (e) {console.error(e);@@ -36,20 +35,18 @@ export function DatabaseRowSubDocument({ rowId }: { rowId: string }) {if (loading) {return (- <div className={'flex h-[260px] w-full items-center justify-center'}>- <CircularProgress />- </div>+ <EditorSkeleton />);}- if (!doc) return null;-+ if (!doc) return <EditorSkeleton />;return (+<Editordoc={doc}loadViewMeta={loadViewMeta}navigateToView={navigateToView}- getViewRowsMap={getViewRowsMap}+ createRowDoc={createRowDoc}readOnly={true}loadView={loadView}/>diff --git a/frontend/appflowy_web_app/src/components/database/components/field/CardField.tsx b/frontend/appflowy_web_app/src/components/database/components/field/CardField.tsxindex c72d87e011..3adf643f27 100644--- a/frontend/appflowy_web_app/src/components/database/components/field/CardField.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/field/CardField.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType, useCellSelector, useFieldSelector } from '@/application/database-yjs';import { FileMediaCellData, TextCell } from '@/application/database-yjs/cell.type';import Cell from '@/components/database/components/cell/Cell';diff --git a/frontend/appflowy_web_app/src/components/database/components/field/FieldDisplay.tsx b/frontend/appflowy_web_app/src/components/database/components/field/FieldDisplay.tsxindex 3ff135e8f7..ac2b26fd45 100644--- a/frontend/appflowy_web_app/src/components/database/components/field/FieldDisplay.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/field/FieldDisplay.tsx@@ -1,4 +1,4 @@-import { FieldId, YjsDatabaseKey } from '@/application/collab.type';+import { FieldId, YjsDatabaseKey } from '@/application/types';import { FieldType, useFieldSelector } from '@/application/database-yjs';import { FieldTypeIcon } from '@/components/database/components/field/FieldTypeIcon';import React from 'react';diff --git a/frontend/appflowy_web_app/src/components/database/components/filters/filter-menu/FilterMenu.tsx b/frontend/appflowy_web_app/src/components/database/components/filters/filter-menu/FilterMenu.tsxindex 720dac3d3d..ea45dfd787 100644--- a/frontend/appflowy_web_app/src/components/database/components/filters/filter-menu/FilterMenu.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/filters/filter-menu/FilterMenu.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType, Filter, SelectOptionFilter, useFieldSelector } from '@/application/database-yjs';import CheckboxFilterMenu from './CheckboxFilterMenu';import ChecklistFilterMenu from './ChecklistFilterMenu';diff --git a/frontend/appflowy_web_app/src/components/database/components/filters/overview/FilterContentOverview.tsx b/frontend/appflowy_web_app/src/components/database/components/filters/overview/FilterContentOverview.tsxindex 9f6d1ea188..08c6cece74 100644--- a/frontend/appflowy_web_app/src/components/database/components/filters/overview/FilterContentOverview.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/filters/overview/FilterContentOverview.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import {CheckboxFilterCondition,ChecklistFilterCondition,diff --git a/frontend/appflowy_web_app/src/components/database/components/filters/overview/SelectFilterContentOverview.tsx b/frontend/appflowy_web_app/src/components/database/components/filters/overview/SelectFilterContentOverview.tsxindex 64e8ddc00c..d770bf64cd 100644--- a/frontend/appflowy_web_app/src/components/database/components/filters/overview/SelectFilterContentOverview.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/filters/overview/SelectFilterContentOverview.tsx@@ -1,4 +1,4 @@-import { YDatabaseField } from '@/application/collab.type';+import { YDatabaseField } from '@/application/types';import {parseSelectOptionTypeOptions,SelectOptionFilter,diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-calculation-cell/CalculationCell.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-calculation-cell/CalculationCell.tsxindex dc01492f2d..cd3f5de71d 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-calculation-cell/CalculationCell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-calculation-cell/CalculationCell.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { currencyFormaterMap, FieldType, parseNumberTypeOptions, useFieldSelector } from '@/application/database-yjs';import { CalculationType } from '@/application/database-yjs/database.type';import Decimal from 'decimal.js';diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsxindex 0090f1361c..6c3619279c 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-cell/GridCell.tsx@@ -1,4 +1,4 @@-import { FieldId, YjsDatabaseKey } from '@/application/collab.type';+import { FieldId, YjsDatabaseKey } from '@/application/types';import { useCellSelector } from '@/application/database-yjs';import { useFieldSelector } from '@/application/database-yjs/selector';import { Cell } from '@/components/database/components/cell';diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsxindex c9883cdbc5..76a8fbc236 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/GridColumn.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { FieldType } from '@/application/database-yjs/database.type';import { Column, useFieldSelector } from '@/application/database-yjs/selector';import { FieldTypeIcon } from '@/components/database/components/field';@@ -33,7 +33,7 @@ export function GridColumn ({ column, index }: { column: Column; index: number }<FieldTypeIcon type={type} className={'mr-1 w-4 h-4 icon'} /></div><div className={'flex-1'}>{name}</div>- {isAIField && <AIIndicatorSvg className={'text-xl'} />}+ {isAIField && <AIIndicatorSvg className={'text-xl w-4 h-4'} />}</div></Tooltip>);diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/useRenderFields.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/useRenderFields.tsxindex f932cd3a72..af7249658a 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/useRenderFields.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-column/useRenderFields.tsx@@ -1,4 +1,4 @@-import { FieldId } from '@/application/collab.type';+import { FieldId } from '@/application/types';import { FieldVisibility } from '@/application/database-yjs/database.type';import { useFieldsSelector } from '@/application/database-yjs/selector';import { useCallback, useMemo } from 'react';diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-row/GridCalculateRowCell.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-row/GridCalculateRowCell.tsxindex ff2b7aaa40..1f0c62fbac 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-row/GridCalculateRowCell.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-row/GridCalculateRowCell.tsx@@ -1,4 +1,4 @@-import { YjsDatabaseKey } from '@/application/collab.type';+import { YjsDatabaseKey } from '@/application/types';import { useDatabaseView } from '@/application/database-yjs';import { CalculationType } from '@/application/database-yjs/database.type';import { CalculationCell, ICalculationCell } from '../grid-calculation-cell';diff --git a/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx b/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsxindex 01ed814c8e..3b088c51e2 100644--- a/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/grid/grid-table/GridTable.tsx@@ -59,7 +59,7 @@ export const GridTable = ({ scrollLeft, columnWidth, columns, onScrollLeft }: Grreturn `${rowIndex}:${columnIndex}`;},- [columns, rows]+ [columns, rows],);const Cell = useCallback(({ columnIndex, rowIndex, style, data }: GridChildComponentProps) => {@@ -111,7 +111,7 @@ export const GridTable = ({ scrollLeft, columnWidth, columns, onScrollLeft }: Grreturn <div style={style} />;},- [onResize]+ [onResize],);return (diff --git a/frontend/appflowy_web_app/src/components/database/components/header/DatabaseHeader.tsx b/frontend/appflowy_web_app/src/components/database/components/header/DatabaseHeader.tsxindex 3ba5b004b9..9406cceac3 100644--- a/frontend/appflowy_web_app/src/components/database/components/header/DatabaseHeader.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/header/DatabaseHeader.tsx@@ -1,4 +1,4 @@-import { ViewLayout, ViewMetaIcon } from '@/application/collab.type';+import { ViewLayout, ViewMetaIcon } from '@/application/types';import { ViewIcon } from '@/components/_shared/view-icon';import { isFlagEmoji } from '@/utils/emoji';import React, { useMemo } from 'react';diff --git a/frontend/appflowy_web_app/src/components/database/components/header/DatabaseRowHeader.tsx b/frontend/appflowy_web_app/src/components/database/components/header/DatabaseRowHeader.tsxindex 1cffe320fd..a70ff414fd 100644--- a/frontend/appflowy_web_app/src/components/database/components/header/DatabaseRowHeader.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/header/DatabaseRowHeader.tsx@@ -1,17 +1,75 @@import { useCellSelector, usePrimaryFieldId, useRowMetaSelector } from '@/application/database-yjs';+import { AppendBreadcrumb, ViewIconType, ViewLayout } from '@/application/types';import Title from '@/components/database/components/header/Title';-import React from 'react';+import { getScrollParent } from '@/components/global-comment/utils';+import React, { useEffect } from 'react';-function DatabaseRowHeader({ rowId }: { rowId: string }) {+function DatabaseRowHeader ({ rowId, appendBreadcrumb }: { rowId: string; appendBreadcrumb?: AppendBreadcrumb }) {const fieldId = usePrimaryFieldId() || '';+ const ref = React.useRef<HTMLDivElement>(null);+ const [offsetLeft, setOffsetLeft] = React.useState(0);+ const [width, setWidth] = React.useState(0);const meta = useRowMetaSelector(rowId);+ const cover = meta?.cover;+const cell = useCellSelector({rowId,fieldId,});- return <Title icon={meta?.icon} name={cell?.data as string} />;+ useEffect(() => {+ appendBreadcrumb?.({+ children: [],+ extra: null, is_private: false, is_published: false, layout: ViewLayout.Document, view_id: rowId,+ name: cell?.data as string,+ icon: meta?.icon ? {+ ty: ViewIconType.Emoji,+ value: meta.icon,+ } : null,+ });++ }, [appendBreadcrumb, cell?.data, meta, rowId]);++ useEffect(() => {+ return () => {+ appendBreadcrumb?.(undefined);+ };+ }, [appendBreadcrumb]);++ useEffect(() => {+ const el = ref.current;++ if (!el) return;++ const container = getScrollParent(el);++ if (!container) return;++ const handleResize = () => {+ setOffsetLeft(container.getBoundingClientRect().left - el.getBoundingClientRect().left);+ setWidth(container.getBoundingClientRect().width);+ };++ handleResize();+ const resizeObserver = new ResizeObserver(handleResize);++ resizeObserver.observe(container);++ return () => {+ resizeObserver.disconnect();+ };+ }, []);++ return <div ref={ref} className={'flex flex-col relative'}>+ <div className={'row-header-cover relative'} style={{ left: offsetLeft, width }}>+ {cover && <img+ className={'max-h-[288px] min-h-[130px] w-full max-sm:h-[180px] object-cover'} src={cover}+ alt={cell?.data as string}+ />}+ </div>+ <Title icon={meta?.icon} name={cell?.data as string} />+ </div>;}export default DatabaseRowHeader;diff --git a/frontend/appflowy_web_app/src/components/database/components/header/Title.tsx b/frontend/appflowy_web_app/src/components/database/components/header/Title.tsxindex 8bb1979196..60e6d84521 100644--- a/frontend/appflowy_web_app/src/components/database/components/header/Title.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/header/Title.tsx@@ -1,15 +1,17 @@import React from 'react';import { useTranslation } from 'react-i18next';-export function Title({ icon, name }: { icon?: string; name?: string }) {+export function Title ({ icon, name }: { icon?: string; name?: string }) {const { t } = useTranslation();return (- <div className={'flex w-full flex-col py-4'}>- <div className={'flex w-full items-center px-16 max-md:px-4'}>- <div className={'flex items-center gap-2 text-3xl'}>- <div>{icon}</div>- <div className={'font-bold'}>{name || t('document.title.placeholder')}</div>+ <div className={'flex w-full flex-col py-4 mt-10 px-6'}>+ <div className={'flex w-full items-center'}>+ <div className={'flex gap-2 text-3xl'}>+ {icon ? <div>{icon}</div> : null}+ <div+ className={`font-bold ${!name ? 'text-text-placeholder' : 'text-text-title'}`}+ >{name || t('document.title.placeholder')}</div></div></div></div>diff --git a/frontend/appflowy_web_app/src/components/database/components/property/Property.tsx b/frontend/appflowy_web_app/src/components/database/components/property/Property.tsxindex 51eac87e58..e11498d050 100644--- a/frontend/appflowy_web_app/src/components/database/components/property/Property.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/property/Property.tsx@@ -1,9 +1,10 @@-import { YjsDatabaseKey } from '@/application/collab.type';import { FieldType, useCellSelector, useFieldSelector } from '@/application/database-yjs';import { Cell as CellType, CellProps } from '@/application/database-yjs/cell.type';+import { YjsDatabaseKey } from '@/application/types';import { CheckboxCell } from '@/components/database/components/cell/checkbox';import { RowCreateModifiedTime } from '@/components/database/components/cell/created-modified';import { DateTimeCell } from '@/components/database/components/cell/date';+import { FileMediaCell } from '@/components/database/components/cell/file-media';import { NumberCell } from '@/components/database/components/cell/number';import { RelationCell } from '@/components/database/components/cell/relation';import { SelectOptionCell } from '@/components/database/components/cell/select-option';@@ -11,12 +12,12 @@ import { TextCell } from '@/components/database/components/cell/text';import { UrlCell } from '@/components/database/components/cell/url';import PropertyWrapper from '@/components/database/components/property/PropertyWrapper';import { TextProperty } from '@/components/database/components/property/text';-import { ChecklistProperty } from 'src/components/database/components/property/cheklist';import React, { FC, useMemo } from 'react';import { useTranslation } from 'react-i18next';+import { ChecklistProperty } from 'src/components/database/components/property/cheklist';-export function Property({ fieldId, rowId }: { fieldId: string; rowId: string }) {+export function Property ({ fieldId, rowId }: { fieldId: string; rowId: string }) {const cell = useCellSelector({fieldId,rowId,@@ -47,6 +48,8 @@ export function Property({ fieldId, rowId }: { fieldId: string; rowId: string })case FieldType.AISummaries:case FieldType.AITranslations:return TextCell;+ case FieldType.FileMedia:+ return FileMediaCell;default:return TextProperty;}@@ -56,7 +59,7 @@ export function Property({ fieldId, rowId }: { fieldId: string; rowId: string })() => ({fontSize: '12px',}),- []+ [],);if (fieldType === FieldType.CreatedTime || fieldType === FieldType.LastEditedTime) {@@ -71,7 +74,9 @@ export function Property({ fieldId, rowId }: { fieldId: string; rowId: string })return (<PropertyWrapper fieldId={fieldId}>- <Component cell={cell} style={style} placeholder={t('grid.row.textPlaceholder')} fieldId={fieldId} rowId={rowId} />+ <Component+ cell={cell} style={style} placeholder={t('grid.row.textPlaceholder')} fieldId={fieldId} rowId={rowId}+ /></PropertyWrapper>);}diff --git a/frontend/appflowy_web_app/src/components/database/components/tabs/DatabaseTabs.tsx b/frontend/appflowy_web_app/src/components/database/components/tabs/DatabaseTabs.tsxindex d18a9c334f..22fa29897d 100644--- a/frontend/appflowy_web_app/src/components/database/components/tabs/DatabaseTabs.tsx+++ b/frontend/appflowy_web_app/src/components/database/components/tabs/DatabaseTabs.tsx@@ -1,6 +1,5 @@-import { DatabaseViewLayout, YDatabaseView, YjsDatabaseKey } from '@/application/collab.type';+import { DatabaseViewLayout, View, YDatabaseView, YjsDatabaseKey } from '@/application/types';import { DatabaseContext, useDatabase, useDatabaseView } from '@/application/database-yjs';-import { ViewMeta } from '@/application/db/tables/view_metas';import { DatabaseActions } from '@/components/database/components/conditions';import { Tooltip } from '@mui/material';import {@@ -43,7 +42,7 @@ export const DatabaseTabs = forwardRef<HTMLDivElement, DatabaseTabBarProps>(const view = useDatabaseView();const views = useDatabase().get(YjsDatabaseKey.views);const loadViewMeta = useContext(DatabaseContext)?.loadViewMeta;- const [meta, setMeta] = useState<ViewMeta | null>(null);+ const [meta, setMeta] = useState<View | null>(null);const layout = Number(view?.get(YjsDatabaseKey.layout)) as DatabaseViewLayout;const handleChange = (_: React.SyntheticEvent, newValue: string) => {@@ -112,7 +111,7 @@ export const DatabaseTabs = forwardRef<HTMLDivElement, DatabaseTabBarProps>(if (!view) return null;const layout = Number(view.get(YjsDatabaseKey.layout)) as DatabaseViewLayout;const Icon = DatabaseIcons[layout];- const name = viewId === iidIndex ? viewName : meta?.child_views?.find((v) => v.view_id === viewId)?.name;+ const name = viewId === iidIndex ? viewName : meta?.children?.find((v) => v.view_id === viewId)?.name;return (<ViewTabdiff --git a/frontend/appflowy_web_app/src/components/database/grid/Grid.tsx b/frontend/appflowy_web_app/src/components/database/grid/Grid.tsxindex 15aaa23e51..2f7b0dc56c 100644--- a/frontend/appflowy_web_app/src/components/database/grid/Grid.tsx+++ b/frontend/appflowy_web_app/src/components/database/grid/Grid.tsx@@ -3,7 +3,7 @@ import { useRenderFields, GridHeader, GridTable } from '@/components/database/coimport { CircularProgress } from '@mui/material';import React, { useEffect, useState } from 'react';-export function Grid() {+export function Grid () {const database = useDatabase();const viewId = useViewId() || '';const [scrollLeft, setScrollLeft] = useState(0);diff --git a/frontend/appflowy_web_app/src/components/document/Document.tsx b/frontend/appflowy_web_app/src/components/document/Document.tsxindex fdd869609c..24c72fc6c2 100644--- a/frontend/appflowy_web_app/src/components/document/Document.tsx+++ b/frontend/appflowy_web_app/src/components/document/Document.tsx@@ -1,17 +1,21 @@-import { GetViewRowsMap, LoadView, LoadViewMeta, YDoc } from '@/application/collab.type';-import DocumentSkeleton from '@/components/_shared/skeleton/DocumentSkeleton';+import { CreateRowDoc, LoadView, LoadViewMeta, YDoc, YjsEditorKey } from '@/application/types';+import EditorSkeleton from '@/components/_shared/skeleton/EditorSkeleton';import { Editor } from '@/components/editor';-import React, { Suspense } from 'react';+import { EditorVariant } from '@/components/editor/EditorContext';+import React, { Suspense, useCallback } from 'react';import ViewMetaPreview, { ViewMetaProps } from '@/components/view-meta/ViewMetaPreview';+import { useSearchParams } from 'react-router-dom';export interface DocumentProps {doc: YDoc;navigateToView?: (viewId: string) => Promise<void>;loadViewMeta?: LoadViewMeta;loadView?: LoadView;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;viewMeta: ViewMetaProps;isTemplateThumb?: boolean;+ variant?: EditorVariant;+ onRendered?: () => void;}export const Document = ({@@ -19,27 +23,46 @@ export const Document = ({loadView,navigateToView,loadViewMeta,- getViewRowsMap,+ createRowDoc,viewMeta,isTemplateThumb,+ variant,+ onRendered,}: DocumentProps) => {+ const [search, setSearch] = useSearchParams();+ const blockId = search.get('blockId') || undefined;++ const onJumpedBlockId = useCallback(() => {+ setSearch(prev => {+ prev.delete('blockId');+ return prev;+ });+ }, [setSearch]);+ const document = doc?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.document);++ if (!document) return null;return (- <div style={{- minHeight: `calc(100vh - 48px)`,- }} className={'mb-16 flex h-full w-full flex-col items-center'}+ <div+ style={{+ minHeight: `calc(100vh - 48px)`,+ }} className={'mb-16 flex h-full w-full flex-col items-center'}><ViewMetaPreview {...viewMeta} />- <Suspense fallback={<DocumentSkeleton />}>+ <Suspense fallback={<EditorSkeleton />}><div className={'flex justify-center w-full'}><EditorloadView={loadView}loadViewMeta={loadViewMeta}navigateToView={navigateToView}- getViewRowsMap={getViewRowsMap}+ createRowDoc={createRowDoc}readSummary={isTemplateThumb}doc={doc}readOnly={true}+ jumpBlockId={blockId}+ onJumpedBlockId={onJumpedBlockId}+ variant={variant}+ onRendered={onRendered}/></div></Suspense>diff --git a/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx b/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsxindex bec9605b1b..a29e52c56c 100644--- a/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx+++ b/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx@@ -1,4 +1,4 @@-import { CollabOrigin } from '@/application/collab.type';+import { CollabOrigin } from '@/application/types';import { withYjs, YjsEditor } from '@/application/slate-yjs/plugins/withYjs';import EditorEditable from '@/components/editor/Editable';import { useEditorContext } from '@/components/editor/EditorContext';diff --git a/frontend/appflowy_web_app/src/components/editor/Editable.tsx b/frontend/appflowy_web_app/src/components/editor/Editable.tsxindex 47d49e3726..711597efe5 100644--- a/frontend/appflowy_web_app/src/components/editor/Editable.tsx+++ b/frontend/appflowy_web_app/src/components/editor/Editable.tsx@@ -28,7 +28,7 @@ const EditorEditable = ({ editor }: { editor: ReactEditor }) => {return decoration || [];}}- className={'outline-none w-[964px] min-w-0 max-w-full max-xl:px-8 max-lg:px-6 focus:outline-none'}+ className={'outline-none w-[964px] min-w-0 max-w-full px-6 focus:outline-none'}renderLeaf={Leaf}renderElement={renderElement}readOnly={readOnly}diff --git a/frontend/appflowy_web_app/src/components/editor/Editor.cy.tsx b/frontend/appflowy_web_app/src/components/editor/Editor.cy.tsxindex f3eb62c9d3..ddcf720750 100644--- a/frontend/appflowy_web_app/src/components/editor/Editor.cy.tsx+++ b/frontend/appflowy_web_app/src/components/editor/Editor.cy.tsx@@ -1,10 +1,10 @@-import { YDoc } from '@/application/collab.type';-import { DocumentTest } from '@/../cypress/support/document';+import { YDoc } from '@/application/types';+import { DocumentTest } from 'cypress/support/document';import { applyYDoc } from '@/application/ydoc/apply';import React from 'react';import * as Y from 'yjs';import { Editor } from './Editor';-import withAppWrapper from '@/components/app/withAppWrapper';+import withAppWrapper from '@/components/main/withAppWrapper';describe('<Editor />', () => {beforeEach(() => {@@ -31,7 +31,7 @@ describe('<Editor />', () => {});});-function renderEditor(doc: YDoc) {+function renderEditor (doc: YDoc) {const AppWrapper = withAppWrapper(() => {return (<div className={'h-screen w-screen overflow-y-auto'}>diff --git a/frontend/appflowy_web_app/src/components/editor/Editor.tsx b/frontend/appflowy_web_app/src/components/editor/Editor.tsxindex 421dc4b689..cf9bfad2c6 100644--- a/frontend/appflowy_web_app/src/components/editor/Editor.tsx+++ b/frontend/appflowy_web_app/src/components/editor/Editor.tsx@@ -1,20 +1,24 @@-import { YDoc } from '@/application/collab.type';+import { YDoc } from '@/application/types';import CollaborativeEditor from '@/components/editor/CollaborativeEditor';import { defaultLayoutStyle, EditorContextProvider, EditorContextState } from '@/components/editor/EditorContext';-import React, { memo } from 'react';+import React, { memo, useEffect } from 'react';import './editor.scss';export interface EditorProps extends EditorContextState {doc: YDoc;}-export const Editor = memo(({ doc, layoutStyle = defaultLayoutStyle, ...props }: EditorProps) => {+export const Editor = memo(({ doc, layoutStyle = defaultLayoutStyle, onRendered, ...props }: EditorProps) => {const [codeGrammars, setCodeGrammars] = React.useState<Record<string, string>>({});const handleAddCodeGrammars = React.useCallback((blockId: string, grammar: string) => {setCodeGrammars((prev) => ({ ...prev, [blockId]: grammar }));}, []);+ useEffect(() => {+ onRendered?.();+ }, [onRendered]);+return (<EditorContextProvider{...props}diff --git a/frontend/appflowy_web_app/src/components/editor/EditorContext.tsx b/frontend/appflowy_web_app/src/components/editor/EditorContext.tsxindex 0bd14c454d..ae4d3e7fbf 100644--- a/frontend/appflowy_web_app/src/components/editor/EditorContext.tsx+++ b/frontend/appflowy_web_app/src/components/editor/EditorContext.tsx@@ -1,4 +1,10 @@-import { FontLayout, GetViewRowsMap, LineHeightLayout, LoadView, LoadViewMeta } from '@/application/collab.type';+import {+ CreateRowDoc,+ FontLayout,+ LineHeightLayout,+ LoadView,+ LoadViewMeta,+} from '@/application/types';import { createContext, useContext } from 'react';export interface EditorLayoutStyle {@@ -13,6 +19,11 @@ export const defaultLayoutStyle: EditorLayoutStyle = {lineHeightLayout: LineHeightLayout.normal,};+export enum EditorVariant {+ publish = 'publish',+ app = 'app',+}+export interface EditorContextState {readOnly: boolean;layoutStyle?: EditorLayoutStyle;@@ -21,8 +32,12 @@ export interface EditorContextState {navigateToView?: (viewId: string) => Promise<void>;loadViewMeta?: LoadViewMeta;loadView?: LoadView;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;readSummary?: boolean;+ jumpBlockId?: string;+ onJumpedBlockId?: () => void;+ variant?: EditorVariant;+ onRendered?: () => void;}export const EditorContext = createContext<EditorContextState>({diff --git a/frontend/appflowy_web_app/src/components/editor/__tests__/blocks/Paragraph.cy.tsx b/frontend/appflowy_web_app/src/components/editor/__tests__/blocks/Paragraph.cy.tsxnew file mode 100644index 0000000000..869bfc6381--- /dev/null+++ b/frontend/appflowy_web_app/src/components/editor/__tests__/blocks/Paragraph.cy.tsx@@ -0,0 +1,44 @@+import { mountEditor } from '@/components/editor/__tests__/mount';+import { DocumentTest, FromBlockJSON } from 'cypress/support/document';++describe('<Paragraph />', () => {+ beforeEach(() => {+ cy.viewport(1280, 720);+ });++ it('render paragraph', () => {+ cy.fixture<FromBlockJSON[]>('editor/blocks/paragraph').then((data) => {+ const documentTest = new DocumentTest();++ documentTest.fromJSON(data);+ mountEditor({ readOnly: true, doc: documentTest.doc });+ }).as('render');+ cy.get('[role="textbox"]').should('exist');+ cy.get('[data-block-type="paragraph"]').should('have.length', 7);+ cy.get('[role="textbox"]').children().should('have.length', 3);+ cy.matchImageSnapshot('paragraph/initial-render');+ });++ it('edit paragraph text', () => {+ const documentTest = new DocumentTest();++ cy.fixture<FromBlockJSON[]>('editor/blocks/paragraph').then((data) => {+ documentTest.fromJSON(data);+ mountEditor({ readOnly: false, doc: documentTest.doc });+ }).as('documentTest');+ cy.get('[role="textbox"]').should('exist');+ cy.get('[role="textbox"]').type('{selectall}').type('{rightarrow}')+ .type('New text at the end');+ cy.get('[role="textbox"]')+ .type('{movetoend}')+ .type('{leftarrow}'.repeat(10))+ .type('{backspace}'.repeat(5)).type('add').type('{backspace}'.repeat(2));+ cy.matchImageSnapshot('paragraph/editing-text');++ cy.then(() => {+ console.log('====', documentTest.doc.getMap('data').toJSON());+ });+ });+});++export {};\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/editor/__tests__/mount.tsx b/frontend/appflowy_web_app/src/components/editor/__tests__/mount.tsxnew file mode 100644index 0000000000..e9f77d4e1d--- /dev/null+++ b/frontend/appflowy_web_app/src/components/editor/__tests__/mount.tsx@@ -0,0 +1,16 @@+import React from 'react';++import Editor, { EditorProps } from '@/components/editor/Editor';+import withAppWrapper from '@/components/main/withAppWrapper';++export function mountEditor (props: EditorProps) {+ const AppWrapper = withAppWrapper(() => {+ return (+ <div className={'h-screen w-screen flex flex-col items-center py-20 overflow-y-auto border border-line-divider'}>+ <Editor {...props} />+ </div>+ );+ });++ cy.mount(<AppWrapper />);+}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/code/useDecorate.ts b/frontend/appflowy_web_app/src/components/editor/components/blocks/code/useDecorate.tsindex c424934cb2..19fe86a3df 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/code/useDecorate.ts+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/code/useDecorate.ts@@ -1,4 +1,4 @@-import { BlockType } from '@/application/collab.type';+import { BlockType } from '@/application/types';import { useEditorContext } from '@/components/editor/EditorContext';import { decorateCode } from './utils';import { CodeNode } from '@/components/editor/editor.type';diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/database/DatabaseBlock.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/database/DatabaseBlock.tsxindex 763d44e7e1..2934067f36 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/database/DatabaseBlock.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/database/DatabaseBlock.tsx@@ -1,13 +1,12 @@import { ReactComponent as ExpandMoreIcon } from '$icons/16x/full_view.svg';-import { ViewMeta } from '@/application/db/tables/view_metas';-import { useEditorContext } from '@/components/editor/EditorContext';+import { BlockType, View, YDoc } from '@/application/types';import { Database } from '@/components/database';import { DatabaseNode, EditorElementProps } from '@/components/editor/editor.type';+import { EditorVariant, useEditorContext } from '@/components/editor/EditorContext';import { Tooltip } from '@mui/material';import CircularProgress from '@mui/material/CircularProgress';-import React, { forwardRef, memo, useEffect, useMemo, useState } from 'react';+import React, { forwardRef, memo, useCallback, useEffect, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';-import { BlockType, YDoc } from '@/application/collab.type';export const DatabaseBlock = memo(forwardRef<HTMLDivElement, EditorElementProps<DatabaseNode>>(({ node, children, ...attributes }, ref) => {@@ -16,8 +15,9 @@ export const DatabaseBlock = memo(const type = node.type;const navigateToView = useEditorContext()?.navigateToView;const loadView = useEditorContext()?.loadView;- const getViewRowsMap = useEditorContext()?.getViewRowsMap;+ const createRowDoc = useEditorContext()?.createRowDoc;const loadViewMeta = useEditorContext()?.loadViewMeta;+ const variant = useEditorContext()?.variant;const [notFound, setNotFound] = useState(false);const [doc, setDoc] = useState<YDoc | null>(null);@@ -58,16 +58,22 @@ export const DatabaseBlock = memo(})();}, [viewId, loadView]);- const [selectedViewId, setSelectedViewId] = useState<string>();+ const [selectedViewId, setSelectedViewId] = useState<string>(viewId);const [visibleViewIds, setVisibleViewIds] = useState<string[]>([]);const [iidName, setIidName] = useState<string>('');useEffect(() => {- const updateVisibleViewIds = async (meta: ViewMeta) => {- const viewIds = meta.visible_view_ids || [];+ const updateVisibleViewIds = async (meta: View | null) => {+ if (!meta) {+ return;+ }++ const viewIds = meta.children.map((v) => v.view_id) || [];++ viewIds.unshift(meta.view_id);if (!viewIds.includes(viewId)) {- setSelectedViewId(meta.visible_view_ids[0]);+ setSelectedViewId(viewIds[0]);} else {setSelectedViewId(viewId);}@@ -89,6 +95,14 @@ export const DatabaseBlock = memo(})();}, [loadViewMeta, viewId]);+ const handleNavigateToRow = useCallback(+ (rowId: string) => {+ if (!viewId || variant !== 'app') return;+ window.open(`${window.origin}/app/${viewId}?r=${rowId}`, '_blank');+ },+ [variant, viewId],+ );+return (<><div@@ -111,13 +125,15 @@ export const DatabaseBlock = memo(doc={doc}iidIndex={viewId}viewId={selectedViewId}- getViewRowsMap={getViewRowsMap}+ createRowDoc={createRowDoc}loadView={loadView}navigateToView={navigateToView}+ onOpenRow={variant === 'app' ? handleNavigateToRow : undefined}loadViewMeta={loadViewMeta}iidName={iidName}visibleViewIds={visibleViewIds}onChangeView={setSelectedViewId}+ hideConditions={variant === EditorVariant.publish}/>{isHovering && (<div className={'absolute right-4 top-1'}>diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/gallery/GalleryBlock.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/gallery/GalleryBlock.tsxindex 3442a2bf88..8b107d276e 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/gallery/GalleryBlock.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/gallery/GalleryBlock.tsx@@ -1,4 +1,5 @@-import { GalleryLayout } from '@/application/collab.type';+import { ReactComponent as ImageIcon } from '@/assets/gallery.svg';+import { GalleryLayout } from '@/application/types';import { GalleryPreview } from '@/components/_shared/gallery-preview';import { notify } from '@/components/_shared/notify';import Carousel from '@/components/editor/components/blocks/gallery/Carousel';@@ -75,7 +76,10 @@ const GalleryBlock = memo(return (<div- ref={ref} {...attributes} className={className} onMouseEnter={() => setHovered(true)}+ ref={ref} {...attributes} className={className} onMouseEnter={() => {+ if (!photos.length) return;+ setHovered(true);+ }}onMouseLeave={() => setHovered(false)}><div className={'absolute left-0 top-0 h-full w-full pointer-events-none'}>@@ -94,7 +98,14 @@ const GalleryBlock = memo(handleOpenPreview();}} images={photos}/>- ) : null}+ ) : <div+ className={+ 'container-bg border border-line-divider flex h-[48px] w-full rounded-[8px] select-none items-center gap-[10px] bg-fill-list-active px-4 text-text-caption'+ }+ >+ <ImageIcon />+ {t('document.plugins.image.addAnImageMobile')}+ </div>}{hovered &&<GalleryToolbar onCopy={handleCopy} onDownload={handleDownload} onOpenPreview={handleOpenPreview} />}diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/heading/Heading.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/heading/Heading.tsxindex 2aa530ad07..2e0577b84b 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/heading/Heading.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/heading/Heading.tsx@@ -1,4 +1,4 @@-import { HEADER_HEIGHT } from '@/components/publish/header';+import { HEADER_HEIGHT } from '@/application/constants';import { getHeadingCssProperty } from './utils';import { EditorElementProps, HeadingNode } from '@/components/editor/editor.type';import React, { forwardRef, memo } from 'react';@@ -24,7 +24,7 @@ export const Heading = memo({children}</div>);- })+ }),);export default Heading;diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageBlock.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageBlock.tsxindex e0ff9218d1..58328241ac 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageBlock.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageBlock.tsx@@ -1,4 +1,4 @@-import { AlignType } from '@/application/collab.type';+import { AlignType } from '@/application/types';import { EditorElementProps, ImageBlockNode } from '@/components/editor/editor.type';import React, { forwardRef, memo, useCallback, useMemo, useRef, useState } from 'react';import { ReactEditor, useSelected, useSlateStatic } from 'slate-react';@@ -6,7 +6,12 @@ import ImageEmpty from './ImageEmpty';import ImageRender from './ImageRender';export const ImageBlock = memo(- forwardRef<HTMLDivElement, EditorElementProps<ImageBlockNode>>(({ node, children, className, ...attributes }, ref) => {+ forwardRef<HTMLDivElement, EditorElementProps<ImageBlockNode>>(({+ node,+ children,+ className,+ ...attributes+ }, ref) => {const selected = useSelected();const { url, align } = useMemo(() => node.data || {}, [node.data]);const containerRef = useRef<HTMLDivElement>(null);@@ -39,7 +44,10 @@ export const ImageBlock = memo(<div ref={ref} className={'absolute left-0 top-0 h-full w-full select-none caret-transparent'}>{children}</div>- <div contentEditable={false} className={`flex w-full select-none ${url ? '' : 'rounded border'} ${alignCss}`}>+ <div+ contentEditable={false}+ className={`flex w-full select-none overflow-hidden ${url ? '' : 'rounded-[8px] border border-line-divider'} ${alignCss}`}+ >{url ? (<ImageRender showToolbar={showToolbar} selected={selected} node={node} />) : (@@ -48,7 +56,7 @@ export const ImageBlock = memo(</div></div>);- })+ }),);export default ImageBlock;diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageEmpty.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageEmpty.tsxindex e528dd4daa..187c5615b4 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageEmpty.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/image/ImageEmpty.tsx@@ -1,9 +1,9 @@import { ImageBlockNode } from '@/components/editor/editor.type';import React from 'react';-import { ReactComponent as ImageIcon } from '$icons/16x/image.svg';+import { ReactComponent as ImageIcon } from '@/assets/image.svg';import { useTranslation } from 'react-i18next';-function ImageEmpty(_: { containerRef: React.RefObject<HTMLDivElement>; onEscape: () => void; node: ImageBlockNode }) {+function ImageEmpty (_: { containerRef: React.RefObject<HTMLDivElement>; onEscape: () => void; node: ImageBlockNode }) {const { t } = useTranslation();return (diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/math-equation/MathEquation.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/math-equation/MathEquation.tsxindex 7a11ef8814..e30b446489 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/math-equation/MathEquation.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/math-equation/MathEquation.tsx@@ -17,7 +17,7 @@ export const MathEquation = memo(const newClassName = useMemo(() => {const classList = [className,- 'math-equation-block relative w-full container-bg w-full py-1 select-none rounded',+ 'math-equation-block relative w-full container-bg w-full py-1 overflow-hidden select-none rounded-[8px]',];if (formula) {@@ -45,7 +45,7 @@ export const MathEquation = memo() : (<divclassName={- 'flex h-[48px] w-full items-center gap-[10px] rounded border border-line-divider bg-fill-list-active px-4 text-text-caption'+ 'flex h-[48px] w-full items-center gap-[10px] rounded-[8px] border border-line-divider bg-fill-list-active px-4 text-text-caption'}><MathSvg className={'h-4 w-4'} />@@ -71,9 +71,9 @@ export const MathEquation = memo(</div></>);- }+ },),- (prevProps, nextProps) => JSON.stringify(prevProps.node) === JSON.stringify(nextProps.node)+ (prevProps, nextProps) => JSON.stringify(prevProps.node) === JSON.stringify(nextProps.node),);export default MathEquation;diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/outline/utils.ts b/frontend/appflowy_web_app/src/components/editor/components/blocks/outline/utils.tsindex 57105fef5a..f24f5d8a30 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/outline/utils.ts+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/outline/utils.ts@@ -1,14 +1,14 @@-import { BlockType } from '@/application/collab.type';-import { CustomEditor } from '@/components/editor/command';+import { BlockType } from '@/application/types';+import { CustomEditor } from 'src/application/slate-yjs/command';import { HeadingNode } from '@/components/editor/editor.type';import { Element, Text } from 'slate';import { ReactEditor } from 'slate-react';-export function extractHeadings(editor: ReactEditor, maxDepth: number): HeadingNode[] {+export function extractHeadings (editor: ReactEditor, maxDepth: number): HeadingNode[] {const headings: HeadingNode[] = [];const blocks = editor.children;- function traverse(children: (Element | Text)[]) {+ function traverse (children: (Element | Text)[]) {for (const block of children) {if (Text.isText(block)) continue;if (block.type === BlockType.HeadingBlock && (block as HeadingNode).data?.level <= maxDepth) {@@ -31,7 +31,7 @@ export function extractHeadings(editor: ReactEditor, maxDepth: number): HeadingNreturn traverse(blocks);}-export function nestHeadings(headings: HeadingNode[]): HeadingNode[] {+export function nestHeadings (headings: HeadingNode[]): HeadingNode[] {const root: HeadingNode[] = [];const stack: HeadingNode[] = [];diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/table/Table.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/table/Table.tsxindex fa551e7c52..60a44dae4a 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/table/Table.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/table/Table.tsx@@ -1,11 +1,11 @@import { EditorElementProps, TableCellNode, TableNode } from '@/components/editor/editor.type';+import { useEditorContext } from '@/components/editor/EditorContext';import { getScrollParent } from '@/components/global-comment/utils';import React, { forwardRef, memo, useEffect, useMemo, useRef, useCallback } from 'react';import { Grid } from '@atlaskit/primitives';import './table.scss';import isEqual from 'lodash-es/isEqual';import { ReactEditor, useSlateStatic } from 'slate-react';-import { useEditorContext } from '@/components/editor/EditorContext';const Table = memo(forwardRef<HTMLDivElement, EditorElementProps<TableNode>>(({ node, children, className, ...attributes }, ref) => {@@ -86,10 +86,9 @@ const Table = memo(}}><div- className={'h-full w-full overflow-x-auto overflow-y-hidden'}- style={{- paddingLeft: offsetLeftRef.current + 'px',- }}+ className={'h-full w-full overflow-x-auto overflow-y-hidden'} style={{+ paddingLeft: offsetLeftRef.current + 'px',+ }}><Gridid={`table-${node.blockId}`}@@ -105,7 +104,7 @@ const Table = memo(</div>);}),- (prevProps, nextProps) => isEqual(prevProps.node, nextProps.node)+ (prevProps, nextProps) => isEqual(prevProps.node, nextProps.node),);export default Table;diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/text/Placeholder.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/text/Placeholder.tsxindex 08a66de9d2..9ef9c7a274 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/text/Placeholder.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/text/Placeholder.tsx@@ -1,4 +1,4 @@-import { BlockType } from '@/application/collab.type';+import { BlockType } from '@/application/types';import { HeadingNode } from '@/components/editor/editor.type';import { useEditorContext } from '@/components/editor/EditorContext';import React, { CSSProperties, useEffect, useMemo, useState } from 'react';diff --git a/frontend/appflowy_web_app/src/components/editor/components/blocks/text/StartIcon.hooks.tsx b/frontend/appflowy_web_app/src/components/editor/components/blocks/text/StartIcon.hooks.tsxindex 2d11329153..03cbd68397 100644--- a/frontend/appflowy_web_app/src/components/editor/components/blocks/text/StartIcon.hooks.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/blocks/text/StartIcon.hooks.tsx@@ -1,4 +1,4 @@-import { BlockType } from '@/application/collab.type';+import { BlockType } from '@/application/types';import { BulletedListIcon } from '@/components/editor/components/blocks/bulleted-list';import { NumberListIcon } from '@/components/editor/components/blocks/numbered-list';import QuoteIcon from '@/components/editor/components/blocks/quote/QuoteIcon';diff --git a/frontend/appflowy_web_app/src/components/editor/components/element/Element.tsx b/frontend/appflowy_web_app/src/components/editor/components/element/Element.tsxindex e357b267ab..719285bbf8 100644--- a/frontend/appflowy_web_app/src/components/editor/components/element/Element.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/element/Element.tsx@@ -1,4 +1,4 @@-import { BlockData, BlockType, InlineBlockType, YjsEditorKey } from '@/application/collab.type';+import { BlockData, BlockType, InlineBlockType, YjsEditorKey } from '@/application/types';import { BulletedList } from '@/components/editor/components/blocks/bulleted-list';import { Callout } from '@/components/editor/components/blocks/callout';import { CodeBlock } from '@/components/editor/components/blocks/code';@@ -16,8 +16,10 @@ import { Paragraph } from '@/components/editor/components/blocks/paragraph';import { Quote } from '@/components/editor/components/blocks/quote';import { TableBlock, TableCellBlock } from '@/components/editor/components/blocks/table';import { Text } from '@/components/editor/components/blocks/text';+import { useEditorContext } from '@/components/editor/EditorContext';import { ElementFallbackRender } from '@/components/error/ElementFallbackRender';import { ErrorBoundary } from 'react-error-boundary';+import smoothScrollIntoViewIfNeeded from 'smooth-scroll-into-view-if-needed';import { TodoList } from 'src/components/editor/components/blocks/todo-list';import { ToggleList } from 'src/components/editor/components/blocks/toggle-list';import { UnSupportedBlock } from '@/components/editor/components/element/UnSupportedBlock';@@ -26,8 +28,8 @@ import { Mention } from '@/components/editor/components/leaf/mention';import { FileBlock } from '@/components/editor/components/blocks/file';import { EditorElementProps, TextNode } from '@/components/editor/editor.type';import { renderColor } from '@/utils/color';-import React, { FC, useMemo } from 'react';-import { RenderElementProps } from 'slate-react';+import React, { FC, useEffect, useMemo } from 'react';+import { ReactEditor, RenderElementProps, useSlateStatic } from 'slate-react';export const Element = ({element: node,@@ -36,6 +38,31 @@ export const Element = ({}: RenderElementProps & {element: EditorElementProps['node'];}) => {+ const {+ jumpBlockId,+ onJumpedBlockId,+ } = useEditorContext();++ const editor = useSlateStatic();++ useEffect(() => {+ if (!jumpBlockId) return;++ if (node.blockId !== jumpBlockId) {+ return;+ }++ const element = ReactEditor.toDOMNode(editor, node);++ void (async () => {+ await smoothScrollIntoViewIfNeeded(element, {+ behavior: 'smooth',+ scrollMode: 'if-needed',+ });+ onJumpedBlockId?.();+ })();++ }, [editor, jumpBlockId, node, onJumpedBlockId]);const Component = useMemo(() => {switch (node.type) {case BlockType.HeadingBlock:diff --git a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionLeaf.tsx b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionLeaf.tsxindex 360dc2a678..3f1f18b82c 100644--- a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionLeaf.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionLeaf.tsx@@ -1,4 +1,4 @@-import { Mention, MentionType } from '@/application/collab.type';+import { Mention, MentionType } from '@/application/types';import MentionDate from '@/components/editor/components/leaf/mention/MentionDate';import MentionPage from '@/components/editor/components/leaf/mention/MentionPage';import { useMemo } from 'react';diff --git a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsxindex 81bee6bf89..650adcd46b 100644--- a/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx+++ b/frontend/appflowy_web_app/src/components/editor/components/leaf/mention/MentionPage.tsx@@ -1,5 +1,4 @@-import { ViewLayout } from '@/application/collab.type';-import { ViewMeta } from '@/application/db/tables/view_metas';+import { ViewLayout, View } from '@/application/types';import { ViewIcon } from '@/components/_shared/view-icon';import { useEditorContext } from '@/components/editor/EditorContext';import { isFlagEmoji } from '@/utils/emoji';@@ -10,7 +9,7 @@ function MentionPage ({ pageId }: { pageId: string }) {const context = useEditorContext();const { navigateToView, loadViewMeta } = context;const [unPublished, setUnPublished] = useState(false);- const [meta, setMeta] = useState<ViewMeta | null>(null);+ const [meta, setMeta] = useState<View | null>(null);useEffect(() => {void (async () => {diff --git a/frontend/appflowy_web_app/src/components/editor/editor.type.ts b/frontend/appflowy_web_app/src/components/editor/editor.type.tsindex 6618e74600..3ed1228985 100644--- a/frontend/appflowy_web_app/src/components/editor/editor.type.ts+++ b/frontend/appflowy_web_app/src/components/editor/editor.type.ts@@ -18,7 +18,7 @@ import {BlockData,DatabaseNodeData,LinkPreviewBlockData, FileBlockData, GalleryBlockData,-} from '@/application/collab.type';+} from '@/application/types';import { HTMLAttributes } from 'react';import { Element } from 'slate';diff --git a/frontend/appflowy_web_app/src/components/editor/plugins/withInlineElement.ts b/frontend/appflowy_web_app/src/components/editor/plugins/withInlineElement.tsindex fbbd238f5f..cd4794db8b 100644--- a/frontend/appflowy_web_app/src/components/editor/plugins/withInlineElement.ts+++ b/frontend/appflowy_web_app/src/components/editor/plugins/withInlineElement.ts@@ -1,4 +1,4 @@-import { InlineBlockType } from '@/application/collab.type';+import { InlineBlockType } from '@/application/types';import { ReactEditor } from 'slate-react';import { Element } from 'slate';diff --git a/frontend/appflowy_web_app/src/components/editor/utils/list.ts b/frontend/appflowy_web_app/src/components/editor/utils/list.tsindex b5e34184b7..032974db51 100644--- a/frontend/appflowy_web_app/src/components/editor/utils/list.ts+++ b/frontend/appflowy_web_app/src/components/editor/utils/list.ts@@ -1,4 +1,4 @@-import { BlockType } from '@/application/collab.type';+import { BlockType } from '@/application/types';import { Element, NodeEntry, Path } from 'slate';import { ReactEditor } from 'slate-react';diff --git a/frontend/appflowy_web_app/src/components/error/NotFound.tsx b/frontend/appflowy_web_app/src/components/error/NotFound.tsxindex 95410cef98..0f536ebbe5 100644--- a/frontend/appflowy_web_app/src/components/error/NotFound.tsx+++ b/frontend/appflowy_web_app/src/components/error/NotFound.tsx@@ -1,23 +1,20 @@import React from 'react';import { Typography, Button } from '@mui/material';import { useTranslation } from 'react-i18next';-import { Link } from 'react-router-dom';-import { ReactComponent as Logo } from '@/assets/logo.svg';+import { Link, useNavigate } from 'react-router-dom';import { ReactComponent as AppflowyLogo } from '@/assets/appflowy.svg';const NotFound = () => {const { t } = useTranslation();+ const navigate = useNavigate();return (<div className={'m-0 flex h-screen w-screen items-center justify-center bg-bg-body p-0'}><div className={'flex flex-col items-center gap-1 text-center'}>- <Typography variant='h3' className={'mb-[27px] flex items-center gap-4 text-text-title'} gutterBottom>- <>- <Logo className={'w-9'} />- <AppflowyLogo className={'w-32'} />- </>+ <Typography variant="h3" className={'mb-[27px] flex items-center gap-4 text-text-title'} gutterBottom>+ <AppflowyLogo className={'w-32'} /></Typography>- <div className={'mb-[16px] text-[52px] font-semibold leading-[128%] text-text-title'}>+ <div className={'mb-[16px] text-[52px] font-semibold leading-[128%] text-text-title max-sm:text-[24px]'}>{t('publish.noAccessToVisit')}</div><div className={'text-[20px] leading-[152%]'}>@@ -27,17 +24,27 @@ const NotFound = () => {<div>{t('publish.tryItNow')}</div></div></div>- <Button- component={Link}- to='https://appflowy.io/download'- variant='contained'- color='primary'- className={- 'mt-[32px] mb-[48px] h-[68px] rounded-[20px] px-[44px] py-[18px] text-[20px] font-medium leading-[120%] text-content-on-fill'- }- >- {t('publish.downloadApp')}- </Button>+ <div className={'flex items-center px-2 max-sm:flex-col mt-4 w-full gap-4 justify-between'}>+ <Button+ component={Link}+ to="https://appflowy.io/download"+ variant="contained"+ color="primary"+ className={'flex-1 py-3 px-4 max-sm:w-full rounded-[8px] max-md:text-base text-[20px] font-medium'}+ >+ {t('publish.downloadApp')}+ </Button>+ <Button+ onClick={() => {+ navigate('/');+ }}+ className={'flex-1 py-3 px-4 max-sm:w-full rounded-[8px] max-md:text-base text-[20px] font-medium'}+ variant={'outlined'} color={'inherit'}+ >+ {t('requestAccess.backToHome')}+ </Button>+ </div>+</div></div>);diff --git a/frontend/appflowy_web_app/src/components/error/RecordNotFound.tsx b/frontend/appflowy_web_app/src/components/error/RecordNotFound.tsxnew file mode 100644index 0000000000..7aa5309cf1--- /dev/null+++ b/frontend/appflowy_web_app/src/components/error/RecordNotFound.tsx@@ -0,0 +1,31 @@+import emptyImageSrc from '@/assets/images/empty.png';+import React from 'react';+import { ReactComponent as WarningIcon } from '@/assets/warning.svg';++function RecordNotFound ({+ noContent,+}: {+ noContent?: boolean;+}) {+ return (+ <div className={'flex h-full w-full flex-col items-center justify-center'}>+ {!noContent && <>+ <div className={'text-2xl font-bold text-text-title opacity-70 flex items-center gap-4'}>+ <WarningIcon className={'w-12 h-12'} />+ RecordNotFound+ </div>+ <div className={'text-lg text-center text-text-title opacity-50 mt-4 whitespace-pre'}>+ {`We're sorry for inconvenience\n`}+ Submit an issue on our{' '}<a+ className={'underline text-fill-default'}+ href={'https://github.com/AppFlowy-IO/AppFlowy/issues/new?template=bug_report.yaml'}+ >Github</a>{' '}page that describes your error+ </div>+ </>}++ <img src={emptyImageSrc} alt={'AppFlowy'} />+ </div>+ );+}++export default RecordNotFound;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/error/SomethingError.tsx b/frontend/appflowy_web_app/src/components/error/SomethingError.tsxnew file mode 100644index 0000000000..04788fb124--- /dev/null+++ b/frontend/appflowy_web_app/src/components/error/SomethingError.tsx@@ -0,0 +1,28 @@+import emptyImageSrc from '@/assets/images/empty.png';+import { Alert } from '@mui/material';+import React from 'react';+import { ReactComponent as WarningIcon } from '@/assets/close_error.svg';++function SomethingError ({ error }: { error: Error }) {+ return (+ <div className={'flex h-full w-full flex-col items-center justify-center'}>+ <div+ className={'text-2xl font-bold text-text-title opacity-70 flex items-center gap-4'}+ >+ <WarningIcon className={'w-12 h-12'} />+ SomethingError+ </div>+ <Alert className={'max-w-[90%] px-6 whitespace-pre-wrap break-words '} severity={'error'}>{error.message}</Alert>+ <div className={'text-lg text-center text-text-title opacity-50 mt-4 whitespace-pre'}>+ {`We're sorry for inconvenience\n`}+ Submit an issue on our{' '}<a+ className={'underline text-fill-default'}+ href={'https://github.com/AppFlowy-IO/AppFlowy/issues/new?template=bug_report.yaml'}+ >Github</a>{' '}page that describes your error+ </div>+ <img src={emptyImageSrc} alt={'AppFlowy'} />+ </div>+ );+}++export default SomethingError;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.hooks.tsx b/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.hooks.tsxindex 9267af5dde..41cdefe208 100644--- a/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.hooks.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.hooks.tsx@@ -1,6 +1,6 @@import { CommentUser, GlobalComment, Reaction } from '@/application/comment.type';import { PublishContext } from '@/application/publish';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { stringAvatar } from '@/utils/color';import { isFlagEmoji } from '@/utils/emoji';import dayjs from 'dayjs';diff --git a/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.tsx b/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.tsxindex 25c6ebf5b3..c9ae90f1a6 100644--- a/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/GlobalComment.tsx@@ -14,7 +14,7 @@ function GlobalComment () {<div className={'mb-[480px] mt-16 flex h-fit w-full justify-center max-md:mb-[100px]'}><divclassName={- 'flex w-[964px] min-w-0 max-w-full max-xl:px-8 transform flex-col gap-2 transition-all duration-300 ease-in-out max-lg:px-6'+ 'flex w-[964px] min-w-0 max-w-full transform flex-col gap-2 transition-all duration-300 ease-in-out px-6'}><div className={'text-[24px]'}>{t('globalComment.comments')}</div>diff --git a/frontend/appflowy_web_app/src/components/global-comment/actions/MoreActions.tsx b/frontend/appflowy_web_app/src/components/global-comment/actions/MoreActions.tsxindex 711148f4b7..249df3dccb 100644--- a/frontend/appflowy_web_app/src/components/global-comment/actions/MoreActions.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/actions/MoreActions.tsx@@ -3,7 +3,7 @@ import { PublishContext } from '@/application/publish';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';import { Popover } from '@/components/_shared/popover';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { useGlobalCommentContext } from '@/components/global-comment/GlobalComment.hooks';import { Button, IconButton, Tooltip, TooltipProps } from '@mui/material';import React, { memo, useCallback, useContext, useMemo } from 'react';@@ -20,7 +20,7 @@ interface Item {tooltip?: TooltipProps;}-function MoreActions({ comment }: { comment: GlobalComment }) {+function MoreActions ({ comment }: { comment: GlobalComment }) {const { reload } = useGlobalCommentContext();const canDeleted = comment.canDeleted;@@ -61,9 +61,9 @@ function MoreActions({ comment }: { comment: GlobalComment }) {tooltip: canDeleted? undefined: {- title: <div className={'text-center'}>{t('globalComment.noAccessDeleteComment')}</div>,- placement: 'top',- },+ title: <div className={'text-center'}>{t('globalComment.noAccessDeleteComment')}</div>,+ placement: 'top',+ },onClick: () => {setDeleteModalOpen(true);},diff --git a/frontend/appflowy_web_app/src/components/global-comment/actions/ReactAction.tsx b/frontend/appflowy_web_app/src/components/global-comment/actions/ReactAction.tsxindex de2cdc62c1..578096534e 100644--- a/frontend/appflowy_web_app/src/components/global-comment/actions/ReactAction.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/actions/ReactAction.tsx@@ -3,14 +3,14 @@ import { EmojiPicker } from '@/components/_shared/emoji-picker';import { EMOJI_SIZE, PER_ROW_EMOJI_COUNT } from '@/components/_shared/emoji-picker/const';import { Popover } from '@/components/_shared/popover';import ComponentLoading from '@/components/_shared/progress/ComponentLoading';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { useGlobalCommentContext } from '@/components/global-comment/GlobalComment.hooks';import { ReactComponent as AddReactionRounded } from '@/assets/add_reaction.svg';import { IconButton, Tooltip } from '@mui/material';import React, { memo, Suspense, useCallback, useContext } from 'react';import { useTranslation } from 'react-i18next';-function ReactAction({ comment }: { comment: GlobalComment }) {+function ReactAction ({ comment }: { comment: GlobalComment }) {const { toggleReaction } = useGlobalCommentContext();const { t } = useTranslation();const isAuthenticated = useContext(AFConfigContext)?.isAuthenticated || false;@@ -37,13 +37,13 @@ function ReactAction({ comment }: { comment: GlobalComment }) {toggleReaction(comment.commentId, emoji);handleClose();},- [comment.commentId, handleClose, toggleReaction]+ [comment.commentId, handleClose, toggleReaction],);return (<><Tooltip title={t('globalComment.addReaction')}>- <IconButton ref={ref} onClick={handleOpen} size='small' className={'h-full'}>+ <IconButton ref={ref} onClick={handleOpen} size="small" className={'h-full'}><AddReactionRounded className={'h-5 w-5'} /></IconButton></Tooltip>diff --git a/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddComment.tsx b/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddComment.tsxindex 3fd9193692..ba2ae3a012 100644--- a/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddComment.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddComment.tsx@@ -1,6 +1,6 @@import { PublishContext } from '@/application/publish';import { notify } from '@/components/_shared/notify';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { useGlobalCommentContext } from '@/components/global-comment/GlobalComment.hooks';import ReplyComment from '@/components/global-comment/ReplyComment';@@ -19,7 +19,7 @@ interface AddCommentProps {fixed: boolean;}-function AddComment({ content, setContent, focus, setFocus, fixed }: AddCommentProps) {+function AddComment ({ content, setContent, focus, setFocus, fixed }: AddCommentProps) {const { reload, replyCommentId, replyComment: setReplyCommentId } = useGlobalCommentContext();const { t } = useTranslation();diff --git a/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddCommentWrapper.tsx b/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddCommentWrapper.tsxindex e6fcdcb2c8..08380d5905 100644--- a/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddCommentWrapper.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/add-comment/AddCommentWrapper.tsx@@ -1,6 +1,6 @@import { useGlobalCommentContext } from '@/components/global-comment/GlobalComment.hooks';import { getScrollParent } from '@/components/global-comment/utils';-import { HEADER_HEIGHT } from '@/components/publish/header';+import { HEADER_HEIGHT } from '@/application/constants';import React, { useEffect, useRef, useState } from 'react';import AddComment from './AddComment';import { Portal } from '@mui/material';@@ -72,12 +72,13 @@ export function AddCommentWrapper () {</div>{showFixedAddComment && (<Portal container={document.body}>- <div style={{- left: offsetLeft + 'px',- width: `calc(100% - ${offsetLeft}px)`,- }} className={'fixed top-[48px] flex w-full justify-center'}+ <div+ style={{+ left: offsetLeft + 'px',+ width: `calc(100% - ${offsetLeft}px)`,+ }} className={'fixed top-[48px] flex w-full justify-center'}>- <div className={'w-[964px] min-w-0 max-w-full max-xl:px-8 max-lg:px-6'}>+ <div className={'w-[964px] min-w-0 max-w-full px-6'}><AddComment fixed content={content} setContent={setContent} focus={focus} setFocus={setFocus} /></div></div>diff --git a/frontend/appflowy_web_app/src/components/global-comment/comment/CommentWrap.tsx b/frontend/appflowy_web_app/src/components/global-comment/comment/CommentWrap.tsxindex b13ff4032f..22f2639f6b 100644--- a/frontend/appflowy_web_app/src/components/global-comment/comment/CommentWrap.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/comment/CommentWrap.tsx@@ -1,4 +1,4 @@-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import CommentActions from '@/components/global-comment/actions/CommentActions';import Comment from './Comment';import { useGlobalCommentContext } from '@/components/global-comment/GlobalComment.hooks';@@ -13,7 +13,7 @@ export interface CommentWrapProps {isHighLight: boolean;}-export function CommentWrap({ commentId, isHighLight, isHovered, onHovered }: CommentWrapProps) {+export function CommentWrap ({ commentId, isHighLight, isHovered, onHovered }: CommentWrapProps) {const { getComment, setHighLightCommentId } = useGlobalCommentContext();const comment = useMemo(() => getComment(commentId), [commentId, getComment]);const ref = React.useRef<HTMLDivElement>(null);diff --git a/frontend/appflowy_web_app/src/components/global-comment/reactions/Reaction.tsx b/frontend/appflowy_web_app/src/components/global-comment/reactions/Reaction.tsxindex 2a053d2ed7..d5bcf4e0d2 100644--- a/frontend/appflowy_web_app/src/components/global-comment/reactions/Reaction.tsx+++ b/frontend/appflowy_web_app/src/components/global-comment/reactions/Reaction.tsx@@ -1,12 +1,12 @@import { Reaction as ReactionType } from '@/application/comment.type';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { isFlagEmoji } from '@/utils/emoji';import { getPlatform } from '@/utils/platform';import { Tooltip } from '@mui/material';import React, { memo, useContext, useMemo } from 'react';import { useTranslation } from 'react-i18next';-function Reaction({ reaction, onClick }: { reaction: ReactionType; onClick: (reaction: ReactionType) => void }) {+function Reaction ({ reaction, onClick }: { reaction: ReactionType; onClick: (reaction: ReactionType) => void }) {const { t } = useTranslation();const isAuthenticated = useContext(AFConfigContext)?.isAuthenticated;const openLoginModal = useContext(AFConfigContext)?.openLoginModal;diff --git a/frontend/appflowy_web_app/src/components/login/LoginAuth.tsx b/frontend/appflowy_web_app/src/components/login/LoginAuth.tsxindex 5941ee4469..27c3d53bd1 100644--- a/frontend/appflowy_web_app/src/components/login/LoginAuth.tsx+++ b/frontend/appflowy_web_app/src/components/login/LoginAuth.tsx@@ -1,6 +1,6 @@import { getRedirectTo } from '@/application/session/sign_in';import { NormalModal } from '@/components/_shared/modal';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import LinearBuffer from '@/components/login/LinearBuffer';import React, { useContext, useEffect, useState } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/login/LoginProvider.tsx b/frontend/appflowy_web_app/src/components/login/LoginProvider.tsxindex 9afe131543..652dd2d72b 100644--- a/frontend/appflowy_web_app/src/components/login/LoginProvider.tsx+++ b/frontend/appflowy_web_app/src/components/login/LoginProvider.tsx@@ -1,5 +1,5 @@import { notify } from '@/components/_shared/notify';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { Button, Collapse, Divider } from '@mui/material';import React, { useCallback, useContext, useMemo } from 'react';import { useTranslation } from 'react-i18next';diff --git a/frontend/appflowy_web_app/src/components/login/MagicLink.tsx b/frontend/appflowy_web_app/src/components/login/MagicLink.tsxindex 8f6594115c..dc9f24fbca 100644--- a/frontend/appflowy_web_app/src/components/login/MagicLink.tsx+++ b/frontend/appflowy_web_app/src/components/login/MagicLink.tsx@@ -1,11 +1,11 @@import { notify } from '@/components/_shared/notify';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { Button, CircularProgress, OutlinedInput } from '@mui/material';import React, { useContext } from 'react';import { useTranslation } from 'react-i18next';import isEmail from 'validator/lib/isEmail';-function MagicLink({ redirectTo }: { redirectTo: string }) {+function MagicLink ({ redirectTo }: { redirectTo: string }) {const { t } = useTranslation();const [email, setEmail] = React.useState<string>('');const [loading, setLoading] = React.useState<boolean>(false);diff --git a/frontend/appflowy_web_app/src/components/main/App.tsx b/frontend/appflowy_web_app/src/components/main/App.tsxnew file mode 100644index 0000000000..b5654e66ec--- /dev/null+++ b/frontend/appflowy_web_app/src/components/main/App.tsx@@ -0,0 +1,49 @@+import { AUTH_CALLBACK_PATH } from '@/application/session/sign_in';+import NotFound from '@/components/error/NotFound';+import LoginAuth from '@/components/login/LoginAuth';+import PublishPage from '@/pages/PublishPage';+import { lazy, Suspense } from 'react';+import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';+import withAppWrapper from '@/components/main/withAppWrapper';++const LoginPage = lazy(() => import('@/pages/LoginPage'));+const AppRouter = lazy(() => import('@/components/app/AppRouter'));+const AsTemplatePage = lazy(() => import('@/pages/AsTemplatePage'));+const AcceptInvitationPage = lazy(() => import('@/pages/AcceptInvitationPage'));+const AfterPaymentPage = lazy(() => import('@/pages/AfterPaymentPage'));++import '@/styles/app.scss';++const AppMain = withAppWrapper(() => {+ return (+ <Routes>+ <Route path={'/:namespace/:publishName'} element={<PublishPage />} />+ <Route path={'/login'} element={<Suspense><LoginPage /></Suspense>} />+ <Route path={AUTH_CALLBACK_PATH} element={<LoginAuth />} />+ <Route path="/404" element={<NotFound />} />+ <Route path="/after-payment" element={<Suspense><AfterPaymentPage /></Suspense>} />+ <Route path="/as-template" element={<Suspense><AsTemplatePage /></Suspense>} />+ <Route path="/accept-invitation" element={<Suspense><AcceptInvitationPage /></Suspense>} />+ <Route path="/" element={<Navigate to="/app" replace />} />+ <Route+ path="/app/*"+ element={+ <Suspense>+ <AppRouter />+ </Suspense>+ }+ />+ <Route path="*" element={<NotFound />} />+ </Routes>+ );+});++function App () {+ return (+ <BrowserRouter>+ <AppMain />+ </BrowserRouter>+ );+}++export default App;diff --git a/frontend/appflowy_web_app/src/components/app/AppConfig.tsx b/frontend/appflowy_web_app/src/components/main/AppConfig.tsxsimilarity index 74%rename from frontend/appflowy_web_app/src/components/app/AppConfig.tsxrename to frontend/appflowy_web_app/src/components/main/AppConfig.tsxindex 952ebdb68b..b87ede6988 100644--- a/frontend/appflowy_web_app/src/components/app/AppConfig.tsx+++ b/frontend/appflowy_web_app/src/components/main/AppConfig.tsx@@ -1,22 +1,33 @@-import { clearData } from '@/application/db';+import { clearData, db } from '@/application/db';import { getService } from '@/application/services';-import { AFService, AFServiceConfig } from '@/application/services/services.type';+import { AFServiceConfig } from '@/application/services/services.type';import { EventType, on } from '@/application/session';-import { isTokenValid } from '@/application/session/token';-import { User } from '@/application/types';+import { getTokenParsed, isTokenValid } from '@/application/session/token';import { InfoSnackbarProps } from '@/components/_shared/notify';-import { AFConfigContext, defaultConfig } from '@/components/app/app.hooks';-import { useAppLanguage } from '@/components/app/useAppLanguage';+import { AFConfigContext, defaultConfig } from '@/components/main/app.hooks';+import { useAppLanguage } from '@/components/main/useAppLanguage';import { LoginModal } from '@/components/login';import { createHotkey, HOT_KEY_NAME } from '@/utils/hotkeys';+import { useLiveQuery } from 'dexie-react-hooks';import { useSnackbar } from 'notistack';-import React, { useCallback, useEffect, useState } from 'react';+import React, { Suspense, useCallback, useEffect, useMemo, useState } from 'react';function AppConfig ({ children }: { children: React.ReactNode }) {const [appConfig] = useState<AFServiceConfig>(defaultConfig);- const [service, setService] = useState<AFService>();+ const service = useMemo(() => getService(appConfig), [appConfig]);const [isAuthenticated, setIsAuthenticated] = React.useState<boolean>(isTokenValid());- const [currentUser, setCurrentUser] = React.useState<User>();++ const userId = useMemo(() => {+ if (!isAuthenticated) return;+ return getTokenParsed()?.user?.id;+ }, [isAuthenticated]);++ const currentUser = useLiveQuery(+ async () => {+ if (!userId) return;+ return db.users.get(userId);+ }, [userId],+ );const [loginOpen, setLoginOpen] = React.useState(false);const [loginCompletedRedirectTo, setLoginCompletedRedirectTo] = React.useState<string>('');@@ -33,16 +44,14 @@ function AppConfig ({ children }: { children: React.ReactNode }) {useEffect(() => {if (!isAuthenticated) {- setCurrentUser(undefined);return;}void (async () => {if (!service) return;try {- const user = await service.getCurrentUser();+ await service.getCurrentUser();- setCurrentUser(user);} catch (e) {console.error(e);}@@ -66,13 +75,6 @@ function AppConfig ({ children }: { children: React.ReactNode }) {}, []);useAppLanguage();- useEffect(() => {- void (async () => {- if (!appConfig) return;- setService(await getService(appConfig));- })();- }, [appConfig]);-const { enqueueSnackbar, closeSnackbar } = useSnackbar();useEffect(() => {@@ -133,13 +135,16 @@ function AppConfig ({ children }: { children: React.ReactNode }) {>{children}{loginOpen && (- <LoginModal- redirectTo={loginCompletedRedirectTo}- open={loginOpen}- onClose={() => {- setLoginOpen(false);- }}- />+ <Suspense>+ <LoginModal+ redirectTo={loginCompletedRedirectTo}+ open={loginOpen}+ onClose={() => {+ setLoginOpen(false);+ }}+ />+ </Suspense>+)}</AFConfigContext.Provider>);diff --git a/frontend/appflowy_web_app/src/components/app/AppTheme.tsx b/frontend/appflowy_web_app/src/components/main/AppTheme.tsxsimilarity index 94%rename from frontend/appflowy_web_app/src/components/app/AppTheme.tsxrename to frontend/appflowy_web_app/src/components/main/AppTheme.tsxindex 4f2163cb6f..98ef60f0af 100644--- a/frontend/appflowy_web_app/src/components/app/AppTheme.tsx+++ b/frontend/appflowy_web_app/src/components/main/AppTheme.tsx@@ -1,4 +1,4 @@-import { ThemeModeContext, useAppThemeMode } from '@/components/app/useAppThemeMode';+import { ThemeModeContext, useAppThemeMode } from '@/components/main/useAppThemeMode';import React, { useMemo } from 'react';import createTheme from '@mui/material/styles/createTheme';import ThemeProvider from '@mui/material/styles/ThemeProvider';@@ -21,6 +21,17 @@ function AppTheme ({ children }: { children: React.ReactNode; }) {},},components: {+ MuiOutlinedInput: {+ styleOverrides: {+ root: {+ borderColor: 'var(--line-divider)',+ },+ notchedOutline: {+ borderColor: 'var(--line-divider)',+ },++ },+ },MuiMenuItem: {defaultProps: {sx: {diff --git a/frontend/appflowy_web_app/src/components/app/app.hooks.ts b/frontend/appflowy_web_app/src/components/main/app.hooks.tssimilarity index 99%rename from frontend/appflowy_web_app/src/components/app/app.hooks.tsrename to frontend/appflowy_web_app/src/components/main/app.hooks.tsindex 9653b82d00..48c7e9b8db 100644--- a/frontend/appflowy_web_app/src/components/app/app.hooks.ts+++ b/frontend/appflowy_web_app/src/components/main/app.hooks.ts@@ -1,5 +1,5 @@-import { AFService, AFServiceConfig } from '@/application/services/services.type';import { User } from '@/application/types';+import { AFService, AFServiceConfig } from '@/application/services/services.type';import { createContext, useContext } from 'react';const baseURL = import.meta.env.AF_BASE_URL || 'https://test.appflowy.cloud';diff --git a/frontend/appflowy_web_app/src/components/app/useAppLanguage.ts b/frontend/appflowy_web_app/src/components/main/useAppLanguage.tssimilarity index 100%rename from frontend/appflowy_web_app/src/components/app/useAppLanguage.tsrename to frontend/appflowy_web_app/src/components/main/useAppLanguage.tsdiff --git a/frontend/appflowy_web_app/src/components/app/useAppThemeMode.ts b/frontend/appflowy_web_app/src/components/main/useAppThemeMode.tssimilarity index 100%rename from frontend/appflowy_web_app/src/components/app/useAppThemeMode.tsrename to frontend/appflowy_web_app/src/components/main/useAppThemeMode.tsdiff --git a/frontend/appflowy_web_app/src/components/app/withAppWrapper.tsx b/frontend/appflowy_web_app/src/components/main/withAppWrapper.tsxsimilarity index 78%rename from frontend/appflowy_web_app/src/components/app/withAppWrapper.tsxrename to frontend/appflowy_web_app/src/components/main/withAppWrapper.tsxindex 8aa93ee5eb..282436c90c 100644--- a/frontend/appflowy_web_app/src/components/app/withAppWrapper.tsx+++ b/frontend/appflowy_web_app/src/components/main/withAppWrapper.tsx@@ -1,7 +1,8 @@+import CustomSnackbar from '@/components/_shared/notify/CustomSnackbar';import { ErrorBoundary } from 'react-error-boundary';import { ErrorHandlerPage } from 'src/components/error/ErrorHandlerPage';-import AppTheme from '@/components/app/AppTheme';-import AppConfig from '@/components/app/AppConfig';+import AppTheme from '@/components/main/AppTheme';+import AppConfig from '@/components/main/AppConfig';import { Suspense } from 'react';import { SnackbarProvider } from 'notistack';import { styled } from '@mui/material';@@ -31,6 +32,10 @@ export default function withAppWrapper (Component: React.FC): React.FC {preventDuplicateComponents={{info: InfoSnackbar,+ success: CustomSnackbar,+ error: CustomSnackbar,+ warning: CustomSnackbar,+ default: CustomSnackbar,}}><AppConfig>diff --git a/frontend/appflowy_web_app/src/components/publish/CollabView.tsx b/frontend/appflowy_web_app/src/components/publish/CollabView.tsxindex c0b46be709..997bde4a56 100644--- a/frontend/appflowy_web_app/src/components/publish/CollabView.tsx+++ b/frontend/appflowy_web_app/src/components/publish/CollabView.tsx@@ -1,13 +1,24 @@-import { GetViewRowsMap, LoadView, LoadViewMeta, ViewLayout, YDoc } from '@/application/collab.type';+import {+ AppendBreadcrumb,+ CreateRowDoc,+ LoadView,+ LoadViewMeta,+ ViewLayout,+ YDoc,+} from '@/application/types';import { usePublishContext } from '@/application/publish';-import ViewHelmet from '@/components/_shared/helmet/ViewHelmet';-import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+import CalendarSkeleton from '@/components/_shared/skeleton/CalendarSkeleton';+import DocumentSkeleton from '@/components/_shared/skeleton/DocumentSkeleton';+import GridSkeleton from '@/components/_shared/skeleton/GridSkeleton';+import KanbanSkeleton from '@/components/_shared/skeleton/KanbanSkeleton';import { Document } from '@/components/document';import DatabaseView from '@/components/publish/DatabaseView';import { useViewMeta } from '@/components/publish/useViewMeta';-import React, { useMemo } from 'react';+import React, { useMemo, Suspense } from 'react';import { ViewMetaProps } from '@/components/view-meta';+const ViewHelmet = React.lazy(() => import('@/components/_shared/helmet/ViewHelmet'));+export interface CollabViewProps {doc?: YDoc;}@@ -30,17 +41,23 @@ function CollabView ({ doc }: CollabViewProps) {doc: YDoc;navigateToView?: (viewId: string) => Promise<void>;loadViewMeta?: LoadViewMeta;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;loadView?: LoadView;viewMeta: ViewMetaProps;isTemplateThumb?: boolean;+ appendBreadcrumb?: AppendBreadcrumb;+ variant?: 'publish' | 'app';+ onRendered?: () => void;}>;const navigateToView = usePublishContext()?.toView;const loadViewMeta = usePublishContext()?.loadViewMeta;- const getViewRowsMap = usePublishContext()?.getViewRowsMap;+ const createRowDoc = usePublishContext()?.createRowDoc;const loadView = usePublishContext()?.loadView;const isTemplateThumb = usePublishContext()?.isTemplateThumb;+ const appendBreadcrumb = usePublishContext()?.appendBreadcrumb;+ const onRendered = usePublishContext()?.onRendered;+ const rendered = usePublishContext()?.rendered;const className = useMemo(() => {const classList = ['relative w-full flex-1'];@@ -56,13 +73,32 @@ function CollabView ({ doc }: CollabViewProps) {return classList.join(' ');}, [isTemplateThumb, layout, layoutClassName]);- if (!doc || !View) {- return <ComponentLoading />;+ const skeleton = useMemo(() => {+ switch (layout) {+ case ViewLayout.Grid:+ return <GridSkeleton />;+ case ViewLayout.Board:+ return <KanbanSkeleton />;+ case ViewLayout.Calendar:+ return <CalendarSkeleton />;+ case ViewLayout.Document:+ return <DocumentSkeleton />;+ default:+ return null;+ }+ }, [layout]);++ if (!View) return null;++ if (!doc) {+ return skeleton;}return (<>- <ViewHelmet icon={icon} name={name} />+ {rendered && <Suspense>+ <ViewHelmet icon={icon} name={name} />+ </Suspense>}<divstyle={style}@@ -71,10 +107,13 @@ function CollabView ({ doc }: CollabViewProps) {<Viewdoc={doc}loadViewMeta={loadViewMeta}- getViewRowsMap={getViewRowsMap}+ createRowDoc={createRowDoc}navigateToView={navigateToView}loadView={loadView}isTemplateThumb={isTemplateThumb}+ appendBreadcrumb={appendBreadcrumb}+ variant={'publish'}+ onRendered={onRendered}viewMeta={{icon,cover,diff --git a/frontend/appflowy_web_app/src/components/publish/DatabaseView.tsx b/frontend/appflowy_web_app/src/components/publish/DatabaseView.tsxindex 28d2025a28..131660978e 100644--- a/frontend/appflowy_web_app/src/components/publish/DatabaseView.tsx+++ b/frontend/appflowy_web_app/src/components/publish/DatabaseView.tsx@@ -1,6 +1,19 @@-import { GetViewRowsMap, LoadView, LoadViewMeta, YDoc } from '@/application/collab.type';import { usePublishContext } from '@/application/publish';+import {+ AppendBreadcrumb,+ CreateRowDoc,+ LoadView,+ LoadViewMeta,+ ViewLayout,+ YDatabase,+ YDoc,+ YjsEditorKey,+} from '@/application/types';import ComponentLoading from '@/components/_shared/progress/ComponentLoading';+import CalendarSkeleton from '@/components/_shared/skeleton/CalendarSkeleton';+import DocumentSkeleton from '@/components/_shared/skeleton/DocumentSkeleton';+import GridSkeleton from '@/components/_shared/skeleton/GridSkeleton';+import KanbanSkeleton from '@/components/_shared/skeleton/KanbanSkeleton';import { Database } from '@/components/database';import DatabaseHeader from '@/components/database/components/header/DatabaseHeader';import { ViewMetaProps } from '@/components/view-meta';@@ -9,11 +22,13 @@ import { useSearchParams } from 'react-router-dom';export interface DatabaseProps {doc: YDoc;- getViewRowsMap?: GetViewRowsMap;+ createRowDoc?: CreateRowDoc;loadView?: LoadView;navigateToView?: (viewId: string) => Promise<void>;loadViewMeta?: LoadViewMeta;viewMeta: ViewMetaProps;+ appendBreadcrumb?: AppendBreadcrumb;+ onRendered?: () => void;}function DatabaseView ({ viewMeta, ...props }: DatabaseProps) {@@ -47,8 +62,27 @@ function DatabaseView ({ viewMeta, ...props }: DatabaseProps) {);const rowId = search.get('r') || undefined;+ const doc = props.doc;+ const database = doc?.getMap(YjsEditorKey.data_section)?.get(YjsEditorKey.database) as YDatabase;- if (!viewId) return null;+ const skeleton = useMemo(() => {+ if (rowId) {+ return <DocumentSkeleton />;+ }++ switch (viewMeta.layout) {+ case ViewLayout.Grid:+ return <GridSkeleton includeTitle={false} />;+ case ViewLayout.Board:+ return <KanbanSkeleton includeTitle={false} />;+ case ViewLayout.Calendar:+ return <CalendarSkeleton includeTitle={false} />;+ default:+ return <ComponentLoading />;+ }+ }, [rowId, viewMeta.layout]);++ if (!viewId || !database) return null;return (<div@@ -56,10 +90,11 @@ function DatabaseView ({ viewMeta, ...props }: DatabaseProps) {minHeight: 'calc(100vh - 48px)',maxWidth: isTemplateThumb ? '964px' : undefined,}}- className={'relative flex h-full w-full flex-col px-16 max-xl:px-8 max-lg:px-6'}+ className={'relative flex h-full w-full flex-col px-6'}>- <DatabaseHeader {...viewMeta} />- <Suspense fallback={<ComponentLoading />}>+ {rowId ? null : <DatabaseHeader {...viewMeta} />}++ <Suspense fallback={skeleton}><DatabaseiidName={viewMeta.name || ''}iidIndex={iidIndex || ''}@@ -68,6 +103,7 @@ function DatabaseView ({ viewMeta, ...props }: DatabaseProps) {rowId={rowId}visibleViewIds={visibleViewIds}onChangeView={handleChangeView}+ hideConditions={true}onOpenRow={handleNavigateToRow}/></Suspense>diff --git a/frontend/appflowy_web_app/src/components/publish/PublishView.tsx b/frontend/appflowy_web_app/src/components/publish/PublishView.tsxindex 84c06aa71f..4bbee0bad7 100644--- a/frontend/appflowy_web_app/src/components/publish/PublishView.tsx+++ b/frontend/appflowy_web_app/src/components/publish/PublishView.tsx@@ -1,13 +1,13 @@-import { YDoc } from '@/application/collab.type';+import { YDoc } from '@/application/types';import { PublishProvider } from '@/application/publish';+import { useOutlineDrawer } from '@/components/_shared/outline/outline.hooks';import ComponentLoading from '@/components/_shared/progress/ComponentLoading';import { AFScroller } from '@/components/_shared/scroller';-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { GlobalCommentProvider } from '@/components/global-comment';import CollabView from '@/components/publish/CollabView';-import { OutlineDrawer } from '@/components/publish/outline';-import { getPlatform } from '@/utils/platform';-import React, { Suspense, useCallback, useContext, useEffect, useMemo, useState } from 'react';+import SideBar from '@/components/publish/SideBar';+import React, { Suspense, useCallback, useContext, useEffect, useState } from 'react';import { PublishViewHeader } from '@/components/publish/header';import NotFound from '@/components/error/NotFound';import { useSearchParams } from 'react-router-dom';@@ -17,8 +17,6 @@ export interface PublishViewProps {publishName: string;}-const drawerWidth = 268;-export function PublishView ({ namespace, publishName }: PublishViewProps) {const [doc, setDoc] = useState<YDoc | undefined>();const [notFound, setNotFound] = useState<boolean>(false);@@ -42,46 +40,22 @@ export function PublishView ({ namespace, publishName }: PublishViewProps) {void openPublishView();}, [openPublishView]);- const [open, setOpen] = useState(() => {- return localStorage.getItem('publish_outline_open') === 'true';- });-const [search] = useSearchParams();const isTemplate = search.get('template') === 'true';const isTemplateThumb = isTemplate && search.get('thumbnail') === 'true';- useEffect(() => {- localStorage.setItem('publish_outline_open', open ? 'true' : 'false');- }, [open]);-useEffect(() => {if (!isTemplateThumb) return;document.documentElement.setAttribute('thumbnail', 'true');}, [isTemplateThumb]);- const drawerOpened = useMemo(() => open && !getPlatform().isMobile, [open]);- const siderWidth = drawerOpened ? drawerWidth : 0;-- useEffect(() => {- const onResize = () => {- const isMobile = getPlatform().isMobile;-- if (!isMobile && window.innerWidth - siderWidth < 640) {-- setOpen(false);- }-- };-- onResize();-- window.addEventListener('resize', onResize);-- return () => {- window.removeEventListener('resize', onResize);- };- }, [siderWidth]);+ const {+ drawerOpened,+ drawerWidth,+ setDrawerWidth,+ toggleOpenDrawer,+ } = useOutlineDrawer();if (notFound && !doc) {return <NotFound />;@@ -92,7 +66,8 @@ export function PublishView ({ namespace, publishName }: PublishViewProps) {isTemplateThumb={isTemplateThumb} isTemplate={isTemplate} namespace={namespace}publishName={publishName}>- <div className={'h-screen w-screen'} style={isTemplateThumb ? {+ <div+ className={'h-screen w-screen'} style={isTemplateThumb ? {pointerEvents: 'none',transform: 'scale(0.333)',transformOrigin: '0 0',@@ -113,11 +88,11 @@ export function PublishView ({ namespace, publishName }: PublishViewProps) {>{!isTemplate && <PublishViewHeaderonOpenDrawer={() => {- setOpen(true);+ toggleOpenDrawer(true);}}drawerWidth={drawerWidth}onCloseDrawer={() => {- setOpen(false);+ toggleOpenDrawer(false);}}openDrawer={drawerOpened}/>}@@ -131,7 +106,11 @@ export function PublishView ({ namespace, publishName }: PublishViewProps) {</AFScroller>{drawerOpened &&- <OutlineDrawer width={drawerWidth} open={drawerOpened} onClose={() => setOpen(false)} />}+ <SideBar+ onResizeDrawerWidth={setDrawerWidth} drawerWidth={drawerWidth} drawerOpened={drawerOpened}+ toggleOpenDrawer={toggleOpenDrawer}+ />+ }</div></PublishProvider>);diff --git a/frontend/appflowy_web_app/src/components/publish/SideBar.tsx b/frontend/appflowy_web_app/src/components/publish/SideBar.tsxnew file mode 100644index 0000000000..2798422033--- /dev/null+++ b/frontend/appflowy_web_app/src/components/publish/SideBar.tsx@@ -0,0 +1,39 @@+import { usePublishContext } from '@/application/publish';+import { UIVariant } from '@/application/types';+import { OutlineDrawer } from '@/components/_shared/outline';+import Outline from '@/components/_shared/outline/Outline';+import React from 'react';++interface SideBarProps {+ drawerWidth: number;+ drawerOpened: boolean;+ toggleOpenDrawer: (status: boolean) => void;+ onResizeDrawerWidth: (width: number) => void;+}++function SideBar ({+ drawerWidth, drawerOpened, toggleOpenDrawer,+ onResizeDrawerWidth,+}: SideBarProps) {+ const outline = usePublishContext()?.outline;++ const viewId = usePublishContext()?.viewMeta?.view_id;+ const navigateToView = usePublishContext()?.toView;++ return (+ <OutlineDrawer+ variant={'publish'}+ onResizeWidth={onResizeDrawerWidth} width={drawerWidth} open={drawerOpened}+ onClose={() => toggleOpenDrawer(false)}+ >+ <Outline+ variant={UIVariant.Publish}+ navigateToView={navigateToView}+ selectedViewId={viewId} width={drawerWidth}+ outline={outline}+ />+ </OutlineDrawer>+ );+}++export default SideBar;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/publish/header/PublishViewHeader.tsx b/frontend/appflowy_web_app/src/components/publish/header/PublishViewHeader.tsxindex 930375fa77..6e2d5abaa3 100644--- a/frontend/appflowy_web_app/src/components/publish/header/PublishViewHeader.tsx+++ b/frontend/appflowy_web_app/src/components/publish/header/PublishViewHeader.tsx@@ -1,23 +1,17 @@-import { PublishViewInfo } from '@/application/collab.type';+import { HEADER_HEIGHT } from '@/application/constants';import { usePublishContext } from '@/application/publish';-import { View } from '@/application/types';+import { UIVariant } from '@/application/types';+import { ReactComponent as SideOutlined } from '@/assets/side_outlined.svg';+import { Breadcrumb } from '@/components/_shared/breadcrumb';+import { OutlinePopover } from '@/components/_shared/outline';+import Outline from '@/components/_shared/outline/Outline';+import { useOutlinePopover } from '@/components/_shared/outline/outline.hooks';import BreadcrumbSkeleton from '@/components/_shared/skeleton/BreadcrumbSkeleton';-import { findAncestors, findView } from '@/components/publish/header/utils';-import { createHotkey, HOT_KEY_NAME } from '@/utils/hotkeys';-import { openOrDownload } from '@/utils/open_schema';import { getPlatform } from '@/utils/platform';-import { Divider, IconButton, Tooltip } from '@mui/material';-import { debounce } from 'lodash-es';-import React, { useCallback, useEffect, useMemo } from 'react';-import { OutlinePopover } from '@/components/publish/outline';-import { useTranslation } from 'react-i18next';-import Breadcrumb from './Breadcrumb';-import { ReactComponent as Logo } from '@/assets/logo.svg';-import MoreActions from './MoreActions';-import { ReactComponent as SideOutlined } from '@/assets/side_outlined.svg';-import { Duplicate } from './duplicate';+import { IconButton } from '@mui/material';+import React, { lazy, Suspense, useMemo } from 'react';-export const HEADER_HEIGHT = 48;+const RightMenu = lazy(() => import('@/components/publish/header/RightMenu'));export function PublishViewHeader ({drawerWidth, onOpenDrawer, openDrawer, onCloseDrawer,@@ -27,87 +21,21 @@ export function PublishViewHeader ({openDrawer: boolean;onCloseDrawer: () => void}) {- const { t } = useTranslation();const viewMeta = usePublishContext()?.viewMeta;const outline = usePublishContext()?.outline;- const crumbs = useMemo(() => {- if (!viewMeta || !outline) return [];- const ancestors = findAncestors(outline.children, viewMeta?.view_id);-- if (ancestors) return ancestors;- if (!viewMeta?.ancestor_views) return [];- const parseToView = (ancestor: PublishViewInfo): View => {- let extra = null;-- try {- extra = ancestor.extra ? JSON.parse(ancestor.extra) : null;- } catch (e) {- // do nothing- }-- return {- view_id: ancestor.view_id,- name: ancestor.name,- icon: ancestor.icon,- layout: ancestor.layout,- extra,- is_published: true,- children: [],- };- };-- const currentView = parseToView(viewMeta);-- return viewMeta?.ancestor_views.slice(1).map(item => findView(outline.children, item.view_id) || parseToView(item)) || [currentView];- }, [viewMeta, outline]);-- const [openPopover, setOpenPopover] = React.useState(false);+ const toView = usePublishContext()?.toView;+ const crumbs = usePublishContext()?.breadcrumbs;++ const {+ openPopover, debounceClosePopover, handleOpenPopover, debounceOpenPopover, handleClosePopover,+ } = useOutlinePopover({+ onOpenDrawer, openDrawer, onCloseDrawer,+ });const isMobile = useMemo(() => {return getPlatform().isMobile;}, []);-- const debounceClosePopover = useMemo(() => {- return debounce(() => {- setOpenPopover(false);- }, 200);- }, []);-- const onKeyDown = useCallback((e: KeyboardEvent) => {- switch (true) {- case createHotkey(HOT_KEY_NAME.TOGGLE_SIDEBAR)(e):- e.preventDefault();- if (openDrawer) {- onCloseDrawer();- } else {- onOpenDrawer();- }-- break;- default:- break;- }- }, [onCloseDrawer, onOpenDrawer, openDrawer]);-- useEffect(() => {- window.addEventListener('keydown', onKeyDown);- return () => {- window.removeEventListener('keydown', onKeyDown);- };- }, [onKeyDown]);-- const handleOpenPopover = useCallback(() => {- debounceClosePopover.cancel();- if (openDrawer) {- return;- }-- setOpenPopover(true);- }, [openDrawer, debounceClosePopover]);-- const debounceOpenPopover = useMemo(() => {- debounceClosePopover.cancel();- return debounce(handleOpenPopover, 100);- }, [handleOpenPopover, debounceClosePopover]);+ const viewId = viewMeta?.view_id;+ const rendered = usePublishContext()?.rendered;return (<div@@ -115,11 +43,13 @@ export function PublishViewHeader ({backdropFilter: 'saturate(180%) blur(16px)',background: 'var(--bg-header)',height: HEADER_HEIGHT,+ minHeight: HEADER_HEIGHT,}}className={'appflowy-top-bar transform-gpu sticky top-0 z-10 flex px-5'}><div className={'flex w-full items-center justify-between gap-4 overflow-hidden'}>{!openDrawer && !isMobile && (+<OutlinePopover{...{onMouseEnter: handleOpenPopover,@@ -128,13 +58,18 @@ export function PublishViewHeader ({open={openPopover}onClose={debounceClosePopover}drawerWidth={drawerWidth}+ content={<Outline+ variant={UIVariant.Publish} selectedViewId={viewId} navigateToView={toView} outline={outline}+ width={drawerWidth}+ />}+ variant={UIVariant.Publish}><IconButton{...{onMouseEnter: debounceOpenPopover,onMouseLeave: debounceClosePopover,onClick: () => {- setOpenPopover(false);+ handleClosePopover();onOpenDrawer();},}}@@ -147,23 +82,17 @@ export function PublishViewHeader ({<div className={'h-full flex-1 overflow-hidden'}>{!viewMeta ? <div className={'h-[48px] flex items-center'}><BreadcrumbSkeleton /></div> : <Breadcrumb- crumbs={crumbs}+ toView={toView}+ crumbs={crumbs || []}+ variant={UIVariant.Publish}/>}</div><div className={'flex items-center gap-2'}>- <MoreActions />- <Duplicate />- <Divider- orientation={'vertical'}- className={'mx-2'}- flexItem- />- <Tooltip title={t('publish.downloadApp')}>- <button onClick={() => openOrDownload()}>- <Logo className={'h-6 w-6'} />- </button>- </Tooltip>+ {rendered && <Suspense fallback={null}>+ <RightMenu />+ </Suspense>}+</div></div></div>diff --git a/frontend/appflowy_web_app/src/components/publish/header/RightMenu.tsx b/frontend/appflowy_web_app/src/components/publish/header/RightMenu.tsxnew file mode 100644index 0000000000..1418cea204--- /dev/null+++ b/frontend/appflowy_web_app/src/components/publish/header/RightMenu.tsx@@ -0,0 +1,31 @@+import MoreActions from '@/components/_shared/more-actions/MoreActions';+import { openOrDownload } from '@/utils/open_schema';+import { Divider, Tooltip } from '@mui/material';+import React from 'react';+import { ReactComponent as Logo } from '@/assets/logo.svg';+import { Duplicate } from '@/components/publish/header/duplicate';+import { useTranslation } from 'react-i18next';++function RightMenu () {+ const { t } = useTranslation();++ return (+ <>+ <MoreActions />+ <Duplicate />++ <Divider+ orientation={'vertical'}+ className={'mx-2'}+ flexItem+ />+ <Tooltip title={t('publish.downloadApp')}>+ <button onClick={() => openOrDownload()}>+ <Logo className={'h-6 w-6'} />+ </button>+ </Tooltip>+ </>+ );+}++export default RightMenu;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/publish/header/duplicate/DuplicateModal.tsx b/frontend/appflowy_web_app/src/components/publish/header/duplicate/DuplicateModal.tsxindex 41d8750e91..4c4193e8de 100644--- a/frontend/appflowy_web_app/src/components/publish/header/duplicate/DuplicateModal.tsx+++ b/frontend/appflowy_web_app/src/components/publish/header/duplicate/DuplicateModal.tsx@@ -1,4 +1,4 @@-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import React, { useCallback, useContext, useEffect } from 'react';import { useTranslation } from 'react-i18next';import { NormalModal } from '@/components/_shared/modal';@@ -7,17 +7,17 @@ import { useLoadWorkspaces } from '@/components/publish/header/duplicate/useDuplimport SpaceList from '@/components/publish/header/duplicate/SpaceList';import { downloadPage, openAppFlowySchema } from '@/utils/url';import { PublishContext } from '@/application/publish';-import { CollabType, ViewLayout } from '@/application/collab.type';+import { Types, ViewLayout } from '@/application/types';import { notify } from '@/components/_shared/notify';function getCollabTypeFromViewLayout (layout: ViewLayout) {switch (layout) {case ViewLayout.Document:- return CollabType.Document;+ return Types.Document;case ViewLayout.Grid:case ViewLayout.Board:case ViewLayout.Calendar:- return CollabType.Database;+ return Types.Database;default:return null;}@@ -43,7 +43,7 @@ function DuplicateModal ({ open, onClose }: { open: boolean; onClose: () => voidloadWorkspaces,loadSpaces,} = useLoadWorkspaces();-+useEffect(() => {if (open) {void loadWorkspaces();diff --git a/frontend/appflowy_web_app/src/components/publish/header/duplicate/SelectWorkspace.tsx b/frontend/appflowy_web_app/src/components/publish/header/duplicate/SelectWorkspace.tsxindex fa3ea1c47f..3beb30ad77 100644--- a/frontend/appflowy_web_app/src/components/publish/header/duplicate/SelectWorkspace.tsx+++ b/frontend/appflowy_web_app/src/components/publish/header/duplicate/SelectWorkspace.tsx@@ -1,8 +1,8 @@-import { AFConfigContext } from '@/components/app/app.hooks';+import { Workspace } from '@/application/types';+import { AFConfigContext } from '@/components/main/app.hooks';import React, { useCallback, useContext, useMemo, useRef, useState } from 'react';import { useTranslation } from 'react-i18next';import { Avatar, Button, CircularProgress, Divider, Tooltip } from '@mui/material';-import { Workspace } from '@/application/types';import { ReactComponent as RightIcon } from '@/assets/arrow_right.svg';import { ReactComponent as CheckIcon } from '@/assets/selected.svg';import { Popover } from '@/components/_shared/popover';diff --git a/frontend/appflowy_web_app/src/components/publish/header/duplicate/SpaceList.tsx b/frontend/appflowy_web_app/src/components/publish/header/duplicate/SpaceList.tsxindex 6aa63768f2..662c64c4b4 100644--- a/frontend/appflowy_web_app/src/components/publish/header/duplicate/SpaceList.tsx+++ b/frontend/appflowy_web_app/src/components/publish/header/duplicate/SpaceList.tsx@@ -1,9 +1,9 @@-import React, { useCallback } from 'react';import { SpaceView } from '@/application/types';+import React, { useCallback } from 'react';import { useTranslation } from 'react-i18next';import { ReactComponent as CheckIcon } from '@/assets/selected.svg';import { renderColor } from '@/utils/color';-import SpaceIcon from '@/components/publish/header/SpaceIcon';+import SpaceIcon from '@/components/_shared/breadcrumb/SpaceIcon';import { Button, CircularProgress, Tooltip } from '@mui/material';import { ReactComponent as LockSvg } from '@/assets/lock.svg';diff --git a/frontend/appflowy_web_app/src/components/publish/header/duplicate/useDuplicate.ts b/frontend/appflowy_web_app/src/components/publish/header/duplicate/useDuplicate.tsindex 56b99d67fe..e41225d0c0 100644--- a/frontend/appflowy_web_app/src/components/publish/header/duplicate/useDuplicate.ts+++ b/frontend/appflowy_web_app/src/components/publish/header/duplicate/useDuplicate.ts@@ -1,7 +1,7 @@-import { AFConfigContext } from '@/components/app/app.hooks';+import { SpaceView, Workspace } from '@/application/types';+import { AFConfigContext } from '@/components/main/app.hooks';import React, { useCallback, useContext, useEffect, useState } from 'react';import { useSearchParams } from 'react-router-dom';-import { SpaceView, Workspace } from '@/application/types';import { notify } from '@/components/_shared/notify';export function useDuplicate () {diff --git a/frontend/appflowy_web_app/src/components/publish/header/utils.ts b/frontend/appflowy_web_app/src/components/publish/header/utils.tsdeleted file mode 100644index 8cb154090e..0000000000--- a/frontend/appflowy_web_app/src/components/publish/header/utils.ts+++ /dev/null@@ -1,39 +0,0 @@-import { View } from '@/application/types';--export function findAncestors (data: View[], targetId: string, currentPath: View[] = []): View[] | null {- for (const item of data) {- const newPath = [...currentPath, item];-- if (item.view_id === targetId) {- return newPath;- }-- if (item.children && item.children.length > 0) {- const result = findAncestors(item.children, targetId, newPath);-- if (result) {- return result;- }- }- }-- return null;-}--export function findView (data: View[], targetId: string): View | null {- for (const item of data) {- if (item.view_id === targetId) {- return item;- }-- if (item.children && item.children.length > 0) {- const result = findView(item.children, targetId);-- if (result) {- return result;- }- }- }-- return null;-}\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/components/publish/outline/Outline.tsx b/frontend/appflowy_web_app/src/components/publish/outline/Outline.tsxdeleted file mode 100644index 1cc005e6d5..0000000000--- a/frontend/appflowy_web_app/src/components/publish/outline/Outline.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { usePublishContext } from '@/application/publish';-import emptyImageSrc from '@/assets/images/empty.png';-import { DirectoryStructure } from '@/components/_shared/skeleton/OutlineSkeleton';-import OutlineItem from '@/components/publish/outline/OutlineItem';-import React from 'react';--function Outline ({ width }: { width: number }) {- const outline = usePublishContext()?.outline;-- const isEmpty = outline && outline.children.length === 0;-- return (- <div className={'flex w-full flex-1 flex-col gap-1 py-[10px] px-[10px]'}>- {isEmpty && <img src={emptyImageSrc} alt={'No data found'} className={'mx-auto h-[200px]'} />}- {!outline ? <div style={{- width: width - 20,- }}- ><DirectoryStructure /></div> :- outline.children.map((view) =>- <OutlineItem- key={view.view_id}- view={view}- width={width - 20}- />,- )- }- </div>- );-}--export default Outline;diff --git a/frontend/appflowy_web_app/src/components/publish/outline/OutlineItem.tsx b/frontend/appflowy_web_app/src/components/publish/outline/OutlineItem.tsxdeleted file mode 100644index 706917f02b..0000000000--- a/frontend/appflowy_web_app/src/components/publish/outline/OutlineItem.tsx+++ /dev/null@@ -1,159 +0,0 @@-import { PublishContext, usePublishContext } from '@/application/publish';-import { View } from '@/application/types';-import { ViewIcon } from '@/components/_shared/view-icon';-import SpaceIcon from '@/components/publish/header/SpaceIcon';-import { renderColor } from '@/utils/color';-import { isFlagEmoji } from '@/utils/emoji';-import { Tooltip } from '@mui/material';-import React, { useCallback, useContext, useEffect } from 'react';-import { ReactComponent as ChevronDownIcon } from '@/assets/chevron_down.svg';-import { ReactComponent as PublishIcon } from '@/assets/publish.svg';-import { useTranslation } from 'react-i18next';--function OutlineItem ({ view, level = 0, width }: { view: View; width: number; level?: number }) {- const [isExpanded, setIsExpanded] = React.useState(() => {- return localStorage.getItem('publish_outline_expanded_' + view.view_id) === 'true';- });-- useEffect(() => {- localStorage.setItem('publish_outline_expanded_' + view.view_id, isExpanded ? 'true' : 'false');- }, [isExpanded, view.view_id]);-- const selected = usePublishContext()?.viewMeta?.view_id === view.view_id;- const getIcon = useCallback(() => {- if (isExpanded) {- return (- <button- style={{- paddingLeft: 1.125 * level + 'rem',- }}- onClick={() => {- setIsExpanded(false);- }}- className={'opacity-50 hover:opacity-100'}- >- <ChevronDownIcon className={'h-4 w-4'} />- </button>- );- }-- return (- <button- style={{- paddingLeft: 1.125 * level + 'rem',- }}- className={'opacity-50 hover:opacity-100'}- onClick={() => {- setIsExpanded(true);- }}- >- <ChevronDownIcon className={'h-4 w-4 -rotate-90 transform'} />- </button>- );- }, [isExpanded, level]);- const { t } = useTranslation();-- const navigateToView = useContext(PublishContext)?.toView;- const [hovered, setHovered] = React.useState(false);-- const renderItem = useCallback((item: View) => {- const { icon, layout, name, view_id, extra } = item;-- const isSpace = extra?.is_space;-- return (- <div className={'flex h-fit my-0.5 w-full flex-col gap-2'}>- <div- style={{- width,- backgroundColor: selected ? 'var(--fill-list-hover)' : undefined,- }}- className={- 'flex items-center w-full gap-0.5 rounded-[8px] py-1.5 px-0.5 text-sm hover:bg-content-blue-50 focus:bg-content-blue-50 focus:outline-none'- }- >- {item.children?.length ? getIcon() : null}-- <div- onClick={async () => {- if (isSpace || !item.is_published) {- setIsExpanded(prev => !prev);- return;- }-- try {- await navigateToView?.(view_id);- } catch (e) {- // do nothing- }- }}- onMouseEnter={() => setHovered(true)}- onMouseLeave={() => setHovered(false)}- style={{- paddingLeft: item.children?.length ? 0 : 1.125 * (level + 1) + 'rem',- }}- className={`flex flex-1 cursor-pointer select-none items-center gap-1.5 overflow-hidden`}- >- {isSpace && extra ?- <span- className={'icon h-4 w-4'}- style={{- backgroundColor: extra.space_icon_color ? renderColor(extra.space_icon_color) : 'rgb(163, 74, 253)',- borderRadius: '4px',- }}- >- <SpaceIcon- value={extra.space_icon || ''}- char={extra.space_icon ? undefined : name.slice(0, 1)}- /></span> :- <div className={`${icon && isFlagEmoji(icon.value) ? 'icon' : ''}`}>- {icon?.value || <ViewIcon layout={layout} size={'small'} />}- </div>- }-- <Tooltip title={name} enterDelay={1000} enterNextDelay={1000}>- <div className={'flex-1 truncate'}>{name}</div>- </Tooltip>- {hovered && !item.is_published && !isSpace && (- <Tooltip- disableInteractive- title={isSpace ? t('publish.spaceHasNotBeenPublished') : t('publish.hasNotBeenPublished')}- >- <div- className={'text-text-caption ml-2 mr-4 cursor-pointer hover:bg-fill-list-hover rounded h-5 w-5 flex items-center justify-center'}- >- <PublishIcon className={'h-4 w-4'} />- </div>- </Tooltip>- )}- </div>- </div>- </div>- );- }, [hovered, getIcon, level, navigateToView, selected, t, width]);-- const children = view.children || [];-- if (!children.length && !view.is_published) {- return null;- }-- return (- <div className={'flex h-fit w-full flex-col'}>- {renderItem(view)}- <div- className={'flex transform flex-col gap-2 transition-all'}- style={{- display: isExpanded ? 'block' : 'none',- }}- >- {children- .map((item, index) => (- <OutlineItem level={level + 1} width={width} key={index} view={item} />- ))}- </div>- </div>- );-}--export default OutlineItem;diff --git a/frontend/appflowy_web_app/src/components/publish/outline/SearchInput.tsx b/frontend/appflowy_web_app/src/components/publish/outline/SearchInput.tsxdeleted file mode 100644index f3dbadc906..0000000000--- a/frontend/appflowy_web_app/src/components/publish/outline/SearchInput.tsx+++ /dev/null@@ -1,39 +0,0 @@-import { InputAdornment, OutlinedInput } from '@mui/material';-import { debounce } from 'lodash-es';-import React from 'react';-import { ReactComponent as SearchIcon } from '@/assets/search.svg';-import { useTranslation } from 'react-i18next';--function SearchInput({ onSearch }: { onSearch: (value: string) => void }) {- const [value, setValue] = React.useState('');-- const debounceSearch = React.useMemo(() => {- return debounce((value: string) => {- onSearch(value);- }, 200);- }, [onSearch]);- const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {- setValue(event.target.value);- debounceSearch(event.target.value);- };-- const { t } = useTranslation();-- return (- <OutlinedInput- spellCheck={false}- startAdornment={- <InputAdornment className={'text-text-caption'} position='start'>- <SearchIcon className={'h-4 w-4'} />- </InputAdornment>- }- onChange={handleChange}- placeholder={t('search.label')}- className={'h-[30px] w-full rounded-lg bg-bg-body'}- value={value}- size={'small'}- />- );-}--export default SearchInput;diff --git a/frontend/appflowy_web_app/src/components/publish/outline/index.ts b/frontend/appflowy_web_app/src/components/publish/outline/index.tsdeleted file mode 100644index dea4da9c45..0000000000--- a/frontend/appflowy_web_app/src/components/publish/outline/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from './OutlinePopover';-export * from './OutlineDrawer';diff --git a/frontend/appflowy_web_app/src/components/publish/outline/utils.ts b/frontend/appflowy_web_app/src/components/publish/outline/utils.tsdeleted file mode 100644index 284c24505f..0000000000--- a/frontend/appflowy_web_app/src/components/publish/outline/utils.ts+++ /dev/null@@ -1,21 +0,0 @@-import { PublishViewInfo } from '@/application/collab.type';--export function filterViews(views: PublishViewInfo[], keyword: string): PublishViewInfo[] {- const filterAndFlatten = (views: PublishViewInfo[]): PublishViewInfo[] => {- let result: PublishViewInfo[] = [];-- for (const view of views) {- if (view.name.toLowerCase().includes(keyword.toLowerCase())) {- result.push(view);- } else if (view.child_views) {- const filteredChildren = filterAndFlatten(view.child_views);-- result = result.concat(filteredChildren);- }- }-- return result;- };-- return filterAndFlatten(views);-}diff --git a/frontend/appflowy_web_app/src/components/view-meta/ViewCover.tsx b/frontend/appflowy_web_app/src/components/view-meta/ViewCover.tsxindex 29c05e4e16..2ec873c46d 100644--- a/frontend/appflowy_web_app/src/components/view-meta/ViewCover.tsx+++ b/frontend/appflowy_web_app/src/components/view-meta/ViewCover.tsx@@ -41,12 +41,3 @@ function ViewCover ({ coverValue, coverType }: { coverValue?: string; coverType?export default ViewCover;-export enum CoverType {- NormalColor = 'color',- GradientColor = 'gradient',- BuildInImage = 'built_in',- CustomImage = 'custom',- LocalImage = 'local',- UpsplashImage = 'unsplash',- None = 'none',-}diff --git a/frontend/appflowy_web_app/src/components/view-meta/ViewMetaPreview.tsx b/frontend/appflowy_web_app/src/components/view-meta/ViewMetaPreview.tsxindex 6a043b82cd..3db0fc218e 100644--- a/frontend/appflowy_web_app/src/components/view-meta/ViewMetaPreview.tsx+++ b/frontend/appflowy_web_app/src/components/view-meta/ViewMetaPreview.tsx@@ -4,11 +4,11 @@ import BuiltInImage3 from '@/assets/cover/m_cover_image_3.png';import BuiltInImage4 from '@/assets/cover/m_cover_image_4.png';import BuiltInImage5 from '@/assets/cover/m_cover_image_5.png';import BuiltInImage6 from '@/assets/cover/m_cover_image_6.png';-import ViewCover, { CoverType } from '@/components/view-meta/ViewCover';+import ViewCover from '@/components/view-meta/ViewCover';import { isFlagEmoji } from '@/utils/emoji';import React, { useMemo } from 'react';import { useTranslation } from 'react-i18next';-import { ViewLayout, ViewMetaIcon } from '@/application/collab.type';+import { CoverType, ViewLayout, ViewMetaIcon } from '@/application/types';export interface ViewMetaCover {type: CoverType;@@ -63,7 +63,7 @@ export function ViewMetaPreview ({ icon, cover, name }: ViewMetaProps) {<div className={'flex w-full flex-col items-center'}>{cover && <ViewCover coverType={coverType} coverValue={coverValue} />}<div- className={`relative mb-6 mt-[52px] max-md:mt-[38px] max-xl:px-8 w-[964px] min-w-0 max-w-full overflow-visible max-lg:px-6`}+ className={`relative mb-6 mt-[52px] max-md:mt-[38px] px-6 w-[964px] min-w-0 max-w-full overflow-visible`}><divclassName={diff --git a/frontend/appflowy_web_app/src/main.tsx b/frontend/appflowy_web_app/src/main.tsxindex d964a40e3d..6b068e9647 100644--- a/frontend/appflowy_web_app/src/main.tsx+++ b/frontend/appflowy_web_app/src/main.tsx@@ -1,4 +1,4 @@import ReactDOM from 'react-dom/client';-import App from 'src/components/app/App';+import App from '@/components/main/App';ReactDOM.createRoot(document.getElementById('root')!).render(<App />);diff --git a/frontend/appflowy_web_app/src/pages/AcceptInvitationPage.tsx b/frontend/appflowy_web_app/src/pages/AcceptInvitationPage.tsxindex bae2773879..0569ea240f 100644--- a/frontend/appflowy_web_app/src/pages/AcceptInvitationPage.tsx+++ b/frontend/appflowy_web_app/src/pages/AcceptInvitationPage.tsx@@ -1,9 +1,10 @@import { Invitation } from '@/application/types';+import { ReactComponent as AppflowyLogo } from '@/assets/appflowy.svg';+import { ReactComponent as ErrorIcon } from '@/assets/error.svg';import { NormalModal } from '@/components/_shared/modal';import { notify } from '@/components/_shared/notify';-import { AFConfigContext, useCurrentUser, useService } from '@/components/app/app.hooks';-import { stringAvatar } from '@/utils/color';-import { isFlagEmoji } from '@/utils/emoji';+import { getAvatar } from '@/components/_shared/view-icon/utils';+import { AFConfigContext, useCurrentUser, useService } from '@/components/main/app.hooks';import { openOrDownload } from '@/utils/open_schema';import { openAppFlowySchema } from '@/utils/url';import { EmailOutlined } from '@mui/icons-material';@@ -11,8 +12,6 @@ import { Avatar, Button, Divider } from '@mui/material';import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';import { useNavigate, useSearchParams } from 'react-router-dom';-import { ReactComponent as AppflowyLogo } from '@/assets/appflowy.svg';-import { ReactComponent as ErrorIcon } from '@/assets/error.svg';function AcceptInvitationPage () {const isAuthenticated = useContext(AFConfigContext)?.isAuthenticated;@@ -177,23 +176,4 @@ function AcceptInvitationPage () {);}-function getAvatar (item: {- icon?: string;- name: string;-}) {- if (item.icon) {- const isFlag = isFlagEmoji(item.icon);-- return {- children: <span className={isFlag ? 'icon' : ''}>{item.icon}</span>,- sx: {- bgcolor: 'var(--bg-body)',- color: 'var(--text-title)',- },- };- }-- return stringAvatar(item.name || '');-}-export default AcceptInvitationPage;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/pages/AppPage.tsx b/frontend/appflowy_web_app/src/pages/AppPage.tsxnew file mode 100644index 0000000000..636b141113--- /dev/null+++ b/frontend/appflowy_web_app/src/pages/AppPage.tsx@@ -0,0 +1,149 @@+import { AppendBreadcrumb, CreateRowDoc, LoadView, LoadViewMeta, ViewLayout, YDoc } from '@/application/types';+import Help from '@/components/_shared/help/Help';+import { findView } from '@/components/_shared/outline/utils';+import CalendarSkeleton from '@/components/_shared/skeleton/CalendarSkeleton';+import GridSkeleton from '@/components/_shared/skeleton/GridSkeleton';+import DocumentSkeleton from '@/components/_shared/skeleton/DocumentSkeleton';+import KanbanSkeleton from '@/components/_shared/skeleton/KanbanSkeleton';+import { AppContext, useAppHandlers, useAppOutline, useAppViewId } from '@/components/app/app.hooks';+import DatabaseView from '@/components/app/DatabaseView';+import { Document } from '@/components/document';+import RecordNotFound from '@/components/error/RecordNotFound';+import { ViewMetaProps } from '@/components/view-meta';+import React, { lazy, Suspense, memo, useCallback, useEffect, useMemo, useContext } from 'react';++const ViewHelmet = lazy(() => import('@/components/_shared/helmet/ViewHelmet'));++function AppPage () {+ const viewId = useAppViewId();+ const outline = useAppOutline();+ const {+ toView,+ loadViewMeta,+ createRowDoc,+ loadView,+ appendBreadcrumb,+ onRendered,+ } = useAppHandlers();+ const view = useMemo(() => {+ if (!outline || !viewId) return;+ return findView(outline, viewId);+ }, [outline, viewId]);+ const rendered = useContext(AppContext)?.rendered;++ const helmet = useMemo(() => {+ return view && rendered ? <Suspense><ViewHelmet name={view.name} icon={view.icon || undefined} /></Suspense> : null;+ }, [rendered, view]);++ const [doc, setDoc] = React.useState<YDoc | undefined>(undefined);+ const [notFound, setNotFound] = React.useState(false);+ const loadPageDoc = useCallback(async () => {++ if (!viewId) {+ return;+ }++ setNotFound(false);+ setDoc(undefined);+ try {+ const doc = await loadView(viewId);++ setDoc(doc);+ } catch (e) {+ setNotFound(true);+ console.error(e);+ }++ }, [loadView, viewId]);++ useEffect(() => {+ void loadPageDoc();+ }, [loadPageDoc]);++ const View = useMemo(() => {+ switch (view?.layout) {+ case ViewLayout.Document:+ return Document;+ case ViewLayout.Grid:+ case ViewLayout.Board:+ case ViewLayout.Calendar:+ return DatabaseView;+ default:+ return null;+ }+ }, [view?.layout]) as React.FC<{+ doc: YDoc;+ navigateToView?: (viewId: string) => Promise<void>;+ loadViewMeta?: LoadViewMeta;+ createRowDoc?: CreateRowDoc;+ loadView?: LoadView;+ viewMeta: ViewMetaProps;+ appendBreadcrumb?: AppendBreadcrumb;+ onRendered?: () => void;+ }>;++ const viewMeta: ViewMetaProps | null = useMemo(() => {+ return view ? {+ name: view.name,+ icon: view.icon || undefined,+ cover: view.extra?.cover || undefined,+ layout: view.layout,+ visibleViewIds: [],+ viewId: view.view_id,+ } : null;+ }, [view]);++ const skeleton = useMemo(() => {+ if (!viewMeta) {+ return null;+ }++ switch (viewMeta.layout) {+ case ViewLayout.Document:+ return <DocumentSkeleton />;+ case ViewLayout.Grid:+ return <GridSkeleton />;+ case ViewLayout.Board:+ return <KanbanSkeleton />;+ case ViewLayout.Calendar:+ return <CalendarSkeleton />;+ default:+ return null;+ }++ }, [viewMeta]);++ const viewDom = useMemo(() => {+ return doc && viewMeta && View ? (+ <View+ doc={doc}+ viewMeta={viewMeta}+ navigateToView={toView}+ loadViewMeta={loadViewMeta}+ createRowDoc={createRowDoc}+ appendBreadcrumb={appendBreadcrumb}+ loadView={loadView}+ onRendered={onRendered}+ />+ ) : skeleton;+ }, [onRendered, doc, viewMeta, View, toView, loadViewMeta, createRowDoc, appendBreadcrumb, loadView, skeleton]);++ if (!viewId) return null;+ return (+ <div className={'relative w-full h-full'}>+ {helmet}++ {notFound ? (+ <RecordNotFound />+ ) : (+ <div className={'w-full h-full'}>+ {viewDom}+ </div>+ )}+ {view && doc && <Help />}++ </div>+ );+}++export default memo(AppPage);\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/pages/LoginPage.tsx b/frontend/appflowy_web_app/src/pages/LoginPage.tsxindex 9797463e85..f959e8ec03 100644--- a/frontend/appflowy_web_app/src/pages/LoginPage.tsx+++ b/frontend/appflowy_web_app/src/pages/LoginPage.tsx@@ -1,9 +1,9 @@-import { AFConfigContext } from '@/components/app/app.hooks';+import { AFConfigContext } from '@/components/main/app.hooks';import { Login } from '@/components/login';import React, { useContext, useEffect } from 'react';import { useSearchParams } from 'react-router-dom';-function LoginPage() {+function LoginPage () {const [search] = useSearchParams();const redirectTo = search.get('redirectTo') || '';const isAuthenticated = useContext(AFConfigContext)?.isAuthenticated || false;diff --git a/frontend/appflowy_web_app/src/pages/TrashPage.tsx b/frontend/appflowy_web_app/src/pages/TrashPage.tsxnew file mode 100644index 0000000000..9e44228d46--- /dev/null+++ b/frontend/appflowy_web_app/src/pages/TrashPage.tsx@@ -0,0 +1,110 @@+import { View } from '@/application/types';+import { notify } from '@/components/_shared/notify';+import TableSkeleton from '@/components/_shared/skeleton/TableSkeleton';+import { useCurrentWorkspaceId } from '@/components/app/app.hooks';+import { useService } from '@/components/main/app.hooks';+import { TableContainer } from '@mui/material';+import dayjs from 'dayjs';+import React, { useCallback, useEffect, useMemo } from 'react';+import { useTranslation } from 'react-i18next';+import Table from '@mui/material/Table';+import TableBody from '@mui/material/TableBody';+import TableCell from '@mui/material/TableCell';+import TableHead from '@mui/material/TableHead';+import TableRow from '@mui/material/TableRow';++function TrashPage () {+ const { t } = useTranslation();+ const [trashList, setTrashList] = React.useState<View[]>();+ const service = useService();+ const currentWorkspaceId = useCurrentWorkspaceId();++ const loadOutline = useCallback(async () => {++ if (!service || !currentWorkspaceId) return;+ try {+ const res = await service?.getAppTrash(currentWorkspaceId);++ if (!res) {+ throw new Error('App trash not found');+ }++ setTrashList(res);+ } catch (e) {+ notify.error('App trash not found');+ }+ }, [currentWorkspaceId, service]);++ useEffect(() => {+ void loadOutline();+ }, [loadOutline]);++ const columns = useMemo(() => {+ return [+ { id: 'name', label: t('trash.pageHeader.fileName'), minWidth: 170 },+ { id: 'last_edited_time', label: t('trash.pageHeader.lastModified'), minWidth: 170 },+ { id: 'created_at', label: t('trash.pageHeader.created'), minWidth: 170 },++ ];+ }, [t]);++ return (+ <div style={{+ height: 'calc(100vh - 48px)',+ }} className={'flex-1 h-full flex-col flex w-full items-center'}+ >+ <div className={'w-[964px] flex flex-col min-w-0 max-w-full px-6 py-10 h-full'}>+ <div+ className={'flex items-center justify-between'}+ >+ <span className={'text-text-title text-xl font-medium'}>{t('trash.text')}</span>+ </div>+ <div className={'flex flex-col gap-2 w-full flex-1 overflow-hidden'}>+ {!trashList ? <TableSkeleton rows={8} columns={3} /> :+ <TableContainer className={'appflowy-scroller'} sx={{ maxHeight: '100%' }}>+ <Table stickyHeader aria-label="sticky table">+ <TableHead>+ <TableRow>+ {columns.map((column) => (+ <TableCell+ className={'font-medium text-text-caption'}+ key={column.id}+ align={'left'}+ style={{ minWidth: column.minWidth }}+ >+ {column.label}+ </TableCell>+ ))}+ </TableRow>+ </TableHead>+ <TableBody>+ {trashList+ .map((row) => {+ return (+ <TableRow hover role="checkbox" tabIndex={-1} key={row.view_id}>+ {columns.map((column) => {+ // eslint-disable-next-line+ // @ts-ignore+ const value = row[column.id];++ return (+ <TableCell key={column.id} align={'left'} className={'font-medium'}>+ {column.id === 'created_at' || column.id === 'last_edited_time' ? dayjs(value).format('MM/DD/YYYY hh:mm A') : value}+ </TableCell>+ );+ })}+ </TableRow>+ );+ })}+ </TableBody>+ </Table>+ </TableContainer>+ }+ </div>+ </div>++ </div>+ );+}++export default TrashPage;\ No newline at end of filediff --git a/frontend/appflowy_web_app/src/styles/variables/dark.variables.css b/frontend/appflowy_web_app/src/styles/variables/dark.variables.cssindex e6e59ed42d..54191a7376 100644--- a/frontend/appflowy_web_app/src/styles/variables/dark.variables.css+++ b/frontend/appflowy_web_app/src/styles/variables/dark.variables.css@@ -19,14 +19,15 @@--fill-toolbar: #0F111C;--fill-selector: #232b38;--fill-list-active: #3c4557;- --fill-list-hover: #FFFFFF19;+ --fill-list-hover: #2b394c;--content-blue-400: #00bcf0;--content-blue-300: #52d1f4;--content-blue-600: #009fd1;--content-blue-100: #005174;+ --content-blue-50: #024562;--content-on-fill: #1a202c;--content-on-tag: #99a6b8;- --content-blue-50: #232b38;+--bg-body: #1a202c;--bg-base: #232b38;--bg-mask: #000000B2;diff --git a/frontend/appflowy_web_app/src/utils/color.ts b/frontend/appflowy_web_app/src/utils/color.tsindex bccf0e5659..4b706fbf8b 100644--- a/frontend/appflowy_web_app/src/utils/color.ts+++ b/frontend/appflowy_web_app/src/utils/color.ts@@ -44,12 +44,12 @@ export const gradientMap = {// Convert ARGB to RGBA// Flutter uses ARGB, but CSS uses RGBA-function argbToRgba(color: string): string {+function argbToRgba (color: string): string {const hex = color.replace(/^#|0x/, '');const hasAlpha = hex.length === 8;- if(!hasAlpha) {+ if (!hasAlpha) {return color.replace('0x', '#');}@@ -61,34 +61,34 @@ function argbToRgba(color: string): string {return `rgba(${r}, ${g}, ${b}, ${a})`;}-export function renderColor(color: string) {- if(colorMap[color as ColorEnum]) {+export function renderColor (color: string) {+ if (colorMap[color as ColorEnum]) {return colorMap[color as ColorEnum];}- if(gradientMap[color as GradientEnum]) {+ if (gradientMap[color as GradientEnum]) {return gradientMap[color as GradientEnum];}return argbToRgba(color);}-export function stringToColor(string: string, colorArray?: string[]) {+export function stringToColor (string: string, colorArray?: string[]) {let hash = 0;let i;/* eslint-disable no-bitwise */- for(i = 0; i < string.length; i += 1) {+ for (i = 0; i < string.length; i += 1) {hash = string.charCodeAt(i) + ((hash << 5) - hash);}- if(colorArray) {+ if (colorArray) {return colorArray[string.slice(0, 1).charCodeAt(0) % colorArray.length];}let color = '#';- for(i = 0; i < 3; i += 1) {+ for (i = 0; i < 3; i += 1) {const value = (hash >> (i * 8)) & 0xff;color += `00${value.toString(16)}`.slice(-2);@@ -98,8 +98,59 @@ export function stringToColor(string: string, colorArray?: string[]) {return color;}-export function stringAvatar(name: string, colorArray?: string[]) {- if(!name) {+const colorDefaultArray: string[] = [+ '#5287D8',+ '#6E9DE3',+ '#8BB3ED',+ '#A7C9F7',+ '#979EB6',+ '#A2A8BF',+ '#ACB2C8',+ '#C1C7DA',+ '#E8AF53',+ '#E6C25A',+ '#E6D26F',+ '#E6E288',+ '#589599',+ '#68AD8E',+ '#79C47F',+ '#8CDB6A',+ '#AA94DC',+ '#C49EEB',+ '#BAACEE',+ '#D5C4FB',+ '#F597D2',+ '#FCB2E3',+ '#FDC5E8',+ '#F8D2E1',+ '#D1D269',+ '#C7C98D',+ '#CED09B',+ '#DAD9B6',+ '#DDD2C6',+ '#DDD6C7',+ '#EADED3',+ '#FED5C4',+ '#72A7D8',+ '#8FCAE3',+ '#64B3DA',+ '#52B2D4',+ '#90A4FF',+ '#A8BEF4',+ '#AEBDFF',+ '#C2CDFF',+ '#86C1B7',+ '#A6D8D0',+ '#A7D7A8',+ '#C8E4C9',+ '#FF9494',+ '#FFBDBD',+ '#DCA8A8',+ '#E3C4C4',+];++export function stringAvatar (name: string, colorArray: string[] = colorDefaultArray) {+ if (!name) {return null;}diff --git a/frontend/appflowy_web_app/vite.config.ts b/frontend/appflowy_web_app/vite.config.tsindex d9f15494f3..b1e88625e0 100644--- a/frontend/appflowy_web_app/vite.config.ts+++ b/frontend/appflowy_web_app/vite.config.ts@@ -146,6 +146,7 @@ export default defineConfig({: `${__dirname}/src/application/services/js-services`,},{ find: '$icons', replacement: `${resourcesPath}/flowy_icons/` },+ { find: 'cypress/support', replacement: `${__dirname}/cypress/support` },],},diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 32c095db9b..110ad23b90 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -118,7 +118,8 @@"visitSite": "Visit site","exportAsTab": "Export as","publishTab": "Publish",- "shareTab": "Share"+ "shareTab": "Share",+ "publishOnAppFlowy": "Publish on AppFlowy"},"moreAction": {"small": "small",@@ -284,6 +285,7 @@"today": "Today","thisWeek": "This week","others": "Earlier favorites",+ "earlier": "Earlier","justNow": "just now","minutesAgo": "{count} minutes ago","lastViewed": "Last viewed",@@ -2509,6 +2511,7 @@"name": "Template name","description": "Template Description","about": "Template About",+ "deleteFromTemplate": "Delete from templates","preview": "Template Preview","categories": "Template Categories","isNewTemplate": "PIN to New template",@@ -2550,7 +2553,8 @@"uploadSuccessDescription": "Your template has been uploaded successfully. You can now view it in the template gallery.","viewTemplate": "View template","deleteTemplate": "Delete template",- "deleteTemplateDescription": "Are you sure you want to delete this template?",+ "deleteSuccess": "Template deleted successfully",+ "deleteTemplateDescription": "This won't affect the current page or published status. Are you sure you want to delete this template?","addRelatedTemplate": "Add related template","removeRelatedTemplate": "Remove related template","uploadAvatar": "Upload avatar",@@ -2599,5 +2603,13 @@"close": "Back to home","changeAccount": "Change account"}+ },+ "requestAccess": {+ "title": "No access to this page",+ "subtitle": "You can request access from the owner of this page. Once approved, you can view the page.",+ "requestAccess": "Request access",+ "backToHome": "Back to home",+ "tip": "You're currently logged in as <link/>.",+ "mightBe": "You might need to <login/> with a different account."}}