refactor: change services schema

type is refactored as category

Author: pyphilia

src/js/constants/globals.js

@@ -8,7 +8,9 @@ export let dataInputs;
 
 const _initWebservices = async () => {
   const xml = await getServicesAPI();
+  console.log("wefd");
   webservices = await Decorators.webservicesDecorator(xml);
+  console.log("wefd");
 };
 
 const _initDataInputs = async () => {

src/js/elements/addElement.js

@@ -130,13 +130,7 @@ export const transformWebserviceForGraph = webservice => {
     alert("problem with ", webservice);
     return {};
   }
-  const {
-    name: label,
-    description,
-    inputs = [],
-    type: category,
-    ports
-  } = webservice;
+  const { name: label, description, inputs = [], category, ports } = webservice;
 
   // handle params
   const params = inputs.filter(inp => isParamInput(inp));

src/js/layout/components/leftSidebar.js

@@ -30,12 +30,12 @@ const LeftSidebar = Vue.component("LeftSidebar", {
       services: (() => {
         const mapped = webservices
           .map(service => {
-            const { type, name } = service;
-            return { type, name };
+            const { category, name } = service;
+            return { category, name };
           })
           .concat(dataInputs);
 
-        const servicesPerCategory = groupBy(mapped, "type");
+        const servicesPerCategory = groupBy(mapped, "category");
         const sorted = [];
         for (let category of Object.keys(servicesPerCategory).sort()) {
           sorted.push(...servicesPerCategory[category].sort(alphabeticalOrder));
@@ -46,7 +46,7 @@ const LeftSidebar = Vue.component("LeftSidebar", {
 
       categories: (() => {
         const categories = webservices
-          .map(algo => algo.type)
+          .map(algo => algo.category)
           .filter((v, i, a) => a.indexOf(v) === i) // get unique value
           .sort();
         categories.push(DATATEST_TYPE);
@@ -142,7 +142,7 @@ const LeftSidebar = Vue.component("LeftSidebar", {
       </div>
       <div id="${ALGO_ITEM_WRAPPER}">
         <div id="${ALGO_ITEMS}">
-          <div v-for="{type, name} in results" :class="'${ALGO_ITEM_CLASS} ' + type" :name="name" @click="type == '${DATATEST_TYPE}' ? addData(name) : addElementByName(name)">
+          <div v-for="{category, name} in results" :class="'${ALGO_ITEM_CLASS} ' + category" :name="name" @click="category == '${DATATEST_TYPE}' ? addData(name) : addElementByName(name)">
             <span class="icon"></span><span class="name" v-html="boldRegInString(name)"></span>
           </div>
         </div>

src/js/layout/utils.js

@@ -186,6 +186,7 @@ i++;
 */
 
 export const buildPortAttrs = (name, type, typeAllowed) => {
+  console.log("TCL: buildPortAttrs -> type", type);
   const showPortDetails = layoutSettingsApp.isShowPortsDetailsChecked();
   const showPorts = layoutSettingsApp.isShowPortsChecked();
   const typeAllowedShort = shortenString(typeAllowed.join(", "), 25);
@@ -223,10 +224,15 @@ export const createPort = (param, group) => {
     } else {
       // @TODO display !userdefined ports ?
       typeAllowed = mimeTypes.allowed;
+      const typeEnd =
+        typeAllowed[0].indexOf("/") < 0
+          ? typeAllowed[0].length
+          : typeAllowed[0].indexOf("/");
+      console.log("TCL: typeEnd", typeEnd);
       type = typeAllowed[0].substr(
         //@TODO diff types ?
         0,
-        typeAllowed[0].indexOf("/")
+        typeEnd
       );
     }