mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22639 from nextcloud/feature/20916/move-unified-search-to-ocs-api 

Move unified search to OCS api
This commit is contained in:
John Molakvoæ 2020-09-07 16:16:10 +02:00 committed by GitHub
parent 99ee00be8c fea294bb29
commit 47e7257c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/Controller/UnifiedSearchController.php
View File

@ -30,16 +30,16 @@ namespace OC\Core\Controller;
use OC\Search\SearchComposer;
use OC\Search\SearchQuery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Route\IRouter;
use OCP\Search\ISearchQuery;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
class UnifiedSearchController extends Controller {
class UnifiedSearchController extends OCSController {
/** @var SearchComposer */
private $composer;
@ -67,12 +67,12 @@ class UnifiedSearchController extends Controller {
*
* @param string $from the url the user is currently at
*
* @return JSONResponse
* @return DataResponse
*/
public function getProviders(string $from = ''): JSONResponse {
public function getProviders(string $from = ''): DataResponse {
[$route, $parameters] = $this->getRouteInformation($from);
return new JSONResponse(
return new DataResponse(
$this->composer->getProviders($route, $parameters)
);
}
@ -88,20 +88,20 @@ class UnifiedSearchController extends Controller {
* @param int|string|null $cursor
* @param string $from
*
* @return JSONResponse
* @return DataResponse
*/
public function search(string $providerId,
string $term = '',
?int $sortOrder = null,
?int $limit = null,
$cursor = null,
string $from = ''): JSONResponse {
string $from = ''): DataResponse {
if (empty(trim($term))) {
return new JSONResponse(null, Http::STATUS_BAD_REQUEST);
return new DataResponse(null, Http::STATUS_BAD_REQUEST);
}
[$route, $routeParameters] = $this->getRouteInformation($from);
return new JSONResponse(
return new DataResponse(
$this->composer->search(
$this->userSession->getUser(),
$providerId,

2
core/js/dist/unified-search.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
core/routes.php
View File

@ -77,8 +77,6 @@ $application->registerRoutes($this, [
['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
['name' => 'UnifiedSearch#getProviders', 'url' => '/search/providers', 'verb' => 'GET'],
['name' => 'UnifiedSearch#search', 'url' => '/search/providers/{providerId}/search', 'verb' => 'GET'],
['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
@ -113,7 +111,11 @@ $application->registerRoutes($this, [
['root' => '/collaboration', 'name' => 'CollaborationResources#removeResource', 'url' => '/resources/collections/{collectionId}', 'verb' => 'DELETE'],
['root' => '/collaboration', 'name' => 'CollaborationResources#getCollectionsByResource', 'url' => '/resources/{resourceType}/{resourceId}', 'verb' => 'GET'],
['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST']
['root' => '/collaboration', 'name' => 'CollaborationResources#createCollectionOnResource', 'url' => '/resources/{baseResourceType}/{baseResourceId}', 'verb' => 'POST'],
// Unified search
['root' => '/search', 'name' => 'UnifiedSearch#getProviders', 'url' => '/providers', 'verb' => 'GET'],
['root' => '/search', 'name' => 'UnifiedSearch#search', 'url' => '/providers/{providerId}/search', 'verb' => 'GET'],
],
]);

11
core/src/services/UnifiedSearchService.js
View File

@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'
@ -35,15 +35,15 @@ export const regexFilterNot = /-in:([a-z_-]+)/ig
*/
export async function getTypes() {
try {
const { data } = await axios.get(generateUrl('/search/providers'), {
const { data } = await axios.get(generateOcsUrl('search', 2) + 'providers', {
params: {
// Sending which location we're currently at
from: window.location.pathname.replace('/index.php', '') + window.location.search,
},
})
if (Array.isArray(data) && data.length > 0) {
if ('ocs' in data && 'data' in data.ocs && Array.isArray(data.ocs.data) && data.ocs.data.length > 0) {
// Providers are sorted by the api based on their order key
return data
return data.ocs.data
}
} catch (error) {
console.error(error)
@ -60,8 +60,9 @@ export async function getTypes() {
* @returns {Promise}
*/
export function search(type, query, cursor) {
return axios.get(generateUrl(`/search/providers/${type}/search?term=${query}`), {
return axios.get(generateOcsUrl('search', 2) + `providers/${type}/search`, {
params: {
term: query,
cursor,
// Sending which location we're currently at
from: window.location.pathname.replace('/index.php', '') + window.location.search,

22
core/src/views/UnifiedSearch.vue
View File

@ -363,23 +363,23 @@ export default {
const request = await search(type, query)
// Process results
if (request.data.entries.length > 0) {
this.$set(this.results, type, request.data.entries)
if (request.data.ocs.data.entries.length > 0) {
this.$set(this.results, type, request.data.ocs.data.entries)
} else {
this.$delete(this.results, type)
}
// Save cursor if any
if (request.data.cursor) {
this.$set(this.cursors, type, request.data.cursor)
} else if (!request.data.isPaginated) {
if (request.data.ocs.data.cursor) {
this.$set(this.cursors, type, request.data.ocs.data.cursor)
} else if (!request.data.ocs.data.isPaginated) {
// If no cursor and no pagination, we save the default amount
// provided by server's initial state `defaultLimit`
this.$set(this.limits, type, this.defaultLimit)
}
// Check if we reached end of pagination
if (request.data.entries.length < this.defaultLimit) {
if (request.data.ocs.data.entries.length < this.defaultLimit) {
this.$set(this.reached, type, true)
}
@ -410,16 +410,16 @@ export default {
const request = await search(type, this.query, this.cursors[type])
// Save cursor if any
if (request.data.cursor) {
this.$set(this.cursors, type, request.data.cursor)
if (request.data.ocs.data.cursor) {
this.$set(this.cursors, type, request.data.ocs.data.cursor)
}
if (request.data.entries.length > 0) {
this.results[type].push(...request.data.entries)
if (request.data.ocs.data.entries.length > 0) {
this.results[type].push(...request.data.ocs.data.entries)
}
// Check if we reached end of pagination
if (request.data.entries.length < this.defaultLimit) {
if (request.data.ocs.data.entries.length < this.defaultLimit) {
this.$set(this.reached, type, true)
}
} else