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

Merge pull request #9289 from vvlladd28/improvement/import-widgets-bundle/support-old-format

Browse Source 
Add support import widgets bundles in old format
This commit is contained in:
Igor Kulikov 2023-09-19 18:07:32 +03:00 committed by GitHub
commit a0250a7122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
View File

@ -398,7 +398,9 @@ export class ImportExportService {
const widgetTypesDetails = widgetsBundleItem.widgetTypes; const widgetTypesDetails = widgetsBundleItem.widgetTypes;
const saveWidgetTypesObservables: Array<Observable<WidgetTypeDetails>> = []; const saveWidgetTypesObservables: Array<Observable<WidgetTypeDetails>> = [];
for (const widgetTypeDetails of widgetTypesDetails) { for (const widgetTypeDetails of widgetTypesDetails) {
saveWidgetTypesObservables.push(this.widgetService.saveImportedWidgetTypeDetails(widgetTypeDetails)); saveWidgetTypesObservables.push(
this.widgetService.saveImportedWidgetTypeDetails(this.prepareWidgetType(widgetTypeDetails, savedWidgetsBundle))
);
} }
widgetTypesObservable = forkJoin(saveWidgetTypesObservables); widgetTypesObservable = forkJoin(saveWidgetTypesObservables);
} else { } else {
@ -432,6 +434,15 @@ export class ImportExportService {
); );
} }
private prepareWidgetType(widgetType: WidgetTypeDetails & {alias?: string}, widgetsBundle: WidgetsBundle): WidgetTypeDetails {
if (!widgetType.fqn) {
widgetType.fqn = `${widgetsBundle.alias}.${widgetType.alias
? widgetType.alias
: widgetType.name.toLowerCase().replace(/\W/g, '_')}`;
}
return widgetType;
}
public bulkImportEntities(entitiesData: BulkImportRequest, entityType: EntityType, config?: RequestConfig): Observable<BulkImportResult> { public bulkImportEntities(entitiesData: BulkImportRequest, entityType: EntityType, config?: RequestConfig): Observable<BulkImportResult> {
switch (entityType) { switch (entityType) {
case EntityType.DEVICE: case EntityType.DEVICE: