diff options
Diffstat (limited to 'app/assets/javascripts/logs')
5 files changed, 41 insertions, 37 deletions
diff --git a/app/assets/javascripts/logs/components/environment_logs.vue b/app/assets/javascripts/logs/components/environment_logs.vue index f37f48aa431..97b96cb5839 100644 --- a/app/assets/javascripts/logs/components/environment_logs.vue +++ b/app/assets/javascripts/logs/components/environment_logs.vue @@ -5,10 +5,10 @@ import { GlSprintf, GlIcon, GlAlert, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlInfiniteScroll, } from '@gitlab/ui'; @@ -25,10 +25,10 @@ export default { GlSprintf, GlIcon, GlAlert, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlInfiniteScroll, LogSimpleFilters, LogAdvancedFilters, @@ -174,16 +174,16 @@ export default { <div class="top-bar d-md-flex border bg-secondary-50 pt-2 pr-1 pb-0 pl-2"> <div class="flex-grow-0"> - <gl-dropdown + <gl-deprecated-dropdown id="environments-dropdown" :text="environments.current || managedApps.current" :disabled="environments.isLoading" class="mb-2 gl-h-32 pr-2 d-flex d-md-block js-environments-dropdown" > - <gl-dropdown-header class="gl-text-center"> + <gl-deprecated-dropdown-header class="gl-text-center"> {{ s__('Environments|Environments') }} - </gl-dropdown-header> - <gl-dropdown-item + </gl-deprecated-dropdown-header> + <gl-deprecated-dropdown-item v-for="env in environments.options" :key="env.id" @click="showEnvironment(env.name)" @@ -195,12 +195,12 @@ export default { /> <div class="gl-flex-grow-1">{{ env.name }}</div> </div> - </gl-dropdown-item> - <gl-dropdown-divider /> - <gl-dropdown-header class="gl-text-center"> + </gl-deprecated-dropdown-item> + <gl-deprecated-dropdown-divider /> + <gl-deprecated-dropdown-header class="gl-text-center"> {{ s__('Environments|Managed apps') }} - </gl-dropdown-header> - <gl-dropdown-item + </gl-deprecated-dropdown-header> + <gl-deprecated-dropdown-item v-for="app in managedApps.options" :key="app.id" @click="showManagedApp(app.name)" @@ -212,8 +212,8 @@ export default { /> <div class="gl-flex-grow-1">{{ app.name }}</div> </div> - </gl-dropdown-item> - </gl-dropdown> + </gl-deprecated-dropdown-item> + </gl-deprecated-dropdown> </div> <log-advanced-filters diff --git a/app/assets/javascripts/logs/components/log_simple_filters.vue b/app/assets/javascripts/logs/components/log_simple_filters.vue index 21fe1695624..2e1270b5428 100644 --- a/app/assets/javascripts/logs/components/log_simple_filters.vue +++ b/app/assets/javascripts/logs/components/log_simple_filters.vue @@ -1,14 +1,19 @@ <script> -import { s__ } from '~/locale'; import { mapActions, mapState } from 'vuex'; -import { GlIcon, GlDropdown, GlDropdownHeader, GlDropdownItem } from '@gitlab/ui'; +import { + GlIcon, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, +} from '@gitlab/ui'; +import { s__ } from '~/locale'; export default { components: { GlIcon, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, }, props: { disabled: { @@ -39,22 +44,22 @@ export default { </script> <template> <div> - <gl-dropdown + <gl-deprecated-dropdown ref="podsDropdown" :text="podDropdownText" :disabled="disabled" class="mb-2 gl-h-32 pr-2 d-flex d-md-block flex-grow-0 qa-pods-dropdown" > - <gl-dropdown-header class="text-center"> + <gl-deprecated-dropdown-header class="text-center"> {{ s__('Environments|Select pod') }} - </gl-dropdown-header> + </gl-deprecated-dropdown-header> - <gl-dropdown-item v-if="!pods.options.length" disabled> + <gl-deprecated-dropdown-item v-if="!pods.options.length" disabled> <span ref="noPodsMsg" class="text-muted"> {{ s__('Environments|No pods to display') }} </span> - </gl-dropdown-item> - <gl-dropdown-item + </gl-deprecated-dropdown-item> + <gl-deprecated-dropdown-item v-for="podName in pods.options" :key="podName" class="text-nowrap" @@ -67,7 +72,7 @@ export default { /> <div class="flex-grow-1">{{ podName }}</div> </div> - </gl-dropdown-item> - </gl-dropdown> + </gl-deprecated-dropdown-item> + </gl-deprecated-dropdown> </div> </template> diff --git a/app/assets/javascripts/logs/stores/actions.js b/app/assets/javascripts/logs/stores/actions.js index 0edd825b6e9..623516f349d 100644 --- a/app/assets/javascripts/logs/stores/actions.js +++ b/app/assets/javascripts/logs/stores/actions.js @@ -200,6 +200,3 @@ export const dismissRequestLogsError = ({ commit }) => { export const dismissInvalidTimeRangeWarning = ({ commit }) => { commit(types.HIDE_TIME_RANGE_INVALID_WARNING); }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/logs/stores/mutations.js b/app/assets/javascripts/logs/stores/mutations.js index be22204d88d..147f562057f 100644 --- a/app/assets/javascripts/logs/stores/mutations.js +++ b/app/assets/javascripts/logs/stores/mutations.js @@ -112,7 +112,9 @@ export default { }, // Managed apps data [types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, apps) { - state.managedApps.options = apps; + state.managedApps.options = apps.filter( + ({ gitlab_managed_apps_logs_path }) => gitlab_managed_apps_logs_path, // eslint-disable-line babel/camelcase + ); state.managedApps.isLoading = false; }, [types.RECEIVE_MANAGED_APPS_DATA_ERROR](state) { diff --git a/app/assets/javascripts/logs/utils.js b/app/assets/javascripts/logs/utils.js index 8479eeb3b59..8e537a4025f 100644 --- a/app/assets/javascripts/logs/utils.js +++ b/app/assets/javascripts/logs/utils.js @@ -1,5 +1,5 @@ -import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import dateFormat from 'dateformat'; +import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import { dateFormatMask } from './constants'; /** |