From 59a9bc15ea79ff10f68bb151a04f0bde7208c2c2 Mon Sep 17 00:00:00 2001
From: Peter Olu <pemeraldy@gmail.com>
Date: Thu, 12 May 2022 07:56:57 +0100
Subject: [PATCH] refactored logs header search terms logic and the handling of
 active buttons

---
 src/views/dashboard/related/log/Header.vue   | 48 ++++++++++++++++----
 src/views/dashboard/related/trace/Filter.vue |  6 +--
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue
index 90374694..82491111 100644
--- a/src/views/dashboard/related/log/Header.vue
+++ b/src/views/dashboard/related/log/Header.vue
@@ -108,12 +108,13 @@ limitations under the License. -->
           <el-input v-model="traceId" class="inputs-max" size="small" />
         </div>
       </div>
-
-      <ConditionTags
-        v-if="currentSearchTerm === 'tags'"
-        :type="'LOG'"
-        @update="updateTags"
-      />
+      <keep-alive>
+        <ConditionTags
+          v-if="currentSearchTerm === 'tags'"
+          :type="'LOG'"
+          @update="updateTags"
+        />
+      </keep-alive>
     </div>
 
     <div class="flex-h items-center" v-show="!isBrowser">
@@ -348,8 +349,37 @@ function removeFromActiveTerms() {
     (term) => term !== currentSearchTerm.value
   );
 }
+function handleActiveSearchTerms() {
+  switch (currentSearchTerm.value) {
+    case "traceId":
+      if (!traceId.value.length) return;
+      addToActiveTerms();
+      break;
+    case "tags":
+      if (!tagsList.value.length) return;
+      addToActiveTerms();
+      break;
+    case "keywords":
+      if (!keywordsOfContent.value.length) return;
+      addToActiveTerms();
+      break;
+    case "exclude":
+      if (!excludingKeywordsOfContent.value.length) return;
+      addToActiveTerms();
+      break;
+    case "instance":
+      addToActiveTerms();
+      break;
+    case "service":
+      addToActiveTerms();
+      break;
+    case "endpoint":
+      addToActiveTerms();
+      break;
+  }
+}
 function searchLogs() {
-  addToActiveTerms();
+  handleActiveSearchTerms();
   currentSearchTerm.value = "";
   let endpoint = "",
     instance = "";
@@ -434,9 +464,7 @@ function removeExcludeContent(index: number) {
   excludingContentStr.value = "";
 }
 function setSearchTerm(term: string) {
-  // if (!term) return;
   currentSearchTerm.value = term;
-  console.log(currentSearchTerm.value);
 }
 function cancelSearchTerm() {
   switch (currentSearchTerm.value) {
@@ -465,7 +493,7 @@ function cancelSearchTerm() {
   }
   removeFromActiveTerms();
   currentSearchTerm.value = "";
-  init()
+  init();
 }
 watch(
   () => selectorStore.currentService,
diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue
index 9784987f..6e94db76 100644
--- a/src/views/dashboard/related/trace/Filter.vue
+++ b/src/views/dashboard/related/trace/Filter.vue
@@ -292,13 +292,13 @@ function handleActiveFilterState() {
       traceStore.setActiveFilter(activeFilter.value);
       break;
     case "service":
-      traceStore.setActiveFilter(activeFilter.value);            
+      traceStore.setActiveFilter(activeFilter.value);
       break;
     case "instance":
-      traceStore.setActiveFilter(activeFilter.value);            
+      traceStore.setActiveFilter(activeFilter.value);
       break;
     case "status":
-      traceStore.setActiveFilter(activeFilter.value);            
+      traceStore.setActiveFilter(activeFilter.value);
       break;
   }
 }