Allow Visio file as process diagram

app/adapters/application.js

@@ -1,3 +1,36 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 
-export default class ApplicationAdapter extends JSONAPIAdapter {}
+export default class ApplicationAdapter extends JSONAPIAdapter {
+  buildURL(modelName, id, snapshot, requestType, query) {
+    // Query object containing
+    //   'paramKey': ['paramValueA', 'paramValueB']
+    // Should lead to URL containing query params
+    //   paramKey=paramValueA&paramKey=paramValueB
+    // Instead of
+    //   paramKey[]=paramValueA&paramKey[]=paramValueB
+
+    let url = super.buildURL(modelName, id, snapshot, requestType, query);
+
+    if (query) {
+      const customParams = [];
+
+      for (let key in query) {
+        if (Array.isArray(query[key])) {
+          query[key].forEach((item) => {
+            customParams.push(
+              `${encodeURIComponent(key)}=${encodeURIComponent(item)}`
+            );
+          });
+          delete query[key];
+        }
+      }
+
+      if (customParams.length > 0) {
+        const customQueryString = customParams.join('&');
+        url += `?${customQueryString}`;
+      }
+    }
+
+    return url;
+  }
+}

app/components/bpmn-viewer.js

@@ -12,10 +12,10 @@ export default class BpmnViewerComponent extends Component {
     element.tabIndex = 0; // Make element focusable
     this.viewer = new NavigatedViewer({ container: element });
 
-    const bpmnFile = this.args.bpmnFile;
-    if (!bpmnFile) return;
+    const latestBpmnFileId = this.args.diagram?.bpmnFile?.id;
+    if (!latestBpmnFileId) return;
 
-    const bpmnXml = await this.downloadBpmnFile.perform(bpmnFile.id);
+    const bpmnXml = await this.downloadBpmnFile.perform(latestBpmnFileId);
     if (!bpmnXml) return;
 
     await this.viewer.importXML(bpmnXml);
@@ -40,11 +40,7 @@ export default class BpmnViewerComponent extends Component {
   @restartableTask
   *downloadBpmnFile(bpmnFileId) {
     const url = generateFileDownloadUrl(bpmnFileId);
-    const response = yield fetch(url, {
-      headers: {
-        Accept: 'text/xml',
-      },
-    });
+    const response = yield fetch(url);
     if (!response.ok) throw Error(response.status);
     return yield response.text();
   }

app/components/custom-file-upload.js

@@ -77,13 +77,22 @@ export default class AuFileUpload extends Component {
   *upload(file) {
     this.resetErrors();
 
-    if (this.args.bpmnForbidden && file.name.endsWith('.bpmn')) {
+    const forbidden = this.args.forbidden?.split(',') ?? [];
+
+    if (forbidden.includes('.bpmn') && file.name.endsWith('.bpmn')) {
       this.addError(
         file,
         'BPMN-bestanden kunnen niet worden toegevoegd aan bijlagen.'
       );
       this.removeFileFromQueue(file);
       return;
+    } else if (forbidden.includes('.vsdx') && file.name.endsWith('.vsdx')) {
+      this.addError(
+        file,
+        'Visiobestanden kunnen niet worden toegevoegd aan bijlagen.'
+      );
+      this.removeFileFromQueue(file);
+      return;
     }
 
     let uploadedFileId = yield this.uploadFileTask.perform(file);