@abp/ng.core 7.1.0 → 7.2.0-rc.1

package/lib/core.module.d.ts

@@ -14,16 +14,17 @@ import * as i9 from "./components/replaceable-route-container.component";
 import * as i10 from "./directives/replaceable-template.directive";
 import * as i11 from "./components/router-outlet.component";
 import * as i12 from "./pipes/sort.pipe";
-import * as i13 from "./directives/stop-propagation.directive";
-import * as i14 from "./pipes/to-injector.pipe";
-import * as i15 from "./pipes/short-date-time.pipe";
-import * as i16 from "./pipes/short-time.pipe";
-import * as i17 from "./pipes/short-date.pipe";
-import * as i18 from "@angular/common";
-import * as i19 from "@angular/common/http";
-import * as i20 from "@angular/forms";
-import * as i21 from "@angular/router";
-import * as i22 from "./localization.module";
+import * as i13 from "./pipes/safe-html.pipe";
+import * as i14 from "./directives/stop-propagation.directive";
+import * as i15 from "./pipes/to-injector.pipe";
+import * as i16 from "./pipes/short-date-time.pipe";
+import * as i17 from "./pipes/short-time.pipe";
+import * as i18 from "./pipes/short-date.pipe";
+import * as i19 from "@angular/common";
+import * as i20 from "@angular/common/http";
+import * as i21 from "@angular/forms";
+import * as i22 from "@angular/router";
+import * as i23 from "./localization.module";
 /**
  * BaseCoreModule is the module that holds
  * all imports, declarations, exports, and entryComponents
@@ -32,7 +33,7 @@ import * as i22 from "./localization.module";
  */
 export declare class BaseCoreModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<BaseCoreModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<BaseCoreModule, [typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.StopPropagationDirective, typeof i14.ToInjectorPipe, typeof i15.ShortDateTimePipe, typeof i16.ShortTimePipe, typeof i17.ShortDatePipe], [typeof i18.CommonModule, typeof i19.HttpClientModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.RouterModule, typeof i22.LocalizationModule], [typeof i18.CommonModule, typeof i19.HttpClientModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.RouterModule, typeof i22.LocalizationModule, typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.StopPropagationDirective, typeof i14.ToInjectorPipe, typeof i15.ShortDateTimePipe, typeof i16.ShortTimePipe, typeof i17.ShortDatePipe]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<BaseCoreModule, [typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.SafeHtmlPipe, typeof i14.StopPropagationDirective, typeof i15.ToInjectorPipe, typeof i16.ShortDateTimePipe, typeof i17.ShortTimePipe, typeof i18.ShortDatePipe], [typeof i19.CommonModule, typeof i20.HttpClientModule, typeof i21.FormsModule, typeof i21.ReactiveFormsModule, typeof i22.RouterModule, typeof i23.LocalizationModule], [typeof i19.CommonModule, typeof i20.HttpClientModule, typeof i21.FormsModule, typeof i21.ReactiveFormsModule, typeof i22.RouterModule, typeof i23.LocalizationModule, typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.SafeHtmlPipe, typeof i14.StopPropagationDirective, typeof i15.ToInjectorPipe, typeof i16.ShortDateTimePipe, typeof i17.ShortTimePipe, typeof i18.ShortDatePipe]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<BaseCoreModule>;
 }
 /**
@@ -41,7 +42,7 @@ export declare class BaseCoreModule {
  */
 export declare class RootCoreModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<RootCoreModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<RootCoreModule, never, [typeof BaseCoreModule, typeof i22.LocalizationModule, typeof i19.HttpClientXsrfModule], [typeof BaseCoreModule, typeof i22.LocalizationModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<RootCoreModule, never, [typeof BaseCoreModule, typeof i23.LocalizationModule, typeof i20.HttpClientXsrfModule], [typeof BaseCoreModule, typeof i23.LocalizationModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<RootCoreModule>;
 }
 /**

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/pipes/index.d.ts

@@ -1,4 +1,5 @@
 export * from './localization.pipe';
+export * from './safe-html.pipe';
 export * from './sort.pipe';
 export * from './to-injector.pipe';
 export * from './short-date.pipe';

package/lib/pipes/safe-html.pipe.d.ts

@@ -0,0 +1,9 @@
+import { PipeTransform } from '@angular/core';
+import * as i0 from "@angular/core";
+export declare class SafeHtmlPipe implements PipeTransform {
+    private readonly sanitizer;
+    transform(value: string): string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SafeHtmlPipe, never>;
+    static ɵpipe: i0.ɵɵPipeDeclaration<SafeHtmlPipe, "abpSafeHtml", false>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SafeHtmlPipe>;
+}

package/lib/services/config-state.service.d.ts

@@ -1,11 +1,13 @@
 import { Observable } from 'rxjs';
+import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
+import { AbpApplicationLocalizationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-localization.service';
 import { ApplicationConfigurationDto, ApplicationGlobalFeatureConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';
 import * as i0 from "@angular/core";
 export declare class ConfigStateService {
-    private readonly store;
-    private readonly includeLocalizationResources;
     private abpConfigService;
     private abpApplicationLocalizationService;
+    private readonly includeLocalizationResources;
+    private readonly store;
     get createOnUpdateStream(): <Slice>(selector: (state: {
         localization?: {
             values?: {
@@ -176,7 +178,7 @@ export declare class ConfigStateService {
         };
     }) => Slice, filterFn?: (x: Slice) => boolean) => Observable<Slice>;
     private updateSubject;
-    constructor();
+    constructor(abpConfigService: AbpApplicationConfigurationService, abpApplicationLocalizationService: AbpApplicationLocalizationService, includeLocalizationResources: boolean | null);
     private initUpdateStream;
     private getLocalizationAndCombineWithAppState;
     private getlocalizationResource;
@@ -371,6 +373,6 @@ export declare class ConfigStateService {
     private isGlobalFeatureEnabled;
     getGlobalFeatureIsEnabled(key: string): boolean;
     getGlobalFeatureIsEnabled$(key: string): Observable<boolean>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<ConfigStateService, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ConfigStateService, [null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ConfigStateService>;
 }

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.0",
+  "version": "7.2.0-rc.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/utils": "~7.1.0",
+    "@abp/utils": "~7.2.0-rc.1",
     "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>;