From cbf3421a6a5c363133f423aac43a48fb06b33d32 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Tue, 18 Jul 2023 23:26:19 +0300 Subject: [PATCH 01/11] deprecated EmailSettingService is fixed --- .../email-setting-group/email-setting-group.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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({ From 39894e3f96d5fa4321a0c562eb7bad03ae2e0a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SAL=C4=B0H=20=C3=96ZKARA?= Date: Tue, 25 Jul 2023 14:56:31 +0300 Subject: [PATCH 02/11] Update Repositories.md --- docs/en/Repositories.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e01ecfc6726ad80b27f7110847017e2fee4b3411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BF=8A?= Date: Wed, 26 Jul 2023 05:38:10 +0000 Subject: [PATCH 03/11] Fix wrongly written SetTableColumnsAsync call to base class method in UserManagement --- .../Pages/Identity/UserManagement.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From bdf1599b90261ade96ae1c50ee410b0c3b5a59ad Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Wed, 26 Jul 2023 10:50:01 +0300 Subject: [PATCH 04/11] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index c11886edf4..f356656fbf 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 7.3.0 + 7.3.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From 564bb1d3d51faeef9a07c2fb02eb4b06c44e005f Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 26 Jul 2023 10:58:32 +0300 Subject: [PATCH 05/11] Dynamic layout musst solve layout oninit. Update guard --- .../src/lib/components/dynamic-layout.component.ts | 11 +++++++++-- .../packages/oauth/src/lib/guards/oauth.guard.ts | 12 +++--------- 2 files changed, 12 insertions(+), 11 deletions(-) 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; } } From add1f0a8174c0745f34f40b8b4b276278f0e1780 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 26 Jul 2023 10:58:32 +0300 Subject: [PATCH 06/11] Dynamic layout musst solve layout oninit. Update guard --- .../src/lib/components/dynamic-layout.component.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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()); From 68dfe6ef0fbcbe6820a59910e34cd7cf6d8891c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 26 Jul 2023 13:12:22 +0300 Subject: [PATCH 07/11] Remove MyGet dependency --- NuGet.Config | 1 - templates/NuGet.Config | 1 - 2 files changed, 2 deletions(-) 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/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 From 5cc528fc868a402f78398efc731bd8f51e3efdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 26 Jul 2023 13:12:22 +0300 Subject: [PATCH 08/11] Remove MyGet dependency --- NuGet.Config | 1 - templates/NuGet.Config | 1 - 2 files changed, 2 deletions(-) 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/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 From f02212579ee752d87072e26fd7db14853fff0836 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Tue, 25 Jul 2023 14:14:21 +0300 Subject: [PATCH 09/11] add schematics build on build:all --- npm/ng-packs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index f1251d0341..ee6cacaf06 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -7,7 +7,7 @@ "nx": "nx", "start": "nx serve", "build": "ng build", - "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics --prod ", + "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics --prod && npm run build:schematics", "test": "ng test --detect-open-handles=true --run-in-band=true --watch-all=true", "test:all": "nx run-many --target=test --all", "lint-staged": "lint-staged", From d89d05606402a2649845c3bdf042cdf69287d34e Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 26 Jul 2023 15:53:58 +0300 Subject: [PATCH 10/11] remove myget temporarly. because it down --- npm/ng-packs/.npmrc | 2 -- 1 file changed, 2 deletions(-) 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 - From fef167fb12b053e3b819a1fa6504fe0d7c043408 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Wed, 26 Jul 2023 15:54:52 +0300 Subject: [PATCH 11/11] formtext property display block --- .../extensible-form/extensible-form-prop.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}