refactor: use webservices to compute data inputs, fixes

Author: pyphilia

src/js/constants/dataTestDecorator.js

@@ -21,7 +21,7 @@ export const dataTestDecorator = async xmlData => {
     Name: [name],
     Output: [output]
   } of xml.DataTests.Data) {
-    const data = { name, outputType: output.Type[0], type: DATATEST_TYPE };
+    const data = { name, outputType: output.Type[0], category: DATATEST_TYPE };
     const mimeType = output.MimeType;
     if (output.MimeType) {
       data.mimeType = mimeType[0];

src/js/constants/globals.js

@@ -2,28 +2,50 @@ import { Decorators } from "divaservices-utils";
 import { getServicesAPI } from "../api/requests";
 import { INPUTS_DATA_XML_FILEPATH } from "../../config";
 import { dataTestDecorator } from "./dataTestDecorator";
+import { DATATEST_TYPE } from "./constants";
 
 export let webservices;
 export let dataInputs;
 
 const _initWebservices = async () => {
   const xml = await getServicesAPI();
-  console.log("wefd");
   webservices = await Decorators.webservicesDecorator(xml);
-  console.log("wefd");
 };
 
-const _initDataInputs = async () => {
+const _initDataInputsOld = async () => {
   const inputDataFilePath = INPUTS_DATA_XML_FILEPATH;
   const inputDataXml = (await import(`!!raw-loader!../../${inputDataFilePath}`))
     .default;
   dataInputs = await dataTestDecorator(inputDataXml);
 };
 
+const _initDataInputs = async () => {
+  dataInputs = [
+    ...new Set( // remove duplicates
+      webservices
+        .map(service =>
+          service.inputs.map(inp =>
+            inp.mimeTypes ? inp.mimeTypes.allowed : null
+          )
+        )
+        .flat(2)
+        .filter(Boolean) // flat and filter null values
+    )
+  ].map(mimetype => ({
+    name: mimetype,
+    category: DATATEST_TYPE,
+    outputType: mimetype.split("/")[0],
+    mimeType: mimetype
+  }));
+};
+
 // init webservices from xml file
 export const initWebservices = async () => {
   await _initWebservices();
+  await _initDataInputsOld();
+  console.log(dataInputs);
   await _initDataInputs();
+  console.log(dataInputs);
 };
 
 export const getWebserviceByName = name => {

src/js/elements/addDataElement.js

@@ -85,17 +85,17 @@ const createFolderInput = boxId => {
   return input;
 };
 
-const createFileInput = ({ boxId }) => {
-  const input = document.createElement("input");
-  input.setAttribute("type", "file");
-  input.classList.add("btn");
-  // input.setAttribute("accept", mimeType);
-  input.addEventListener("change", function() {
-    const data = [...this.files];
-    app.updateDataInDataElement({ boxId, data });
-  });
-  return input;
-};
+// const createFileInput = ({ boxId }) => {
+//   const input = document.createElement("input");
+//   input.setAttribute("type", "file");
+//   input.classList.add("btn");
+//   // input.setAttribute("accept", mimeType);
+//   input.addEventListener("change", function() {
+//     const data = [...this.files];
+//     app.updateDataInDataElement({ boxId, data });
+//   });
+//   return input;
+// };
 
 const createFileInputNew = ({ boxId }) => {
   const btn = document.createElement("button");
@@ -170,7 +170,7 @@ const addContent = ({ mimeType, outputType, boxId }) => {
     }
     default: {
       console.log("default for type : " + outputType);
-      const input = createFileInput({ mimeType, boxId });
+      const input = createFileInputNew({ mimeType, boxId });
       content.appendChild(input);
     }
   }

src/js/layout/inputs.js

@@ -425,7 +425,7 @@ export const setParametersInForeignObject = (element, defaultParams = {}) => {
       })
       .on("click", function() {
         const win = window.open(
-          `${BASE_URL}services/service?id=${serviceId}`,
+          `${BASE_URL}services/${serviceId}/view`,
           "_blank"
         );
         win.focus();

src/js/layout/utils.js

@@ -189,7 +189,7 @@ export const buildPortAttrs = (name, type, typeAllowed) => {
   const showPortDetails = layoutSettingsApp.isShowPortsDetailsChecked();
   const showPorts = layoutSettingsApp.isShowPortsChecked();
   const typeAllowedShort = shortenString(typeAllowed.join(", "), 25);
-
+  console.log(type);
   return {
     [PORT_SELECTOR]: {
       fill: MimeTypes[type].color,