Changed processing of Validation Errors from Service.

Dennis Labordus · Dennis Labordus · commit f0fc7309fa64 · 2022-05-10T14:31:13.000+02:00
Signed-off-by: Dennis Labordus &lt;dennis.labordus@alliander.com&gt;
diff --git a/src/compas-services/CompasValidatorService.ts b/src/compas-services/CompasValidatorService.ts
@@ -57,10 +57,11 @@ export function CompasSclValidatorService() {
         .then(parseXml);
     },
 
-    getNsdocFile(id: string): Promise<string> {
+    getNsdocFile(id: string): Promise<Document> {
       const svsUrl = getSclValidatorServiceUrl() + '/nsdoc/v1/' + id;
       return fetch(svsUrl).catch(handleError)
-        .then(handleResponse);
+        .then(handleResponse)
+        .then(parseXml);
     },
   }
 }
diff --git a/src/compas/CompasNsdoc.ts b/src/compas/CompasNsdoc.ts
@@ -21,7 +21,8 @@ async function processNsdocFile(id: string, nsdocId: string, filename: string, c
   if (localStorage.getItem(nsdocId) === null || checksumStored === null || checksumStored !== checksum) {
     console.info(`Loading NSDoc File '${nsdocId}' with ID '${id}'.`);
     await CompasSclValidatorService().getNsdocFile(id)
-      .then(nsdocContent => {
+      .then(document => {
+        const nsdocContent = document.querySelectorAll("NsdocFile").item(0).textContent ?? '';
         dispatchEventOnOpenScd(newLoadNsdocEvent(nsdocContent, filename));
         localStorage.setItem(checksumKey, checksum);
       })

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,11 @@ export function CompasSclValidatorService() {`
`57`	`57`	`.then(parseXml);`
`58`	`58`	`},`
`59`	`59`
`60`		`- getNsdocFile(id: string): Promise<string> {`
	`60`	`+ getNsdocFile(id: string): Promise<Document> {`
`61`	`61`	`const svsUrl = getSclValidatorServiceUrl() + '/nsdoc/v1/' + id;`
`62`	`62`	`return fetch(svsUrl).catch(handleError)`
`63`		`- .then(handleResponse);`
	`63`	`+ .then(handleResponse)`
	`64`	`+ .then(parseXml);`
`64`	`65`	`},`
`65`	`66`	`}`
`66`	`67`	`}`