feat/seasearch: add wiki search api

frontend/src/components/search/search.js

@@ -21,6 +21,7 @@ const propTypes = {
   onSearchedClick: PropTypes.func.isRequired,
   isPublic: PropTypes.bool,
   isViewFile: PropTypes.bool,
+  isWiki2: PropTypes.bool,
 };
 
 const PER_PAGE = 10;
@@ -564,6 +565,23 @@ class Search extends Component {
   renderSearchTypes = (inputValue) => {
     const highlightIndex = this.state.highlightSearchTypesIndex;
     const { resultItems } = this.state;
+    if (this.props.isWiki2) {
+      return (
+        <div className="search-types">
+          <div
+            className="search-types-wiki search-types-highlight"
+            onClick={this.searchWiki}
+            tabIndex={0}
+          >
+            <i className="search-icon-left input-icon-addon sf3-font sf3-font-search"></i>
+            {inputValue}
+            <span className="search-types-text">{gettext('in this wiki')}</span>
+            <i className="sf3-font sf3-font-enter"></i>
+          </div>
+        </div>
+      );
+    }
+
     if (!this.props.repoID) {
       return (
         <div className="search-result-list-container" ref={this.searchResultListContainerRef}>
@@ -682,6 +700,69 @@ class Search extends Component {
     this.getSearchResult(queryData);
   };
 
+  getWikiSearchResult = (queryData) => {
+    if (this.source) {
+      this.source.cancel('prev request is cancelled');
+    }
+    this.setState({
+      isLoading: true,
+      isResultGetted: false,
+      resultItems: [],
+      highlightIndex: 0,
+    });
+    this.source = seafileAPI.getSource();
+
+    const query = queryData.q;
+    const search_wiki = this.props.repoID;
+
+    searchAPI.searchWiki(query, search_wiki, this.source.token).then(res => {
+      this.source = null;
+      if (res.data.total > 0) {
+        this.setState({
+          resultItems: this.formatWikiResultItems(res.data.results),
+          isResultGetted: true,
+          isLoading: false,
+          page: 1,
+          hasMore: res.data.has_more,
+        });
+      } else {
+        this.setState({
+          highlightIndex: 0,
+          resultItems: [],
+          isLoading: false,
+          isResultGetted: true,
+          hasMore: false,
+        });
+      }
+    }).catch(error => {
+      let errMessage = Utils.getErrorMsg(error);
+      toaster.danger(errMessage);
+      this.setState({ isLoading: false });
+    });
+  };
+
+  formatWikiResultItems(data) {
+    return data.map((item, index) => ({
+      index: [index],
+      name: item.name,
+      path: item.path,
+      repo_id: item.repo_id,
+      repo_name: item.repo_name,
+      is_dir: false,
+      link_content: item.path,
+      content: item.content_highlight,
+    }));
+  }
+
+  searchWiki = () => {
+    const { value } = this.state;
+    const queryData = {
+      q: value,
+      search_repo: this.props.repoID,
+    };
+    this.getWikiSearchResult(queryData);
+  };
+
   renderResults = (resultItems, isVisited) => {
     const { highlightIndex } = this.state;
     const results = (

frontend/src/pages/wiki2/side-panel.js

@@ -14,6 +14,7 @@ import { Utils } from '../../utils/utils';
 import WikiExternalOperations from './wiki-external-operations';
 import WikiTrashDialog from './wiki-trash-dialog';
 import { DEFAULT_PAGE_NAME } from './constant';
+import Search from '../../components/search/search';
 
 import './side-panel.css';
 
@@ -176,6 +177,12 @@ class SidePanel extends Component {
             </div>
           }
         </div>
+        <Search
+          repoID={wikiId}
+          onSearchedClick={this.onSearchedClick}
+          placeholder={gettext('Search')}
+          isWiki2={true}
+        />
         <div className="wiki2-side-nav">
           {isLoading ? <Loading/> : this.renderWikiNav()}
         </div>

frontend/src/utils/search-api.js

@@ -49,6 +49,14 @@ class SearchAPI {
     return this.req.get(url, { cancelToken: cancelToken });
   }
 
+  searchWiki(query, search_wiki, cancelToken) {
+    let url = this.server + '/api/v2.1/wiki2/search/';
+    let data = {
+      query: query,
+      search_wiki: search_wiki
+    };
+    return this.req.post(url, data, { cancelToken: cancelToken });
+  }
 }
 
 let searchAPI = new SearchAPI();

seahub/api2/endpoints/utils.py

@@ -319,3 +319,12 @@ def event_export_status(task_id):
     resp = requests.get(url, params=params, headers=headers)
 
     return resp
+
+
+def wiki_search(params):
+    payload = {'exp': int(time.time()) + 300, }
+    token = jwt.encode(payload, SECRET_KEY, algorithm='HS256')
+    headers = {"Authorization": "Token %s" % token}
+    url = urljoin(SEAFEVENTS_SERVER_URL, '/wiki-search')
+    resp = requests.post(url, json=params, headers=headers)
+    return resp

seahub/api2/endpoints/wiki2.py

@@ -3,47 +3,44 @@
 import os
 import json
 import logging
-import requests
 import posixpath
-import time
 import datetime
 import uuid
 import re
-import urllib.request, urllib.error, urllib.parse
 from copy import deepcopy
 from constance import config
 
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
-from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from seaserv import seafile_api, edit_repo
+from seaserv import seafile_api
 from pysearpc import SearpcError
 from django.utils.translation import gettext as _
 
 from seahub.api2.authentication import TokenAuthentication
 from seahub.api2.throttling import UserRateThrottle
-from seahub.api2.utils import api_error, to_python_boolean, is_wiki_repo
+from seahub.api2.utils import api_error, is_wiki_repo
+from seahub.api2.endpoints.utils import wiki_search
 from seahub.utils.db_api import SeafileDB
 from seahub.wiki2.models import Wiki2 as Wiki
 from seahub.wiki2.models import WikiPageTrash, Wiki2Publish
-from seahub.wiki2.utils import is_valid_wiki_name, can_edit_wiki, get_wiki_dirs_by_path, \
-    get_wiki_config, WIKI_PAGES_DIR, WIKI_CONFIG_PATH, WIKI_CONFIG_FILE_NAME, is_group_wiki, \
+from seahub.wiki2.utils import is_valid_wiki_name, get_wiki_config, WIKI_PAGES_DIR, is_group_wiki, \
     check_wiki_admin_permission, check_wiki_permission, get_all_wiki_ids, get_and_gen_page_nav_by_id, \
     get_current_level_page_ids, save_wiki_config, gen_unique_id, gen_new_page_nav_by_id, pop_nav, \
     delete_page, move_nav, revert_nav, get_sub_ids_by_page_id, get_parent_id_stack
 
-from seahub.utils import is_org_context, get_user_repos, gen_inner_file_get_url, gen_file_upload_url, \
-    normalize_dir_path, is_pro_version, check_filename_with_rename, is_valid_dirent_name, get_no_duplicate_obj_name
+from seahub.utils import is_org_context, get_user_repos, is_pro_version, is_valid_dirent_name, \
+    get_no_duplicate_obj_name
+
 from seahub.views import check_folder_permission
 from seahub.base.templatetags.seahub_tags import email2nickname
-from seahub.utils.file_op import check_file_lock, ONLINE_OFFICE_LOCK_OWNER, if_locked_by_online_office
-from seahub.utils.repo import parse_repo_perm, get_repo_owner
+from seahub.utils.file_op import check_file_lock
+from seahub.utils.repo import get_repo_owner, is_valid_repo_id_format
 from seahub.seadoc.utils import get_seadoc_file_uuid, gen_seadoc_access_token, copy_sdoc_images_with_sdoc_uuid
-from seahub.settings import SEADOC_SERVER_URL, ENABLE_STORAGE_CLASSES, STORAGE_CLASS_MAPPING_POLICY, \
+from seahub.settings import ENABLE_STORAGE_CLASSES, STORAGE_CLASS_MAPPING_POLICY, \
     ENCRYPTED_LIBRARY_VERSION
-from seahub.seadoc.sdoc_server_api import SdocServerAPI
 from seahub.utils.timeutils import timestamp_to_isoformat_timestr
 from seahub.utils.ccnet_db import CcnetDB
 from seahub.tags.models import FileUUIDMap
@@ -54,7 +51,6 @@
 from seahub.utils.rpc import SeafileAPI
 from seahub.constants import PERMISSION_READ_WRITE
 from seaserv import ccnet_api
-from seahub.signals import clean_up_repo_trash
 
 HTTP_520_OPERATION_FAILED = 520
 
@@ -1275,3 +1271,43 @@ def delete(self, request, wiki_id):
         if publish_config:
             publish_config.delete()
         return Response({'success': True})
+
+
+class WikiSearch(APIView):
+    authentication_classes = (TokenAuthentication, SessionAuthentication)
+    permission_classes = (IsAuthenticated, )
+    throttle_classes = (UserRateThrottle, )
+
+    def post(self, request):
+        query = request.data.get('query')
+        search_wiki = request.data.get('search_wiki')
+
+        try:
+            count = int(request.data.get('count'))
+        except:
+            count = 20
+
+        if not query:
+            return api_error(status.HTTP_400_BAD_REQUEST, 'wiki search query invalid')
+
+        if not is_valid_repo_id_format(search_wiki):
+            error_msg = 'search_wiki invalid.'
+            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+
+        params = {
+            'query': query,
+            'wiki': search_wiki,
+            'count': count,
+        }
+
+        try:
+            resp = wiki_search(params)
+            if resp.status_code == 500:
+                logger.error('search in wiki error status: %s body: %s', resp.status_code, resp.text)
+                return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error')
+            resp_json = resp.json()
+        except Exception as e:
+            logger.error(e)
+            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal Server Error')
+
+        return Response(resp_json, resp.status_code)

seahub/urls.py

@@ -208,7 +208,8 @@
 from seahub.ocm.settings import OCM_ENDPOINT
 from seahub.wiki2.views import wiki_view, wiki_publish_view
 from seahub.api2.endpoints.wiki2 import Wikis2View, Wiki2View, Wiki2ConfigView, Wiki2PagesView, Wiki2PageView, \
-    Wiki2DuplicatePageView, WikiPageTrashView, Wiki2PublishView, Wiki2PublishConfigView, Wiki2PublishPageView
+    Wiki2DuplicatePageView, WikiPageTrashView, Wiki2PublishView, Wiki2PublishConfigView, Wiki2PublishPageView, \
+    WikiSearch
 from seahub.api2.endpoints.subscription import SubscriptionView, SubscriptionPlansView, SubscriptionLogsView
 from seahub.api2.endpoints.metadata_manage import MetadataRecords, MetadataManage, MetadataColumns, MetadataRecordInfo, \
     MetadataViews, MetadataViewsMoveView, MetadataViewsDetailView, MetadataViewsDuplicateView, FacesRecords, \
@@ -554,6 +555,8 @@
     re_path(r'^api/v2.1/wiki2/(?P<wiki_id>[-0-9a-f]{36})/duplicate-page/$', Wiki2DuplicatePageView.as_view(), name='api-v2.1-wiki2-duplicate-page'),
     re_path(r'^api/v2.1/wiki2/(?P<wiki_id>[-0-9a-f]{36})/trash/', WikiPageTrashView.as_view(), name='api-v2.1-wiki2-trash'),
     re_path(r'^api/v2.1/wiki2/(?P<wiki_id>[-0-9a-f]{36})/publish/$', Wiki2PublishView.as_view(), name='api-v2.1-wiki2-publish'),
+    re_path(r'^api/v2.1/wiki2/search/$', WikiSearch.as_view(), name='api-v2.1-wiki2-search'),
+
     ## user::drafts
     re_path(r'^api/v2.1/drafts/$', DraftsView.as_view(), name='api-v2.1-drafts'),
     re_path(r'^api/v2.1/drafts/(?P<pk>\d+)/$', DraftView.as_view(), name='api-v2.1-draft'),