@abp/ng.core 7.1.1 → 7.2.0-rc.2

package/lib/models/common.d.ts

@@ -11,6 +11,7 @@ export declare namespace ABP {
         sendNullsAsQueryParam?: boolean;
         tenantKey?: string;
         localizations?: Localization[];
+        othersGroup?: string;
     }
     interface Child {
         localizations?: Localization[];
@@ -58,6 +59,7 @@ export declare namespace ABP {
         path?: string;
         layout?: eLayoutType;
         iconClass?: string;
+        group?: string;
     }
     interface Tab extends Nav {
         component: Type<any>;

package/lib/models/rest.d.ts

@@ -3,6 +3,7 @@ export declare namespace Rest {
     type Config = Partial<{
         apiName: string;
         skipHandleError: boolean;
+        skipAddingHeader: boolean;
         observe: Observe;
         httpParamEncoder?: HttpParameterCodec;
     }>;

package/lib/services/rest.service.d.ts

@@ -1,5 +1,6 @@
 import { HttpClient, HttpRequest } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { ExternalHttpClient } from '../clients/http.client';
 import { ABP } from '../models/common';
 import { Rest } from '../models/rest';
 import { EnvironmentService } from './environment.service';
@@ -8,12 +9,14 @@ import * as i0 from "@angular/core";
 export declare class RestService {
     protected options: ABP.Root;
     protected http: HttpClient;
+    protected externalHttp: ExternalHttpClient;
     protected environment: EnvironmentService;
     protected httpErrorReporter: HttpErrorReporterService;
-    constructor(options: ABP.Root, http: HttpClient, environment: EnvironmentService, httpErrorReporter: HttpErrorReporterService);
+    constructor(options: ABP.Root, http: HttpClient, externalHttp: ExternalHttpClient, environment: EnvironmentService, httpErrorReporter: HttpErrorReporterService);
     protected getApiFromStore(apiName: string | undefined): string;
     handleError(err: any): Observable<any>;
     request<T, R>(request: HttpRequest<T> | Rest.Request<T>, config?: Rest.Config, api?: string): Observable<R>;
+    private getHttpClient;
     private getParams;
     private removeDuplicateSlashes;
     static ɵfac: i0.ɵɵFactoryDeclaration<RestService, never>;

package/lib/services/routes.service.d.ts

@@ -1,7 +1,7 @@
 import { Injector, OnDestroy } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ABP } from '../models/common';
-import { TreeNode } from '../utils/tree-utils';
+import { TreeNode, RouteGroup } from '../utils/tree-utils';
 import * as i0 from "@angular/core";
 export declare abstract class AbstractTreeService<T extends {
     [key: string | number | symbol]: any;
@@ -13,6 +13,7 @@ export declare abstract class AbstractTreeService<T extends {
     private _flat$;
     private _tree$;
     private _visible$;
+    protected othersGroup: string;
     get flat(): T[];
     get flat$(): Observable<T[]>;
     get tree(): TreeNode<T>[];
@@ -20,6 +21,7 @@ export declare abstract class AbstractTreeService<T extends {
     get visible(): TreeNode<T>[];
     get visible$(): Observable<TreeNode<T>[]>;
     protected createTree(items: T[]): TreeNode<T>[];
+    protected createGroupedTree(list: TreeNode<T>[]): RouteGroup<T>[] | undefined;
     private filterWith;
     private findItemsToRemove;
     private publish;
@@ -47,6 +49,9 @@ export declare abstract class AbstractNavTreeService<T extends ABP.Nav> extends
     static ɵprov: i0.ɵɵInjectableDeclaration<AbstractNavTreeService<any>>;
 }
 export declare class RoutesService extends AbstractNavTreeService<ABP.Route> {
+    private hasPathOrChild;
+    get groupedVisible(): RouteGroup<ABP.Route>[] | undefined;
+    get groupedVisible$(): Observable<RouteGroup<ABP.Route>[] | undefined>;
     static ɵfac: i0.ɵɵFactoryDeclaration<RoutesService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<RoutesService>;
 }

package/lib/tokens/index.d.ts

@@ -12,3 +12,4 @@ export * from './pipe-to-login.token';
 export * from './set-token-response-to-storage.token';
 export * from './check-authentication-state';
 export * from './http-context.token';
+export * from './others-group.token';

package/lib/tokens/others-group.token.d.ts

@@ -0,0 +1,2 @@
+import { InjectionToken } from '@angular/core';
+export declare const OTHERS_GROUP: InjectionToken<string>;

package/lib/utils/tree-utils.d.ts

@@ -8,6 +8,9 @@ export declare class BaseTreeNode<T extends object> {
 export declare function createTreeFromList<T extends object, R>(list: T[], keySelector: (item: T) => NodeKey, parentKeySelector: typeof keySelector, valueMapper: (item: T) => R): R[];
 export declare function createMapFromList<T extends object, R>(list: T[], keySelector: (item: T) => NodeKey, valueMapper: (item: T) => R): Map<NodeKey, R>;
 export declare function createTreeNodeFilterCreator<T extends object>(key: keyof T, mapperFn: (value: any) => string): (search: string) => (nodes: TreeNode<T>[], matches?: TreeNode<T>[]) => TreeNode<T>[];
+export declare function createGroupMap<T extends {
+    group?: string;
+}>(list: TreeNode<T>[], othersGroupKey: string): Map<string, TreeNode<T>[]>;
 export declare type TreeNode<T extends object> = {
     [K in keyof T]: T[K];
 } & {
@@ -15,5 +18,9 @@ export declare type TreeNode<T extends object> = {
     isLeaf: boolean;
     parent?: TreeNode<T>;
 };
+export declare type RouteGroup<T extends object> = {
+    readonly group: string;
+    readonly items: TreeNode<T>[];
+};
 export declare type NodeKey = number | string | symbol | undefined | null;
 export declare type NodeValue<T extends object, F extends (...args: any) => any> = F extends undefined ? TreeNode<T> : ReturnType<F>;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.core",
-  "version": "7.1.1",
+  "version": "7.2.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/utils": "~7.1.1",
+    "@abp/utils": "~7.2.0",
     "angular-oauth2-oidc": "^15.0.1",
     "just-clone": "^6.1.1",
     "just-compare": "^2.3.0",

package/testing/lib/services/mock-rest.service.d.ts

@@ -1,12 +1,13 @@
-import { ABP, EnvironmentService, RestService } from '@abp/ng.core';
+import { ABP, EnvironmentService, ExternalHttpClient, RestService } from '@abp/ng.core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
 export declare class MockRestService extends RestService {
     protected options: ABP.Root;
     protected http: HttpClient;
+    protected externalhttp: ExternalHttpClient;
     protected environment: EnvironmentService;
-    constructor(options: ABP.Root, http: HttpClient, environment: EnvironmentService);
+    constructor(options: ABP.Root, http: HttpClient, externalhttp: ExternalHttpClient, environment: EnvironmentService);
     handleError(err: any): Observable<any>;
     static ɵfac: i0.ɵɵFactoryDeclaration<MockRestService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MockRestService>;