@eo-sdk/client 7.13.0-rc.1 → 7.13.0-rc.2

package/app/eo-framework/app-shell/app-bar/app-search/app-search.component.d.ts

@@ -7,7 +7,7 @@ import { AutoComplete } from 'primeng/primeng';
 import { NgForm } from '@angular/forms';
 import { LocaleDatePipe } from '../../../../eo-framework-core/pipes/locale-date.pipe';
 import { AppSearchService } from '../../../../eo-framework-core/search/app-search.service';
-import { UserService, StoredQuery, ObjectType, SearchFilter, SearchQuery, SearchState, SearchService, SystemService, Logger, CapabilitiesService, Capabilities, StoredQueriesService, NotificationsService, PrepareService, TranslateService } from '@eo-sdk/core';
+import { UserService, StoredQuery, ObjectType, SearchFilter, SearchQuery, SearchState, SearchService, SystemService, Logger, CapabilitiesService, Capabilities, StoredQueriesService, NotificationsService, PrepareService, TranslateService, QueryScope } from '@eo-sdk/core';
 export interface IdxSearch {
     type: ObjectType;
     contextFolderType: ObjectType;
@@ -58,6 +58,7 @@ export declare class AppSearchComponent implements OnInit, AfterViewInit, OnDest
         INTERVAL_INCLUDE_FROM: string;
         RANGE: string;
     };
+    queryScope: QueryScope;
     searchInput: AutoComplete;
     expertInput: ElementRef;
     indexdataForm: ObjectFormComponent;
@@ -122,6 +123,7 @@ export declare class AppSearchComponent implements OnInit, AfterViewInit, OnDest
     resolveSelection(aggs: any[], key: string, selected: boolean): any[];
     resetExpertModeInput(): void;
     toggleExpertMode(): void;
+    setQueryScope(scope: QueryScope): void;
     xpSelectGroup(group: any): void;
     xpSelectType(type: any): void;
     xpAddToTerm(str: any): void;

package/app/eo-framework/stored-query/stored-query/stored-query.component.d.ts

@@ -3,7 +3,7 @@ import { ObjectFormHelperService } from "../../object-form/object-form-helper.se
 import { ObjectFormControlWrapper } from "../../object-form/object-form/object-form-control-wrapper";
 import { AppSearchService } from "../../../eo-framework-core/search/app-search.service";
 import { ObjectFormGroup } from "../../object-form/object-form/object-form-group";
