Merge branch 'dev' into saved-search-2140

FAIRsharing · Aug 2, 2024 · 12e710a · 12e710a
2 parents 736c2f5 + 7b060f8
commit 12e710a
Show file tree

Hide file tree

Showing 61 changed files with 122 additions and 254 deletions.
diff --git a/documentation/html/ExternalRESTClients.html b/documentation/html/ExternalRESTClients.html
@@ -414,7 +414,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/GraphQLClient.html b/documentation/html/GraphQLClient.html
@@ -912,7 +912,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/RESTClient.html b/documentation/html/RESTClient.html
@@ -8895,7 +8895,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/Static.html b/documentation/html/Static.html
@@ -391,7 +391,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/classes.list.html b/documentation/html/classes.list.html
@@ -2771,7 +2771,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Record_Collections.vue.html b/documentation/html/components_Records_Record_Collections.vue.html
@@ -135,15 +135,15 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
         color="accent3"
         slider-color="accent3"
         class="mb-5"
-        :hide-slider="tabsData.tabs[Object.keys(tabsData.tabs)[tabsData.selectedTab]].type === 'conforming_resources'? !currentRecord['fairsharingRecord'].savedSearches.length : tabsData.tabs[Object.keys(tabsData.tabs)[tabsData.selectedTab]].data.length===0"
+        :hide-slider="tabsData.tabs[Object.keys(tabsData.tabs)[tabsData.selectedTab]].data.length===0"
       >
         &lt;v-tab
           v-for="(tabName,tabIndex) in Object.keys(tabsData.tabs)"
           :key="tabName+'_'+tabIndex"
-          :disabled="tabName === 'conforming_resources' ? !currentRecord['fairsharingRecord'].savedSearches.length : tabsData.tabs[tabName].data.length===0"
+          :disabled="tabsData.tabs[tabName].data.length===0"
           @change="selectedValues=null"
         >
-          {{ cleanString(tabName) }} ({{ tabName === 'conforming_resources' ? currentRecord['fairsharingRecord'].savedSearches.length : tabsData.tabs[tabName].count }})
+          {{ cleanString(tabName) }} ({{ tabsData.tabs[tabName].count }})
         &lt;/v-tab>
       &lt;/v-tabs>
       &lt;!--  tab content  -->
@@ -156,12 +156,7 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
           v-for="(tabItem,tabItemIndex) in filterList"
           :key="tabItem+'_'+tabItemIndex"
         >
-          &lt;SavedSearches
-            v-if="tabItem.type === 'conforming_resources'"
-          />
-
           &lt;v-virtual-scroll
-            v-else
             :items="tabItem.data"
             height="400"
             item-height="130"
@@ -215,7 +210,6 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
 &lt;script>
 import {mapState} from "vuex";
 
-import SavedSearches from '@/components/Records/Record/GeneralInfo/SavedSearches'
 import SectionTitle from '@/components/Records/Record/SectionTitle';
 import RecordStatus from "@/components/Records/Shared/RecordStatus";
 import recordRelationShipsDefinitions from "@/data/RecordRelationShipsDefinitions.json";
@@ -227,7 +221,6 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
   components: {
     RecordStatus,
     SectionTitle,
-    SavedSearches
   },
   mixins: [stringUtils, recordTabUtils],
   props:{
@@ -245,42 +238,12 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
         tabs: {
           in_collections: {relation: 'collects', data: [], count:0}
         }
-      },
+      }
     }
   },
   computed: {
     ...mapState("record", ["currentRecord"]),
   },
