Merge pull request #45 from FAIRsharing/dev

Dev

Author: knirirr

src/components/Registry/__tests__/CollapseTreeGraph.spec.js

@@ -52,7 +52,7 @@ describe("CollapseTreeGraph.vue", function () {
     await wrapper.vm.getGraphData();
     const component = wrapper.findComponent("[data-testid='selectGraph']");
     await component.setValue(itemList[1]);
-    expect(component.vm.modelValue).toBe("2");
+    expect(component.vm.modelValue).toBe("bar");
   });
 
   it("can check if getGraphData() method have the error in catch block", async () => {

src/components/Tools/ResourceTable.vue

@@ -31,7 +31,15 @@
           </li>
         </ul>
       </template>
-
+      <template #item.organisation="{ item }">
+        <a
+          :href="item.organisationURL"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          {{ item.organisation }}
+        </a>
+      </template>
       <template #item.readingMaterial="{ item }">
         <a
           :href="item.readingMaterialURL"
@@ -41,6 +49,18 @@
           {{ item.readingMaterial }}
         </a>
       </template>
+      <template #item.contactName="{ item }">
+        {{ item.contactName }}
+        <a
+          :href="`mailto:${item.contactEmail}`"
+          rel="noopener noreferrer"
+          target="_blank"
+          >{{ item.contactEmail }}</a
+        >
+      </template>
+      <template #item.reviewed="{ item }">
+        {{ item.reviewed === "Y" ? "Yes" : "No" }}
+      </template>
     </v-data-table>
   </div>
 </template>
@@ -89,6 +109,24 @@ export default {
           align: "center",
           key: "readingMaterial",
         },
+        {
+          title: "Contact Name",
+          value: "contactName",
+          align: "center",
+          key: "contactName",
+        },
+        {
+          title: "Comment",
+          value: "comment",
+          align: "center",
+          key: "comment",
+        },
+        {
+          title: "Reviewed",
+          value: "reviewed",
+          align: "center",
+          key: "reviewed",
+        },
       ],
       resources: [],
       noData: "",
@@ -141,9 +179,14 @@ export default {
             executionType: obj[3],
             keyFeatures: obj[4].split("\n"),
             organisation: obj[5],
+            organisationURL: obj[6],
             targetObjects: obj[7],
             readingMaterial: obj[8],
             readingMaterialURL: obj[9],
+            contactName: obj[10],
+            contactEmail: obj[11],
+            comment: obj[12],
+            reviewed: obj[13],
           });
         }
       });