From 657c247687e88f2010f386e3d43c903afc3e169b Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Thu, 26 Oct 2023 15:23:09 +0300 Subject: [PATCH 1/4] UI: Add case for widget type --- ui-ngx/src/app/core/http/entity.service.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index 69ca114001..fe884ab927 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -41,7 +41,7 @@ import { AttributeScope, DataKeyType } from '@shared/models/telemetry/telemetry. import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils'; import { RuleChainService } from '@core/http/rule-chain.service'; import { AliasInfo, StateParams, SubscriptionInfo } from '@core/api/widget-api.models'; -import { DataKey, Datasource, DatasourceType, KeyInfo } from '@app/shared/models/widget.models'; +import { DataKey, Datasource, DatasourceType, DeprecatedFilter, KeyInfo } from '@app/shared/models/widget.models'; import { UtilsService } from '@core/services/utils.service'; import { AliasFilterType, @@ -65,7 +65,9 @@ import { Device, DeviceCredentialsType } from '@shared/models/device.models'; import { AttributeService } from '@core/http/attribute.service'; import { AlarmData, - AlarmDataQuery, AlarmFilter, AlarmFilterConfig, + AlarmDataQuery, + AlarmFilter, + AlarmFilterConfig, createDefaultEntityDataPageLink, EntityData, EntityDataQuery, @@ -418,6 +420,10 @@ export class EntityService { pageLink.sortOrder.property = 'title'; entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, config); break; + case EntityType.WIDGET_TYPE: + pageLink.sortOrder.property = 'name'; + entitiesObservable = this.widgetService.getWidgetTypes(pageLink, true, false, DeprecatedFilter.ALL, null, config); + break; case EntityType.NOTIFICATION_TARGET: pageLink.sortOrder.property = 'name'; entitiesObservable = this.notificationService.getNotificationTargets(pageLink, subType as NotificationType, config); From 5206ebb87b4a804abcdaec39f5fb7b71133af270 Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Thu, 26 Oct 2023 17:25:54 +0300 Subject: [PATCH 2/4] UI: Fixed widget bundle entity list --- ui-ngx/src/app/core/http/entity.service.ts | 2 +- ui-ngx/src/app/core/http/widget.service.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index fe884ab927..4e04304754 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -418,7 +418,7 @@ export class EntityService { break; case EntityType.WIDGETS_BUNDLE: pageLink.sortOrder.property = 'title'; - entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, config); + entitiesObservable = this.widgetService.getWidgetBundles(pageLink, true, false, config); break; case EntityType.WIDGET_TYPE: pageLink.sortOrder.property = 'name'; diff --git a/ui-ngx/src/app/core/http/widget.service.ts b/ui-ngx/src/app/core/http/widget.service.ts index 6b53e4d0cb..3d33aad9e7 100644 --- a/ui-ngx/src/app/core/http/widget.service.ts +++ b/ui-ngx/src/app/core/http/widget.service.ts @@ -85,9 +85,12 @@ export class WidgetService { ); } - public getWidgetBundles(pageLink: PageLink, fullSearch = false, config?: RequestConfig): Observable> { - return this.http.get>(`/api/widgetsBundles${pageLink.toQuery()}&fullSearch=${fullSearch}`, - defaultHttpOptionsFromConfig(config)); + public getWidgetBundles(pageLink: PageLink, tenantOnly = false, + fullSearch = false, config?: RequestConfig): Observable> { + return this.http.get>( + `/api/widgetsBundles${pageLink.toQuery()}&tenantOnly=${tenantOnly}&fullSearch=${fullSearch}`, + defaultHttpOptionsFromConfig(config) + ); } public getWidgetsBundle(widgetsBundleId: string, From 7d87ee4829374c0c5400c58e2f3e451a4a00346c Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Tue, 31 Oct 2023 17:00:17 +0200 Subject: [PATCH 3/4] UI: Refactoring --- ui-ngx/src/app/core/http/entity.service.ts | 4 ++-- ui-ngx/src/app/core/http/widget.service.ts | 4 ++-- .../components/vc/entity-types-version-create.component.html | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index 4e04304754..ac13aa31c8 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -418,11 +418,11 @@ export class EntityService { break; case EntityType.WIDGETS_BUNDLE: pageLink.sortOrder.property = 'title'; - entitiesObservable = this.widgetService.getWidgetBundles(pageLink, true, false, config); + entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, subType === 'tenant', config); break; case EntityType.WIDGET_TYPE: pageLink.sortOrder.property = 'name'; - entitiesObservable = this.widgetService.getWidgetTypes(pageLink, true, false, DeprecatedFilter.ALL, null, config); + entitiesObservable = this.widgetService.getWidgetTypes(pageLink, subType === 'tenant', false, DeprecatedFilter.ALL, null, config); break; case EntityType.NOTIFICATION_TARGET: pageLink.sortOrder.property = 'name'; diff --git a/ui-ngx/src/app/core/http/widget.service.ts b/ui-ngx/src/app/core/http/widget.service.ts index 3d33aad9e7..6905a0f594 100644 --- a/ui-ngx/src/app/core/http/widget.service.ts +++ b/ui-ngx/src/app/core/http/widget.service.ts @@ -85,8 +85,8 @@ export class WidgetService { ); } - public getWidgetBundles(pageLink: PageLink, tenantOnly = false, - fullSearch = false, config?: RequestConfig): Observable> { + public getWidgetBundles(pageLink: PageLink, fullSearch = false, + tenantOnly = false, config?: RequestConfig): Observable> { return this.http.get>( `/api/widgetsBundles${pageLink.toQuery()}&tenantOnly=${tenantOnly}&fullSearch=${fullSearch}`, defaultHttpOptionsFromConfig(config) diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html index ef09a2b382..11b37245fa 100644 --- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html @@ -84,6 +84,7 @@ fxFlex [fxShow]="!entityTypeFormGroup.get('config').get('allEntities').value" [entityType]="entityTypeFormGroup.get('entityType').value" + subType="tenant" required formControlName="entityIds"> From 4f1646853c5ce780c46a210170d876488d9770db Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Tue, 7 Nov 2023 16:57:08 +0200 Subject: [PATCH 4/4] UI: Refactoring --- ui-ngx/src/app/core/http/entity.service.ts | 4 ++-- .../components/vc/entity-types-version-create.component.html | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index bab3a7f9be..8bc8bfe3f2 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -420,11 +420,11 @@ export class EntityService { break; case EntityType.WIDGETS_BUNDLE: pageLink.sortOrder.property = 'title'; - entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, subType === 'tenant', config); + entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, true, config); break; case EntityType.WIDGET_TYPE: pageLink.sortOrder.property = 'name'; - entitiesObservable = this.widgetService.getWidgetTypes(pageLink, subType === 'tenant', false, DeprecatedFilter.ALL, null, config); + entitiesObservable = this.widgetService.getWidgetTypes(pageLink, true, false, DeprecatedFilter.ALL, null, config); break; case EntityType.NOTIFICATION_TARGET: pageLink.sortOrder.property = 'name'; diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html index 11b37245fa..ef09a2b382 100644 --- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html @@ -84,7 +84,6 @@ fxFlex [fxShow]="!entityTypeFormGroup.get('config').get('allEntities').value" [entityType]="entityTypeFormGroup.get('entityType').value" - subType="tenant" required formControlName="entityIds">