-import { StoredQueriesService, StoredQuery, SearchService, TranslateService, SystemService } from "@eo-sdk/core";
+import { StoredQueriesService, StoredQuery, SearchService, TranslateService, SystemService, QueryScope } from "@eo-sdk/core";
 export declare class StoredQueryComponent {
     private searchService;
     private elementRef;
@@ -12,6 +12,7 @@ export declare class StoredQueryComponent {
     private storedQueriesService;
     private formHelperService;
     private appSearchService;
+    queryScope: QueryScope;
     _storedQuery: StoredQuery;
     queryFormControls: ObjectFormControlWrapper[];
     queryForm: ObjectFormGroup;
@@ -24,6 +25,7 @@ export declare class StoredQueryComponent {
     onQueryExecute: EventEmitter<any>;
     isOpen: boolean;
     constructor(searchService: SearchService, elementRef: ElementRef, translate: TranslateService, systemService: SystemService, storedQueriesService: StoredQueriesService, formHelperService: ObjectFormHelperService, appSearchService: AppSearchService);
+    setQueryScope(scope: QueryScope): void;
     createQueryForm(): void;
     private getFormElements;
     private getValue;

package/app/eo-framework/stored-query/stored-query-details/stored-query-details.component.d.ts

@@ -6,7 +6,7 @@ import { EditForm, NotifyList, Restriction } from '../stored-query.interface';
 import { StoredQueryComponent } from '../stored-query/stored-query.component';
 import { SelectionService } from '../../../eo-framework-core/selection/selection.service';
 import { UnsubscribeOnDestroy } from '../../util/unsubscribe/unsubscribe.component';
-import { StoredQuery, StoredQueriesService, SearchFilter, TranslateService, SystemService, UserService, OrgRole, SearchService } from '@eo-sdk/core';
+import { StoredQuery, StoredQueriesService, SearchFilter, TranslateService, SystemService, UserService, OrgRole, SearchService, QueryScope } from '@eo-sdk/core';
 export declare class StoredQueryDetailsComponent extends UnsubscribeOnDestroy implements OnInit {
     private router;
     private searchService;
@@ -25,6 +25,7 @@ export declare class StoredQueryDetailsComponent extends UnsubscribeOnDestroy im
     storedQueryForm: StoredQueryComponent;
     iconTitles: any;
     storedQuery: StoredQuery;
+    queryScope: QueryScope;
     editForm: EditForm;
     restrictions: Restriction[];
     editingShare: boolean;
@@ -40,6 +41,7 @@ export declare class StoredQueryDetailsComponent extends UnsubscribeOnDestroy im
     set query(q: StoredQuery);
     notifyList: EventEmitter<NotifyList>;
     constructor(router: Router, searchService: SearchService, userService: UserService, systemService: SystemService, selection: SelectionService, pendingChanges: PendingChangesService, storedQueriesService: StoredQueriesService, formHelperService: ObjectFormHelperService, translate: TranslateService);
+    setQueryScope(scope: QueryScope): void;
     setQuery(q: StoredQuery): void;
     private startPending;
     private finishPending;

package/app/eo-framework/ui/query-scope-select/query-scope-select.component.d.ts

@@ -0,0 +1,11 @@
+import { EventEmitter } from '@angular/core';
+import { QueryScope } from '@eo-sdk/core';
+export declare class QueryScopeSelectComponent {
+    QueryScope: typeof QueryScope;
+    private _selectedQueryScope;
+    set selectedQueryScope(scope: QueryScope);
+    get selectedQueryScope(): QueryScope;
+    select: EventEmitter<QueryScope>;
+    constructor();
+    selectQueryScope(scope: QueryScope): void;
+}

package/app/eo-framework-core/search/app-search.service.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { SearchFilter, SearchQuery, SearchState, SystemService, ObjectType, SearchService, EventService } from '@eo-sdk/core';
+import { SearchFilter, SearchQuery, SearchState, SystemService, ObjectType, SearchService, EventService, QueryScope } from '@eo-sdk/core';
 /**
  * AppSearchService is the apps main entry point for searching (used by the appBarSearch component).
  * It provides an `query$` observable components can subscribe to, to
@@ -43,6 +43,7 @@ export declare class AppSearchService {
      */
     toggleExpertMode(): void;
     setTerm(term: string): void;
+    setQueryScope(scope: QueryScope): void;
     setAggs(aggs: any, extend?: boolean): void;
     /**
      * Toggles a type filter.

package/assets/_default/i18n/de.json

@@ -194,6 +194,9 @@
   "eo.notifications.filter.resubmission.label": "Wiedervorlage",
   "eo.search.close": "Suche schließen",
   "eo.search.clear.search": "Suche löschen",
+  "eo.search.scope.all.label": "Alles",
+  "eo.search.scope.content.label": "Nur Dokumentdateien",
+  "eo.search.scope.indexdata.label": "Nur Metadaten",
   "eo.add.title.location.subfolder": "Ablage in '{{folder}}'",
   "eo.add.empty.root.types": "Es steht kein Objekttyp zur Verfügung.",
   "eo.sort.by": "Sortieren nach",

package/assets/_default/i18n/en.json

@@ -196,6 +196,9 @@
   "eo.notifications.filter.resubmission.label": "Follow-up",
   "eo.search.close": "Close search",
   "eo.search.clear.search": "Delete search",
+  "eo.search.scope.all.label": "All",
+  "eo.search.scope.content.label": "Document files only",
+  "eo.search.scope.indexdata.label": "Metadata only",
   "eo.add.title.location.subfolder": "File to '{{folder}}'",
   "eo.add.empty.root.types": "There are no object types available.",
   "eo.sort.by": "Sort by",

package/bundles/eo-sdk-client-projects-eo-sdk-core.umd.js

@@ -3791,14 +3791,14 @@
                 // remove stored access data
                 this.storage.removeItem(this.TOKEN_STORAGE_KEY).subscribe();
                 if (this.coreConfig.environment.production && EnvironmentEnaio.isWebEnvironment()) {
-                    window.location.href = '/logout';
+                    window.location.href = this.config.getLoginBase() + '/logout';
                     return;
                 }
             }
             if (gatewayLogout) {
                 // by default we are just resetting internal state to 'logged out' and in
                 // some cases call gateways logout endpoint to do logout stuff there silently
-                this.http.get((this.profile.host || '') + "/logout").subscribe();
+                this.http.get("" + (this.profile.host || '') + this.config.getLoginBase() + "/logout").subscribe();
             }
             this.backend.setAuthProfile(this.profile);
             this.eventService.trigger(EnaioEvent.LOGOUT);
@@ -4588,6 +4588,11 @@
         { type: EventService }
     ]; };
 
+    (function (QueryScope) {
+        QueryScope["ALL"] = "all";
+        QueryScope["CONTENT"] = "content";
+        QueryScope["INDEX_DATA"] = "indexdata";
+    })(exports.QueryScope || (exports.QueryScope = {}));
     /**
      * The SearchQuery Class
      *
@@ -4768,6 +4773,7 @@
             // add options when they differ from the default values
             if (this.applyOptions()) {
                 queryJson.options = {};
+                queryJson.options.scope = this.scope;
                 if (this.suggest) {
                     queryJson.options.suggest = true;
                 }
@@ -4800,6 +4806,7 @@
         // determines whether or not the query send to the search service should contain options
         SearchQuery.prototype.applyOptions = function () {
             return (this.expertMode ||
+                !!this.scope ||
                 this.suggest ||
                 this.highlighting ||
                 this.resolveReference ||
@@ -5170,6 +5177,7 @@
             this.filters = searchQuery ? searchQuery.filters : [];
             this.suggest = searchQuery ? searchQuery.suggest : false;
             this.expertMode = searchQuery ? searchQuery.expertMode : false;
+            this.scope = searchQuery ? searchQuery.scope : null;
             this.searchMode = searchQuery ? searchQuery.searchMode : 'idx';
         };
         /**
@@ -5349,6 +5357,7 @@
                 if (qObj_1.options) {
                     q.suggest = qObj_1.options.suggest || false;
                     q.expertMode = qObj_1.options.expertmode || false;
+                    q.scope = qObj_1.options.scope;
                     q.resolveReference = qObj_1.options.resolveReference || true;
                     q.searchMode =
                         qObj_1.options.searchmode || SearchQuery.DEFAULT_SEARCH_MODE;