Merge branch 'dev' into additional_fields_advanced_search

FAIRsharing · Jul 17, 2024 · 0579eaf · 0579eaf
2 parents 774471c + 1f5ccef
commit 0579eaf
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 10 deletions.
diff --git a/.../components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Countries.vue.html b/.../components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Countries.vue.html
@@ -226,7 +226,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ml/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Domains.vue.html b/...ml/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Domains.vue.html
@@ -223,7 +223,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...l/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Licences.vue.html b/...l/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Licences.vue.html
@@ -226,7 +226,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ponents_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Organisations.vue.html b/...ponents_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Organisations.vue.html
@@ -228,7 +228,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ml/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Subject.vue.html b/...ml/components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Subject.vue.html
@@ -225,7 +225,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Taxonomies.vue.html b/...components_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_Taxonomies.vue.html
@@ -226,7 +226,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...onents_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_UserDefinedTag.vue.html b/...onents_Records_Search_Input_AdvancedSearch_QueryBuilderComponents_UserDefinedTag.vue.html
@@ -226,7 +226,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.3</a>
 
-		on Tue Jul 16th 2024
+		on Wed Jul 17th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/src/components/Records/Search/Header/SummaryDownload.vue b/src/components/Records/Search/Header/SummaryDownload.vue
@@ -16,7 +16,7 @@
             class="info mr-10"
             v-on="on"
           >
-            <a @click="commenceDownload()">
+            <a @click="chooseDownload()">
               <span class="white--text">Download</span>
             </a>
           </v-btn>
@@ -25,9 +25,50 @@
       </v-tooltip>
       <!-- eslint-enable-next-line  vue/no-template-shadow -->
     </p>
+    <v-dialog 
+      v-model="chooseDownloadActive"
+      max-width="500"
+    >
+      <v-card>
+        <v-card-title>
+          Do you need information on organisations?
+        </v-card-title>
+        <v-card-text>
+          Selecting "yes" here will add a FAIRsharing record's organisations to your download file. This will increase
+          the file size as each organisation will require a separate line. Select "no" to download without organisations.
+        </v-card-text>
+
+        <v-card-actions>
+          <v-spacer />
+
+          <v-btn
+            color="blue darken-1"
+            text
+            @click="commenceDownload(true)"
+          >
+            Yes
+          </v-btn>
+          <v-btn
+            color="blue darken-1"
+            text
+            @click="commenceDownload(false)"
+          >
+            No
+          </v-btn>
+          <v-btn
+            color="red darken-1"
+            text
+            @click="chooseDownloadActive = false"
+          >
+            Cancel
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
+
 <script>
 import { mapGetters, mapState } from "vuex";
 
@@ -47,6 +88,7 @@ export default {
       listControllerData: listControllerData,
       recordTypes: recordsLabels["recordTypes"],
       buttonDisabled: false,
+      chooseDownloadActive: false
     };
   },
   computed: {
@@ -73,16 +115,20 @@ export default {
     },
   },
   methods: {
+    chooseDownload() {
+      this.chooseDownloadActive = true;
+    },
     // Please refer to SummaryDownload.spec.js for comments on why this is ignored.
     /* istanbul ignore next */
-    async commenceDownload() {
+    async commenceDownload(includeOrgs) {
+      this.chooseDownloadActive = false;
       this.buttonDisabled = true;
       let params = this.$store.getters["introspection/buildQueryParameters"](
         this.currentPath
       );
+      params["includeOrgs"] = includeOrgs;
       params["searchUrl"] =
         this.getHostname().slice(0, -1) + this.$route.fullPath;
-      // TODO: ids must be added to the params. It's in recordSearch.js/fetchCollectionRecords
       if (this.getCollectionIdsParams && this.getCollectionIdsParams.length) {
         params["ids"] = this.getCollectionIdsParams;
       }