diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/error_tracking | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/error_tracking')
6 files changed, 14 insertions, 14 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue index fca2d5b06e5..03b8df50c54 100644 --- a/app/assets/javascripts/error_tracking/components/error_details.vue +++ b/app/assets/javascripts/error_tracking/components/error_details.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButton, GlFormInput, @@ -13,19 +12,20 @@ import { GlDropdownDivider, GlIcon, } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __, sprintf, n__ } from '~/locale'; +import Tracking from '~/tracking'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import TrackEventDirective from '~/vue_shared/directives/track_event'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import Tracking from '~/tracking'; +import query from '../queries/details.query.graphql'; import { trackClickErrorLinkToSentryOptions, trackErrorDetailsViewsOptions, trackErrorStatusUpdateOptions, } from '../utils'; -import query from '../queries/details.query.graphql'; import { severityLevel, severityLevelVariant, errorStatus } from './constants'; import Stacktrace from './stacktrace.vue'; diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index 04efd9fff40..0f564fc3c60 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlEmptyState, GlButton, @@ -15,11 +14,12 @@ import { GlPagination, } from '@gitlab/ui'; import { isEmpty } from 'lodash'; +import { mapActions, mapState } from 'vuex'; import { helpPagePath } from '~/helpers/help_page_helper'; import AccessorUtils from '~/lib/utils/accessor'; -import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import { __ } from '~/locale'; import Tracking from '~/tracking'; +import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '../utils'; import ErrorTrackingActions from './error_tracking_actions.vue'; diff --git a/app/assets/javascripts/error_tracking/details.js b/app/assets/javascripts/error_tracking/details.js index 65cda53626a..37b8007d556 100644 --- a/app/assets/javascripts/error_tracking/details.js +++ b/app/assets/javascripts/error_tracking/details.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import csrf from '~/lib/utils/csrf'; -import store from './store'; import ErrorDetails from './components/error_details.vue'; +import store from './store'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/error_tracking/list.js b/app/assets/javascripts/error_tracking/list.js index cb656a9ef13..9c729407009 100644 --- a/app/assets/javascripts/error_tracking/list.js +++ b/app/assets/javascripts/error_tracking/list.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; -import store from './store'; import ErrorTrackingList from './components/error_tracking_list.vue'; +import store from './store'; export default () => { const selector = '#js-error_tracking'; diff --git a/app/assets/javascripts/error_tracking/store/index.js b/app/assets/javascripts/error_tracking/store/index.js index d9206bc8d7c..1d8f1998583 100644 --- a/app/assets/javascripts/error_tracking/store/index.js +++ b/app/assets/javascripts/error_tracking/store/index.js @@ -2,16 +2,16 @@ import Vue from 'vue'; import Vuex from 'vuex'; import * as actions from './actions'; -import mutations from './mutations'; +import * as detailsActions from './details/actions'; +import * as detailsGetters from './details/getters'; +import detailsMutations from './details/mutations'; +import detailsState from './details/state'; import * as listActions from './list/actions'; import listMutations from './list/mutations'; import listState from './list/state'; -import * as detailsActions from './details/actions'; -import detailsMutations from './details/mutations'; -import detailsState from './details/state'; -import * as detailsGetters from './details/getters'; +import mutations from './mutations'; Vue.use(Vuex); diff --git a/app/assets/javascripts/error_tracking/store/list/mutations.js b/app/assets/javascripts/error_tracking/store/list/mutations.js index 82d747e83f8..d92a64947ad 100644 --- a/app/assets/javascripts/error_tracking/store/list/mutations.js +++ b/app/assets/javascripts/error_tracking/store/list/mutations.js @@ -1,5 +1,5 @@ -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import AccessorUtils from '~/lib/utils/accessor'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import * as types from './mutation_types'; export default { |