Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add search whiteboard api #7340

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@seafile/seafile-calendar": "0.0.28",
"@seafile/seafile-editor": "1.0.133",
"@seafile/sf-metadata-ui-component": "^0.0.64",
"@seafile/stldraw-editor": "0.1.5",
"@seafile/stldraw-editor": "^0.1.5-test1.0",
"@uiw/codemirror-extensions-langs": "^4.19.4",
"@uiw/codemirror-themes": "^4.23.5",
"@uiw/react-codemirror": "^4.19.4",
Expand Down Expand Up @@ -63,7 +63,7 @@
"start": "node scripts/start.js",
"build": "node scripts/build.js",
"test": "node scripts/test.js --env=jsdom",
"dev": "export NODE_ENV=development && node config/server.js"
"dev": "export NODE_ENV=development && node --max-old-space-size=4096 config/server.js"
},
"browserslist": {
"production": [
Expand Down
34 changes: 32 additions & 2 deletions frontend/src/pages/sdoc/sdoc-editor/external-operations.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import ReactDom from 'react-dom';
import { EventBus, EXTERNAL_EVENT } from '@seafile/sdoc-editor';
import { seafileAPI } from '../../../utils/seafile-api';
import { Utils } from '../../../utils/utils';
import toaster from '../../../components/toast';
import InternalLinkDialog from '../../../components/dialog/internal-link-dialog';
import ShareDialog from '../../../components/dialog/share-dialog';
import CreateFile from '../../../components/dialog/create-file-dialog';
import TldrawEditor from '../../tldraw-editor';

const propTypes = {
repoID: PropTypes.string.isRequired,
Expand All @@ -33,6 +35,7 @@
fileType: '.sdoc',
editor: null,
insertSdocFileLink: null,
insertWhiteboard: null,
};
}

Expand All @@ -46,6 +49,8 @@
this.unsubscribeNewNotification = eventBus.subscribe(EXTERNAL_EVENT.NEW_NOTIFICATION, this.onNewNotification);
this.unsubscribeClearNotification = eventBus.subscribe(EXTERNAL_EVENT.CLEAR_NOTIFICATION, this.onClearNotification);
this.unsubscribeCreateSdocFile = eventBus.subscribe(EXTERNAL_EVENT.CREATE_SDOC_FILE, this.onCreateSdocFile);
this.unsubscribeCreateSdocFile = eventBus.subscribe(EXTERNAL_EVENT.CREATE_WHITEBOARD_FILE, this.onCreateWhiteboardFile);
this.unsubscribeWhiteboardEditor = eventBus.subscribe(EXTERNAL_EVENT.TLDRAW_EDITOR, this.renderWhiteboard);
}

componentWillUnmount() {
Expand All @@ -58,8 +63,17 @@
this.unsubscribeNewNotification();
this.unsubscribeCreateSdocFile();
this.unsubscribeClearNotification();
this.unsubscribeCreateSdocFile();
this.unsubscribeWhiteboardEditor();
}

renderWhiteboard = ({ containerId, props }) => {
const container = containerId && document.getElementById(containerId);
if (container) {
ReactDom.render(<TldrawEditor {...props} />, container);
}
};

onInternalLinkToggle = (options) => {
if (options && options.internalLink) {
this.setState({ internalLink: options.internalLink });
Expand Down Expand Up @@ -143,6 +157,18 @@
});
};

onCreateWhiteboardFile = (params) => {
if (params?.editor && params?.insertWhiteboard) {
this.setState({ editor: params.editor, insertWhiteboard: params.insertWhiteboard });
}
if (params?.fileType) {
this.setState({ fileType: '.draw' });
}
this.setState({
isShowCreateFileDialog: !this.state.isShowCreateFileDialog
});
};

