diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 21:11:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 21:11:43 +0300 |
commit | bc75527dca77b2b72331ac6cbd5928d5b8c0c419 (patch) | |
tree | 000196faadb05f6e2ff60c08865b1a09506e5522 /app/assets/javascripts/logs | |
parent | c82ca12a1c5a359325cb45aaf01b483d1fa0efcb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/logs')
-rw-r--r-- | app/assets/javascripts/logs/stores/getters.js | 14 |
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); }; |