Merge pull request #2481 from FAIRsharing/dev

knirirr · web-flow · commit ecb5b5bbcb0b · 2025-02-04T15:06:17.000Z
Dev
diff --git a/documentation/html/components_Records_Record_RelatedContent.vue.html b/documentation/html/components_Records_Record_RelatedContent.vue.html
@@ -272,6 +272,10 @@ <h1 class="page-title">Source: components/Records/Record/RelatedContent.vue</h1>
       if (_module.currentRecord['fairsharingRecord'].registry === 'Policy') {
         _module.$set(_module.tabsData.tabs, 'related_collections', {registry: ["Collection"], data: [], count:0});
       }
+      if (_module.currentRecord['fairsharingRecord'].registry === 'FAIRassist' ||
+          _module.currentRecord['fairsharingRecord'].registry === 'Standard') {
+        _module.$set(_module.tabsData.tabs, 'related_fairassist_components', {registry: ["FAIRassist"], data: [], count:0});
+      }
       if (Object.keys(_module.currentRecord['fairsharingRecord']).includes('recordAssociations') ||
           Object.keys(_module.currentRecord['fairsharingRecord']).includes('reverseRecordAssociations')) {
         Object.keys(_module.tabsData.tabs).forEach(tabName => {
diff --git a/documentation/html/quicksearch.html b/documentation/html/quicksearch.html
diff --git a/src/components/Editor/EditRelationships.vue b/src/components/Editor/EditRelationships.vue
@@ -48,7 +48,7 @@
                       <v-switch
                         v-model="searchFilters[filterName]"
                         inset
-                        :label="`${capitalize(filterName)}(s)`"
+                        :label="`${prepareFilterName(filterName)}`"
                       />
                     </v-col>
                   </v-row>
@@ -188,7 +188,7 @@
                       <v-switch
                         v-model="labelsFilter[filterName]"
                         inset
-                        :label="`${capitalize(filterName)}(s)`"
+                        :label="`${prepareFilterName(filterName)}`"
                       />
                     </v-col>
                   </v-row>
@@ -425,6 +425,13 @@
     >
       The same record/relation combination may not be added more than once.
     </v-snackbar>
+    <v-snackbar
+      v-model="multipleRelationship"
+      color="warning"
+      class="text-body"
+    >
+      {{ multipleRelationshipMessage }}
+    </v-snackbar>
   </v-card>
 </template>
 
@@ -462,11 +469,20 @@
             initialized: false,
             lastQuery: null,
             duplicateRelationship: false,
-            recordsList: []
+            multipleRelationship: false,
+            multipleRelationshipMessage: null,
+            recordsList: [],
+            fairsharingRegistries: [
+              "collection",
+              "standard",
+              "database",
+              "policy",
+              "fairassist"
+            ]
           }
         },
         computed: {
-          ...mapState("record", ["sections", "currentID"]),
+          ...mapState("record", ["sections", "currentID", "currentRecord"]),
           ...mapState("users", ["user"]),
           ...mapState("editor", ["availableRecords", "relationsTypes"]),
           ...mapGetters("editor", ["allowedRelations", "allowedTargets"]),
@@ -492,7 +508,8 @@
                 /* istanbul ignore next */
                 if ((obj.linkedRecord.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
                     obj.linkedRecord.abbreviation.toLowerCase().includes(searchTerm.toLowerCase()) )
-                    && this.labelsFilter[obj.linkedRecord.registry.toLowerCase()] === true){
+                    && (this.labelsFilter[obj.linkedRecord.registry.toLowerCase()] ||
+                        this.labelsFilter[obj.linkedRecord.type.toLowerCase()]) === true){
                   return obj;
                 }
               }
@@ -563,10 +580,34 @@
                       tmpRelation === _module.addingRelation.recordAssocLabel.relation;
 
             });
+            // Check if a duplicate relation is being added.
             if (exists) {
               _module.duplicateRelationship = true;
               return;
             }
