dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Refactoring

Browse Source
This commit is contained in:
Artem Dzhereleiko 2023-10-31 17:00:17 +02:00
parent 5206ebb87b
commit 7d87ee4829
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/core/http/entity.service.ts
View File

@ -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';

4
ui-ngx/src/app/core/http/widget.service.ts
View File

@ -85,8 +85,8 @@ export class WidgetService {
);
}
public getWidgetBundles(pageLink: PageLink, tenantOnly = false,
fullSearch = false, config?: RequestConfig): Observable<PageData<WidgetsBundle>> {
public getWidgetBundles(pageLink: PageLink, fullSearch = false,
tenantOnly = false, config?: RequestConfig): Observable<PageData<WidgetsBundle>> {
return this.http.get<PageData<WidgetsBundle>>(
`/api/widgetsBundles${pageLink.toQuery()}&tenantOnly=${tenantOnly}&fullSearch=${fullSearch}`,
defaultHttpOptionsFromConfig(config)

1
ui-ngx/src/app/modules/home/components/vc/entity-types-version-create.component.html
View File

@ -84,6 +84,7 @@
fxFlex
[fxShow]="!entityTypeFormGroup.get('config').get('allEntities').value"
[entityType]="entityTypeFormGroup.get('entityType').value"
subType="tenant"
required
formControlName="entityIds">
</tb-entity-list>