From f00151553c506333bf9ed9298f556484919cd9e4 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 23 Dec 2024 12:10:13 +0200 Subject: [PATCH 1/3] UI: Fixed incorrect help link --- ui-ngx/src/app/shared/models/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/shared/models/constants.ts b/ui-ngx/src/app/shared/models/constants.ts index 9bdc7c3c23..7fc6d4b154 100644 --- a/ui-ngx/src/app/shared/models/constants.ts +++ b/ui-ngx/src/app/shared/models/constants.ts @@ -192,9 +192,9 @@ export const HelpLinks = { scada: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada`, scadaSymbolDev: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/`, scadaSymbolDevAnimation: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/#scadasymbolanimation`, - mobileApplication: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/ui/mobile-qr-code/`, + mobileApplication: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/applications/`, mobileBundle: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/mobile-center/`, - mobileQrCode: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/applications/`, + mobileQrCode: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/ui/mobile-qr-code/`, } }; /* eslint-enable max-len */ From e3f25f5c54cb2ae9b9aca3c97c685d369d0db7ba Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 23 Dec 2024 12:50:03 +0200 Subject: [PATCH 2/3] UI: Fixed show help button in oauth section and change domains help link --- .../oauth2/clients/client-table-header.component.html | 5 ++++- .../admin/oauth2/clients/client-table-header.component.ts | 4 +++- .../admin/oauth2/clients/clients-table-config.resolver.ts | 2 -- .../admin/oauth2/domains/domain-table-config.resolver.ts | 7 ++----- .../oauth2/domains/domain-table-header.component.html | 5 ++++- .../admin/oauth2/domains/domain-table-header.component.ts | 4 +++- ui-ngx/src/app/shared/models/constants.ts | 1 + ui-ngx/src/app/shared/models/entity-type.models.ts | 2 +- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.html b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.html index fd66a026da..c5e91718fe 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.html @@ -15,4 +15,7 @@ limitations under the License. --> -
+
+
admin.oauth2.clients
+
+
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.ts index 891285d4fd..7da4ea62e1 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-table-header.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component } from '@angular/core'; +import { Component, HostBinding } from '@angular/core'; import { EntityTableHeaderComponent } from '@home/components/entity/entity-table-header.component'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; @@ -28,6 +28,8 @@ import { PageLink } from '@shared/models/page/page-link'; }) export class ClientTableHeaderComponent extends EntityTableHeaderComponent { + @HostBinding('style.width') width = '100%'; + constructor(protected store: Store) { super(store); } diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts index 9f009bc54b..d4f0af00c3 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts @@ -15,7 +15,6 @@ /// import { Injectable } from '@angular/core'; - import { DateEntityTableColumn, EntityTableColumn, @@ -45,7 +44,6 @@ export class ClientsTableConfigResolver { constructor(private translate: TranslateService, private datePipe: DatePipe, private oauth2Service: OAuth2Service) { - this.config.tableTitle = this.translate.instant('admin.oauth2.clients'); this.config.selectionEnabled = false; this.config.entityType = EntityType.OAUTH2_CLIENT; this.config.rowPointer = true; diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts index 1359f24893..8e1014a1da 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts @@ -24,7 +24,6 @@ import { EntityTableConfig } from '@home/models/entity/entities-table-config.models'; import { DomainInfo } from '@shared/models/oauth2.models'; -import { UtilsService } from '@core/services/utils.service'; import { TranslateService } from '@ngx-translate/core'; import { DatePipe } from '@angular/common'; import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models'; @@ -33,7 +32,7 @@ import { DomainComponent } from '@home/pages/admin/oauth2/domains/domain.compone import { isEqual } from '@core/utils'; import { DomainTableHeaderComponent } from '@home/pages/admin/oauth2/domains/domain-table-header.component'; import { Direction } from '@app/shared/models/page/sort-order'; -import { map, Observable, of, mergeMap } from 'rxjs'; +import { map, mergeMap, Observable, of } from 'rxjs'; @Injectable() export class DomainTableConfigResolver { @@ -42,9 +41,7 @@ export class DomainTableConfigResolver { constructor(private translate: TranslateService, private datePipe: DatePipe, - private utilsService: UtilsService, private domainService: DomainService) { - this.config.tableTitle = this.translate.instant('admin.oauth2.domains'); this.config.selectionEnabled = false; this.config.entityType = EntityType.DOMAIN; this.config.rowPointer = true; @@ -106,7 +103,7 @@ export class DomainTableConfigResolver { this.config.deleteEntity = id => this.domainService.deleteDomain(id.id); } - resolve(route: ActivatedRouteSnapshot): EntityTableConfig { + resolve(_route: ActivatedRouteSnapshot): EntityTableConfig { return this.config; } diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.html b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.html index fd66a026da..6fcf7d2070 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.html @@ -15,4 +15,7 @@ limitations under the License. --> -
+
+
admin.oauth2.domains
+
+
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.ts index 3b9f7c6a3c..96d0f5959b 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.ts +++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-header.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component } from '@angular/core'; +import { Component, HostBinding } from '@angular/core'; import { EntityTableHeaderComponent } from '@home/components/entity/entity-table-header.component'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; @@ -27,6 +27,8 @@ import { DomainInfo } from '@shared/models/oauth2.models'; }) export class DomainTableHeaderComponent extends EntityTableHeaderComponent { + @HostBinding('style.width') width = '100%'; + constructor(protected store: Store) { super(store); } diff --git a/ui-ngx/src/app/shared/models/constants.ts b/ui-ngx/src/app/shared/models/constants.ts index 7fc6d4b154..667a12e748 100644 --- a/ui-ngx/src/app/shared/models/constants.ts +++ b/ui-ngx/src/app/shared/models/constants.ts @@ -192,6 +192,7 @@ export const HelpLinks = { scada: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada`, scadaSymbolDev: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/`, scadaSymbolDevAnimation: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/#scadasymbolanimation`, + domains: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/domains`, mobileApplication: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/applications/`, mobileBundle: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/mobile-center/`, mobileQrCode: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/ui/mobile-qr-code/`, diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts index 769ca2ce87..19e059ba79 100644 --- a/ui-ngx/src/app/shared/models/entity-type.models.ts +++ b/ui-ngx/src/app/shared/models/entity-type.models.ts @@ -591,7 +591,7 @@ export const entityTypeResources = new Map Date: Mon, 23 Dec 2024 17:16:43 +0200 Subject: [PATCH 3/3] UI: Change domains help link --- ui-ngx/src/app/shared/models/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-ngx/src/app/shared/models/constants.ts b/ui-ngx/src/app/shared/models/constants.ts index 667a12e748..6f61132dde 100644 --- a/ui-ngx/src/app/shared/models/constants.ts +++ b/ui-ngx/src/app/shared/models/constants.ts @@ -192,7 +192,7 @@ export const HelpLinks = { scada: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada`, scadaSymbolDev: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/`, scadaSymbolDevAnimation: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/scada/scada-symbols-dev-guide/#scadasymbolanimation`, - domains: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/domains`, + domains: `${helpBaseUrl}/docs${docPlatformPrefix}/domains`, mobileApplication: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/applications/`, mobileBundle: `${helpBaseUrl}/docs${docPlatformPrefix}/mobile-center/mobile-center/`, mobileQrCode: `${helpBaseUrl}/docs${docPlatformPrefix}/user-guide/ui/mobile-qr-code/`,