add tree type indication when applying rule

Arborator · Oct 17, 2024 · 79ed5c8 · 79ed5c8
1 parent a605faa
commit 79ed5c8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/components/grewSearch/GrewRequestCard.vue b/src/components/grewSearch/GrewRequestCard.vue
@@ -119,7 +119,8 @@ export default defineComponent({
   },
   data() {
     const currentQueryType: 'SEARCH' | 'REWRITE' = grewTemplates.searchQueries[0].type as 'SEARCH' | 'REWRITE';
-    const data: { selectedSamples: string[]; treeType: string; otherUser: string } = { selectedSamples: [], treeType: 'recent', otherUser: '' };
+    const data: { selectedSamples: string[]; treeType: string; otherUser: string; treeTypeLabel: string } 
+    = { selectedSamples: [], treeType: 'recent', otherUser: '', treeTypeLabel: this.$t('grewSearch.recentTree') };
     return {
       searchReplaceTab: grewTemplates.searchQueries[0].type,
       searchQueryTab: grewTemplates.searchQueries[0].type,
@@ -152,11 +153,11 @@ export default defineComponent({
       this.data = val;
     },
     onSearch() {
-      this.parentOnSearch(this.currentQuery.normalize('NFC'), this.data.treeType, this.data.otherUser, this.data.selectedSamples);
+      this.parentOnSearch(this.currentQuery.normalize('NFC'), this.data.treeType, this.data.treeTypeLabel,  this.data.otherUser, this.data.selectedSamples);
       this.changeLastGrewQuery({ text: this.currentQuery.normalize('NFC'), type: this.currentQueryType, userType: this.data.treeType });
     },
     tryRules() {
-      this.parentOnTryRules(this.currentQuery.normalize('NFC'), this.data.treeType, this.data.otherUser, this.data.selectedSamples);
+      this.parentOnTryRules(this.currentQuery.normalize('NFC'), this.data.treeType, this.data.treeTypeLabel, this.data.otherUser, this.data.selectedSamples);
       this.changeLastGrewQuery({ text: this.currentQuery.normalize('NFC'), type: this.currentQueryType, userType: this.data.treeType });
     },
     changeQuery(query: string, type: 'SEARCH' | 'REWRITE') {

diff --git a/src/components/grewSearch/GrewSearch.vue b/src/components/grewSearch/GrewSearch.vue
@@ -6,6 +6,7 @@
       :query-type="queryType" 
       :query="query" 
       :userType="userType" 
+      :treeLabel="treeLabel"
       @reload-results="reloadResults" 
       @closed="closeDialog"
       />
@@ -49,12 +50,14 @@ export default defineComponent({
       queryType: string;
       query: string;
       userType: string;
+      treeLabel: string;
     } = {
       resultSearchDialog: false,
       resultSearch: {},
       queryType: '',
       query: '',
       userType: '',
+      treeLabel: '',
     };
     return result;
   },
@@ -63,10 +66,12 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useGrewHistoryStore, ['saveHistory']),
-    onSearch(searchPattern: string, treeType: string, otherUser: string, selectedSamples: string[]) {
+    onSearch(searchPattern: string, treeType: string, treeLabel: string, otherUser: string, selectedSamples: string[]) {
       const data = { pattern: searchPattern, userType: treeType, sampleIds: selectedSamples, otherUser: otherUser };
       this.queryType = 'SEARCH';
       this.userType = treeType;
+      this.treeLabel = treeLabel;
+      console.log(this.treeLabel)
       api
         .searchRequest(this.name, data)
         .then((response) => {
@@ -78,11 +83,12 @@ export default defineComponent({
           notifyError({ error });
         });
     },
-    onTryRules(query: string, userType: string, otherUser: string, selectedSamples: string[]) {
+    onTryRules(query: string, userType: string, treeLabel: string, otherUser: string, selectedSamples: string[]) {
       const data = { query: query, userType: userType, sampleIds: selectedSamples, otherUser: otherUser };
       this.queryType = 'REWRITE';
       this.query = query;
       this.userType = userType;
+      this.treeLabel = treeLabel;
       api
         .tryPackage(this.name, data)
         .then((response) => {

diff --git a/src/components/grewSearch/ResultView.vue b/src/components/grewSearch/ResultView.vue
@@ -82,6 +82,9 @@
           <q-tooltip v-if="!atLeastOneSelected">{{ $t('grewSearch.applyRuleTooltip') }}</q-tooltip>
         </q-btn>
       </div>
+      <div>
+        {{ treeLabel }}
+      </div>
     </q-bar>
   </div>
 </template>
@@ -121,6 +124,10 @@ export default defineComponent({
       type: String as PropType<string>,
       required: false,
     },
+    treeLabel: {
+      type: String as PropType<string>,
+      required: false,
+    }
   },
 
   data() {

diff --git a/src/components/shared/TreesTypeSelect.vue b/src/components/shared/TreesTypeSelect.vue
@@ -155,6 +155,7 @@ export default defineComponent({
       const data = {
         selectedSamples: this.selectedSamples.map((sample) => sample.sampleName),
         treeType: this.treeType.value,
+        treeTypeLabel: this.treeType.label,
         otherUser: this.otherUser,
       };
       this.$emit('selected-value', data);