+            // Check if the user is trying to add multiple examples of FAIRassist relations.
+            // https://github.com/FAIRsharing/FAIRsharing-API/issues/1137
+            if (_module.currentRecord.fairsharingRecord.type === "metric" || _module.currentRecord.fairsharingRecord.type === "principle") {
+              let parts_of = _module.sections.relations.data.recordAssociations.filter((item) => {
+                return item.recordAssocLabel === 'part_of';
+              })
+              if (parts_of.length > 0) {
+                _module.multipleRelationship = true;
+                _module.multipleRelationshipMessage = "A principle or metric can be part of no more than 1 other of the same type.";
+                return;
+              }
+            }
+            if (_module.currentRecord.fairsharingRecord.type === "metric") {
+              let measures = _module.sections.relations.data.recordAssociations.filter((item) => {
+                return item.recordAssocLabel === 'measures_principle';
+              })
+              if (measures.length > 0) {
+                _module.multipleRelationship = true;
+                _module.multipleRelationshipMessage = "A metric can only measure one principle.";
+                return;
+              }
+            }
+            // Finally get to add the new relation.
             let newRelation = {
               linkedRecord: _module.addingRelation.linkedRecord,
               recordAssocLabel: _module.addingRelation.recordAssocLabel,
@@ -606,7 +647,8 @@
                   registry: target.registry.toLowerCase(),
                   type: target.type.toLowerCase()
                 },
-                sourceType: this.sections.relations.data.registry.toLowerCase(),
+                sourceRegistry: this.sections.relations.data.registry.toLowerCase(),
+                sourceType: this.sections.relations.data.type.toLowerCase(),
                 prohibited: prohibited
             });
             this.$nextTick(() => {this.$refs['editRecordAssociation'].validate()});
@@ -616,19 +658,24 @@
           },
           getRelations() {
             let labelsFilter = {};
-            let allRelations = ['standard', 'database', 'collection', 'policy'];
-
+            let allRegistries = ['standard', 'database', 'collection', 'policy', 'fairassist'];
+            let types = [];
             let allowedRelations = this.allowedRelations({
               target: null,
-              sourceType: this.sections.relations.data.registry.toLowerCase(),
+              sourceRegistry: this.sections.relations.data.registry.toLowerCase(),
+              sourceType: this.sections.relations.data.type.toLowerCase(),
               prohibited: null
             });
             allowedRelations.forEach(allowedRelation => {
               if (!Object.keys(labelsFilter).includes(allowedRelation.target)){
                 /* istanbul ignore else */
-                if (allRelations.includes(allowedRelation.target.toLowerCase())) {
+                if (allRegistries.includes(allowedRelation.target.toLowerCase())) {
+                  labelsFilter[allowedRelation.target] = true;
+                  allRegistries.splice(allRegistries.indexOf(allowedRelation.target.toLowerCase()), 1)
+                }
+                else {  // This must therefore be a record type.
                   labelsFilter[allowedRelation.target] = true;
-                  allRelations.splice(allRelations.indexOf(allowedRelation.target.toLowerCase()), 1)
+                  types.push(allowedRelation.target);
                 }
               }
             });
@@ -643,16 +690,25 @@
               search = this.search.trim();
             }
             let registries = [];
+            let types = [];
             Object.keys(this.searchFilters).forEach(filter => {
               if (this.searchFilters[filter]){
-                registries.push(filter);
+               // Check if this is a registry or type
+                if (this.fairsharingRegistries.indexOf(filter) > -1) {
+                  registries.push(filter);
+                }
+                else {
+                  types.push(filter);
+                }
               }
             });
             this.lastQuery = search;
             await _module.getAvailableRecords({
               q: search,
               fairsharingRegistry: registries,
-              excludeId: _module.currentID
+              recordType: types,
+              excludeId: _module.currentID,
+              searchAnd: false
             });
             let i = 0;
             this.availableRecords.forEach(rec => {
@@ -682,6 +738,12 @@
             if (redirect && !this.message.error){
               await this.$router.push({path: '/' + this.$route.params.id})
             }
+          },
+          prepareFilterName(name) {
+            if (name == 'fairassist') {
+              return 'FAIRassist'
+            }
+            return capitalize(name) + "(s)";
           }
         }
     }
diff --git a/src/components/Editor/GeneralInformation/BaseFields.vue b/src/components/Editor/GeneralInformation/BaseFields.vue
@@ -276,7 +276,7 @@
         <v-autocomplete
           ref="editRecordType"
           v-model="fields.type"
