Merge pull request #157 from com-pas/nsdoc-response

Change processing of NSDOC File response
com-pas · May 10, 2022 · be190ce · be190ce
2 parents 00f5bc2 + f0fc730
commit be190ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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);
       })