Merge branch 'saved-search-2140' of https://github.com/FAIRsharing/fa…

…irsharing.github.io into saved-search-2140
FAIRsharing · May 7, 2024 · 23afcd6 · 23afcd6
2 parents 53e94a1 + 735db6e
commit 23afcd6
Show file tree

Hide file tree

Showing 60 changed files with 457 additions and 75 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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
@@ -9077,7 +9077,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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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
@@ -2663,7 +2663,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 May 2nd 2024
+		on Tue May 7th 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
@@ -357,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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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
@@ -483,7 +483,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 May 2nd 2024
+		on Tue May 7th 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
@@ -222,7 +222,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 May 2nd 2024
+		on Tue May 7th 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
@@ -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 May 2nd 2024
+		on Tue May 7th 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
@@ -227,7 +227,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 May 2nd 2024
+		on Tue May 7th 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
@@ -224,7 +224,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 May 2nd 2024
+		on Tue May 7th 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
@@ -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 May 2nd 2024
+		on Tue May 7th 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
@@ -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 May 2nd 2024
+		on Tue May 7th 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
@@ -644,7 +644,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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 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 May 2nd 2024
+		on Tue May 7th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_SaveSearch_SaveSearchButton.vue.html b/documentation/html/components_Records_Search_SaveSearch_SaveSearchButton.vue.html
@@ -182,7 +182,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 May 2nd 2024
+		on Tue May 7th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/documentation/html/components_Records_Search_SaveSearch_SaveSearchStepper.vue.html b/documentation/html/components_Records_Search_SaveSearch_SaveSearchStepper.vue.html
@@ -104,25 +104,53 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/SaveSearchSt
       &lt;StepperDialogHeader />
       &lt;!--Stepper Form -->
       &lt;div>
-        &lt;v-stepper v-model="steps" non-linear class="rounded-t-0">
+        &lt;v-stepper
+          v-model="steps"
+          non-linear
+          class="rounded-t-0"
+        >
           &lt;!--Stepper Header -->
           &lt;v-stepper-header class="rounded-0">
             &lt;!--Header 1 -->
-            &lt;v-stepper-step editable :complete="steps > 1" step="1">
+            &lt;v-stepper-step
+              editable
+              :complete="steps > 1"
+              step="1"
+            >
               Select Policy
               &lt;small>Optional&lt;/small>
             &lt;/v-stepper-step>
 
             &lt;v-divider />
             &lt;!--Header 2 -->
-            &lt;v-stepper-step editable :complete="steps > 2" step="2">
+            &lt;v-stepper-step
+              editable
+              :complete="steps > 2"
+              step="2"
+            >
               Select Organisation
               &lt;small>Optional&lt;/small>
             &lt;/v-stepper-step>
 
             &lt;v-divider />
             &lt;!--Header 3 -->
-            &lt;v-stepper-step editable step="3"> Save Search &lt;/v-stepper-step>
+            &lt;v-stepper-step
+              v-if="isSuperCurator"
+              editable
+              step="3"
+            >
+              Select User
+              &lt;small>Optional&lt;/small>
+            &lt;/v-stepper-step>
+
+            &lt;v-divider v-if="isSuperCurator" />
+            &lt;!--Header 4 -->
+            &lt;v-stepper-step
+              editable
+              :step="isSuperCurator ? 4 : 3"
+            >
+              Save Search
+            &lt;/v-stepper-step>
           &lt;/v-stepper-header>
 
           &lt;!--Stepper Body -->
@@ -168,8 +196,41 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/SaveSearchSt
             &lt;/v-stepper-content>
 
             &lt;!--Stepper Content 3 Save Search Form-->
-            &lt;v-stepper-content step="3">
-              &lt;v-form ref="searchFormRef" v-model="searchForm">
+            &lt;v-stepper-content
+              v-if="isSuperCurator"
+              step="3"
+            >
+              &lt;UserStepper />
+
+              &lt;div
+                class="d-flex flex-column flex-md-row justify-md-space-between my-3"
+              >
+                &lt;v-btn
+                  class="order-md-2"
+                  :class="{
+                    'mb-3': $vuetify.breakpoint.smAndDown,
+                  }"
+                  color="primary"
+                  @click="steps = 4"
+                >
+                  Continue
+                &lt;/v-btn>
+                &lt;v-btn
+                  class="white--text order-md-1"
+                  color="accent3"
+                  @click="steps = 2"
+                >
+                  Back
+                &lt;/v-btn>
+              &lt;/div>
+            &lt;/v-stepper-content>
+
+            &lt;!--Stepper Content 4 Save Search Form-->
+            &lt;v-stepper-content :step="isSuperCurator ? 4 : 3">
+              &lt;v-form
+                ref="searchFormRef"
+                v-model="searchForm"
+              >
                 &lt;v-text-field
                   v-model="searchName"
                   label="Search Name"
@@ -195,7 +256,11 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/SaveSearchSt
                 >
                   Save
                 &lt;/v-btn>
-                &lt;v-btn class="white--text" color="accent3" @click="steps = 2">
+                &lt;v-btn
+                  class="white--text"
+                  color="accent3"
+                  @click="steps = isSuperCurator ? 3 : 2"
+                >
                   Back
                 &lt;/v-btn>
               &lt;/div>
@@ -218,13 +283,19 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/SaveSearchSt
   OrganisationStepper,
   PolicyStepper,
   StepperDialogHeader,
+  UserStepper,
 } from "./StepperComponents";
 
 const restClient = new RESTClient();
 
 export default {
   name: "SaveSearchStepper",
-  components: { StepperDialogHeader, PolicyStepper, OrganisationStepper },
+  components: {
+    StepperDialogHeader,
+    PolicyStepper,
+    OrganisationStepper,
+    UserStepper,
+  },
   data() {
     return {
       stepperDialog: false,
@@ -278,7 +349,7 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/SaveSearchSt
      * Save Search method
      */
     async saveSearch() {
-      // console.log("this.user()::", this.user());
+      console.log("this.user()::", this.user());
       let saveSearchObj = {
         name: this.searchName,
         comments: this.searchComment,
@@ -359,7 +430,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 May 2nd 2024
+		on Tue May 7th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/.../html/components_Records_Search_SaveSearch_StepperComponents_OrganisationStepper.vue.html b/.../html/components_Records_Search_SaveSearch_StepperComponents_OrganisationStepper.vue.html
@@ -113,10 +113,10 @@ <h1 class="page-title">Source: components/Records/Search/SaveSearch/StepperCompo
         &lt;template #selection="data">
           &lt;v-chip
             v-bind="data.attrs"
-            :input-value="data.name"
+            :input-value="data.item['id']"
             close
             @click="data.select"
-            @click:close="remove(data.item['name'])"
+            @click:close="remove(data.item['id'])"
           >
             {{ data.item["name"] }}
           &lt;/v-chip>
@@ -263,7 +263,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 May 2nd 2024
+		on Tue May 7th 2024
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>