Merge branch 'abpframework:dev' into dev

NuGet.Config

@@ -2,6 +2,5 @@
 <configuration>
     <packageSources>
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="BlazoriseMyGet" value="https://www.myget.org/F/blazorise/api/v3/index.json" />
     </packageSources>
 </configuration>

docs/en/Repositories.md

@@ -215,7 +215,7 @@ Where as the `IReadOnlyBasicRepository<Tentity, TKey>` 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
 

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()

npm/ng-packs/.npmrc

@@ -1,2 +0,0 @@
-@abp:registry=https://www.myget.org/F/abp-nightly/npm
-

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: ` <ng-container *ngIf="isLayoutVisible" [ngComponentOutlet]="layout"></ng-container> `,
   providers: [SubscriptionService],
 })
-export class DynamicLayoutComponent {
+export class DynamicLayoutComponent implements OnInit {
   layout?: Type<any>;
   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());

npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts

@@ -23,14 +23,8 @@ export class AbpOAuthGuard implements IAbpGuard {
     if (hasValidAccessToken) {
       return true;
     }
-
+    const params = { returnUrl: state.url };
-    return of(false).pipe(
+    this.authService.navigateToLogin(params);
-      tap(() => this.httpErrorReporter.reportError({ status: 401 } as HttpErrorResponse)),
+    return false;
-      delay(1500),
-      tap(() => {
-        const params = { returnUrl: state.url };
-        this.authService.navigateToLogin(params);
-      }),
-    );
   }
 }

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({

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html

@@ -154,7 +154,7 @@
       ></abp-password>
     </ng-template>
 
-    <small *ngIf="prop.formText" class="form-text text-muted">{{
+    <small *ngIf="prop.formText" class="text-muted d-block">{{
       prop.formText | abpLocalization
     }}</small>
   </div>

templates/NuGet.Config

@@ -2,6 +2,5 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="ABP Nightly" value="https://www.myget.org/F/abp-nightly/api/v3/index.json" />
   </packageSources>
 </configuration>