From 98ee0984a05bdff7324e6398765374fe168ec931 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 21 Mar 2022 20:08:47 +0200 Subject: [PATCH] adapted search to latest api --- .../modules/search/search-screen/search-screen.component.ts | 4 ++-- .../app/services/entity-services/platform-search.service.ts | 6 +++--- apps/red-ui/src/assets/config/config.json | 4 ++-- libs/red-domain/src/lib/search/search-input.ts | 4 ++-- libs/red-domain/src/lib/search/search.request.ts | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 57e13f5fc..eed89ea85 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -51,8 +51,8 @@ export class SearchScreenComponent extends ListingComponent imp this._platformSearchService.search({ query, dossierIds, - inDeletedDossiers: false, - inArchivedDossiers: !onlyActive, + includeDeletedDossiers: false, + includeArchivedDossiers: !onlyActive, }), ), map(searchResult => this._toMatchedDocuments(searchResult)), diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index b546c5dd1..d729373d4 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -21,7 +21,7 @@ export class PlatformSearchService extends GenericService { super(_injector, 'search-v2'); } - search({ dossierIds, query, inDeletedDossiers, inArchivedDossiers }: ISearchInput): Observable { + search({ dossierIds, query, includeDeletedDossiers, includeArchivedDossiers }: ISearchInput): Observable { if (!query) { return of({ matchedDocuments: [], @@ -35,8 +35,8 @@ export class PlatformSearchService extends GenericService { page: 0, returnSections: false, pageSize: 300, - inDeletedDossiers, - inArchivedDossiers, + includeDeletedDossiers, + includeArchivedDossiers, }; return this._post(body).pipe(switchMap(searchValue => this._loadMissingFiles$(searchValue))); diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 4f84161f0..78d1498b2 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dom1.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dom1.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/libs/red-domain/src/lib/search/search-input.ts b/libs/red-domain/src/lib/search/search-input.ts index e0eafd1ca..c2524d142 100644 --- a/libs/red-domain/src/lib/search/search-input.ts +++ b/libs/red-domain/src/lib/search/search-input.ts @@ -3,6 +3,6 @@ import { List } from '@iqser/common-ui'; export interface ISearchInput { readonly query: string; readonly dossierIds?: List; - readonly inDeletedDossiers: boolean; - readonly inArchivedDossiers: boolean; + readonly includeDeletedDossiers: boolean; + readonly includeArchivedDossiers: boolean; } diff --git a/libs/red-domain/src/lib/search/search.request.ts b/libs/red-domain/src/lib/search/search.request.ts index d497b3b14..c142351d3 100644 --- a/libs/red-domain/src/lib/search/search.request.ts +++ b/libs/red-domain/src/lib/search/search.request.ts @@ -3,8 +3,8 @@ import { List } from '@iqser/common-ui'; export interface ISearchRequest { readonly dossierIds?: List; readonly dossierTemplateIds?: List; - readonly inDeletedDossiers: boolean; - readonly inArchivedDossiers: boolean; + readonly includeDeletedDossiers: boolean; + readonly includeArchivedDossiers: boolean; readonly fileId?: string; readonly page?: number; readonly pageSize?: number;