Merge pull request #81 from com-pas/optimize-memory-usage

Change calls to SCL Data Service because of memory optimize.

Author: Rob Tjalma

src/compas-editors/CompasVersions.ts

@@ -153,9 +153,8 @@ function openScl(docName: string, docId: string, version: string) {
     CompasSclDataService().getSclDocumentVersion(type, docId, version)
       .then(response => {
         // Copy the SCL Result from the Response and create a new Document from it.
-        const sclElement = response.querySelectorAll("SCL").item(0);
-        const sclDocument = document.implementation.createDocument("", "", null);
-        sclDocument.getRootNode().appendChild(sclElement.cloneNode(true));
+        const sclData = response.querySelectorAll("SclData").item(0).textContent;
+        const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
 
         updateDocumentInOpenSCD(sclDocument);
 

src/compas-services/CompasCimMappingService.ts

@@ -32,7 +32,7 @@ export function CompasCimMappingService() {
                   return `
                     <cms:CimData>
                         <cms:Name>${cimData.name}</cms:Name>
-                        ${new XMLSerializer().serializeToString(cimData.doc.documentElement)}
+                        <cms:RdfData><![CDATA[${new XMLSerializer().serializeToString(cimData.doc.documentElement)}]]></cms:RdfData>
                     </cms:CimData>`;
                 }) }
                </cms:MapRequest>`

src/compas-services/CompasSclDataService.ts

@@ -105,14 +105,14 @@ export function CompasSclDataService() {
                <sds:CreateRequest xmlns:sds="${SDS_NAMESPACE}">
                    <sds:Name>${body.sclName}</sds:Name>
                    <sds:Comment>${body.comment}</sds:Comment>
-                   ${new XMLSerializer().serializeToString(body.doc.documentElement)}
+                   <sds:SclData><![CDATA[${new XMLSerializer().serializeToString(body.doc.documentElement)}]]></sds:SclData>
                </sds:CreateRequest>`
       }).catch(handleError)
         .then(handleResponse)
         .then(parseXml);
     },
 
