From 4f1646853c5ce780c46a210170d876488d9770db Mon Sep 17 00:00:00 2001 From: Artem Dzhereleiko Date: Tue, 7 Nov 2023 16:57:08 +0200 Subject: [PATCH] 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">