Merge pull request #2558 from FAIRsharing/dev

Dev

Author: knirirr

src/router/index.js

@@ -130,6 +130,18 @@ let routes = [
   },
 
   /* VARIOUS REDIRECTIONS */
+  {
+    name: "fairassist",
+    path: "/fairassist",
+    redirect: () => {
+      window.location.assign(
+        [
+          process.env.VUE_APP_API_HOSTNAME,
+          "/search?fairsharingRegistry=FAIRassist",
+        ].join("")
+      );
+    },
+  },
   {
     name: "article",
     path: "/article/:name",
@@ -450,11 +462,21 @@ let routes = [
     name: "New_content",
     path: "/create",
     component: NewRecord,
+    props: { fairassistOnly: false },
+    beforeEnter(to, from, next) {
+      isLoggedIn(to, from, next, store);
+    },
+  },
+  {
+    name: "New_FAIRassist_content",
+    path: "/create-fairassist",
+    component: NewRecord,
+    props: { fairassistOnly: true },
+    /* istanbul ignore next */
     beforeEnter(to, from, next) {
       isLoggedIn(to, from, next, store);
     },
   },
-
   /* Static pages */
   {
     name: "New",

src/store/editor.js

@@ -151,25 +151,28 @@ let editorStore = {
             let countries = await graphClient.executeQuery(countriesQuery);
             state.commit("setCountries", countries['searchCountries'])
         },
-        async getRecordTypes(state){
+        async getRecordTypes(state, fairassistOnly=false){
             let recordTypes = [];
             let data = await graphClient.executeQuery(typesQuery);
             const size = data['fairsharingRegistries'].records.length;
             let currentItem = 0;
             data['fairsharingRegistries'].records.forEach(function(type){
-                currentItem += 1;
-                recordTypes.push({
-                    header: type.name
-                });
-                type.recordTypes.forEach(function(subType){
-                    recordTypes.push({
-                        name: subType.name,
-                        group: type.name,
-                        id: subType.id,
-                        description: subType.description
-                    })
-                });
-                if (currentItem < size) recordTypes.push({ divider: true });
+              if (fairassistOnly){
+                if (type.name.toLowerCase() !== 'fairassist') return;
+              }
+              currentItem += 1;
+              recordTypes.push({
+                  header: type.name
+              });
+              type.recordTypes.forEach(function(subType){
+                  recordTypes.push({
+                      name: subType.name,
+                      group: type.name,
+                      id: subType.id,
+                      description: subType.description
+                  })
+              });
+              if (currentItem < size) recordTypes.push({ divider: true });
             });
             state.commit("setRecordTypes", recordTypes);
         },

src/views/CreateRecord/NewRecord.vue

@@ -12,7 +12,15 @@
         <v-col cols="12">
           <v-card v-if="loaded">
             <v-card-title class="primary white--text">
-              <h3 class="white--text">
+              <h3
+                v-if="fairassistOnly"
+                class="white--text"
+              >
+                Creating a new FAIRassist record
+              </h3>
+              <h3
+                v-else
+              >
                 Creating a new FAIRsharing record
               </h3>
             </v-card-title>
@@ -102,6 +110,9 @@
     export default {
       name: "NewRecordPage",
       components: {Loaders, BaseFields},
+      props: {
+        fairassistOnly: { type: Boolean, default: false }
+      },
       data(){
           return {
             record: {},
@@ -147,7 +158,7 @@
           ...mapActions("record", ["resetRecord"]),
           async getData(){
             await this.getCountries();
-            await this.getRecordTypes();
+            await this.getRecordTypes(this.fairassistOnly);
             await this.getTags();
           },
           async createRecord(){

tests/unit/router/routes.spec.js

@@ -205,7 +205,8 @@ describe("Routes", () => {
             old_policies_institution: '/search?fairsharingRegistry=Policy&recordType=institution&page=1',
             old_policies_society: '/search?fairsharingRegistry=Policy&recordType=society&page=1',
             old_policies_journal_publisher: '/search?fairsharingRegistry=Policy&recordType=journal_publisher&page=1',
-            old_policies_funder: '/search?fairsharingRegistry=Policy&recordType=funder&page=1'
+            old_policies_funder: '/search?fairsharingRegistry=Policy&recordType=funder&page=1',
+            fairassist: '/search?fairsharingRegistry=FAIRassist'
         }
 
         // eslint-disable no-promise-executor-return
@@ -262,8 +263,6 @@ describe("Routes", () => {
         // eslint-enable no-promise-executor-return
     });
 
-
-
     it("gets sitemap from the api", async () => {
         process.env.VUE_APP_API_ENDPOINT = 'https://api.fairsharing.org'
         let assignMock = jest.fn();

tests/unit/views/CreateRecord/NewFairassistRecord.spec.js

@@ -0,0 +1,81 @@
+import { createLocalVue, shallowMount } from '@vue/test-utils'
+import sinon  from "sinon";
+import VueRouter from "vue-router";
+import Vuetify from "vuetify"
+import Vuex from "vuex"
+
+import GraphClient from "@/lib/GraphClient/GraphClient";
+import editorStore from "@/store/editor.js"
+import recordStore from "@/store/recordData.js"
+import userStore from "@/store/users.js"
+import NewRecord from "@/views/CreateRecord/NewRecord.vue"
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+const vuetify = new Vuetify();
+
+recordStore.state.newRecord = false;
+userStore.state.user().is_curator = false;
+userStore.state.user().credentials.token = 'a token';
+
+const recordTypeData = {
+  fairsharingRegistries: {
+    records: [
+      {
+        id: 1,
+        name: "Database"
+      },
+      {
+        id: 2,
+        name: "FAIRassist"
+      },
+    ]
+  }
+}
+
+const $store = new Vuex.Store({
+  modules: {
+    editor: editorStore,
+    record: recordStore,
+    users: userStore
+  }
+});
+
+const $route = {
+  path: "/create-fairassist"
+};
+const router = new VueRouter();
+const $router = {
+  push: jest.fn(),
+  currentRoute: {
+    path: "/create-fairassist"
+  }
+};
+
+let wrapper;
+let graphStub;
+
+describe('NewRecord', () => {
+
+  beforeAll(() => {
+    graphStub = sinon.stub(GraphClient.prototype, "executeQuery");
+    graphStub.withArgs(sinon.match.any).returns(recordTypeData);
+
+    wrapper = shallowMount(NewRecord, {
+      localVue,
+      vuetify,
+      router,
+      mocks: {$store, $route, $router},
+      propsData: {
+        fairassistOnly: true
+      },
+    });
+  });
+
+  it("can be mounted", () => {
+    expect(wrapper.vm.$options.name).toMatch("NewRecord");
+    expect(wrapper.vm.$route.path).toEqual('/create-fairassist');
+    expect(wrapper.vm.fairassistOnly).toBe(true);
+  });
+
+});