-    updateSclDocument(type: string, id: string, body: UpdateRequestBody): Promise<string> {
+    updateSclDocument(type: string, id: string, body: UpdateRequestBody): Promise<Document> {
       const sclUrl = getCompasSettings().sclDataServiceUrl + '/scl/v1/' + type?.toUpperCase() + '/' + id;
       return fetch(sclUrl, {
         method: 'PUT',
@@ -123,10 +123,11 @@ export function CompasSclDataService() {
                <sds:UpdateRequest xmlns:sds="${SDS_NAMESPACE}">
                    <sds:ChangeSet>${body.changeSet}</sds:ChangeSet>
                    <sds:Comment>${body.comment}</sds:Comment>
-                   ${new XMLSerializer().serializeToString(body.doc.documentElement)}
+                   <sds:SclData><![CDATA[${new XMLSerializer().serializeToString(body.doc.documentElement)}]]></sds:SclData>
                </sds:UpdateRequest>`
       }).catch(handleError)
-        .then(handleResponse);
+        .then(handleResponse)
+        .then(parseXml);
     }
   }
 }

src/compas/CompasSaveTo.ts

@@ -10,7 +10,7 @@ import {CompasSclTypeRadiogroup} from "./CompasSclTypeRadiogroup.js";
 import {CompasCommentElement} from "./CompasComment.js";
 import {CompasSclDataService} from "../compas-services/CompasSclDataService.js";
 import {createLogEvent} from "../compas-services/foundation.js";
-import {getOpenScdElement, getTypeFromDocName, reloadSclDocument, stripExtensionFromName} from "./foundation.js";
+import {getOpenScdElement, getTypeFromDocName, stripExtensionFromName, updateDocumentInOpenSCD} from "./foundation.js";
 import './CompasSclTypeRadiogroup.js';
 
 @customElement('compas-save-to')
@@ -47,11 +47,11 @@ export class CompasSaveTo  extends CompasExistsIn(LitElement) {
     const docType = this.getSclTypeRadioGroup().getSelectedValue() ?? '';
 
     await CompasSclDataService().addSclDocument(docType, {sclName: name, comment: comment, doc: doc})
-      .then(async xmlResponse => {
-        const id = Array.from(xmlResponse.querySelectorAll('*|Id') ?? [])[0]
+      .then(response => {
+        const sclData = response.querySelectorAll("SclData").item(0).textContent;
+        const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
 
-        // Retrieve the document to fetch server-side updates.
-        await reloadSclDocument(docType, id.textContent ?? '');
+        updateDocumentInOpenSCD(sclDocument);
 
         const openScd = getOpenScdElement();
         openScd.dispatchEvent(
@@ -72,9 +72,10 @@ export class CompasSaveTo  extends CompasExistsIn(LitElement) {
     const docType = getTypeFromDocName(docName);
 
     await CompasSclDataService().updateSclDocument(docType.toUpperCase(), docId, {changeSet: changeSet!, comment: comment, doc: doc})
-      .then(async () => {
-        // Retrieve the document to fetch server-side updates.
-        await reloadSclDocument(docType, docId);
+      .then(response => {
+        const sclData = response.querySelectorAll("SclData").item(0).textContent;
+        const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
+        updateDocumentInOpenSCD(sclDocument);
 
         const openScd = getOpenScdElement();
         openScd.dispatchEvent(

src/compas/CompasScl.ts

@@ -1,7 +1,7 @@
 import {customElement, html, LitElement, property, TemplateResult} from "lit-element";
 import {get, translate} from "lit-translate";
 
-import {newPendingStateEvent, newWizardEvent, Wizard} from "../foundation.js";
+import {newLogEvent, newPendingStateEvent, newWizardEvent, Wizard} from "../foundation.js";
 import {SingleSelectedEvent} from "@material/mwc-list/mwc-list-foundation";
 
 import {CompasSclDataService, SDS_NAMESPACE} from "../compas-services/CompasSclDataService.js";
@@ -39,9 +39,14 @@ export class CompasScl extends LitElement {
 
     if (response instanceof Document) {
       // Copy the SCL Result from the Response and create a new Document from it.
-      const sclElement = response.querySelectorAll("SCL").item(0);
-      const sclDocument = document.implementation.createDocument("", "", null);
-      sclDocument.getRootNode().appendChild(sclElement.cloneNode(true));
+      const sclData = response.querySelectorAll("SclData").item(0).textContent;
+      const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
+
+      const openScd = getOpenScdElement();
+      openScd.dispatchEvent(
+        newLogEvent({
+          kind: 'reset'
+        }));
 
       updateDocumentInOpenSCD(sclDocument);
     }

src/compas/CompasUploadVersion.ts

@@ -6,7 +6,7 @@ import {newLogEvent, newPendingStateEvent, newWizardEvent, Wizard, WizardInput}
 import {CompasExistsIn} from "./CompasExistsIn.js";
 import {CompasSclDataService} from "../compas-services/CompasSclDataService.js";
 import {createLogEvent} from "../compas-services/foundation.js";
-import {getOpenScdElement, getTypeFromDocName, reloadSclDocument} from "./foundation.js";
+import {getOpenScdElement, getTypeFromDocName, updateDocumentInOpenSCD} from "./foundation.js";
 import {CompasChangeSetRadiogroup} from "./CompasChangeSetRadiogroup.js";
 import {CompasCommentElement} from "./CompasComment.js";
 
@@ -47,9 +47,10 @@ export class CompasUploadVersionElement extends CompasExistsIn(LitElement) {
 
     await CompasSclDataService().updateSclDocument(docType.toUpperCase(), this.docId,
       {changeSet: changeSet!, comment: comment, doc: doc})
-      .then(async () => {
-        // Retrieve the document to fetch server-side updates.
-        await reloadSclDocument(docType, this.docId);
+      .then(response => {
+        const sclData = response.querySelectorAll("SclData").item(0).textContent;
+        const sclDocument = new DOMParser().parseFromString(sclData??'', 'application/xml');
+        updateDocumentInOpenSCD(sclDocument);
 
         const openScd = getOpenScdElement();
         openScd.dispatchEvent(

src/compas/foundation.ts

@@ -31,19 +31,6 @@ export function getOpenScdElement(): OpenSCD {
   return <OpenSCD>document.querySelector('open-scd');
 }
 
-export async function reloadSclDocument(type: string, id: string): Promise<void>{
-  await CompasSclDataService().getSclDocument(type, id)
-    .then(response => {
-      // Copy the SCL Result from the Response and create a new Document from it.
-      const sclElement = response.querySelectorAll("SCL").item(0);
-      const sclDocument = document.implementation.createDocument("", "", null);
-      sclDocument.getRootNode().appendChild(sclElement.cloneNode(true));
-
-      updateDocumentInOpenSCD(sclDocument);
-    })
-    .catch(createLogEvent);
-}
-
 export function updateDocumentInOpenSCD(doc: Document): void {
   const id = (doc.querySelectorAll(':root > Header') ?? []).item(0).getAttribute('id') ?? '';
   const version = (doc.querySelectorAll(':root > Header') ?? []).item(0).getAttribute('version') ?? '';