Merge pull request #93 from com-pas/fix-handling-404

Added check on NOT_FOUND to show correct message.

Author: Rob Tjalma

src/compas-editors/CompasVersions.ts

@@ -3,7 +3,7 @@ import {get, translate} from 'lit-translate';
 import {newLogEvent, newWizardEvent, Wizard} from "../foundation.js";
 
 import {CompasSclDataService, SDS_NAMESPACE} from "../compas-services/CompasSclDataService.js";
-import {createLogEvent} from "../compas-services/foundation.js";
+import {createLogEvent, isNotFoundError, NOT_FOUND_ERROR} from "../compas-services/foundation.js";
 import {getTypeFromDocName, updateDocumentInOpenSCD} from "../compas/foundation.js";
 import {getElementByName, getOpenScdElement, styles} from './foundation.js';
 import {addVersionToCompasWizard} from "../compas/CompasUploadVersion.js";
@@ -53,6 +53,11 @@ export default class CompasVersionsPlugin extends LitElement {
     CompasSclDataService().listVersions(type, this.docId)
       .then(xmlResponse => {
         this.scls = Array.from(xmlResponse.querySelectorAll('Item') ?? []);
+      })
+      .catch(reason => {
+        if (isNotFoundError(reason)) {
+          this.scls = [];
+        }
       });
   }
 

src/compas-services/foundation.ts

@@ -69,6 +69,10 @@ export function handleError(error: Error): Promise<never> {
   return Promise.reject({type: SERVER_ERROR, message: error.message});
 }
 
+export function isNotFoundError(reason: any): boolean {
+  return (reason.type !== undefined && reason.type === NOT_FOUND_ERROR);
+}
+
 export function createLogEvent(reason: any): void {
   let message = reason.message;
   if (reason.status) {

src/compas/CompasExistsIn.ts

@@ -3,7 +3,7 @@ import {property} from "lit-element";
 import {LitElementConstructor, Mixin} from "../foundation.js";
 
 import {CompasSclDataService} from "../compas-services/CompasSclDataService.js";
-import {NOT_FOUND_ERROR} from "../compas-services/foundation.js";
+import {isNotFoundError, NOT_FOUND_ERROR} from "../compas-services/foundation.js";
 import {getTypeFromDocName} from "./foundation.js";
 
 export type CompasExistsInElement = Mixin<typeof CompasExistsIn>;
@@ -33,7 +33,7 @@ export function CompasExistsIn<TBase extends LitElementConstructor>(Base: TBase)
         this.callService(docType, this.docId)
           .then(() => this.existInCompas = true)
           .catch(reason => {
-            if (reason.type && reason.type === NOT_FOUND_ERROR) {
+            if (isNotFoundError(reason)) {
               this.existInCompas = false;
             }
           });

test/unit/compas-services/foundation.test.ts

@@ -1,6 +1,11 @@
 import {expect} from "@open-wc/testing";
 
-import {processErrorMessage} from "../../../src/compas-services/foundation.js";
+import {
+  isNotFoundError,
+  NOT_FOUND_ERROR,
+  processErrorMessage,
+  SERVER_ERROR
+} from "../../../src/compas-services/foundation.js";
 
 const errorBody =
 `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -19,13 +24,29 @@ describe('compas-services-foundation', () => {
     const result = await processErrorMessage(response);
     expect(result).to.be.equal(statusText);
   })
-
   it('when there is a body in the response, the message is retrieved from the body', async () => {
     const expectedMessage = 'Name is not a correct name to be used later as filename. (CORE-8000)'
     const statusText = 'some status text';
     const response = new Response(errorBody, <ResponseInit>{statusText: statusText});
     const result = await processErrorMessage(response);
     expect(result).to.be.equal(expectedMessage);
+
+  })
+
+  it('when the error is caused by a status 404 then return true', () => {
+    const reason = {type: NOT_FOUND_ERROR};
+    const result = isNotFoundError(reason);
+    expect(result).to.be.true;
+  })
+  it('when the error is caused by other status then return false', () => {
+    const reason = {type: SERVER_ERROR};
+    const result = isNotFoundError(reason);
+    expect(result).to.be.false;
+  })
+  it('when no type of error found then return false', () => {
+    const reason = {};
+    const result = isNotFoundError(reason);
+    expect(result).to.be.false;
   })
 });