- {/* {isWiki2 &&
-
this.saveWikiConfig(Object.assign({}, this.state.config, data))}
- />
- } */}
diff --git a/frontend/src/pages/wiki2/main-panel.js b/frontend/src/pages/wiki2/main-panel.js
index 72628f11116..1fbe42881f2 100644
--- a/frontend/src/pages/wiki2/main-panel.js
+++ b/frontend/src/pages/wiki2/main-panel.js
@@ -1,7 +1,7 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { SdocWikiViewer } from '@seafile/sdoc-editor';
-import { gettext, repoID, siteRoot, username } from '../../utils/constants';
+import { gettext, username } from '../../utils/constants';
import Loading from '../../components/loading';
import { Utils } from '../../utils/utils';
import Account from '../../components/common/account';
@@ -14,12 +14,6 @@ const propTypes = {
isDataLoading: PropTypes.bool.isRequired,
editorContent: PropTypes.object,
permission: PropTypes.string,
- lastModified: PropTypes.string,
- latestContributor: PropTypes.string,
- onMenuClick: PropTypes.func.isRequired,
- onSearchedClick: PropTypes.func.isRequired,
- onMainNavBarClick: PropTypes.func.isRequired,
- onLinkClick: PropTypes.func.isRequired,
seadoc_access_token: PropTypes.string,
assets_url: PropTypes.string,
config: PropTypes.object,
@@ -30,59 +24,11 @@ class MainPanel extends Component {
constructor(props) {
super(props);
-
this.state = {
docUuid: '',
};
}
- onMenuClick = () => {
- this.props.onMenuClick();
- };
-
- onEditClick = (e) => {
- e.preventDefault();
- let url = siteRoot + 'lib/' + repoID + '/file' + this.props.path + '?mode=edit';
- window.open(url);
- };
-
- onMainNavBarClick = (e) => {
- let path = Utils.getEventData(e, 'path');
- this.props.onMainNavBarClick(path);
- };
-
- renderNavPath = () => {
- let paths = this.props.path.split('/');
- let nodePath = '';
- let pathElem = paths.map((item, index) => {
- if (item === '') {
- return null;
- }
- if (index === (paths.length - 1)) {
- return (
-
- /
- {item}
-
- );
- } else {
- nodePath += '/' + item;
- return (
-
- /
-
- {item}
-
-
- );
- }
- });
- return pathElem;
- };
-
static getDerivedStateFromProps(props, state) {
const { seadoc_access_token } = props;
const config = window.app.config;
@@ -102,7 +48,6 @@ class MainPanel extends Component {
}
render() {
- const errMessage = ({gettext('Folder does not exist.')}
);
const { permission, pathExist, isDataLoading, isViewFile } = this.props;
const isViewingFile = pathExist && !isDataLoading && isViewFile;
const isReadOnly = !(permission === 'rw');
@@ -119,7 +64,9 @@ class MainPanel extends Component {
- {!this.props.pathExist && errMessage}
+ {!this.props.pathExist &&
+
{gettext('Folder does not exist.')}
+ }
{this.props.pathExist && this.props.isDataLoading &&
}
{isViewingFile && Utils.isSdocFile(this.props.path) && (
{
- return (
-
- );
- };
-
- renderTreeView = () => {
- return (
-
- {/* {this.props.treeData && (
-
- )} */}
- {isWiki2 &&
-
- }
- {this.state.isShowNewFolderDialog &&
-
- }
- {this.state.isShowAddNewPageDialog &&
-
- }
-
+ {isWiki2 &&
+
+ }
+ {this.state.isShowNewFolderDialog &&
+
+ }
+ {this.state.isShowAddNewPageDialog &&
+
+ }
+
{repoName}
- {this.renderContent()}
+ {isLoading ? : (isObjectNotEmpty(config) ? this.renderFolderView() : this.renderNoFolder())}
);
diff --git a/frontend/src/utils/wiki-api.js b/frontend/src/utils/wiki-api.js
index fe258a45236..36980249311 100644
--- a/frontend/src/utils/wiki-api.js
+++ b/frontend/src/utils/wiki-api.js
@@ -106,24 +106,6 @@ class WikiAPI {
// for wiki2
- listWiki2Dir(wikiId, dirPath, withParents) {
- const path = encodeURIComponent(dirPath);
- let url = this.server + '/api/v2.1/wiki2/' + wikiId + '/page-dir/?p=' + path;
- if (withParents) {
- url = this.server + '/api/v2.1/wiki2/' + wikiId + '/page-dir/?p=' + path + '&with_parents=' + withParents;
- }
- return this.req.get(url);
- }
-
-
- getWiki2FileContent(wikiId, filePath) {
- const path = encodeURIComponent(filePath);
- const time = new Date().getTime();
- const url = this.server + '/api/v2.1/wiki2/' + wikiId + '/content/' + '?p=' + path + '&_=' + time;
- return this.req.get(url);
- }
-
-
listWikis2(options) {
/*
* options: `{type: 'shared'}`, `{type: ['mine', 'shared', ...]}`
From c97224bf6218935b635b647d8813eb931a69dc95 Mon Sep 17 00:00:00 2001
From: Michael An <2331806369@qq.com>
Date: Wed, 29 May 2024 15:32:56 +0800
Subject: [PATCH 2/2] remove wiki2 useless APIs
---
seahub/api2/endpoints/wiki2.py | 149 ---------------------------------
seahub/urls.py | 5 +-
2 files changed, 1 insertion(+), 153 deletions(-)
diff --git a/seahub/api2/endpoints/wiki2.py b/seahub/api2/endpoints/wiki2.py
index e60ec42885a..dc53e688a4c 100644
--- a/seahub/api2/endpoints/wiki2.py
+++ b/seahub/api2/endpoints/wiki2.py
@@ -316,155 +316,6 @@ def get(self, request, wiki_id):
return Response({'wiki': wiki})
-
-class Wiki2PagesDirView(APIView):
- authentication_classes = (TokenAuthentication, SessionAuthentication)
- permission_classes = (IsAuthenticatedOrReadOnly,)
- throttle_classes = (UserRateThrottle,)
-
- def get(self, request, wiki_id):
- """List all dir files in a wiki.
- """
- try:
- wiki = Wiki.objects.get(id=wiki_id)
- except Wiki.DoesNotExist:
- error_msg = "Wiki not found."
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
- parent_dir = request.GET.get("p", '/')
- parent_dir = normalize_dir_path(parent_dir)
- permission = check_folder_permission(request, wiki.repo_id, parent_dir)
- if not permission:
- error_msg = 'Permission denied.'
- return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
- try:
- repo = seafile_api.get_repo(wiki.repo_id)
- if not repo:
- error_msg = "Wiki library not found."
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- except SearpcError:
- error_msg = "Internal Server Error"
- return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
- with_parents = request.GET.get('with_parents', 'false')
- if with_parents not in ('true', 'false'):
- error_msg = 'with_parents invalid.'
- return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
- with_parents = to_python_boolean(with_parents)
- dir_id = seafile_api.get_dir_id_by_path(repo.repo_id, parent_dir)
- if not dir_id:
- error_msg = 'Folder %s not found.' % parent_dir
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
- parent_dir_list = []
- if not with_parents:
- # only return dirent list in current parent folder
- parent_dir_list.append(parent_dir)
- else:
- # if value of 'p' parameter is '/a/b/c' add with_parents's is 'true'
- # then return dirent list in '/', '/a', '/a/b' and '/a/b/c'.
- if parent_dir == '/':
- parent_dir_list.append(parent_dir)
- else:
- tmp_parent_dir = '/'
- parent_dir_list.append(tmp_parent_dir)
- for folder_name in parent_dir.strip('/').split('/'):
- tmp_parent_dir = posixpath.join(tmp_parent_dir, folder_name)
- parent_dir_list.append(tmp_parent_dir)
-
- all_dirs_info = []
- for parent_dir in parent_dir_list:
- all_dirs = get_wiki_dirs_by_path(repo.repo_id, parent_dir, [])
- all_dirs_info += all_dirs
-
- return Response({
- "dirent_list": all_dirs_info
- })
-
-
-class Wiki2PageContentView(APIView):
- authentication_classes = (TokenAuthentication, SessionAuthentication)
- permission_classes = (IsAuthenticatedOrReadOnly,)
- throttle_classes = (UserRateThrottle,)
-
- def get(self, request, wiki_id):
- """Get content of a wiki
- """
- path = request.GET.get('p', '/')
- try:
- wiki = Wiki.objects.get(id=wiki_id)
- except Wiki.DoesNotExist:
- error_msg = "Wiki not found."
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
- if not check_wiki_permission(wiki, request.user.username):
- error_msg = 'Permission denied.'
- return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
- permission = check_folder_permission(request, wiki.repo_id, '/')
- if not permission:
- error_msg = 'Permission denied.'
- return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
- try:
- repo = seafile_api.get_repo(wiki.repo_id)
- if not repo:
- error_msg = "Wiki library not found."
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- except SearpcError:
- error_msg = _("Internal Server Error")
- return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
- try:
- file_id = seafile_api.get_file_id_by_path(repo.repo_id, path)
- except SearpcError as e:
- logger.error(e)
- return api_error(HTTP_520_OPERATION_FAILED,
- "Failed to get file id by path.")
- if not file_id:
- return api_error(status.HTTP_404_NOT_FOUND, "File not found")
-
- # send stats message
- send_file_access_msg(request, repo, path, 'api')
-
- file_uuid = get_seadoc_file_uuid(repo, path)
- filename = os.path.basename(path)
-
- try:
- sdoc_server_api = SdocServerAPI(file_uuid, filename, request.user.username)
- res = sdoc_server_api.get_doc()
- content = json.dumps(res)
- except Exception as e:
- logger.error(e)
- error_msg = 'Internal Server Error'
- return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
- try:
- dirent = seafile_api.get_dirent_by_path(repo.repo_id, path)
- if dirent:
- latest_contributor, last_modified = dirent.modifier, dirent.mtime
- else:
- latest_contributor, last_modified = None, 0
- except SearpcError as e:
- logger.error(e)
- latest_contributor, last_modified = None, 0
-
- assets_url = '/api/v2.1/seadoc/download-image/' + file_uuid
- seadoc_access_token = gen_seadoc_access_token(file_uuid, filename, request.user.username, permission=permission)
-
- return Response({
- "content": content,
- "latest_contributor": email2nickname(latest_contributor),
- "last_modified": last_modified,
- "permission": permission,
- "seadoc_server_url": SEADOC_SERVER_URL,
- "seadoc_access_token": seadoc_access_token,
- "assets_url": assets_url,
- })
-
-
class Wiki2PagesView(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated, )
diff --git a/seahub/urls.py b/seahub/urls.py
index d367e9ba496..cec0d30dca2 100644
--- a/seahub/urls.py
+++ b/seahub/urls.py
@@ -204,8 +204,7 @@
from seahub.ai.apis import LibrarySdocIndexes, Search, LibrarySdocIndex, TaskStatus, \
LibraryIndexState, QuestionAnsweringSearchInLibrary, FileDownloadToken
from seahub.wiki2.views import wiki_view
-from seahub.api2.endpoints.wiki2 import Wikis2View, Wiki2View, Wiki2ConfigView, Wiki2PagesDirView, Wiki2PageContentView,\
- Wiki2PagesView, Wiki2PageView
+from seahub.api2.endpoints.wiki2 import Wikis2View, Wiki2View, Wiki2ConfigView, Wiki2PagesView, Wiki2PageView
from seahub.api2.endpoints.subscription import SubscriptionView, SubscriptionPlansView, SubscriptionLogsView
urlpatterns = [
@@ -523,9 +522,7 @@
## user::wiki2
re_path(r'^api/v2.1/wikis2/$', Wikis2View.as_view(), name='api-v2.1-wikis2'),
re_path(r'^api/v2.1/wiki2/(?P\d+)/$', Wiki2View.as_view(), name='api-v2.1-wiki2'),
- re_path(r'^api/v2.1/wiki2/(?P\d+)/page-dir/$', Wiki2PagesDirView.as_view(), name='api-v2.1-wiki2-pages-dir'),
re_path(r'^api/v2.1/wiki2/(?P\d+)/config/$', Wiki2ConfigView.as_view(), name='api-v2.1-wiki2-config'),
- re_path(r'^api/v2.1/wiki2/(?P\d+)/content/$', Wiki2PageContentView.as_view(), name='api-v2.1-wiki2-pages-content'),
re_path(r'^api/v2.1/wiki2/(?P\d+)/pages/$', Wiki2PagesView.as_view(), name='api-v2.1-wiki2-pages'),
re_path(r'^api/v2.1/wiki2/(?P\d+)/page/(?P[-0-9a-zA-Z]{4})/$', Wiki2PageView.as_view(), name='api-v2.1-wiki2-page'),