From 8526aace20a0b88f2d56416363dd9e8e0d4ede02 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Tue, 20 Jun 2023 16:24:50 +0300 Subject: [PATCH 1/5] Window service created --- npm/ng-packs/packages/core/src/lib/services/index.ts | 1 + .../packages/core/src/lib/services/window.service.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 npm/ng-packs/packages/core/src/lib/services/window.service.ts diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts index fefc9931eb..8ccf802cb7 100644 --- a/npm/ng-packs/packages/core/src/lib/services/index.ts +++ b/npm/ng-packs/packages/core/src/lib/services/index.ts @@ -19,3 +19,4 @@ export * from './session-state.service'; export * from './subscription.service'; export * from './track-by.service'; export * from './local-storage.service'; +export * from './window.service'; diff --git a/npm/ng-packs/packages/core/src/lib/services/window.service.ts b/npm/ng-packs/packages/core/src/lib/services/window.service.ts new file mode 100644 index 0000000000..1598143016 --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/services/window.service.ts @@ -0,0 +1,12 @@ +import { Injectable, inject } from '@angular/core'; +import { DOCUMENT } from '@angular/common'; + +@Injectable({ providedIn: 'root' }) +export class AbpWindowService { + protected readonly window = inject(DOCUMENT).defaultView; + protected readonly navigator = this.window.navigator; + + copyToClipboard(text: string): Promise { + return this.navigator.clipboard.writeText(text); + } +} From fee40358ef6d2cd196f1391e9d38231f0926e750 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Tue, 20 Jun 2023 18:49:52 +0300 Subject: [PATCH 2/5] add reloadPage method to window.service --- npm/ng-packs/packages/core/src/lib/services/window.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/npm/ng-packs/packages/core/src/lib/services/window.service.ts b/npm/ng-packs/packages/core/src/lib/services/window.service.ts index 1598143016..469813481a 100644 --- a/npm/ng-packs/packages/core/src/lib/services/window.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/window.service.ts @@ -9,4 +9,8 @@ export class AbpWindowService { copyToClipboard(text: string): Promise { return this.navigator.clipboard.writeText(text); } + + reloadPage(): void { + this.window.location.reload(); + } } From 30d996f4b13bc555587675f429115cc6dfd95d29 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Tue, 20 Jun 2023 23:05:15 +0300 Subject: [PATCH 3/5] Add open method to window service --- npm/ng-packs/packages/core/src/lib/services/window.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/npm/ng-packs/packages/core/src/lib/services/window.service.ts b/npm/ng-packs/packages/core/src/lib/services/window.service.ts index 469813481a..f4780ec10d 100644 --- a/npm/ng-packs/packages/core/src/lib/services/window.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/window.service.ts @@ -10,6 +10,10 @@ export class AbpWindowService { return this.navigator.clipboard.writeText(text); } + open(url?: string | URL, target?: string, features?: string): Window { + return this.window.open(url, target, features); + } + reloadPage(): void { this.window.location.reload(); } From 1ba3a28ded96f82f2358a35daf66ce70c32cdaa0 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Tue, 20 Jun 2023 23:39:09 +0300 Subject: [PATCH 4/5] fix lint errors --- .../packages/core/src/lib/directives/caps-lock.directive.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts index 0194bb9d3e..16b3c40757 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts @@ -5,7 +5,7 @@ import { Directive, EventEmitter, HostListener, Output } from '@angular/core'; selector: '[abpCapsLock]', }) export class TrackCapsLockDirective { - @Output('abpCapsLock') capsLock = new EventEmitter(); + @Output('abpCapsLock') capsLock = new EventEmitter(); @HostListener('window:keydown', ['$event']) onKeyDown(event: KeyboardEvent): void { @@ -17,7 +17,7 @@ export class TrackCapsLockDirective { } isCapsLockOpen(e): boolean { - var s = String.fromCharCode(e.which); + const s = String.fromCharCode(e.which); if ( (s.toUpperCase() === s && s.toLowerCase() !== s && e.shiftKey) || (s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey) || From 8bd601c7a7019ded56e281fa8a4684414fd7d5b3 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Wed, 21 Jun 2023 16:13:32 +0300 Subject: [PATCH 5/5] Update abp package version --- templates/app-nolayers/angular/package.json | 18 +++++++++--------- templates/app/angular/package.json | 18 +++++++++--------- templates/module/angular/package.json | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index c5688afa32..5601f5c730 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.3.0-rc.1", - "@abp/ng.components": "~7.3.0-rc.1", - "@abp/ng.core": "~7.3.0-rc.1", - "@abp/ng.oauth": "~7.3.0-rc.1", - "@abp/ng.identity": "~7.3.0-rc.1", - "@abp/ng.setting-management": "~7.3.0-rc.1", - "@abp/ng.tenant-management": "~7.3.0-rc.1", - "@abp/ng.theme.shared": "~7.3.0-rc.1", + "@abp/ng.account": "~7.3.0-rc.2", + "@abp/ng.components": "~7.3.0-rc.2", + "@abp/ng.core": "~7.3.0-rc.2", + "@abp/ng.oauth": "~7.3.0-rc.2", + "@abp/ng.identity": "~7.3.0-rc.2", + "@abp/ng.setting-management": "~7.3.0-rc.2", + "@abp/ng.tenant-management": "~7.3.0-rc.2", + "@abp/ng.theme.shared": "~7.3.0-rc.2", "@abp/ng.theme.lepton-x": "~2.3.0-rc.1", "@angular/animations": "^16.0.2", "@angular/common": "^16.0.2", @@ -36,7 +36,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.3.0-rc.1", + "@abp/ng.schematics": "~7.3.0-rc.2", "@angular-devkit/build-angular": "~16.0.0", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0", diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index e39fadb930..ad57dd86b5 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "7.3.0-rc.1", - "@abp/ng.components": "7.3.0-rc.1", - "@abp/ng.core": "7.3.0-rc.1", - "@abp/ng.oauth": "7.3.0-rc.1", - "@abp/ng.identity": "7.3.0-rc.1", - "@abp/ng.setting-management": "7.3.0-rc.1", - "@abp/ng.tenant-management": "7.3.0-rc.1", - "@abp/ng.theme.shared": "7.3.0-rc.1", + "@abp/ng.account": "~7.3.0-rc.2", + "@abp/ng.components": "~7.3.0-rc.2", + "@abp/ng.core": "~7.3.0-rc.2", + "@abp/ng.oauth": "~7.3.0-rc.2", + "@abp/ng.identity": "~7.3.0-rc.2", + "@abp/ng.setting-management": "~7.3.0-rc.2", + "@abp/ng.tenant-management": "~7.3.0-rc.2", + "@abp/ng.theme.shared": "~7.3.0-rc.2", "@abp/ng.theme.lepton-x": "~2.3.0-rc.1", "@angular/animations": "^16.0.2", "@angular/common": "^16.0.2", @@ -42,7 +42,7 @@ "@angular-eslint/eslint-plugin-template": "^16.0.2", "@angular-eslint/schematics": "^16.0.2", "@angular-eslint/template-parser": "^16.0.2", - "@abp/ng.schematics": "7.3.0-rc.1", + "@abp/ng.schematics": "~7.3.0-rc.2", "@angular/cli": "^16.0.2", "@angular/compiler-cli": "^16.0.2", "@angular/language-service": "^16.0.2", diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 22898223a1..d8db55a3b5 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,15 +15,15 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~7.3.0-rc.1", - "@abp/ng.components": "~7.3.0-rc.1", - "@abp/ng.core": "~7.3.0-rc.1", - "@abp/ng.oauth": "~7.3.0-rc.1", - "@abp/ng.identity": "~7.3.0-rc.1", - "@abp/ng.setting-management": "~7.3.0-rc.1", - "@abp/ng.tenant-management": "~7.3.0-rc.1", - "@abp/ng.theme.basic": "~7.3.0-rc.1", - "@abp/ng.theme.shared": "~7.3.0-rc.1", + "@abp/ng.account": "~7.3.0-rc.2", + "@abp/ng.components": "~7.3.0-rc.2", + "@abp/ng.core": "~7.3.0-rc.2", + "@abp/ng.oauth": "~7.3.0-rc.2", + "@abp/ng.identity": "~7.3.0-rc.2", + "@abp/ng.setting-management": "~7.3.0-rc.2", + "@abp/ng.tenant-management": "~7.3.0-rc.2", + "@abp/ng.theme.basic": "~7.3.0-rc.2", + "@abp/ng.theme.shared": "~7.3.0-rc.2", "@angular/animations": "^16.0.2", "@angular/common": "^16.0.2", "@angular/compiler": "^16.0.2", @@ -38,7 +38,7 @@ "zone.js": "~0.13.0" }, "devDependencies": { - "@abp/ng.schematics": "~7.3.0-rc.1", + "@abp/ng.schematics": "~7.3.0-rc.2", "@angular-devkit/build-angular": "~16.0.1", "@angular-eslint/builder": "~16.0.0", "@angular-eslint/eslint-plugin": "~16.0.0",