Сделал отображение подзаметок в пошереной заметке

frontend-park-mail-ru · May 26, 2024 · 6a97d84 · 6a97d84
1 parent a4f0cdf
commit 6a97d84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/public/src/components/Editor/Plugin.ts b/public/src/components/Editor/Plugin.ts
@@ -1,7 +1,7 @@
 import {AppUserStore} from "../../modules/stores/UserStore";
 import {parseNoteTitle, setCursorAtNodePosition, truncate} from "../../modules/utils";
 import {AppNotesStore, NotesActions} from "../../modules/stores/NotesStore";
-import {AppNoteRequests} from "../../modules/api";
+import {AppNoteRequests, AppSharedNoteRequests} from '../../modules/api';
 import {AppDispatcher} from "../../modules/dispatcher";
 import {AppToasts} from "../../modules/toasts";
 import {AppNoteStore, NoteStoreActions} from "../../modules/stores/NoteStore";
@@ -1108,7 +1108,9 @@ const RenderSubNote = (subNoteId:string) => {
         subNoteTitle.innerHTML = AppNoteStore.state.cache[subNoteId]
         loaded = true
     } else {
-        AppNoteRequests.Get(subNoteId, AppUserStore.state.JWT).then(result => {
+
+        const request = pluginSettings.isEditable ? AppNoteRequests.Get(subNoteId, AppUserStore.state.JWT) : AppSharedNoteRequests.Get(subNoteId)
+        request.then(result => {
             if (result.data.title == null) {
                 subNoteTitle.innerHTML = 'Подзаметка'
             }

diff --git a/...c/src/components/Editor/EditorWrapper.tsx → ...omponents/EditorWrapper/EditorWrapper.tsx b/...c/src/components/Editor/EditorWrapper.tsx → ...omponents/EditorWrapper/EditorWrapper.tsx
@@ -1,13 +1,13 @@
 import {Component} from "@veglem/screact/dist/component";
 import {VDomNode} from "@veglem/screact/dist/vdom";
-import "./Editor.sass"
-import {Editor} from "./Editor";
+import "../Editor/Editor.sass"
+import {Editor} from "../Editor/Editor";
 import {AppNoteStore, NoteStoreState} from "../../modules/stores/NoteStore";
 import {Tippy} from "../Tippy/Tippy";
 import {isEqual} from "@veglem/screact/dist/isEqual";
-import {Viewer} from "./Viewer";
+import {Viewer} from "../Editor/Viewer";
 import {NoteType} from "../../utils/types";
-import {PluginProps} from "./Plugin";
+import {PluginProps} from "../Editor/Plugin";
 import {parseNoteTitle} from "../../modules/utils";
 
 window['mobileCheck'] = function() {

diff --git a/public/src/components/NoteEditor/NoteEditor.tsx b/public/src/components/NoteEditor/NoteEditor.tsx
@@ -10,7 +10,7 @@ import {DeleteNoteDialog} from '../DeleteNoteDialog/DeleteNoteDialog';
 import NoteMenu from "../NoteMenu/NoteMenu";
 import {Tooltip} from "../Tooltip/Tooltip";
 import {TagList} from "../TagList/TagList";
-import {EditorWrapper} from "../Editor/EditorWrapper";
+import {EditorWrapper} from "../EditorWrapper/EditorWrapper";
 import {AppUserStore} from "../../modules/stores/UserStore";
 import {Collaborators} from "../Collaborators/Collaborators";
 import {EmojiPicker} from "../EmojiPicker/EmojiPicker";