diff options
Diffstat (limited to 'app/assets/javascripts/error_tracking')
9 files changed, 30 insertions, 26 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue index e21c6b62b91..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,21 +12,22 @@ 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 Stacktrace from './stacktrace.vue'; import TrackEventDirective from '~/vue_shared/directives/track_event'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import { severityLevel, severityLevelVariant, errorStatus } from './constants'; -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'; const SENTRY_TIMEOUT = 10000; 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 7ccb6253508..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,12 +14,14 @@ 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 ErrorTrackingActions from './error_tracking_actions.vue'; 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'; export const tableDataClass = 'table-col d-flex d-md-table-cell align-items-center'; @@ -138,6 +139,9 @@ export default { paginationRequired() { return !isEmpty(this.pagination); }, + errorTrackingHelpUrl() { + return helpPagePath('operations/error_tracking'); + }, }, watch: { pagination() { @@ -404,7 +408,7 @@ export default { <template #description> <div> <span>{{ __('Monitor your errors by integrating with Sentry.') }}</span> - <gl-link target="_blank" href="/help/user/project/operations/error_tracking.html">{{ + <gl-link target="_blank" :href="errorTrackingHelpUrl">{{ __('More information') }}</gl-link> </div> diff --git a/app/assets/javascripts/error_tracking/details.js b/app/assets/javascripts/error_tracking/details.js index 55ab362f805..37b8007d556 100644 --- a/app/assets/javascripts/error_tracking/details.js +++ b/app/assets/javascripts/error_tracking/details.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import store from './store'; -import ErrorDetails from './components/error_details.vue'; import csrf from '~/lib/utils/csrf'; +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/actions.js b/app/assets/javascripts/error_tracking/store/actions.js index 8f1e7e0b959..a27ebd16956 100644 --- a/app/assets/javascripts/error_tracking/store/actions.js +++ b/app/assets/javascripts/error_tracking/store/actions.js @@ -1,8 +1,8 @@ -import service from '../services'; -import * as types from './mutation_types'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { visitUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; +import service from '../services'; +import * as types from './mutation_types'; export const setStatus = ({ commit }, status) => { commit(types.SET_ERROR_STATUS, status.toLowerCase()); diff --git a/app/assets/javascripts/error_tracking/store/details/actions.js b/app/assets/javascripts/error_tracking/store/details/actions.js index 394dec938cf..7319d45bbd2 100644 --- a/app/assets/javascripts/error_tracking/store/details/actions.js +++ b/app/assets/javascripts/error_tracking/store/details/actions.js @@ -1,8 +1,8 @@ -import service from '../../services'; -import * as types from './mutation_types'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import Poll from '~/lib/utils/poll'; import { __ } from '~/locale'; +import service from '../../services'; +import * as types from './mutation_types'; let stackTracePoll; 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/actions.js b/app/assets/javascripts/error_tracking/store/list/actions.js index a242c0e4236..f07e546241a 100644 --- a/app/assets/javascripts/error_tracking/store/list/actions.js +++ b/app/assets/javascripts/error_tracking/store/list/actions.js @@ -1,8 +1,8 @@ -import Service from '../../services'; -import * as types from './mutation_types'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import Poll from '~/lib/utils/poll'; import { __ } from '~/locale'; +import Service from '../../services'; +import * as types from './mutation_types'; let eTagPoll; diff --git a/app/assets/javascripts/error_tracking/store/list/mutations.js b/app/assets/javascripts/error_tracking/store/list/mutations.js index 84a62fa9024..d92a64947ad 100644 --- a/app/assets/javascripts/error_tracking/store/list/mutations.js +++ b/app/assets/javascripts/error_tracking/store/list/mutations.js @@ -1,6 +1,6 @@ -import * as types from './mutation_types'; -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 { [types.SET_ERRORS](state, data) { |