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

UI: Refactoring error msg

Browse Source
This commit is contained in:
Artem Dzhereleiko 2025-04-10 14:59:11 +03:00
parent 5b8c8d1aed
commit b854dcf0c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
View File

@ -271,7 +271,7 @@ export const updateScadaSymbolMetadataInContent = (svgContent: string, metadata:
const svgDoc = new DOMParser().parseFromString(svgContent, 'image/svg+xml'); const svgDoc = new DOMParser().parseFromString(svgContent, 'image/svg+xml');
const parsererror = svgDoc.getElementsByTagName('parsererror'); const parsererror = svgDoc.getElementsByTagName('parsererror');
if (parsererror?.length) { if (parsererror?.length) {
return parsererror[0].outerHTML; throw Error(parsererror[0].textContent)
} }
updateScadaSymbolMetadataInDom(svgDoc, metadata); updateScadaSymbolMetadataInDom(svgDoc, metadata);
return svgDoc.documentElement.outerHTML; return svgDoc.documentElement.outerHTML;

6
ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol.component.ts
View File

@ -214,10 +214,8 @@ export class ScadaSymbolComponent extends PageComponent
this.editObjectCallbacks.tagsUpdated(tags); this.editObjectCallbacks.tagsUpdated(tags);
} }
const metadata: ScadaSymbolMetadata = this.scadaSymbolFormGroup.get('metadata').value; const metadata: ScadaSymbolMetadata = this.scadaSymbolFormGroup.get('metadata').value;
try {
const scadaSymbolContent = this.prepareScadaSymbolContent(metadata); const scadaSymbolContent = this.prepareScadaSymbolContent(metadata);
if (scadaSymbolContent.includes('parsererror')) {
this.store.dispatch(new ActionNotificationShow({ message: scadaSymbolContent, type: 'error' }));
} else {
const file = createFileFromContent(scadaSymbolContent, this.symbolData.imageResource.fileName, const file = createFileFromContent(scadaSymbolContent, this.symbolData.imageResource.fileName,
this.symbolData.imageResource.descriptor.mediaType); this.symbolData.imageResource.descriptor.mediaType);
const type = imageResourceType(this.symbolData.imageResource); const type = imageResourceType(this.symbolData.imageResource);
@ -243,6 +241,8 @@ export class ScadaSymbolComponent extends PageComponent
this.init(data); this.init(data);
this.updateBreadcrumbs.emit(); this.updateBreadcrumbs.emit();
}); });
} catch (e) {
this.store.dispatch(new ActionNotificationShow({ message: e.message, type: 'error' }));
} }
} }
} }