Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 11 insertions, 3 deletions

diff --git a/app/assets/javascripts/logs/stores/getters.js b/app/assets/javascripts/logs/stores/getters.js
index d92969c5389..dc392af8381 100644
--- a/app/assets/javascripts/logs/stores/getters.js
+++ b/app/assets/javascripts/logs/stores/getters.js
@@ -6,8 +6,16 @@ const mapTrace = ({ timestamp = null, pod = '', message = '' }) =>
 export const trace = state => state.logs.lines.map(mapTrace).join('\n');
 
 export const showAdvancedFilters = state => {
-  const environment = state.environments.options.find(
-    ({ name }) => name === state.environments.current,
+  if (state.environments.current) {
+    const environment = state.environments.options.find(
+      ({ name }) => name === state.environments.current,
+    );
+
+    return Boolean(environment?.enable_advanced_logs_querying);
+  }
+  const managedApp = state.managedApps.options.find(
+    ({ name }) => name === state.managedApps.current,
   );
-  return Boolean(environment?.enable_advanced_logs_querying);
+
+  return Boolean(managedApp?.enable_advanced_logs_querying);
 };