diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/logs | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/logs')
6 files changed, 14 insertions, 15 deletions
diff --git a/app/assets/javascripts/logs/components/environment_logs.vue b/app/assets/javascripts/logs/components/environment_logs.vue index a114b3c7d4d..5092c6905c4 100644 --- a/app/assets/javascripts/logs/components/environment_logs.vue +++ b/app/assets/javascripts/logs/components/environment_logs.vue @@ -1,6 +1,4 @@ <script> -import { throttle } from 'lodash'; -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlSprintf, GlAlert, @@ -10,14 +8,15 @@ import { GlDropdownDivider, GlInfiniteScroll, } from '@gitlab/ui'; +import { throttle } from 'lodash'; +import { mapActions, mapState, mapGetters } from 'vuex'; -import LogSimpleFilters from './log_simple_filters.vue'; -import LogAdvancedFilters from './log_advanced_filters.vue'; -import LogControlButtons from './log_control_buttons.vue'; - -import { defaultTimeRange } from '~/vue_shared/constants'; import { timeRangeFromUrl } from '~/monitoring/utils'; +import { defaultTimeRange } from '~/vue_shared/constants'; import { formatDate } from '../utils'; +import LogAdvancedFilters from './log_advanced_filters.vue'; +import LogControlButtons from './log_control_buttons.vue'; +import LogSimpleFilters from './log_simple_filters.vue'; export default { components: { @@ -176,7 +175,7 @@ export default { id="environments-dropdown" :text="environments.current || managedApps.current" :disabled="environments.isLoading" - class="gl-mr-3 gl-mb-3 gl-display-flex gl-display-md-block js-environments-dropdown" + class="gl-mr-3 gl-mb-3 gl-display-flex gl-md-display-block js-environments-dropdown" > <gl-dropdown-section-header> {{ s__('Environments|Environments') }} diff --git a/app/assets/javascripts/logs/components/log_advanced_filters.vue b/app/assets/javascripts/logs/components/log_advanced_filters.vue index 37fc4dc3735..9159ca5b9dc 100644 --- a/app/assets/javascripts/logs/components/log_advanced_filters.vue +++ b/app/assets/javascripts/logs/components/log_advanced_filters.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlFilteredSearch } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { __, s__ } from '~/locale'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; import { timeRanges } from '~/vue_shared/constants'; diff --git a/app/assets/javascripts/logs/components/log_simple_filters.vue b/app/assets/javascripts/logs/components/log_simple_filters.vue index ba30d4628c9..55bdd5f0088 100644 --- a/app/assets/javascripts/logs/components/log_simple_filters.vue +++ b/app/assets/javascripts/logs/components/log_simple_filters.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlDropdown, GlDropdownSectionHeader, GlDropdownItem } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; export default { @@ -42,7 +42,7 @@ export default { ref="podsDropdown" :text="podDropdownText" :disabled="disabled" - class="gl-mr-3 gl-mb-3 gl-display-flex gl-display-md-block qa-pods-dropdown" + class="gl-mr-3 gl-mb-3 gl-display-flex gl-md-display-block qa-pods-dropdown" > <gl-dropdown-section-header> {{ s__('Environments|Select pod') }} diff --git a/app/assets/javascripts/logs/stores/actions.js b/app/assets/javascripts/logs/stores/actions.js index a26e6f694c9..e813f91d2fa 100644 --- a/app/assets/javascripts/logs/stores/actions.js +++ b/app/assets/javascripts/logs/stores/actions.js @@ -1,7 +1,7 @@ -import { backOff } from '~/lib/utils/common_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; +import { backOff } from '~/lib/utils/common_utils'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import httpStatusCodes from '~/lib/utils/http_status'; import { TOKEN_TYPE_POD_NAME, tracking, logExplorerOptions } from '../constants'; import trackLogs from '../logs_tracking_helper'; diff --git a/app/assets/javascripts/logs/stores/mutations.js b/app/assets/javascripts/logs/stores/mutations.js index 147f562057f..21031838adf 100644 --- a/app/assets/javascripts/logs/stores/mutations.js +++ b/app/assets/javascripts/logs/stores/mutations.js @@ -1,5 +1,5 @@ -import * as types from './mutation_types'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import * as types from './mutation_types'; const mapLine = ({ timestamp, pod, message }) => ({ timestamp, diff --git a/app/assets/javascripts/logs/stores/state.js b/app/assets/javascripts/logs/stores/state.js index fbe6589dd84..e2028621ac8 100644 --- a/app/assets/javascripts/logs/stores/state.js +++ b/app/assets/javascripts/logs/stores/state.js @@ -1,5 +1,5 @@ -import { timeRanges, defaultTimeRange } from '~/vue_shared/constants'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import { timeRanges, defaultTimeRange } from '~/vue_shared/constants'; export default () => ({ /** |