|
|
@ -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: |
|
|
|