Taichi Masuyama пре 4 година
родитељ
комит
d8323666ca
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 2 2
      packages/app/src/server/routes/search.js
  2. 4 4
      packages/app/src/server/service/search.ts

+ 2 - 2
packages/app/src/server/routes/search.js

@@ -147,8 +147,8 @@ module.exports = function(crowi, app) {
     let delegatorName;
     let delegatorName;
     try {
     try {
       const keyword = decodeURIComponent(q);
       const keyword = decodeURIComponent(q);
-      const nqString = nq ?? decodeURIComponent(nq);
-      [searchResult, delegatorName] = await searchService.searchKeyword(keyword, nqString, user, userGroups, searchOpts);
+      const nqName = nq ?? decodeURIComponent(nq);
+      [searchResult, delegatorName] = await searchService.searchKeyword(keyword, nqName, user, userGroups, searchOpts);
     }
     }
     catch (err) {
     catch (err) {
       logger.error('Failed to search', err);
       logger.error('Failed to search', err);

+ 4 - 4
packages/app/src/server/service/search.ts

@@ -219,8 +219,8 @@ class SearchService implements SearchQueryParser, SearchResolver {
     return this.fullTextSearchDelegator.rebuildIndex();
     return this.fullTextSearchDelegator.rebuildIndex();
   }
   }
 
 
-  // TODO: https://redmine.weseek.co.jp/issues/92049 Parse nqString as well
-  async parseSearchQuery(queryString: string, nqString: string | null): Promise<ParsedQuery> {
+  // TODO: https://redmine.weseek.co.jp/issues/92049 No need to parseNQString anymore
+  async parseSearchQuery(queryString: string, nqName: string | null): Promise<ParsedQuery> {
     // eslint-disable-next-line no-param-reassign
     // eslint-disable-next-line no-param-reassign
     queryString = normalizeQueryString(queryString);
     queryString = normalizeQueryString(queryString);
 
 
@@ -262,11 +262,11 @@ class SearchService implements SearchQueryParser, SearchResolver {
     return [nqDeledator, data];
     return [nqDeledator, data];
   }
   }
 
 
-  async searchKeyword(keyword: string, nqString: string | null, user, userGroups, searchOpts): Promise<[ISearchResult<unknown>, string | null]> {
+  async searchKeyword(keyword: string, nqName: string | null, user, userGroups, searchOpts): Promise<[ISearchResult<unknown>, string | null]> {
     let parsedQuery: ParsedQuery;
     let parsedQuery: ParsedQuery;
     // parse
     // parse
     try {
     try {
-      parsedQuery = await this.parseSearchQuery(keyword, nqString);
+      parsedQuery = await this.parseSearchQuery(keyword, nqName);
     }
     }
     catch (err) {
     catch (err) {
       logger.error('Error occurred while parseSearchQuery', err);
       logger.error('Error occurred while parseSearchQuery', err);