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

Update import-export.service.ts

Browse Source
This commit is contained in:
Igor Kulikov 2023-09-19 18:06:54 +03:00 committed by GitHub
parent 5a4b2cf406
commit b4f0190454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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