-          label="Registry type"
+          label="Registry and type"
           :rules="[rules.isRequired()]"
           :items="recordTypes"
           item-text="name"
diff --git a/src/components/Records/Record/RelatedContent.vue b/src/components/Records/Record/RelatedContent.vue
@@ -179,6 +179,10 @@ export default {
       if (_module.currentRecord['fairsharingRecord'].registry === 'Policy') {
         _module.$set(_module.tabsData.tabs, 'related_collections', {registry: ["Collection"], data: [], count:0});
       }
+      if (_module.currentRecord['fairsharingRecord'].registry === 'FAIRassist' ||
+          _module.currentRecord['fairsharingRecord'].registry === 'Standard') {
+        _module.$set(_module.tabsData.tabs, 'related_fairassist_components', {registry: ["FAIRassist"], data: [], count:0});
+      }
       if (Object.keys(_module.currentRecord['fairsharingRecord']).includes('recordAssociations') ||
           Object.keys(_module.currentRecord['fairsharingRecord']).includes('reverseRecordAssociations')) {
         Object.keys(_module.tabsData.tabs).forEach(tabName => {
diff --git a/src/data/RecordRelationShipsDefinitions.json b/src/data/RecordRelationShipsDefinitions.json
@@ -9,5 +9,7 @@
   "shares data with": "This database shares a portion of data with another database",
   "shares code with": "This database shares a portion of code with another database",
   "accepts": "This database accepts data that follows a particular standard",
-  "outputs": "This database outputs data that follows a particular standard"
+  "outputs": "This database outputs data that follows a particular standard",
+  "measures principle": "Used to show which 'owning' principle any given metric belongs to",
+  "part of": "Allows composition of metrics within other metrics, or shows what 'parent' principle a principle bleongs to"
 }
diff --git a/src/data/jumbotronData.json b/src/data/jumbotronData.json
@@ -29,11 +29,11 @@
   },
   "collection": {
     "title": "Collections",
-    "subtitle": " Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation. A Recommendation is a core-set of resources that are selected or endorsed by data policies from journals, funders or other organisations. "
+    "subtitle": " Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation. "
   },
   "collections": {
     "title": "Collections",
-    "subtitle": " Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation. A Recommendation is a core-set of resources that are selected or endorsed by data policies from journals, funders or other organisations. "
+    "subtitle": " Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation."
   },
   "privacy": {
     "title": "Privacy policy",
diff --git a/src/data/recordsTypes.json b/src/data/recordsTypes.json
@@ -1,7 +1,7 @@
 {
   "recordSubTitles": {
     "Standards": "The standards in FAIRsharing are manually curated from a variety of sources, including BioPortal, MIBBI and the Equator Network.",
-    "Collections": "Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation. A Recommendation is a core-set of resources that are selected or endorsed by data policies from journals, funders or other organisations.",
+    "Collections": "Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation.",
     "Databases": "A catalogue of databases, described according to the BioDBcore guidelines, along with the standards used within them; partly compiled with the support of Oxford University Press (NAR Database Issue and DATABASE Journal).",
     "Policies": "FAIRsharing policies: A catalogue of data preservation, management and sharing policies from international funding agencies, regulators and journals.",
     "Search": "Search the FAIRsharing records using advanced filtering"
diff --git a/src/plugins/icons.js b/src/plugins/icons.js
@@ -184,6 +184,11 @@ const customIcons = {
       icon: "/assets/records/benchmark.svg",
       tooltip: "Benchmark",
     },
+    principle: {
+      type: "img",
+      icon: "/assets/records/principle.svg",
+      tooltip: "Principle",
+    },
     repository: {
       type: "img",
       icon: "/assets/records/db-icon.svg",
diff --git a/src/store/editor.js b/src/store/editor.js
@@ -192,6 +192,7 @@ let editorStore = {
             getRecordsQuery.queryParam = {perPage: 100};
             if (options.q) getRecordsQuery.queryParam.q = options.q;
             getRecordsQuery.queryParam.fairsharingRegistry = options.fairsharingRegistry;
+            getRecordsQuery.queryParam.recordType = options.recordType;
             getRecordsQuery.queryParam.searchAnd = false;
             getRecordsQuery.queryParam.excludeId = options.excludeId;
             let data = await graphClient.executeQuery(getRecordsQuery);
@@ -205,10 +206,11 @@ let editorStore = {
         async getAvailableRelationsTypes({commit}){
             let types = await restClient.getRelationsTypes();
             let allowed = {};
-            let relationTypes = ['standard', 'database', 'policy', 'collection'];
+            let relationTypes = ['standard', 'database', 'policy', 'collection', 'fairassist'];
             for (let typeObject of types) {
                 let relationName = typeObject.name,
                     id = typeObject.id;
+                /* istanbul ignore else */
                 if (typeObject['allowed_associations'].length > 0) {
                     typeObject['allowed_associations'].forEach(allowed_association => {
                         let relationParent = allowed_association.from;
@@ -263,21 +265,35 @@ let editorStore = {
         },
         allowedRelations: (state) => (options) => {
             let output = [];
-            state.relationsTypes[options.sourceType].forEach(relation => {
-                if ((options.target && options.prohibited) &&
-                    (relation.target === options.target.registry || relation.target === options.target.type) &&
-                    !options.prohibited.includes(relation.relation)){
-                    output.push(relation)
-                }
-                if (!options.target && !options.prohibited){
-                    output.push(relation);
+            let seen = [];
+            [options.sourceType, options.sourceRegistry].forEach(type => {
+                // This undefined check prevents allowed relations from being pushed to the array twice,
+                // as we're checking for both registry and record type here.
+                /* istanbul ignore else */
+                if (state.relationsTypes[type] !== undefined) {
+                    state.relationsTypes[type].forEach(relation => {
+                        if ((options.target && options.prohibited) &&
+                            (relation.target === options.target.registry || relation.target === options.target.type) &&
+                            !options.prohibited.includes(relation.relation)) {
+                            if (!seen.includes(relation.id)) {
+                                output.push(relation)
+                                seen.push(relation.id);
+                            }
+                        }
+                        if (!options.target && !options.prohibited) {
+                            if (!seen.includes(relation.id)) {
+                                output.push(relation);
+                                seen.push(relation.id);
+                            }
+                        }
+                    });
                 }
-            });
+            })
             return output;
         },
         allowedTargets: (state) => (source) => {
             let output = [];
-            let allowed = ["standard", "database", "policy", "collection"];
+            let allowed = ["standard", "database", "policy", "collection", "fairassist"];
             state.relationsTypes[source.toLowerCase()].forEach(relation => {
                 /* istanbul ignore else */
                 if (allowed.includes(relation.target)) output.push(relation.target);
diff --git a/tests/fixtures/relationTypes.json b/tests/fixtures/relationTypes.json
diff --git a/tests/unit/components/Editor/EditRelations.spec.js b/tests/unit/components/Editor/EditRelations.spec.js

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@`
`9`	`9`	`"shares data with": "This database shares a portion of data with another database",`
`10`	`10`	`"shares code with": "This database shares a portion of code with another database",`
`11`	`11`	`"accepts": "This database accepts data that follows a particular standard",`
`12`		`- "outputs": "This database outputs data that follows a particular standard"`
	`12`	`+ "outputs": "This database outputs data that follows a particular standard",`
	`13`	`+ "measures principle": "Used to show which 'owning' principle any given metric belongs to",`
	`14`	`+ "part of": "Allows composition of metrics within other metrics, or shows what 'parent' principle a principle bleongs to"`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"recordSubTitles": {`
`3`	`3`	`"Standards": "The standards in FAIRsharing are manually curated from a variety of sources, including BioPortal, MIBBI and the Equator Network.",`
`4`		`- "Collections": "Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation. A Recommendation is a core-set of resources that are selected or endorsed by data policies from journals, funders or other organisations.",`
	`4`	`+ "Collections": "Collections group together one or more types of resource (standard, database or policy) by domain, project or organisation.",`
`5`	`5`	`"Databases": "A catalogue of databases, described according to the BioDBcore guidelines, along with the standards used within them; partly compiled with the support of Oxford University Press (NAR Database Issue and DATABASE Journal).",`
`6`	`6`	`"Policies": "FAIRsharing policies: A catalogue of data preservation, management and sharing policies from international funding agencies, regulators and journals.",`
`7`	`7`	`"Search": "Search the FAIRsharing records using advanced filtering"`