[ADF-2010] Move/copy, when searching for folder multiple results are returned (#2727)

* adding debounce time in object picker
unify search api
fix multiples duplicate result
remove limit of 4 character to search

* remove three.min.js

* remove unused import

* tlsint fix and remove file

* rename sitesApiService to sitesService as all the other services

* fix test timeout async
This commit is contained in:
Eugenio Romano
2017-11-26 22:06:05 +00:00
committed by GitHub
parent 4549dbf1f5
commit 197fab4da8
23 changed files with 380 additions and 323 deletions

View File

@@ -1,4 +1,4 @@
<div *ngIf="pagination.hasMoreItems" class="adf-infinite-pagination">
<div *ngIf="pagination?.hasMoreItems" class="adf-infinite-pagination">
<button mat-button
*ngIf="!isLoading"
class="adf-infinite-pagination-load-more"
@@ -11,4 +11,4 @@
mode="indeterminate"
class="adf-infinite-pagination-spinner"
data-automation-id="adf-infinite-pagination-spinner"></mat-progress-bar>
</div>
</div>

View File

@@ -43,9 +43,8 @@ export * from './favorites-api.service';
export * from './nodes-api.service';
export * from './people-content.service';
export * from './people-process.service';
export * from './search-api.service';
export * from './search.service';
export * from './shared-links-api.service';
export * from './sites-api.service';
export * from './sites.service';
export * from './discovery-api.service';
export * from './comment-process.service';

View File

@@ -1,47 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/fromPromise';
import { NodePaging } from 'alfresco-js-api';
import { AlfrescoApiService } from './alfresco-api.service';
@Injectable()
export class SearchApiService {
constructor(private apiService: AlfrescoApiService) {}
private get searchApi() {
return this.apiService.getInstance().search.searchApi;
}
search(query: any): Observable<NodePaging> {
const { searchApi, handleError } = this;
const searchQuery = Object.assign(query);
const promise = searchApi.search(searchQuery);
return Observable
.fromPromise(promise)
.catch(handleError);
}
private handleError(error): Observable<any> {
return Observable.of(error);
}
}

View File

@@ -16,7 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { NodePaging } from 'alfresco-js-api';
import { NodePaging, QueryBody } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { AlfrescoApiService } from './alfresco-api.service';
import { AuthenticationService } from './authentication.service';
@@ -32,21 +32,19 @@ export class SearchService {
private apiService: AlfrescoApiService) {
}
/**
* Execute a search against the repository
*
* @param term Search term
* @param options Additional options passed to the search
* @returns {Observable<NodePaging>} Search results
*/
getNodeQueryResults(term: string, options?: SearchOptions): Observable<NodePaging> {
return Observable.fromPromise(this.getQueryNodesPromise(term, options))
return Observable.fromPromise(this.apiService.getInstance().core.queriesApi.findNodes(term, options))
.map(res => <NodePaging> res)
.catch(err => this.handleError(err));
}
getQueryNodesPromise(term: string, opts: SearchOptions): Promise<NodePaging> {
return this.apiService.getInstance().core.queriesApi.findNodes(term, opts);
search(query: QueryBody): Observable<NodePaging> {
const searchQuery = Object.assign(query);
const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);
return Observable
.fromPromise(promise)
.catch(err => this.handleError(err));
}
private handleError(error: any): Observable<any> {

View File

@@ -39,11 +39,10 @@ import { PageTitleService } from './page-title.service';
import { PeopleContentService } from './people-content.service';
import { PeopleProcessService } from './people-process.service';
import { RenditionsService } from './renditions.service';
import { SearchApiService } from './search-api.service';
import { SearchService } from './search.service';
import { SettingsService } from './settings.service';
import { SharedLinksApiService } from './shared-links-api.service';
import { SitesApiService } from './sites-api.service';
import { SitesService } from './sites.service';
import { StorageService } from './storage.service';
import { ThumbnailService } from './thumbnail.service';
import { TranslateLoaderService } from './translate-loader.service';
@@ -82,10 +81,9 @@ import { UserPreferencesService } from './user-preferences.service';
NodesApiService,
PeopleContentService,
PeopleProcessService,
SearchApiService,
SearchService,
SharedLinksApiService,
SitesApiService,
SitesService,
DiscoveryApiService,
CommentProcessService
],

View File

@@ -23,7 +23,7 @@ import { AppConfigService } from '../app-config/app-config.service';
import { AppConfigModule } from '../app-config/app-config.module';
import { AuthenticationService } from './authentication.service';
import { LogService } from './log.service';
import { SitesApiService } from './sites-api.service';
import { SitesService } from './sites.service';
import { StorageService } from './storage.service';
import { TranslateLoaderService } from './translate-loader.service';
import { UserPreferencesService } from './user-preferences.service';
@@ -46,7 +46,7 @@ describe('Sites service', () => {
})
],
providers: [
SitesApiService,
SitesService,
AlfrescoApiService,
UserPreferencesService,
AuthenticationService,
@@ -66,7 +66,7 @@ describe('Sites service', () => {
}
};
service = TestBed.get(SitesApiService);
service = TestBed.get(SitesService);
jasmine.Ajax.install();
});

View File

@@ -24,7 +24,7 @@ import 'rxjs/add/observable/fromPromise';
import 'rxjs/add/operator/catch';
@Injectable()
export class SitesApiService {
export class SitesService {
constructor(
private apiService: AlfrescoApiService) { }