diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index b6fd63572..4a1007320 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -39,6 +39,7 @@ import { AnnotationsListComponent } from './components/file-workload/components/ import { AnnotationSourceComponent } from './components/file-workload/components/annotation-source/annotation-source.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; +import { PlatformSearchService } from './shared/services/platform-search.service'; const screens = [FilePreviewScreenComponent, SearchScreenComponent]; @@ -84,6 +85,7 @@ const services = [ PdfViewerDataService, AnnotationDrawService, AnnotationProcessingService, + PlatformSearchService, ]; @NgModule({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts index a941e78b5..bf133e511 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts @@ -9,7 +9,7 @@ import { SearchPositions, TableColumnConfig, } from '@iqser/common-ui'; -import { List, MatchedDocument, SearchControllerService, SearchResult } from '@redaction/red-ui-http'; +import { List, MatchedDocument, SearchResult } from '@redaction/red-ui-http'; import { BehaviorSubject, Observable } from 'rxjs'; import { debounceTime, map, skip, switchMap, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; @@ -18,6 +18,7 @@ import { fileStatusTranslations } from '../../translations/file-status-translati import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { PlatformSearchService } from '../../shared/services/platform-search.service'; interface ListItem extends IListable { readonly dossierId: string; @@ -69,7 +70,7 @@ export class SearchScreenComponent extends ListingComponent implements private readonly _dossiersService: DossiersService, readonly routerHistoryService: RouterHistoryService, private readonly _translateService: TranslateService, - private readonly _searchControllerService: SearchControllerService, + private readonly _platformSearchService: PlatformSearchService, ) { super(_injector); this.searchService.skip = true; @@ -108,7 +109,7 @@ export class SearchScreenComponent extends ListingComponent implements } private _search(searchInput: SearchInput): Observable { - return this._searchControllerService.search({ + return this._platformSearchService.search({ dossierIds: [...searchInput.dossierIds], queryString: searchInput.query ?? '', page: 1, diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/platform-search.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/platform-search.service.ts new file mode 100644 index 000000000..ff8f8a55c --- /dev/null +++ b/apps/red-ui/src/app/modules/dossier/shared/services/platform-search.service.ts @@ -0,0 +1,14 @@ +import { Injectable, Injector } from '@angular/core'; +import { GenericService } from '@iqser/common-ui'; +import { SearchRequest, SearchResult } from '@redaction/red-ui-http'; + +@Injectable() +export class PlatformSearchService extends GenericService { + constructor(protected readonly _injector: Injector) { + super(_injector, 'search'); + } + + search(body: SearchRequest) { + return this._post(body); + } +} diff --git a/libs/red-ui-http/src/lib/api.module.ts b/libs/red-ui-http/src/lib/api.module.ts index 5304fad3a..37fdf8dcf 100644 --- a/libs/red-ui-http/src/lib/api.module.ts +++ b/libs/red-ui-http/src/lib/api.module.ts @@ -1,14 +1,13 @@ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; import { Configuration } from './configuration'; import { HttpClient } from '@angular/common/http'; -import { SearchControllerService } from './api/searchController.service'; import { NotificationControllerService } from './api/notificationController.service'; @NgModule({ imports: [], declarations: [], exports: [], - providers: [SearchControllerService, NotificationControllerService], + providers: [NotificationControllerService], }) export class ApiModule { constructor(@Optional() @SkipSelf() parentModule: ApiModule, @Optional() http: HttpClient) {