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

Merge pull request #9503 from ArtemDzhereleiko/AD/bug-fix/vc/entity-list

Browse Source 
Fixed version control Widgets/Widget bundles entity list
This commit is contained in:
Igor Kulikov 2023-11-07 18:36:40 +02:00 committed by GitHub
commit 4025a1f549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ import { AttributeScope, DataKeyType } from '@shared/models/telemetry/telemetry.
import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils'; import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils';
import { RuleChainService } from '@core/http/rule-chain.service'; import { RuleChainService } from '@core/http/rule-chain.service';
import { AliasInfo, StateParams, SubscriptionInfo } from '@core/api/widget-api.models'; 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 { UtilsService } from '@core/services/utils.service';
import { import {
AliasFilterType, AliasFilterType,
@ -65,7 +65,9 @@ import { Device, DeviceCredentialsType } from '@shared/models/device.models';
import { AttributeService } from '@core/http/attribute.service'; import { AttributeService } from '@core/http/attribute.service';
import { import {
AlarmData, AlarmData,
AlarmDataQuery, AlarmFilter, AlarmFilterConfig, AlarmDataQuery,
AlarmFilter,
AlarmFilterConfig,
createDefaultEntityDataPageLink, createDefaultEntityDataPageLink,
EntityData, EntityData,
EntityDataQuery, EntityDataQuery,
@ -418,7 +420,11 @@ export class EntityService {
break; break;
case EntityType.WIDGETS_BUNDLE: case EntityType.WIDGETS_BUNDLE:
pageLink.sortOrder.property = 'title'; pageLink.sortOrder.property = 'title';
entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, config); entitiesObservable = this.widgetService.getWidgetBundles(pageLink, false, true, config);
break;
case EntityType.WIDGET_TYPE:
pageLink.sortOrder.property = 'name';
entitiesObservable = this.widgetService.getWidgetTypes(pageLink, true, false, DeprecatedFilter.ALL, null, config);
break; break;
case EntityType.NOTIFICATION_TARGET: case EntityType.NOTIFICATION_TARGET:
pageLink.sortOrder.property = 'name'; pageLink.sortOrder.property = 'name';

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

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