diff --git a/NuGet.Config b/NuGet.Config index a0572030a2..08027d47f3 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/docs/en/Repositories.md b/docs/en/Repositories.md index e39c100b47..95f908d004 100644 --- a/docs/en/Repositories.md +++ b/docs/en/Repositories.md @@ -215,7 +215,7 @@ Where as the `IReadOnlyBasicRepository` provides the following me They can all be seen as below: -![generic-repositories](\images\generic-repositories.png) +![generic-repositories](images/generic-repositories.png) ### Generic Repository without a Primary Key diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index 403e46601d..00d583c9f0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -217,7 +217,7 @@ public partial class UserManagement UserManagementTableColumns.AddRange(GetExtensionTableColumns(IdentityModuleExtensionConsts.ModuleName, IdentityModuleExtensionConsts.EntityNames.User)); - return base.SetEntityActionsAsync(); + return base.SetTableColumnsAsync(); } protected override ValueTask SetToolbarItemsAsync() diff --git a/npm/ng-packs/.npmrc b/npm/ng-packs/.npmrc index cb55c69ab1..e69de29bb2 100644 --- a/npm/ng-packs/.npmrc +++ b/npm/ng-packs/.npmrc @@ -1,2 +0,0 @@ -@abp:registry=https://www.myget.org/F/abp-nightly/npm - diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts index 5adaa0d768..5215c95398 100644 --- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts +++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts @@ -1,4 +1,4 @@ -import { Component, Injector, isDevMode, Optional, SkipSelf, Type } from '@angular/core'; +import { Component, Injector, isDevMode, OnInit, Optional, SkipSelf, Type } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { eLayoutType } from '../enums/common'; import { ABP } from '../models'; @@ -16,7 +16,7 @@ import { TreeNode } from '../utils/tree-utils'; template: ` `, providers: [SubscriptionService], }) -export class DynamicLayoutComponent { +export class DynamicLayoutComponent implements OnInit { layout?: Type; layoutKey?: eLayoutType; @@ -53,6 +53,13 @@ export class DynamicLayoutComponent { this.listenToLanguageChange(); } + ngOnInit(): void { + if(this.layout){ + return; + } + this.getLayout() + } + private checkLayoutOnNavigationEnd() { const navigationEnd$ = this.routerEvents.getNavigationEvents('End'); this.subscription.addOne(navigationEnd$, () => this.getLayout()); diff --git a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts index 85a39b5bf8..faafafedfa 100644 --- a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts +++ b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts @@ -23,14 +23,8 @@ export class AbpOAuthGuard implements IAbpGuard { if (hasValidAccessToken) { return true; } - - return of(false).pipe( - tap(() => this.httpErrorReporter.reportError({ status: 401 } as HttpErrorResponse)), - delay(1500), - tap(() => { - const params = { returnUrl: state.url }; - this.authService.navigateToLogin(params); - }), - ); + const params = { returnUrl: state.url }; + this.authService.navigateToLogin(params); + return false; } } diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts index acf603f38e..07085a50a7 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { finalize } from 'rxjs/operators'; import { SettingManagementPolicyNames } from '../../enums/policy-names'; -import { EmailSettingsService } from '../../proxy/email-settings.service'; +import { EmailSettingsService } from '@abp/ng.setting-management/proxy'; import { EmailSettingsDto } from '../../proxy/models'; @Component({ diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html index 26dcbf1297..5fc312a92d 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html @@ -154,7 +154,7 @@ > - {{ + {{ prop.formText | abpLocalization }} diff --git a/templates/NuGet.Config b/templates/NuGet.Config index c2097e6a05..554c2f634b 100644 --- a/templates/NuGet.Config +++ b/templates/NuGet.Config @@ -2,6 +2,5 @@ - \ No newline at end of file