-  watch:{
-    currentRecord() {
-      let _module = this
-      Object.keys(_module.tabsData.tabs).forEach(tabName => {
-        //Update the count of the conforming resources after unlinking saved search
-        if (tabName === 'conforming_resources') {
-          _module.tabsData.tabs[tabName].count = _module.currentRecord['fairsharingRecord'].savedSearches.length;
-        }
-        //If no saved search is available in conforming resources tab
-        if(!_module.currentRecord['fairsharingRecord'].savedSearches.length) {
-          //If no conforming resources is available then shift focus to Related Policies tab
-          if(tabName === "related_policies") {
-            if(_module.tabsData.tabs[tabName].data.length) {
-              this.tabsData.selectedTab = 1
-            }
-          }
-          //If no related policies is available then shift focus to In collections tab
-          else if(tabName === "in_collections") {
-            if(_module.tabsData.tabs[tabName].data.length) {
-              this.tabsData.selectedTab = 0
-            }
-          }
-          //If nothing is available make all tabs section disabled with its initial value i.e null
-          else {
-            this.selectedValues = null
-          }
-        }
-      })
-    }
-  },
   methods: {
     /** Dynamically sets data for each tabs based on the data received from recordAssociations and reverseAssociations*/
     prepareTabsData() {
@@ -292,12 +255,6 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
           data: [],
           count:0
         }
-        _module.tabsData.tabs.conforming_resources = {
-          registry: ['Policy'],
-          data: [],
-          count:0,
-          type:'conforming_resources'
-        }
       }
       else {
         _module.tabsData.tabs.in_policies = {
@@ -325,13 +282,6 @@ <h1 class="page-title">Source: components/Records/Record/Collections.vue</h1>
               )
               _module.tabsData.tabs[tabName].count = _module.tabsData.tabs[tabName].data.length;
             }
-            //Save searches for the policy
-            else if (tabName === 'conforming_resources') {
-              _module.tabsData.tabs[tabName].data =
-                  _module.currentRecord['fairsharingRecord'].savedSearches
-
-              _module.tabsData.tabs[tabName].count = _module.currentRecord['fairsharingRecord'].savedSearches.length;
-            }
             // All incoming collections.
             else {
               _module.tabsData.tabs[tabName].data = _module.prepareAssociations(
@@ -407,7 +357,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Record_RelatedContent.vue.html b/documentation/html/components_Records_Record_RelatedContent.vue.html
@@ -377,7 +377,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Header_FilterChips.vue.html b/documentation/html/components_Records_Search_Header_FilterChips.vue.html
@@ -253,7 +253,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Header_Pagination.vue.html b/documentation/html/components_Records_Search_Header_Pagination.vue.html
@@ -259,7 +259,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Header_Sorting.vue.html b/documentation/html/components_Records_Search_Header_Sorting.vue.html
@@ -215,7 +215,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...tion/html/components_Records_Search_Input_AdvancedSearch_AdvancedSearchDialogBox.vue.html b/...tion/html/components_Records_Search_Input_AdvancedSearch_AdvancedSearchDialogBox.vue.html
@@ -484,7 +484,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...s_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Countries.vue.html b/...s_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Domains.vue.html b/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Licences.vue.html b/...ds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...arch_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Organisations.vue.html b/...arch_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Subject.vue.html b/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/..._Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_Taxonomies.vue.html b/..._Search_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...rch_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_UserDefinedTag.vue.html b/...rch_Input_AdvancedSearch_QueryBuilderComponents_GeneralComponents_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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ds_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_DatabaseRule.vue.html b/...ds_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_DatabaseRule.vue.html
@@ -302,7 +302,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_GeneralRule.vue.html b/...rds_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_GeneralRule.vue.html
@@ -278,7 +278,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...s_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_GroupCtrlSlot.vue.html b/...s_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_GroupCtrlSlot.vue.html
@@ -187,7 +187,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...earch_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_OtherBooleanRule.vue.html b/...earch_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_OtherBooleanRule.vue.html
@@ -211,7 +211,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/...ords_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_PolicyRule.vue.html b/...ords_Search_Input_AdvancedSearch_QueryBuilderComponents_GroupCtrlSlot_PolicyRule.vue.html
@@ -322,7 +322,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Input_AdvancedSearch_QueryBuilderView.vue.html b/documentation/html/components_Records_Search_Input_AdvancedSearch_QueryBuilderView.vue.html
@@ -620,7 +620,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Input_FilterAutocomplete.vue.html b/documentation/html/components_Records_Search_Input_FilterAutocomplete.vue.html
@@ -315,7 +315,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Input_FilterButton.vue.html b/documentation/html/components_Records_Search_Input_FilterButton.vue.html
@@ -279,7 +279,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_Input_SearchInput.vue.html b/documentation/html/components_Records_Search_Input_SearchInput.vue.html
@@ -285,7 +285,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/global.html b/documentation/html/global.html
@@ -2751,7 +2751,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/index.html b/documentation/html/index.html
@@ -176,7 +176,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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/lib_Client_ExternalClients.js.html b/documentation/html/lib_Client_ExternalClients.js.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 Thu Aug 1st 2024
+		on Fri Aug 2nd 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>