Merge branch 'dev'

thoughtspot · May 14, 2024 · 3597c66 · 3597c66
2 parents 9ccc37c + 9e7b273
commit 3597c66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cs_tools/__project__.py b/cs_tools/__project__.py
@@ -1,4 +1,4 @@
-__version__ = "1.5.4"
+__version__ = "1.5.5"
 __docs__ = "https://thoughtspot.github.io/cs_tools/"
 __repo__ = "https://github.com/thoughtspot/cs_tools"
 __help__ = f"{__repo__}/discussions/"

diff --git a/cs_tools/cli/tools/searchable/app.py b/cs_tools/cli/tools/searchable/app.py
@@ -196,14 +196,14 @@ def bi_server(
         "[database latency (us)] [impressions] [timestamp] != 'today'"
 
         # FOR DATA QUALITY PURPOSES
-        + "[incident id] != [incident id].{null}"
+        + " [incident id] != [incident id].{null}"
 
         # CONDITIONALS BASED ON CLI OPTIONS OR ENVIRONMENT
-        + ("" if not ts.session_context.thoughtspot.is_orgs_enabled else "[org id]")
         + ("" if not compact else " [user action] != [user action].invalid [user action].{null}")
         + ("" if from_date is None else f" [timestamp] >= '{from_date.strftime(SEARCH_DATA_DATE_FMT)}'")
         + ("" if to_date is None else f" [timestamp] <= '{to_date.strftime(SEARCH_DATA_DATE_FMT)}'")
-        + ("" if org_override is None else f"[org id] = {ts.org.guid_for(org_override)}")
+        + ("" if not ts.session_context.thoughtspot.is_orgs_enabled else " [org id]")
+        + ("" if org_override is None else f" [org id] = {ts.org.guid_for(org_override)}")
     )
 
     tasks = [