checkDuplicatedName = (newName) => {
let direntList = this.props.direntList;
let isDuplicated = direntList.some(object => {
Expand All @@ -153,11 +179,15 @@

onAddFile = (filePath) => {
let repoID = this.props.repoID;
const { insertSdocFileLink, editor } = this.state;
const { insertWhiteboard, insertSdocFileLink, editor } = this.state;
seafileAPI.createFile(repoID, filePath).then((res) => {
if (insertSdocFileLink && editor) {
insertSdocFileLink(editor, res.data.obj_name, res.data.doc_uuid);
}
if (insertWhiteboard && editor) {
const whiteboardFilePath = '/' + res.data.obj_name

Check warning on line 188 in frontend/src/pages/sdoc/sdoc-editor/external-operations.js

View workflow job for this annotation

GitHub Actions / build

Missing semicolon
insertWhiteboard(editor, res.data.obj_name, whiteboardFilePath);
}
}).catch((error) => {
let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage);
Expand Down Expand Up @@ -193,7 +223,7 @@
fileType={fileType}
onAddFile={this.onAddFile}
checkDuplicatedName={this.checkDuplicatedName}
toggleDialog={this.onCreateSdocFile}
toggleDialog={this.onCreateSdocFile || this.onCreateWhiteboardFile}
/>
)}
</>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/tldraw-editor/editor-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class EditorApi {
});
}

getFileContent = () => {
return seafileAPI.getFileDownloadLink(repoID, filePath).then(res => {
getFileContent = (transferredRepoID = repoID, transferredFilePath = filePath) => {
return seafileAPI.getFileDownloadLink(transferredRepoID, transferredFilePath).then(res => {
const downLoadUrl = res.data;
return seafileAPI.getFileContent(downLoadUrl);
});
Expand Down
14 changes: 9 additions & 5 deletions frontend/src/pages/tldraw-editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ import { gettext } from '../../utils/constants';
import toaster from '../../components/toast';
import { SAVE_INTERVAL_TIME } from './constants';

const TldrawEditor = () => {
const TldrawEditor = (props) => {
const { repoID, filePath, readOnly } = props;
const editorRef = useRef(null);
const isChangedRef = useRef(false);
const [fileContent, setFileContent] = useState({});
const [isFetching, setIsFetching] = useState(true);

useEffect(() => {
editorApi.getFileContent().then(res => {
editorApi.getFileContent(repoID, filePath).then(res => {
setFileContent(res.data);
setIsFetching(false);
});
}, []);
}, [repoID, filePath]);

const saveDocument = useCallback(async () => {
if (isChangedRef.current) {
Expand All @@ -32,6 +33,7 @@ const TldrawEditor = () => {
}, []);

useEffect(() => {
if (readOnly) return;
const handleHotkeySave = (event) => {
if (isHotkey('mod+s')(event)) {
event.preventDefault();
Expand All @@ -42,9 +44,10 @@ const TldrawEditor = () => {
return () => {
document.removeEventListener('keydown', handleHotkeySave);
};
}, [saveDocument]);
}, [saveDocument, readOnly]);

useEffect(() => {
if (readOnly) return;
const saveInterval = setInterval(() => {
if (isChangedRef.current) {
editorApi.saveContent(JSON.stringify(editorRef.current)).then(res => {
Expand All @@ -65,7 +68,7 @@ const TldrawEditor = () => {
clearInterval(saveInterval);
window.removeEventListener('beforeunload', handleBeforeUnload);
};
}, [saveDocument]);
}, [saveDocument, readOnly]);

const onContentChanged = useCallback((docContent) => {
editorRef.current = docContent;
Expand All @@ -79,6 +82,7 @@ const TldrawEditor = () => {
return (
<SimpleEditor
isFetching={isFetching}
readOnly={readOnly}
document={fileContent}
onContentChanged={onContentChanged}
onSave={onSave}
Expand Down
6 changes: 5 additions & 1 deletion seahub/seadoc/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
gen_seadoc_image_parent_path, get_seadoc_asset_upload_link, get_seadoc_asset_download_link, \
can_access_seadoc_asset, is_seadoc_revision, ZSDOC, export_sdoc
from seahub.seadoc.settings import SDOC_REVISIONS_DIR, SDOC_IMAGES_DIR
from seahub.utils.file_types import SEADOC, IMAGE, VIDEO
from seahub.utils.file_types import SEADOC, IMAGE, VIDEO, TLDRAW
from seahub.utils.file_op import if_locked_by_online_office
from seahub.utils import get_file_type_and_ext, normalize_file_path, \
normalize_dir_path, PREVIEW_FILEEXT, \
Expand Down Expand Up @@ -2533,6 +2533,8 @@ def get(self, request, file_uuid):
entry["file_uuid"] = dirent_file_uuid
elif file_type == 'file' and filetype not in (SEADOC, IMAGE):
entry["file_uuid"] = dirent_file_uuid
elif file_type == 'draw' and filetype == TLDRAW:
entry["file_uuid"] = dirent_file_uuid
else:
continue
entry["type"] = dtype
Expand Down Expand Up @@ -2925,6 +2927,8 @@ def get(self, request, file_uuid):
suffixes = ['sdoc',]
if search_type == 'file':
suffixes = get_non_sdoc_file_exts()
if search_type == 'draw':
suffixes = ['draw',]
if not suffixes:
error_msg = 'search_type is not valid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
Expand Down
Loading