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 | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
982 files changed, 2075 insertions, 2104 deletions
diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js index 6b9f46dcfb6..5064d9ee2d2 100644 --- a/app/assets/javascripts/activities.js +++ b/app/assets/javascripts/activities.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; -import Pager from './pager'; import { localTimeAgo } from './lib/utils/datetime_utility'; +import Pager from './pager'; export default class Activities { constructor(container = '') { diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue index a9c35d7929e..5d074698ea4 100644 --- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue +++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue @@ -1,10 +1,10 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf } from '@gitlab/ui'; -import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import { mapState, mapActions } from 'vuex'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; -import { s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import { s__ } from '~/locale'; import eventHub from '../event_hub'; import { findCommitIndex, diff --git a/app/assets/javascripts/add_context_commits_modal/index.js b/app/assets/javascripts/add_context_commits_modal/index.js index b5cd111fabc..697d32664e8 100644 --- a/app/assets/javascripts/add_context_commits_modal/index.js +++ b/app/assets/javascripts/add_context_commits_modal/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; -import createStore from './store'; import AddContextCommitsModalTrigger from './components/add_context_commits_modal_trigger.vue'; import AddContextCommitsModalWrapper from './components/add_context_commits_modal_wrapper.vue'; +import createStore from './store'; export default function initAddContextCommitsTriggers() { const addContextCommitsModalTriggerEl = document.querySelector('.add-review-item-modal-trigger'); diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js index 1bf54b159ee..7b6f4c81bd2 100644 --- a/app/assets/javascripts/add_context_commits_modal/store/actions.js +++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js @@ -1,8 +1,8 @@ import _ from 'lodash'; -import axios from '~/lib/utils/axios_utils'; +import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; -import Api from '~/api'; import * as types from './mutation_types'; export const setBaseConfig = ({ commit }, options) => { diff --git a/app/assets/javascripts/admin/statistics_panel/components/app.vue b/app/assets/javascripts/admin/statistics_panel/components/app.vue index 7e1bb3ed0ce..1f0db422807 100644 --- a/app/assets/javascripts/admin/statistics_panel/components/app.vue +++ b/app/assets/javascripts/admin/statistics_panel/components/app.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState, mapGetters, mapActions } from 'vuex'; import statisticsLabels from '../constants'; export default { diff --git a/app/assets/javascripts/admin/statistics_panel/store/actions.js b/app/assets/javascripts/admin/statistics_panel/store/actions.js index 149540c4222..459f11c02f1 100644 --- a/app/assets/javascripts/admin/statistics_panel/store/actions.js +++ b/app/assets/javascripts/admin/statistics_panel/store/actions.js @@ -1,7 +1,7 @@ import Api from '~/api'; -import { s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import * as types from './mutation_types'; export const requestStatistics = ({ commit }) => commit(types.REQUEST_STATISTICS); diff --git a/app/assets/javascripts/admin/users/components/actions/index.js b/app/assets/javascripts/admin/users/components/actions/index.js index 697bf284453..e34b01346b9 100644 --- a/app/assets/javascripts/admin/users/components/actions/index.js +++ b/app/assets/javascripts/admin/users/components/actions/index.js @@ -4,9 +4,9 @@ import Block from './block.vue'; import Deactivate from './deactivate.vue'; import Delete from './delete.vue'; import DeleteWithContributions from './delete_with_contributions.vue'; +import Reject from './reject.vue'; import Unblock from './unblock.vue'; import Unlock from './unlock.vue'; -import Reject from './reject.vue'; export default { Activate, diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index f6d2f6b7497..e92c97b54a3 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -6,10 +6,10 @@ import { GlDropdownSectionHeader, GlDropdownDivider, } from '@gitlab/ui'; -import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { convertArrayToCamelCase } from '~/lib/utils/common_utils'; -import { generateUserPaths } from '../utils'; +import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { I18N_USER_ACTIONS } from '../constants'; +import { generateUserPaths } from '../utils'; import Actions from './actions'; export default { diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue index 0eefe1070ff..8962068601c 100644 --- a/app/assets/javascripts/admin/users/components/users_table.vue +++ b/app/assets/javascripts/admin/users/components/users_table.vue @@ -1,8 +1,8 @@ <script> import { GlTable } from '@gitlab/ui'; import { __ } from '~/locale'; -import UserAvatar from './user_avatar.vue'; import UserActions from './user_actions.vue'; +import UserAvatar from './user_avatar.vue'; import UserDate from './user_date.vue'; const DEFAULT_TH_CLASSES = diff --git a/app/assets/javascripts/admin/users/index.js b/app/assets/javascripts/admin/users/index.js index 00a84259c22..0365d054fc9 100644 --- a/app/assets/javascripts/admin/users/index.js +++ b/app/assets/javascripts/admin/users/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import UsagePingDisabled from './components/usage_ping_disabled.vue'; import AdminUsersApp from './components/app.vue'; +import UsagePingDisabled from './components/usage_ping_disabled.vue'; export const initAdminUsersApp = (el = document.querySelector('#js-admin-users-app')) => { if (!el) { diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index dae52a530ac..dd702c4a5d3 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -11,22 +11,22 @@ import { GlSprintf, GlTooltipDirective, } from '@gitlab/ui'; -import { s__, __ } from '~/locale'; +import getAlertsQuery from '~/graphql_shared/queries/get_alerts.query.graphql'; import { fetchPolicies } from '~/lib/graphql'; +import { convertToSnakeCase } from '~/lib/utils/text_utility'; import { joinPaths, visitUrl } from '~/lib/utils/url_utility'; -import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; +import { s__, __ } from '~/locale'; +import AlertStatus from '~/vue_shared/alert_details/components/alert_status.vue'; import { tdClass, thClass, bodyTrClass, initialPaginationState, } from '~/vue_shared/components/paginated_table_with_search_and_tabs/constants'; +import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; -import { convertToSnakeCase } from '~/lib/utils/text_utility'; -import AlertStatus from '~/vue_shared/alert_details/components/alert_status.vue'; -import getAlertsQuery from '~/graphql_shared/queries/get_alerts.query.graphql'; -import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; import { ALERTS_STATUS_TABS, SEVERITY_LEVELS, trackAlertListViewsOptions } from '../constants'; +import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; const TH_TEST_ID = { 'data-testid': 'alert-management-severity-sort' }; diff --git a/app/assets/javascripts/alert_management/list.js b/app/assets/javascripts/alert_management/list.js index 4b18dee7806..f5eac26431f 100644 --- a/app/assets/javascripts/alert_management/list.js +++ b/app/assets/javascripts/alert_management/list.js @@ -1,6 +1,6 @@ +import { defaultDataIdFromObject } from 'apollo-cache-inmemory'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { defaultDataIdFromObject } from 'apollo-cache-inmemory'; import createDefaultClient from '~/lib/graphql'; import { parseBoolean } from '~/lib/utils/common_utils'; import { PAGE_CONFIG } from '~/vue_shared/alert_details/constants'; diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue index 66d6af6f0a4..1135562834a 100644 --- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue +++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue @@ -1,5 +1,4 @@ <script> -import Vue from 'vue'; import { GlIcon, GlFormInput, @@ -9,8 +8,9 @@ import { GlTooltipDirective as GlTooltip, } from '@gitlab/ui'; import { cloneDeep } from 'lodash'; -import { s__, __ } from '~/locale'; +import Vue from 'vue'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { s__, __ } from '~/locale'; import { getMappingData, getPayloadFields, diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue index cef20321ce2..18372c54b84 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue @@ -12,16 +12,16 @@ import { GlModalDirective, GlToggle, } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { s__ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { integrationTypes, JSON_VALIDATE_DELAY, targetPrometheusUrlPlaceholder, typeSet, } from '../constants'; +import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; import MappingBuilder from './alert_mapping_builder.vue'; import AlertSettingsFormHelpBlock from './alert_settings_form_help_block.vue'; // Mocks will be removed when integrating with BE is ready diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue index 71d094dbe6e..366f2209fb2 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue @@ -1,19 +1,19 @@ <script> -import { s__ } from '~/locale'; -import { fetchPolicies } from '~/lib/graphql'; import createFlash, { FLASH_TYPES } from '~/flash'; -import getIntegrationsQuery from '../graphql/queries/get_integrations.query.graphql'; -import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; +import { fetchPolicies } from '~/lib/graphql'; +import { s__ } from '~/locale'; +import { typeSet } from '../constants'; import createHttpIntegrationMutation from '../graphql/mutations/create_http_integration.mutation.graphql'; import createPrometheusIntegrationMutation from '../graphql/mutations/create_prometheus_integration.mutation.graphql'; -import updateHttpIntegrationMutation from '../graphql/mutations/update_http_integration.mutation.graphql'; -import updatePrometheusIntegrationMutation from '../graphql/mutations/update_prometheus_integration.mutation.graphql'; import destroyHttpIntegrationMutation from '../graphql/mutations/destroy_http_integration.mutation.graphql'; import resetHttpTokenMutation from '../graphql/mutations/reset_http_token.mutation.graphql'; import resetPrometheusTokenMutation from '../graphql/mutations/reset_prometheus_token.mutation.graphql'; import updateCurrentIntergrationMutation from '../graphql/mutations/update_current_intergration.mutation.graphql'; +import updateHttpIntegrationMutation from '../graphql/mutations/update_http_integration.mutation.graphql'; +import updatePrometheusIntegrationMutation from '../graphql/mutations/update_prometheus_integration.mutation.graphql'; +import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; +import getIntegrationsQuery from '../graphql/queries/get_integrations.query.graphql'; import service from '../services'; -import { typeSet } from '../constants'; import { updateStoreAfterIntegrationDelete, updateStoreAfterIntegrationAdd, @@ -25,8 +25,8 @@ import { UPDATE_INTEGRATION_ERROR, INTEGRATION_PAYLOAD_TEST_ERROR, } from '../utils/error_messages'; -import AlertSettingsForm from './alerts_settings_form.vue'; import IntegrationsList from './alerts_integrations_list.vue'; +import AlertSettingsForm from './alerts_settings_form.vue'; export default { typeSet, diff --git a/app/assets/javascripts/alerts_settings/graphql.js b/app/assets/javascripts/alerts_settings/graphql.js index 3dbfa69a8e9..5fd05169533 100644 --- a/app/assets/javascripts/alerts_settings/graphql.js +++ b/app/assets/javascripts/alerts_settings/graphql.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import produce from 'immer'; +import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import getCurrentIntegrationQuery from './graphql/queries/get_current_integration.query.graphql'; diff --git a/app/assets/javascripts/alerts_settings/index.js b/app/assets/javascripts/alerts_settings/index.js index 973f5d4ec54..8506b3fda01 100644 --- a/app/assets/javascripts/alerts_settings/index.js +++ b/app/assets/javascripts/alerts_settings/index.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import AlertSettingsWrapper from './components/alerts_settings_wrapper.vue'; import apolloProvider from './graphql'; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/app.vue b/app/assets/javascripts/analytics/instance_statistics/components/app.vue index cdf1b1bbe2b..3bf41eaa008 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/app.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/app.vue @@ -1,10 +1,10 @@ <script> import { TODAY, TOTAL_DAYS_TO_SHOW, START_DATE } from '../constants'; +import ChartsConfig from './charts_config'; import InstanceCounts from './instance_counts.vue'; import InstanceStatisticsCountChart from './instance_statistics_count_chart.vue'; -import UsersChart from './users_chart.vue'; import ProjectsAndGroupsChart from './projects_and_groups_chart.vue'; -import ChartsConfig from './charts_config'; +import UsersChart from './users_chart.vue'; export default { name: 'InstanceStatisticsApp', diff --git a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue index b331e659a92..f3779ed62e9 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue @@ -1,9 +1,9 @@ <script> -import * as Sentry from '~/sentry/wrapper'; -import { s__ } from '~/locale'; +import MetricCard from '~/analytics/shared/components/metric_card.vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format'; -import MetricCard from '~/analytics/shared/components/metric_card.vue'; +import { s__ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import instanceStatisticsCountQuery from '../graphql/queries/instance_statistics_count.query.graphql'; const defaultPrecision = 0; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue index 620f38bd50f..e2defe0572d 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue @@ -1,16 +1,16 @@ <script> -import { GlLineChart } from '@gitlab/ui/dist/charts'; import { GlAlert } from '@gitlab/ui'; +import { GlLineChart } from '@gitlab/ui/dist/charts'; import { some, every } from 'lodash'; -import * as Sentry from '~/sentry/wrapper'; -import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import { differenceInMonths, formatDateAsMonth, getDayDifference, } from '~/lib/utils/datetime_utility'; -import { getAverageByMonth, getEarliestDate, generateDataKeys } from '../utils'; +import * as Sentry from '~/sentry/wrapper'; +import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import { TODAY, START_DATE } from '../constants'; +import { getAverageByMonth, getEarliestDate, generateDataKeys } from '../utils'; const QUERY_DATA_KEY = 'instanceStatisticsMeasurements'; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue index 46cc05fc124..3ffec90fb68 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue @@ -3,10 +3,10 @@ import { GlAlert } from '@gitlab/ui'; import { GlLineChart } from '@gitlab/ui/dist/charts'; import produce from 'immer'; import { sortBy } from 'lodash'; +import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; +import { s__, __ } from '~/locale'; import * as Sentry from '~/sentry/wrapper'; import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import { s__, __ } from '~/locale'; -import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; import latestGroupsQuery from '../graphql/queries/groups.query.graphql'; import latestProjectsQuery from '../graphql/queries/projects.query.graphql'; import { getAverageByMonth } from '../utils'; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue index 03462113630..73940f028a1 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue @@ -3,10 +3,10 @@ import { GlAlert } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; import produce from 'immer'; import { sortBy } from 'lodash'; +import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; +import { __ } from '~/locale'; import * as Sentry from '~/sentry/wrapper'; import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import { __ } from '~/locale'; -import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; import usersQuery from '../graphql/queries/users.query.graphql'; import { getAverageByMonth } from '../utils'; diff --git a/app/assets/javascripts/artifacts_settings/index.js b/app/assets/javascripts/artifacts_settings/index.js index d99d2be81cf..531b42bc185 100644 --- a/app/assets/javascripts/artifacts_settings/index.js +++ b/app/assets/javascripts/artifacts_settings/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import createDefaultClient from '~/lib/graphql'; import KeepLatestArtifactCheckbox from '~/artifacts_settings/keep_latest_artifact_checkbox.vue'; +import createDefaultClient from '~/lib/graphql'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/artifacts_settings/keep_latest_artifact_checkbox.vue b/app/assets/javascripts/artifacts_settings/keep_latest_artifact_checkbox.vue index a0cf91bbe7a..92f1cc8117a 100644 --- a/app/assets/javascripts/artifacts_settings/keep_latest_artifact_checkbox.vue +++ b/app/assets/javascripts/artifacts_settings/keep_latest_artifact_checkbox.vue @@ -1,9 +1,9 @@ <script> import { GlAlert, GlFormCheckbox, GlLink } from '@gitlab/ui'; import { __ } from '~/locale'; -import GetKeepLatestArtifactProjectSetting from './graphql/queries/get_keep_latest_artifact_project_setting.query.graphql'; -import GetKeepLatestArtifactApplicationSetting from './graphql/queries/get_keep_latest_artifact_application_setting.query.graphql'; import UpdateKeepLatestArtifactProjectSetting from './graphql/mutations/update_keep_latest_artifact_project_setting.mutation.graphql'; +import GetKeepLatestArtifactApplicationSetting from './graphql/queries/get_keep_latest_artifact_application_setting.query.graphql'; +import GetKeepLatestArtifactProjectSetting from './graphql/queries/get_keep_latest_artifact_project_setting.query.graphql'; export default { errors: { diff --git a/app/assets/javascripts/authentication/mount_2fa.js b/app/assets/javascripts/authentication/mount_2fa.js index 6dead2f03db..52ed67b8c7b 100644 --- a/app/assets/javascripts/authentication/mount_2fa.js +++ b/app/assets/javascripts/authentication/mount_2fa.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import initU2F from './u2f'; -import initWebauthn from './webauthn'; import U2FRegister from './u2f/register'; +import initWebauthn from './webauthn'; import WebAuthnRegister from './webauthn/register'; export const mount2faAuthentication = () => { diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue index 87502db8b82..0e589d98668 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue @@ -1,9 +1,9 @@ <script> -import Mousetrap from 'mousetrap'; import { GlSprintf, GlButton, GlAlert } from '@gitlab/ui'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import Tracking from '~/tracking'; +import Mousetrap from 'mousetrap'; import { __ } from '~/locale'; +import Tracking from '~/tracking'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { COPY_BUTTON_ACTION, DOWNLOAD_BUTTON_ACTION, diff --git a/app/assets/javascripts/authentication/u2f/authenticate.js b/app/assets/javascripts/authentication/u2f/authenticate.js index f5217e9c9be..22eca904f32 100644 --- a/app/assets/javascripts/authentication/u2f/authenticate.js +++ b/app/assets/javascripts/authentication/u2f/authenticate.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { template as lodashTemplate, omit } from 'lodash'; -import importU2FLibrary from './util'; import U2FError from './error'; +import importU2FLibrary from './util'; // Authenticate U2F (universal 2nd factor) devices for users to authenticate with. // diff --git a/app/assets/javascripts/authentication/u2f/register.js b/app/assets/javascripts/authentication/u2f/register.js index 52940e1c305..6c98f0978bc 100644 --- a/app/assets/javascripts/authentication/u2f/register.js +++ b/app/assets/javascripts/authentication/u2f/register.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { template as lodashTemplate } from 'lodash'; import { __ } from '~/locale'; -import importU2FLibrary from './util'; import U2FError from './error'; +import importU2FLibrary from './util'; // Register U2F (universal 2nd factor) devices for users to authenticate with. // diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index ab95e00b740..6fb90551ed7 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -1,15 +1,15 @@ /* eslint-disable class-methods-use-this, @gitlab/require-i18n-strings */ -import $ from 'jquery'; -import { uniq } from 'lodash'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import $ from 'jquery'; import Cookies from 'js-cookie'; +import { uniq } from 'lodash'; import * as Emoji from '~/emoji'; import { dispose, fixTitle } from '~/tooltips'; -import { __ } from './locale'; -import { isInVueNoteablePage } from './lib/utils/dom_utils'; import { deprecatedCreateFlash as flash } from './flash'; import axios from './lib/utils/axios_utils'; +import { isInVueNoteablePage } from './lib/utils/dom_utils'; +import { __ } from './locale'; const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd'; const transitionEndEventString = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd'; diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 0beb6bed9ea..20541ad8ccc 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ +import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui'; import { escape, debounce } from 'lodash'; import { mapActions, mapState } from 'vuex'; -import { GlLoadingIcon, GlFormInput, GlFormGroup, GlButton } from '@gitlab/ui'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__, sprintf } from '~/locale'; import createEmptyBadge from '../empty_badge'; diff --git a/app/assets/javascripts/badges/components/badge_list.vue b/app/assets/javascripts/badges/components/badge_list.vue index 811ec6d333b..f16a547e441 100644 --- a/app/assets/javascripts/badges/components/badge_list.vue +++ b/app/assets/javascripts/badges/components/badge_list.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { GROUP_BADGE } from '../constants'; import BadgeListRow from './badge_list_row.vue'; diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index 4ca91e7a589..fda51c98e2c 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlLoadingIcon, GlButton, GlModalDirective } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; import { PROJECT_BADGE } from '../constants'; import Badge from './badge.vue'; diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index 73c63a72b1c..8d5bd216367 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlSprintf, GlModal } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__ } from '~/locale'; import Badge from './badge.vue'; diff --git a/app/assets/javascripts/badges/store/index.js b/app/assets/javascripts/badges/store/index.js index 7a5df403a0e..848deb2baa7 100644 --- a/app/assets/javascripts/badges/store/index.js +++ b/app/assets/javascripts/badges/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue index b480cf098f2..e6de724512f 100644 --- a/app/assets/javascripts/batch_comments/components/draft_note.vue +++ b/app/assets/javascripts/batch_comments/components/draft_note.vue @@ -1,7 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import NoteableNote from '~/notes/components/noteable_note.vue'; import PublishButton from './publish_button.vue'; diff --git a/app/assets/javascripts/batch_comments/components/drafts_count.vue b/app/assets/javascripts/batch_comments/components/drafts_count.vue index 7a8482ac341..5e110b101eb 100644 --- a/app/assets/javascripts/batch_comments/components/drafts_count.vue +++ b/app/assets/javascripts/batch_comments/components/drafts_count.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlBadge } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue index e18dc344cd7..fb643d441ec 100644 --- a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue +++ b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters } from 'vuex'; import { GlDropdown, GlDropdownItem, GlIcon } from '@gitlab/ui'; +import { mapActions, mapGetters } from 'vuex'; import PreviewItem from './preview_item.vue'; export default { diff --git a/app/assets/javascripts/batch_comments/components/preview_item.vue b/app/assets/javascripts/batch_comments/components/preview_item.vue index 7f3892ae066..756bcfdb3d0 100644 --- a/app/assets/javascripts/batch_comments/components/preview_item.vue +++ b/app/assets/javascripts/batch_comments/components/preview_item.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlSprintf, GlIcon } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; import { sprintf, __ } from '~/locale'; import { diff --git a/app/assets/javascripts/batch_comments/components/publish_button.vue b/app/assets/javascripts/batch_comments/components/publish_button.vue index ecced36771e..8568dba5947 100644 --- a/app/assets/javascripts/batch_comments/components/publish_button.vue +++ b/app/assets/javascripts/batch_comments/components/publish_button.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import DraftsCount from './drafts_count.vue'; export default { diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js index bd7909bfa76..36fef06eeff 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js @@ -1,8 +1,8 @@ import { deprecatedCreateFlash as flash } from '~/flash'; -import { __ } from '~/locale'; import { scrollToElement } from '~/lib/utils/common_utils'; -import service from '../../../services/drafts_service'; +import { __ } from '~/locale'; import { CHANGES_TAB, DISCUSSION_TAB, SHOW_TAB } from '../../../constants'; +import service from '../../../services/drafts_service'; import * as types from './mutation_types'; export const saveDraft = ({ dispatch }, draft) => diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/index.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/index.js index 81dab0566c1..81a51b5ab31 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/index.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/index.js @@ -1,7 +1,7 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; import * as getters from './getters'; +import mutations from './mutations'; +import state from './state'; export default () => ({ namespaced: true, diff --git a/app/assets/javascripts/behaviors/collapse_sidebar_on_window_resize.js b/app/assets/javascripts/behaviors/collapse_sidebar_on_window_resize.js index c4af34b848b..5e474e56196 100644 --- a/app/assets/javascripts/behaviors/collapse_sidebar_on_window_resize.js +++ b/app/assets/javascripts/behaviors/collapse_sidebar_on_window_resize.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import $ from 'jquery'; /** * This behavior collapses the right sidebar diff --git a/app/assets/javascripts/behaviors/copy_to_clipboard.js b/app/assets/javascripts/behaviors/copy_to_clipboard.js index 1176fa6628d..a31bcc2cb41 100644 --- a/app/assets/javascripts/behaviors/copy_to_clipboard.js +++ b/app/assets/javascripts/behaviors/copy_to_clipboard.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import Clipboard from 'clipboard'; +import $ from 'jquery'; import { sprintf, __ } from '~/locale'; import { fixTitle, show } from '~/tooltips'; diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 65a6d1388e7..bf7a87144f9 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -1,5 +1,4 @@ import 'document-register-element'; -import isEmojiUnicodeSupported from '../emoji/support'; import { initEmojiMap, getEmojiInfo, @@ -7,6 +6,7 @@ import { emojiImageTag, FALLBACK_EMOJI_KEY, } from '../emoji'; +import isEmojiUnicodeSupported from '../emoji/support'; class GlEmoji extends HTMLElement { connectedCallback() { diff --git a/app/assets/javascripts/behaviors/index.js b/app/assets/javascripts/behaviors/index.js index 669bc90dcb9..bfd025e8dab 100644 --- a/app/assets/javascripts/behaviors/index.js +++ b/app/assets/javascripts/behaviors/index.js @@ -2,17 +2,17 @@ import $ from 'jquery'; import './autosize'; import './bind_in_out'; import './markdown/render_gfm'; -import initCopyAsGFM from './markdown/copy_as_gfm'; +import initCollapseSidebarOnWindowResize from './collapse_sidebar_on_window_resize'; import initCopyToClipboard from './copy_to_clipboard'; import installGlEmojiElement from './gl_emoji'; +import { loadStartupCSS } from './load_startup_css'; +import initCopyAsGFM from './markdown/copy_as_gfm'; import './quick_submit'; import './requires_input'; +import initSelect2Dropdowns from './select2'; import initPageShortcuts from './shortcuts'; import './toggler_behavior'; import './preview_markdown'; -import initCollapseSidebarOnWindowResize from './collapse_sidebar_on_window_resize'; -import initSelect2Dropdowns from './select2'; -import { loadStartupCSS } from './load_startup_css'; loadStartupCSS(); diff --git a/app/assets/javascripts/behaviors/markdown/editor_extensions.js b/app/assets/javascripts/behaviors/markdown/editor_extensions.js index 308e31e7047..ee50075862a 100644 --- a/app/assets/javascripts/behaviors/markdown/editor_extensions.js +++ b/app/assets/javascripts/behaviors/markdown/editor_extensions.js @@ -1,14 +1,28 @@ -import Doc from './nodes/doc'; -import Paragraph from './nodes/paragraph'; -import Text from './nodes/text'; - +import Bold from './marks/bold'; +import Code from './marks/code'; +import InlineDiff from './marks/inline_diff'; +import InlineHTML from './marks/inline_html'; +import Italic from './marks/italic'; +import Link from './marks/link'; +import MathMark from './marks/math'; +import Strike from './marks/strike'; +import Audio from './nodes/audio'; import Blockquote from './nodes/blockquote'; +import BulletList from './nodes/bullet_list'; import CodeBlock from './nodes/code_block'; +import DescriptionDetails from './nodes/description_details'; +import DescriptionList from './nodes/description_list'; +import DescriptionTerm from './nodes/description_term'; +import Details from './nodes/details'; +import Doc from './nodes/doc'; + +import Emoji from './nodes/emoji'; import HardBreak from './nodes/hard_break'; import Heading from './nodes/heading'; import HorizontalRule from './nodes/horizontal_rule'; import Image from './nodes/image'; +import Reference from './nodes/reference'; import Table from './nodes/table'; import TableHead from './nodes/table_head'; import TableBody from './nodes/table_body'; @@ -16,37 +30,19 @@ import TableHeaderRow from './nodes/table_header_row'; import TableRow from './nodes/table_row'; import TableCell from './nodes/table_cell'; -import Emoji from './nodes/emoji'; -import Reference from './nodes/reference'; - import TableOfContents from './nodes/table_of_contents'; +import TaskList from './nodes/task_list'; +import TaskListItem from './nodes/task_list_item'; import Video from './nodes/video'; -import Audio from './nodes/audio'; -import BulletList from './nodes/bullet_list'; import OrderedList from './nodes/ordered_list'; import ListItem from './nodes/list_item'; -import DescriptionList from './nodes/description_list'; -import DescriptionTerm from './nodes/description_term'; -import DescriptionDetails from './nodes/description_details'; - -import TaskList from './nodes/task_list'; import OrderedTaskList from './nodes/ordered_task_list'; -import TaskListItem from './nodes/task_list_item'; +import Paragraph from './nodes/paragraph'; import Summary from './nodes/summary'; -import Details from './nodes/details'; - -import Bold from './marks/bold'; -import Italic from './marks/italic'; -import Strike from './marks/strike'; -import InlineDiff from './marks/inline_diff'; - -import Link from './marks/link'; -import Code from './marks/code'; -import MathMark from './marks/math'; -import InlineHTML from './marks/inline_html'; +import Text from './nodes/text'; // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb transform // GitLab Flavored Markdown (GFM) to HTML. diff --git a/app/assets/javascripts/behaviors/markdown/marks/bold.js b/app/assets/javascripts/behaviors/markdown/marks/bold.js index b537954c1cb..d307edd9fd3 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/bold.js +++ b/app/assets/javascripts/behaviors/markdown/marks/bold.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Bold as BaseBold } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Bold as BaseBold } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Bold extends BaseBold { diff --git a/app/assets/javascripts/behaviors/markdown/marks/code.js b/app/assets/javascripts/behaviors/markdown/marks/code.js index a760ee80dd0..ccfe2cf5b8d 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/code.js +++ b/app/assets/javascripts/behaviors/markdown/marks/code.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Code as BaseCode } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Code as BaseCode } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Code extends BaseCode { diff --git a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js index 556e6f7df1c..e957f81b774 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js +++ b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Mark } from 'tiptap'; import { escape } from 'lodash'; +import { Mark } from 'tiptap'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class InlineHTML extends Mark { diff --git a/app/assets/javascripts/behaviors/markdown/marks/italic.js b/app/assets/javascripts/behaviors/markdown/marks/italic.js index 44b35c97739..dbef10536ab 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/italic.js +++ b/app/assets/javascripts/behaviors/markdown/marks/italic.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Italic as BaseItalic } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Italic as BaseItalic } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Italic extends BaseItalic { diff --git a/app/assets/javascripts/behaviors/markdown/marks/link.js b/app/assets/javascripts/behaviors/markdown/marks/link.js index 5c23d6a5ceb..1111c51805d 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/link.js +++ b/app/assets/javascripts/behaviors/markdown/marks/link.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Link as BaseLink } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Link as BaseLink } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Link extends BaseLink { diff --git a/app/assets/javascripts/behaviors/markdown/marks/math.js b/app/assets/javascripts/behaviors/markdown/marks/math.js index 04441d5d710..382bf5c9b5b 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/math.js +++ b/app/assets/javascripts/behaviors/markdown/marks/math.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Mark } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Mark } from 'tiptap'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; // Transforms generated HTML back to GFM for Banzai::Filter::MathFilter diff --git a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js index b0bc8f79643..bd5868e5524 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Blockquote as BaseBlockquote } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Blockquote as BaseBlockquote } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Blockquote extends BaseBlockquote { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js index 3b0792e1af8..209e7239998 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { BulletList as BaseBulletList } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { BulletList as BaseBulletList } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class BulletList extends BaseBulletList { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/heading.js b/app/assets/javascripts/behaviors/markdown/nodes/heading.js index fec8608cf5d..708da053a2f 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/heading.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/heading.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Heading as BaseHeading } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Heading as BaseHeading } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Heading extends BaseHeading { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js index 695c7160bde..47a24eae1e8 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { HorizontalRule as BaseHorizontalRule } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { HorizontalRule as BaseHorizontalRule } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class HorizontalRule extends BaseHorizontalRule { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/image.js b/app/assets/javascripts/behaviors/markdown/nodes/image.js index 76746528e72..ade5839d10b 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/image.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/image.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Image as BaseImage } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Image as BaseImage } from 'tiptap-extensions'; import { placeholderImage } from '~/lazy_loader'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; diff --git a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js index 4237637ed9a..0f56e89dca6 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { ListItem as BaseListItem } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { ListItem as BaseListItem } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class ListItem extends BaseListItem { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js index dec3207b1bb..93d00f27868 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Paragraph extends Node { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js index 9cbd95a7bd8..33bb6e0c31c 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js @@ -1,8 +1,8 @@ /* eslint-disable class-methods-use-this */ /* eslint-disable @gitlab/require-i18n-strings */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; /** diff --git a/app/assets/javascripts/behaviors/markdown/nodes/text.js b/app/assets/javascripts/behaviors/markdown/nodes/text.js index 84838c14999..4eab10c9d98 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/text.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/text.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; export default class Text extends Node { get name() { diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index e0d5f34ba06..7934eac2f7e 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import syntaxHighlight from '~/syntax_highlight'; import initUserPopovers from '../../user_popovers'; +import highlightCurrentUser from './highlight_current_user'; import renderMath from './render_math'; import renderMermaid from './render_mermaid'; import renderMetrics from './render_metrics'; -import highlightCurrentUser from './highlight_current_user'; // Render GitLab flavoured Markdown // diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js index f34fec4d449..5479866c99a 100644 --- a/app/assets/javascripts/behaviors/markdown/render_math.js +++ b/app/assets/javascripts/behaviors/markdown/render_math.js @@ -1,6 +1,6 @@ import { deprecatedCreateFlash as flash } from '~/flash'; -import { s__, sprintf } from '~/locale'; import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; +import { s__, sprintf } from '~/locale'; // Renders math using KaTeX in any element with the // `js-render-math` class diff --git a/app/assets/javascripts/behaviors/preview_markdown.js b/app/assets/javascripts/behaviors/preview_markdown.js index def1c567cd5..5405819cfe0 100644 --- a/app/assets/javascripts/behaviors/preview_markdown.js +++ b/app/assets/javascripts/behaviors/preview_markdown.js @@ -1,8 +1,8 @@ /* eslint-disable func-names */ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; // MarkdownPreview diff --git a/app/assets/javascripts/behaviors/secret_values.js b/app/assets/javascripts/behaviors/secret_values.js index 2f1951c97f9..a34d5dcaef8 100644 --- a/app/assets/javascripts/behaviors/secret_values.js +++ b/app/assets/javascripts/behaviors/secret_values.js @@ -1,5 +1,5 @@ -import { n__ } from '../locale'; import { parseBoolean } from '../lib/utils/common_utils'; +import { n__ } from '../locale'; export default class SecretValues { constructor({ diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js index 87e78de99b8..0513e807ed6 100644 --- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js +++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js @@ -1,6 +1,6 @@ import { flatten } from 'lodash'; -import { s__ } from '~/locale'; import AccessorUtilities from '~/lib/utils/accessor'; +import { s__ } from '~/locale'; import { shouldDisableShortcuts } from './shortcuts_toggle'; export const LOCAL_STORAGE_KEY = 'gl-keyboard-shortcuts-customizations'; diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index d586c0c8dd0..e4ec68601e0 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; +import { flatten } from 'lodash'; import Mousetrap from 'mousetrap'; import Vue from 'vue'; -import { flatten } from 'lodash'; -import { refreshCurrentPage, visitUrl } from '~/lib/utils/url_utility'; -import findAndFollowLink from '~/lib/utils/navigation_utility'; import { parseBoolean } from '~/lib/utils/common_utils'; +import findAndFollowLink from '~/lib/utils/navigation_utility'; +import { refreshCurrentPage, visitUrl } from '~/lib/utils/url_utility'; -import { disableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle'; import { keysFor, TOGGLE_PERFORMANCE_BAR, TOGGLE_CANARY } from './keybindings'; +import { disableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle'; const defaultStopCallback = Mousetrap.prototype.stopCallback; Mousetrap.prototype.stopCallback = function customStopCallback(e, element, combo) { diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js index 14b6ca4474b..476745beb19 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import Mousetrap from 'mousetrap'; +import { clickCopyToClipboardButton } from '~/behaviors/copy_to_clipboard'; import { getSelectedFragment } from '~/lib/utils/common_utils'; import { isElementVisible } from '~/lib/utils/dom_utils'; -import { clickCopyToClipboardButton } from '~/behaviors/copy_to_clipboard'; -import { CopyAsGFM } from '../markdown/copy_as_gfm'; import Sidebar from '../../right_sidebar'; +import { CopyAsGFM } from '../markdown/copy_as_gfm'; import Shortcuts from './shortcuts'; export default class ShortcutsIssuable extends Shortcuts { diff --git a/app/assets/javascripts/blob/3d_viewer/index.js b/app/assets/javascripts/blob/3d_viewer/index.js index 94397d70384..fd064e7ca8f 100644 --- a/app/assets/javascripts/blob/3d_viewer/index.js +++ b/app/assets/javascripts/blob/3d_viewer/index.js @@ -1,6 +1,6 @@ -import * as THREE from 'three/build/three.module'; -import STLLoaderClass from 'three-stl-loader'; import OrbitControlsClass from 'three-orbit-controls'; +import STLLoaderClass from 'three-stl-loader'; +import * as THREE from 'three/build/three.module'; import MeshObject from './mesh_object'; const STLLoader = STLLoaderClass(THREE); diff --git a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js index ebe2c2b3bb8..313bec7e01a 100644 --- a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js +++ b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js @@ -1,5 +1,5 @@ -import sqljs from 'sql.js'; import { template as _template } from 'lodash'; +import sqljs from 'sql.js'; import axios from '~/lib/utils/axios_utils'; import { successCodes } from '~/lib/utils/http_status'; diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js index f3e273bf082..e72c5c90986 100644 --- a/app/assets/javascripts/blob/blob_file_dropzone.js +++ b/app/assets/javascripts/blob/blob_file_dropzone.js @@ -1,11 +1,11 @@ /* eslint-disable func-names */ -import $ from 'jquery'; import Dropzone from 'dropzone'; +import $ from 'jquery'; import { sprintf, __ } from '~/locale'; -import { visitUrl } from '../lib/utils/url_utility'; import { HIDDEN_CLASS } from '../lib/utils/constants'; import csrf from '../lib/utils/csrf'; +import { visitUrl } from '../lib/utils/url_utility'; Dropzone.autoDiscover = false; diff --git a/app/assets/javascripts/blob/components/blob_header.vue b/app/assets/javascripts/blob/components/blob_header.vue index 8960d45b29c..9c023235428 100644 --- a/app/assets/javascripts/blob/components/blob_header.vue +++ b/app/assets/javascripts/blob/components/blob_header.vue @@ -1,7 +1,7 @@ <script> -import ViewerSwitcher from './blob_header_viewer_switcher.vue'; import DefaultActions from './blob_header_default_actions.vue'; import BlobFilepath from './blob_header_filepath.vue'; +import ViewerSwitcher from './blob_header_viewer_switcher.vue'; import { SIMPLE_BLOB_VIEWER } from './constants'; export default { diff --git a/app/assets/javascripts/blob/components/blob_header_filepath.vue b/app/assets/javascripts/blob/components/blob_header_filepath.vue index eb8068a8ad7..99fe3938046 100644 --- a/app/assets/javascripts/blob/components/blob_header_filepath.vue +++ b/app/assets/javascripts/blob/components/blob_header_filepath.vue @@ -1,7 +1,7 @@ <script> -import FileIcon from '~/vue_shared/components/file_icon.vue'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; export default { components: { diff --git a/app/assets/javascripts/blob/components/constants.js b/app/assets/javascripts/blob/components/constants.js index 0137bd38d28..a129c537fa5 100644 --- a/app/assets/javascripts/blob/components/constants.js +++ b/app/assets/javascripts/blob/components/constants.js @@ -1,5 +1,5 @@ -import { __, sprintf } from '~/locale'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import { __, sprintf } from '~/locale'; export const BTN_COPY_CONTENTS_TITLE = __('Copy file contents'); export const BTN_RAW_TITLE = __('Open raw'); diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index c35f9934004..77910850908 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -1,19 +1,19 @@ import $ from 'jquery'; import Api from '~/api'; -import toast from '~/vue_shared/plugins/global_toast'; -import { __ } from '~/locale'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; +import { __ } from '~/locale'; +import toast from '~/vue_shared/plugins/global_toast'; import { deprecatedCreateFlash as Flash } from '../flash'; -import FileTemplateTypeSelector from './template_selectors/type_selector'; -import BlobCiYamlSelector from './template_selectors/ci_yaml_selector'; import BlobCiSyntaxYamlSelector from './template_selectors/ci_syntax_yaml_selector'; +import BlobCiYamlSelector from './template_selectors/ci_yaml_selector'; import DockerfileSelector from './template_selectors/dockerfile_selector'; import GitignoreSelector from './template_selectors/gitignore_selector'; import LicenseSelector from './template_selectors/license_selector'; import MetricsDashboardSelector from './template_selectors/metrics_dashboard_selector'; +import FileTemplateTypeSelector from './template_selectors/type_selector'; export default class FileTemplateMediator { constructor({ editor, currentAction, projectId }) { diff --git a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js index 42c7a4bd408..b48b3d6bec3 100644 --- a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js +++ b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; import FileTemplateSelector from '../file_template_selector'; export default class DockerfileSelector extends FileTemplateSelector { diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 3a55e18d2ff..b4cd0d5d875 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -3,8 +3,8 @@ import '~/behaviors/markdown/render_gfm'; import { __ } from '~/locale'; import { fixTitle } from '~/tooltips'; import { deprecatedCreateFlash as Flash } from '../../flash'; -import { handleLocationHash } from '../../lib/utils/common_utils'; import axios from '../../lib/utils/axios_utils'; +import { handleLocationHash } from '../../lib/utils/common_utils'; import eventHub from '../../notes/event_hub'; const loadRichBlobViewer = (type) => { diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js index 76c88efc12b..173c82ef9b0 100644 --- a/app/assets/javascripts/blob_edit/blob_bundle.js +++ b/app/assets/javascripts/blob_edit/blob_bundle.js @@ -1,8 +1,8 @@ /* eslint-disable no-new */ import $ from 'jquery'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { disableButtonIfEmptyField, setCookie } from '~/lib/utils/common_utils'; import Tracking from '~/tracking'; import BlobFileDropzone from '../blob/blob_file_dropzone'; diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js index f3b0f4ab57c..7c8f6646c0d 100644 --- a/app/assets/javascripts/blob_edit/edit_blob.js +++ b/app/assets/javascripts/blob_edit/edit_blob.js @@ -1,9 +1,9 @@ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown'; import EditorLite from '~/editor/editor_lite'; import { FileTemplateExtension } from '~/editor/extensions/editor_file_template_ext'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown'; import { insertFinalNewline } from '~/lib/utils/text_utility'; import TemplateSelectorMediator from '../blob/file_template_mediator'; import { BLOB_EDITOR_ERROR, BLOB_PREVIEW_ERROR } from './constants'; diff --git a/app/assets/javascripts/boards/components/board_assignee_dropdown.vue b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue index c5cb61ae21c..59d91f4ae72 100644 --- a/app/assets/javascripts/boards/components/board_assignee_dropdown.vue +++ b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue @@ -1,6 +1,4 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; -import { cloneDeep } from 'lodash'; import { GlDropdownItem, GlDropdownDivider, @@ -9,12 +7,14 @@ import { GlSearchBoxByType, GlLoadingIcon, } from '@gitlab/ui'; +import { cloneDeep } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; +import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; +import searchUsers from '~/boards/graphql/users_search.query.graphql'; import { __, n__ } from '~/locale'; import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue'; -import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue'; import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql'; -import searchUsers from '~/boards/graphql/users_search.query.graphql'; export default { noSearchDelay: 0, diff --git a/app/assets/javascripts/boards/components/board_card_layout_deprecated.vue b/app/assets/javascripts/boards/components/board_card_layout_deprecated.vue index 78a581690fd..f9a726134a3 100644 --- a/app/assets/javascripts/boards/components/board_card_layout_deprecated.vue +++ b/app/assets/javascripts/boards/components/board_card_layout_deprecated.vue @@ -1,7 +1,7 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { ISSUABLE } from '~/boards/constants'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import boardsStore from '../stores/boards_store'; import IssueCardInner from './issue_card_inner.vue'; import IssueCardInnerDeprecated from './issue_card_inner_deprecated.vue'; diff --git a/app/assets/javascripts/boards/components/board_column_deprecated.vue b/app/assets/javascripts/boards/components/board_column_deprecated.vue index a8f1577d092..b7931adf067 100644 --- a/app/assets/javascripts/boards/components/board_column_deprecated.vue +++ b/app/assets/javascripts/boards/components/board_column_deprecated.vue @@ -2,8 +2,8 @@ // This component is being replaced in favor of './board_column.vue' for GraphQL boards import Sortable from 'sortablejs'; import BoardListHeader from 'ee_else_ce/boards/components/board_list_header_deprecated.vue'; -import boardsStore from '../stores/boards_store'; import { getBoardSortableDefaultOptions, sortableEnd } from '../mixins/sortable_default_options'; +import boardsStore from '../stores/boards_store'; import BoardList from './board_list_deprecated.vue'; export default { diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue index 49c6a144b1a..9b10e7d7db5 100644 --- a/app/assets/javascripts/boards/components/board_content.vue +++ b/app/assets/javascripts/boards/components/board_content.vue @@ -1,11 +1,11 @@ <script> +import { GlAlert } from '@gitlab/ui'; +import { sortBy } from 'lodash'; import Draggable from 'vuedraggable'; import { mapState, mapGetters, mapActions } from 'vuex'; -import { sortBy } from 'lodash'; -import { GlAlert } from '@gitlab/ui'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import defaultSortableConfig from '~/sortable/sortable_config'; import { sortableEnd, sortableStart } from '~/boards/mixins/sortable_default_options'; +import defaultSortableConfig from '~/sortable/sortable_config'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import BoardColumn from './board_column.vue'; import BoardColumnDeprecated from './board_column_deprecated.vue'; diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index b5f6d03d6d3..f65f00bcccc 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -1,16 +1,16 @@ <script> import { GlModal } from '@gitlab/ui'; -import { __, s__ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import { visitUrl } from '~/lib/utils/url_utility'; -import { getParameterByName } from '~/lib/utils/common_utils'; import { convertToGraphQLId } from '~/graphql_shared/utils'; +import { getParameterByName } from '~/lib/utils/common_utils'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { __, s__ } from '~/locale'; import { fullLabelId, fullBoardId } from '../boards_util'; import { formType } from '../constants'; -import updateBoardMutation from '../graphql/board_update.mutation.graphql'; import createBoardMutation from '../graphql/board_create.mutation.graphql'; import destroyBoardMutation from '../graphql/board_destroy.mutation.graphql'; +import updateBoardMutation from '../graphql/board_update.mutation.graphql'; import BoardConfigurationOptions from './board_configuration_options.vue'; const boardDefaults = { diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index d3c12d2b86d..7495b1163be 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -1,13 +1,13 @@ <script> +import { GlLoadingIcon } from '@gitlab/ui'; import Draggable from 'vuedraggable'; import { mapActions, mapState } from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; -import defaultSortableConfig from '~/sortable/sortable_config'; import { sortableStart, sortableEnd } from '~/boards/mixins/sortable_default_options'; import { sprintf, __ } from '~/locale'; +import defaultSortableConfig from '~/sortable/sortable_config'; import eventHub from '../eventhub'; -import BoardNewIssue from './board_new_issue.vue'; import BoardCard from './board_card.vue'; +import BoardNewIssue from './board_new_issue.vue'; export default { name: 'BoardList', diff --git a/app/assets/javascripts/boards/components/board_list_deprecated.vue b/app/assets/javascripts/boards/components/board_list_deprecated.vue index 72d98149153..9b4961d362d 100644 --- a/app/assets/javascripts/boards/components/board_list_deprecated.vue +++ b/app/assets/javascripts/boards/components/board_list_deprecated.vue @@ -1,16 +1,16 @@ <script> -import { Sortable, MultiDrag } from 'sortablejs'; import { GlLoadingIcon } from '@gitlab/ui'; -import { sprintf, __ } from '~/locale'; +import { Sortable, MultiDrag } from 'sortablejs'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { sprintf, __ } from '~/locale'; import eventHub from '../eventhub'; -import boardsStore from '../stores/boards_store'; import { getBoardSortableDefaultOptions, sortableStart, sortableEnd, } from '../mixins/sortable_default_options'; +import boardsStore from '../stores/boards_store'; import boardCard from './board_card.vue'; import boardNewIssue from './board_new_issue_deprecated.vue'; diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue index dc779609b86..a933370427c 100644 --- a/app/assets/javascripts/boards/components/board_list_header.vue +++ b/app/assets/javascripts/boards/components/board_list_header.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton, GlButtonGroup, @@ -9,14 +8,15 @@ import { GlSprintf, GlTooltipDirective, } from '@gitlab/ui'; -import { n__, s__, __ } from '~/locale'; -import sidebarEventHub from '~/sidebar/event_hub'; -import { isScopedLabel } from '~/lib/utils/common_utils'; +import { mapActions, mapState } from 'vuex'; import { isListDraggable } from '~/boards/boards_util'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { n__, s__, __ } from '~/locale'; +import sidebarEventHub from '~/sidebar/event_hub'; +import AccessorUtilities from '../../lib/utils/accessor'; import { inactiveId, LIST, ListType } from '../constants'; import eventHub from '../eventhub'; -import AccessorUtilities from '../../lib/utils/accessor'; import IssueCount from './issue_count.vue'; export default { diff --git a/app/assets/javascripts/boards/components/board_list_header_deprecated.vue b/app/assets/javascripts/boards/components/board_list_header_deprecated.vue index 54cc56dcbeb..ff043d3aa01 100644 --- a/app/assets/javascripts/boards/components/board_list_header_deprecated.vue +++ b/app/assets/javascripts/boards/components/board_list_header_deprecated.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton, GlButtonGroup, @@ -9,14 +8,15 @@ import { GlSprintf, GlTooltipDirective, } from '@gitlab/ui'; -import { n__, s__ } from '~/locale'; -import sidebarEventHub from '~/sidebar/event_hub'; +import { mapActions, mapState } from 'vuex'; import { isScopedLabel } from '~/lib/utils/common_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { n__, s__ } from '~/locale'; +import sidebarEventHub from '~/sidebar/event_hub'; import AccessorUtilities from '../../lib/utils/accessor'; -import boardsStore from '../stores/boards_store'; -import eventHub from '../eventhub'; import { inactiveId, LIST, ListType } from '../constants'; +import eventHub from '../eventhub'; +import boardsStore from '../stores/boards_store'; import IssueCount from './issue_count.vue'; // This component is being replaced in favor of './board_list_header.vue' for GraphQL boards diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue index 29a88cf705e..1df154688c8 100644 --- a/app/assets/javascripts/boards/components/board_new_issue.vue +++ b/app/assets/javascripts/boards/components/board_new_issue.vue @@ -1,9 +1,9 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { getMilestone } from 'ee_else_ce/boards/boards_util'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { __ } from '~/locale'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import eventHub from '../eventhub'; import ProjectSelect from './project_select.vue'; diff --git a/app/assets/javascripts/boards/components/board_settings_sidebar.vue b/app/assets/javascripts/boards/components/board_settings_sidebar.vue index 50831b074f4..7cfedad0aed 100644 --- a/app/assets/javascripts/boards/components/board_settings_sidebar.vue +++ b/app/assets/javascripts/boards/components/board_settings_sidebar.vue @@ -1,11 +1,11 @@ <script> import { GlButton, GlDrawer, GlLabel } from '@gitlab/ui'; import { mapActions, mapState, mapGetters } from 'vuex'; -import { __ } from '~/locale'; +import { LIST, ListType, ListTypeTitles } from '~/boards/constants'; import boardsStore from '~/boards/stores/boards_store'; -import eventHub from '~/sidebar/event_hub'; import { isScopedLabel } from '~/lib/utils/common_utils'; -import { LIST, ListType, ListTypeTitles } from '~/boards/constants'; +import { __ } from '~/locale'; +import eventHub from '~/sidebar/event_hub'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; // NOTE: need to revisit how we handle headerHeight, because we have so many different header and footer options. diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js index f9ab38b32c4..f303c45a40e 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js +++ b/app/assets/javascripts/boards/components/board_sidebar.js @@ -3,22 +3,22 @@ // template. /* eslint-disable no-new, @gitlab/no-runtime-template-compiler */ +import { GlLabel } from '@gitlab/ui'; import $ from 'jquery'; import Vue from 'vue'; -import { GlLabel } from '@gitlab/ui'; -import { deprecatedCreateFlash as Flash } from '~/flash'; -import { sprintf, __ } from '~/locale'; -import Sidebar from '~/right_sidebar'; -import eventHub from '~/sidebar/event_hub'; import DueDateSelectors from '~/due_date_select'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import IssuableContext from '~/issuable_context'; import LabelsSelect from '~/labels_select'; +import { isScopedLabel } from '~/lib/utils/common_utils'; +import { sprintf, __ } from '~/locale'; +import MilestoneSelect from '~/milestone_select'; +import Sidebar from '~/right_sidebar'; import AssigneeTitle from '~/sidebar/components/assignees/assignee_title.vue'; import Assignees from '~/sidebar/components/assignees/assignees.vue'; import Subscriptions from '~/sidebar/components/subscriptions/subscriptions.vue'; import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue'; -import MilestoneSelect from '~/milestone_select'; -import { isScopedLabel } from '~/lib/utils/common_utils'; +import eventHub from '~/sidebar/event_hub'; import boardsStore from '../stores/boards_store'; import RemoveBtn from './sidebar/remove_issue.vue'; diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index da76d21fe39..2a064aaa885 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -1,5 +1,4 @@ <script> -import { throttle } from 'lodash'; import { GlLoadingIcon, GlSearchBoxByType, @@ -9,15 +8,16 @@ import { GlDropdownItem, GlModalDirective, } from '@gitlab/ui'; +import { throttle } from 'lodash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; -import axios from '~/lib/utils/axios_utils'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import projectQuery from '../graphql/project_boards.query.graphql'; +import eventHub from '../eventhub'; import groupQuery from '../graphql/group_boards.query.graphql'; +import projectQuery from '../graphql/project_boards.query.graphql'; -import eventHub from '../eventhub'; import BoardForm from './board_form.vue'; const MIN_BOARDS_TO_VIEW_RECENT = 10; diff --git a/app/assets/javascripts/boards/components/boards_selector_deprecated.vue b/app/assets/javascripts/boards/components/boards_selector_deprecated.vue index 3483f5c1281..33ad46a0d29 100644 --- a/app/assets/javascripts/boards/components/boards_selector_deprecated.vue +++ b/app/assets/javascripts/boards/components/boards_selector_deprecated.vue @@ -1,5 +1,4 @@ <script> -import { throttle } from 'lodash'; import { GlLoadingIcon, GlSearchBoxByType, @@ -9,12 +8,13 @@ import { GlDropdownItem, GlModalDirective, } from '@gitlab/ui'; +import { throttle } from 'lodash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import httpStatusCodes from '~/lib/utils/http_status'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import projectQuery from '../graphql/project_boards.query.graphql'; import groupQuery from '../graphql/group_boards.query.graphql'; +import projectQuery from '../graphql/project_boards.query.graphql'; import boardsStore from '../stores/boards_store'; import BoardForm from './board_form.vue'; diff --git a/app/assets/javascripts/boards/components/issue_card_inner.vue b/app/assets/javascripts/boards/components/issue_card_inner.vue index 8723c1bb7f3..e5ea30df767 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner.vue @@ -1,15 +1,15 @@ <script> +import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { sortBy } from 'lodash'; import { mapActions, mapState } from 'vuex'; -import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner'; -import { sprintf, __, n__ } from '~/locale'; -import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import { isScopedLabel } from '~/lib/utils/common_utils'; import { updateHistory } from '~/lib/utils/url_utility'; +import { sprintf, __, n__ } from '~/locale'; +import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; -import eventHub from '../eventhub'; import { ListType } from '../constants'; +import eventHub from '../eventhub'; import IssueDueDate from './issue_due_date.vue'; import IssueTimeEstimate from './issue_time_estimate.vue'; diff --git a/app/assets/javascripts/boards/components/issue_card_inner_deprecated.vue b/app/assets/javascripts/boards/components/issue_card_inner_deprecated.vue index 64caac22391..069cc2cda22 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner_deprecated.vue +++ b/app/assets/javascripts/boards/components/issue_card_inner_deprecated.vue @@ -1,11 +1,11 @@ <script> +import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { sortBy } from 'lodash'; import { mapState } from 'vuex'; -import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { sprintf, __, n__ } from '~/locale'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; -import { isScopedLabel } from '~/lib/utils/common_utils'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import boardsStore from '../stores/boards_store'; import IssueDueDate from './issue_due_date.vue'; diff --git a/app/assets/javascripts/boards/components/issue_due_date.vue b/app/assets/javascripts/boards/components/issue_due_date.vue index fb45de6e14d..7e3f36c8a17 100644 --- a/app/assets/javascripts/boards/components/issue_due_date.vue +++ b/app/assets/javascripts/boards/components/issue_due_date.vue @@ -1,13 +1,13 @@ <script> -import dateFormat from 'dateformat'; import { GlTooltip, GlIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; +import dateFormat from 'dateformat'; import { getDayDifference, getTimeago, dateInWords, parsePikadayDate, } from '~/lib/utils/datetime_utility'; +import { __ } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/boards/components/issue_time_estimate.vue b/app/assets/javascripts/boards/components/issue_time_estimate.vue index f6b00b695da..42d187b9b40 100644 --- a/app/assets/javascripts/boards/components/issue_time_estimate.vue +++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue @@ -1,7 +1,7 @@ <script> import { GlTooltip, GlIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; import { parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility'; +import { __ } from '~/locale'; export default { i18n: { diff --git a/app/assets/javascripts/boards/components/modal/empty_state.vue b/app/assets/javascripts/boards/components/modal/empty_state.vue index eb2db260717..486b012e3d2 100644 --- a/app/assets/javascripts/boards/components/modal/empty_state.vue +++ b/app/assets/javascripts/boards/components/modal/empty_state.vue @@ -1,8 +1,8 @@ <script> import { GlButton, GlSprintf } from '@gitlab/ui'; import { __ } from '~/locale'; -import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; +import ModalStore from '../../stores/modal_store'; export default { components: { diff --git a/app/assets/javascripts/boards/components/modal/filters.js b/app/assets/javascripts/boards/components/modal/filters.js index 56a0fde5a91..2fb38a549f3 100644 --- a/app/assets/javascripts/boards/components/modal/filters.js +++ b/app/assets/javascripts/boards/components/modal/filters.js @@ -1,5 +1,5 @@ -import FilteredSearchBoards from '../../filtered_search_boards'; import FilteredSearchContainer from '../../../filtered_search/container'; +import FilteredSearchBoards from '../../filtered_search_boards'; export default { name: 'modal-filters', diff --git a/app/assets/javascripts/boards/components/modal/footer.vue b/app/assets/javascripts/boards/components/modal/footer.vue index 3054ebfc173..05e1219bc70 100644 --- a/app/assets/javascripts/boards/components/modal/footer.vue +++ b/app/assets/javascripts/boards/components/modal/footer.vue @@ -3,9 +3,9 @@ import { GlButton } from '@gitlab/ui'; import footerEEMixin from 'ee_else_ce/boards/mixins/modal_footer'; import { deprecatedCreateFlash as Flash } from '../../../flash'; import { __, n__ } from '../../../locale'; -import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; import boardsStore from '../../stores/boards_store'; +import ModalStore from '../../stores/modal_store'; import ListsDropdown from './lists_dropdown.vue'; export default { diff --git a/app/assets/javascripts/boards/components/modal/header.vue b/app/assets/javascripts/boards/components/modal/header.vue index dfc0d08c3fe..c3a71e7177a 100644 --- a/app/assets/javascripts/boards/components/modal/header.vue +++ b/app/assets/javascripts/boards/components/modal/header.vue @@ -2,8 +2,8 @@ /* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlButton } from '@gitlab/ui'; import { __ } from '~/locale'; -import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; +import ModalStore from '../../stores/modal_store'; import ModalFilters from './filters'; import ModalTabs from './tabs.vue'; diff --git a/app/assets/javascripts/boards/components/modal/index.vue b/app/assets/javascripts/boards/components/modal/index.vue index 5e4af9814c7..5af90c1ee66 100644 --- a/app/assets/javascripts/boards/components/modal/index.vue +++ b/app/assets/javascripts/boards/components/modal/index.vue @@ -1,13 +1,13 @@ <script> /* global ListIssue */ import { GlLoadingIcon } from '@gitlab/ui'; -import { urlParamsToObject } from '~/lib/utils/common_utils'; import boardsStore from '~/boards/stores/boards_store'; +import { urlParamsToObject } from '~/lib/utils/common_utils'; import ModalStore from '../../stores/modal_store'; +import EmptyState from './empty_state.vue'; +import ModalFooter from './footer.vue'; import ModalHeader from './header.vue'; import ModalList from './list.vue'; -import ModalFooter from './footer.vue'; -import EmptyState from './empty_state.vue'; export default { components: { diff --git a/app/assets/javascripts/boards/components/modal/list.vue b/app/assets/javascripts/boards/components/modal/list.vue index 219263bd9b9..bf69f8140d5 100644 --- a/app/assets/javascripts/boards/components/modal/list.vue +++ b/app/assets/javascripts/boards/components/modal/list.vue @@ -1,6 +1,6 @@ <script> -import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { GlIcon } from '@gitlab/ui'; +import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import ModalStore from '../../stores/modal_store'; import IssueCardInner from '../issue_card_inner.vue'; diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue index fe10e7fb856..2065568d275 100644 --- a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue +++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlLink, GlIcon } from '@gitlab/ui'; -import ModalStore from '../../stores/modal_store'; import boardsStore from '../../stores/boards_store'; +import ModalStore from '../../stores/modal_store'; export default { components: { diff --git a/app/assets/javascripts/boards/components/modal/tabs.vue b/app/assets/javascripts/boards/components/modal/tabs.vue index b066fb25360..0b717f516db 100644 --- a/app/assets/javascripts/boards/components/modal/tabs.vue +++ b/app/assets/javascripts/boards/components/modal/tabs.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlTabs, GlTab, GlBadge } from '@gitlab/ui'; -import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; +import ModalStore from '../../stores/modal_store'; export default { components: { diff --git a/app/assets/javascripts/boards/components/new_list_dropdown.js b/app/assets/javascripts/boards/components/new_list_dropdown.js index 3c9f174dedc..2fd16f06455 100644 --- a/app/assets/javascripts/boards/components/new_list_dropdown.js +++ b/app/assets/javascripts/boards/components/new_list_dropdown.js @@ -1,15 +1,15 @@ /* eslint-disable func-names, no-new */ import $ from 'jquery'; -import { __ } from '~/locale'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as flash } from '~/flash'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import store from '~/boards/stores'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; import CreateLabelDropdown from '../../create_label'; -import boardsStore from '../stores/boards_store'; import { fullLabelId } from '../boards_util'; +import boardsStore from '../stores/boards_store'; function shouldCreateListGraphQL(label) { return store.getters.shouldUseGraphQL && !store.getters.getListByLabelId(fullLabelId(label)); diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue index 04699d0d3a4..cfc1752a828 100644 --- a/app/assets/javascripts/boards/components/project_select.vue +++ b/app/assets/javascripts/boards/components/project_select.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlDropdown, GlDropdownItem, @@ -8,6 +7,7 @@ import { GlIntersectionObserver, GlLoadingIcon, } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants'; import { ListType } from '../constants'; diff --git a/app/assets/javascripts/boards/components/project_select_deprecated.vue b/app/assets/javascripts/boards/components/project_select_deprecated.vue index d4830e5afbf..5605e9945ea 100644 --- a/app/assets/javascripts/boards/components/project_select_deprecated.vue +++ b/app/assets/javascripts/boards/components/project_select_deprecated.vue @@ -8,9 +8,9 @@ import { } from '@gitlab/ui'; import { s__ } from '~/locale'; import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants'; -import eventHub from '../eventhub'; import Api from '../../api'; import { ListType } from '../constants'; +import eventHub from '../eventhub'; export default { name: 'ProjectSelect', diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue index 373351eca22..6d928337396 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue @@ -1,9 +1,9 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlButton, GlDatepicker } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility'; import createFlash from '~/flash'; +import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility'; import { __ } from '~/locale'; export default { diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue index d26d03323fb..95864bd62a7 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue @@ -1,11 +1,11 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlAlert, GlButton, GlForm, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; -import { joinPaths } from '~/lib/utils/url_utility'; import createFlash from '~/flash'; +import { joinPaths } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; +import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; export default { components: { diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue index dcf769e6fe5..55b1596ee18 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_labels_select.vue @@ -1,12 +1,12 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlLabel } from '@gitlab/ui'; -import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { mapGetters, mapActions } from 'vuex'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import { isScopedLabel } from '~/lib/utils/common_utils'; import createFlash from '~/flash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; +import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; export default { components: { diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue index 64d02dbdc54..829f1c72806 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue @@ -1,5 +1,4 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlDropdown, GlDropdownItem, @@ -8,6 +7,7 @@ import { GlDropdownDivider, GlLoadingIcon, } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; import createFlash from '~/flash'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_subscription.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_subscription.vue index 4aa8d2f55e4..aa4fdcf9a94 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_subscription.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_subscription.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlToggle } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import createFlash from '~/flash'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js index 83413ee216c..66580bdd30f 100644 --- a/app/assets/javascripts/boards/filtered_search_boards.js +++ b/app/assets/javascripts/boards/filtered_search_boards.js @@ -1,10 +1,10 @@ -import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; -import FilteredSearchManager from 'ee_else_ce/filtered_search/filtered_search_manager'; import { transformBoardConfig } from 'ee_else_ce/boards/boards_util'; +import FilteredSearchManager from 'ee_else_ce/filtered_search/filtered_search_manager'; +import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; import { updateHistory } from '~/lib/utils/url_utility'; import FilteredSearchContainer from '../filtered_search/container'; -import boardsStore from './stores/boards_store'; import vuexstore from './stores'; +import boardsStore from './stores/boards_store'; export default class FilteredSearchBoards extends FilteredSearchManager { constructor(store, updateUrl = false, cantEdit = []) { diff --git a/app/assets/javascripts/boards/filters/due_date_filters.js b/app/assets/javascripts/boards/filters/due_date_filters.js index c35dedde71b..1745ab3bab4 100644 --- a/app/assets/javascripts/boards/filters/due_date_filters.js +++ b/app/assets/javascripts/boards/filters/due_date_filters.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import dateFormat from 'dateformat'; +import Vue from 'vue'; Vue.filter('due-date', (value) => { const date = new Date(value); diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 9a86e4ae3eb..ac7d8e542c4 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -7,20 +7,20 @@ import VueApollo from 'vue-apollo'; import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar'; import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown'; import boardConfigToggle from 'ee_else_ce/boards/config_toggle'; -import toggleLabels from 'ee_else_ce/boards/toggle_labels'; -import toggleEpicsSwimlanes from 'ee_else_ce/boards/toggle_epics_swimlanes'; import { setWeightFetchingState, setEpicFetchingState, getMilestoneTitle, getBoardsModalData, } from 'ee_else_ce/boards/ee_functions'; +import toggleEpicsSwimlanes from 'ee_else_ce/boards/toggle_epics_swimlanes'; +import toggleLabels from 'ee_else_ce/boards/toggle_labels'; import BoardAddNewColumnTrigger from '~/boards/components/board_add_new_column_trigger.vue'; import BoardContent from '~/boards/components/board_content.vue'; import BoardExtraActions from '~/boards/components/board_extra_actions.vue'; -import createDefaultClient from '~/lib/graphql'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import createDefaultClient from '~/lib/graphql'; import { __ } from '~/locale'; import './models/label'; import './models/assignee'; diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js index 299e025529a..f6681193dcb 100644 --- a/app/assets/javascripts/boards/models/list.js +++ b/app/assets/javascripts/boards/models/list.js @@ -1,11 +1,11 @@ /* eslint-disable class-methods-use-this */ -import { __ } from '~/locale'; import { deprecatedCreateFlash as flash } from '~/flash'; +import { __ } from '~/locale'; import boardsStore from '../stores/boards_store'; -import ListLabel from './label'; import ListAssignee from './assignee'; -import ListMilestone from './milestone'; import ListIteration from './iteration'; +import ListLabel from './label'; +import ListMilestone from './milestone'; import 'ee_else_ce/boards/models/issue'; const TYPES = { diff --git a/app/assets/javascripts/boards/mount_multiple_boards_switcher.js b/app/assets/javascripts/boards/mount_multiple_boards_switcher.js index fda56546697..fa58af24ba2 100644 --- a/app/assets/javascripts/boards/mount_multiple_boards_switcher.js +++ b/app/assets/javascripts/boards/mount_multiple_boards_switcher.js @@ -1,12 +1,12 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import { mapGetters } from 'vuex'; +import BoardsSelector from '~/boards/components/boards_selector.vue'; +import BoardsSelectorDeprecated from '~/boards/components/boards_selector_deprecated.vue'; import store from '~/boards/stores'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import createDefaultClient from '~/lib/graphql'; import { parseBoolean } from '~/lib/utils/common_utils'; -import BoardsSelector from '~/boards/components/boards_selector.vue'; -import BoardsSelectorDeprecated from '~/boards/components/boards_selector_deprecated.vue'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index 8c9f86b17a4..5ef3147a0a9 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -1,11 +1,11 @@ import { pick } from 'lodash'; import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql'; -import createGqClient, { fetchPolicies } from '~/lib/graphql'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { convertObjectPropsToCamelCase, urlParamsToObject } from '~/lib/utils/common_utils'; import { BoardType, ListType, inactiveId } from '~/boards/constants'; import createFlash from '~/flash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import createGqClient, { fetchPolicies } from '~/lib/graphql'; +import { convertObjectPropsToCamelCase, urlParamsToObject } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; import updateAssigneesMutation from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql'; import { @@ -18,19 +18,19 @@ import { updateListPosition, transformNotFilters, } from '../boards_util'; -import listsIssuesQuery from '../graphql/lists_issues.query.graphql'; import boardLabelsQuery from '../graphql/board_labels.query.graphql'; import createBoardListMutation from '../graphql/board_list_create.mutation.graphql'; -import updateBoardListMutation from '../graphql/board_list_update.mutation.graphql'; -import issueMoveListMutation from '../graphql/issue_move_list.mutation.graphql'; import destroyBoardListMutation from '../graphql/board_list_destroy.mutation.graphql'; +import updateBoardListMutation from '../graphql/board_list_update.mutation.graphql'; +import groupProjectsQuery from '../graphql/group_projects.query.graphql'; import issueCreateMutation from '../graphql/issue_create.mutation.graphql'; -import issueSetLabelsMutation from '../graphql/issue_set_labels.mutation.graphql'; +import issueMoveListMutation from '../graphql/issue_move_list.mutation.graphql'; import issueSetDueDateMutation from '../graphql/issue_set_due_date.mutation.graphql'; -import issueSetSubscriptionMutation from '../graphql/issue_set_subscription.mutation.graphql'; +import issueSetLabelsMutation from '../graphql/issue_set_labels.mutation.graphql'; import issueSetMilestoneMutation from '../graphql/issue_set_milestone.mutation.graphql'; +import issueSetSubscriptionMutation from '../graphql/issue_set_subscription.mutation.graphql'; import issueSetTitleMutation from '../graphql/issue_set_title.mutation.graphql'; -import groupProjectsQuery from '../graphql/group_projects.query.graphql'; +import listsIssuesQuery from '../graphql/lists_issues.query.graphql'; import * as types from './mutation_types'; const notImplemented = () => { diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index e3d57d9bb9e..de6d03669f7 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -4,22 +4,22 @@ import { sortBy } from 'lodash'; import Vue from 'vue'; import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import createDefaultClient from '~/lib/graphql'; +import axios from '~/lib/utils/axios_utils'; import { urlParamsToObject, getUrlParamsArray, parseBoolean, convertObjectPropsToCamelCase, } from '~/lib/utils/common_utils'; -import createDefaultClient from '~/lib/graphql'; -import axios from '~/lib/utils/axios_utils'; import { mergeUrlParams } from '~/lib/utils/url_utility'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import eventHub from '../eventhub'; import { ListType } from '../constants'; -import IssueProject from '../models/project'; -import ListLabel from '../models/label'; +import eventHub from '../eventhub'; import ListAssignee from '../models/assignee'; +import ListLabel from '../models/label'; import ListMilestone from '../models/milestone'; +import IssueProject from '../models/project'; const PER_PAGE = 20; export const gqlClient = createDefaultClient(); diff --git a/app/assets/javascripts/boards/stores/index.js b/app/assets/javascripts/boards/stores/index.js index 471b952a212..0a87c6ab821 100644 --- a/app/assets/javascripts/boards/stores/index.js +++ b/app/assets/javascripts/boards/stores/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from 'ee_else_ce/boards/stores/state'; -import getters from 'ee_else_ce/boards/stores/getters'; import actions from 'ee_else_ce/boards/stores/actions'; +import getters from 'ee_else_ce/boards/stores/getters'; import mutations from 'ee_else_ce/boards/stores/mutations'; +import state from 'ee_else_ce/boards/stores/state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/boards/stores/mutations.js b/app/assets/javascripts/boards/stores/mutations.js index acf62782fad..09f7f267ee3 100644 --- a/app/assets/javascripts/boards/stores/mutations.js +++ b/app/assets/javascripts/boards/stores/mutations.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; import { pull, union } from 'lodash'; -import { s__ } from '~/locale'; +import Vue from 'vue'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { s__ } from '~/locale'; import { formatIssue, moveIssueListHelper } from '../boards_util'; import * as mutationTypes from './mutation_types'; diff --git a/app/assets/javascripts/branches/divergence_graph.js b/app/assets/javascripts/branches/divergence_graph.js index a577bdca082..ca019bc4178 100644 --- a/app/assets/javascripts/branches/divergence_graph.js +++ b/app/assets/javascripts/branches/divergence_graph.js @@ -1,7 +1,7 @@ import Vue from 'vue'; -import { __ } from '../locale'; import { deprecatedCreateFlash as createFlash } from '../flash'; import axios from '../lib/utils/axios_utils'; +import { __ } from '../locale'; import DivergenceGraph from './components/divergence_graph.vue'; export function createGraphVueApp(el, data, maxCommits) { diff --git a/app/assets/javascripts/build_artifacts.js b/app/assets/javascripts/build_artifacts.js index ee13e482af5..e895df01f2c 100644 --- a/app/assets/javascripts/build_artifacts.js +++ b/app/assets/javascripts/build_artifacts.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import { hide, initTooltips, show } from '~/tooltips'; -import { visitUrl } from './lib/utils/url_utility'; import { parseBoolean } from './lib/utils/common_utils'; +import { visitUrl } from './lib/utils/url_utility'; export default class BuildArtifacts { constructor() { diff --git a/app/assets/javascripts/captcha/captcha_modal.vue b/app/assets/javascripts/captcha/captcha_modal.vue index 00ea06db0cf..e6c73bc9643 100644 --- a/app/assets/javascripts/captcha/captcha_modal.vue +++ b/app/assets/javascripts/captcha/captcha_modal.vue @@ -8,8 +8,8 @@ // captcha implementations other than reCAPTCHA (e.g. FriendlyCaptcha) without having to // change the references in the code or API. -import { uniqueId } from 'lodash'; import { GlModal } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; import { initRecaptchaScript } from '~/captcha/init_recaptcha_script'; export default { diff --git a/app/assets/javascripts/ci_lint/components/ci_lint.vue b/app/assets/javascripts/ci_lint/components/ci_lint.vue index fc47fe8c333..9a55177b15f 100644 --- a/app/assets/javascripts/ci_lint/components/ci_lint.vue +++ b/app/assets/javascripts/ci_lint/components/ci_lint.vue @@ -1,8 +1,8 @@ <script> import { GlButton, GlFormCheckbox, GlIcon, GlLink, GlAlert } from '@gitlab/ui'; -import EditorLite from '~/vue_shared/components/editor_lite.vue'; import CiLintResults from '~/pipeline_editor/components/lint/ci_lint_results.vue'; import lintCiMutation from '~/pipeline_editor/graphql/mutations/lint_ci.mutation.graphql'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; export default { components: { diff --git a/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue b/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue index b84c188cd08..0233ffaccdc 100644 --- a/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue +++ b/app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue @@ -2,9 +2,9 @@ import { GlTable, GlButton, GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { s__ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { components: { diff --git a/app/assets/javascripts/ci_variable_list/ci_variable_list.js b/app/assets/javascripts/ci_variable_list/ci_variable_list.js index aa4d311527e..065cb4f5616 100644 --- a/app/assets/javascripts/ci_variable_list/ci_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ci_variable_list.js @@ -1,9 +1,9 @@ import $ from 'jquery'; +import SecretValues from '../behaviors/secret_values'; +import CreateItemDropdown from '../create_item_dropdown'; import { parseBoolean } from '../lib/utils/common_utils'; import { s__ } from '../locale'; import setupToggleButtons from '../toggle_buttons'; -import CreateItemDropdown from '../create_item_dropdown'; -import SecretValues from '../behaviors/secret_values'; const ALL_ENVIRONMENTS_STRING = s__('CiVariable|All environments'); diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue index da816f85466..af4349083b6 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue @@ -15,17 +15,17 @@ import { } from '@gitlab/ui'; import Cookies from 'js-cookie'; import { mapActions, mapState } from 'vuex'; -import { mapComputed } from '~/vuex_shared/bindings'; import { __ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { mapComputed } from '~/vuex_shared/bindings'; import { AWS_TOKEN_CONSTANTS, ADD_CI_VARIABLE_MODAL_ID, AWS_TIP_DISMISSED_COOKIE_NAME, AWS_TIP_MESSAGE, } from '../constants'; -import { awsTokens, awsTokenList } from './ci_variable_autocomplete_tokens'; import CiEnvironmentsDropdown from './ci_environments_dropdown.vue'; +import { awsTokens, awsTokenList } from './ci_variable_autocomplete_tokens'; export default { modalId: ADD_CI_VARIABLE_MODAL_ID, diff --git a/app/assets/javascripts/ci_variable_list/store/actions.js b/app/assets/javascripts/ci_variable_list/store/actions.js index 350b2190aa7..8569cecc6a7 100644 --- a/app/assets/javascripts/ci_variable_list/store/actions.js +++ b/app/assets/javascripts/ci_variable_list/store/actions.js @@ -1,6 +1,6 @@ -import axios from '~/lib/utils/axios_utils'; import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import * as types from './mutation_types'; import { prepareDataForApi, prepareDataForDisplay, prepareEnvironments } from './utils'; diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index 11db8058318..5cb3d913210 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -1,20 +1,20 @@ +import { GlToast } from '@gitlab/ui'; import Visibility from 'visibilityjs'; import Vue from 'vue'; -import { GlToast } from '@gitlab/ui'; import AccessorUtilities from '~/lib/utils/accessor'; import initProjectSelectDropdown from '~/project_select'; import initServerlessSurveyBanner from '~/serverless/survey_banner'; -import PersistentUserCallout from '../persistent_user_callout'; -import { s__, sprintf } from '../locale'; import { deprecatedCreateFlash as Flash } from '../flash'; import Poll from '../lib/utils/poll'; +import { s__, sprintf } from '../locale'; +import PersistentUserCallout from '../persistent_user_callout'; import initSettingsPanels from '../settings_panels'; -import eventHub from './event_hub'; +import Applications from './components/applications.vue'; +import RemoveClusterConfirmation from './components/remove_cluster_confirmation.vue'; import { APPLICATION_STATUS, CROSSPLANE, KNATIVE, FLUENTD } from './constants'; +import eventHub from './event_hub'; import ClustersService from './services/clusters_service'; import ClustersStore from './stores/clusters_store'; -import Applications from './components/applications.vue'; -import RemoveClusterConfirmation from './components/remove_cluster_confirmation.vue'; const Environments = () => import('ee_component/clusters/components/environments.vue'); diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index 21870e491ba..76fe076d4ff 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -1,9 +1,9 @@ <script> import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/ui'; import { s__, __, sprintf } from '~/locale'; -import eventHub from '../event_hub'; import identicon from '../../vue_shared/components/identicon.vue'; import { APPLICATION_STATUS, ELASTIC_STACK } from '../constants'; +import eventHub from '../event_hub'; import UninstallApplicationButton from './uninstall_application_button.vue'; import UninstallApplicationConfirmationModal from './uninstall_application_confirmation_modal.vue'; import UpdateApplicationConfirmationModal from './update_application_confirmation_modal.vue'; diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 62bc1deba8d..8ef3169dc65 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -1,23 +1,23 @@ <script> import { GlLoadingIcon, GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; +import certManagerLogo from 'images/cluster_app_logos/cert_manager.png'; +import crossplaneLogo from 'images/cluster_app_logos/crossplane.png'; +import elasticStackLogo from 'images/cluster_app_logos/elastic_stack.png'; +import fluentdLogo from 'images/cluster_app_logos/fluentd.png'; import gitlabLogo from 'images/cluster_app_logos/gitlab.png'; import helmLogo from 'images/cluster_app_logos/helm.png'; import jupyterhubLogo from 'images/cluster_app_logos/jupyterhub.png'; -import kubernetesLogo from 'images/cluster_app_logos/kubernetes.png'; -import certManagerLogo from 'images/cluster_app_logos/cert_manager.png'; -import crossplaneLogo from 'images/cluster_app_logos/crossplane.png'; import knativeLogo from 'images/cluster_app_logos/knative.png'; +import kubernetesLogo from 'images/cluster_app_logos/kubernetes.png'; import prometheusLogo from 'images/cluster_app_logos/prometheus.png'; -import elasticStackLogo from 'images/cluster_app_logos/elastic_stack.png'; -import fluentdLogo from 'images/cluster_app_logos/fluentd.png'; import eventHub from '~/clusters/event_hub'; import clipboardButton from '../../vue_shared/components/clipboard_button.vue'; import { CLUSTER_TYPE, PROVIDER_TYPE, APPLICATION_STATUS, INGRESS } from '../constants'; import applicationRow from './application_row.vue'; -import KnativeDomainEditor from './knative_domain_editor.vue'; import CrossplaneProviderStack from './crossplane_provider_stack.vue'; -import IngressModsecuritySettings from './ingress_modsecurity_settings.vue'; import FluentdOutputSettings from './fluentd_output_settings.vue'; +import IngressModsecuritySettings from './ingress_modsecurity_settings.vue'; +import KnativeDomainEditor from './knative_domain_editor.vue'; export default { components: { diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue index 84a39874000..369cb2fa0f3 100644 --- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue +++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue @@ -1,9 +1,9 @@ <script> import { GlAlert, GlButton, GlDropdown, GlDropdownItem, GlFormCheckbox } from '@gitlab/ui'; import { mapValues } from 'lodash'; -import { __ } from '~/locale'; import { APPLICATION_STATUS, FLUENTD } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; +import { __ } from '~/locale'; const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS; diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue index 58a5edb832f..26767c32275 100644 --- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue +++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue @@ -1,5 +1,4 @@ <script> -import { escape } from 'lodash'; import { GlAlert, GlSprintf, @@ -10,6 +9,7 @@ import { GlDropdownItem, GlIcon, } from '@gitlab/ui'; +import { escape } from 'lodash'; import modSecurityLogo from 'images/cluster_app_logos/gitlab.png'; import { APPLICATION_STATUS, INGRESS, LOGGING_MODE, BLOCKING_MODE } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; diff --git a/app/assets/javascripts/clusters/components/knative_domain_editor.vue b/app/assets/javascripts/clusters/components/knative_domain_editor.vue index bf89c288b75..89446680173 100644 --- a/app/assets/javascripts/clusters/components/knative_domain_editor.vue +++ b/app/assets/javascripts/clusters/components/knative_domain_editor.vue @@ -9,9 +9,9 @@ import { GlButton, GlAlert, } from '@gitlab/ui'; +import { APPLICATION_STATUS } from '~/clusters/constants'; import { __, s__ } from '~/locale'; -import { APPLICATION_STATUS } from '~/clusters/constants'; import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; const { UPDATING, UNINSTALLING } = APPLICATION_STATUS; diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index c5678173be4..5cd9baf2c2b 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/no-v-html */ -import { escape } from 'lodash'; import { GlModal, GlButton, GlFormInput, GlSprintf } from '@gitlab/ui'; -import SplitButton from '~/vue_shared/components/split_button.vue'; -import { s__, sprintf } from '~/locale'; +import { escape } from 'lodash'; import csrf from '~/lib/utils/csrf'; +import { s__, sprintf } from '~/locale'; +import SplitButton from '~/vue_shared/components/split_button.vue'; const splitButtonActionItems = [ { diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index 5de487308c5..d45696c98c2 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -1,5 +1,5 @@ -import { s__ } from '../../locale'; import { parseBoolean } from '../../lib/utils/common_utils'; +import { s__ } from '../../locale'; import { INGRESS, JUPYTER, diff --git a/app/assets/javascripts/clusters_list/components/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue index 30b683cee41..8f81d967126 100644 --- a/app/assets/javascripts/clusters_list/components/clusters.vue +++ b/app/assets/javascripts/clusters_list/components/clusters.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlBadge, GlLink, @@ -10,6 +9,7 @@ import { GlTable, GlTooltipDirective, } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { __, sprintf } from '~/locale'; import { CLUSTER_TYPES, STATUSES } from '../constants'; import AncestorNotice from './ancestor_notice.vue'; diff --git a/app/assets/javascripts/clusters_list/store/actions.js b/app/assets/javascripts/clusters_list/store/actions.js index ee85b3e13fb..45d3e0cbc23 100644 --- a/app/assets/javascripts/clusters_list/store/actions.js +++ b/app/assets/javascripts/clusters_list/store/actions.js @@ -1,9 +1,9 @@ -import * as Sentry from '~/sentry/wrapper'; -import Poll from '~/lib/utils/poll'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; -import { __ } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; +import Poll from '~/lib/utils/poll'; +import { __ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import { MAX_REQUESTS } from '../constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/clusters_list/store/index.js b/app/assets/javascripts/clusters_list/store/index.js index 47e17b3624b..7cdd93eeae9 100644 --- a/app/assets/javascripts/clusters_list/store/index.js +++ b/app/assets/javascripts/clusters_list/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; +import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/code_navigation/index.js b/app/assets/javascripts/code_navigation/index.js index 38b3467dc33..83906245b81 100644 --- a/app/assets/javascripts/code_navigation/index.js +++ b/app/assets/javascripts/code_navigation/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createStore from './store'; import App from './components/app.vue'; +import createStore from './store'; export default (initialData) => { const el = document.getElementById('js-code-navigation'); diff --git a/app/assets/javascripts/code_navigation/store/index.js b/app/assets/javascripts/code_navigation/store/index.js index 9b60fc337fe..6b448bc5fb7 100644 --- a/app/assets/javascripts/code_navigation/store/index.js +++ b/app/assets/javascripts/code_navigation/store/index.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import createState from './state'; import actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default () => new Vuex.Store({ diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 71560bd979f..4e93bd8dcf1 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -1,12 +1,12 @@ <script> import { GlButton, GlLoadingIcon, GlModal, GlLink } from '@gitlab/ui'; +import { getParameterByName } from '~/lib/utils/common_utils'; +import eventHub from '~/pipelines/event_hub'; +import pipelinesMixin from '~/pipelines/mixins/pipelines'; +import PipelinesPaginationApiMixin from '~/pipelines/mixins/pipelines_pagination_api_mixin'; import PipelinesService from '~/pipelines/services/pipelines_service'; import PipelineStore from '~/pipelines/stores/pipelines_store'; -import pipelinesMixin from '~/pipelines/mixins/pipelines'; -import eventHub from '~/pipelines/event_hub'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; -import { getParameterByName } from '~/lib/utils/common_utils'; -import PipelinesPaginationApiMixin from '~/pipelines/mixins/pipelines_pagination_api_mixin'; export default { components: { diff --git a/app/assets/javascripts/commits.js b/app/assets/javascripts/commits.js index f82bea134a3..5cbe9a24fc4 100644 --- a/app/assets/javascripts/commits.js +++ b/app/assets/javascripts/commits.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { n__ } from '~/locale'; +import axios from './lib/utils/axios_utils'; import { localTimeAgo } from './lib/utils/datetime_utility'; import Pager from './pager'; -import axios from './lib/utils/axios_utils'; export default class CommitsList { constructor(limit = 0) { diff --git a/app/assets/javascripts/compare_autocomplete.js b/app/assets/javascripts/compare_autocomplete.js index b3958b05d62..314e4e911ee 100644 --- a/app/assets/javascripts/compare_autocomplete.js +++ b/app/assets/javascripts/compare_autocomplete.js @@ -1,12 +1,12 @@ /* eslint-disable func-names */ import $ from 'jquery'; -import { fixTitle } from '~/tooltips'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { __ } from './locale'; -import axios from './lib/utils/axios_utils'; +import { fixTitle } from '~/tooltips'; import { deprecatedCreateFlash as flash } from './flash'; +import axios from './lib/utils/axios_utils'; import { capitalizeFirstCharacter } from './lib/utils/text_utility'; +import { __ } from './locale'; export default function initCompareAutocomplete(limitTo = null, clickHandler = () => {}) { $('.js-compare-dropdown').each(function () { diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue index 58fe022b794..2f39bbacc7d 100644 --- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue +++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue @@ -1,8 +1,8 @@ <script> import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; -import { __ } from '../../locale'; -import { deprecatedCreateFlash as createFlash } from '../../flash'; import Api from '../../api'; +import { deprecatedCreateFlash as createFlash } from '../../flash'; +import { __ } from '../../locale'; import state from '../state'; import Dropdown from './dropdown.vue'; diff --git a/app/assets/javascripts/contextual_sidebar.js b/app/assets/javascripts/contextual_sidebar.js index f7d24c70864..08cf0197993 100644 --- a/app/assets/javascripts/contextual_sidebar.js +++ b/app/assets/javascripts/contextual_sidebar.js @@ -1,7 +1,7 @@ +import { GlBreakpointInstance as bp, breakpoints } from '@gitlab/ui/dist/utils'; import $ from 'jquery'; -import { debounce } from 'lodash'; import Cookies from 'js-cookie'; -import { GlBreakpointInstance as bp, breakpoints } from '@gitlab/ui/dist/utils'; +import { debounce } from 'lodash'; import { parseBoolean } from '~/lib/utils/common_utils'; export const SIDEBAR_COLLAPSED_CLASS = 'js-sidebar-collapsed'; diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index 977c2ba907e..7426e570864 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -1,11 +1,11 @@ <script> -import { debounce, uniq } from 'lodash'; -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; -import { __ } from '~/locale'; -import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; +import { debounce, uniq } from 'lodash'; +import { mapActions, mapState, mapGetters } from 'vuex'; import { getDatesInRange } from '~/lib/utils/datetime_utility'; +import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; +import { __ } from '~/locale'; import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; import { xAxisLabelFormatter, dateFormatter } from '../utils'; diff --git a/app/assets/javascripts/contributors/stores/index.js b/app/assets/javascripts/contributors/stores/index.js index bc739851aa7..38259f46d4c 100644 --- a/app/assets/javascripts/contributors/stores/index.js +++ b/app/assets/javascripts/contributors/stores/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; -import mutations from './mutations'; -import * as getters from './getters'; import * as actions from './actions'; +import * as getters from './getters'; +import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/create_cluster/components/cluster_form_dropdown.vue b/app/assets/javascripts/create_cluster/components/cluster_form_dropdown.vue index 7f4c3635119..fa0a17f3643 100644 --- a/app/assets/javascripts/create_cluster/components/cluster_form_dropdown.vue +++ b/app/assets/javascripts/create_cluster/components/cluster_form_dropdown.vue @@ -1,10 +1,10 @@ <script> -import { isNil } from 'lodash'; -import $ from 'jquery'; import { GlIcon } from '@gitlab/ui'; -import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; +import $ from 'jquery'; +import { isNil } from 'lodash'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; +import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; +import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; const toArray = (value) => (isNil(value) ? [] : [].concat(value)); const itemsProp = (items, prop) => items.map((item) => item[prop]); diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue index eb195ad2b30..ba170dc0e19 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue +++ b/app/assets/javascripts/create_cluster/eks_cluster/components/create_eks_cluster.vue @@ -1,7 +1,7 @@ <script> import { mapState } from 'vuex'; -import ServiceCredentialsForm from './service_credentials_form.vue'; import EksClusterConfigurationForm from './eks_cluster_configuration_form.vue'; +import ServiceCredentialsForm from './service_credentials_form.vue'; export default { components: { diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue index a7425735733..4aee02e45c8 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue +++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue @@ -1,5 +1,4 @@ <script> -import { createNamespacedHelpers, mapState, mapActions, mapGetters } from 'vuex'; import { GlFormGroup, GlFormInput, @@ -9,8 +8,9 @@ import { GlSprintf, GlButton, } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import { createNamespacedHelpers, mapState, mapActions, mapGetters } from 'vuex'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; +import { s__ } from '~/locale'; import { KUBERNETES_VERSIONS } from '../constants'; const { mapState: mapRolesState, mapActions: mapRolesActions } = createNamespacedHelpers('roles'); diff --git a/app/assets/javascripts/create_cluster/eks_cluster/services/aws_services_facade.js b/app/assets/javascripts/create_cluster/eks_cluster/services/aws_services_facade.js index c2b59191997..bd9554521b8 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/services/aws_services_facade.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/services/aws_services_facade.js @@ -1,6 +1,6 @@ -import AWS from 'aws-sdk/global'; import EC2 from 'aws-sdk/clients/ec2'; import IAM from 'aws-sdk/clients/iam'; +import AWS from 'aws-sdk/global'; const lookupVpcName = ({ Tags: tags, VpcId: id }) => { const nameTag = tags.find(({ Key: key }) => key === 'Name'); diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js b/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js index 6df9645b03a..8b7c93ad880 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js @@ -1,8 +1,8 @@ -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { setAWSConfig } from '../services/aws_services_facade'; import { DEFAULT_REGION } from '../constants'; +import { setAWSConfig } from '../services/aws_services_facade'; import * as types from './mutation_types'; const getErrorMessage = (data) => { diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js index f9d0d86e381..1246fdb19d7 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js @@ -1,7 +1,7 @@ import { GlLoadingIcon } from '@gitlab/ui'; -import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; +import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; +import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; import store from '../store'; diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue index acbc4d1b3bc..b6f0bdbf01d 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlSprintf, GlLink, GlIcon } from '@gitlab/ui'; +import { mapState, mapGetters, mapActions } from 'vuex'; import { s__ } from '~/locale'; import gkeDropdownMixin from './gke_dropdown_mixin'; diff --git a/app/assets/javascripts/create_cluster/gke_cluster/index.js b/app/assets/javascripts/create_cluster/gke_cluster/index.js index c02173fc510..4eafbdb7265 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/index.js +++ b/app/assets/javascripts/create_cluster/gke_cluster/index.js @@ -1,15 +1,14 @@ import Vue from 'vue'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import GkeProjectIdDropdown from './components/gke_project_id_dropdown.vue'; -import GkeZoneDropdown from './components/gke_zone_dropdown.vue'; import GkeMachineTypeDropdown from './components/gke_machine_type_dropdown.vue'; +import GkeProjectIdDropdown from './components/gke_project_id_dropdown.vue'; import GkeSubmitButton from './components/gke_submit_button.vue'; +import GkeZoneDropdown from './components/gke_zone_dropdown.vue'; +import * as CONSTANTS from './constants'; import gapiLoader from './gapi_loader'; import store from './store'; -import * as CONSTANTS from './constants'; - const mountComponent = (entryPoint, component, componentName, extraProps = {}) => { const el = document.querySelector(entryPoint); if (!el) return false; diff --git a/app/assets/javascripts/create_cluster/store/cluster_dropdown/index.js b/app/assets/javascripts/create_cluster/store/cluster_dropdown/index.js index 0b19589215c..de8cc44fa7c 100644 --- a/app/assets/javascripts/create_cluster/store/cluster_dropdown/index.js +++ b/app/assets/javascripts/create_cluster/store/cluster_dropdown/index.js @@ -1,5 +1,5 @@ -import * as getters from './getters'; import actions from './actions'; +import * as getters from './getters'; import mutations from './mutations'; import state from './state'; diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js index aaaa7055799..35176c19f69 100644 --- a/app/assets/javascripts/create_merge_request_dropdown.js +++ b/app/assets/javascripts/create_merge_request_dropdown.js @@ -1,16 +1,16 @@ /* eslint-disable no-new */ import { debounce } from 'lodash'; -import axios from './lib/utils/axios_utils'; -import { deprecatedCreateFlash as Flash } from './flash'; -import DropLab from './droplab/drop_lab'; -import ISetter from './droplab/plugins/input_setter'; -import { __, sprintf } from './locale'; import { init as initConfidentialMergeRequest, isConfidentialIssue, canCreateConfidentialMergeRequest, } from './confidential_merge_request'; import confidentialMergeRequestState from './confidential_merge_request/state'; +import DropLab from './droplab/drop_lab'; +import ISetter from './droplab/plugins/input_setter'; +import { deprecatedCreateFlash as Flash } from './flash'; +import axios from './lib/utils/axios_utils'; +import { __, sprintf } from './locale'; // Todo: Remove this when fixing issue in input_setter plugin const InputSetter = { ...ISetter }; diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue index 1b32225d251..3158ae9b126 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue @@ -1,7 +1,7 @@ <script> import { GlButton } from '@gitlab/ui'; -import { __, s__ } from '~/locale'; import csrf from '~/lib/utils/csrf'; +import { __, s__ } from '~/locale'; import { formDataValidator } from '../constants'; import CustomMetricsFormFields from './custom_metrics_form_fields.vue'; import DeleteCustomMetricModal from './delete_custom_metric_modal.vue'; diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue index f3fa28dc2f3..0aae63e1648 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue @@ -8,11 +8,11 @@ import { GlIcon, } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { __, s__ } from '~/locale'; -import csrf from '~/lib/utils/csrf'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; +import csrf from '~/lib/utils/csrf'; +import statusCodes from '~/lib/utils/http_status'; +import { __, s__ } from '~/locale'; import { queryTypes, formDataValidator } from '../constants'; const VALIDATION_REQUEST_TIMEOUT = 10000; diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js index 56954a4e97f..847820c965f 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js @@ -2,20 +2,20 @@ // relies on app/views/projects/cycle_analytics/show.html.haml for its // template. /* eslint-disable @gitlab/no-runtime-template-compiler */ +import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; import $ from 'jquery'; -import Vue from 'vue'; import Cookies from 'js-cookie'; -import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; +import Vue from 'vue'; import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '../flash'; import Translate from '../vue_shared/translate'; import banner from './components/banner.vue'; import stageCodeComponent from './components/stage_code_component.vue'; import stageComponent from './components/stage_component.vue'; +import stageNavItem from './components/stage_nav_item.vue'; import stageReviewComponent from './components/stage_review_component.vue'; import stageStagingComponent from './components/stage_staging_component.vue'; import stageTestComponent from './components/stage_test_component.vue'; -import stageNavItem from './components/stage_nav_item.vue'; import CycleAnalyticsService from './cycle_analytics_service'; import CycleAnalyticsStore from './cycle_analytics_store'; diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js index 7b04494892e..24ad6ef4c88 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js @@ -1,7 +1,7 @@ /* eslint-disable no-param-reassign */ -import { __ } from '../locale'; import { dasherize } from '../lib/utils/text_utility'; +import { __ } from '../locale'; import DEFAULT_EVENT_OBJECTS from './default_event_objects'; const EMPTY_STAGE_TEXTS = { diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue index afc1c2cda8e..d05a0761ae3 100644 --- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue +++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_modal.vue @@ -1,10 +1,10 @@ <script> import { GlFormGroup, GlFormInput, GlModal, GlSprintf, GlLink } from '@gitlab/ui'; -import { mapActions, mapState } from 'vuex'; import { isValidCron } from 'cron-validator'; -import { mapComputed } from '~/vuex_shared/bindings'; +import { mapActions, mapState } from 'vuex'; import { __ } from '~/locale'; import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; +import { mapComputed } from '~/vuex_shared/bindings'; export default { components: { diff --git a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue index fc2ed10f3ca..0f898f20033 100644 --- a/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue +++ b/app/assets/javascripts/deploy_freeze/components/deploy_freeze_settings.vue @@ -1,6 +1,6 @@ <script> -import DeployFreezeTable from './deploy_freeze_table.vue'; import DeployFreezeModal from './deploy_freeze_modal.vue'; +import DeployFreezeTable from './deploy_freeze_table.vue'; export default { components: { diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue index 92e80d15902..425cca13ae8 100644 --- a/app/assets/javascripts/deploy_keys/components/app.vue +++ b/app/assets/javascripts/deploy_keys/components/app.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { s__ } from '~/locale'; import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; import eventHub from '../eventhub'; import DeployKeysService from '../service'; diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue index 797f5a6aaf0..e70ca18bb71 100644 --- a/app/assets/javascripts/deploy_keys/components/key.vue +++ b/app/assets/javascripts/deploy_keys/components/key.vue @@ -1,6 +1,6 @@ <script> -import { head, tail } from 'lodash'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { head, tail } from 'lodash'; import { s__, sprintf } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js index 98858f20518..162491312a8 100644 --- a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js +++ b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js @@ -1,13 +1,13 @@ /* eslint-disable consistent-return */ +import fuzzaldrinPlus from 'fuzzaldrin-plus'; import $ from 'jquery'; import { escape } from 'lodash'; -import fuzzaldrinPlus from 'fuzzaldrin-plus'; -import { visitUrl } from '~/lib/utils/url_utility'; import { isObject } from '~/lib/utils/type_utility'; -import renderItem from './render'; -import { GitLabDropdownRemote } from './gl_dropdown_remote'; -import { GitLabDropdownInput } from './gl_dropdown_input'; +import { visitUrl } from '~/lib/utils/url_utility'; import { GitLabDropdownFilter } from './gl_dropdown_filter'; +import { GitLabDropdownInput } from './gl_dropdown_input'; +import { GitLabDropdownRemote } from './gl_dropdown_remote'; +import renderItem from './render'; const LOADING_CLASS = 'is-loading'; diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js index ab9fb1ec332..b1d486c5d66 100644 --- a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js +++ b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown_filter.js @@ -1,7 +1,7 @@ /* eslint-disable consistent-return */ -import $ from 'jquery'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; +import $ from 'jquery'; import { isObject } from '~/lib/utils/type_utility'; const BLUR_KEYCODES = [27, 40]; diff --git a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue index ab963990ce3..33f0aa00cad 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue @@ -1,15 +1,15 @@ <script> -import { ApolloMutation } from 'vue-apollo'; import { GlTooltipDirective, GlIcon, GlLoadingIcon, GlLink, GlBadge } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import { ApolloMutation } from 'vue-apollo'; import createFlash from '~/flash'; +import { s__ } from '~/locale'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import allVersionsMixin from '../../mixins/all_versions'; +import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../../constants'; import createNoteMutation from '../../graphql/mutations/create_note.mutation.graphql'; import toggleResolveDiscussionMutation from '../../graphql/mutations/toggle_resolve_discussion.mutation.graphql'; import activeDiscussionQuery from '../../graphql/queries/active_discussion.query.graphql'; -import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../../constants'; +import allVersionsMixin from '../../mixins/all_versions'; import { hasErrors } from '../../utils/cache_update'; import { ADD_DISCUSSION_COMMENT_ERROR } from '../../utils/error_messages'; import DesignNote from './design_note.vue'; diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index 371f2d06486..2b867217327 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -1,12 +1,12 @@ <script> -import { ApolloMutation } from 'vue-apollo'; import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import { ApolloMutation } from 'vue-apollo'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import updateNoteMutation from '../../graphql/mutations/update_note.mutation.graphql'; -import { findNoteId, extractDesignNoteId } from '../../utils/design_management_utils'; import { hasErrors } from '../../utils/cache_update'; +import { findNoteId, extractDesignNoteId } from '../../utils/design_management_utils'; import DesignReplyForm from './design_reply_form.vue'; export default { diff --git a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue index 0cc89440754..fb25d3618ab 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue @@ -1,8 +1,8 @@ <script> import { GlButton, GlModal } from '@gitlab/ui'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; -import { s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { s__ } from '~/locale'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; export default { name: 'DesignReplyForm', diff --git a/app/assets/javascripts/design_management/components/design_overlay.vue b/app/assets/javascripts/design_management/components/design_overlay.vue index d19ac198fb2..ecca8606f89 100644 --- a/app/assets/javascripts/design_management/components/design_overlay.vue +++ b/app/assets/javascripts/design_management/components/design_overlay.vue @@ -1,8 +1,8 @@ <script> import { __ } from '~/locale'; -import activeDiscussionQuery from '../graphql/queries/active_discussion.query.graphql'; -import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql'; import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants'; +import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql'; +import activeDiscussionQuery from '../graphql/queries/active_discussion.query.graphql'; import DesignNotePin from './design_note_pin.vue'; export default { diff --git a/app/assets/javascripts/design_management/components/design_presentation.vue b/app/assets/javascripts/design_management/components/design_presentation.vue index a760adf8b14..11d2f3b2e37 100644 --- a/app/assets/javascripts/design_management/components/design_presentation.vue +++ b/app/assets/javascripts/design_management/components/design_presentation.vue @@ -1,7 +1,7 @@ <script> import { throttle } from 'lodash'; -import DesignImage from './image.vue'; import DesignOverlay from './design_overlay.vue'; +import DesignImage from './image.vue'; const CLICK_DRAG_BUFFER_PX = 2; diff --git a/app/assets/javascripts/design_management/components/design_sidebar.vue b/app/assets/javascripts/design_management/components/design_sidebar.vue index d6063e2e79e..efa1ef2107a 100644 --- a/app/assets/javascripts/design_management/components/design_sidebar.vue +++ b/app/assets/javascripts/design_management/components/design_sidebar.vue @@ -1,13 +1,13 @@ <script> -import Cookies from 'js-cookie'; import { GlCollapse, GlButton, GlPopover } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import Cookies from 'js-cookie'; import { parseBoolean } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import Participants from '~/sidebar/components/participants/participants.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants'; import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql'; import { extractDiscussions, extractParticipants } from '../utils/design_management_utils'; -import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants'; import DesignDiscussion from './design_notes/design_discussion.vue'; import DesignTodoButton from './design_todo_button.vue'; diff --git a/app/assets/javascripts/design_management/components/design_todo_button.vue b/app/assets/javascripts/design_management/components/design_todo_button.vue index e80300ad57b..da492f03801 100644 --- a/app/assets/javascripts/design_management/components/design_todo_button.vue +++ b/app/assets/javascripts/design_management/components/design_todo_button.vue @@ -1,8 +1,8 @@ <script> import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; import TodoButton from '~/vue_shared/components/todo_button.vue'; -import getDesignQuery from '../graphql/queries/get_design.query.graphql'; import createDesignTodoMutation from '../graphql/mutations/create_design_todo.mutation.graphql'; +import getDesignQuery from '../graphql/queries/get_design.query.graphql'; import allVersionsMixin from '../mixins/all_versions'; import { updateStoreAfterDeleteDesignTodo } from '../utils/cache_update'; import { findIssueId, findDesignId } from '../utils/design_management_utils'; diff --git a/app/assets/javascripts/design_management/components/image.vue b/app/assets/javascripts/design_management/components/image.vue index 53062e6ebb0..e64ee4a5a34 100644 --- a/app/assets/javascripts/design_management/components/image.vue +++ b/app/assets/javascripts/design_management/components/image.vue @@ -1,6 +1,6 @@ <script> -import { throttle } from 'lodash'; import { GlIcon } from '@gitlab/ui'; +import { throttle } from 'lodash'; export default { components: { diff --git a/app/assets/javascripts/design_management/components/list/item.vue b/app/assets/javascripts/design_management/components/list/item.vue index 67110265b5f..5eabe9ef1bc 100644 --- a/app/assets/javascripts/design_management/components/list/item.vue +++ b/app/assets/javascripts/design_management/components/list/item.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon, GlIcon, GlIntersectionObserver, GlTooltipDirective } from '@gitlab/ui'; -import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { n__, __ } from '~/locale'; +import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { DESIGN_ROUTE_NAME } from '../../router/constants'; export default { diff --git a/app/assets/javascripts/design_management/components/toolbar/index.vue b/app/assets/javascripts/design_management/components/toolbar/index.vue index 295327b0f05..a3b0f06fb28 100644 --- a/app/assets/javascripts/design_management/components/toolbar/index.vue +++ b/app/assets/javascripts/design_management/components/toolbar/index.vue @@ -3,8 +3,8 @@ import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui'; import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql'; import { __, sprintf } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import DeleteButton from '../delete_button.vue'; import { DESIGNS_ROUTE_NAME } from '../../router/constants'; +import DeleteButton from '../delete_button.vue'; import DesignNavigation from './design_navigation.vue'; export default { diff --git a/app/assets/javascripts/design_management/graphql.js b/app/assets/javascripts/design_management/graphql.js index b7aba315168..c6c3e66a01f 100644 --- a/app/assets/javascripts/design_management/graphql.js +++ b/app/assets/javascripts/design_management/graphql.js @@ -1,16 +1,16 @@ +import { defaultDataIdFromObject } from 'apollo-cache-inmemory'; +import produce from 'immer'; +import { uniqueId } from 'lodash'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { uniqueId } from 'lodash'; -import produce from 'immer'; -import { defaultDataIdFromObject } from 'apollo-cache-inmemory'; -import axios from '~/lib/utils/axios_utils'; import createDefaultClient from '~/lib/graphql'; +import axios from '~/lib/utils/axios_utils'; import activeDiscussionQuery from './graphql/queries/active_discussion.query.graphql'; import getDesignQuery from './graphql/queries/get_design.query.graphql'; import typeDefs from './graphql/typedefs.graphql'; +import { addPendingTodoToStore } from './utils/cache_update'; import { extractTodoIdFromDeletePath, createPendingTodo } from './utils/design_management_utils'; import { CREATE_DESIGN_TODO_EXISTS_ERROR } from './utils/error_messages'; -import { addPendingTodoToStore } from './utils/cache_update'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/design_management/index.js b/app/assets/javascripts/design_management/index.js index 1a87dd38137..f0930ade1b5 100644 --- a/app/assets/javascripts/design_management/index.js +++ b/app/assets/javascripts/design_management/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; -import createRouter from './router'; import App from './components/app.vue'; import apolloProvider from './graphql'; +import createRouter from './router'; export default () => { const el = document.querySelector('.js-design-management'); diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue index 492ed2e8719..8a11c25a795 100644 --- a/app/assets/javascripts/design_management/pages/design/index.vue +++ b/app/assets/javascripts/design_management/pages/design/index.vue @@ -1,21 +1,27 @@ <script> -import Mousetrap from 'mousetrap'; import { GlLoadingIcon, GlAlert } from '@gitlab/ui'; +import Mousetrap from 'mousetrap'; import { ApolloMutation } from 'vue-apollo'; import createFlash from '~/flash'; import { fetchPolicies } from '~/lib/graphql'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import allVersionsMixin from '../../mixins/all_versions'; -import Toolbar from '../../components/toolbar/index.vue'; import DesignDestroyer from '../../components/design_destroyer.vue'; -import DesignScaler from '../../components/design_scaler.vue'; -import DesignPresentation from '../../components/design_presentation.vue'; import DesignReplyForm from '../../components/design_notes/design_reply_form.vue'; +import DesignPresentation from '../../components/design_presentation.vue'; +import DesignScaler from '../../components/design_scaler.vue'; import DesignSidebar from '../../components/design_sidebar.vue'; -import getDesignQuery from '../../graphql/queries/get_design.query.graphql'; +import Toolbar from '../../components/toolbar/index.vue'; +import { ACTIVE_DISCUSSION_SOURCE_TYPES, DESIGN_DETAIL_LAYOUT_CLASSLIST } from '../../constants'; import createImageDiffNoteMutation from '../../graphql/mutations/create_image_diff_note.mutation.graphql'; import repositionImageDiffNoteMutation from '../../graphql/mutations/reposition_image_diff_note.mutation.graphql'; import updateActiveDiscussionMutation from '../../graphql/mutations/update_active_discussion.mutation.graphql'; +import getDesignQuery from '../../graphql/queries/get_design.query.graphql'; +import allVersionsMixin from '../../mixins/all_versions'; +import { DESIGNS_ROUTE_NAME } from '../../router/constants'; +import { + updateStoreAfterAddImageDiffNote, + updateStoreAfterRepositionImageDiffNote, +} from '../../utils/cache_update'; import { extractDiscussions, extractDesign, @@ -25,10 +31,6 @@ import { getPageLayoutElement, } from '../../utils/design_management_utils'; import { - updateStoreAfterAddImageDiffNote, - updateStoreAfterRepositionImageDiffNote, -} from '../../utils/cache_update'; -import { ADD_DISCUSSION_COMMENT_ERROR, ADD_IMAGE_DIFF_NOTE_ERROR, UPDATE_IMAGE_DIFF_NOTE_ERROR, @@ -39,8 +41,6 @@ import { designDeletionError, } from '../../utils/error_messages'; import { trackDesignDetailView, usagePingDesignDetailView } from '../../utils/tracking'; -import { DESIGNS_ROUTE_NAME } from '../../router/constants'; -import { ACTIVE_DISCUSSION_SOURCE_TYPES, DESIGN_DETAIL_LAYOUT_CLASSLIST } from '../../constants'; const DEFAULT_SCALE = 1; diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue index 59f567fc372..0f2afb779fd 100644 --- a/app/assets/javascripts/design_management/pages/index.vue +++ b/app/assets/javascripts/design_management/pages/index.vue @@ -1,29 +1,22 @@ <script> import { GlLoadingIcon, GlButton, GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; import VueDraggable from 'vuedraggable'; -import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql'; import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql'; +import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql'; import createFlash, { FLASH_TYPES } from '~/flash'; -import { __, s__, sprintf } from '~/locale'; import { getFilename } from '~/lib/utils/file_upload'; +import { __, s__, sprintf } from '~/locale'; import DesignDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue'; -import UploadButton from '../components/upload/button.vue'; import DeleteButton from '../components/delete_button.vue'; -import Design from '../components/list/item.vue'; import DesignDestroyer from '../components/design_destroyer.vue'; +import Design from '../components/list/item.vue'; +import UploadButton from '../components/upload/button.vue'; import DesignVersionDropdown from '../components/upload/design_version_dropdown.vue'; -import uploadDesignMutation from '../graphql/mutations/upload_design.mutation.graphql'; +import { VALID_DESIGN_FILE_MIMETYPE } from '../constants'; import moveDesignMutation from '../graphql/mutations/move_design.mutation.graphql'; +import uploadDesignMutation from '../graphql/mutations/upload_design.mutation.graphql'; import allDesignsMixin from '../mixins/all_designs'; -import { - UPLOAD_DESIGN_ERROR, - EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE, - EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE, - MOVE_DESIGN_ERROR, - UPLOAD_DESIGN_INVALID_FILETYPE_ERROR, - designUploadSkippedWarning, - designDeletionError, -} from '../utils/error_messages'; +import { DESIGNS_ROUTE_NAME } from '../router/constants'; import { updateStoreAfterUploadDesign, updateDesignsOnStoreAfterReorder, @@ -33,9 +26,16 @@ import { isValidDesignFile, moveDesignOptimisticResponse, } from '../utils/design_management_utils'; +import { + UPLOAD_DESIGN_ERROR, + EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE, + EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE, + MOVE_DESIGN_ERROR, + UPLOAD_DESIGN_INVALID_FILETYPE_ERROR, + designUploadSkippedWarning, + designDeletionError, +} from '../utils/error_messages'; import { trackDesignCreate, trackDesignUpdate } from '../utils/tracking'; -import { DESIGNS_ROUTE_NAME } from '../router/constants'; -import { VALID_DESIGN_FILE_MIMETYPE } from '../constants'; const MAXIMUM_FILE_UPLOAD_LIMIT = 10; diff --git a/app/assets/javascripts/design_management/router/routes.js b/app/assets/javascripts/design_management/router/routes.js index 1b07d8aeb76..fb1daecfc35 100644 --- a/app/assets/javascripts/design_management/router/routes.js +++ b/app/assets/javascripts/design_management/router/routes.js @@ -1,5 +1,5 @@ -import Home from '../pages/index.vue'; import DesignDetail from '../pages/design/index.vue'; +import Home from '../pages/index.vue'; import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from './constants'; export default [ diff --git a/app/assets/javascripts/design_management/utils/cache_update.js b/app/assets/javascripts/design_management/utils/cache_update.js index 0c4ee0bf012..c561eda12ed 100644 --- a/app/assets/javascripts/design_management/utils/cache_update.js +++ b/app/assets/javascripts/design_management/utils/cache_update.js @@ -1,7 +1,7 @@ /* eslint-disable @gitlab/require-i18n-strings */ -import { differenceBy } from 'lodash'; import produce from 'immer'; +import { differenceBy } from 'lodash'; import createFlash from '~/flash'; import { extractCurrentDiscussion, extractDesign, extractDesigns } from './design_management_utils'; import { diff --git a/app/assets/javascripts/design_management/utils/tracking.js b/app/assets/javascripts/design_management/utils/tracking.js index 37296f5b4ff..905134fa985 100644 --- a/app/assets/javascripts/design_management/utils/tracking.js +++ b/app/assets/javascripts/design_management/utils/tracking.js @@ -1,5 +1,5 @@ -import Tracking from '~/tracking'; import Api from '~/api'; +import Tracking from '~/tracking'; // Snowplow tracking constants const DESIGN_TRACKING_CONTEXT_SCHEMAS = { diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index c4e86638e9d..7200e6c2e3a 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -1,11 +1,11 @@ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import { getLocationHash } from './lib/utils/url_utility'; import FilesCommentButton from './files_comment_button'; -import SingleFileDiff from './single_file_diff'; import initImageDiffHelper from './image_diff/helpers/init_image_diff'; +import { getLocationHash } from './lib/utils/url_utility'; +import SingleFileDiff from './single_file_diff'; const UNFOLD_COUNT = 20; let isBound = false; diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 0d74d654cd6..bb311148627 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -1,22 +1,17 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlLoadingIcon, GlPagination, GlSprintf } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import Mousetrap from 'mousetrap'; -import { __ } from '~/locale'; -import { getParameterByName, parseBoolean } from '~/lib/utils/common_utils'; +import { mapState, mapGetters, mapActions } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import PanelResizer from '~/vue_shared/components/panel_resizer.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { isSingleViewStyle } from '~/helpers/diffs_helper'; +import { getParameterByName, parseBoolean } from '~/lib/utils/common_utils'; import { updateHistory } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; +import PanelResizer from '~/vue_shared/components/panel_resizer.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import notesEventHub from '../../notes/event_hub'; -import eventHub from '../event_hub'; - -import { diffsApp } from '../utils/performance'; -import { fileByFile } from '../utils/preferences'; -import { reviewStatuses } from '../utils/file_reviews'; import { TREE_LIST_WIDTH_STORAGE_KEY, INITIAL_TREE_WIDTH, @@ -30,15 +25,19 @@ import { ALERT_COLLAPSED_FILES, EVT_VIEW_FILE_BY_FILE, } from '../constants'; +import eventHub from '../event_hub'; + +import { reviewStatuses } from '../utils/file_reviews'; +import { diffsApp } from '../utils/performance'; +import { fileByFile } from '../utils/preferences'; +import CollapsedFilesWarning from './collapsed_files_warning.vue'; +import CommitWidget from './commit_widget.vue'; import CompareVersions from './compare_versions.vue'; import DiffFile from './diff_file.vue'; -import NoChanges from './no_changes.vue'; -import CommitWidget from './commit_widget.vue'; -import TreeList from './tree_list.vue'; - import HiddenFilesWarning from './hidden_files_warning.vue'; import MergeConflictWarning from './merge_conflict_warning.vue'; -import CollapsedFilesWarning from './collapsed_files_warning.vue'; +import NoChanges from './no_changes.vue'; +import TreeList from './tree_list.vue'; export default { name: 'DiffsApp', diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index af19f90ee77..92b317eb3f0 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -1,18 +1,16 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions } from 'vuex'; import { GlButtonGroup, GlButton, GlTooltipDirective, GlIcon } from '@gitlab/ui'; +import { mapActions } from 'vuex'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; - -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; - -import initUserPopovers from '../../user_popovers'; import { setUrlParams } from '../../lib/utils/url_utility'; +import initUserPopovers from '../../user_popovers'; /** * CommitItem diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue index 8db0a542eb5..bd8d2d6b8f2 100644 --- a/app/assets/javascripts/diffs/components/compare_versions.vue +++ b/app/assets/javascripts/diffs/components/compare_versions.vue @@ -1,13 +1,13 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective, GlLink, GlButton, GlSprintf } from '@gitlab/ui'; -import { __ } from '~/locale'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { polyfillSticky } from '~/lib/utils/sticky'; +import { __ } from '~/locale'; import { CENTERED_LIMITED_CONTAINER_CLASSES, EVT_EXPAND_ALL_FILES } from '../constants'; import eventHub from '../event_hub'; import CompareDropdownLayout from './compare_dropdown_layout.vue'; -import SettingsDropdown from './settings_dropdown.vue'; import DiffStats from './diff_stats.vue'; +import SettingsDropdown from './settings_dropdown.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/diff_comment_cell.vue b/app/assets/javascripts/diffs/components/diff_comment_cell.vue index 4b0b603f5a5..4af4b46f94c 100644 --- a/app/assets/javascripts/diffs/components/diff_comment_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_comment_cell.vue @@ -1,8 +1,8 @@ <script> import { mapActions } from 'vuex'; +import DiffDiscussionReply from './diff_discussion_reply.vue'; import DiffDiscussions from './diff_discussions.vue'; import DiffLineNoteForm from './diff_line_note_form.vue'; -import DiffDiscussionReply from './diff_discussion_reply.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index 137fcfdca88..663d2bb3cf8 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -1,25 +1,25 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; +import { mapActions, mapGetters, mapState } from 'vuex'; +import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue'; import draftCommentsMixin from '~/diffs/mixins/draft_comments'; +import { diffViewerModes } from '~/ide/constants'; +import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; -import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_preview.vue'; -import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue'; -import { diffViewerModes } from '~/ide/constants'; -import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; +import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import NoteForm from '../../notes/components/note_form.vue'; import eventHub from '../../notes/event_hub'; +import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import { IMAGE_DIFF_POSITION_TYPE } from '../constants'; import { getDiffMode } from '../store/utils'; -import InlineDiffView from './inline_diff_view.vue'; -import ParallelDiffView from './parallel_diff_view.vue'; -import DiffView from './diff_view.vue'; -import ImageDiffOverlay from './image_diff_overlay.vue'; import DiffDiscussions from './diff_discussions.vue'; import { mapInline, mapParallel } from './diff_row_utils'; +import DiffView from './diff_view.vue'; +import ImageDiffOverlay from './image_diff_overlay.vue'; +import InlineDiffView from './inline_diff_view.vue'; +import ParallelDiffView from './parallel_diff_view.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue index a7a6b38235b..9027d0c8aa4 100644 --- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue +++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue @@ -1,7 +1,7 @@ <script> import { mapGetters } from 'vuex'; -import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; +import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue'; export default { name: 'DiffDiscussionReply', diff --git a/app/assets/javascripts/diffs/components/diff_discussions.vue b/app/assets/javascripts/diffs/components/diff_discussions.vue index 7b55bd2104d..d0d457d8582 100644 --- a/app/assets/javascripts/diffs/components/diff_discussions.vue +++ b/app/assets/javascripts/diffs/components/diff_discussions.vue @@ -1,6 +1,6 @@ <script> -import { mapActions } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import noteableDiscussion from '../../notes/components/noteable_discussion.vue'; export default { diff --git a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue index 2d1a7237122..67900af8789 100644 --- a/app/assets/javascripts/diffs/components/diff_expansion_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_expansion_cell.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__, sprintf } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 5659f1a098e..f77c8d7406b 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -1,16 +1,14 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; -import { escape } from 'lodash'; import { GlButton, GlLoadingIcon, GlSafeHtmlDirective as SafeHtml, GlSprintf } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { sprintf } from '~/locale'; +import { escape } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { hasDiff } from '~/helpers/diffs_helper'; import { diffViewerErrors } from '~/ide/constants'; +import { sprintf } from '~/locale'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import notesEventHub from '../../notes/event_hub'; -import { collapsedType, isCollapsed, getShortShaFromFile } from '../utils/diff_file'; - import { DIFF_FILE_AUTOMATIC_COLLAPSE, DIFF_FILE_MANUAL_COLLAPSE, @@ -18,8 +16,9 @@ import { EVT_PERF_MARK_DIFF_FILES_END, EVT_PERF_MARK_FIRST_DIFF_FILE_SHOWN, } from '../constants'; -import { DIFF_FILE, GENERIC_ERROR } from '../i18n'; import eventHub from '../event_hub'; +import { DIFF_FILE, GENERIC_ERROR } from '../i18n'; +import { collapsedType, isCollapsed, getShortShaFromFile } from '../utils/diff_file'; import DiffContent from './diff_content.vue'; import DiffFileHeader from './diff_file_header.vue'; diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index eb842a09d64..1195a7f2565 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -1,6 +1,4 @@ <script> -import { escape } from 'lodash'; -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective, GlSafeHtmlDirective, @@ -13,20 +11,21 @@ import { GlFormCheckbox, GlLoadingIcon, } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; +import { escape } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; +import { diffViewerModes } from '~/ide/constants'; +import { scrollToElement } from '~/lib/utils/common_utils'; import { truncateSha } from '~/lib/utils/text_utility'; import { __, s__, sprintf } from '~/locale'; -import { scrollToElement } from '~/lib/utils/common_utils'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { diffViewerModes } from '~/ide/constants'; +import { DIFF_FILE_AUTOMATIC_COLLAPSE } from '../constants'; +import { DIFF_FILE_HEADER } from '../i18n'; import { collapsedType, isCollapsed } from '../utils/diff_file'; import { reviewable } from '../utils/file_reviews'; -import { DIFF_FILE_AUTOMATIC_COLLAPSE } from '../constants'; - -import { DIFF_FILE_HEADER } from '../i18n'; import DiffStats from './diff_stats.vue'; export default { diff --git a/app/assets/javascripts/diffs/components/diff_file_row.vue b/app/assets/javascripts/diffs/components/diff_file_row.vue index 6c5d9170c9e..89822ba7878 100644 --- a/app/assets/javascripts/diffs/components/diff_file_row.vue +++ b/app/assets/javascripts/diffs/components/diff_file_row.vue @@ -3,9 +3,9 @@ * This component is an iterative step towards refactoring and simplifying `vue_shared/components/file_row.vue` * https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23720 */ -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import FileRow from '~/vue_shared/components/file_row.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; +import FileRow from '~/vue_shared/components/file_row.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import FileRowStats from './file_row_stats.vue'; export default { diff --git a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue index f62b31734c5..1f3ec7092bc 100644 --- a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue +++ b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { n__ } from '~/locale'; import { truncate } from '~/lib/utils/text_utility'; +import { n__ } from '~/locale'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants'; diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue index 4908d600e4f..2f09f2e24b2 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -1,16 +1,16 @@ <script> import { mapState, mapGetters, mapActions } from 'vuex'; +import { s__ } from '~/locale'; import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { s__ } from '~/locale'; -import noteForm from '../../notes/components/note_form.vue'; import MultilineCommentForm from '../../notes/components/multiline_comment_form.vue'; -import autosave from '../../notes/mixins/autosave'; -import { DIFF_NOTE_TYPE, INLINE_DIFF_LINES_KEY, PARALLEL_DIFF_VIEW_TYPE } from '../constants'; import { commentLineOptions, formatLineRange, } from '../../notes/components/multiline_comment_utils'; +import noteForm from '../../notes/components/note_form.vue'; +import autosave from '../../notes/mixins/autosave'; +import { DIFF_NOTE_TYPE, INLINE_DIFF_LINES_KEY, PARALLEL_DIFF_VIEW_TYPE } from '../constants'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/diff_row.vue b/app/assets/javascripts/diffs/components/diff_row.vue index a8aca6deee6..ab6890d66b5 100644 --- a/app/assets/javascripts/diffs/components/diff_row.vue +++ b/app/assets/javascripts/diffs/components/diff_row.vue @@ -1,8 +1,8 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { CONTEXT_LINE_CLASS_NAME, PARALLEL_DIFF_VIEW_TYPE, diff --git a/app/assets/javascripts/diffs/components/diff_stats.vue b/app/assets/javascripts/diffs/components/diff_stats.vue index f229fc4cf60..0303700f42a 100644 --- a/app/assets/javascripts/diffs/components/diff_stats.vue +++ b/app/assets/javascripts/diffs/components/diff_stats.vue @@ -1,6 +1,6 @@ <script> -import { isNumber } from 'lodash'; import { GlIcon } from '@gitlab/ui'; +import { isNumber } from 'lodash'; import { n__ } from '~/locale'; export default { diff --git a/app/assets/javascripts/diffs/components/diff_view.vue b/app/assets/javascripts/diffs/components/diff_view.vue index b710e588360..43cfa22073f 100644 --- a/app/assets/javascripts/diffs/components/diff_view.vue +++ b/app/assets/javascripts/diffs/components/diff_view.vue @@ -1,11 +1,11 @@ <script> import { mapGetters, mapState, mapActions } from 'vuex'; -import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import DraftNote from '~/batch_comments/components/draft_note.vue'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import { getCommentedLines } from '~/notes/components/multiline_comment_utils'; -import DiffRow from './diff_row.vue'; import DiffCommentCell from './diff_comment_cell.vue'; import DiffExpansionCell from './diff_expansion_cell.vue'; +import DiffRow from './diff_row.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/image_diff_overlay.vue b/app/assets/javascripts/diffs/components/image_diff_overlay.vue index 54b491faa2a..3d05202fb2d 100644 --- a/app/assets/javascripts/diffs/components/image_diff_overlay.vue +++ b/app/assets/javascripts/diffs/components/image_diff_overlay.vue @@ -1,7 +1,7 @@ <script> -import { mapActions, mapGetters } from 'vuex'; -import { isArray } from 'lodash'; import { GlIcon } from '@gitlab/ui'; +import { isArray } from 'lodash'; +import { mapActions, mapGetters } from 'vuex'; import imageDiffMixin from 'ee_else_ce/diffs/mixins/image_diff'; function calcPercent(pos, size, renderedSize) { diff --git a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue index 014b1ebe54b..154f2fdcfc7 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { CONTEXT_LINE_CLASS_NAME } from '../constants'; import DiffGutterAvatars from './diff_gutter_avatars.vue'; import { diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index fd4e2004857..e407609d9e9 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -1,12 +1,12 @@ <script> import { mapGetters, mapState } from 'vuex'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import DraftNote from '~/batch_comments/components/draft_note.vue'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import { getCommentedLines } from '~/notes/components/multiline_comment_utils'; -import inlineDiffTableRow from './inline_diff_table_row.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import DiffCommentCell from './diff_comment_cell.vue'; import DiffExpansionCell from './diff_expansion_cell.vue'; +import inlineDiffTableRow from './inline_diff_table_row.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/no_changes.vue b/app/assets/javascripts/diffs/components/no_changes.vue index e0fdbf6ac3a..ab518fcfb16 100644 --- a/app/assets/javascripts/diffs/components/no_changes.vue +++ b/app/assets/javascripts/diffs/components/no_changes.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlButton, GlSprintf } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue index 47eecef2385..3d20dfd0c9b 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue @@ -1,7 +1,7 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; -import $ from 'jquery'; import { GlTooltipDirective, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import $ from 'jquery'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { CONTEXT_LINE_CLASS_NAME, PARALLEL_DIFF_VIEW_TYPE } from '../constants'; import DiffGutterAvatars from './diff_gutter_avatars.vue'; import * as utils from './diff_row_utils'; diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index 21a5eece125..b167081a379 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -1,11 +1,11 @@ <script> import { mapGetters, mapState } from 'vuex'; -import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import DraftNote from '~/batch_comments/components/draft_note.vue'; +import draftCommentsMixin from '~/diffs/mixins/draft_comments'; import { getCommentedLines } from '~/notes/components/multiline_comment_utils'; -import parallelDiffTableRow from './parallel_diff_table_row.vue'; import DiffCommentCell from './diff_comment_cell.vue'; import DiffExpansionCell from './diff_expansion_cell.vue'; +import parallelDiffTableRow from './parallel_diff_table_row.vue'; export default { components: { diff --git a/app/assets/javascripts/diffs/components/settings_dropdown.vue b/app/assets/javascripts/diffs/components/settings_dropdown.vue index 2fe2fd6b3d8..7d74e81257a 100644 --- a/app/assets/javascripts/diffs/components/settings_dropdown.vue +++ b/app/assets/javascripts/diffs/components/settings_dropdown.vue @@ -1,9 +1,9 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButtonGroup, GlButton, GlDropdown, GlFormCheckbox } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; -import eventHub from '../event_hub'; import { EVT_VIEW_FILE_BY_FILE } from '../constants'; +import eventHub from '../event_hub'; import { SETTINGS_DROPDOWN } from '../i18n'; export default { diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 1a258695fa0..39ce849fc03 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { s__, sprintf } from '~/locale'; import FileTree from '~/vue_shared/components/file_tree.vue'; import DiffFileRow from './diff_file_row.vue'; diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js index 4e0720c645a..68fe204d955 100644 --- a/app/assets/javascripts/diffs/index.js +++ b/app/assets/javascripts/diffs/index.js @@ -1,15 +1,14 @@ +import Cookies from 'js-cookie'; import Vue from 'vue'; import { mapActions, mapState, mapGetters } from 'vuex'; -import Cookies from 'js-cookie'; import { parseBoolean } from '~/lib/utils/common_utils'; import FindFile from '~/vue_shared/components/file_finder/index.vue'; import eventHub from '../notes/event_hub'; import diffsApp from './components/app.vue'; -import { getDerivedMergeRequestInformation } from './utils/merge_request'; -import { getReviewsForMergeRequest } from './utils/file_reviews'; - import { TREE_LIST_STORAGE_KEY, DIFF_WHITESPACE_COOKIE_NAME } from './constants'; +import { getReviewsForMergeRequest } from './utils/file_reviews'; +import { getDerivedMergeRequestInformation } from './utils/merge_request'; export default function initDiffsApp(store) { const fileFinderEl = document.getElementById('js-diff-file-finder'); diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 32b4b5c57b4..4b2dc2d45df 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -1,16 +1,14 @@ -import Vue from 'vue'; import Cookies from 'js-cookie'; -import Poll from '~/lib/utils/poll'; -import axios from '~/lib/utils/axios_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; +import Vue from 'vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { __, s__ } from '~/locale'; +import { diffViewerModes } from '~/ide/constants'; +import axios from '~/lib/utils/axios_utils'; import { handleLocationHash, historyPushState, scrollToElement } from '~/lib/utils/common_utils'; +import httpStatusCodes from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; import { mergeUrlParams, getLocationHash } from '~/lib/utils/url_utility'; -import { diffViewerModes } from '~/ide/constants'; -import TreeWorker from '../workers/tree_worker'; +import { __, s__ } from '~/locale'; import notesEventHub from '../../notes/event_hub'; -import eventHub from '../event_hub'; import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE, @@ -39,9 +37,11 @@ import { DIFF_VIEW_ALL_FILES, DIFF_FILE_BY_FILE_COOKIE_NAME, } from '../constants'; +import eventHub from '../event_hub'; import { isCollapsed } from '../utils/diff_file'; -import { getDerivedMergeRequestInformation } from '../utils/merge_request'; import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews'; +import { getDerivedMergeRequestInformation } from '../utils/merge_request'; +import TreeWorker from '../workers/tree_worker'; import * as types from './mutation_types'; import { getDiffPositionByLineCode, diff --git a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js index 3f33b0c900e..01811e60caa 100644 --- a/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js +++ b/app/assets/javascripts/diffs/store/getters_versions_dropdowns.js @@ -1,5 +1,5 @@ -import { __, n__, sprintf } from '~/locale'; import { getParameterByName, parseBoolean } from '~/lib/utils/common_utils'; +import { __, n__, sprintf } from '~/locale'; import { DIFF_COMPARE_BASE_VERSION_INDEX, DIFF_COMPARE_HEAD_VERSION_INDEX } from '../constants'; export const selectedTargetIndex = (state) => diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 9db29e8491e..d06793c05af 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -5,6 +5,7 @@ import { DIFF_FILE_AUTOMATIC_COLLAPSE, INLINE_DIFF_LINES_KEY, } from '../constants'; +import * as types from './mutation_types'; import { findDiffFile, addLineReferences, @@ -14,7 +15,6 @@ import { isDiscussionApplicableToLine, updateLineInFile, } from './utils'; -import * as types from './mutation_types'; function updateDiffFilesInState(state, files) { return Object.assign(state, { diffFiles: files }); diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index c52da558be2..87b4f33c216 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -1,6 +1,6 @@ import { property, isEqual } from 'lodash'; -import { truncatePathMiddleToLength } from '~/lib/utils/text_utility'; import { diffModes, diffViewerModes } from '~/ide/constants'; +import { truncatePathMiddleToLength } from '~/lib/utils/text_utility'; import { LINE_POSITION_LEFT, LINE_POSITION_RIGHT, diff --git a/app/assets/javascripts/diffs/utils/performance.js b/app/assets/javascripts/diffs/utils/performance.js index dcde6f4ecc4..50bf17001a6 100644 --- a/app/assets/javascripts/diffs/utils/performance.js +++ b/app/assets/javascripts/diffs/utils/performance.js @@ -9,7 +9,6 @@ import { MR_DIFFS_MEASURE_DIFF_FILES_DONE, } from '../../performance/constants'; -import eventHub from '../event_hub'; import { EVT_PERF_MARK_FILE_TREE_START, EVT_PERF_MARK_FILE_TREE_END, @@ -17,6 +16,7 @@ import { EVT_PERF_MARK_FIRST_DIFF_FILE_SHOWN, EVT_PERF_MARK_DIFF_FILES_END, } from '../constants'; +import eventHub from '../event_hub'; function treeStart() { performanceMarkAndMeasure({ diff --git a/app/assets/javascripts/diffs/utils/uuids.js b/app/assets/javascripts/diffs/utils/uuids.js index 1fe5f9f6499..98fe4bf9664 100644 --- a/app/assets/javascripts/diffs/utils/uuids.js +++ b/app/assets/javascripts/diffs/utils/uuids.js @@ -12,8 +12,8 @@ */ import { MersenneTwister } from 'fast-mersenne-twister'; -import stringHash from 'string-hash'; import { isString } from 'lodash'; +import stringHash from 'string-hash'; import { v4 } from 'uuid'; function getSeed(seeds) { diff --git a/app/assets/javascripts/dirty_submit/dirty_submit_form.js b/app/assets/javascripts/dirty_submit/dirty_submit_form.js index 54fd5f91194..db13daf0799 100644 --- a/app/assets/javascripts/dirty_submit/dirty_submit_form.js +++ b/app/assets/javascripts/dirty_submit/dirty_submit_form.js @@ -1,5 +1,5 @@ -import { memoize, throttle } from 'lodash'; import $ from 'jquery'; +import { memoize, throttle } from 'lodash'; class DirtySubmitForm { constructor(form) { diff --git a/app/assets/javascripts/droplab/drop_down.js b/app/assets/javascripts/droplab/drop_down.js index f4a0b3ed727..05b741af191 100644 --- a/app/assets/javascripts/droplab/drop_down.js +++ b/app/assets/javascripts/droplab/drop_down.js @@ -1,5 +1,5 @@ -import utils from './utils'; import { SELECTED_CLASS, IGNORE_CLASS } from './constants'; +import utils from './utils'; class DropDown { constructor(list, config = {}) { diff --git a/app/assets/javascripts/droplab/drop_lab.js b/app/assets/javascripts/droplab/drop_lab.js index 537a05aebb9..74fa6887ba5 100644 --- a/app/assets/javascripts/droplab/drop_lab.js +++ b/app/assets/javascripts/droplab/drop_lab.js @@ -1,8 +1,8 @@ +import { DATA_TRIGGER } from './constants'; import HookButton from './hook_button'; import HookInput from './hook_input'; -import utils from './utils'; import Keyboard from './keyboard'; -import { DATA_TRIGGER } from './constants'; +import utils from './utils'; class DropLab { constructor() { diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index 13db9400777..337f7ae2757 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -1,13 +1,13 @@ -import $ from 'jquery'; import Dropzone from 'dropzone'; +import $ from 'jquery'; import { escape } from 'lodash'; import './behaviors/preview_markdown'; -import { n__, __ } from '~/locale'; -import { getFilename } from '~/lib/utils/file_upload'; import { spriteIcon } from '~/lib/utils/common_utils'; +import { getFilename } from '~/lib/utils/file_upload'; +import { n__, __ } from '~/locale'; import PasteMarkdownTable from './behaviors/markdown/paste_markdown_table'; -import csrf from './lib/utils/csrf'; import axios from './lib/utils/axios_utils'; +import csrf from './lib/utils/csrf'; Dropzone.autoDiscover = false; diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js index 72ffbfd62ce..1f57d73d3d3 100644 --- a/app/assets/javascripts/due_date_select.js +++ b/app/assets/javascripts/due_date_select.js @@ -1,12 +1,12 @@ /* eslint-disable max-classes-per-file */ +import dateFormat from 'dateformat'; import $ from 'jquery'; import Pikaday from 'pikaday'; -import dateFormat from 'dateformat'; -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; +import boardsStore from './boards/stores/boards_store'; import axios from './lib/utils/axios_utils'; import { timeFor, parsePikadayDate, pikadayToString } from './lib/utils/datetime_utility'; -import boardsStore from './boards/stores/boards_store'; class DueDateSelect { constructor({ $dropdown, $loading } = {}) { diff --git a/app/assets/javascripts/editor/editor_lite.js b/app/assets/javascripts/editor/editor_lite.js index 9403783c991..79beb3a4857 100644 --- a/app/assets/javascripts/editor/editor_lite.js +++ b/app/assets/javascripts/editor/editor_lite.js @@ -1,17 +1,17 @@ import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor'; -import { DEFAULT_THEME, themes } from '~/ide/lib/themes'; -import languages from '~/ide/lib/languages'; +import { uuids } from '~/diffs/utils/uuids'; import { defaultEditorOptions } from '~/ide/lib/editor_options'; +import languages from '~/ide/lib/languages'; +import { DEFAULT_THEME, themes } from '~/ide/lib/themes'; import { registerLanguages } from '~/ide/utils'; import { joinPaths } from '~/lib/utils/url_utility'; -import { uuids } from '~/diffs/utils/uuids'; -import { clearDomElement } from './utils'; import { EDITOR_LITE_INSTANCE_ERROR_NO_EL, URI_PREFIX, EDITOR_READY_EVENT, EDITOR_TYPE_DIFF, } from './constants'; +import { clearDomElement } from './utils'; export default class EditorLite { constructor(options = {}) { diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js index 73820b4e429..d022fcbeabe 100644 --- a/app/assets/javascripts/emoji/index.js +++ b/app/assets/javascripts/emoji/index.js @@ -1,7 +1,7 @@ import { escape, minBy } from 'lodash'; import emojiAliases from 'emojis/aliases.json'; -import axios from '../lib/utils/axios_utils'; import AccessorUtilities from '../lib/utils/accessor'; +import axios from '../lib/utils/axios_utils'; let emojiMap = null; let validEmojiNames = null; diff --git a/app/assets/javascripts/environments/components/canary_ingress.vue b/app/assets/javascripts/environments/components/canary_ingress.vue index f8cdbb96bc2..02d660a91c1 100644 --- a/app/assets/javascripts/environments/components/canary_ingress.vue +++ b/app/assets/javascripts/environments/components/canary_ingress.vue @@ -1,6 +1,6 @@ <script> -import { uniqueId } from 'lodash'; import { GlDropdown, GlDropdownItem, GlModalDirective as GlModal } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; import { s__ } from '~/locale'; import { CANARY_UPDATE_MODAL } from '../constants'; diff --git a/app/assets/javascripts/environments/components/canary_update_modal.vue b/app/assets/javascripts/environments/components/canary_update_modal.vue index fc63d6272c8..8b1121c7158 100644 --- a/app/assets/javascripts/environments/components/canary_update_modal.vue +++ b/app/assets/javascripts/environments/components/canary_update_modal.vue @@ -1,8 +1,8 @@ <script> import { GlAlert, GlModal, GlSprintf } from '@gitlab/ui'; import { __, s__ } from '~/locale'; -import updateCanaryIngress from '../graphql/mutations/update_canary_ingress.mutation.graphql'; import { CANARY_UPDATE_MODAL } from '../constants'; +import updateCanaryIngress from '../graphql/mutations/update_canary_ingress.mutation.graphql'; export default { components: { diff --git a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue index b2a8571820b..76ad74e04d0 100644 --- a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue +++ b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue @@ -4,8 +4,8 @@ * Render modal to confirm rollback/redeploy. */ -import { escape } from 'lodash'; import { GlModal } from '@gitlab/ui'; +import { escape } from 'lodash'; import { s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/environments/components/deploy_board.vue b/app/assets/javascripts/environments/components/deploy_board.vue index 9249ea53a84..f9c4660036b 100644 --- a/app/assets/javascripts/environments/components/deploy_board.vue +++ b/app/assets/javascripts/environments/components/deploy_board.vue @@ -9,7 +9,7 @@ * - Button Actions. * [Mockup](https://gitlab.com/gitlab-org/gitlab-foss/uploads/2f655655c0eadf655d0ae7467b53002a/environments__deploy-graphic.png) */ -import { isEmpty } from 'lodash'; +import deployBoardSvg from '@gitlab/svgs/dist/illustrations/deploy-boards.svg'; import { GlIcon, GlLoadingIcon, @@ -18,9 +18,9 @@ import { GlTooltipDirective, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; -import deployBoardSvg from '@gitlab/svgs/dist/illustrations/deploy-boards.svg'; -import instanceComponent from '~/vue_shared/components/deployment_instance.vue'; +import { isEmpty } from 'lodash'; import { n__ } from '~/locale'; +import instanceComponent from '~/vue_shared/components/deployment_instance.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { STATUS_MAP, CANARY_STATUS } from '../constants'; import CanaryIngress from './canary_ingress.vue'; diff --git a/app/assets/javascripts/environments/components/enable_review_app_modal.vue b/app/assets/javascripts/environments/components/enable_review_app_modal.vue index 3dd1d5a1bcc..2494968857c 100644 --- a/app/assets/javascripts/environments/components/enable_review_app_modal.vue +++ b/app/assets/javascripts/environments/components/enable_review_app_modal.vue @@ -1,7 +1,7 @@ <script> import { GlLink, GlModal, GlSprintf } from '@gitlab/ui'; -import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; import { s__ } from '~/locale'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; export default { components: { diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue index 2192d456861..8911380290a 100644 --- a/app/assets/javascripts/environments/components/environment_actions.vue +++ b/app/assets/javascripts/environments/components/environment_actions.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlIcon, GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import { formatTime } from '~/lib/utils/datetime_utility'; +import { __, s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/environments/components/environment_delete.vue b/app/assets/javascripts/environments/components/environment_delete.vue index 0dea04f7c7d..4b7917b4572 100644 --- a/app/assets/javascripts/environments/components/environment_delete.vue +++ b/app/assets/javascripts/environments/components/environment_delete.vue @@ -5,8 +5,8 @@ */ import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { s__ } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index cc55c05b08b..4db0dff16aa 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -1,22 +1,22 @@ <script> /* eslint-disable @gitlab/vue-require-i18n-strings */ -import { isEmpty } from 'lodash'; import { GlTooltipDirective, GlIcon, GlLink } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; +import { isEmpty } from 'lodash'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import { __, s__, sprintf } from '~/locale'; +import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CommitComponent from '~/vue_shared/components/commit.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; import eventHub from '../event_hub'; import ActionsComponent from './environment_actions.vue'; +import DeleteComponent from './environment_delete.vue'; import ExternalUrlComponent from './environment_external_url.vue'; import MonitoringButtonComponent from './environment_monitoring.vue'; import PinComponent from './environment_pin.vue'; -import DeleteComponent from './environment_delete.vue'; -import StopComponent from './environment_stop.vue'; import RollbackComponent from './environment_rollback.vue'; +import StopComponent from './environment_stop.vue'; import TerminalButtonComponent from './environment_terminal_button.vue'; /** diff --git a/app/assets/javascripts/environments/components/environment_stop.vue b/app/assets/javascripts/environments/components/environment_stop.vue index adb0b05d002..dceaf3cacf1 100644 --- a/app/assets/javascripts/environments/components/environment_stop.vue +++ b/app/assets/javascripts/environments/components/environment_stop.vue @@ -5,8 +5,8 @@ */ import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { s__ } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index 09fe00a4042..ed852895f10 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -5,11 +5,11 @@ import { s__ } from '~/locale'; import eventHub from '../event_hub'; import environmentsMixin from '../mixins/environments_mixin'; import EnvironmentsPaginationApiMixin from '../mixins/environments_pagination_api_mixin'; +import ConfirmRollbackModal from './confirm_rollback_modal.vue'; +import DeleteEnvironmentModal from './delete_environment_modal.vue'; import emptyState from './empty_state.vue'; import EnableReviewAppModal from './enable_review_app_modal.vue'; import StopEnvironmentModal from './stop_environment_modal.vue'; -import DeleteEnvironmentModal from './delete_environment_modal.vue'; -import ConfirmRollbackModal from './confirm_rollback_modal.vue'; export default { i18n: { diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue index c6a7fe1f57d..cbce887f491 100644 --- a/app/assets/javascripts/environments/components/environments_table.vue +++ b/app/assets/javascripts/environments/components/environments_table.vue @@ -5,9 +5,9 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { flow, reverse, sortBy } from 'lodash/fp'; import { s__ } from '~/locale'; -import EnvironmentItem from './environment_item.vue'; -import DeployBoard from './deploy_board.vue'; import CanaryUpdateModal from './canary_update_modal.vue'; +import DeployBoard from './deploy_board.vue'; +import EnvironmentItem from './environment_item.vue'; export default { components: { diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.vue b/app/assets/javascripts/environments/folder/environments_folder_view.vue index 7dc6c1b36ec..8070f3f12f8 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.vue +++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue @@ -1,9 +1,9 @@ <script> import { GlBadge, GlTab, GlTabs } from '@gitlab/ui'; +import DeleteEnvironmentModal from '../components/delete_environment_modal.vue'; +import StopEnvironmentModal from '../components/stop_environment_modal.vue'; import environmentsMixin from '../mixins/environments_mixin'; import EnvironmentsPaginationApiMixin from '../mixins/environments_pagination_api_mixin'; -import StopEnvironmentModal from '../components/stop_environment_modal.vue'; -import DeleteEnvironmentModal from '../components/delete_environment_modal.vue'; export default { components: { diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js index 15a00c11ee6..d5caff1660a 100644 --- a/app/assets/javascripts/environments/mixins/environments_mixin.js +++ b/app/assets/javascripts/environments/mixins/environments_mixin.js @@ -3,18 +3,18 @@ */ import { isEqual, isFunction, omitBy } from 'lodash'; import Visibility from 'visibilityjs'; -import EnvironmentsStore from '../stores/environments_store'; -import Poll from '../../lib/utils/poll'; +import { deprecatedCreateFlash as Flash } from '../../flash'; import { getParameterByName } from '../../lib/utils/common_utils'; +import Poll from '../../lib/utils/poll'; import { s__ } from '../../locale'; -import { deprecatedCreateFlash as Flash } from '../../flash'; +import tabs from '../../vue_shared/components/navigation_tabs.vue'; +import tablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; +import container from '../components/container.vue'; +import environmentTable from '../components/environments_table.vue'; import eventHub from '../event_hub'; import EnvironmentsService from '../services/environments_service'; -import tablePagination from '../../vue_shared/components/pagination/table_pagination.vue'; -import environmentTable from '../components/environments_table.vue'; -import tabs from '../../vue_shared/components/navigation_tabs.vue'; -import container from '../components/container.vue'; +import EnvironmentsStore from '../stores/environments_store'; export default { components: { 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 { diff --git a/app/assets/javascripts/error_tracking_settings/components/app.vue b/app/assets/javascripts/error_tracking_settings/components/app.vue index 786abc8ce49..971eb21ee3b 100644 --- a/app/assets/javascripts/error_tracking_settings/components/app.vue +++ b/app/assets/javascripts/error_tracking_settings/components/app.vue @@ -1,8 +1,8 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; -import ProjectDropdown from './project_dropdown.vue'; +import { mapActions, mapGetters, mapState } from 'vuex'; import ErrorTrackingForm from './error_tracking_form.vue'; +import ProjectDropdown from './project_dropdown.vue'; export default { components: { ProjectDropdown, ErrorTrackingForm, GlButton }, diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue index b1b699d2e2a..dbcda0877b4 100644 --- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue +++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlFormInput, GlIcon, GlButton } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; export default { components: { GlFormInput, GlIcon, GlButton }, diff --git a/app/assets/javascripts/error_tracking_settings/store/actions.js b/app/assets/javascripts/error_tracking_settings/store/actions.js index 2821798f82d..7eb684fb52c 100644 --- a/app/assets/javascripts/error_tracking_settings/store/actions.js +++ b/app/assets/javascripts/error_tracking_settings/store/actions.js @@ -1,7 +1,7 @@ -import { __ } from '~/locale'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { __ } from '~/locale'; import { transformFrontendSettings } from '../utils'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/error_tracking_settings/store/index.js b/app/assets/javascripts/error_tracking_settings/store/index.js index 560f265a2ea..1cd6d119657 100644 --- a/app/assets/javascripts/error_tracking_settings/store/index.js +++ b/app/assets/javascripts/error_tracking_settings/store/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/feature_flags/components/environments_dropdown.vue b/app/assets/javascripts/feature_flags/components/environments_dropdown.vue index 88f1e692f5f..7f316d20f9c 100644 --- a/app/assets/javascripts/feature_flags/components/environments_dropdown.vue +++ b/app/assets/javascripts/feature_flags/components/environments_dropdown.vue @@ -1,9 +1,9 @@ <script> -import { debounce } from 'lodash'; import { GlButton, GlSearchBoxByType } from '@gitlab/ui'; +import { debounce } from 'lodash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; /** * Creates a searchable input for environments. diff --git a/app/assets/javascripts/feature_flags/components/feature_flags.vue b/app/assets/javascripts/feature_flags/components/feature_flags.vue index 8a0b388b0aa..348b71dc1c6 100644 --- a/app/assets/javascripts/feature_flags/components/feature_flags.vue +++ b/app/assets/javascripts/feature_flags/components/feature_flags.vue @@ -1,21 +1,20 @@ <script> -import { mapState, mapActions } from 'vuex'; -import { isEmpty } from 'lodash'; import { GlAlert, GlButton, GlModalDirective, GlSprintf, GlTabs } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; +import { mapState, mapActions } from 'vuex'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { buildUrlWithCurrentLocation, getParameterByName, historyPushState, } from '~/lib/utils/common_utils'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '../constants'; +import ConfigureFeatureFlagsModal from './configure_feature_flags_modal.vue'; import FeatureFlagsTab from './feature_flags_tab.vue'; import FeatureFlagsTable from './feature_flags_table.vue'; import UserListsTable from './user_lists_table.vue'; -import ConfigureFeatureFlagsModal from './configure_feature_flags_modal.vue'; - const SCOPES = { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE }; export default { diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue index 1e5d8e219d2..f6a14d9996f 100644 --- a/app/assets/javascripts/feature_flags/components/form.vue +++ b/app/assets/javascripts/feature_flags/components/form.vue @@ -1,6 +1,4 @@ <script> -import Vue from 'vue'; -import { memoize, isString, cloneDeep, isNumber, uniqueId } from 'lodash'; import { GlButton, GlBadge, @@ -12,8 +10,10 @@ import { GlIcon, GlToggle, } from '@gitlab/ui'; -import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue'; +import { memoize, isString, cloneDeep, isNumber, uniqueId } from 'lodash'; +import Vue from 'vue'; import { s__ } from '~/locale'; +import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue'; import featureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { ROLLOUT_STRATEGY_ALL_USERS, diff --git a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue index f2017c22abf..efe4ff71a9e 100644 --- a/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue +++ b/app/assets/javascripts/feature_flags/components/new_environments_dropdown.vue @@ -1,5 +1,4 @@ <script> -import { debounce } from 'lodash'; import { GlDropdown, GlDropdownDivider, @@ -8,9 +7,10 @@ import { GlLoadingIcon, GlSearchBoxByType, } from '@gitlab/ui'; +import { debounce } from 'lodash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; export default { components: { diff --git a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue index 6a57e9a8759..45fc37da747 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue @@ -1,7 +1,7 @@ <script> +import { GlDropdown, GlDropdownItem, GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; import { debounce } from 'lodash'; import { createNamespacedHelpers } from 'vuex'; -import { GlDropdown, GlDropdownItem, GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; import { s__ } from '~/locale'; import ParameterFormGroup from './parameter_form_group.vue'; diff --git a/app/assets/javascripts/feature_flags/components/strategies/parameter_form_group.vue b/app/assets/javascripts/feature_flags/components/strategies/parameter_form_group.vue index 7f2c6d55db8..822ff92b405 100644 --- a/app/assets/javascripts/feature_flags/components/strategies/parameter_form_group.vue +++ b/app/assets/javascripts/feature_flags/components/strategies/parameter_form_group.vue @@ -1,6 +1,6 @@ <script> -import { uniqueId } from 'lodash'; import { GlFormGroup } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; export default { components: { diff --git a/app/assets/javascripts/feature_flags/components/strategy.vue b/app/assets/javascripts/feature_flags/components/strategy.vue index 9593bcf6487..170f120b036 100644 --- a/app/assets/javascripts/feature_flags/components/strategy.vue +++ b/app/assets/javascripts/feature_flags/components/strategy.vue @@ -1,7 +1,7 @@ <script> -import Vue from 'vue'; -import { isNumber } from 'lodash'; import { GlAlert, GlButton, GlFormSelect, GlFormGroup, GlIcon, GlLink, GlToken } from '@gitlab/ui'; +import { isNumber } from 'lodash'; +import Vue from 'vue'; import { s__, __ } from '~/locale'; import { EMPTY_PARAMETERS, diff --git a/app/assets/javascripts/feature_flags/components/strategy_parameters.vue b/app/assets/javascripts/feature_flags/components/strategy_parameters.vue index a22f081bb92..ded91621cb8 100644 --- a/app/assets/javascripts/feature_flags/components/strategy_parameters.vue +++ b/app/assets/javascripts/feature_flags/components/strategy_parameters.vue @@ -9,9 +9,9 @@ import { import Default from './strategies/default.vue'; import FlexibleRollout from './strategies/flexible_rollout.vue'; +import GitlabUserList from './strategies/gitlab_user_list.vue'; import PercentRollout from './strategies/percent_rollout.vue'; import UsersWithId from './strategies/users_with_id.vue'; -import GitlabUserList from './strategies/gitlab_user_list.vue'; const STRATEGIES = Object.freeze({ [ROLLOUT_STRATEGY_ALL_USERS]: Default, diff --git a/app/assets/javascripts/feature_flags/edit.js b/app/assets/javascripts/feature_flags/edit.js index 05a9bbce654..010674592f8 100644 --- a/app/assets/javascripts/feature_flags/edit.js +++ b/app/assets/javascripts/feature_flags/edit.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; import { parseBoolean } from '~/lib/utils/common_utils'; -import createStore from './store/edit'; import EditFeatureFlag from './components/edit_feature_flag.vue'; +import createStore from './store/edit'; Vue.use(Vuex); diff --git a/app/assets/javascripts/feature_flags/new.js b/app/assets/javascripts/feature_flags/new.js index 8e18213cc03..f763b12fedb 100644 --- a/app/assets/javascripts/feature_flags/new.js +++ b/app/assets/javascripts/feature_flags/new.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; import { parseBoolean } from '~/lib/utils/common_utils'; -import createStore from './store/new'; import NewFeatureFlag from './components/new_feature_flag.vue'; +import createStore from './store/new'; Vue.use(Vuex); diff --git a/app/assets/javascripts/feature_flags/store/edit/actions.js b/app/assets/javascripts/feature_flags/store/edit/actions.js index 3ff7dac96e8..72b17333832 100644 --- a/app/assets/javascripts/feature_flags/store/edit/actions.js +++ b/app/assets/javascripts/feature_flags/store/edit/actions.js @@ -1,6 +1,6 @@ +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __ } from '~/locale'; import { NEW_VERSION_FLAG } from '../../constants'; import { mapFromScopesViewModel, mapStrategiesToRails } from '../helpers'; diff --git a/app/assets/javascripts/feature_flags/store/edit/index.js b/app/assets/javascripts/feature_flags/store/edit/index.js index 65ea61c3025..16b8a5ae970 100644 --- a/app/assets/javascripts/feature_flags/store/edit/index.js +++ b/app/assets/javascripts/feature_flags/store/edit/index.js @@ -1,8 +1,8 @@ import Vuex from 'vuex'; import userLists from '../gitlab_user_list'; -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default (data) => new Vuex.Store({ diff --git a/app/assets/javascripts/feature_flags/store/edit/mutations.js b/app/assets/javascripts/feature_flags/store/edit/mutations.js index 777013a2b7d..0a610f4b395 100644 --- a/app/assets/javascripts/feature_flags/store/edit/mutations.js +++ b/app/assets/javascripts/feature_flags/store/edit/mutations.js @@ -1,5 +1,5 @@ -import { mapToScopesViewModel, mapStrategiesToViewModel } from '../helpers'; import { LEGACY_FLAG } from '../../constants'; +import { mapToScopesViewModel, mapStrategiesToViewModel } from '../helpers'; import * as types from './mutation_types'; export default { diff --git a/app/assets/javascripts/feature_flags/store/gitlab_user_list/index.js b/app/assets/javascripts/feature_flags/store/gitlab_user_list/index.js index 5f2726770d5..8a38f068609 100644 --- a/app/assets/javascripts/feature_flags/store/gitlab_user_list/index.js +++ b/app/assets/javascripts/feature_flags/store/gitlab_user_list/index.js @@ -1,7 +1,7 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; import * as getters from './getters'; +import mutations from './mutations'; +import state from './state'; export default (data) => ({ state: state(data), diff --git a/app/assets/javascripts/feature_flags/store/gitlab_user_list/mutations.js b/app/assets/javascripts/feature_flags/store/gitlab_user_list/mutations.js index bd7c6f68009..31e67a47541 100644 --- a/app/assets/javascripts/feature_flags/store/gitlab_user_list/mutations.js +++ b/app/assets/javascripts/feature_flags/store/gitlab_user_list/mutations.js @@ -1,5 +1,5 @@ -import statuses from './status'; import * as types from './mutation_types'; +import statuses from './status'; export default { [types.FETCH_USER_LISTS](state) { diff --git a/app/assets/javascripts/feature_flags/store/index/index.js b/app/assets/javascripts/feature_flags/store/index/index.js index 76495a33232..96ccb35fa21 100644 --- a/app/assets/javascripts/feature_flags/store/index/index.js +++ b/app/assets/javascripts/feature_flags/store/index/index.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default (data) => new Vuex.Store({ diff --git a/app/assets/javascripts/feature_flags/store/new/index.js b/app/assets/javascripts/feature_flags/store/new/index.js index 65ea61c3025..16b8a5ae970 100644 --- a/app/assets/javascripts/feature_flags/store/new/index.js +++ b/app/assets/javascripts/feature_flags/store/new/index.js @@ -1,8 +1,8 @@ import Vuex from 'vuex'; import userLists from '../gitlab_user_list'; -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default (data) => new Vuex.Store({ diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js index fabc905d756..0f460a83c07 100644 --- a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js +++ b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js @@ -1,8 +1,8 @@ import $ from 'jquery'; -import axios from '../lib/utils/axios_utils'; -import { __ } from '../locale'; import { deprecatedCreateFlash as Flash } from '../flash'; import LazyLoader from '../lazy_loader'; +import axios from '../lib/utils/axios_utils'; +import { __ } from '../locale'; import { togglePopover } from '../shared/popover'; export const getSelector = (highlightId) => `.js-feature-highlight[data-highlight=${highlightId}]`; diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue index 879427eef96..2fd92a1bb11 100644 --- a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue +++ b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue @@ -1,4 +1,5 @@ <script> +import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg'; import { GlPopover, GlSprintf, @@ -6,10 +7,9 @@ import { GlButton, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; -import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg'; import { __ } from '~/locale'; -import { dismiss } from './feature_highlight_helper'; import { POPOVER_TARGET_ID } from './constants'; +import { dismiss } from './feature_highlight_helper'; export default { components: { diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js index 43365ba8613..409b4ccbcfa 100644 --- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js +++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js @@ -1,12 +1,12 @@ import { mergeUrlParams } from '../lib/utils/url_utility'; +import DropdownAjaxFilter from './dropdown_ajax_filter'; +import DropdownEmoji from './dropdown_emoji'; import DropdownHint from './dropdown_hint'; -import DropdownUser from './dropdown_user'; import DropdownNonUser from './dropdown_non_user'; -import DropdownEmoji from './dropdown_emoji'; -import NullDropdown from './null_dropdown'; -import DropdownAjaxFilter from './dropdown_ajax_filter'; import DropdownOperator from './dropdown_operator'; +import DropdownUser from './dropdown_user'; import DropdownUtils from './dropdown_utils'; +import NullDropdown from './null_dropdown'; export default class AvailableDropdownMappings { constructor({ diff --git a/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js b/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js index 99e510ba0c9..e317700b09b 100644 --- a/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js +++ b/app/assets/javascripts/filtered_search/dropdown_ajax_filter.js @@ -1,8 +1,8 @@ import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '../flash'; import AjaxFilter from '../droplab/plugins/ajax_filter'; -import FilteredSearchDropdown from './filtered_search_dropdown'; +import { deprecatedCreateFlash as createFlash } from '../flash'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchDropdown from './filtered_search_dropdown'; import FilteredSearchTokenizer from './filtered_search_tokenizer'; export default class DropdownAjaxFilter extends FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js index 8fb483162f1..a22430833a3 100644 --- a/app/assets/javascripts/filtered_search/dropdown_emoji.js +++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -1,9 +1,9 @@ import { __ } from '~/locale'; -import { deprecatedCreateFlash as Flash } from '../flash'; import Ajax from '../droplab/plugins/ajax'; import Filter from '../droplab/plugins/filter'; -import FilteredSearchDropdown from './filtered_search_dropdown'; +import { deprecatedCreateFlash as Flash } from '../flash'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchDropdown from './filtered_search_dropdown'; export default class DropdownEmoji extends FilteredSearchDropdown { constructor(options = {}) { diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 6ab4015eb80..47f350dc6a2 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,7 +1,7 @@ import Filter from '~/droplab/plugins/filter'; import { __ } from '~/locale'; -import FilteredSearchDropdown from './filtered_search_dropdown'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchDropdown from './filtered_search_dropdown'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index 36c756d6a49..4df1120f169 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,9 +1,9 @@ import { __ } from '~/locale'; -import { deprecatedCreateFlash as Flash } from '../flash'; import Ajax from '../droplab/plugins/ajax'; import Filter from '../droplab/plugins/filter'; -import FilteredSearchDropdown from './filtered_search_dropdown'; +import { deprecatedCreateFlash as Flash } from '../flash'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchDropdown from './filtered_search_dropdown'; export default class DropdownNonUser extends FilteredSearchDropdown { constructor(options = {}) { diff --git a/app/assets/javascripts/filtered_search/dropdown_operator.js b/app/assets/javascripts/filtered_search/dropdown_operator.js index 8fee3385de1..0da8cd0ad83 100644 --- a/app/assets/javascripts/filtered_search/dropdown_operator.js +++ b/app/assets/javascripts/filtered_search/dropdown_operator.js @@ -1,7 +1,7 @@ import Filter from '~/droplab/plugins/filter'; import { __ } from '~/locale'; -import FilteredSearchDropdown from './filtered_search_dropdown'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchDropdown from './filtered_search_dropdown'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js b/app/assets/javascripts/filtered_search/dropdown_utils.js index 22c98f360ed..c98d1f8e064 100644 --- a/app/assets/javascripts/filtered_search/dropdown_utils.js +++ b/app/assets/javascripts/filtered_search/dropdown_utils.js @@ -1,7 +1,7 @@ import { last } from 'lodash'; import FilteredSearchContainer from './container'; -import FilteredSearchTokenizer from './filtered_search_tokenizer'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; +import FilteredSearchTokenizer from './filtered_search_tokenizer'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; export default class DropdownUtils { diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js index 7434cc4c5d1..fcc7caa9ff2 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js @@ -1,7 +1,7 @@ +import { FILTER_TYPE } from './constants'; import DropdownUtils from './dropdown_utils'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; -import { FILTER_TYPE } from './constants'; const DATA_DROPDOWN_TRIGGER = 'data-dropdown-trigger'; diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 3c630c26bc7..ebaa3ef98b1 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,11 +1,11 @@ import { last } from 'lodash'; import AvailableDropdownMappings from 'ee_else_ce/filtered_search/available_dropdown_mappings'; import DropLab from '~/droplab/drop_lab'; +import { DROPDOWN_TYPE } from './constants'; import FilteredSearchContainer from './container'; -import FilteredSearchTokenKeys from './filtered_search_token_keys'; import DropdownUtils from './dropdown_utils'; +import FilteredSearchTokenKeys from './filtered_search_token_keys'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; -import { DROPDOWN_TYPE } from './constants'; export default class FilteredSearchDropdownManager { constructor({ diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index 755e60dd7d2..69d19074cd0 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -1,7 +1,7 @@ import { last } from 'lodash'; import recentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys'; -import { getParameterByName, getUrlParamsArray } from '~/lib/utils/common_utils'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import { getParameterByName, getUrlParamsArray } from '~/lib/utils/common_utils'; import { ENTER_KEY_CODE, BACKSPACE_KEY_CODE, @@ -10,18 +10,18 @@ import { DOWN_KEY_CODE, } from '~/lib/utils/keycodes'; import { __ } from '~/locale'; -import { visitUrl } from '../lib/utils/url_utility'; import { deprecatedCreateFlash as Flash } from '../flash'; import { addClassIfElementExists } from '../lib/utils/dom_utils'; +import { visitUrl } from '../lib/utils/url_utility'; import FilteredSearchContainer from './container'; -import RecentSearchesRoot from './recent_searches_root'; -import RecentSearchesStore from './stores/recent_searches_store'; -import RecentSearchesService from './services/recent_searches_service'; +import DropdownUtils from './dropdown_utils'; import eventHub from './event_hub'; -import FilteredSearchTokenizer from './filtered_search_tokenizer'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; +import FilteredSearchTokenizer from './filtered_search_tokenizer'; import FilteredSearchVisualTokens from './filtered_search_visual_tokens'; -import DropdownUtils from './dropdown_utils'; +import RecentSearchesRoot from './recent_searches_root'; +import RecentSearchesService from './services/recent_searches_service'; +import RecentSearchesStore from './stores/recent_searches_store'; export default class FilteredSearchManager { constructor({ diff --git a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js index 92899de7e8e..eec4db41b0a 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js +++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js @@ -1,6 +1,6 @@ import { objectToQueryString, spriteIcon } from '~/lib/utils/common_utils'; -import VisualTokenValue from './visual_token_value'; import FilteredSearchContainer from './container'; +import VisualTokenValue from './visual_token_value'; export default class FilteredSearchVisualTokens { static permissibleOperatorValues = ['=', '!=']; diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js index 0d36126943b..7f4445ad4c7 100644 --- a/app/assets/javascripts/filtered_search/visual_token_value.js +++ b/app/assets/javascripts/filtered_search/visual_token_value.js @@ -1,13 +1,13 @@ import { escape } from 'lodash'; import { USER_TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants'; +import * as Emoji from '~/emoji'; import FilteredSearchContainer from '~/filtered_search/container'; -import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens'; -import AjaxCache from '~/lib/utils/ajax_cache'; import DropdownUtils from '~/filtered_search/dropdown_utils'; +import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import AjaxCache from '~/lib/utils/ajax_cache'; import UsersCache from '~/lib/utils/users_cache'; import { __ } from '~/locale'; -import * as Emoji from '~/emoji'; export default class VisualTokenValue { constructor(tokenValue, tokenType, tokenOperator) { diff --git a/app/assets/javascripts/frequent_items/components/app.vue b/app/assets/javascripts/frequent_items/components/app.vue index 68cc8645813..69f89aa3857 100644 --- a/app/assets/javascripts/frequent_items/components/app.vue +++ b/app/assets/javascripts/frequent_items/components/app.vue @@ -1,13 +1,13 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import AccessorUtilities from '~/lib/utils/accessor'; -import eventHub from '../event_hub'; import { FREQUENT_ITEMS, STORAGE_KEY } from '../constants'; +import eventHub from '../event_hub'; import { isMobile, updateExistingFrequentItem, sanitizeItem } from '../utils'; -import FrequentItemsSearchInput from './frequent_items_search_input.vue'; import FrequentItemsList from './frequent_items_list.vue'; import frequentItemsMixin from './frequent_items_mixin'; +import FrequentItemsSearchInput from './frequent_items_search_input.vue'; export default { components: { diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue index 3260d768fd9..6f17e6a5282 100644 --- a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue +++ b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/require-default-prop, vue/no-v-html */ import { mapState } from 'vuex'; -import Identicon from '~/vue_shared/components/identicon.vue'; import highlight from '~/lib/utils/highlight'; import { truncateNamespace } from '~/lib/utils/text_utility'; import Tracking from '~/tracking'; +import Identicon from '~/vue_shared/components/identicon.vue'; const trackingMixin = Tracking.mixin(); diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_search_input.vue b/app/assets/javascripts/frequent_items/components/frequent_items_search_input.vue index f2c8fb1036d..b0972246e70 100644 --- a/app/assets/javascripts/frequent_items/components/frequent_items_search_input.vue +++ b/app/assets/javascripts/frequent_items/components/frequent_items_search_input.vue @@ -1,7 +1,7 @@ <script> +import { GlSearchBoxByType } from '@gitlab/ui'; import { debounce } from 'lodash'; import { mapActions, mapState } from 'vuex'; -import { GlSearchBoxByType } from '@gitlab/ui'; import Tracking from '~/tracking'; import frequentItemsMixin from './frequent_items_mixin'; diff --git a/app/assets/javascripts/frequent_items/index.js b/app/assets/javascripts/frequent_items/index.js index ab36189c239..eb8a404e8a5 100644 --- a/app/assets/javascripts/frequent_items/index.js +++ b/app/assets/javascripts/frequent_items/index.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { createStore } from '~/frequent_items/store'; +import Translate from '~/vue_shared/translate'; import eventHub from './event_hub'; Vue.use(Translate); diff --git a/app/assets/javascripts/frequent_items/utils.js b/app/assets/javascripts/frequent_items/utils.js index 63fe0ef20b0..88519d934cb 100644 --- a/app/assets/javascripts/frequent_items/utils.js +++ b/app/assets/javascripts/frequent_items/utils.js @@ -1,5 +1,5 @@ -import { take } from 'lodash'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { take } from 'lodash'; import { sanitize } from '~/lib/dompurify'; import { FREQUENT_ITEMS, HOUR_IN_MS } from './constants'; diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 949540d38d4..d209a971c39 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import '~/lib/utils/jquery_at_who'; import { escape, template } from 'lodash'; +import * as Emoji from '~/emoji'; +import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; -import SidebarMediator from '~/sidebar/sidebar_mediator'; import { isUserBusy } from '~/set_status_modal/utils'; -import axios from '~/lib/utils/axios_utils'; -import * as Emoji from '~/emoji'; -import glRegexp from './lib/utils/regexp'; +import SidebarMediator from '~/sidebar/sidebar_mediator'; import AjaxCache from './lib/utils/ajax_cache'; import { spriteIcon } from './lib/utils/common_utils'; +import glRegexp from './lib/utils/regexp'; function sanitize(str) { return str.replace(/<(?:.|\n)*?>/gm, ''); diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index bb5dea877b8..3a04779e48d 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import autosize from 'autosize'; +import $ from 'jquery'; import GfmAutoComplete, { defaultAutocompleteConfig } from 'ee_else_ce/gfm_auto_complete'; import { disableButtonIfEmptyField } from '~/lib/utils/common_utils'; import dropzoneInput from './dropzone_input'; diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js index 3a8ae56bb8f..cde2cd6d6ab 100644 --- a/app/assets/javascripts/gpg_badges.js +++ b/app/assets/javascripts/gpg_badges.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { parseQueryStringIntoObject } from '~/lib/utils/common_utils'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { parseQueryStringIntoObject } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; export default class GpgBadges { diff --git a/app/assets/javascripts/grafana_integration/index.js b/app/assets/javascripts/grafana_integration/index.js index a93edab4388..208a92c97c7 100644 --- a/app/assets/javascripts/grafana_integration/index.js +++ b/app/assets/javascripts/grafana_integration/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import store from './store'; import GrafanaIntegration from './components/grafana_integration.vue'; +import store from './store'; export default () => { const el = document.querySelector('.js-grafana-integration'); diff --git a/app/assets/javascripts/grafana_integration/store/actions.js b/app/assets/javascripts/grafana_integration/store/actions.js index 436f92eae84..7c5d4695731 100644 --- a/app/assets/javascripts/grafana_integration/store/actions.js +++ b/app/assets/javascripts/grafana_integration/store/actions.js @@ -1,7 +1,7 @@ -import axios from '~/lib/utils/axios_utils'; -import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import * as mutationTypes from './mutation_types'; export const setGrafanaUrl = ({ commit }, url) => commit(mutationTypes.SET_GRAFANA_URL, url); diff --git a/app/assets/javascripts/grafana_integration/store/index.js b/app/assets/javascripts/grafana_integration/store/index.js index e3dcfd31a83..a11bd8089fd 100644 --- a/app/assets/javascripts/grafana_integration/store/index.js +++ b/app/assets/javascripts/grafana_integration/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/group.js b/app/assets/javascripts/group.js index 29ddd0c5fef..39c8a88d485 100644 --- a/app/assets/javascripts/group.js +++ b/app/assets/javascripts/group.js @@ -1,6 +1,6 @@ -import fetchGroupPathAvailability from '~/pages/groups/new/fetch_group_path_availability'; import { deprecatedCreateFlash as flash } from '~/flash'; import { __ } from '~/locale'; +import fetchGroupPathAvailability from '~/pages/groups/new/fetch_group_path_availability'; import { slugify } from './lib/utils/text_utility'; export default class Group { diff --git a/app/assets/javascripts/group_label_subscription.js b/app/assets/javascripts/group_label_subscription.js index 9e846b88a11..257f5ac9658 100644 --- a/app/assets/javascripts/group_label_subscription.js +++ b/app/assets/javascripts/group_label_subscription.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { __ } from '~/locale'; import { fixTitle, hide } from '~/tooltips'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from './flash'; +import axios from './lib/utils/axios_utils'; const tooltipTitles = { group: __('Unsubscribe at group level'), diff --git a/app/assets/javascripts/group_settings/components/shared_runners_form.vue b/app/assets/javascripts/group_settings/components/shared_runners_form.vue index d6ed08a9407..a1d706f0f66 100644 --- a/app/assets/javascripts/group_settings/components/shared_runners_form.vue +++ b/app/assets/javascripts/group_settings/components/shared_runners_form.vue @@ -1,8 +1,8 @@ <script> import { GlToggle, GlLoadingIcon, GlTooltip, GlAlert } from '@gitlab/ui'; import { debounce } from 'lodash'; -import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; import { DEBOUNCE_TOGGLE_DELAY, ERROR_MESSAGE, diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index 4f26bab8bd3..9d2c7cfe581 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -2,13 +2,13 @@ /* global Flash */ import { GlLoadingIcon, GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; -import { HIDDEN_CLASS } from '~/lib/utils/constants'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { HIDDEN_CLASS } from '~/lib/utils/constants'; import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { __, s__, sprintf } from '~/locale'; -import eventHub from '../event_hub'; import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants'; +import eventHub from '../event_hub'; import groupsComponent from './groups.vue'; export default { diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 0997fb3a98c..d41fa0b2410 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -3,14 +3,14 @@ import { GlLoadingIcon, GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { visitUrl } from '../../lib/utils/url_utility'; import identicon from '../../vue_shared/components/identicon.vue'; -import eventHub from '../event_hub'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '../constants'; +import eventHub from '../event_hub'; +import itemActions from './item_actions.vue'; import itemCaret from './item_caret.vue'; -import itemTypeIcon from './item_type_icon.vue'; import itemStats from './item_stats.vue'; import itemStatsValue from './item_stats_value.vue'; -import itemActions from './item_actions.vue'; +import itemTypeIcon from './item_type_icon.vue'; export default { directives: { diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index c7713cbfafc..d407fdd2b90 100644 --- a/app/assets/javascripts/groups/components/groups.vue +++ b/app/assets/javascripts/groups/components/groups.vue @@ -1,7 +1,7 @@ <script> import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import eventHub from '../event_hub'; import { getParameterByName } from '../../lib/utils/common_utils'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/groups/components/invite_members_banner.vue b/app/assets/javascripts/groups/components/invite_members_banner.vue index da7adab1d86..81c5e3ce85d 100644 --- a/app/assets/javascripts/groups/components/invite_members_banner.vue +++ b/app/assets/javascripts/groups/components/invite_members_banner.vue @@ -1,7 +1,7 @@ <script> import { GlBanner } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { parseBoolean, setCookie, getCookie } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import Tracking from '~/tracking'; const trackingMixin = Tracking.mixin(); diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index ff52f5ef51c..df751a3f37e 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui'; -import eventHub from '../event_hub'; import { COMMON_STR } from '../constants'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js index 4fd2c12c9fe..c34810954a3 100644 --- a/app/assets/javascripts/groups/index.js +++ b/app/assets/javascripts/groups/index.js @@ -1,16 +1,16 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import UserCallout from '~/user_callout'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; +import UserCallout from '~/user_callout'; import Translate from '../vue_shared/translate'; -import GroupFilterableList from './groups_filterable_list'; -import GroupsStore from './store/groups_store'; -import GroupsService from './service/groups_service'; import groupsApp from './components/app.vue'; import groupFolderComponent from './components/group_folder.vue'; import groupItemComponent from './components/group_item.vue'; import { GROUPS_LIST_HOLDER_CLASS, CONTENT_LIST_CLASS } from './constants'; +import GroupFilterableList from './groups_filterable_list'; +import GroupsService from './service/groups_service'; +import GroupsStore from './store/groups_store'; Vue.use(Translate); diff --git a/app/assets/javascripts/groups/members/utils.js b/app/assets/javascripts/groups/members/utils.js index 71918bfe9f0..dc4eb7f4422 100644 --- a/app/assets/javascripts/groups/members/utils.js +++ b/app/assets/javascripts/groups/members/utils.js @@ -1,5 +1,5 @@ -import { baseRequestFormatter } from '~/members/utils'; import { MEMBER_ACCESS_LEVEL_PROPERTY_NAME } from '~/members/constants'; +import { baseRequestFormatter } from '~/members/utils'; import { GROUP_MEMBER_BASE_PROPERTY_NAME } from './constants'; export const groupMemberRequestFormatter = baseRequestFormatter( diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js index 59cc779d2ae..d6343f698c0 100644 --- a/app/assets/javascripts/groups/transfer_dropdown.js +++ b/app/assets/javascripts/groups/transfer_dropdown.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; export default class TransferDropdown { constructor() { diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js index 840b3030177..da2890f91fc 100644 --- a/app/assets/javascripts/groups_select.js +++ b/app/assets/javascripts/groups_select.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { escape } from 'lodash'; import { __ } from '~/locale'; -import axios from './lib/utils/axios_utils'; import Api from './api'; +import axios from './lib/utils/axios_utils'; import { normalizeHeaders } from './lib/utils/common_utils'; import { loadCSSFile } from './lib/utils/css_utils'; diff --git a/app/assets/javascripts/header.js b/app/assets/javascripts/header.js index bcafb09bc66..22c648a76a7 100644 --- a/app/assets/javascripts/header.js +++ b/app/assets/javascripts/header.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { highCountTrim } from '~/lib/utils/text_utility'; import Tracking from '~/tracking'; +import Translate from '~/vue_shared/translate'; /** * Updates todo counter when todos are toggled. diff --git a/app/assets/javascripts/helpers/avatar_helper.js b/app/assets/javascripts/helpers/avatar_helper.js index 4f04a1b8c16..35b09e9b027 100644 --- a/app/assets/javascripts/helpers/avatar_helper.js +++ b/app/assets/javascripts/helpers/avatar_helper.js @@ -1,6 +1,6 @@ import { escape } from 'lodash'; -import { getFirstCharacterCapitalized } from '~/lib/utils/text_utility'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { getFirstCharacterCapitalized } from '~/lib/utils/text_utility'; export const DEFAULT_SIZE_CLASS = 's40'; export const IDENTICON_BG_COUNT = 7; diff --git a/app/assets/javascripts/ide/components/activity_bar.vue b/app/assets/javascripts/ide/components/activity_bar.vue index edb7e373f6f..c71d911adfb 100644 --- a/app/assets/javascripts/ide/components/activity_bar.vue +++ b/app/assets/javascripts/ide/components/activity_bar.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { leftSidebarViews } from '../constants'; diff --git a/app/assets/javascripts/ide/components/branches/search_list.vue b/app/assets/javascripts/ide/components/branches/search_list.vue index c317fadb656..1ae7cf9339d 100644 --- a/app/assets/javascripts/ide/components/branches/search_list.vue +++ b/app/assets/javascripts/ide/components/branches/search_list.vue @@ -1,7 +1,7 @@ <script> -import { mapActions, mapState } from 'vuex'; -import { debounce } from 'lodash'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { debounce } from 'lodash'; +import { mapActions, mapState } from 'vuex'; import Item from './item.vue'; export default { diff --git a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue index c7f79b3ace4..273d8d972f7 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue @@ -1,14 +1,14 @@ <script> +import { GlSprintf } from '@gitlab/ui'; import { escape } from 'lodash'; import { mapState, mapGetters, createNamespacedHelpers } from 'vuex'; -import { GlSprintf } from '@gitlab/ui'; import { s__ } from '~/locale'; import { COMMIT_TO_CURRENT_BRANCH, COMMIT_TO_NEW_BRANCH, } from '../../stores/modules/commit/constants'; -import RadioGroup from './radio_group.vue'; import NewMergeRequestOption from './new_merge_request_option.vue'; +import RadioGroup from './radio_group.vue'; const { mapState: mapCommitState, mapActions: mapCommitActions } = createNamespacedHelpers( 'commit', diff --git a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue index 53fac09ab66..75f02af28c4 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue @@ -1,9 +1,9 @@ <script> -import { mapActions } from 'vuex'; import { GlModal, GlButton } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import { sprintf, __ } from '~/locale'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index dd649c7d46a..cdb3eaff207 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -1,11 +1,11 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlModal, GlSafeHtmlDirective, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { n__, s__ } from '~/locale'; import { leftSidebarViews, MAX_WINDOW_HEIGHT_COMPACT } from '../../constants'; import { createUnexpectedCommitError } from '../../lib/errors'; -import CommitMessageField from './message_field.vue'; import Actions from './actions.vue'; +import CommitMessageField from './message_field.vue'; import SuccessMessage from './success_message.vue'; const MSG_CANNOT_PUSH_CODE = s__( diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 729ff7c74ec..fbe353fc4ba 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -1,6 +1,6 @@ <script> -import { mapActions } from 'vuex'; import { GlModal, GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import { __, sprintf } from '~/locale'; import ListItem from './list_item.vue'; diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index ab90ab0791a..79b6fd1ec68 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -1,9 +1,9 @@ <script> -import { mapActions } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import FileIcon from '~/vue_shared/components/file_icon.vue'; -import { viewerTypes } from '../../constants'; import getCommitIconMap from '../../commit_icon'; +import { viewerTypes } from '../../constants'; export default { components: { diff --git a/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue b/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue index cdf49866982..121dae4b87e 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue @@ -1,6 +1,6 @@ <script> -import { createNamespacedHelpers } from 'vuex'; import { GlTooltipDirective } from '@gitlab/ui'; +import { createNamespacedHelpers } from 'vuex'; import { s__ } from '~/locale'; const { mapActions: mapCommitActions, mapGetters: mapCommitGetters } = createNamespacedHelpers( diff --git a/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue b/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue index 91cce44382c..039b4a54b26 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlTooltipDirective } from '@gitlab/ui'; +import { mapActions, mapState, mapGetters } from 'vuex'; export default { directives: { diff --git a/app/assets/javascripts/ide/components/error_message.vue b/app/assets/javascripts/ide/components/error_message.vue index 08635b43b91..d3a52f9f0cf 100644 --- a/app/assets/javascripts/ide/components/error_message.vue +++ b/app/assets/javascripts/ide/components/error_message.vue @@ -1,7 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions } from 'vuex'; import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { mapActions } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index fb0d00dc6a1..d80ad723fce 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -1,10 +1,10 @@ <script> -import { mapGetters } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { n__ } from '~/locale'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; -import NewDropdown from './new_dropdown/index.vue'; import MrFileIcon from './mr_file_icon.vue'; +import NewDropdown from './new_dropdown/index.vue'; export default { name: 'FileRowExtra', diff --git a/app/assets/javascripts/ide/components/file_templates/dropdown.vue b/app/assets/javascripts/ide/components/file_templates/dropdown.vue index 772dab3fed3..ec61e3374d7 100644 --- a/app/assets/javascripts/ide/components/file_templates/dropdown.vue +++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue @@ -1,7 +1,7 @@ <script> +import { GlIcon, GlLoadingIcon } from '@gitlab/ui'; import $ from 'jquery'; import { mapActions, mapState } from 'vuex'; -import { GlIcon, GlLoadingIcon } from '@gitlab/ui'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; export default { diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue index 131a039ef1a..2816f89d60d 100644 --- a/app/assets/javascripts/ide/components/ide.vue +++ b/app/assets/javascripts/ide/components/ide.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlAlert, GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { __, s__ } from '~/locale'; import { WEBIDE_MARK_APP_START, diff --git a/app/assets/javascripts/ide/components/ide_review.vue b/app/assets/javascripts/ide/components/ide_review.vue index d75629e9995..bea25d42756 100644 --- a/app/assets/javascripts/ide/components/ide_review.vue +++ b/app/assets/javascripts/ide/components/ide_review.vue @@ -1,8 +1,8 @@ <script> import { mapGetters, mapState, mapActions } from 'vuex'; import { viewerTypes } from '../constants'; -import IdeTreeList from './ide_tree_list.vue'; import EditorModeDropdown from './editor_mode_dropdown.vue'; +import IdeTreeList from './ide_tree_list.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue index a447dae3f80..c3d6494692a 100644 --- a/app/assets/javascripts/ide/components/ide_side_bar.vue +++ b/app/assets/javascripts/ide/components/ide_side_bar.vue @@ -1,12 +1,12 @@ <script> -import { mapState, mapGetters } from 'vuex'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; +import { mapState, mapGetters } from 'vuex'; import { SIDEBAR_INIT_WIDTH, leftSidebarViews } from '../constants'; -import IdeTree from './ide_tree.vue'; -import ResizablePanel from './resizable_panel.vue'; import ActivityBar from './activity_bar.vue'; import CommitForm from './commit_sidebar/form.vue'; import IdeProjectHeader from './ide_project_header.vue'; +import IdeTree from './ide_tree.vue'; +import ResizablePanel from './resizable_panel.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/ide_sidebar_nav.vue b/app/assets/javascripts/ide/components/ide_sidebar_nav.vue index 6bc84eb90c6..d8daf3b7ad6 100644 --- a/app/assets/javascripts/ide/components/ide_sidebar_nav.vue +++ b/app/assets/javascripts/ide/components/ide_sidebar_nav.vue @@ -1,8 +1,8 @@ <script> import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; -import { otherSide } from '../utils'; import { SIDE_RIGHT } from '../constants'; +import { otherSide } from '../utils'; export default { directives: { diff --git a/app/assets/javascripts/ide/components/ide_status_bar.vue b/app/assets/javascripts/ide/components/ide_status_bar.vue index 8a47835a252..28ca1b6750f 100644 --- a/app/assets/javascripts/ide/components/ide_status_bar.vue +++ b/app/assets/javascripts/ide/components/ide_status_bar.vue @@ -1,13 +1,13 @@ <script> /* eslint-disable @gitlab/vue-require-i18n-strings */ -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapActions, mapState, mapGetters } from 'vuex'; import timeAgoMixin from '~/vue_shared/mixins/timeago'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import { rightSidebarViews } from '../constants'; -import IdeStatusMr from './ide_status_mr.vue'; import IdeStatusList from './ide_status_list.vue'; +import IdeStatusMr from './ide_status_mr.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/ide_status_list.vue b/app/assets/javascripts/ide/components/ide_status_list.vue index 9966d109b55..da393b42dca 100644 --- a/app/assets/javascripts/ide/components/ide_status_list.vue +++ b/app/assets/javascripts/ide/components/ide_status_list.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlLink, GlTooltipDirective } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { isTextFile, getFileEOL } from '~/ide/utils'; import TerminalSyncStatusSafe from './terminal_sync/terminal_sync_status_safe.vue'; diff --git a/app/assets/javascripts/ide/components/ide_tree.vue b/app/assets/javascripts/ide/components/ide_tree.vue index d10714a687d..2df998d7518 100644 --- a/app/assets/javascripts/ide/components/ide_tree.vue +++ b/app/assets/javascripts/ide/components/ide_tree.vue @@ -2,9 +2,9 @@ import { mapState, mapGetters, mapActions } from 'vuex'; import { modalTypes, viewerTypes } from '../constants'; import IdeTreeList from './ide_tree_list.vue'; -import Upload from './new_dropdown/upload.vue'; import NewEntryButton from './new_dropdown/button.vue'; import NewModal from './new_dropdown/modal.vue'; +import Upload from './new_dropdown/upload.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/ide_tree_list.vue b/app/assets/javascripts/ide/components/ide_tree_list.vue index b67881b14f4..b987adc8bae 100644 --- a/app/assets/javascripts/ide/components/ide_tree_list.vue +++ b/app/assets/javascripts/ide/components/ide_tree_list.vue @@ -1,9 +1,9 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; -import FileTree from '~/vue_shared/components/file_tree.vue'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { WEBIDE_MARK_FILE_CLICKED } from '~/performance/constants'; import { performanceMarkAndMeasure } from '~/performance/utils'; +import FileTree from '~/vue_shared/components/file_tree.vue'; import IdeFileRow from './ide_file_row.vue'; import NavDropdown from './nav_dropdown.vue'; diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue index 7f07a5dbe43..8e611503cb4 100644 --- a/app/assets/javascripts/ide/components/jobs/detail.vue +++ b/app/assets/javascripts/ide/components/jobs/detail.vue @@ -1,11 +1,11 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions, mapState } from 'vuex'; -import { throttle } from 'lodash'; import { GlTooltipDirective, GlButton, GlIcon } from '@gitlab/ui'; +import { throttle } from 'lodash'; +import { mapActions, mapState } from 'vuex'; import { __ } from '../../../locale'; -import ScrollButton from './detail/scroll_button.vue'; import JobDescription from './detail/description.vue'; +import ScrollButton from './detail/scroll_button.vue'; const scrollPositions = { top: 0, diff --git a/app/assets/javascripts/ide/components/jobs/list.vue b/app/assets/javascripts/ide/components/jobs/list.vue index 4e0912f3f44..0ce21c5c36c 100644 --- a/app/assets/javascripts/ide/components/jobs/list.vue +++ b/app/assets/javascripts/ide/components/jobs/list.vue @@ -1,6 +1,6 @@ <script> -import { mapActions } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import Stage from './stage.vue'; export default { diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index c6711d1ac10..680e8841a1f 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -1,7 +1,7 @@ <script> -import { mapActions, mapState } from 'vuex'; -import { debounce } from 'lodash'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { debounce } from 'lodash'; +import { mapActions, mapState } from 'vuex'; import { __ } from '~/locale'; import TokenedInput from '../shared/tokened_input.vue'; import Item from './item.vue'; diff --git a/app/assets/javascripts/ide/components/nav_dropdown.vue b/app/assets/javascripts/ide/components/nav_dropdown.vue index 6ff77e556c0..f5f0db3a7a3 100644 --- a/app/assets/javascripts/ide/components/nav_dropdown.vue +++ b/app/assets/javascripts/ide/components/nav_dropdown.vue @@ -1,8 +1,8 @@ <script> import $ from 'jquery'; import { mapGetters } from 'vuex'; -import NavForm from './nav_form.vue'; import NavDropdownButton from './nav_dropdown_button.vue'; +import NavForm from './nav_form.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/nav_dropdown_button.vue b/app/assets/javascripts/ide/components/nav_dropdown_button.vue index 116d3cec03e..0db43123562 100644 --- a/app/assets/javascripts/ide/components/nav_dropdown_button.vue +++ b/app/assets/javascripts/ide/components/nav_dropdown_button.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapState } from 'vuex'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; const EMPTY_LABEL = '-'; diff --git a/app/assets/javascripts/ide/components/nav_form.vue b/app/assets/javascripts/ide/components/nav_form.vue index 70a92b8d3ab..62bb4841760 100644 --- a/app/assets/javascripts/ide/components/nav_form.vue +++ b/app/assets/javascripts/ide/components/nav_form.vue @@ -1,6 +1,6 @@ <script> -import Tabs from '~/vue_shared/components/tabs/tabs'; import Tab from '~/vue_shared/components/tabs/tab.vue'; +import Tabs from '~/vue_shared/components/tabs/tabs'; import BranchesSearchList from './branches/search_list.vue'; import MergeRequestSearchList from './merge_requests/list.vue'; diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue index 46d21bc14aa..bdd201aac1b 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/index.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue @@ -1,10 +1,10 @@ <script> -import { mapActions } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import { modalTypes } from '../../constants'; -import upload from './upload.vue'; import ItemButton from './button.vue'; import NewModal from './modal.vue'; +import upload from './upload.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue index 22eefb6634f..cafb58b0e2c 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlModal, GlButton } from '@gitlab/ui'; +import { mapActions, mapState, mapGetters } from 'vuex'; import { deprecatedCreateFlash as flash } from '~/flash'; import { __, sprintf, s__ } from '~/locale'; import { modalTypes } from '../../constants'; diff --git a/app/assets/javascripts/ide/components/panes/right.vue b/app/assets/javascripts/ide/components/panes/right.vue index da484893530..da2d4fbe7f0 100644 --- a/app/assets/javascripts/ide/components/panes/right.vue +++ b/app/assets/javascripts/ide/components/panes/right.vue @@ -1,11 +1,11 @@ <script> import { mapGetters, mapState } from 'vuex'; import { __ } from '~/locale'; -import ResizablePanel from '../resizable_panel.vue'; import { rightSidebarViews, SIDEBAR_INIT_WIDTH, SIDEBAR_NAV_WIDTH } from '../../constants'; -import PipelinesList from '../pipelines/list.vue'; import JobsDetail from '../jobs/detail.vue'; +import PipelinesList from '../pipelines/list.vue'; import Clientside from '../preview/clientside.vue'; +import ResizablePanel from '../resizable_panel.vue'; import TerminalView from '../terminal/view.vue'; import CollapsibleSidebar from './collapsible_sidebar.vue'; diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index 4c13dfc7a1d..2526db0cd7b 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -1,6 +1,4 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; -import { escape } from 'lodash'; import { GlLoadingIcon, GlIcon, @@ -10,10 +8,12 @@ import { GlBadge, GlAlert, } from '@gitlab/ui'; +import { escape } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; import IDEServices from '~/ide/services'; import { sprintf, __ } from '../../../locale'; -import CiIcon from '../../../vue_shared/components/ci_icon.vue'; import EmptyState from '../../../pipelines/components/pipelines_list/empty_state.vue'; +import CiIcon from '../../../vue_shared/components/ci_icon.vue'; import JobsList from '../jobs/list.vue'; export default { diff --git a/app/assets/javascripts/ide/components/preview/clientside.vue b/app/assets/javascripts/ide/components/preview/clientside.vue index 3bfb8f918af..13f2e775fc3 100644 --- a/app/assets/javascripts/ide/components/preview/clientside.vue +++ b/app/assets/javascripts/ide/components/preview/clientside.vue @@ -1,12 +1,12 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; +import { GlLoadingIcon } from '@gitlab/ui'; +import { listen } from 'codesandbox-api'; import { isEmpty, debounce } from 'lodash'; import { Manager } from 'smooshpack'; -import { listen } from 'codesandbox-api'; -import { GlLoadingIcon } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { packageJsonPath, LIVE_PREVIEW_DEBOUNCE } from '../../constants'; -import { createPathWithExt } from '../../utils'; import eventHub from '../../eventhub'; +import { createPathWithExt } from '../../utils'; import Navigator from './navigator.vue'; export default { diff --git a/app/assets/javascripts/ide/components/preview/navigator.vue b/app/assets/javascripts/ide/components/preview/navigator.vue index ad4e6adf125..0c6cb041095 100644 --- a/app/assets/javascripts/ide/components/preview/navigator.vue +++ b/app/assets/javascripts/ide/components/preview/navigator.vue @@ -1,6 +1,6 @@ <script> -import { listen } from 'codesandbox-api'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { listen } from 'codesandbox-api'; export default { components: { diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue index c5ff9fbbc01..854ff74d0af 100644 --- a/app/assets/javascripts/ide/components/repo_commit_section.vue +++ b/app/assets/javascripts/ide/components/repo_commit_section.vue @@ -1,8 +1,8 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; import { stageKeys } from '../constants'; -import CommitFilesList from './commit_sidebar/list.vue'; import EmptyState from './commit_sidebar/empty_state.vue'; +import CommitFilesList from './commit_sidebar/list.vue'; export default { components: { diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index 9f8bd299d52..690060f5cb0 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -1,9 +1,7 @@ <script> import { mapState, mapGetters, mapActions } from 'vuex'; -import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; -import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue'; -import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; +import { __ } from '~/locale'; import { WEBIDE_MARK_FILE_CLICKED, WEBIDE_MARK_REPO_EDITOR_START, @@ -12,8 +10,9 @@ import { WEBIDE_MEASURE_FILE_AFTER_INTERACTION, } from '~/performance/constants'; import { performanceMarkAndMeasure } from '~/performance/utils'; -import { __ } from '~/locale'; -import Editor from '../lib/editor'; +import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue'; +import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils'; +import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import { leftSidebarViews, viewerTypes, @@ -21,11 +20,12 @@ import { FILE_VIEW_MODE_PREVIEW, } from '../constants'; import eventHub from '../eventhub'; -import { extractMarkdownImagesFromEntries } from '../stores/utils'; -import { getFileEditorOrDefault } from '../stores/modules/editor/utils'; -import { getPathParent, readFileAsDataURL, registerSchema, isTextFile } from '../utils'; +import Editor from '../lib/editor'; import { getRulesWithTraversal } from '../lib/editorconfig/parser'; import mapRulesToMonaco from '../lib/editorconfig/rules_mapper'; +import { getFileEditorOrDefault } from '../stores/modules/editor/utils'; +import { extractMarkdownImagesFromEntries } from '../stores/utils'; +import { getPathParent, readFileAsDataURL, registerSchema, isTextFile } from '../utils'; import FileTemplatesBar from './file_templates/bar.vue'; export default { diff --git a/app/assets/javascripts/ide/components/repo_tab.vue b/app/assets/javascripts/ide/components/repo_tab.vue index e3c41eee15e..d28751c9571 100644 --- a/app/assets/javascripts/ide/components/repo_tab.vue +++ b/app/assets/javascripts/ide/components/repo_tab.vue @@ -1,10 +1,10 @@ <script> -import { mapActions, mapGetters } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapActions, mapGetters } from 'vuex'; import { __, sprintf } from '~/locale'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; import FileStatusIcon from './repo_file_status_icon.vue'; export default { diff --git a/app/assets/javascripts/ide/components/terminal/session.vue b/app/assets/javascripts/ide/components/terminal/session.vue index 4089d2e4ba9..3a4128b6207 100644 --- a/app/assets/javascripts/ide/components/terminal/session.vue +++ b/app/assets/javascripts/ide/components/terminal/session.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { __ } from '~/locale'; import { isEndingStatus } from '../../stores/modules/terminal/utils'; import Terminal from './terminal.vue'; diff --git a/app/assets/javascripts/ide/components/terminal/terminal.vue b/app/assets/javascripts/ide/components/terminal/terminal.vue index 9cfc5504c83..08fb2f5e5a0 100644 --- a/app/assets/javascripts/ide/components/terminal/terminal.vue +++ b/app/assets/javascripts/ide/components/terminal/terminal.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { __ } from '~/locale'; import GLTerminal from '~/terminal/terminal'; import { RUNNING, STOPPING } from '../../stores/modules/terminal/constants'; diff --git a/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue b/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue index c3f722d6052..67692c842b8 100644 --- a/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue +++ b/app/assets/javascripts/ide/components/terminal_sync/terminal_sync_status.vue @@ -1,6 +1,6 @@ <script> -import { throttle } from 'lodash'; import { GlTooltipDirective, GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { throttle } from 'lodash'; import { mapState } from 'vuex'; import { MSG_TERMINAL_SYNC_CONNECTING, diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js index 0e6775d87f1..cb59cd7a8df 100644 --- a/app/assets/javascripts/ide/ide_router.js +++ b/app/assets/javascripts/ide/ide_router.js @@ -1,14 +1,14 @@ import Vue from 'vue'; +import { deprecatedCreateFlash as flash } from '~/flash'; import IdeRouter from '~/ide/ide_router_extension'; import { joinPaths } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as flash } from '~/flash'; import { __ } from '~/locale'; -import { performanceMarkAndMeasure } from '~/performance/utils'; import { WEBIDE_MARK_FETCH_PROJECT_DATA_START, WEBIDE_MARK_FETCH_PROJECT_DATA_FINISH, WEBIDE_MEASURE_FETCH_PROJECT_DATA, } from '~/performance/constants'; +import { performanceMarkAndMeasure } from '~/performance/utils'; import { syncRouterAndStore } from './sync_router_and_store'; Vue.use(IdeRouter); diff --git a/app/assets/javascripts/ide/index.js b/app/assets/javascripts/ide/index.js index bf0d6b32850..1b4b59ef62f 100644 --- a/app/assets/javascripts/ide/index.js +++ b/app/assets/javascripts/ide/index.js @@ -1,14 +1,14 @@ +import { identity } from 'lodash'; import Vue from 'vue'; import { mapActions } from 'vuex'; -import { identity } from 'lodash'; -import Translate from '~/vue_shared/translate'; import PerformancePlugin from '~/performance/vue_performance_plugin'; +import Translate from '~/vue_shared/translate'; import { parseBoolean } from '../lib/utils/common_utils'; import { resetServiceWorkersPublicPath } from '../lib/utils/webpack'; import ide from './components/ide.vue'; -import { createStore } from './stores'; import { createRouter } from './ide_router'; import { DEFAULT_THEME } from './lib/themes'; +import { createStore } from './stores'; Vue.use(Translate); diff --git a/app/assets/javascripts/ide/lib/create_diff.js b/app/assets/javascripts/ide/lib/create_diff.js index 51d4967fb23..17779b6314e 100644 --- a/app/assets/javascripts/ide/lib/create_diff.js +++ b/app/assets/javascripts/ide/lib/create_diff.js @@ -1,5 +1,5 @@ -import { commitActionForFile } from '~/ide/stores/utils'; import { commitActionTypes } from '~/ide/constants'; +import { commitActionForFile } from '~/ide/stores/utils'; import createFileDiff from './create_file_diff'; const getDeletedParents = (entries, file) => { diff --git a/app/assets/javascripts/ide/lib/diff/controller.js b/app/assets/javascripts/ide/lib/diff/controller.js index ee4fdd10c97..1d051062637 100644 --- a/app/assets/javascripts/ide/lib/diff/controller.js +++ b/app/assets/javascripts/ide/lib/diff/controller.js @@ -1,5 +1,5 @@ -import { Range } from 'monaco-editor'; import { throttle } from 'lodash'; +import { Range } from 'monaco-editor'; import Disposable from '../common/disposable'; import DirtyDiffWorker from './diff_worker'; diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index f3c572bfeed..80191f635a3 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -2,14 +2,14 @@ import { debounce } from 'lodash'; import { editor as monacoEditor, KeyCode, KeyMod, Range } from 'monaco-editor'; import { clearDomElement } from '~/editor/utils'; import { registerLanguages } from '../utils'; -import DecorationsController from './decorations/controller'; -import DirtyDiffController from './diff/controller'; import Disposable from './common/disposable'; import ModelManager from './common/model_manager'; +import DecorationsController from './decorations/controller'; +import DirtyDiffController from './diff/controller'; import { editorOptions, defaultEditorOptions, defaultDiffEditorOptions } from './editor_options'; -import { themes } from './themes'; -import languages from './languages'; import keymap from './keymap.json'; +import languages from './languages'; +import { themes } from './themes'; function setupThemes() { themes.forEach((theme) => { diff --git a/app/assets/javascripts/ide/lib/languages/index.js b/app/assets/javascripts/ide/lib/languages/index.js index 580ad820bf9..f758cb7dd86 100644 --- a/app/assets/javascripts/ide/lib/languages/index.js +++ b/app/assets/javascripts/ide/lib/languages/index.js @@ -1,5 +1,5 @@ -import vue from './vue'; import hcl from './hcl'; +import vue from './vue'; const languages = [vue, hcl]; diff --git a/app/assets/javascripts/ide/lib/themes/index.js b/app/assets/javascripts/ide/lib/themes/index.js index bb5be50576c..6a3feb9cab6 100644 --- a/app/assets/javascripts/ide/lib/themes/index.js +++ b/app/assets/javascripts/ide/lib/themes/index.js @@ -1,9 +1,9 @@ -import white from './white'; import dark from './dark'; import monokai from './monokai'; -import solarizedLight from './solarized_light'; -import solarizedDark from './solarized_dark'; import none from './none'; +import solarizedDark from './solarized_dark'; +import solarizedLight from './solarized_light'; +import white from './white'; export const themes = [ { diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js index 2264d63c737..e98653aedc2 100644 --- a/app/assets/javascripts/ide/services/index.js +++ b/app/assets/javascripts/ide/services/index.js @@ -1,6 +1,6 @@ +import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; -import Api from '~/api'; import getUserPermissions from '../queries/getUserPermissions.query.graphql'; import { query } from './gql'; diff --git a/app/assets/javascripts/ide/stores/actions.js b/app/assets/javascripts/ide/stores/actions.js index d4ae460d78b..bf94f9d31c8 100644 --- a/app/assets/javascripts/ide/stores/actions.js +++ b/app/assets/javascripts/ide/stores/actions.js @@ -1,18 +1,18 @@ -import Vue from 'vue'; import { escape } from 'lodash'; -import { __, sprintf } from '~/locale'; -import { visitUrl } from '~/lib/utils/url_utility'; +import Vue from 'vue'; import { deprecatedCreateFlash as flash } from '~/flash'; -import { performanceMarkAndMeasure } from '~/performance/utils'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { __, sprintf } from '~/locale'; import { WEBIDE_MARK_FETCH_BRANCH_DATA_START, WEBIDE_MARK_FETCH_BRANCH_DATA_FINISH, WEBIDE_MEASURE_FETCH_BRANCH_DATA, } from '~/performance/constants'; -import { decorateFiles } from '../lib/files'; +import { performanceMarkAndMeasure } from '~/performance/utils'; import { stageKeys, commitActionTypes } from '../constants'; -import service from '../services'; import eventHub from '../eventhub'; +import { decorateFiles } from '../lib/files'; +import service from '../services'; import * as types from './mutation_types'; export const redirectToUrl = (self, url) => visitUrl(url); diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 42668dec63a..aa2e3d32b59 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -1,16 +1,16 @@ import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; -import { performanceMarkAndMeasure } from '~/performance/utils'; import { WEBIDE_MARK_FETCH_FILE_DATA_START, WEBIDE_MARK_FETCH_FILE_DATA_FINISH, WEBIDE_MEASURE_FETCH_FILE_DATA, } from '~/performance/constants'; +import { performanceMarkAndMeasure } from '~/performance/utils'; +import { viewerTypes, stageKeys, commitActionTypes } from '../../constants'; import eventHub from '../../eventhub'; import service from '../../services'; import * as types from '../mutation_types'; import { setPageTitleForFile } from '../utils'; -import { viewerTypes, stageKeys, commitActionTypes } from '../../constants'; export const closeFile = ({ commit, state, dispatch, getters }, file) => { const { path } = file; diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index 8215cba7ccf..8dcc420f156 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -1,8 +1,8 @@ import { deprecatedCreateFlash as flash } from '~/flash'; import { __ } from '~/locale'; +import { leftSidebarViews, PERMISSION_READ_MR } from '../../constants'; import service from '../../services'; import * as types from '../mutation_types'; -import { leftSidebarViews, PERMISSION_READ_MR } from '../../constants'; export const getMergeRequestsForBranch = ( { commit, state, getters }, diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js index 27f6848f1d6..120a577d44a 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -1,8 +1,8 @@ import { escape } from 'lodash'; import { deprecatedCreateFlash as flash } from '~/flash'; import { __, sprintf } from '~/locale'; -import service from '../../services'; import api from '../../../api'; +import service from '../../services'; import * as types from '../mutation_types'; export const getProjectData = ({ commit, state }, { namespace, projectId, force = false } = {}) => diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js index 150dfcb2726..f46d3cbe946 100644 --- a/app/assets/javascripts/ide/stores/actions/tree.js +++ b/app/assets/javascripts/ide/stores/actions/tree.js @@ -1,14 +1,14 @@ import { defer } from 'lodash'; -import { performanceMarkAndMeasure } from '~/performance/utils'; import { WEBIDE_MARK_FETCH_FILES_FINISH, WEBIDE_MEASURE_FETCH_FILES, WEBIDE_MARK_FETCH_FILES_START, } from '~/performance/constants'; +import { performanceMarkAndMeasure } from '~/performance/utils'; import { __ } from '../../../locale'; +import { decorateFiles } from '../../lib/files'; import service from '../../services'; import * as types from '../mutation_types'; -import { decorateFiles } from '../../lib/files'; export const toggleTreeOpen = ({ commit }, path) => { commit(types.TOGGLE_TREE_OPEN, path); diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js index 9600c1a1b8c..9b93fc74f76 100644 --- a/app/assets/javascripts/ide/stores/getters.js +++ b/app/assets/javascripts/ide/stores/getters.js @@ -1,5 +1,5 @@ -import { addNumericSuffix } from '~/ide/utils'; import Api from '~/api'; +import { addNumericSuffix } from '~/ide/utils'; import { leftSidebarViews, packageJsonPath, diff --git a/app/assets/javascripts/ide/stores/index.js b/app/assets/javascripts/ide/stores/index.js index d543209716a..b660ff178a2 100644 --- a/app/assets/javascripts/ide/stores/index.js +++ b/app/assets/javascripts/ide/stores/index.js @@ -1,19 +1,19 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; import * as actions from './actions'; import * as getters from './getters'; -import mutations from './mutations'; -import commitModule from './modules/commit'; -import pipelines from './modules/pipelines'; -import mergeRequests from './modules/merge_requests'; import branches from './modules/branches'; -import fileTemplates from './modules/file_templates'; -import paneModule from './modules/pane'; import clientsideModule from './modules/clientside'; -import routerModule from './modules/router'; +import commitModule from './modules/commit'; import editorModule from './modules/editor'; import { setupFileEditorsSync } from './modules/editor/setup'; +import fileTemplates from './modules/file_templates'; +import mergeRequests from './modules/merge_requests'; +import paneModule from './modules/pane'; +import pipelines from './modules/pipelines'; +import routerModule from './modules/router'; +import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/ide/stores/modules/branches/actions.js b/app/assets/javascripts/ide/stores/modules/branches/actions.js index 74a4cd9848b..57a63749d7c 100644 --- a/app/assets/javascripts/ide/stores/modules/branches/actions.js +++ b/app/assets/javascripts/ide/stores/modules/branches/actions.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import Api from '~/api'; +import { __ } from '~/locale'; import * as types from './mutation_types'; export const requestBranches = ({ commit }) => commit(types.REQUEST_BRANCHES); diff --git a/app/assets/javascripts/ide/stores/modules/branches/index.js b/app/assets/javascripts/ide/stores/modules/branches/index.js index deda95cd0c9..4b7d6d2998b 100644 --- a/app/assets/javascripts/ide/stores/modules/branches/index.js +++ b/app/assets/javascripts/ide/stores/modules/branches/index.js @@ -1,6 +1,6 @@ -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index 57a1e4f133a..29555799074 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -1,12 +1,12 @@ -import { sprintf, __ } from '~/locale'; import { deprecatedCreateFlash as flash } from '~/flash'; import { addNumericSuffix } from '~/ide/utils'; -import * as rootTypes from '../../mutation_types'; -import { createCommitPayload, createNewMergeRequestUrl } from '../../utils'; -import service from '../../../services'; +import { sprintf, __ } from '~/locale'; import { leftSidebarViews } from '../../../constants'; import eventHub from '../../../eventhub'; import { parseCommitError } from '../../../lib/errors'; +import service from '../../../services'; +import * as rootTypes from '../../mutation_types'; +import { createCommitPayload, createNewMergeRequestUrl } from '../../utils'; import { COMMIT_TO_CURRENT_BRANCH } from './constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/ide/stores/modules/commit/index.js b/app/assets/javascripts/ide/stores/modules/commit/index.js index 5cec73bde2e..c5a39249348 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/index.js +++ b/app/assets/javascripts/ide/stores/modules/commit/index.js @@ -1,7 +1,7 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; import * as getters from './getters'; +import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/editor/index.js b/app/assets/javascripts/ide/stores/modules/editor/index.js index 8a7437b427d..b601f0e79d4 100644 --- a/app/assets/javascripts/ide/stores/modules/editor/index.js +++ b/app/assets/javascripts/ide/stores/modules/editor/index.js @@ -1,7 +1,7 @@ import * as actions from './actions'; import * as getters from './getters'; -import state from './state'; import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/editor/setup.js b/app/assets/javascripts/ide/stores/modules/editor/setup.js index 9f3163aa6f5..5899706e38a 100644 --- a/app/assets/javascripts/ide/stores/modules/editor/setup.js +++ b/app/assets/javascripts/ide/stores/modules/editor/setup.js @@ -1,5 +1,5 @@ -import eventHub from '~/ide/eventhub'; import { commitActionTypes } from '~/ide/constants'; +import eventHub from '~/ide/eventhub'; const removeUnusedFileEditors = (store) => { Object.keys(store.state.editor.fileEditors) diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/actions.js b/app/assets/javascripts/ide/stores/modules/file_templates/actions.js index ad5b01e7040..bc96ec267b5 100644 --- a/app/assets/javascripts/ide/stores/modules/file_templates/actions.js +++ b/app/assets/javascripts/ide/stores/modules/file_templates/actions.js @@ -1,6 +1,6 @@ import Api from '~/api'; -import { __ } from '~/locale'; import { normalizeHeaders } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import eventHub from '../../../eventhub'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/index.js b/app/assets/javascripts/ide/stores/modules/file_templates/index.js index 383ff5db392..5f850b8b86a 100644 --- a/app/assets/javascripts/ide/stores/modules/file_templates/index.js +++ b/app/assets/javascripts/ide/stores/modules/file_templates/index.js @@ -1,7 +1,7 @@ -import createState from './state'; import * as actions from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import createState from './state'; export default () => ({ namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js index 299f7a883d2..8446b93d14a 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js @@ -1,5 +1,5 @@ -import { __ } from '../../../../locale'; import Api from '../../../../api'; +import { __ } from '../../../../locale'; import { scopes } from './constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/ide/stores/modules/merge_requests/index.js b/app/assets/javascripts/ide/stores/modules/merge_requests/index.js index 04e7e0f08f1..d858a855d9e 100644 --- a/app/assets/javascripts/ide/stores/modules/merge_requests/index.js +++ b/app/assets/javascripts/ide/stores/modules/merge_requests/index.js @@ -1,6 +1,6 @@ -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index 2c2034d76d0..60561292c9d 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js @@ -1,10 +1,10 @@ -import Visibility from 'visibilityjs'; import axios from 'axios'; +import Visibility from 'visibilityjs'; import httpStatus from '../../../../lib/utils/http_status'; -import { __ } from '../../../../locale'; import Poll from '../../../../lib/utils/poll'; -import service from '../../../services'; +import { __ } from '../../../../locale'; import { rightSidebarViews } from '../../../constants'; +import service from '../../../services'; import * as types from './mutation_types'; let eTagPoll; diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/index.js b/app/assets/javascripts/ide/stores/modules/pipelines/index.js index b44c3141b81..b48f63887ca 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/index.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/index.js @@ -1,7 +1,7 @@ -import state from './state'; import * as actions from './actions'; -import mutations from './mutations'; import * as getters from './getters'; +import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/router/index.js b/app/assets/javascripts/ide/stores/modules/router/index.js index 68c81bb4509..1d5af1d4fe5 100644 --- a/app/assets/javascripts/ide/stores/modules/router/index.js +++ b/app/assets/javascripts/ide/stores/modules/router/index.js @@ -1,6 +1,6 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; +import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/checks.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/checks.js index b2c1ddd877c..91645a34a3d 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/checks.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/checks.js @@ -1,9 +1,9 @@ import Api from '~/api'; import httpStatus from '~/lib/utils/http_status'; -import * as types from '../mutation_types'; -import * as messages from '../messages'; -import { CHECK_CONFIG, CHECK_RUNNERS, RETRY_RUNNERS_INTERVAL } from '../constants'; import * as terminalService from '../../../../services/terminals'; +import { CHECK_CONFIG, CHECK_RUNNERS, RETRY_RUNNERS_INTERVAL } from '../constants'; +import * as messages from '../messages'; +import * as types from '../mutation_types'; export const requestConfigCheck = ({ commit }) => { commit(types.REQUEST_CHECK, CHECK_CONFIG); diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js index aa460859b4c..6c9be6d10c9 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_controls.js @@ -1,10 +1,10 @@ +import { deprecatedCreateFlash as flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; -import { deprecatedCreateFlash as flash } from '~/flash'; -import * as types from '../mutation_types'; -import * as messages from '../messages'; import * as terminalService from '../../../../services/terminals'; import { STARTING, STOPPING, STOPPED } from '../constants'; +import * as messages from '../messages'; +import * as types from '../mutation_types'; export const requestStartSession = ({ commit }) => { commit(types.SET_SESSION_STATUS, STARTING); diff --git a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js index 3ab1817e662..da10894c2c6 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/actions/session_status.js @@ -1,7 +1,7 @@ -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; -import * as types from '../mutation_types'; +import axios from '~/lib/utils/axios_utils'; import * as messages from '../messages'; +import * as types from '../mutation_types'; import { isEndingStatus } from '../utils'; export const pollSessionStatus = ({ state, dispatch, commit }) => { diff --git a/app/assets/javascripts/ide/stores/modules/terminal/messages.js b/app/assets/javascripts/ide/stores/modules/terminal/messages.js index 967ba80cd2c..ec05ca84754 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal/messages.js +++ b/app/assets/javascripts/ide/stores/modules/terminal/messages.js @@ -1,6 +1,6 @@ import { escape } from 'lodash'; -import { __, sprintf } from '~/locale'; import httpStatus from '~/lib/utils/http_status'; +import { __, sprintf } from '~/locale'; export const UNEXPECTED_ERROR_CONFIG = __( 'An unexpected error occurred while checking the project environment.', diff --git a/app/assets/javascripts/ide/stores/modules/terminal_sync/index.js b/app/assets/javascripts/ide/stores/modules/terminal_sync/index.js index 795c2fad724..a0685293839 100644 --- a/app/assets/javascripts/ide/stores/modules/terminal_sync/index.js +++ b/app/assets/javascripts/ide/stores/modules/terminal_sync/index.js @@ -1,6 +1,6 @@ -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default () => ({ namespaced: true, diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js index 6ed6798a5b6..576f861a090 100644 --- a/app/assets/javascripts/ide/stores/mutations.js +++ b/app/assets/javascripts/ide/stores/mutations.js @@ -1,10 +1,10 @@ import Vue from 'vue'; import * as types from './mutation_types'; -import projectMutations from './mutations/project'; -import mergeRequestMutation from './mutations/merge_request'; +import branchMutations from './mutations/branch'; import fileMutations from './mutations/file'; +import mergeRequestMutation from './mutations/merge_request'; +import projectMutations from './mutations/project'; import treeMutations from './mutations/tree'; -import branchMutations from './mutations/branch'; import { sortTree, swapInParentTreeWithSorting, diff --git a/app/assets/javascripts/ide/stores/mutations/file.js b/app/assets/javascripts/ide/stores/mutations/file.js index d678c5e280c..fa9830a7469 100644 --- a/app/assets/javascripts/ide/stores/mutations/file.js +++ b/app/assets/javascripts/ide/stores/mutations/file.js @@ -1,7 +1,7 @@ import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { diffModes } from '../../constants'; import * as types from '../mutation_types'; import { sortTree } from '../utils'; -import { diffModes } from '../../constants'; export default { [types.SET_FILE_ACTIVE](state, { path, active }) { diff --git a/app/assets/javascripts/ide/stores/plugins/terminal_sync.js b/app/assets/javascripts/ide/stores/plugins/terminal_sync.js index d925a5f7567..944a034fe97 100644 --- a/app/assets/javascripts/ide/stores/plugins/terminal_sync.js +++ b/app/assets/javascripts/ide/stores/plugins/terminal_sync.js @@ -1,8 +1,8 @@ import { debounce } from 'lodash'; -import eventHub from '~/ide/eventhub'; import { commitActionTypes } from '~/ide/constants'; -import terminalSyncModule from '../modules/terminal_sync'; +import eventHub from '~/ide/eventhub'; import { isEndingStatus, isRunningStatus } from '../modules/terminal/utils'; +import terminalSyncModule from '../modules/terminal_sync'; const UPLOAD_DEBOUNCE = 200; diff --git a/app/assets/javascripts/ide/utils.js b/app/assets/javascripts/ide/utils.js index 99d6ccde770..63c53737119 100644 --- a/app/assets/javascripts/ide/utils.js +++ b/app/assets/javascripts/ide/utils.js @@ -1,5 +1,5 @@ -import { languages } from 'monaco-editor'; import { flatten, isString } from 'lodash'; +import { languages } from 'monaco-editor'; import { performanceMarkAndMeasure } from '~/performance/utils'; import { SIDE_LEFT, SIDE_RIGHT } from './constants'; diff --git a/app/assets/javascripts/image_diff/helpers/init_image_diff.js b/app/assets/javascripts/image_diff/helpers/init_image_diff.js index 8eef930c372..51168b94e6d 100644 --- a/app/assets/javascripts/image_diff/helpers/init_image_diff.js +++ b/app/assets/javascripts/image_diff/helpers/init_image_diff.js @@ -1,6 +1,6 @@ +import ImageFile from '../../commit/image_file'; import ImageDiff from '../image_diff'; import ReplacedImageDiff from '../replaced_image_diff'; -import ImageFile from '../../commit/image_file'; function initImageDiff(fileEl, canCreateNote, renderCommentBadge) { const options = { diff --git a/app/assets/javascripts/image_diff/replaced_image_diff.js b/app/assets/javascripts/image_diff/replaced_image_diff.js index 2df15e5e1a5..a3d9b8a138a 100644 --- a/app/assets/javascripts/image_diff/replaced_image_diff.js +++ b/app/assets/javascripts/image_diff/replaced_image_diff.js @@ -1,6 +1,6 @@ import imageDiffHelper from './helpers/index'; -import { viewTypes, isValidViewType } from './view_types'; import ImageDiff from './image_diff'; +import { viewTypes, isValidViewType } from './view_types'; export default class ReplacedImageDiff extends ImageDiff { init(defaultViewType = viewTypes.TWO_UP) { diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue index c4859d4f60e..7c5f48dcafc 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue @@ -9,11 +9,11 @@ import { } from '@gitlab/ui'; import { s__ } from '~/locale'; import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import bulkImportSourceGroupsQuery from '../graphql/queries/bulk_import_source_groups.query.graphql'; -import availableNamespacesQuery from '../graphql/queries/available_namespaces.query.graphql'; -import setTargetNamespaceMutation from '../graphql/mutations/set_target_namespace.mutation.graphql'; -import setNewNameMutation from '../graphql/mutations/set_new_name.mutation.graphql'; import importGroupMutation from '../graphql/mutations/import_group.mutation.graphql'; +import setNewNameMutation from '../graphql/mutations/set_new_name.mutation.graphql'; +import setTargetNamespaceMutation from '../graphql/mutations/set_target_namespace.mutation.graphql'; +import availableNamespacesQuery from '../graphql/queries/available_namespaces.query.graphql'; +import bulkImportSourceGroupsQuery from '../graphql/queries/bulk_import_source_groups.query.graphql'; import ImportTableRow from './import_table_row.vue'; export default { diff --git a/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js b/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js index beb058417e5..651fc907611 100644 --- a/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js +++ b/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js @@ -1,8 +1,8 @@ +import createFlash from '~/flash'; +import createDefaultClient from '~/lib/graphql'; import axios from '~/lib/utils/axios_utils'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; -import createDefaultClient from '~/lib/graphql'; import { s__ } from '~/locale'; -import createFlash from '~/flash'; import { STATUSES } from '../../constants'; import availableNamespacesQuery from './queries/available_namespaces.query.graphql'; import { SourceGroupsManager } from './services/source_groups_manager'; diff --git a/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js b/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js index 886cf24081b..960126cfa6d 100644 --- a/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js +++ b/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js @@ -1,8 +1,8 @@ import gql from 'graphql-tag'; import createFlash from '~/flash'; import { s__ } from '~/locale'; -import bulkImportSourceGroupsQuery from '../queries/bulk_import_source_groups.query.graphql'; import { STATUSES } from '../../../constants'; +import bulkImportSourceGroupsQuery from '../queries/bulk_import_source_groups.query.graphql'; import { SourceGroupsManager } from './source_groups_manager'; const groupId = (i) => `group${i}`; diff --git a/app/assets/javascripts/import_entities/import_groups/index.js b/app/assets/javascripts/import_entities/import_groups/index.js index 1ce74bf4f60..cd646befaaa 100644 --- a/app/assets/javascripts/import_entities/import_groups/index.js +++ b/app/assets/javascripts/import_entities/import_groups/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import Translate from '~/vue_shared/translate'; -import { createApolloClient } from './graphql/client_factory'; import ImportTable from './components/import_table.vue'; +import { createApolloClient } from './graphql/client_factory'; Vue.use(Translate); Vue.use(VueApollo); diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue index 192d6e056cd..dfc5b68b820 100644 --- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue +++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlButton, GlLoadingIcon, GlIntersectionObserver, GlModal } from '@gitlab/ui'; +import { mapActions, mapState, mapGetters } from 'vuex'; import { n__, __, sprintf } from '~/locale'; import ProviderRepoTableRow from './provider_repo_table_row.vue'; diff --git a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue index 983abda57f7..d448ea44bc7 100644 --- a/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue +++ b/app/assets/javascripts/import_entities/import_projects/components/provider_repo_table_row.vue @@ -1,8 +1,8 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlIcon, GlBadge } from '@gitlab/ui'; -import Select2Select from '~/vue_shared/components/select2_select.vue'; +import { mapState, mapGetters, mapActions } from 'vuex'; import { __ } from '~/locale'; +import Select2Select from '~/vue_shared/components/select2_select.vue'; import ImportStatus from '../../components/import_status.vue'; import { STATUSES } from '../../constants'; import { isProjectImportable, isIncompatible, getImportStatus } from '../utils'; diff --git a/app/assets/javascripts/import_entities/import_projects/index.js b/app/assets/javascripts/import_entities/import_projects/index.js index 7373b628f2b..6b7fe23ed60 100644 --- a/app/assets/javascripts/import_entities/import_projects/index.js +++ b/app/assets/javascripts/import_entities/import_projects/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { parseBoolean } from '~/lib/utils/common_utils'; +import Translate from '~/vue_shared/translate'; import ImportProjectsTable from './components/import_projects_table.vue'; import createStore from './store'; diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js index a5d6fa175fc..33f8dbb8737 100644 --- a/app/assets/javascripts/import_entities/import_projects/store/actions.js +++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js @@ -1,12 +1,12 @@ import Visibility from 'visibilityjs'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import Poll from '~/lib/utils/poll'; -import { visitUrl, objectToQuery } from '~/lib/utils/url_utility'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__, sprintf } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import httpStatusCodes from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { visitUrl, objectToQuery } from '~/lib/utils/url_utility'; +import { s__, sprintf } from '~/locale'; import { isProjectImportable } from '../utils'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/import_entities/import_projects/store/index.js b/app/assets/javascripts/import_entities/import_projects/store/index.js index 7ba12f81eb9..a2880e7d031 100644 --- a/app/assets/javascripts/import_entities/import_projects/store/index.js +++ b/app/assets/javascripts/import_entities/import_projects/store/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; import actionsFactory from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index b848f7adc9d..5638dc064d1 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -10,22 +10,20 @@ import { GlIcon, GlEmptyState, } from '@gitlab/ui'; +import { convertToSnakeCase } from '~/lib/utils/text_utility'; +import { visitUrl, mergeUrlParams, joinPaths } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; +import { INCIDENT_SEVERITY } from '~/sidebar/components/severity/constants'; +import SeverityToken from '~/sidebar/components/severity/severity.vue'; import Tracking from '~/tracking'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; import { tdClass, thClass, bodyTrClass, initialPaginationState, } from '~/vue_shared/components/paginated_table_with_search_and_tabs/constants'; -import { convertToSnakeCase } from '~/lib/utils/text_utility'; -import { s__ } from '~/locale'; -import { visitUrl, mergeUrlParams, joinPaths } from '~/lib/utils/url_utility'; -import SeverityToken from '~/sidebar/components/severity/severity.vue'; -import { INCIDENT_SEVERITY } from '~/sidebar/components/severity/constants'; -import getIncidents from '../graphql/queries/get_incidents.query.graphql'; -import getIncidentsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; +import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { I18N, INCIDENT_STATUS_TABS, @@ -37,6 +35,8 @@ import { trackIncidentCreateNewOptions, trackIncidentListViewsOptions, } from '../constants'; +import getIncidentsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql'; +import getIncidents from '../graphql/queries/get_incidents.query.graphql'; export default { trackIncidentCreateNewOptions, diff --git a/app/assets/javascripts/incidents_settings/incidents_settings_service.js b/app/assets/javascripts/incidents_settings/incidents_settings_service.js index f0e692f9cbe..82b94c08381 100644 --- a/app/assets/javascripts/incidents_settings/incidents_settings_service.js +++ b/app/assets/javascripts/incidents_settings/incidents_settings_service.js @@ -1,6 +1,6 @@ +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { ERROR_MSG } from './constants'; export default class IncidentsSettingsService { diff --git a/app/assets/javascripts/init_issuable_sidebar.js b/app/assets/javascripts/init_issuable_sidebar.js index 63ef6a01844..59038b3d9fb 100644 --- a/app/assets/javascripts/init_issuable_sidebar.js +++ b/app/assets/javascripts/init_issuable_sidebar.js @@ -1,11 +1,11 @@ /* eslint-disable no-new */ import { mountSidebarLabels, getSidebarOptions } from '~/sidebar/mount_sidebar'; -import MilestoneSelect from './milestone_select'; -import LabelsSelect from './labels_select'; +import DueDateSelectors from './due_date_select'; import IssuableContext from './issuable_context'; +import LabelsSelect from './labels_select'; +import MilestoneSelect from './milestone_select'; import Sidebar from './right_sidebar'; -import DueDateSelectors from './due_date_select'; export default () => { const sidebarOptEl = document.querySelector('.js-sidebar-options'); diff --git a/app/assets/javascripts/init_labels.js b/app/assets/javascripts/init_labels.js index 15da5d5cceb..10bfbf7960c 100644 --- a/app/assets/javascripts/init_labels.js +++ b/app/assets/javascripts/init_labels.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import LabelManager from './label_manager'; import GroupLabelSubscription from './group_label_subscription'; +import LabelManager from './label_manager'; import ProjectLabelSubscription from './project_label_subscription'; export default () => { diff --git a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue index 6698984d02f..8677f139723 100644 --- a/app/assets/javascripts/integrations/edit/components/active_checkbox.vue +++ b/app/assets/javascripts/integrations/edit/components/active_checkbox.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlFormGroup, GlFormCheckbox } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue index 93ea1f4f636..bcf4b036fd2 100644 --- a/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue +++ b/app/assets/javascripts/integrations/edit/components/confirmation_modal.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlModal } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { __ } from '~/locale'; export default { diff --git a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue index 80815972006..a4baca20ac9 100644 --- a/app/assets/javascripts/integrations/edit/components/dynamic_field.vue +++ b/app/assets/javascripts/integrations/edit/components/dynamic_field.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapGetters } from 'vuex'; -import { capitalize, lowerCase, isEmpty } from 'lodash'; import { GlFormGroup, GlFormCheckbox, GlFormInput, GlFormSelect, GlFormTextarea } from '@gitlab/ui'; +import { capitalize, lowerCase, isEmpty } from 'lodash'; +import { mapGetters } from 'vuex'; import { __, sprintf } from '~/locale'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue index e5c4368c32d..3ec0c23e55d 100644 --- a/app/assets/javascripts/integrations/edit/components/integration_form.vue +++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue @@ -1,18 +1,18 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlButton, GlModalDirective, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import eventHub from '../event_hub'; import { integrationLevels } from '../constants'; +import eventHub from '../event_hub'; -import OverrideDropdown from './override_dropdown.vue'; import ActiveCheckbox from './active_checkbox.vue'; -import JiraTriggerFields from './jira_trigger_fields.vue'; -import JiraIssuesFields from './jira_issues_fields.vue'; -import TriggerFields from './trigger_fields.vue'; -import DynamicField from './dynamic_field.vue'; import ConfirmationModal from './confirmation_modal.vue'; +import DynamicField from './dynamic_field.vue'; +import JiraIssuesFields from './jira_issues_fields.vue'; +import JiraTriggerFields from './jira_trigger_fields.vue'; +import OverrideDropdown from './override_dropdown.vue'; import ResetConfirmationModal from './reset_confirmation_modal.vue'; +import TriggerFields from './trigger_fields.vue'; export default { name: 'IntegrationForm', diff --git a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue index bc005aa16e9..af4e9acf4ba 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlFormGroup, GlFormCheckbox, GlFormRadio } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { s__ } from '~/locale'; const commentDetailOptions = [ diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue index 4e2c37ac7f3..7b3a067b186 100644 --- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue +++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlDropdown, GlDropdownItem, GlLink } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { s__ } from '~/locale'; import { defaultIntegrationLevel, overrideDropdownDescriptions } from '../constants'; diff --git a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue index d8503910566..9472a3eeafe 100644 --- a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue +++ b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlModal } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue index 32878c6afa4..1bbecea05ad 100644 --- a/app/assets/javascripts/integrations/edit/components/trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/trigger_fields.vue @@ -1,7 +1,7 @@ <script> -import { mapGetters } from 'vuex'; -import { startCase } from 'lodash'; import { GlFormGroup, GlFormCheckbox, GlFormInput } from '@gitlab/ui'; +import { startCase } from 'lodash'; +import { mapGetters } from 'vuex'; import { __ } from '~/locale'; const typeWithPlaceholder = { diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js index deca11d07d9..ab9bdd9ca2e 100644 --- a/app/assets/javascripts/integrations/edit/index.js +++ b/app/assets/javascripts/integrations/edit/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; -import { createStore } from './store'; import IntegrationForm from './components/integration_form.vue'; +import { createStore } from './store'; function parseBooleanInData(data) { const result = {}; diff --git a/app/assets/javascripts/invite_member/components/invite_member_modal.vue b/app/assets/javascripts/invite_member/components/invite_member_modal.vue index ce79e1b58d2..144c1a2c22a 100644 --- a/app/assets/javascripts/invite_member/components/invite_member_modal.vue +++ b/app/assets/javascripts/invite_member/components/invite_member_modal.vue @@ -1,9 +1,9 @@ <script> import { GlModal, GlLink } from '@gitlab/ui'; -import { s__, __ } from '~/locale'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; -import eventHub from '../event_hub'; +import { s__, __ } from '~/locale'; import { OPEN_MODAL, MODAL_ID } from '../constants'; +import eventHub from '../event_hub'; export default { cancelProps: { diff --git a/app/assets/javascripts/invite_member/components/invite_member_trigger.vue b/app/assets/javascripts/invite_member/components/invite_member_trigger.vue index 6e886e0e002..56cf1ab2fc2 100644 --- a/app/assets/javascripts/invite_member/components/invite_member_trigger.vue +++ b/app/assets/javascripts/invite_member/components/invite_member_trigger.vue @@ -1,7 +1,7 @@ <script> import { GlLink } from '@gitlab/ui'; -import eventHub from '../event_hub'; import { OPEN_MODAL } from '../constants'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/invite_member/init_invite_member_modal.js b/app/assets/javascripts/invite_member/init_invite_member_modal.js index 901e3e315ee..c292bda1931 100644 --- a/app/assets/javascripts/invite_member/init_invite_member_modal.js +++ b/app/assets/javascripts/invite_member/init_invite_member_modal.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; import InviteMemberModal from './components/invite_member_modal.vue'; Vue.use(GlToast); diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue index e70bbfe152d..f5a65882fba 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -10,10 +10,10 @@ import { GlFormInput, } from '@gitlab/ui'; import { partition, isString } from 'lodash'; -import { s__, __, sprintf } from '~/locale'; import Api from '~/api'; import MembersTokenSelect from '~/invite_members/components/members_token_select.vue'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; +import { s__, __, sprintf } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/invite_members/components/members_token_select.vue b/app/assets/javascripts/invite_members/components/members_token_select.vue index ae27aaddb62..233a214013b 100644 --- a/app/assets/javascripts/invite_members/components/members_token_select.vue +++ b/app/assets/javascripts/invite_members/components/members_token_select.vue @@ -1,6 +1,6 @@ <script> -import { debounce } from 'lodash'; import { GlTokenSelector, GlAvatar, GlAvatarLabeled, GlSprintf } from '@gitlab/ui'; +import { debounce } from 'lodash'; import { __ } from '~/locale'; import { getUsers } from '~/rest_api'; import { USER_SEARCH_DELAY } from '../constants'; diff --git a/app/assets/javascripts/invite_members/init_invite_members_modal.js b/app/assets/javascripts/invite_members/init_invite_members_modal.js index 74c374018de..3de99dcc546 100644 --- a/app/assets/javascripts/invite_members/init_invite_members_modal.js +++ b/app/assets/javascripts/invite_members/init_invite_members_modal.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import { parseBoolean } from '~/lib/utils/common_utils'; +import Vue from 'vue'; import InviteMembersModal from '~/invite_members/components/invite_members_modal.vue'; +import { parseBoolean } from '~/lib/utils/common_utils'; Vue.use(GlToast); diff --git a/app/assets/javascripts/issuable/components/issuable_by_email.vue b/app/assets/javascripts/issuable/components/issuable_by_email.vue index 330118ce8a6..6d063b59922 100644 --- a/app/assets/javascripts/issuable/components/issuable_by_email.vue +++ b/app/assets/javascripts/issuable/components/issuable_by_email.vue @@ -9,9 +9,9 @@ import { GlFormInputGroup, GlIcon, } from '@gitlab/ui'; -import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; -import { sprintf, __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { sprintf, __ } from '~/locale'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; export default { name: 'IssuableByEmail', diff --git a/app/assets/javascripts/issuable/init_issuable_by_email.js b/app/assets/javascripts/issuable/init_issuable_by_email.js index 1fed55c3d8e..984b826234c 100644 --- a/app/assets/javascripts/issuable/init_issuable_by_email.js +++ b/app/assets/javascripts/issuable/init_issuable_by_email.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; import IssuableByEmail from './components/issuable_by_email.vue'; Vue.use(GlToast); diff --git a/app/assets/javascripts/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable_bulk_update_actions.js index b9e8c015d19..f507f072253 100644 --- a/app/assets/javascripts/issuable_bulk_update_actions.js +++ b/app/assets/javascripts/issuable_bulk_update_actions.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { difference, intersection, union } from 'lodash'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as Flash } from './flash'; +import axios from './lib/utils/axios_utils'; import { __ } from './locale'; export default { diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar.js b/app/assets/javascripts/issuable_bulk_update_sidebar.js index d6fa0f42bd4..ef98db5151a 100644 --- a/app/assets/javascripts/issuable_bulk_update_sidebar.js +++ b/app/assets/javascripts/issuable_bulk_update_sidebar.js @@ -3,11 +3,11 @@ import $ from 'jquery'; import { property } from 'lodash'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; -import MilestoneSelect from './milestone_select'; import issueStatusSelect from './issue_status_select'; -import subscriptionSelect from './subscription_select'; -import LabelsSelect from './labels_select'; import issueableEventHub from './issues_list/eventhub'; +import LabelsSelect from './labels_select'; +import MilestoneSelect from './milestone_select'; +import subscriptionSelect from './subscription_select'; const HIDDEN_CLASS = 'hidden'; const DISABLED_CONTENT_CLASS = 'disabled-content'; diff --git a/app/assets/javascripts/issuable_context.js b/app/assets/javascripts/issuable_context.js index 6fcff90b608..a87d4f077cc 100644 --- a/app/assets/javascripts/issuable_context.js +++ b/app/assets/javascripts/issuable_context.js @@ -1,8 +1,8 @@ +import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import $ from 'jquery'; import Cookies from 'js-cookie'; -import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; -import UsersSelect from './users_select'; import { loadCSSFile } from './lib/utils/css_utils'; +import UsersSelect from './users_select'; export default class IssuableContext { constructor(currentUser) { diff --git a/app/assets/javascripts/issuable_create/components/issuable_form.vue b/app/assets/javascripts/issuable_create/components/issuable_form.vue index d7b88cc7fc8..3cbd5620063 100644 --- a/app/assets/javascripts/issuable_create/components/issuable_form.vue +++ b/app/assets/javascripts/issuable_create/components/issuable_form.vue @@ -1,9 +1,8 @@ <script> import { GlForm, GlFormInput } from '@gitlab/ui'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; -import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; - import { DropdownVariant } from '~/vue_shared/components/sidebar/labels_select_vue/constants'; +import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; export default { LabelSelectVariant: DropdownVariant, diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index a8fd7aaecdf..1b06dffbae7 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -2,12 +2,12 @@ import $ from 'jquery'; import Pikaday from 'pikaday'; import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete'; import Autosave from './autosave'; -import UsersSelect from './users_select'; -import ZenMode from './zen_mode'; import AutoWidthDropdownSelect from './issuable/auto_width_dropdown_select'; +import { loadCSSFile } from './lib/utils/css_utils'; import { parsePikadayDate, pikadayToString } from './lib/utils/datetime_utility'; import { queryToObject, objectToQuery } from './lib/utils/url_utility'; -import { loadCSSFile } from './lib/utils/css_utils'; +import UsersSelect from './users_select'; +import ZenMode from './zen_mode'; const MR_SOURCE_BRANCH = 'merge_request[source_branch]'; const MR_TARGET_BRANCH = 'merge_request[target_branch]'; diff --git a/app/assets/javascripts/issuable_init_bulk_update_sidebar.js b/app/assets/javascripts/issuable_init_bulk_update_sidebar.js index da8969c80f3..179c2b83c6c 100644 --- a/app/assets/javascripts/issuable_init_bulk_update_sidebar.js +++ b/app/assets/javascripts/issuable_init_bulk_update_sidebar.js @@ -1,5 +1,5 @@ -import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar'; import issuableBulkUpdateActions from './issuable_bulk_update_actions'; +import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar'; export default { bulkUpdateSidebar: null, diff --git a/app/assets/javascripts/issuable_list/components/issuable_item.vue b/app/assets/javascripts/issuable_list/components/issuable_item.vue index df303665538..b114f6e7278 100644 --- a/app/assets/javascripts/issuable_list/components/issuable_item.vue +++ b/app/assets/javascripts/issuable_list/components/issuable_item.vue @@ -1,13 +1,12 @@ <script> import { GlLink, GlIcon, GlLabel, GlFormCheckbox, GlTooltipDirective } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import { getTimeago } from '~/lib/utils/datetime_utility'; import { isScopedLabel } from '~/lib/utils/common_utils'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; - +import { getTimeago } from '~/lib/utils/datetime_utility'; +import { __, sprintf } from '~/locale'; import IssuableAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; export default { components: { diff --git a/app/assets/javascripts/issuable_list/components/issuable_list_root.vue b/app/assets/javascripts/issuable_list/components/issuable_list_root.vue index 8a4c487f119..708e175cdb2 100644 --- a/app/assets/javascripts/issuable_list/components/issuable_list_root.vue +++ b/app/assets/javascripts/issuable_list/components/issuable_list_root.vue @@ -6,9 +6,9 @@ import { updateHistory, setUrlParams } from '~/lib/utils/url_utility'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { DEFAULT_SKELETON_COUNT } from '../constants'; -import IssuableTabs from './issuable_tabs.vue'; -import IssuableItem from './issuable_item.vue'; import IssuableBulkEditSidebar from './issuable_bulk_edit_sidebar.vue'; +import IssuableItem from './issuable_item.vue'; +import IssuableTabs from './issuable_tabs.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_show/components/issuable_body.vue b/app/assets/javascripts/issuable_show/components/issuable_body.vue index c084f328f42..02cf7a67727 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_body.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_body.vue @@ -3,9 +3,9 @@ import { GlLink } from '@gitlab/ui'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import IssuableTitle from './issuable_title.vue'; import IssuableDescription from './issuable_description.vue'; import IssuableEditForm from './issuable_edit_form.vue'; +import IssuableTitle from './issuable_title.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_show/components/issuable_description.vue b/app/assets/javascripts/issuable_show/components/issuable_description.vue index 091a4be5bd8..aa7e530972f 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_description.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_description.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; export default { diff --git a/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue b/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue index 830a740ff78..6d139541524 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_edit_form.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlForm, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import $ from 'jquery'; import Autosave from '~/autosave'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; diff --git a/app/assets/javascripts/issuable_show/components/issuable_header.vue b/app/assets/javascripts/issuable_show/components/issuable_header.vue index 9cfbc2d9bbc..de17f7e7f6b 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_header.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_header.vue @@ -2,8 +2,8 @@ import { GlIcon, GlButton, GlTooltipDirective, GlAvatarLink, GlAvatarLabeled } from '@gitlab/ui'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { isExternal } from '~/lib/utils/url_utility'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_show/components/issuable_show_root.vue b/app/assets/javascripts/issuable_show/components/issuable_show_root.vue index 2443338e8c4..240f35b74c8 100644 --- a/app/assets/javascripts/issuable_show/components/issuable_show_root.vue +++ b/app/assets/javascripts/issuable_show/components/issuable_show_root.vue @@ -1,8 +1,8 @@ <script> import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; -import IssuableHeader from './issuable_header.vue'; import IssuableBody from './issuable_body.vue'; +import IssuableHeader from './issuable_header.vue'; export default { components: { diff --git a/app/assets/javascripts/issuable_sidebar/components/issuable_sidebar_root.vue b/app/assets/javascripts/issuable_sidebar/components/issuable_sidebar_root.vue index 7cacba1cb65..8a159139af0 100644 --- a/app/assets/javascripts/issuable_sidebar/components/issuable_sidebar_root.vue +++ b/app/assets/javascripts/issuable_sidebar/components/issuable_sidebar_root.vue @@ -1,7 +1,7 @@ <script> -import Cookies from 'js-cookie'; import { GlIcon } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import Cookies from 'js-cookie'; import { parseBoolean } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/issuable_suggestions/components/item.vue b/app/assets/javascripts/issuable_suggestions/components/item.vue index 6e265b1bf42..dea7608685a 100644 --- a/app/assets/javascripts/issuable_suggestions/components/item.vue +++ b/app/assets/javascripts/issuable_suggestions/components/item.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable @gitlab/vue-require-i18n-strings */ -import { uniqueId } from 'lodash'; import { GlLink, GlTooltip, GlTooltipDirective, GlIcon } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; import { __ } from '~/locale'; -import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import timeago from '~/vue_shared/mixins/timeago'; export default { diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 576bd1f93ed..3f25682ab8b 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import { joinPaths } from '~/lib/utils/url_utility'; +import CreateMergeRequestDropdown from './create_merge_request_dropdown'; +import { deprecatedCreateFlash as flash } from './flash'; import axios from './lib/utils/axios_utils'; import { addDelimiter } from './lib/utils/text_utility'; -import { deprecatedCreateFlash as flash } from './flash'; -import CreateMergeRequestDropdown from './create_merge_request_dropdown'; import { __ } from './locale'; export default class Issue { diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index f5793363913..e70c18040b3 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -1,20 +1,20 @@ <script> import { GlIcon, GlIntersectionObserver } from '@gitlab/ui'; import Visibility from 'visibilityjs'; -import { __, s__, sprintf } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { visitUrl } from '~/lib/utils/url_utility'; import Poll from '~/lib/utils/poll'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { __, s__, sprintf } from '~/locale'; import recaptchaModalImplementor from '~/vue_shared/mixins/recaptcha_modal_implementor'; +import { IssuableStatus, IssuableStatusText, IssuableType } from '../constants'; import eventHub from '../event_hub'; import Service from '../services/index'; import Store from '../stores'; -import { IssuableStatus, IssuableStatusText, IssuableType } from '../constants'; -import titleComponent from './title.vue'; import descriptionComponent from './description.vue'; import editedComponent from './edited.vue'; import formComponent from './form.vue'; import PinnedLinks from './pinned_links.vue'; +import titleComponent from './title.vue'; export default { components: { diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue index ec454ef9e8d..5416d3bebd0 100644 --- a/app/assets/javascripts/issue_show/components/description.vue +++ b/app/assets/javascripts/issue_show/components/description.vue @@ -1,11 +1,11 @@ <script> -import $ from 'jquery'; import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import { s__, sprintf } from '~/locale'; +import $ from 'jquery'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import animateMixin from '../mixins/animate'; +import { s__, sprintf } from '~/locale'; import TaskList from '../../task_list'; import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor'; +import animateMixin from '../mixins/animate'; export default { directives: { diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index 14ada5adcf6..dd378c40b46 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -1,8 +1,8 @@ <script> import { GlButton } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; -import updateMixin from '../mixins/update'; import eventHub from '../event_hub'; +import updateMixin from '../mixins/update'; const issuableTypes = { issue: __('Issue'), diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue index b54d85d6247..dbec6f15cab 100644 --- a/app/assets/javascripts/issue_show/components/fields/description_template.vue +++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlIcon } from '@gitlab/ui'; +import $ from 'jquery'; import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors'; export default { diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue index ae884f49410..b7425448052 100644 --- a/app/assets/javascripts/issue_show/components/form.vue +++ b/app/assets/javascripts/issue_show/components/form.vue @@ -2,11 +2,11 @@ import $ from 'jquery'; import Autosave from '~/autosave'; import eventHub from '../event_hub'; -import lockedWarning from './locked_warning.vue'; -import titleField from './fields/title.vue'; -import descriptionField from './fields/description.vue'; import editActions from './edit_actions.vue'; +import descriptionField from './fields/description.vue'; import descriptionTemplate from './fields/description_template.vue'; +import titleField from './fields/title.vue'; +import lockedWarning from './locked_warning.vue'; export default { components: { diff --git a/app/assets/javascripts/issue_show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issue_show/components/incidents/incident_tabs.vue index 9fc90b501eb..84107d3eaca 100644 --- a/app/assets/javascripts/issue_show/components/incidents/incident_tabs.vue +++ b/app/assets/javascripts/issue_show/components/incidents/incident_tabs.vue @@ -1,10 +1,10 @@ <script> import { GlTab, GlTabs } from '@gitlab/ui'; import createFlash from '~/flash'; +import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; import { s__ } from '~/locale'; -import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; import Tracking from '~/tracking'; -import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; +import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; import DescriptionComponent from '../description.vue'; import getAlert from './graphql/queries/get_alert.graphql'; import HighlightBar from './highlight_bar.vue'; diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue index b03a91716fe..806d95ca748 100644 --- a/app/assets/javascripts/issue_show/components/title.vue +++ b/app/assets/javascripts/issue_show/components/title.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlTooltipDirective, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import animateMixin from '../mixins/animate'; import eventHub from '../event_hub'; +import animateMixin from '../mixins/animate'; export default { components: { diff --git a/app/assets/javascripts/issue_show/utils/parse_data.js b/app/assets/javascripts/issue_show/utils/parse_data.js index d5e7d2a8807..19d1e0eebcb 100644 --- a/app/assets/javascripts/issue_show/utils/parse_data.js +++ b/app/assets/javascripts/issue_show/utils/parse_data.js @@ -1,5 +1,5 @@ -import * as Sentry from '~/sentry/wrapper'; import { sanitize } from '~/lib/dompurify'; +import * as Sentry from '~/sentry/wrapper'; // We currently load + parse the data from the issue app and related merge request let cachedParsedData; diff --git a/app/assets/javascripts/issues_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue index 6cadcd2043b..b7af6e098e1 100644 --- a/app/assets/javascripts/issues_list/components/issuable.vue +++ b/app/assets/javascripts/issues_list/components/issuable.vue @@ -5,7 +5,7 @@ */ // TODO: need to move this component to graphql - https://gitlab.com/gitlab-org/gitlab/-/issues/221246 -import { escape, isNumber } from 'lodash'; +import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg'; import { GlLink, GlTooltipDirective as GlTooltip, @@ -14,7 +14,8 @@ import { GlIcon, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; -import jiraLogo from '@gitlab/svgs/dist/illustrations/logos/jira.svg'; +import { escape, isNumber } from 'lodash'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { dateInWords, formatDate, @@ -23,13 +24,11 @@ import { timeFor, newDateAsLocaleTime, } from '~/lib/utils/datetime_utility'; +import { convertToCamelCase } from '~/lib/utils/text_utility'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; import { sprintf, __ } from '~/locale'; import initUserPopovers from '~/user_popovers'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; -import { isScopedLabel } from '~/lib/utils/common_utils'; - -import { convertToCamelCase } from '~/lib/utils/text_utility'; export default { i18n: { diff --git a/app/assets/javascripts/issues_list/components/issuables_list_app.vue b/app/assets/javascripts/issues_list/components/issuables_list_app.vue index 225d56c11f0..8022e2234a9 100644 --- a/app/assets/javascripts/issues_list/components/issuables_list_app.vue +++ b/app/assets/javascripts/issues_list/components/issuables_list_app.vue @@ -1,11 +1,11 @@ <script> -import { toNumber, omit } from 'lodash'; import { GlEmptyState, GlPagination, GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; +import { toNumber, omit } from 'lodash'; import { deprecatedCreateFlash as flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { @@ -14,10 +14,10 @@ import { historyPushState, getParameterByName, } from '~/lib/utils/common_utils'; +import { setUrlParams } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import initManualOrdering from '~/manual_ordering'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; -import { setUrlParams } from '~/lib/utils/url_utility'; import { sortOrderMap, availableSortOptionsJira, diff --git a/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue index 534f478cb7e..7396cfe27b3 100644 --- a/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue +++ b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue @@ -1,13 +1,13 @@ <script> import { GlAlert, GlLabel } from '@gitlab/ui'; import { last } from 'lodash'; -import { n__ } from '~/locale'; import { calculateJiraImportLabel, isInProgress, setFinishedAlertHideMap, shouldShowFinishedAlert, } from '~/jira_import/utils/jira_import_utils'; +import { n__ } from '~/locale'; import getIssuesListDetailsQuery from '../queries/get_issues_list_details.query.graphql'; export default { diff --git a/app/assets/javascripts/issues_list/index.js b/app/assets/javascripts/issues_list/index.js index 42e97766b95..5c3910955bc 100644 --- a/app/assets/javascripts/issues_list/index.js +++ b/app/assets/javascripts/issues_list/index.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import { parseBoolean, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import JiraIssuesListRoot from './components/jira_issues_list_root.vue'; import IssuablesListApp from './components/issuables_list_app.vue'; +import JiraIssuesListRoot from './components/jira_issues_list_root.vue'; function mountJiraIssuesListApp() { const el = document.querySelector('.js-projects-issues-root'); diff --git a/app/assets/javascripts/jira_connect/components/app.vue b/app/assets/javascripts/jira_connect/components/app.vue index ed01c188752..a4ba86dc6a1 100644 --- a/app/assets/javascripts/jira_connect/components/app.vue +++ b/app/assets/javascripts/jira_connect/components/app.vue @@ -1,10 +1,10 @@ <script> -import { mapState } from 'vuex'; import { GlAlert, GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; +import { getLocation } from '~/jira_connect/api'; import { __ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { getLocation } from '~/jira_connect/api'; import GroupsList from './groups_list.vue'; export default { diff --git a/app/assets/javascripts/jira_connect/components/groups_list.vue b/app/assets/javascripts/jira_connect/components/groups_list.vue index 8671ecaa78a..69f2903388c 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list.vue +++ b/app/assets/javascripts/jira_connect/components/groups_list.vue @@ -1,9 +1,9 @@ <script> import { GlTabs, GlTab, GlLoadingIcon, GlPagination, GlAlert } from '@gitlab/ui'; -import { s__ } from '~/locale'; -import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { fetchGroups } from '~/jira_connect/api'; import { defaultPerPage } from '~/jira_connect/constants'; +import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import GroupsListItem from './groups_list_item.vue'; export default { diff --git a/app/assets/javascripts/jira_connect/components/groups_list_item.vue b/app/assets/javascripts/jira_connect/components/groups_list_item.vue index 305f440707e..69b09ab0a21 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list_item.vue +++ b/app/assets/javascripts/jira_connect/components/groups_list_item.vue @@ -1,8 +1,7 @@ <script> import { GlAvatar, GlButton, GlIcon } from '@gitlab/ui'; -import { s__ } from '~/locale'; - import { addSubscription } from '~/jira_connect/api'; +import { s__ } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/index.js index 082c74150c5..7191fce3c33 100644 --- a/app/assets/javascripts/jira_connect/index.js +++ b/app/assets/javascripts/jira_connect/index.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import setConfigs from '@gitlab/ui/dist/config'; -import Translate from '~/vue_shared/translate'; +import Vue from 'vue'; +import { addSubscription, removeSubscription, getLocation } from '~/jira_connect/api'; import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin'; +import Translate from '~/vue_shared/translate'; -import { addSubscription, removeSubscription, getLocation } from '~/jira_connect/api'; import JiraConnectApp from './components/app.vue'; import createStore from './store'; import { SET_ERROR_MESSAGE } from './store/mutation_types'; diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue index c78d36355e2..9d451f94e8a 100644 --- a/app/assets/javascripts/jobs/components/environments_block.vue +++ b/app/assets/javascripts/jobs/components/environments_block.vue @@ -1,6 +1,6 @@ <script> -import { isEmpty } from 'lodash'; import { GlSprintf, GlLink } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import { __ } from '../../locale'; diff --git a/app/assets/javascripts/jobs/components/erased_block.vue b/app/assets/javascripts/jobs/components/erased_block.vue index 91c36f38447..a815689659e 100644 --- a/app/assets/javascripts/jobs/components/erased_block.vue +++ b/app/assets/javascripts/jobs/components/erased_block.vue @@ -1,6 +1,6 @@ <script> -import { isEmpty } from 'lodash'; import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 52b60a1effd..7107380b146 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -1,21 +1,21 @@ <script> -import { throttle, isEmpty } from 'lodash'; -import { mapGetters, mapState, mapActions } from 'vuex'; import { GlLoadingIcon, GlIcon, GlSafeHtmlDirective as SafeHtml, GlAlert } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { throttle, isEmpty } from 'lodash'; +import { mapGetters, mapState, mapActions } from 'vuex'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; import { polyfillSticky } from '~/lib/utils/sticky'; -import CiHeader from '~/vue_shared/components/header_ci_component.vue'; import { sprintf } from '~/locale'; +import CiHeader from '~/vue_shared/components/header_ci_component.vue'; import delayedJobMixin from '../mixins/delayed_job_mixin'; import EmptyState from './empty_state.vue'; import EnvironmentsBlock from './environments_block.vue'; import ErasedBlock from './erased_block.vue'; import LogTopBar from './job_log_controllers.vue'; +import Log from './log/log.vue'; +import Sidebar from './sidebar.vue'; import StuckBlock from './stuck_block.vue'; import UnmetPrerequisitesBlock from './unmet_prerequisites_block.vue'; -import Sidebar from './sidebar.vue'; -import Log from './log/log.vue'; export default { name: 'JobPageApp', diff --git a/app/assets/javascripts/jobs/components/job_container_item.vue b/app/assets/javascripts/jobs/components/job_container_item.vue index 6a803c06df2..e68368919ab 100644 --- a/app/assets/javascripts/jobs/components/job_container_item.vue +++ b/app/assets/javascripts/jobs/components/job_container_item.vue @@ -1,8 +1,8 @@ <script> import { GlLink, GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import { sprintf } from '~/locale'; +import CiIcon from '~/vue_shared/components/ci_icon.vue'; export default { components: { diff --git a/app/assets/javascripts/jobs/components/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job_log_controllers.vue index 7e7d9a0549b..2453fea9e58 100644 --- a/app/assets/javascripts/jobs/components/job_log_controllers.vue +++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui'; -import { polyfillSticky } from '~/lib/utils/sticky'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import { polyfillSticky } from '~/lib/utils/sticky'; import { __, sprintf } from '~/locale'; import scrollDown from '../svg/scroll_down.svg'; diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue index 4c1c00cb2a7..3bb1f58573c 100644 --- a/app/assets/javascripts/jobs/components/log/line_header.vue +++ b/app/assets/javascripts/jobs/components/log/line_header.vue @@ -1,7 +1,7 @@ <script> import { GlIcon } from '@gitlab/ui'; -import LineNumber from './line_number.vue'; import DurationBadge from './duration_badge.vue'; +import LineNumber from './line_number.vue'; export default { components: { diff --git a/app/assets/javascripts/jobs/components/manual_variables_form.vue b/app/assets/javascripts/jobs/components/manual_variables_form.vue index 24276cbe60a..a1f4f7abb77 100644 --- a/app/assets/javascripts/jobs/components/manual_variables_form.vue +++ b/app/assets/javascripts/jobs/components/manual_variables_form.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ +import { GlButton } from '@gitlab/ui'; import { uniqueId } from 'lodash'; import { mapActions } from 'vuex'; -import { GlButton } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; export default { diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index c51a3f459c7..f63fe72a71a 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -1,17 +1,17 @@ <script> +import { GlButton, GlIcon, GlLink } from '@gitlab/ui'; import { isEmpty } from 'lodash'; import { mapActions, mapGetters, mapState } from 'vuex'; -import { GlButton, GlIcon, GlLink } from '@gitlab/ui'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import { JOB_SIDEBAR } from '../constants'; import ArtifactsBlock from './artifacts_block.vue'; -import JobSidebarRetryButton from './job_sidebar_retry_button.vue'; -import JobRetryForwardDeploymentModal from './job_retry_forward_deployment_modal.vue'; -import TriggerBlock from './trigger_block.vue'; import CommitBlock from './commit_block.vue'; -import StagesDropdown from './stages_dropdown.vue'; +import JobRetryForwardDeploymentModal from './job_retry_forward_deployment_modal.vue'; +import JobSidebarRetryButton from './job_sidebar_retry_button.vue'; import JobsContainer from './jobs_container.vue'; import JobSidebarDetailsContainer from './sidebar_job_details_container.vue'; +import StagesDropdown from './stages_dropdown.vue'; +import TriggerBlock from './trigger_block.vue'; export const forwardDeploymentFailureModalId = 'forward-deployment-failure'; diff --git a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue index 84883ead125..62cd30fb320 100644 --- a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue +++ b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue @@ -1,9 +1,9 @@ <script> import { mapState } from 'vuex'; +import { helpPagePath } from '~/helpers/help_page_helper'; +import { timeIntervalInWords } from '~/lib/utils/datetime_utility'; import { __, sprintf } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { timeIntervalInWords } from '~/lib/utils/datetime_utility'; -import { helpPagePath } from '~/helpers/help_page_helper'; import DetailRow from './sidebar_detail_row.vue'; export default { diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue index 7d4fe0a0680..64c4031b002 100644 --- a/app/assets/javascripts/jobs/components/stages_dropdown.vue +++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue @@ -1,6 +1,6 @@ <script> -import { isEmpty } from 'lodash'; import { GlLink, GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; export default { diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js index 6b0ca8ab986..c89aeada69d 100644 --- a/app/assets/javascripts/jobs/store/actions.js +++ b/app/assets/javascripts/jobs/store/actions.js @@ -1,9 +1,9 @@ import Visibility from 'visibilityjs'; +import { deprecatedCreateFlash as flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import Poll from '~/lib/utils/poll'; import { setFaviconOverlay, resetFavicon } from '~/lib/utils/favicon'; -import { deprecatedCreateFlash as flash } from '~/flash'; -import { __ } from '~/locale'; +import httpStatusCodes from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; import { canScroll, isScrolledToBottom, @@ -12,7 +12,7 @@ import { scrollDown, scrollUp, } from '~/lib/utils/scroll_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; +import { __ } from '~/locale'; import * as types from './mutation_types'; export const init = ({ dispatch }, { endpoint, logState, pagePath }) => { diff --git a/app/assets/javascripts/jobs/store/index.js b/app/assets/javascripts/jobs/store/index.js index bba01426af7..467c692b438 100644 --- a/app/assets/javascripts/jobs/store/index.js +++ b/app/assets/javascripts/jobs/store/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; import * as actions from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index dd5bba45c21..56e69ab9418 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -4,15 +4,15 @@ import $ from 'jquery'; import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; -import { isScopedLabel } from '~/lib/utils/common_utils'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { sprintf, __ } from './locale'; -import axios from './lib/utils/axios_utils'; -import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; +import { isScopedLabel } from '~/lib/utils/common_utils'; +import boardsStore from './boards/stores/boards_store'; +import ModalStore from './boards/stores/modal_store'; import CreateLabelDropdown from './create_label'; import { deprecatedCreateFlash as flash } from './flash'; -import ModalStore from './boards/stores/modal_store'; -import boardsStore from './boards/stores/boards_store'; +import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; +import axios from './lib/utils/axios_utils'; +import { sprintf, __ } from './locale'; export default class LabelsSelect { constructor(els, options = {}) { diff --git a/app/assets/javascripts/lib/graphql.js b/app/assets/javascripts/lib/graphql.js index d974e36f6f0..bda5550a9f4 100644 --- a/app/assets/javascripts/lib/graphql.js +++ b/app/assets/javascripts/lib/graphql.js @@ -1,11 +1,11 @@ -import { ApolloClient } from 'apollo-client'; import { InMemoryCache } from 'apollo-cache-inmemory'; -import { createUploadLink } from 'apollo-upload-client'; +import { ApolloClient } from 'apollo-client'; import { ApolloLink } from 'apollo-link'; import { BatchHttpLink } from 'apollo-link-batch-http'; +import { createUploadLink } from 'apollo-upload-client'; +import { StartupJSLink } from '~/lib/utils/apollo_startup_js_link'; import csrf from '~/lib/utils/csrf'; import PerformanceBarService from '~/performance_bar/services/performance_bar_service'; -import { StartupJSLink } from '~/lib/utils/apollo_startup_js_link'; export const fetchPolicies = { CACHE_FIRST: 'cache-first', diff --git a/app/assets/javascripts/lib/utils/axios_utils.js b/app/assets/javascripts/lib/utils/axios_utils.js index cb479e243b2..204c84b879e 100644 --- a/app/assets/javascripts/lib/utils/axios_utils.js +++ b/app/assets/javascripts/lib/utils/axios_utils.js @@ -1,7 +1,7 @@ import axios from 'axios'; +import setupAxiosStartupCalls from './axios_startup_calls'; import csrf from './csrf'; import suppressAjaxErrorsDuringNavigation from './suppress_ajax_errors_during_navigation'; -import setupAxiosStartupCalls from './axios_startup_calls'; axios.defaults.headers.common[csrf.headerKey] = csrf.token; // Used by Rails to check if it is a valid XHR request diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index 3ddbcd64511..73eadfe3cbe 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -4,11 +4,11 @@ import { GlBreakpointInstance as breakpointInstance } from '@gitlab/ui/dist/utils'; import $ from 'jquery'; -import { isFunction, defer } from 'lodash'; import Cookies from 'js-cookie'; -import { getLocationHash } from './url_utility'; +import { isFunction, defer } from 'lodash'; import { convertToCamelCase, convertToSnakeCase } from './text_utility'; import { isObject } from './type_utility'; +import { getLocationHash } from './url_utility'; export const getPagePath = (index = 0) => { const page = $('body').attr('data-page') || ''; diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index d475dd6b9e6..38b3b26dc44 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -1,7 +1,7 @@ +import dateFormat from 'dateformat'; import $ from 'jquery'; import { isString, mapValues, isNumber, reduce } from 'lodash'; import * as timeago from 'timeago.js'; -import dateFormat from 'dateformat'; import { languageCode, s__, __, n__ } from '../../locale'; const MILLISECONDS_IN_HOUR = 60 * 60 * 1000; diff --git a/app/assets/javascripts/lib/utils/poll.js b/app/assets/javascripts/lib/utils/poll.js index 6ec1bd206e6..71782c9a4ce 100644 --- a/app/assets/javascripts/lib/utils/poll.js +++ b/app/assets/javascripts/lib/utils/poll.js @@ -1,5 +1,5 @@ -import httpStatusCodes, { successCodes } from './http_status'; import { normalizeHeaders } from './common_utils'; +import httpStatusCodes, { successCodes } from './http_status'; /** * Polling utility for handling realtime updates. diff --git a/app/assets/javascripts/lib/utils/poll_until_complete.js b/app/assets/javascripts/lib/utils/poll_until_complete.js index d3b551ca755..3545db3a227 100644 --- a/app/assets/javascripts/lib/utils/poll_until_complete.js +++ b/app/assets/javascripts/lib/utils/poll_until_complete.js @@ -1,6 +1,6 @@ import axios from '~/lib/utils/axios_utils'; -import Poll from './poll'; import httpStatusCodes from './http_status'; +import Poll from './poll'; /** * Polls an endpoint until it returns either a 200 OK or a error status. diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js index 2c993c8b128..5e66aa05218 100644 --- a/app/assets/javascripts/lib/utils/text_markdown.js +++ b/app/assets/javascripts/lib/utils/text_markdown.js @@ -1,7 +1,7 @@ /* eslint-disable func-names, no-param-reassign, operator-assignment, consistent-return */ import $ from 'jquery'; -import { insertText } from '~/lib/utils/common_utils'; import Shortcuts from '~/behaviors/shortcuts/shortcuts'; +import { insertText } from '~/lib/utils/common_utils'; const LINK_TAG_PATTERN = '[{text}](url)'; diff --git a/app/assets/javascripts/logs/components/environment_logs.vue b/app/assets/javascripts/logs/components/environment_logs.vue index 2ce8d9815b5..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,13 +8,15 @@ import { GlDropdownDivider, GlInfiniteScroll, } from '@gitlab/ui'; +import { throttle } from 'lodash'; +import { mapActions, mapState, mapGetters } from 'vuex'; -import { defaultTimeRange } from '~/vue_shared/constants'; import { timeRangeFromUrl } from '~/monitoring/utils'; +import { defaultTimeRange } from '~/vue_shared/constants'; import { formatDate } from '../utils'; -import LogSimpleFilters from './log_simple_filters.vue'; import LogAdvancedFilters from './log_advanced_filters.vue'; import LogControlButtons from './log_control_buttons.vue'; +import LogSimpleFilters from './log_simple_filters.vue'; export default { components: { 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 6ee1df3c3fe..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 { 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/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 () => ({ /** diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 71dffe744fb..b5596e257f3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -12,8 +12,12 @@ import './behaviors'; import applyGitLabUIConfig from '@gitlab/ui/dist/config'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { initRails } from '~/lib/utils/rails_ujs'; -import * as tooltips from '~/tooltips'; import * as popovers from '~/popovers'; +import * as tooltips from '~/tooltips'; +import initAlertHandler from './alert_handler'; +import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash'; +import initTodoToggle from './header'; +import initLayoutNav from './layout_nav'; import { handleLocationHash, addSelectOnFocusBehaviour, @@ -23,22 +27,18 @@ import { localTimeAgo } from './lib/utils/datetime_utility'; import { getLocationHash, visitUrl } from './lib/utils/url_utility'; // everything else -import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash'; -import initTodoToggle from './header'; -import initLayoutNav from './layout_nav'; -import initAlertHandler from './alert_handler'; import './feature_highlight/feature_highlight_options'; import LazyLoader from './lazy_loader'; +import { __ } from './locale'; import initLogoAnimation from './logo'; import initFrequentItemDropdowns from './frequent_items'; import initBreadcrumbs from './breadcrumb'; +import initPersistentUserCallouts from './persistent_user_callouts'; +import { initUserTracking, initDefaultTrackers } from './tracking'; import initUsagePingConsent from './usage_ping_consent'; import GlFieldErrors from './gl_field_errors'; import initUserPopovers from './user_popovers'; import initBroadcastNotifications from './broadcast_notification'; -import initPersistentUserCallouts from './persistent_user_callouts'; -import { initUserTracking, initDefaultTrackers } from './tracking'; -import { __ } from './locale'; import 'ee_else_ce/main_ee'; diff --git a/app/assets/javascripts/manual_ordering.js b/app/assets/javascripts/manual_ordering.js index 04eaa0c77c3..540314f8f9b 100644 --- a/app/assets/javascripts/manual_ordering.js +++ b/app/assets/javascripts/manual_ordering.js @@ -1,11 +1,11 @@ import Sortable from 'sortablejs'; -import { s__ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { getBoardSortableDefaultOptions, sortableStart, } from '~/boards/mixins/sortable_default_options'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; +import { s__ } from '~/locale'; const updateIssue = (url, issueList, { move_before_id, move_after_id }) => axios diff --git a/app/assets/javascripts/members.js b/app/assets/javascripts/members.js index 4cf4fdd12bf..a8edeaf5176 100644 --- a/app/assets/javascripts/members.js +++ b/app/assets/javascripts/members.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { Rails } from '~/lib/utils/rails_ujs'; -import { disableButtonIfEmptyField } from '~/lib/utils/common_utils'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { disableButtonIfEmptyField } from '~/lib/utils/common_utils'; +import { Rails } from '~/lib/utils/rails_ujs'; import { __, sprintf } from '~/locale'; export default class Members { diff --git a/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue index 77b41996ab5..35966be7363 100644 --- a/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/access_request_action_buttons.vue @@ -1,8 +1,8 @@ <script> import { s__, sprintf } from '~/locale'; import ActionButtonGroup from './action_button_group.vue'; -import RemoveMemberButton from './remove_member_button.vue'; import ApproveAccessRequestButton from './approve_access_request_button.vue'; +import RemoveMemberButton from './remove_member_button.vue'; export default { name: 'AccessRequestActionButtons', diff --git a/app/assets/javascripts/members/components/action_buttons/approve_access_request_button.vue b/app/assets/javascripts/members/components/action_buttons/approve_access_request_button.vue index e8a53ff173d..83f266779f2 100644 --- a/app/assets/javascripts/members/components/action_buttons/approve_access_request_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/approve_access_request_button.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlButton, GlForm, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; import csrf from '~/lib/utils/csrf'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/members/components/action_buttons/leave_button.vue b/app/assets/javascripts/members/components/action_buttons/leave_button.vue index 443a962e0cf..f600a207b8d 100644 --- a/app/assets/javascripts/members/components/action_buttons/leave_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/leave_button.vue @@ -1,8 +1,8 @@ <script> import { GlButton, GlModalDirective, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; -import LeaveModal from '../modals/leave_modal.vue'; import { LEAVE_MODAL_ID } from '../../constants'; +import LeaveModal from '../modals/leave_modal.vue'; export default { name: 'LeaveButton', diff --git a/app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue b/app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue index 0120ab08556..3b87c29c1bc 100644 --- a/app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue @@ -1,6 +1,6 @@ <script> -import { mapActions } from 'vuex'; import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import { s__ } from '~/locale'; export default { diff --git a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue index b0b7ff4ce9a..cb71be39ebc 100644 --- a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; export default { name: 'RemoveMemberButton', diff --git a/app/assets/javascripts/members/components/action_buttons/resend_invite_button.vue b/app/assets/javascripts/members/components/action_buttons/resend_invite_button.vue index 1cc3fd17e98..261a6279920 100644 --- a/app/assets/javascripts/members/components/action_buttons/resend_invite_button.vue +++ b/app/assets/javascripts/members/components/action_buttons/resend_invite_button.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; import csrf from '~/lib/utils/csrf'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue index 70e7a2a6948..f779d1755a5 100644 --- a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue @@ -1,8 +1,8 @@ <script> import { s__, sprintf } from '~/locale'; import ActionButtonGroup from './action_button_group.vue'; -import RemoveMemberButton from './remove_member_button.vue'; import LeaveButton from './leave_button.vue'; +import RemoveMemberButton from './remove_member_button.vue'; export default { name: 'UserActionButtons', diff --git a/app/assets/javascripts/members/components/app.vue b/app/assets/javascripts/members/components/app.vue index 0aee50e529d..27fceb7374e 100644 --- a/app/assets/javascripts/members/components/app.vue +++ b/app/assets/javascripts/members/components/app.vue @@ -1,10 +1,10 @@ <script> -import { mapState, mapMutations } from 'vuex'; import { GlAlert } from '@gitlab/ui'; +import { mapState, mapMutations } from 'vuex'; import { scrollToElement } from '~/lib/utils/common_utils'; import { HIDE_ERROR } from '../store/mutation_types'; -import MembersTable from './table/members_table.vue'; import FilterSortContainer from './filter_sort/filter_sort_container.vue'; +import MembersTable from './table/members_table.vue'; export default { name: 'MembersApp', diff --git a/app/assets/javascripts/members/components/avatars/user_avatar.vue b/app/assets/javascripts/members/components/avatars/user_avatar.vue index 991f77cf3da..79dda3c1379 100644 --- a/app/assets/javascripts/members/components/avatars/user_avatar.vue +++ b/app/assets/javascripts/members/components/avatars/user_avatar.vue @@ -6,8 +6,8 @@ import { GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; import { generateBadges } from 'ee_else_ce/members/utils'; -import { __ } from '~/locale'; import { glEmojiTag } from '~/emoji'; +import { __ } from '~/locale'; import { AVATAR_SIZE } from '../../constants'; export default { diff --git a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue index cf7501d84fa..039ee9a0207 100644 --- a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue +++ b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue @@ -1,11 +1,11 @@ <script> -import { mapState } from 'vuex'; import { GlFilteredSearchToken } from '@gitlab/ui'; -import { setUrlParams, queryToObject } from '~/lib/utils/url_utility'; +import { mapState } from 'vuex'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { setUrlParams, queryToObject } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; -import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { SEARCH_TOKEN_TYPE, SORT_PARAM } from '~/members/constants'; +import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; export default { name: 'MembersFilteredSearchBar', diff --git a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue index bcfe559768d..9fa8772faf4 100644 --- a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue +++ b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue @@ -1,9 +1,9 @@ <script> -import { mapState } from 'vuex'; import { GlSorting, GlSortingItem } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { visitUrl } from '~/lib/utils/url_utility'; -import { parseSortParam, buildSortHref } from '~/members/utils'; import { FIELDS } from '~/members/constants'; +import { parseSortParam, buildSortHref } from '~/members/utils'; export default { name: 'SortDropdown', diff --git a/app/assets/javascripts/members/components/modals/leave_modal.vue b/app/assets/javascripts/members/components/modals/leave_modal.vue index d231c7eabfa..a0f978d85cc 100644 --- a/app/assets/javascripts/members/components/modals/leave_modal.vue +++ b/app/assets/javascripts/members/components/modals/leave_modal.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlModal, GlForm, GlSprintf, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; import csrf from '~/lib/utils/csrf'; import { __, s__, sprintf } from '~/locale'; import { LEAVE_MODAL_ID } from '../../constants'; diff --git a/app/assets/javascripts/members/components/modals/remove_group_link_modal.vue b/app/assets/javascripts/members/components/modals/remove_group_link_modal.vue index 2bf61c7795a..1ba6bf9aba6 100644 --- a/app/assets/javascripts/members/components/modals/remove_group_link_modal.vue +++ b/app/assets/javascripts/members/components/modals/remove_group_link_modal.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlModal, GlSprintf, GlForm } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import csrf from '~/lib/utils/csrf'; import { __, s__, sprintf } from '~/locale'; import { REMOVE_GROUP_LINK_MODAL_ID } from '../../constants'; diff --git a/app/assets/javascripts/members/components/table/member_action_buttons.vue b/app/assets/javascripts/members/components/table/member_action_buttons.vue index c61ebec33bd..6f15f079d2d 100644 --- a/app/assets/javascripts/members/components/table/member_action_buttons.vue +++ b/app/assets/javascripts/members/components/table/member_action_buttons.vue @@ -1,9 +1,9 @@ <script> -import UserActionButtons from '../action_buttons/user_action_buttons.vue'; +import { MEMBER_TYPES } from '../../constants'; +import AccessRequestActionButtons from '../action_buttons/access_request_action_buttons.vue'; import GroupActionButtons from '../action_buttons/group_action_buttons.vue'; import InviteActionButtons from '../action_buttons/invite_action_buttons.vue'; -import AccessRequestActionButtons from '../action_buttons/access_request_action_buttons.vue'; -import { MEMBER_TYPES } from '../../constants'; +import UserActionButtons from '../action_buttons/user_action_buttons.vue'; export default { name: 'MemberActionButtons', diff --git a/app/assets/javascripts/members/components/table/member_avatar.vue b/app/assets/javascripts/members/components/table/member_avatar.vue index a1f98d4008a..92b757ffcba 100644 --- a/app/assets/javascripts/members/components/table/member_avatar.vue +++ b/app/assets/javascripts/members/components/table/member_avatar.vue @@ -1,8 +1,8 @@ <script> import { kebabCase } from 'lodash'; -import UserAvatar from '../avatars/user_avatar.vue'; -import InviteAvatar from '../avatars/invite_avatar.vue'; import GroupAvatar from '../avatars/group_avatar.vue'; +import InviteAvatar from '../avatars/invite_avatar.vue'; +import UserAvatar from '../avatars/user_avatar.vue'; export default { name: 'MemberAvatar', diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index cfe9e40cde2..9a3edff19ff 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -1,18 +1,18 @@ <script> -import { mapState } from 'vuex'; import { GlTable, GlBadge } from '@gitlab/ui'; +import { mapState } from 'vuex'; import MembersTableCell from 'ee_else_ce/members/components/table/members_table_cell.vue'; import { canOverride, canRemove, canResend, canUpdate } from 'ee_else_ce/members/utils'; import initUserPopovers from '~/user_popovers'; import { FIELDS } from '../../constants'; import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue'; -import MemberAvatar from './member_avatar.vue'; -import MemberSource from './member_source.vue'; import CreatedAt from './created_at.vue'; +import ExpirationDatepicker from './expiration_datepicker.vue'; import ExpiresAt from './expires_at.vue'; import MemberActionButtons from './member_action_buttons.vue'; +import MemberAvatar from './member_avatar.vue'; +import MemberSource from './member_source.vue'; import RoleDropdown from './role_dropdown.vue'; -import ExpirationDatepicker from './expiration_datepicker.vue'; export default { name: 'MembersTable', diff --git a/app/assets/javascripts/members/index.js b/app/assets/javascripts/members/index.js index bd80bb2485b..fe174d9beb6 100644 --- a/app/assets/javascripts/members/index.js +++ b/app/assets/javascripts/members/index.js @@ -1,6 +1,6 @@ +import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; import Vuex from 'vuex'; -import { GlToast } from '@gitlab/ui'; import { parseDataAttributes } from 'ee_else_ce/members/utils'; import App from './components/app.vue'; import membersStore from './store'; diff --git a/app/assets/javascripts/members/store/index.js b/app/assets/javascripts/members/store/index.js index 34c102999d2..45f4eefffc9 100644 --- a/app/assets/javascripts/members/store/index.js +++ b/app/assets/javascripts/members/store/index.js @@ -1,6 +1,6 @@ -import createState from 'ee_else_ce/members/store/state'; -import mutations from 'ee_else_ce/members/store/mutations'; import * as actions from 'ee_else_ce/members/store/actions'; +import mutations from 'ee_else_ce/members/store/mutations'; +import createState from 'ee_else_ce/members/store/state'; export default (initialState) => ({ state: createState(initialState), diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js index bac83533214..4de2dadb490 100644 --- a/app/assets/javascripts/members/utils.js +++ b/app/assets/javascripts/members/utils.js @@ -1,11 +1,11 @@ import { isUndefined } from 'lodash'; -import { __ } from '~/locale'; import { getParameterByName, convertObjectPropsToCamelCase, parseBoolean, } from '~/lib/utils/common_utils'; import { setUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import { FIELDS, DEFAULT_SORT, diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js index 87642c7a698..6eaabbb3519 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js @@ -3,10 +3,10 @@ // for its template. /* eslint-disable no-param-reassign, @gitlab/no-runtime-template-compiler */ -import Vue from 'vue'; import { debounce } from 'lodash'; -import axios from '~/lib/utils/axios_utils'; +import Vue from 'vue'; import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; ((global) => { diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 693f0b619a8..fb3444262ea 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign, babel/camelcase, no-nested-ternary, no-continue */ import $ from 'jquery'; -import Vue from 'vue'; import Cookies from 'js-cookie'; +import Vue from 'vue'; import { s__ } from '~/locale'; ((global) => { diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 96b2e2a2240..e3972b8b574 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -4,8 +4,8 @@ /* eslint-disable @gitlab/no-runtime-template-compiler */ import $ from 'jquery'; import Vue from 'vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; import { __ } from '~/locale'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; import { deprecatedCreateFlash as createFlash } from '../flash'; import initIssuableSidebar from '../init_issuable_sidebar'; import './merge_conflict_store'; diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index 7bcfe529175..1a0156f8c0e 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -1,14 +1,14 @@ /* eslint-disable func-names, no-underscore-dangle, consistent-return */ import $ from 'jquery'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __ } from '~/locale'; import eventHub from '~/vue_merge_request_widget/event_hub'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from './lib/utils/axios_utils'; -import TaskList from './task_list'; -import MergeRequestTabs from './merge_request_tabs'; import { addDelimiter } from './lib/utils/text_utility'; import { getParameterValues, setUrlParams } from './lib/utils/url_utility'; +import MergeRequestTabs from './merge_request_tabs'; +import TaskList from './task_list'; function MergeRequest(opts) { // Initialize MergeRequest behavior diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 81241cd2418..6aa45ecc7a0 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -1,13 +1,15 @@ /* eslint-disable no-new, class-methods-use-this */ -import $ from 'jquery'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import $ from 'jquery'; import Cookies from 'js-cookie'; import createEventHub from '~/helpers/event_hub_factory'; -import axios from './lib/utils/axios_utils'; -import { deprecatedCreateFlash as flash } from './flash'; +import initAddContextCommitsTriggers from './add_context_commits_modal'; import BlobForkSuggestion from './blob/blob_fork_suggestion'; +import Diff from './diff'; +import { deprecatedCreateFlash as flash } from './flash'; import initChangesDropdown from './init_changes_dropdown'; +import axios from './lib/utils/axios_utils'; import { parseUrlPathname, handleLocationHash, @@ -15,15 +17,13 @@ import { parseBoolean, scrollToElement, } from './lib/utils/common_utils'; -import { isInVueNoteablePage } from './lib/utils/dom_utils'; -import { getLocationHash } from './lib/utils/url_utility'; -import Diff from './diff'; import { localTimeAgo } from './lib/utils/datetime_utility'; -import syntaxHighlight from './syntax_highlight'; -import Notes from './notes'; +import { isInVueNoteablePage } from './lib/utils/dom_utils'; import { polyfillSticky } from './lib/utils/sticky'; -import initAddContextCommitsTriggers from './add_context_commits_modal'; +import { getLocationHash } from './lib/utils/url_utility'; import { __ } from './locale'; +import Notes from './notes'; +import syntaxHighlight from './syntax_highlight'; // MergeRequestTabs // diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js index 717766578de..f249fef5ea4 100644 --- a/app/assets/javascripts/milestone.js +++ b/app/assets/javascripts/milestone.js @@ -1,8 +1,8 @@ import $ from 'jquery'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from './flash'; -import { mouseenter, debouncedMouseleave, togglePopover } from './shared/popover'; +import axios from './lib/utils/axios_utils'; import { __ } from './locale'; +import { mouseenter, debouncedMouseleave, togglePopover } from './shared/popover'; export default class Milestone { constructor() { diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index badd87921d4..4cbe0a53307 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -4,16 +4,16 @@ import $ from 'jquery'; import { template, escape } from 'lodash'; -import { __, sprintf } from '~/locale'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import Api from '~/api'; -import axios from './lib/utils/axios_utils'; -import { timeFor, parsePikadayDate, dateInWords } from './lib/utils/datetime_utility'; -import ModalStore from './boards/stores/modal_store'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __, sprintf } from '~/locale'; import boardsStore, { boardStoreIssueSet, boardStoreIssueDelete, } from './boards/stores/boards_store'; +import ModalStore from './boards/stores/modal_store'; +import axios from './lib/utils/axios_utils'; +import { timeFor, parsePikadayDate, dateInWords } from './lib/utils/datetime_utility'; export default class MilestoneSelect { constructor(currentProject, els, options = {}) { diff --git a/app/assets/javascripts/mirrors/mirror_repos.js b/app/assets/javascripts/mirrors/mirror_repos.js index b4e34021e36..a26c8f85958 100644 --- a/app/assets/javascripts/mirrors/mirror_repos.js +++ b/app/assets/javascripts/mirrors/mirror_repos.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { debounce } from 'lodash'; -import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; import { hide } from '~/tooltips'; import SSHMirror from './ssh_mirror'; diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js index b692db10e2d..15ded478405 100644 --- a/app/assets/javascripts/mirrors/ssh_mirror.js +++ b/app/assets/javascripts/mirrors/ssh_mirror.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import { escape } from 'lodash'; -import { __ } from '~/locale'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { backOff } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import AUTH_METHOD from './constants'; export default class SSHMirror { diff --git a/app/assets/javascripts/monitoring/components/alert_widget.vue b/app/assets/javascripts/monitoring/components/alert_widget.vue index 0ffbf169941..9724ef9950b 100644 --- a/app/assets/javascripts/monitoring/components/alert_widget.vue +++ b/app/assets/javascripts/monitoring/components/alert_widget.vue @@ -1,12 +1,12 @@ <script> import { GlBadge, GlLoadingIcon, GlModalDirective, GlIcon, GlTooltip, GlSprintf } from '@gitlab/ui'; import { values, get } from 'lodash'; -import { s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; +import { s__ } from '~/locale'; +import { OPERATORS } from '../constants'; import AlertsService from '../services/alerts_service'; import { alertsValidator, queriesValidator } from '../validators'; -import { OPERATORS } from '../constants'; import AlertWidgetForm from './alert_widget_form.vue'; export default { diff --git a/app/assets/javascripts/monitoring/components/alert_widget_form.vue b/app/assets/javascripts/monitoring/components/alert_widget_form.vue index b26941891e4..68fd3e256ec 100644 --- a/app/assets/javascripts/monitoring/components/alert_widget_form.vue +++ b/app/assets/javascripts/monitoring/components/alert_widget_form.vue @@ -1,6 +1,4 @@ <script> -import { isEmpty, findKey } from 'lodash'; -import Vue from 'vue'; import { GlLink, GlButton, @@ -13,12 +11,14 @@ import { GlTooltipDirective, GlIcon, } from '@gitlab/ui'; +import { isEmpty, findKey } from 'lodash'; +import Vue from 'vue'; import { __, s__ } from '~/locale'; -import Translate from '~/vue_shared/translate'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { alertsValidator, queriesValidator } from '../validators'; +import Translate from '~/vue_shared/translate'; import { OPERATORS } from '../constants'; +import { alertsValidator, queriesValidator } from '../validators'; Vue.use(Translate); diff --git a/app/assets/javascripts/monitoring/components/charts/anomaly.vue b/app/assets/javascripts/monitoring/components/charts/anomaly.vue index cb533c38fa0..8569a67da34 100644 --- a/app/assets/javascripts/monitoring/components/charts/anomaly.vue +++ b/app/assets/javascripts/monitoring/components/charts/anomaly.vue @@ -1,9 +1,9 @@ <script> +import { GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import produce from 'immer'; import { flattenDeep, isNumber } from 'lodash'; -import { GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; -import { roundOffFloat } from '~/lib/utils/common_utils'; import { hexToRgb } from '~/lib/utils/color_utils'; +import { roundOffFloat } from '~/lib/utils/common_utils'; import { areaOpacityValues, symbolSizes, colorValues, panelTypes } from '../../constants'; import { graphDataValidatorForAnomalyValues } from '../../utils'; import MonitorTimeSeriesChart from './time_series.vue'; diff --git a/app/assets/javascripts/monitoring/components/charts/column.vue b/app/assets/javascripts/monitoring/components/charts/column.vue index bb1882c90af..37251af2049 100644 --- a/app/assets/javascripts/monitoring/components/charts/column.vue +++ b/app/assets/javascripts/monitoring/components/charts/column.vue @@ -1,11 +1,11 @@ <script> import { GlResizeObserverDirective } from '@gitlab/ui'; import { GlColumnChart } from '@gitlab/ui/dist/charts'; -import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; import { makeDataSeries } from '~/helpers/monitor_helper'; +import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; import { chartHeight } from '../../constants'; -import { graphDataValidatorForValues } from '../../utils'; import { timezones } from '../../format_date'; +import { graphDataValidatorForValues } from '../../utils'; import { getTimeAxisOptions, getYAxisOptions, getChartGrid } from './options'; export default { diff --git a/app/assets/javascripts/monitoring/components/charts/heatmap.vue b/app/assets/javascripts/monitoring/components/charts/heatmap.vue index 22214a76aba..ed888ef022c 100644 --- a/app/assets/javascripts/monitoring/components/charts/heatmap.vue +++ b/app/assets/javascripts/monitoring/components/charts/heatmap.vue @@ -1,8 +1,8 @@ <script> import { GlResizeObserverDirective } from '@gitlab/ui'; import { GlHeatmap } from '@gitlab/ui/dist/charts'; -import { graphDataValidatorForValues } from '../../utils'; import { formatDate, timezones, formats } from '../../format_date'; +import { graphDataValidatorForValues } from '../../utils'; export default { components: { diff --git a/app/assets/javascripts/monitoring/components/charts/options.js b/app/assets/javascripts/monitoring/components/charts/options.js index 163a7be6973..643550a7144 100644 --- a/app/assets/javascripts/monitoring/components/charts/options.js +++ b/app/assets/javascripts/monitoring/components/charts/options.js @@ -1,8 +1,8 @@ import { isFinite, uniq, sortBy, includes } from 'lodash'; import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format'; import { __, s__ } from '~/locale'; -import { formatDate, timezones, formats } from '../../format_date'; import { thresholdModeTypes } from '../../constants'; +import { formatDate, timezones, formats } from '../../format_date'; const yAxisBoundaryGap = [0.1, 0.1]; /** diff --git a/app/assets/javascripts/monitoring/components/charts/single_stat.vue b/app/assets/javascripts/monitoring/components/charts/single_stat.vue index 4cf583fed18..6d6a7af600b 100644 --- a/app/assets/javascripts/monitoring/components/charts/single_stat.vue +++ b/app/assets/javascripts/monitoring/components/charts/single_stat.vue @@ -1,7 +1,7 @@ <script> import { GlSingleStat } from '@gitlab/ui/dist/charts'; -import { __ } from '~/locale'; import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format'; +import { __ } from '~/locale'; import { graphDataValidatorForValues } from '../../utils'; const defaultPrecision = 2; diff --git a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue index bfa0bd5333b..a53f899f752 100644 --- a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue +++ b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue @@ -4,8 +4,8 @@ import { GlStackedColumnChart } from '@gitlab/ui/dist/charts'; import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; import { s__ } from '~/locale'; import { chartHeight, legendLayoutTypes } from '../../constants'; -import { graphDataValidatorForValues } from '../../utils'; import { formats, timezones } from '../../format_date'; +import { graphDataValidatorForValues } from '../../utils'; import { getTimeAxisOptions, axisTypes } from './options'; export default { diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index b720700d36d..99008d047af 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -1,15 +1,15 @@ <script> -import { isEmpty, omit, throttle } from 'lodash'; import { GlLink, GlTooltip, GlResizeObserverDirective, GlIcon } from '@gitlab/ui'; import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; -import { s__ } from '~/locale'; -import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; +import { isEmpty, omit, throttle } from 'lodash'; import { makeDataSeries } from '~/helpers/monitor_helper'; +import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; +import { s__ } from '~/locale'; import { panelTypes, chartHeight, lineTypes, lineWidths, legendLayoutTypes } from '../../constants'; -import { graphDataValidatorForValues } from '../../utils'; import { formatDate, timezones } from '../../format_date'; -import { getYAxisOptions, getTimeAxisOptions, getChartGrid, getTooltipFormatter } from './options'; +import { graphDataValidatorForValues } from '../../utils'; import { annotationsYAxis, generateAnnotationsSeries } from './annotations'; +import { getYAxisOptions, getTimeAxisOptions, getChartGrid, getTooltipFormatter } from './options'; export const timestampToISODate = (timestamp) => new Date(timestamp).toISOString(); diff --git a/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue index 74799002b17..bfaf8b2bd28 100644 --- a/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlModal, GlSprintf } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { isSafeURL } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; export default { components: { GlButton, GlModal, GlSprintf }, diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 5ec87332288..bfb18206b62 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -1,30 +1,30 @@ <script> -import { mapActions, mapState, mapGetters } from 'vuex'; -import VueDraggable from 'vuedraggable'; -import Mousetrap from 'mousetrap'; import { GlButton, GlModalDirective, GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import Mousetrap from 'mousetrap'; +import VueDraggable from 'vuedraggable'; +import { mapActions, mapState, mapGetters } from 'vuex'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import invalidUrl from '~/lib/utils/invalid_url'; import { ESC_KEY } from '~/lib/utils/keys'; import { mergeUrlParams, updateHistory } from '~/lib/utils/url_utility'; -import invalidUrl from '~/lib/utils/invalid_url'; -import TrackEventDirective from '~/vue_shared/directives/track_event'; +import { s__ } from '~/locale'; import { defaultTimeRange } from '~/vue_shared/constants'; +import TrackEventDirective from '~/vue_shared/directives/track_event'; +import { metricStates, keyboardShortcutKeys } from '../constants'; import { timeRangeFromUrl, panelToUrl, expandedPanelPayloadFromUrl, convertVariablesForURL, } from '../utils'; -import { metricStates, keyboardShortcutKeys } from '../constants'; import DashboardHeader from './dashboard_header.vue'; import DashboardPanel from './dashboard_panel.vue'; -import GraphGroup from './graph_group.vue'; import EmptyState from './empty_state.vue'; +import GraphGroup from './graph_group.vue'; import GroupEmptyState from './group_empty_state.vue'; -import VariablesSection from './variables_section.vue'; import LinksSection from './links_section.vue'; +import VariablesSection from './variables_section.vue'; export default { components: { diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue index 77d3766d4bc..94cfb562ce3 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlButton, GlDropdown, @@ -10,10 +9,11 @@ import { GlModalDirective, GlTooltipDirective, } from '@gitlab/ui'; +import { mapState, mapGetters, mapActions } from 'vuex'; import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue'; -import { s__ } from '~/locale'; import invalidUrl from '~/lib/utils/invalid_url'; import { redirectTo } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import { PANEL_NEW_PAGE } from '../router/constants'; import { getAddMetricTrackingOptions } from '../utils'; diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index 0303c47203f..3c423bea368 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -1,6 +1,4 @@ <script> -import { debounce } from 'lodash'; -import { mapActions, mapState, mapGetters } from 'vuex'; import { GlButton, GlDropdown, @@ -12,16 +10,18 @@ import { GlTooltipDirective, GlIcon, } from '@gitlab/ui'; -import { mergeUrlParams, redirectTo } from '~/lib/utils/url_utility'; +import { debounce } from 'lodash'; +import { mapActions, mapState, mapGetters } from 'vuex'; import invalidUrl from '~/lib/utils/invalid_url'; +import { mergeUrlParams, redirectTo } from '~/lib/utils/url_utility'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; import { timeRanges } from '~/vue_shared/constants'; -import { timeRangeToUrl } from '../utils'; import { timezones } from '../format_date'; +import { timeRangeToUrl } from '../utils'; +import ActionsMenu from './dashboard_actions_menu.vue'; import DashboardsDropdown from './dashboards_dropdown.vue'; import RefreshButton from './refresh_button.vue'; -import ActionsMenu from './dashboard_actions_menu.vue'; export default { components: { diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue index bf4f52bb4b9..55e73d17842 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue @@ -1,6 +1,4 @@ <script> -import { mapState } from 'vuex'; -import { mapValues, pickBy } from 'lodash'; import { GlResizeObserverDirective, GlIcon, @@ -15,27 +13,28 @@ import { GlTooltip, GlTooltipDirective, } from '@gitlab/ui'; -import invalidUrl from '~/lib/utils/invalid_url'; +import { mapValues, pickBy } from 'lodash'; +import { mapState } from 'vuex'; +import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import invalidUrl from '~/lib/utils/invalid_url'; import { relativePathToAbsolute, getBaseURL, visitUrl, isSafeURL } from '~/lib/utils/url_utility'; import { __, n__ } from '~/locale'; -import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import TrackEventDirective from '~/vue_shared/directives/track_event'; import { panelTypes } from '../constants'; -import { timeRangeToUrl, downloadCSVOptions, generateLinkToChartOptions } from '../utils'; import { graphDataToCsv } from '../csv_export'; -import MonitorEmptyChart from './charts/empty_chart.vue'; -import MonitorTimeSeriesChart from './charts/time_series.vue'; +import { timeRangeToUrl, downloadCSVOptions, generateLinkToChartOptions } from '../utils'; +import AlertWidget from './alert_widget.vue'; import MonitorAnomalyChart from './charts/anomaly.vue'; -import MonitorSingleStatChart from './charts/single_stat.vue'; +import MonitorBarChart from './charts/bar.vue'; +import MonitorColumnChart from './charts/column.vue'; +import MonitorEmptyChart from './charts/empty_chart.vue'; import MonitorGaugeChart from './charts/gauge.vue'; import MonitorHeatmapChart from './charts/heatmap.vue'; -import MonitorColumnChart from './charts/column.vue'; -import MonitorBarChart from './charts/bar.vue'; +import MonitorSingleStatChart from './charts/single_stat.vue'; import MonitorStackedColumnChart from './charts/stacked_column.vue'; - -import AlertWidget from './alert_widget.vue'; +import MonitorTimeSeriesChart from './charts/time_series.vue'; const events = { timeRangeZoom: 'timerangezoom', diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue index bcfa1b04322..847339e814a 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlCard, GlForm, @@ -10,6 +9,7 @@ import { GlAlert, GlTooltipDirective, } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; import { timeRanges } from '~/vue_shared/constants'; import DashboardPanel from './dashboard_panel.vue'; diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue index 1a349aa154a..1238996154d 100644 --- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue +++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapGetters } from 'vuex'; import { GlIcon, GlDropdown, @@ -9,6 +8,7 @@ import { GlSearchBoxByType, GlModalDirective, } from '@gitlab/ui'; +import { mapState, mapGetters } from 'vuex'; const events = { selectDashboard: 'selectDashboard', diff --git a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue index b87934a1db2..49d7e3a48a7 100644 --- a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters } from 'vuex'; import { GlAlert, GlLoadingIcon, GlModal } from '@gitlab/ui'; +import { mapActions, mapGetters } from 'vuex'; import { s__ } from '~/locale'; import DuplicateDashboardForm from './duplicate_dashboard_form.vue'; diff --git a/app/assets/javascripts/monitoring/components/embeds/embed_group.vue b/app/assets/javascripts/monitoring/components/embeds/embed_group.vue index c114ae1809f..8eef3d69a4f 100644 --- a/app/assets/javascripts/monitoring/components/embeds/embed_group.vue +++ b/app/assets/javascripts/monitoring/components/embeds/embed_group.vue @@ -1,7 +1,7 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; -import sum from 'lodash/sum'; import { GlButton, GlCard, GlIcon } from '@gitlab/ui'; +import sum from 'lodash/sum'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { n__ } from '~/locale'; import { monitoringDashboard } from '~/monitoring/stores'; import MetricEmbed from './metric_embed.vue'; diff --git a/app/assets/javascripts/monitoring/components/embeds/metric_embed.vue b/app/assets/javascripts/monitoring/components/embeds/metric_embed.vue index 2fe49152c4f..25500747573 100644 --- a/app/assets/javascripts/monitoring/components/embeds/metric_embed.vue +++ b/app/assets/javascripts/monitoring/components/embeds/metric_embed.vue @@ -1,10 +1,10 @@ <script> import { mapState, mapActions } from 'vuex'; -import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; import { defaultTimeRange } from '~/vue_shared/constants'; -import { timeRangeFromUrl, removeTimeRangeParams } from '../../utils'; import { sidebarAnimationDuration } from '../../constants'; +import { timeRangeFromUrl, removeTimeRangeParams } from '../../utils'; let sidebarMutationObserver; diff --git a/app/assets/javascripts/monitoring/components/links_section.vue b/app/assets/javascripts/monitoring/components/links_section.vue index 1fa36c14242..3f9f57d4ac1 100644 --- a/app/assets/javascripts/monitoring/components/links_section.vue +++ b/app/assets/javascripts/monitoring/components/links_section.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlIcon, GlLink } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue index e0d9f92440b..3daf5b38933 100644 --- a/app/assets/javascripts/monitoring/components/refresh_button.vue +++ b/app/assets/javascripts/monitoring/components/refresh_button.vue @@ -1,6 +1,4 @@ <script> -import Visibility from 'visibilityjs'; -import { mapActions } from 'vuex'; import { GlButtonGroup, GlButton, @@ -9,6 +7,8 @@ import { GlDropdownDivider, GlTooltipDirective, } from '@gitlab/ui'; +import Visibility from 'visibilityjs'; +import { mapActions } from 'vuex'; import { n__, __ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; diff --git a/app/assets/javascripts/monitoring/components/variables_section.vue b/app/assets/javascripts/monitoring/components/variables_section.vue index a4aa00abbd1..493d37ce263 100644 --- a/app/assets/javascripts/monitoring/components/variables_section.vue +++ b/app/assets/javascripts/monitoring/components/variables_section.vue @@ -1,7 +1,7 @@ <script> import { mapState, mapActions } from 'vuex'; -import { setCustomVariablesFromUrl } from '../utils'; import { VARIABLE_TYPES } from '../constants'; +import { setCustomVariablesFromUrl } from '../utils'; import DropdownField from './variables/dropdown_field.vue'; import TextField from './variables/text_field.vue'; diff --git a/app/assets/javascripts/monitoring/monitoring_app.js b/app/assets/javascripts/monitoring/monitoring_app.js index 2f8c3e2a0c4..ee67e5dd827 100644 --- a/app/assets/javascripts/monitoring/monitoring_app.js +++ b/app/assets/javascripts/monitoring/monitoring_app.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import { createStore } from './stores'; +import Vue from 'vue'; import createRouter from './router'; +import { createStore } from './stores'; import { stateAndPropsFromDataset } from './utils'; Vue.use(GlToast); diff --git a/app/assets/javascripts/monitoring/pages/panel_new_page.vue b/app/assets/javascripts/monitoring/pages/panel_new_page.vue index 8ff6adb47ca..dbda6e80dac 100644 --- a/app/assets/javascripts/monitoring/pages/panel_new_page.vue +++ b/app/assets/javascripts/monitoring/pages/panel_new_page.vue @@ -1,9 +1,9 @@ <script> -import { mapState } from 'vuex'; import { GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { s__ } from '~/locale'; -import { DASHBOARD_PAGE } from '../router/constants'; import DashboardPanelBuilder from '../components/dashboard_panel_builder.vue'; +import { DASHBOARD_PAGE } from '../router/constants'; export default { components: { diff --git a/app/assets/javascripts/monitoring/requests/index.js b/app/assets/javascripts/monitoring/requests/index.js index 4a12ca06197..26fedb9c81c 100644 --- a/app/assets/javascripts/monitoring/requests/index.js +++ b/app/assets/javascripts/monitoring/requests/index.js @@ -1,6 +1,6 @@ import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; +import statusCodes from '~/lib/utils/http_status'; import { PROMETHEUS_TIMEOUT } from '../constants'; const cancellableBackOffRequest = (makeRequestCallback) => diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js index 391cb35882c..8522ac6a57d 100644 --- a/app/assets/javascripts/monitoring/stores/actions.js +++ b/app/assets/javascripts/monitoring/stores/actions.js @@ -1,23 +1,23 @@ -import * as Sentry from '~/sentry/wrapper'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; +import * as Sentry from '~/sentry/wrapper'; +import { convertObjectPropsToCamelCase } from '../../lib/utils/common_utils'; +import { s__, sprintf } from '../../locale'; +import { ENVIRONMENT_AVAILABLE_STATE, OVERVIEW_DASHBOARD_PATH, VARIABLE_TYPES } from '../constants'; import trackDashboardLoad from '../monitoring_tracking_helper'; -import getEnvironments from '../queries/getEnvironments.query.graphql'; import getAnnotations from '../queries/getAnnotations.query.graphql'; import getDashboardValidationWarnings from '../queries/getDashboardValidationWarnings.query.graphql'; -import { convertObjectPropsToCamelCase } from '../../lib/utils/common_utils'; -import { s__, sprintf } from '../../locale'; +import getEnvironments from '../queries/getEnvironments.query.graphql'; import { getDashboard, getPrometheusQueryData } from '../requests'; -import { ENVIRONMENT_AVAILABLE_STATE, OVERVIEW_DASHBOARD_PATH, VARIABLE_TYPES } from '../constants'; +import * as types from './mutation_types'; import { gqClient, parseEnvironmentsResponse, parseAnnotationsResponse, removeLeadingSlash, } from './utils'; -import * as types from './mutation_types'; const axiosCancelToken = axios.CancelToken; let cancelTokenSource; diff --git a/app/assets/javascripts/monitoring/stores/mutations.js b/app/assets/javascripts/monitoring/stores/mutations.js index 37febd062ff..e0eaf76b5f6 100644 --- a/app/assets/javascripts/monitoring/stores/mutations.js +++ b/app/assets/javascripts/monitoring/stores/mutations.js @@ -1,10 +1,10 @@ -import Vue from 'vue'; import { pick } from 'lodash'; -import httpStatusCodes from '~/lib/utils/http_status'; +import Vue from 'vue'; import { BACKOFF_TIMEOUT } from '~/lib/utils/common_utils'; +import httpStatusCodes from '~/lib/utils/http_status'; import { dashboardEmptyStates, endpointKeys, initialStateKeys, metricStates } from '../constants'; -import { mapToDashboardViewModel, mapPanelToViewModel, normalizeQueryResponseData } from './utils'; import * as types from './mutation_types'; +import { mapToDashboardViewModel, mapPanelToViewModel, normalizeQueryResponseData } from './utils'; import { optionsFromSeriesData } from './variable_mapping'; /** diff --git a/app/assets/javascripts/monitoring/stores/state.js b/app/assets/javascripts/monitoring/stores/state.js index b8ecb15a72f..3883fa3380d 100644 --- a/app/assets/javascripts/monitoring/stores/state.js +++ b/app/assets/javascripts/monitoring/stores/state.js @@ -1,7 +1,7 @@ import invalidUrl from '~/lib/utils/invalid_url'; import { defaultTimeRange } from '~/vue_shared/constants'; -import { timezones } from '../format_date'; import { dashboardEmptyStates } from '../constants'; +import { timezones } from '../format_date'; export default () => ({ // API endpoints diff --git a/app/assets/javascripts/monitoring/stores/utils.js b/app/assets/javascripts/monitoring/stores/utils.js index 305080cc104..20f7c5cdb60 100644 --- a/app/assets/javascripts/monitoring/stores/utils.js +++ b/app/assets/javascripts/monitoring/stores/utils.js @@ -1,9 +1,9 @@ -import { slugify } from '~/lib/utils/text_utility'; -import createGqClient, { fetchPolicies } from '~/lib/graphql'; -import { SUPPORTED_FORMATS } from '~/lib/utils/unit_format'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import createGqClient, { fetchPolicies } from '~/lib/graphql'; import { DATETIME_RANGE_TYPES } from '~/lib/utils/constants'; import { timeRangeToParams, getRangeType } from '~/lib/utils/datetime_range'; +import { slugify } from '~/lib/utils/text_utility'; +import { SUPPORTED_FORMATS } from '~/lib/utils/unit_format'; import { isSafeURL, mergeUrlParams } from '~/lib/utils/url_utility'; import { NOT_IN_DB_PREFIX, linkTypes, OUT_OF_THE_BOX_DASHBOARDS_PATH_PREFIX } from '../constants'; import { mergeURLVariables, parseTemplatingVariables } from './variable_mapping'; diff --git a/app/assets/javascripts/monitoring/stores/variable_mapping.js b/app/assets/javascripts/monitoring/stores/variable_mapping.js index c9e0e383582..4ca7a0b51d6 100644 --- a/app/assets/javascripts/monitoring/stores/variable_mapping.js +++ b/app/assets/javascripts/monitoring/stores/variable_mapping.js @@ -1,6 +1,6 @@ import { isString } from 'lodash'; -import { templatingVariablesFromUrl } from '../utils'; import { VARIABLE_TYPES } from '../constants'; +import { templatingVariablesFromUrl } from '../utils'; /** * This file exclusively deals with parsing user-defined variables diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 01cae7127e5..6306415a8b9 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -1,16 +1,16 @@ import { pickBy, mapKeys } from 'lodash'; -import { - queryToObject, - mergeUrlParams, - removeParams, - updateHistory, -} from '~/lib/utils/url_utility'; import { parseBoolean } from '~/lib/utils/common_utils'; import { timeRangeParamNames, timeRangeFromParams, timeRangeToParams, } from '~/lib/utils/datetime_range'; +import { + queryToObject, + mergeUrlParams, + removeParams, + updateHistory, +} from '~/lib/utils/url_utility'; import { VARIABLE_PREFIX } from './constants'; /** diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js index 8a53b4632e5..a7696a716d0 100644 --- a/app/assets/javascripts/mr_notes/index.js +++ b/app/assets/javascripts/mr_notes/index.js @@ -3,11 +3,11 @@ import store from '~/mr_notes/stores'; import initCherryPickCommitModal from '~/projects/commit/init_cherry_pick_commit_modal'; import initRevertCommitModal from '~/projects/commit/init_revert_commit_modal'; import initDiffsApp from '../diffs'; +import { resetServiceWorkersPublicPath } from '../lib/utils/webpack'; +import MergeRequest from '../merge_request'; import discussionCounter from '../notes/components/discussion_counter.vue'; import initDiscussionFilters from '../notes/discussion_filters'; import initSortDiscussions from '../notes/sort_discussions'; -import MergeRequest from '../merge_request'; -import { resetServiceWorkersPublicPath } from '../lib/utils/webpack'; import initNotesApp from './init_notes'; export default function initMrNotes() { diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index 958ee8e226a..9a93e90c2bb 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import Vue from 'vue'; import { mapActions, mapState, mapGetters } from 'vuex'; -import store from '~/mr_notes/stores'; import { parseBoolean } from '~/lib/utils/common_utils'; -import notesApp from '../notes/components/notes_app.vue'; +import store from '~/mr_notes/stores'; import discussionNavigator from '../notes/components/discussion_navigator.vue'; +import notesApp from '../notes/components/notes_app.vue'; import initWidget from '../vue_merge_request_widget'; export default () => { diff --git a/app/assets/javascripts/mr_notes/stores/index.js b/app/assets/javascripts/mr_notes/stores/index.js index 8492b8d0aff..4a0602ad512 100644 --- a/app/assets/javascripts/mr_notes/stores/index.js +++ b/app/assets/javascripts/mr_notes/stores/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; import batchCommentsModule from '~/batch_comments/stores/modules/batch_comments'; -import notesModule from '~/notes/stores/modules'; import diffsModule from '~/diffs/store/modules'; +import notesModule from '~/notes/stores/modules'; import mrPageModule from './modules'; Vue.use(Vuex); diff --git a/app/assets/javascripts/mr_popover/components/mr_popover.vue b/app/assets/javascripts/mr_popover/components/mr_popover.vue index 2058f0c9b76..791fdf7660f 100644 --- a/app/assets/javascripts/mr_popover/components/mr_popover.vue +++ b/app/assets/javascripts/mr_popover/components/mr_popover.vue @@ -3,8 +3,8 @@ import { GlPopover, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; -import query from '../queries/merge_request.query.graphql'; import { mrStates, humanMRStates } from '../constants'; +import query from '../queries/merge_request.query.graphql'; export default { // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 diff --git a/app/assets/javascripts/namespace_select.js b/app/assets/javascripts/namespace_select.js index 16acf130c9f..af7a600d1ad 100644 --- a/app/assets/javascripts/namespace_select.js +++ b/app/assets/javascripts/namespace_select.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { parseBoolean } from '~/lib/utils/common_utils'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { parseBoolean } from '~/lib/utils/common_utils'; import Api from './api'; import { mergeUrlParams } from './lib/utils/url_utility'; import { __ } from './locale'; diff --git a/app/assets/javascripts/namespaces/leave_by_url.js b/app/assets/javascripts/namespaces/leave_by_url.js index 7b15253d872..094590804c1 100644 --- a/app/assets/javascripts/namespaces/leave_by_url.js +++ b/app/assets/javascripts/namespaces/leave_by_url.js @@ -1,7 +1,7 @@ -import { initRails } from '~/lib/utils/rails_ujs'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import { __, sprintf } from '~/locale'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { initRails } from '~/lib/utils/rails_ujs'; +import { __, sprintf } from '~/locale'; const PARAMETER_NAME = 'leave'; const LEAVE_LINK_SELECTOR = '.js-leave-link'; diff --git a/app/assets/javascripts/network/branch_graph.js b/app/assets/javascripts/network/branch_graph.js index 3574fc47088..1f360e84f68 100644 --- a/app/assets/javascripts/network/branch_graph.js +++ b/app/assets/javascripts/network/branch_graph.js @@ -1,8 +1,8 @@ /* eslint-disable func-names, consistent-return */ import $ from 'jquery'; -import { __ } from '../locale'; import axios from '../lib/utils/axios_utils'; +import { __ } from '../locale'; import Raphael from './raphael'; export default class BranchGraph { diff --git a/app/assets/javascripts/notebook/cells/markdown.vue b/app/assets/javascripts/notebook/cells/markdown.vue index d1d5ae5265a..e4cde0d4ff3 100644 --- a/app/assets/javascripts/notebook/cells/markdown.vue +++ b/app/assets/javascripts/notebook/cells/markdown.vue @@ -1,7 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ -import marked from 'marked'; import katex from 'katex'; +import marked from 'marked'; import { sanitize } from '~/lib/dompurify'; import Prompt from './prompt.vue'; diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 78e89f28542..072983b4285 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -12,22 +12,20 @@ old_notes_spec.js is the spec for the legacy, jQuery notes application. It has n import $ from 'jquery'; import '~/lib/utils/jquery_at_who'; -import { escape, uniqueId } from 'lodash'; import Cookies from 'js-cookie'; +import { escape, uniqueId } from 'lodash'; import Autosize from 'autosize'; import Vue from 'vue'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import AjaxCache from '~/lib/utils/ajax_cache'; import syntaxHighlight from '~/syntax_highlight'; -import axios from './lib/utils/axios_utils'; -import { getLocationHash } from './lib/utils/url_utility'; +import Autosave from './autosave'; +import loadAwardsHandler from './awards_handler'; +import CommentTypeToggle from './comment_type_toggle'; import { deprecatedCreateFlash as Flash } from './flash'; import { defaultAutocompleteConfig } from './gfm_auto_complete'; -import CommentTypeToggle from './comment_type_toggle'; import GLForm from './gl_form'; -import loadAwardsHandler from './awards_handler'; -import Autosave from './autosave'; -import TaskList from './task_list'; +import axios from './lib/utils/axios_utils'; import { isInViewport, getPagePath, @@ -36,7 +34,9 @@ import { isInMRPage, } from './lib/utils/common_utils'; import { localTimeAgo } from './lib/utils/datetime_utility'; +import { getLocationHash } from './lib/utils/url_utility'; import { sprintf, s__, __ } from './locale'; +import TaskList from './task_list'; window.autosize = Autosize; diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index e57d42dc63c..50db3b86025 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -1,27 +1,27 @@ <script> +import { GlButton, GlIcon, GlFormCheckbox, GlTooltipDirective } from '@gitlab/ui'; +import Autosize from 'autosize'; import $ from 'jquery'; import { mapActions, mapGetters, mapState } from 'vuex'; -import Autosize from 'autosize'; -import { GlButton, GlIcon, GlFormCheckbox, GlTooltipDirective } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; -import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; -import { deprecatedCreateFlash as Flash } from '~/flash'; import Autosave from '~/autosave'; +import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import { capitalizeFirstCharacter, convertToCamelCase, splitCamelCase, slugifyWithUnderscore, } from '~/lib/utils/text_utility'; -import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; +import { __, sprintf } from '~/locale'; import markdownField from '~/vue_shared/components/markdown/field.vue'; +import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import * as constants from '../constants'; import eventHub from '../event_hub'; import issuableStateMixin from '../mixins/issuable_state'; -import noteSignedOutWidget from './note_signed_out_widget.vue'; -import discussionLockedWidget from './discussion_locked_widget.vue'; import CommentFieldLayout from './comment_field_layout.vue'; +import discussionLockedWidget from './discussion_locked_widget.vue'; +import noteSignedOutWidget from './note_signed_out_widget.vue'; export default { name: 'CommentForm', diff --git a/app/assets/javascripts/notes/components/diff_discussion_header.vue b/app/assets/javascripts/notes/components/diff_discussion_header.vue index ee39a529345..0ce1eb8191a 100644 --- a/app/assets/javascripts/notes/components/diff_discussion_header.vue +++ b/app/assets/javascripts/notes/components/diff_discussion_header.vue @@ -1,10 +1,10 @@ <script> -import { mapActions } from 'vuex'; -import { escape } from 'lodash'; import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { escape } from 'lodash'; +import { mapActions } from 'vuex'; -import { s__, __, sprintf } from '~/locale'; import { truncateSha } from '~/lib/utils/text_utility'; +import { s__, __, sprintf } from '~/locale'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import noteEditedText from './note_edited_text.vue'; diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index b7355d4d927..e96e1204f76 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -1,12 +1,12 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapState, mapActions } from 'vuex'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import DiffFileHeader from '~/diffs/components/diff_file_header.vue'; -import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue'; import { getDiffMode } from '~/diffs/store/utils'; import { diffViewerModes } from '~/ide/constants'; +import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import { isCollapsed } from '../../diffs/utils/diff_file'; const FIRST_CHAR_REGEX = /^(\+|-| )/; diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 0a72627834d..55cf75132a9 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlTooltipDirective, GlIcon, GlButton, GlButtonGroup } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import { __ } from '~/locale'; import discussionNavigation from '../mixins/discussion_navigation'; diff --git a/app/assets/javascripts/notes/components/discussion_filter.vue b/app/assets/javascripts/notes/components/discussion_filter.vue index aa61aa9b3cb..88f053aed67 100644 --- a/app/assets/javascripts/notes/components/discussion_filter.vue +++ b/app/assets/javascripts/notes/components/discussion_filter.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters, mapActions } from 'vuex'; import { GlDropdown, GlDropdownItem, GlDropdownDivider } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; import { getLocationHash, doesHashExistInUrl } from '../../lib/utils/url_utility'; import { DISCUSSION_FILTERS_DEFAULT_VALUE, diff --git a/app/assets/javascripts/notes/components/discussion_navigator.vue b/app/assets/javascripts/notes/components/discussion_navigator.vue index facc53e27a6..fa3c900c337 100644 --- a/app/assets/javascripts/notes/components/discussion_navigator.vue +++ b/app/assets/javascripts/notes/components/discussion_navigator.vue @@ -1,8 +1,8 @@ <script> /* global Mousetrap */ import 'mousetrap'; -import discussionNavigation from '~/notes/mixins/discussion_navigation'; import eventHub from '~/notes/event_hub'; +import discussionNavigation from '~/notes/mixins/discussion_navigation'; export default { mixins: [discussionNavigation], diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue index 2d74bd8f74b..0f74d78c8e0 100644 --- a/app/assets/javascripts/notes/components/discussion_notes.vue +++ b/app/assets/javascripts/notes/components/discussion_notes.vue @@ -5,10 +5,10 @@ import PlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue' import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; import SystemNote from '~/vue_shared/components/notes/system_note.vue'; import { SYSTEM_NOTE } from '../constants'; +import DiscussionNotesRepliesWrapper from './discussion_notes_replies_wrapper.vue'; +import NoteEditedText from './note_edited_text.vue'; import NoteableNote from './noteable_note.vue'; import ToggleRepliesWidget from './toggle_replies_widget.vue'; -import NoteEditedText from './note_edited_text.vue'; -import DiscussionNotesRepliesWrapper from './discussion_notes_replies_wrapper.vue'; export default { name: 'DiscussionNotes', diff --git a/app/assets/javascripts/notes/components/email_participants_warning.vue b/app/assets/javascripts/notes/components/email_participants_warning.vue index bb1ff58120a..ecf42fce1d2 100644 --- a/app/assets/javascripts/notes/components/email_participants_warning.vue +++ b/app/assets/javascripts/notes/components/email_participants_warning.vue @@ -1,7 +1,7 @@ <script> import { GlSprintf } from '@gitlab/ui'; -import { s__, sprintf } from '~/locale'; import { toNounSeriesText } from '~/lib/utils/grammar'; +import { s__, sprintf } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/notes/components/multiline_comment_form.vue b/app/assets/javascripts/notes/components/multiline_comment_form.vue index 9fbf2c9265c..6ad565567be 100644 --- a/app/assets/javascripts/notes/components/multiline_comment_form.vue +++ b/app/assets/javascripts/notes/components/multiline_comment_form.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlFormSelect, GlSprintf } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { getSymbol, getLineClasses } from './multiline_comment_utils'; export default { diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 4168a5f927c..907a4316a93 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -1,12 +1,12 @@ <script> -import { mapGetters } from 'vuex'; import { GlTooltipDirective, GlIcon, GlButton, GlDropdownItem } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; -import resolvedStatusMixin from '~/batch_comments/mixins/resolved_status'; -import eventHub from '~/sidebar/event_hub'; +import { mapGetters } from 'vuex'; import Api from '~/api'; +import resolvedStatusMixin from '~/batch_comments/mixins/resolved_status'; import { deprecatedCreateFlash as flash } from '~/flash'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { __, sprintf } from '~/locale'; +import eventHub from '~/sidebar/event_hub'; import { splitCamelCase } from '../../lib/utils/text_utility'; import ReplyButton from './note_actions/reply_button.vue'; diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue index ff0bf5bd142..9eb7b928ea4 100644 --- a/app/assets/javascripts/notes/components/note_awards_list.vue +++ b/app/assets/javascripts/notes/components/note_awards_list.vue @@ -1,7 +1,7 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import AwardsList from '~/vue_shared/components/awards_list.vue'; import { __ } from '~/locale'; +import AwardsList from '~/vue_shared/components/awards_list.vue'; import { deprecatedCreateFlash as Flash } from '../../flash'; export default { diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index df56e6fd8b0..8c5d81c0cc9 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -1,15 +1,15 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions, mapGetters, mapState } from 'vuex'; import $ from 'jquery'; import { escape } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; import '~/behaviors/markdown/render_gfm'; import Suggestions from '~/vue_shared/components/markdown/suggestions.vue'; import autosave from '../mixins/autosave'; -import noteEditedText from './note_edited_text.vue'; -import noteAwardsList from './note_awards_list.vue'; import noteAttachment from './note_attachment.vue'; +import noteAwardsList from './note_awards_list.vue'; +import noteEditedText from './note_edited_text.vue'; import noteForm from './note_form.vue'; export default { diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 03ee5547fc8..653bc450d0b 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -1,15 +1,15 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapGetters, mapActions, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; +import { mapGetters, mapActions, mapState } from 'vuex'; +import { getDraft, updateDraft } from '~/lib/utils/autosave'; import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { __, sprintf } from '~/locale'; import markdownField from '~/vue_shared/components/markdown/field.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { __, sprintf } from '~/locale'; -import { getDraft, updateDraft } from '~/lib/utils/autosave'; +import eventHub from '../event_hub'; import issuableStateMixin from '../mixins/issuable_state'; import resolvable from '../mixins/resolvable'; -import eventHub from '../event_hub'; import CommentFieldLayout from './comment_field_layout.vue'; export default { diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index 23b1f1e2ac1..101421523d0 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -1,7 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ -import { mapActions } from 'vuex'; import { GlIcon, GlLoadingIcon, GlTooltipDirective, GlSprintf } from '@gitlab/ui'; +import { mapActions } from 'vuex'; import { isUserBusy } from '~/set_status_modal/utils'; import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index c9722ebb8b6..34dd21dcbac 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -1,22 +1,22 @@ <script> -import { mapActions, mapGetters } from 'vuex'; import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; -import { s__, __ } from '~/locale'; +import { mapActions, mapGetters } from 'vuex'; +import DraftNote from '~/batch_comments/components/draft_note.vue'; import { clearDraft, getDiscussionReplyKey } from '~/lib/utils/autosave'; +import { s__, __ } from '~/locale'; +import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; -import DraftNote from '~/batch_comments/components/draft_note.vue'; import { deprecatedCreateFlash as Flash } from '../../flash'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; +import eventHub from '../event_hub'; import noteable from '../mixins/noteable'; import resolvable from '../mixins/resolvable'; -import eventHub from '../event_hub'; import diffDiscussionHeader from './diff_discussion_header.vue'; -import noteSignedOutWidget from './note_signed_out_widget.vue'; -import noteForm from './note_form.vue'; import diffWithNote from './diff_with_note.vue'; -import DiscussionNotes from './discussion_notes.vue'; import DiscussionActions from './discussion_actions.vue'; +import DiscussionNotes from './discussion_notes.vue'; +import noteForm from './note_form.vue'; +import noteSignedOutWidget from './note_signed_out_widget.vue'; export default { name: 'NoteableDiscussion', diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 2eee932b5cc..4343fac3cfa 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -1,21 +1,18 @@ <script> +import { GlSprintf, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import $ from 'jquery'; -import { mapGetters, mapActions } from 'vuex'; import { escape } from 'lodash'; -import { GlSprintf, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { mapGetters, mapActions } from 'vuex'; +import { INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; +import httpStatusCodes from '~/lib/utils/http_status'; import { truncateSha } from '~/lib/utils/text_utility'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; -import httpStatusCodes from '~/lib/utils/http_status'; -import { INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; -import { __, s__, sprintf } from '../../locale'; import { deprecatedCreateFlash as Flash } from '../../flash'; +import { __, s__, sprintf } from '../../locale'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import eventHub from '../event_hub'; import noteable from '../mixins/noteable'; import resolvable from '../mixins/resolvable'; -import noteHeader from './note_header.vue'; -import noteActions from './note_actions.vue'; -import NoteBody from './note_body.vue'; import { getStartLineNumber, getEndLineNumber, @@ -23,6 +20,9 @@ import { commentLineOptions, formatLineRange, } from './multiline_comment_utils'; +import noteActions from './note_actions.vue'; +import NoteBody from './note_body.vue'; +import noteHeader from './note_header.vue'; export default { name: 'NoteableNote', diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index c0468e5df0f..2d66e0d24e3 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -1,22 +1,22 @@ <script> import { mapGetters, mapActions } from 'vuex'; -import OrderedLayout from '~/vue_shared/components/ordered_layout.vue'; import highlightCurrentUser from '~/behaviors/markdown/highlight_current_user'; import { __ } from '~/locale'; import initUserPopovers from '~/user_popovers'; +import OrderedLayout from '~/vue_shared/components/ordered_layout.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { getLocationHash, doesHashExistInUrl } from '../../lib/utils/url_utility'; import { deprecatedCreateFlash as Flash } from '../../flash'; -import * as constants from '../constants'; -import eventHub from '../event_hub'; -import systemNote from '../../vue_shared/components/notes/system_note.vue'; +import { getLocationHash, doesHashExistInUrl } from '../../lib/utils/url_utility'; import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue'; import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue'; import skeletonLoadingContainer from '../../vue_shared/components/notes/skeleton_note.vue'; -import noteableNote from './noteable_note.vue'; -import noteableDiscussion from './noteable_discussion.vue'; -import discussionFilterNote from './discussion_filter_note.vue'; +import systemNote from '../../vue_shared/components/notes/system_note.vue'; +import * as constants from '../constants'; +import eventHub from '../event_hub'; import commentForm from './comment_form.vue'; +import discussionFilterNote from './discussion_filter_note.vue'; +import noteableDiscussion from './noteable_discussion.vue'; +import noteableNote from './noteable_note.vue'; export default { name: 'NotesApp', diff --git a/app/assets/javascripts/notes/components/sort_discussion.vue b/app/assets/javascripts/notes/components/sort_discussion.vue index c279a7107c7..ed1f456c174 100644 --- a/app/assets/javascripts/notes/components/sort_discussion.vue +++ b/app/assets/javascripts/notes/components/sort_discussion.vue @@ -2,8 +2,8 @@ import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { mapActions, mapGetters } from 'vuex'; import { __ } from '~/locale'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import Tracking from '~/tracking'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import { ASC, DESC } from '../constants'; const SORT_OPTIONS = [ diff --git a/app/assets/javascripts/notes/components/toggle_replies_widget.vue b/app/assets/javascripts/notes/components/toggle_replies_widget.vue index 06de3104a47..01e3f84d00e 100644 --- a/app/assets/javascripts/notes/components/toggle_replies_widget.vue +++ b/app/assets/javascripts/notes/components/toggle_replies_widget.vue @@ -1,8 +1,8 @@ <script> -import { uniqBy } from 'lodash'; import { GlButton, GlIcon } from '@gitlab/ui'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import { uniqBy } from 'lodash'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; export default { components: { diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js index 1f0b2afab9e..e4241669fbc 100644 --- a/app/assets/javascripts/notes/index.js +++ b/app/assets/javascripts/notes/index.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import notesApp from './components/notes_app.vue'; import initDiscussionFilters from './discussion_filters'; import initSortDiscussions from './sort_discussions'; -import initTimelineToggle from './timeline'; import { store } from './stores'; +import initTimelineToggle from './timeline'; const el = document.getElementById('js-vue-notes'); diff --git a/app/assets/javascripts/notes/mixins/diff_line_note_form.js b/app/assets/javascripts/notes/mixins/diff_line_note_form.js index 5ce541781d4..76342e07c04 100644 --- a/app/assets/javascripts/notes/mixins/diff_line_note_form.js +++ b/app/assets/javascripts/notes/mixins/diff_line_note_form.js @@ -2,8 +2,8 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import { getDraftReplyFormData, getDraftFormData } from '~/batch_comments/utils'; import { TEXT_DIFF_POSITION_TYPE, IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__ } from '~/locale'; import { clearDraft } from '~/lib/utils/autosave'; +import { s__ } from '~/locale'; import { formatLineRange } from '~/notes/components/multiline_comment_utils'; export default { diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index d3ea1f56037..19403c29cda 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -1,24 +1,24 @@ -import Vue from 'vue'; import $ from 'jquery'; import Visibility from 'visibilityjs'; +import Vue from 'vue'; +import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; +import { __, sprintf } from '~/locale'; import updateIssueConfidentialMutation from '~/sidebar/components/confidential/mutations/update_issue_confidential.mutation.graphql'; -import updateMergeRequestLockMutation from '~/sidebar/components/lock/mutations/update_merge_request_lock.mutation.graphql'; import updateIssueLockMutation from '~/sidebar/components/lock/mutations/update_issue_lock.mutation.graphql'; -import { __, sprintf } from '~/locale'; -import Api from '~/api'; -import TaskList from '../../task_list'; -import { deprecatedCreateFlash as Flash } from '../../flash'; -import Poll from '../../lib/utils/poll'; -import * as constants from '../constants'; +import updateMergeRequestLockMutation from '~/sidebar/components/lock/mutations/update_merge_request_lock.mutation.graphql'; import loadAwardsHandler from '../../awards_handler'; -import sidebarTimeTrackingEventHub from '../../sidebar/event_hub'; +import { deprecatedCreateFlash as Flash } from '../../flash'; import { isInViewport, scrollToElement, isInMRPage } from '../../lib/utils/common_utils'; +import Poll from '../../lib/utils/poll'; import { mergeUrlParams } from '../../lib/utils/url_utility'; -import eventHub from '../event_hub'; +import sidebarTimeTrackingEventHub from '../../sidebar/event_hub'; +import TaskList from '../../task_list'; import mrWidgetEventHub from '../../vue_merge_request_widget/event_hub'; -import * as utils from './utils'; +import * as constants from '../constants'; +import eventHub from '../event_hub'; import * as types from './mutation_types'; +import * as utils from './utils'; let eTagPoll; diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js index c1738eb20da..f154edd3434 100644 --- a/app/assets/javascripts/notes/stores/modules/index.js +++ b/app/assets/javascripts/notes/stores/modules/index.js @@ -1,7 +1,7 @@ +import { ASC } from '../../constants'; import * as actions from '../actions'; import * as getters from '../getters'; import mutations from '../mutations'; -import { ASC } from '../../constants'; export default () => ({ state: { diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index 536b47667c2..c5fa34dfedd 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -1,8 +1,8 @@ import { isEqual } from 'lodash'; -import * as constants from '../constants'; import { isInMRPage } from '../../lib/utils/common_utils'; -import * as utils from './utils'; +import * as constants from '../constants'; import * as types from './mutation_types'; +import * as utils from './utils'; export default { [types.ADD_NEW_NOTE](state, data) { diff --git a/app/assets/javascripts/notes/stores/utils.js b/app/assets/javascripts/notes/stores/utils.js index 6df926e1249..627e405c75c 100644 --- a/app/assets/javascripts/notes/stores/utils.js +++ b/app/assets/javascripts/notes/stores/utils.js @@ -1,7 +1,7 @@ -import AjaxCache from '~/lib/utils/ajax_cache'; import { trimFirstCharOfLineContent } from '~/diffs/store/utils'; -import { sprintf, __ } from '~/locale'; import createGqClient, { fetchPolicies } from '~/lib/graphql'; +import AjaxCache from '~/lib/utils/ajax_cache'; +import { sprintf, __ } from '~/locale'; // factory function because global flag makes RegExp stateful const createQuickActionsRegex = () => /^\/\w+.*$/gm; diff --git a/app/assets/javascripts/notifications/components/notifications_dropdown.vue b/app/assets/javascripts/notifications/components/notifications_dropdown.vue index 85b58f9dec6..e4cedfdb810 100644 --- a/app/assets/javascripts/notifications/components/notifications_dropdown.vue +++ b/app/assets/javascripts/notifications/components/notifications_dropdown.vue @@ -7,11 +7,11 @@ import { GlTooltipDirective, GlModalDirective, } from '@gitlab/ui'; -import { sprintf } from '~/locale'; import Api from '~/api'; +import { sprintf } from '~/locale'; import { CUSTOM_LEVEL, i18n } from '../constants'; -import NotificationsDropdownItem from './notifications_dropdown_item.vue'; import CustomNotificationsModal from './custom_notifications_modal.vue'; +import NotificationsDropdownItem from './notifications_dropdown_item.vue'; export default { name: 'NotificationsDropdown', diff --git a/app/assets/javascripts/notifications/index.js b/app/assets/javascripts/notifications/index.js index e095d0afe32..d60a368703c 100644 --- a/app/assets/javascripts/notifications/index.js +++ b/app/assets/javascripts/notifications/index.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import NotificationsDropdown from './components/notifications_dropdown.vue'; diff --git a/app/assets/javascripts/notifications_form.js b/app/assets/javascripts/notifications_form.js index 1b12fece23a..8b90da71bef 100644 --- a/app/assets/javascripts/notifications_form.js +++ b/app/assets/javascripts/notifications_form.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { __ } from './locale'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from './flash'; +import axios from './lib/utils/axios_utils'; +import { __ } from './locale'; export default class NotificationsForm { constructor() { diff --git a/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue b/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue index d83146d2f5e..7120ad511d3 100644 --- a/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue +++ b/app/assets/javascripts/operation_settings/components/form_group/dashboard_timezone.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlFormGroup, GlFormSelect } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { s__ } from '~/locale'; import { timezones } from '~/monitoring/format_date'; diff --git a/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue b/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue index 812c5a3fe9a..2ea5b4e01b1 100644 --- a/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue +++ b/app/assets/javascripts/operation_settings/components/form_group/external_dashboard.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/operation_settings/components/metrics_settings.vue b/app/assets/javascripts/operation_settings/components/metrics_settings.vue index 2d2e625d3d3..0c0bbb744b3 100644 --- a/app/assets/javascripts/operation_settings/components/metrics_settings.vue +++ b/app/assets/javascripts/operation_settings/components/metrics_settings.vue @@ -1,8 +1,8 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlButton, GlLink } from '@gitlab/ui'; -import ExternalDashboard from './form_group/external_dashboard.vue'; +import { mapState, mapActions } from 'vuex'; import DashboardTimezone from './form_group/dashboard_timezone.vue'; +import ExternalDashboard from './form_group/external_dashboard.vue'; export default { components: { diff --git a/app/assets/javascripts/operation_settings/index.js b/app/assets/javascripts/operation_settings/index.js index 426a060949e..faddf9c7b81 100644 --- a/app/assets/javascripts/operation_settings/index.js +++ b/app/assets/javascripts/operation_settings/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import store from './store'; import MetricsSettingsForm from './components/metrics_settings.vue'; +import store from './store'; export default () => { const el = document.querySelector('.js-operation-settings'); diff --git a/app/assets/javascripts/operation_settings/store/actions.js b/app/assets/javascripts/operation_settings/store/actions.js index bbbff6630d3..af66e344b35 100644 --- a/app/assets/javascripts/operation_settings/store/actions.js +++ b/app/assets/javascripts/operation_settings/store/actions.js @@ -1,7 +1,7 @@ -import axios from '~/lib/utils/axios_utils'; -import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import * as mutationTypes from './mutation_types'; export const setExternalDashboardUrl = ({ commit }, url) => diff --git a/app/assets/javascripts/operation_settings/store/index.js b/app/assets/javascripts/operation_settings/store/index.js index e3dcfd31a83..a11bd8089fd 100644 --- a/app/assets/javascripts/operation_settings/store/index.js +++ b/app/assets/javascripts/operation_settings/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/packages/details/components/app.vue b/app/assets/javascripts/packages/details/components/app.vue index e8b9ecfd616..bcfb17a1529 100644 --- a/app/assets/javascripts/packages/details/components/app.vue +++ b/app/assets/javascripts/packages/details/components/app.vue @@ -11,20 +11,20 @@ import { GlSprintf, } from '@gitlab/ui'; import { mapActions, mapState } from 'vuex'; -import Tracking from '~/tracking'; -import { s__ } from '~/locale'; import { objectToQueryString } from '~/lib/utils/common_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils'; -import PackagesListLoader from '../../shared/components/packages_list_loader.vue'; +import { s__ } from '~/locale'; +import Tracking from '~/tracking'; import PackageListRow from '../../shared/components/package_list_row.vue'; -import { packageTypeToTrackCategory } from '../../shared/utils'; +import PackagesListLoader from '../../shared/components/packages_list_loader.vue'; import { PackageType, TrackingActions, SHOW_DELETE_SUCCESS_ALERT } from '../../shared/constants'; -import PackageTitle from './package_title.vue'; -import PackageHistory from './package_history.vue'; -import DependencyRow from './dependency_row.vue'; +import { packageTypeToTrackCategory } from '../../shared/utils'; import AdditionalMetadata from './additional_metadata.vue'; +import DependencyRow from './dependency_row.vue'; import InstallationCommands from './installation_commands.vue'; import PackageFiles from './package_files.vue'; +import PackageHistory from './package_history.vue'; +import PackageTitle from './package_title.vue'; export default { name: 'PackagesApp', diff --git a/app/assets/javascripts/packages/details/components/installation_commands.vue b/app/assets/javascripts/packages/details/components/installation_commands.vue index ec97ef216f1..28978913e6e 100644 --- a/app/assets/javascripts/packages/details/components/installation_commands.vue +++ b/app/assets/javascripts/packages/details/components/installation_commands.vue @@ -1,11 +1,11 @@ <script> import { PackageType } from '../../shared/constants'; +import ComposerInstallation from './composer_installation.vue'; import ConanInstallation from './conan_installation.vue'; import MavenInstallation from './maven_installation.vue'; import NpmInstallation from './npm_installation.vue'; import NugetInstallation from './nuget_installation.vue'; import PypiInstallation from './pypi_installation.vue'; -import ComposerInstallation from './composer_installation.vue'; export default { name: 'InstallationCommands', diff --git a/app/assets/javascripts/packages/details/components/package_files.vue b/app/assets/javascripts/packages/details/components/package_files.vue index 3add454fda3..c5e929fe2a4 100644 --- a/app/assets/javascripts/packages/details/components/package_files.vue +++ b/app/assets/javascripts/packages/details/components/package_files.vue @@ -1,11 +1,11 @@ <script> import { GlLink, GlTable } from '@gitlab/ui'; import { last } from 'lodash'; +import { numberToHumanSize } from '~/lib/utils/number_utils'; import { __ } from '~/locale'; import Tracking from '~/tracking'; -import { numberToHumanSize } from '~/lib/utils/number_utils'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { name: 'PackageFiles', diff --git a/app/assets/javascripts/packages/details/components/package_history.vue b/app/assets/javascripts/packages/details/components/package_history.vue index 62550602428..0d7a73c12f1 100644 --- a/app/assets/javascripts/packages/details/components/package_history.vue +++ b/app/assets/javascripts/packages/details/components/package_history.vue @@ -1,11 +1,11 @@ <script> import { GlLink, GlSprintf } from '@gitlab/ui'; import { first } from 'lodash'; -import { s__, n__ } from '~/locale'; import { truncateSha } from '~/lib/utils/text_utility'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import HistoryItem from '~/vue_shared/components/registry/history_item.vue'; +import { s__, n__ } from '~/locale'; import { HISTORY_PIPELINES_LIMIT } from '~/packages/details/constants'; +import HistoryItem from '~/vue_shared/components/registry/history_item.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { name: 'PackageHistory', diff --git a/app/assets/javascripts/packages/details/components/package_title.vue b/app/assets/javascripts/packages/details/components/package_title.vue index cded8708b0c..d02a7b3ec27 100644 --- a/app/assets/javascripts/packages/details/components/package_title.vue +++ b/app/assets/javascripts/packages/details/components/package_title.vue @@ -1,13 +1,13 @@ <script> /* eslint-disable vue/v-slot-style */ -import { mapState, mapGetters } from 'vuex'; import { GlIcon, GlSprintf, GlTooltipDirective, GlBadge } from '@gitlab/ui'; import { GlBreakpointInstance } from '@gitlab/ui/dist/utils'; +import { mapState, mapGetters } from 'vuex'; import { numberToHumanSize } from '~/lib/utils/number_utils'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; -import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; import { __ } from '~/locale'; +import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; import PackageTags from '../../shared/components/package_tags.vue'; export default { diff --git a/app/assets/javascripts/packages/list/components/package_title.vue b/app/assets/javascripts/packages/list/components/package_title.vue index f94a98e4ca7..6176e15ffd4 100644 --- a/app/assets/javascripts/packages/list/components/package_title.vue +++ b/app/assets/javascripts/packages/list/components/package_title.vue @@ -1,7 +1,7 @@ <script> import { n__ } from '~/locale'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import { LIST_INTRO_TEXT, LIST_TITLE_TEXT } from '../constants'; export default { diff --git a/app/assets/javascripts/packages/list/components/packages_list.vue b/app/assets/javascripts/packages/list/components/packages_list.vue index 1e38ee525b8..23ba070aa26 100644 --- a/app/assets/javascripts/packages/list/components/packages_list.vue +++ b/app/assets/javascripts/packages/list/components/packages_list.vue @@ -1,12 +1,12 @@ <script> -import { mapState, mapGetters } from 'vuex'; import { GlPagination, GlModal, GlSprintf } from '@gitlab/ui'; -import Tracking from '~/tracking'; +import { mapState, mapGetters } from 'vuex'; import { s__ } from '~/locale'; +import Tracking from '~/tracking'; +import PackagesListRow from '../../shared/components/package_list_row.vue'; +import PackagesListLoader from '../../shared/components/packages_list_loader.vue'; import { TrackingActions } from '../../shared/constants'; import { packageTypeToTrackCategory } from '../../shared/utils'; -import PackagesListLoader from '../../shared/components/packages_list_loader.vue'; -import PackagesListRow from '../../shared/components/package_list_row.vue'; export default { components: { diff --git a/app/assets/javascripts/packages/list/components/packages_list_app.vue b/app/assets/javascripts/packages/list/components/packages_list_app.vue index 195859bdb6a..a609dfebedf 100644 --- a/app/assets/javascripts/packages/list/components/packages_list_app.vue +++ b/app/assets/javascripts/packages/list/components/packages_list_app.vue @@ -1,14 +1,14 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import { mapActions, mapState } from 'vuex'; import createFlash from '~/flash'; import { historyReplaceState } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages/shared/constants'; import { DELETE_PACKAGE_SUCCESS_MESSAGE } from '../constants'; -import PackageList from './packages_list.vue'; -import PackageTitle from './package_title.vue'; import PackageSearch from './package_search.vue'; +import PackageTitle from './package_title.vue'; +import PackageList from './packages_list.vue'; export default { components: { diff --git a/app/assets/javascripts/packages/list/packages_list_app_bundle.js b/app/assets/javascripts/packages/list/packages_list_app_bundle.js index 73840035728..58b09c1ebd1 100644 --- a/app/assets/javascripts/packages/list/packages_list_app_bundle.js +++ b/app/assets/javascripts/packages/list/packages_list_app_bundle.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import Translate from '~/vue_shared/translate'; import createDefaultClient from '~/lib/graphql'; -import { createStore } from './stores'; +import Translate from '~/vue_shared/translate'; import PackagesListApp from './components/packages_list_app.vue'; +import { createStore } from './stores'; Vue.use(VueApollo); Vue.use(Translate); diff --git a/app/assets/javascripts/packages/list/stores/actions.js b/app/assets/javascripts/packages/list/stores/actions.js index b123cbaa531..195117b9ddb 100644 --- a/app/assets/javascripts/packages/list/stores/actions.js +++ b/app/assets/javascripts/packages/list/stores/actions.js @@ -1,6 +1,6 @@ import Api from '~/api'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages/shared/constants'; import { FETCH_PACKAGES_LIST_ERROR_MESSAGE, diff --git a/app/assets/javascripts/packages/list/stores/getters.js b/app/assets/javascripts/packages/list/stores/getters.js index 85c489deda0..482c111b58b 100644 --- a/app/assets/javascripts/packages/list/stores/getters.js +++ b/app/assets/javascripts/packages/list/stores/getters.js @@ -1,5 +1,5 @@ -import { LIST_KEY_PROJECT } from '../constants'; import { beautifyPath } from '../../shared/utils'; +import { LIST_KEY_PROJECT } from '../constants'; export default (state) => state.packages.map((p) => ({ ...p, projectPathName: beautifyPath(p[LIST_KEY_PROJECT]) })); diff --git a/app/assets/javascripts/packages/shared/components/package_list_row.vue b/app/assets/javascripts/packages/shared/components/package_list_row.vue index 89b217b7d42..cdfe042c39f 100644 --- a/app/assets/javascripts/packages/shared/components/package_list_row.vue +++ b/app/assets/javascripts/packages/shared/components/package_list_row.vue @@ -1,10 +1,10 @@ <script> import { GlButton, GlIcon, GlLink, GlSprintf, GlTooltipDirective, GlTruncate } from '@gitlab/ui'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; import ListItem from '~/vue_shared/components/registry/list_item.vue'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; import { getPackageTypeLabel } from '../utils'; -import PackageTags from './package_tags.vue'; import PackagePath from './package_path.vue'; +import PackageTags from './package_tags.vue'; import PublishMethod from './publish_method.vue'; export default { diff --git a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js index 1bf2336a1f4..5cd8261ac23 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js @@ -1,8 +1,8 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { parseBoolean } from '~/lib/utils/common_utils'; +import Translate from '~/vue_shared/translate'; import SettingsApp from './components/group_settings_app.vue'; import { apolloProvider } from './graphql'; diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue index da90b7290e1..933cbeaedce 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue +++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue @@ -1,6 +1,5 @@ <script> import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; -import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue'; import { @@ -10,10 +9,11 @@ import { ERROR_UPDATING_SETTINGS, SUCCESS_UPDATING_SETTINGS, } from '~/packages_and_registries/settings/group/constants'; +import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql'; +import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update'; import { updateGroupPackagesSettingsOptimisticResponse } from '~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'; -import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; -import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql'; +import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; export default { name: 'GroupSettingsApp', diff --git a/app/assets/javascripts/packages_and_registries/settings/group/constants.js b/app/assets/javascripts/packages_and_registries/settings/group/constants.js index 12d595d3625..72bec74060c 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/constants.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/constants.js @@ -1,5 +1,5 @@ -import { s__, __ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { s__, __ } from '~/locale'; export const PACKAGE_SETTINGS_HEADER = s__('PackageRegistry|Package Registry'); export const PACKAGE_SETTINGS_DESCRIPTION = s__( diff --git a/app/assets/javascripts/pager.js b/app/assets/javascripts/pager.js index f9a91ec322b..f78d2b0dbd3 100644 --- a/app/assets/javascripts/pager.js +++ b/app/assets/javascripts/pager.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'vendor/jquery.endless-scroll'; -import { getParameterByName } from '~/lib/utils/common_utils'; import axios from '~/lib/utils/axios_utils'; +import { getParameterByName } from '~/lib/utils/common_utils'; import { removeParams } from '~/lib/utils/url_utility'; const ENDLESS_SCROLL_BOTTOM_PX = 400; diff --git a/app/assets/javascripts/pages/admin/application_settings/index.js b/app/assets/javascripts/pages/admin/application_settings/index.js index ac255b8d913..e7e74588bec 100644 --- a/app/assets/javascripts/pages/admin/application_settings/index.js +++ b/app/assets/javascripts/pages/admin/application_settings/index.js @@ -1,8 +1,8 @@ -import initSettingsPanels from '~/settings_panels'; -import projectSelect from '~/project_select'; -import selfMonitor from '~/self_monitor'; import initVariableList from '~/ci_variable_list'; +import projectSelect from '~/project_select'; import initSearchSettings from '~/search_settings'; +import selfMonitor from '~/self_monitor'; +import initSettingsPanels from '~/settings_panels'; document.addEventListener('DOMContentLoaded', () => { if (gon.features?.ciInstanceVariablesUi) { diff --git a/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js b/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js index b995cb1d3dd..bc1d4dd6122 100644 --- a/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js +++ b/app/assets/javascripts/pages/admin/application_settings/payload_previewer.js @@ -1,6 +1,6 @@ +import { deprecatedCreateFlash as flash } from '../../../flash'; import axios from '../../../lib/utils/axios_utils'; import { __ } from '../../../locale'; -import { deprecatedCreateFlash as flash } from '../../../flash'; export default class PayloadPreviewer { constructor(trigger) { diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js index 9e4c4d9f615..5a16716fe2d 100644 --- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js +++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import { debounce } from 'lodash'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; -import { __ } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { textColorForBackground } from '~/lib/utils/color_utils'; +import { __ } from '~/locale'; export default () => { const $broadcastMessageColor = $('.js-broadcast-message-color'); diff --git a/app/assets/javascripts/pages/admin/clusters/index/index.js b/app/assets/javascripts/pages/admin/clusters/index/index.js index 744be65bfbe..a99e0dfa4f0 100644 --- a/app/assets/javascripts/pages/admin/clusters/index/index.js +++ b/app/assets/javascripts/pages/admin/clusters/index/index.js @@ -1,5 +1,5 @@ -import PersistentUserCallout from '~/persistent_user_callout'; import initClustersListApp from '~/clusters_list'; +import PersistentUserCallout from '~/persistent_user_callout'; document.addEventListener('DOMContentLoaded', () => { const callout = document.querySelector('.gcp-signup-offer'); diff --git a/app/assets/javascripts/pages/admin/clusters/show/index.js b/app/assets/javascripts/pages/admin/clusters/show/index.js index f87da6c7074..9d94973af0d 100644 --- a/app/assets/javascripts/pages/admin/clusters/show/index.js +++ b/app/assets/javascripts/pages/admin/clusters/show/index.js @@ -1,6 +1,6 @@ import ClustersBundle from '~/clusters/clusters_bundle'; -import initClusterHealth from '~/pages/projects/clusters/show/cluster_health'; import initIntegrationForm from '~/clusters/forms/show'; +import initClusterHealth from '~/pages/projects/clusters/show/cluster_health'; document.addEventListener('DOMContentLoaded', () => { new ClustersBundle(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue index d65593963ce..798eeee48bf 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue +++ b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue @@ -1,7 +1,7 @@ <script> import { GlModal } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { redirectTo } from '~/lib/utils/url_utility'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/pages/admin/jobs/index/index.js b/app/assets/javascripts/pages/admin/jobs/index/index.js index 9db2868e051..46ddb95299d 100644 --- a/app/assets/javascripts/pages/admin/jobs/index/index.js +++ b/app/assets/javascripts/pages/admin/jobs/index/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import Translate from '~/vue_shared/translate'; import stopJobsModal from './components/stop_jobs_modal.vue'; Vue.use(Translate); diff --git a/app/assets/javascripts/pages/admin/projects/index.js b/app/assets/javascripts/pages/admin/projects/index.js index fa2b0546c02..2286a085143 100644 --- a/app/assets/javascripts/pages/admin/projects/index.js +++ b/app/assets/javascripts/pages/admin/projects/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import ProjectsList from '~/projects_list'; import NamespaceSelect from '~/namespace_select'; +import ProjectsList from '~/projects_list'; import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue'; function mountRemoveMemberModal() { diff --git a/app/assets/javascripts/pages/admin/projects/index/index.js b/app/assets/javascripts/pages/admin/projects/index/index.js index 40f176d5eb2..1971323abac 100644 --- a/app/assets/javascripts/pages/admin/projects/index/index.js +++ b/app/assets/javascripts/pages/admin/projects/index/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; -import csrf from '~/lib/utils/csrf'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import csrf from '~/lib/utils/csrf'; +import Translate from '~/vue_shared/translate'; import deleteProjectModal from './components/delete_project_modal.vue'; diff --git a/app/assets/javascripts/pages/admin/runners/index.js b/app/assets/javascripts/pages/admin/runners/index.js index 0b92f5ef90f..f07ac1d8674 100644 --- a/app/assets/javascripts/pages/admin/runners/index.js +++ b/app/assets/javascripts/pages/admin/runners/index.js @@ -1,6 +1,6 @@ -import initFilteredSearch from '~/pages/search/init_filtered_search'; import AdminRunnersFilteredSearchTokenKeys from '~/filtered_search/admin_runners_filtered_search_token_keys'; import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; import { initInstallRunner } from '~/pages/shared/mount_runner_instructions'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/admin/users/index.js b/app/assets/javascripts/pages/admin/users/index.js index 42afcf434f6..b1079c3b068 100644 --- a/app/assets/javascripts/pages/admin/users/index.js +++ b/app/assets/javascripts/pages/admin/users/index.js @@ -1,10 +1,10 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; -import csrf from '~/lib/utils/csrf'; -import initConfirmModal from '~/confirm_modal'; import { initAdminUsersApp, initCohortsEmptyState } from '~/admin/users'; import initTabs from '~/admin/users/tabs'; +import initConfirmModal from '~/confirm_modal'; +import csrf from '~/lib/utils/csrf'; +import Translate from '~/vue_shared/translate'; import ModalManager from './components/user_modal_manager.vue'; const CONFIRM_DELETE_BUTTON_SELECTOR = '.js-delete-user-modal-button'; diff --git a/app/assets/javascripts/pages/dashboard/issues/index.js b/app/assets/javascripts/pages/dashboard/issues/index.js index 71cdaf45052..3ad95fb1318 100644 --- a/app/assets/javascripts/pages/dashboard/issues/index.js +++ b/app/assets/javascripts/pages/dashboard/issues/index.js @@ -1,8 +1,8 @@ -import projectSelect from '~/project_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; -import { FILTERED_SEARCH } from '~/pages/constants'; import initManualOrdering from '~/manual_ordering'; +import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import projectSelect from '~/project_select'; document.addEventListener('DOMContentLoaded', () => { initFilteredSearch({ diff --git a/app/assets/javascripts/pages/dashboard/merge_requests/index.js b/app/assets/javascripts/pages/dashboard/merge_requests/index.js index 7adae2cdb05..b099165e3f5 100644 --- a/app/assets/javascripts/pages/dashboard/merge_requests/index.js +++ b/app/assets/javascripts/pages/dashboard/merge_requests/index.js @@ -1,8 +1,8 @@ import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; -import projectSelect from '~/project_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import projectSelect from '~/project_select'; document.addEventListener('DOMContentLoaded', () => { addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys, true); diff --git a/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue b/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue index bed753b0c40..d17c37e9e1a 100644 --- a/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue +++ b/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue @@ -1,7 +1,7 @@ <script> import { GlBanner } from '@gitlab/ui'; -import { s__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { s__ } from '~/locale'; import Tracking from '~/tracking'; const trackingMixin = Tracking.mixin(); diff --git a/app/assets/javascripts/pages/dashboard/todos/index/todos.js b/app/assets/javascripts/pages/dashboard/todos/index/todos.js index bd283201eff..d53cd405504 100644 --- a/app/assets/javascripts/pages/dashboard/todos/index/todos.js +++ b/app/assets/javascripts/pages/dashboard/todos/index/todos.js @@ -2,13 +2,13 @@ import $ from 'jquery'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { visitUrl } from '~/lib/utils/url_utility'; -import UsersSelect from '~/users_select'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { isMetaClick } from '~/lib/utils/common_utils'; import { addDelimiter } from '~/lib/utils/text_utility'; +import { visitUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; -import { deprecatedCreateFlash as flash } from '~/flash'; -import axios from '~/lib/utils/axios_utils'; +import UsersSelect from '~/users_select'; export default class Todos { constructor() { diff --git a/app/assets/javascripts/pages/groups/boards/index.js b/app/assets/javascripts/pages/groups/boards/index.js index 922f39627c9..bde0007ec6a 100644 --- a/app/assets/javascripts/pages/groups/boards/index.js +++ b/app/assets/javascripts/pages/groups/boards/index.js @@ -1,6 +1,6 @@ -import UsersSelect from '~/users_select'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import initBoards from '~/boards'; +import UsersSelect from '~/users_select'; new UsersSelect(); // eslint-disable-line no-new new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/groups/clusters/index.js b/app/assets/javascripts/pages/groups/clusters/index.js index 9f466e0d60a..d5ce5d076a2 100644 --- a/app/assets/javascripts/pages/groups/clusters/index.js +++ b/app/assets/javascripts/pages/groups/clusters/index.js @@ -1,5 +1,5 @@ -import initCreateCluster from '~/create_cluster/init_create_cluster'; import initIntegrationForm from '~/clusters/forms/show/index'; +import initCreateCluster from '~/create_cluster/init_create_cluster'; document.addEventListener('DOMContentLoaded', () => { initCreateCluster(document, gon); diff --git a/app/assets/javascripts/pages/groups/clusters/index/index.js b/app/assets/javascripts/pages/groups/clusters/index/index.js index 744be65bfbe..a99e0dfa4f0 100644 --- a/app/assets/javascripts/pages/groups/clusters/index/index.js +++ b/app/assets/javascripts/pages/groups/clusters/index/index.js @@ -1,5 +1,5 @@ -import PersistentUserCallout from '~/persistent_user_callout'; import initClustersListApp from '~/clusters_list'; +import PersistentUserCallout from '~/persistent_user_callout'; document.addEventListener('DOMContentLoaded', () => { const callout = document.querySelector('.gcp-signup-offer'); diff --git a/app/assets/javascripts/pages/groups/edit/index.js b/app/assets/javascripts/pages/groups/edit/index.js index 33e552cd1ba..95ee512b71a 100644 --- a/app/assets/javascripts/pages/groups/edit/index.js +++ b/app/assets/javascripts/pages/groups/edit/index.js @@ -1,13 +1,13 @@ -import initFilePickers from '~/file_pickers'; -import TransferDropdown from '~/groups/transfer_dropdown'; +import { GROUP_BADGE } from '~/badges/constants'; import initConfirmDangerModal from '~/confirm_danger_modal'; -import initSettingsPanels from '~/settings_panels'; -import setupTransferEdit from '~/transfer_edit'; import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; -import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; -import { GROUP_BADGE } from '~/badges/constants'; +import initFilePickers from '~/file_pickers'; +import TransferDropdown from '~/groups/transfer_dropdown'; import groupsSelect from '~/groups_select'; +import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; import projectSelect from '~/project_select'; +import initSettingsPanels from '~/settings_panels'; +import setupTransferEdit from '~/transfer_edit'; document.addEventListener('DOMContentLoaded', () => { initFilePickers(); diff --git a/app/assets/javascripts/pages/groups/group_members/index.js b/app/assets/javascripts/pages/groups/group_members/index.js index 516311dd841..3496f699b06 100644 --- a/app/assets/javascripts/pages/groups/group_members/index.js +++ b/app/assets/javascripts/pages/groups/group_members/index.js @@ -1,14 +1,14 @@ import Vue from 'vue'; -import memberExpirationDate from '~/member_expiration_date'; -import UsersSelect from '~/users_select'; +import { groupMemberRequestFormatter } from '~/groups/members/utils'; import groupsSelect from '~/groups_select'; -import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; +import { s__ } from '~/locale'; +import memberExpirationDate from '~/member_expiration_date'; import { initMembersApp } from '~/members/index'; -import { groupMemberRequestFormatter } from '~/groups/members/utils'; import { groupLinkRequestFormatter } from '~/members/utils'; -import { s__ } from '~/locale'; +import UsersSelect from '~/users_select'; +import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue'; function mountRemoveMemberModal() { const el = document.querySelector('.js-remove-member-modal'); diff --git a/app/assets/javascripts/pages/groups/issues/index.js b/app/assets/javascripts/pages/groups/issues/index.js index 5cb21ca61ab..b60607e8857 100644 --- a/app/assets/javascripts/pages/groups/issues/index.js +++ b/app/assets/javascripts/pages/groups/issues/index.js @@ -1,10 +1,10 @@ import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; -import initIssuablesList from '~/issues_list'; -import projectSelect from '~/project_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; -import { FILTERED_SEARCH } from '~/pages/constants'; +import initIssuablesList from '~/issues_list'; import initManualOrdering from '~/manual_ordering'; +import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import projectSelect from '~/project_select'; const ISSUE_BULK_UPDATE_PREFIX = 'issue_'; diff --git a/app/assets/javascripts/pages/groups/merge_requests/index.js b/app/assets/javascripts/pages/groups/merge_requests/index.js index 2832cbed5ac..2f6f9bb16e1 100644 --- a/app/assets/javascripts/pages/groups/merge_requests/index.js +++ b/app/assets/javascripts/pages/groups/merge_requests/index.js @@ -1,9 +1,9 @@ import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; -import projectSelect from '~/project_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; -import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import projectSelect from '~/project_select'; const ISSUABLE_BULK_UPDATE_PREFIX = 'merge_request_'; diff --git a/app/assets/javascripts/pages/groups/milestones/show/index.js b/app/assets/javascripts/pages/groups/milestones/show/index.js index ebaea5ef3dc..3094fe5cd21 100644 --- a/app/assets/javascripts/pages/groups/milestones/show/index.js +++ b/app/assets/javascripts/pages/groups/milestones/show/index.js @@ -1,7 +1,6 @@ -import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show'; -import initDeleteMilestoneModal from '~/pages/milestones/shared/delete_milestone_modal_init'; - import Milestone from '~/milestone'; +import initDeleteMilestoneModal from '~/pages/milestones/shared/delete_milestone_modal_init'; +import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show'; document.addEventListener('DOMContentLoaded', () => { initMilestonesShow(); diff --git a/app/assets/javascripts/pages/groups/new/group_path_validator.js b/app/assets/javascripts/pages/groups/new/group_path_validator.js index 7da196a34ab..89dccea2812 100644 --- a/app/assets/javascripts/pages/groups/new/group_path_validator.js +++ b/app/assets/javascripts/pages/groups/new/group_path_validator.js @@ -1,8 +1,8 @@ import { debounce } from 'lodash'; -import InputValidator from '~/validators/input_validator'; import { deprecatedCreateFlash as flash } from '~/flash'; import { __ } from '~/locale'; +import InputValidator from '~/validators/input_validator'; import fetchGroupPathAvailability from './fetch_group_path_availability'; const debounceTimeoutDuration = 1000; diff --git a/app/assets/javascripts/pages/groups/new/index.js b/app/assets/javascripts/pages/groups/new/index.js index 88118d07c9e..63515abe698 100644 --- a/app/assets/javascripts/pages/groups/new/index.js +++ b/app/assets/javascripts/pages/groups/new/index.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import BindInOut from '~/behaviors/bind_in_out'; -import Group from '~/group'; import initFilePickers from '~/file_pickers'; +import Group from '~/group'; import GroupPathValidator from './group_path_validator'; const parentId = $('#group_parent_id'); diff --git a/app/assets/javascripts/pages/groups/settings/badges/index.js b/app/assets/javascripts/pages/groups/settings/badges/index.js index 74e96ee4a8f..3f48e4f281e 100644 --- a/app/assets/javascripts/pages/groups/settings/badges/index.js +++ b/app/assets/javascripts/pages/groups/settings/badges/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { GROUP_BADGE } from '~/badges/constants'; import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; +import Translate from '~/vue_shared/translate'; Vue.use(Translate); diff --git a/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js index 19d81f61dba..378b8663777 100644 --- a/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js +++ b/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js @@ -1,10 +1,10 @@ -import initSettingsPanels from '~/settings_panels'; import initVariableList from '~/ci_variable_list'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; import GroupRunnersFilteredSearchTokenKeys from '~/filtered_search/group_runners_filtered_search_token_keys'; -import { FILTERED_SEARCH } from '~/pages/constants'; import initSharedRunnersForm from '~/group_settings/mount_shared_runners'; +import { FILTERED_SEARCH } from '~/pages/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; import { initInstallRunner } from '~/pages/shared/mount_runner_instructions'; +import initSettingsPanels from '~/settings_panels'; document.addEventListener('DOMContentLoaded', () => { // Initialize expandable settings panels diff --git a/app/assets/javascripts/pages/groups/settings/repository/show/index.js b/app/assets/javascripts/pages/groups/settings/repository/show/index.js index f4b26ba81fe..a1bcf6dbf57 100644 --- a/app/assets/javascripts/pages/groups/settings/repository/show/index.js +++ b/app/assets/javascripts/pages/groups/settings/repository/show/index.js @@ -1,5 +1,5 @@ -import initSettingsPanels from '~/settings_panels'; import DueDateSelectors from '~/due_date_select'; +import initSettingsPanels from '~/settings_panels'; document.addEventListener('DOMContentLoaded', () => { // Initialize expandable settings panels diff --git a/app/assets/javascripts/pages/groups/shared/group_details.js b/app/assets/javascripts/pages/groups/shared/group_details.js index add955ab1f2..8c272e561db 100644 --- a/app/assets/javascripts/pages/groups/shared/group_details.js +++ b/app/assets/javascripts/pages/groups/shared/group_details.js @@ -1,15 +1,15 @@ /* eslint-disable no-new */ -import { getPagePath, getDashPath } from '~/lib/utils/common_utils'; -import { ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED } from '~/groups/constants'; -import notificationsDropdown from '~/notifications_dropdown'; -import NotificationsForm from '~/notifications_form'; -import ProjectsList from '~/projects_list'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import { ACTIVE_TAB_SHARED, ACTIVE_TAB_ARCHIVED } from '~/groups/constants'; import initInviteMembersBanner from '~/groups/init_invite_members_banner'; -import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; +import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; +import { getPagePath, getDashPath } from '~/lib/utils/common_utils'; import initNotificationsDropdown from '~/notifications'; +import notificationsDropdown from '~/notifications_dropdown'; +import NotificationsForm from '~/notifications_form'; +import ProjectsList from '~/projects_list'; import GroupTabs from './group_tabs'; export default function initGroupDetails(actionName = 'show') { diff --git a/app/assets/javascripts/pages/groups/shared/group_tabs.js b/app/assets/javascripts/pages/groups/shared/group_tabs.js index 033843d8504..73d810007dc 100644 --- a/app/assets/javascripts/pages/groups/shared/group_tabs.js +++ b/app/assets/javascripts/pages/groups/shared/group_tabs.js @@ -1,5 +1,4 @@ import $ from 'jquery'; -import { removeParams } from '~/lib/utils/url_utility'; import createGroupTree from '~/groups'; import { ACTIVE_TAB_SUBGROUPS_AND_PROJECTS, @@ -9,8 +8,9 @@ import { GROUPS_LIST_HOLDER_CLASS, GROUPS_FILTER_FORM_CLASS, } from '~/groups/constants'; -import UserTabs from '~/pages/users/user_tabs'; import GroupFilterableList from '~/groups/groups_filterable_list'; +import { removeParams } from '~/lib/utils/url_utility'; +import UserTabs from '~/pages/users/user_tabs'; export default class GroupTabs extends UserTabs { constructor({ defaultAction = 'subgroups_and_projects', action, parentEl }) { diff --git a/app/assets/javascripts/pages/help/index/index.js b/app/assets/javascripts/pages/help/index/index.js index 1bafe564a37..fd8c590eb4e 100644 --- a/app/assets/javascripts/pages/help/index/index.js +++ b/app/assets/javascripts/pages/help/index/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import VersionCheckImage from '~/version_check_image'; import docs from '~/docs/docs_bundle'; +import VersionCheckImage from '~/version_check_image'; document.addEventListener('DOMContentLoaded', () => { docs(); diff --git a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue index f47945c5a9f..16f68b94c9a 100644 --- a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue +++ b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue @@ -1,10 +1,10 @@ <script> import { GlSafeHtmlDirective as SafeHtml, GlModal } from '@gitlab/ui'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as Flash } from '~/flash'; -import { __, n__, s__, sprintf } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; +import { __, n__, s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue b/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue index ecde11aff40..8d4997586dd 100644 --- a/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue +++ b/app/assets/javascripts/pages/milestones/shared/components/promote_milestone_modal.vue @@ -1,9 +1,9 @@ <script> import { GlModal } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__, sprintf } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; +import { s__, sprintf } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js b/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js index 829dfa7bb5e..3aeff2db2e0 100644 --- a/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js +++ b/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import Translate from '~/vue_shared/translate'; import DeleteMilestoneModal from './components/delete_milestone_modal.vue'; import eventHub from './event_hub'; diff --git a/app/assets/javascripts/pages/profiles/accounts/show/index.js b/app/assets/javascripts/pages/profiles/accounts/show/index.js index 6c1e953aa83..5350ef61184 100644 --- a/app/assets/javascripts/pages/profiles/accounts/show/index.js +++ b/app/assets/javascripts/pages/profiles/accounts/show/index.js @@ -1,5 +1,5 @@ -import initProfileAccount from '~/profile/account'; import { initClose2faSuccessMessage } from '~/authentication/two_factor_auth'; +import initProfileAccount from '~/profile/account'; document.addEventListener('DOMContentLoaded', initProfileAccount); diff --git a/app/assets/javascripts/pages/profiles/index/index.js b/app/assets/javascripts/pages/profiles/index/index.js index 9bd430f4f11..586b3be8661 100644 --- a/app/assets/javascripts/pages/profiles/index/index.js +++ b/app/assets/javascripts/pages/profiles/index/index.js @@ -1,5 +1,5 @@ -import NotificationsForm from '../../../notifications_form'; import notificationsDropdown from '../../../notifications_dropdown'; +import NotificationsForm from '../../../notifications_form'; document.addEventListener('DOMContentLoaded', () => { new NotificationsForm(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/profiles/notifications/show/index.js b/app/assets/javascripts/pages/profiles/notifications/show/index.js index cd1512df2da..639f5deb72c 100644 --- a/app/assets/javascripts/pages/profiles/notifications/show/index.js +++ b/app/assets/javascripts/pages/profiles/notifications/show/index.js @@ -1,6 +1,6 @@ import initNotificationsDropdown from '~/notifications'; -import NotificationsForm from '../../../../notifications_form'; import notificationsDropdown from '../../../../notifications_dropdown'; +import NotificationsForm from '../../../../notifications_form'; document.addEventListener('DOMContentLoaded', () => { new NotificationsForm(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/profiles/show/index.js b/app/assets/javascripts/pages/profiles/show/index.js index f1f0b2c508b..a24c6ca7754 100644 --- a/app/assets/javascripts/pages/profiles/show/index.js +++ b/app/assets/javascripts/pages/profiles/show/index.js @@ -1,9 +1,9 @@ -import $ from 'jquery'; import emojiRegex from 'emoji-regex'; +import $ from 'jquery'; import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete'; +import * as Emoji from '~/emoji'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __ } from '~/locale'; -import * as Emoji from '~/emoji'; import EmojiMenu from './emoji_menu'; const defaultStatusEmoji = 'speech_balloon'; diff --git a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js index 24dbc312dd2..186072531b8 100644 --- a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js +++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js @@ -1,6 +1,6 @@ -import { parseBoolean } from '~/lib/utils/common_utils'; import { mount2faRegistration } from '~/authentication/mount_2fa'; import { initRecoveryCodes } from '~/authentication/two_factor_auth'; +import { parseBoolean } from '~/lib/utils/common_utils'; document.addEventListener('DOMContentLoaded', () => { const twoFactorNode = document.querySelector('.js-two-factor-auth'); diff --git a/app/assets/javascripts/pages/projects/artifacts/browse/index.js b/app/assets/javascripts/pages/projects/artifacts/browse/index.js index 26dc90a56d7..58ba6a500a3 100644 --- a/app/assets/javascripts/pages/projects/artifacts/browse/index.js +++ b/app/assets/javascripts/pages/projects/artifacts/browse/index.js @@ -1,5 +1,5 @@ -import BuildArtifacts from '~/build_artifacts'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import BuildArtifacts from '~/build_artifacts'; document.addEventListener('DOMContentLoaded', () => { new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/artifacts/file/index.js b/app/assets/javascripts/pages/projects/artifacts/file/index.js index 249900d6cb7..eb5ecc27c43 100644 --- a/app/assets/javascripts/pages/projects/artifacts/file/index.js +++ b/app/assets/javascripts/pages/projects/artifacts/file/index.js @@ -1,5 +1,5 @@ -import BlobViewer from '~/blob/viewer/index'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import BlobViewer from '~/blob/viewer/index'; document.addEventListener('DOMContentLoaded', () => { new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js index 57c4ffd3933..610c643c805 100644 --- a/app/assets/javascripts/pages/projects/blob/show/index.js +++ b/app/assets/javascripts/pages/projects/blob/show/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; -import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import BlobViewer from '~/blob/viewer/index'; -import initBlob from '~/pages/projects/init_blob'; import GpgBadges from '~/gpg_badges'; +import initBlob from '~/pages/projects/init_blob'; import initWebIdeLink from '~/pages/projects/shared/web_ide_link'; +import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import '~/sourcegraph/load'; import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue'; diff --git a/app/assets/javascripts/pages/projects/boards/index.js b/app/assets/javascripts/pages/projects/boards/index.js index 79c3be771d0..3a06d0faa3e 100644 --- a/app/assets/javascripts/pages/projects/boards/index.js +++ b/app/assets/javascripts/pages/projects/boards/index.js @@ -1,6 +1,6 @@ -import UsersSelect from '~/users_select'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import initBoards from '~/boards'; +import UsersSelect from '~/users_select'; document.addEventListener('DOMContentLoaded', () => { new UsersSelect(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/clusters/show/index.js b/app/assets/javascripts/pages/projects/clusters/show/index.js index 376268ec3f6..1d019285e23 100644 --- a/app/assets/javascripts/pages/projects/clusters/show/index.js +++ b/app/assets/javascripts/pages/projects/clusters/show/index.js @@ -1,6 +1,6 @@ import ClustersBundle from '~/clusters/clusters_bundle'; -import initGkeNamespace from '~/create_cluster/gke_cluster_namespace'; import initIntegrationForm from '~/clusters/forms/show'; +import initGkeNamespace from '~/create_cluster/gke_cluster_namespace'; import initClusterHealth from './cluster_health'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/projects/commit/pipelines/index.js b/app/assets/javascripts/pages/projects/commit/pipelines/index.js index f542014c5b9..6efd8298bf8 100644 --- a/app/assets/javascripts/pages/projects/commit/pipelines/index.js +++ b/app/assets/javascripts/pages/projects/commit/pipelines/index.js @@ -1,6 +1,6 @@ -import { initCommitBoxInfo } from '~/projects/commit_box/info'; import initPipelines from '~/commit/pipelines/pipelines_bundle'; import initCommitActions from '~/projects/commit'; +import { initCommitBoxInfo } from '~/projects/commit_box/info'; initCommitBoxInfo(); initPipelines(); diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/show/index.js index 5a3b486fd40..6baf8c6595e 100644 --- a/app/assets/javascripts/pages/projects/commit/show/index.js +++ b/app/assets/javascripts/pages/projects/commit/show/index.js @@ -1,20 +1,20 @@ /* eslint-disable no-new */ import $ from 'jquery'; -import Diff from '~/diff'; -import ZenMode from '~/zen_mode'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import initNotes from '~/init_notes'; +import Diff from '~/diff'; +import flash from '~/flash'; import initChangesDropdown from '~/init_changes_dropdown'; -import '~/sourcegraph/load'; -import { handleLocationHash } from '~/lib/utils/common_utils'; +import initNotes from '~/init_notes'; import axios from '~/lib/utils/axios_utils'; -import syntaxHighlight from '~/syntax_highlight'; -import flash from '~/flash'; +import { handleLocationHash } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; -import loadAwardsHandler from '~/awards_handler'; -import { initCommitBoxInfo } from '~/projects/commit_box/info'; import initCommitActions from '~/projects/commit'; +import { initCommitBoxInfo } from '~/projects/commit_box/info'; +import syntaxHighlight from '~/syntax_highlight'; +import ZenMode from '~/zen_mode'; +import '~/sourcegraph/load'; +import loadAwardsHandler from '~/awards_handler'; const hasPerfBar = document.querySelector('.with-performance-bar'); const performanceHeight = hasPerfBar ? 35 : 0; diff --git a/app/assets/javascripts/pages/projects/commits/show/index.js b/app/assets/javascripts/pages/projects/commits/show/index.js index 6239e4c99d2..ee74628a994 100644 --- a/app/assets/javascripts/pages/projects/commits/show/index.js +++ b/app/assets/javascripts/pages/projects/commits/show/index.js @@ -1,6 +1,6 @@ +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import CommitsList from '~/commits'; import GpgBadges from '~/gpg_badges'; -import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import mountCommits from '~/projects/commits'; new CommitsList(document.querySelector('.js-project-commits-show').dataset.commitsLimit); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/compare/show/index.js b/app/assets/javascripts/pages/projects/compare/show/index.js index a626ed2d30b..f1cf9caa28b 100644 --- a/app/assets/javascripts/pages/projects/compare/show/index.js +++ b/app/assets/javascripts/pages/projects/compare/show/index.js @@ -1,6 +1,6 @@ import Diff from '~/diff'; -import initChangesDropdown from '~/init_changes_dropdown'; import GpgBadges from '~/gpg_badges'; +import initChangesDropdown from '~/init_changes_dropdown'; document.addEventListener('DOMContentLoaded', () => { new Diff(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/edit/index.js b/app/assets/javascripts/pages/projects/edit/index.js index 16e7645592c..9aa7e62e3ee 100644 --- a/app/assets/javascripts/pages/projects/edit/index.js +++ b/app/assets/javascripts/pages/projects/edit/index.js @@ -1,14 +1,14 @@ import { PROJECT_BADGE } from '~/badges/constants'; -import initSettingsPanels from '~/settings_panels'; -import setupTransferEdit from '~/transfer_edit'; import initConfirmDangerModal from '~/confirm_danger_modal'; -import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; import initFilePickers from '~/file_pickers'; +import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; import initProjectDeleteButton from '~/projects/project_delete_button'; -import UserCallout from '~/user_callout'; import initServiceDesk from '~/projects/settings_service_desk'; import initSearchSettings from '~/search_settings'; +import initSettingsPanels from '~/settings_panels'; +import setupTransferEdit from '~/transfer_edit'; +import UserCallout from '~/user_callout'; import initProjectPermissionsSettings from '../shared/permissions'; import initProjectLoadingSpinner from '../shared/save_project_loader'; diff --git a/app/assets/javascripts/pages/projects/find_file/show/index.js b/app/assets/javascripts/pages/projects/find_file/show/index.js index 7fb009e7dc9..a8225167c6b 100644 --- a/app/assets/javascripts/pages/projects/find_file/show/index.js +++ b/app/assets/javascripts/pages/projects/find_file/show/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import ProjectFindFile from '~/project_find_file'; import ShortcutsFindFile from '~/behaviors/shortcuts/shortcuts_find_file'; +import ProjectFindFile from '~/project_find_file'; const findElement = document.querySelector('.js-file-finder'); const projectFindFile = new ProjectFindFile($('.file-finder-holder'), { diff --git a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue index b9e748711f5..bc47b124f8b 100644 --- a/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue +++ b/app/assets/javascripts/pages/projects/forks/new/components/fork_groups_list.vue @@ -1,8 +1,8 @@ <script> import { GlTabs, GlTab, GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import ForkGroupsListItem from './fork_groups_list_item.vue'; export default { diff --git a/app/assets/javascripts/pages/projects/incidents/show/index.js b/app/assets/javascripts/pages/projects/incidents/show/index.js index 850bb8da5e7..a75b68873ef 100644 --- a/app/assets/javascripts/pages/projects/incidents/show/index.js +++ b/app/assets/javascripts/pages/projects/incidents/show/index.js @@ -1,5 +1,5 @@ -import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initRelatedIssues from '~/related_issues'; +import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initShow from '../../issues/show'; initShow(); diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js index 5eb0d323266..06aba866ccf 100644 --- a/app/assets/javascripts/pages/projects/init_blob.js +++ b/app/assets/javascripts/pages/projects/init_blob.js @@ -1,9 +1,9 @@ -import LineHighlighter from '~/line_highlighter'; -import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater'; -import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import ShortcutsBlob from '~/behaviors/shortcuts/shortcuts_blob'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import BlobForkSuggestion from '~/blob/blob_fork_suggestion'; +import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater'; import initBlobBundle from '~/blob_edit/blob_bundle'; +import LineHighlighter from '~/line_highlighter'; export default () => { new LineHighlighter(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/init_form.js b/app/assets/javascripts/pages/projects/init_form.js index a7124e77163..764c23e9a99 100644 --- a/app/assets/javascripts/pages/projects/init_form.js +++ b/app/assets/javascripts/pages/projects/init_form.js @@ -1,5 +1,5 @@ -import ZenMode from '~/zen_mode'; import GLForm from '~/gl_form'; +import ZenMode from '~/zen_mode'; export default function initProjectForm($formEl) { new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/issues/form.js b/app/assets/javascripts/pages/projects/issues/form.js index 34c7ee2e603..4e35f28ab06 100644 --- a/app/assets/javascripts/pages/projects/issues/form.js +++ b/app/assets/javascripts/pages/projects/issues/form.js @@ -2,12 +2,12 @@ import $ from 'jquery'; import IssuableForm from 'ee_else_ce/issuable_form'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GLForm from '~/gl_form'; +import initSuggestions from '~/issuable_suggestions'; import LabelsSelect from '~/labels_select'; import MilestoneSelect from '~/milestone_select'; -import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; -import initSuggestions from '~/issuable_suggestions'; export default () => { new ShortcutsNavigation(); diff --git a/app/assets/javascripts/pages/projects/issues/index/index.js b/app/assets/javascripts/pages/projects/issues/index/index.js index 25790a27888..525d90e162d 100644 --- a/app/assets/javascripts/pages/projects/issues/index/index.js +++ b/app/assets/javascripts/pages/projects/issues/index/index.js @@ -1,15 +1,15 @@ /* eslint-disable no-new */ import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; -import IssuableIndex from '~/issuable_index'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import UsersSelect from '~/users_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; -import { FILTERED_SEARCH } from '~/pages/constants'; -import { ISSUABLE_INDEX } from '~/pages/projects/constants'; +import initIssuableByEmail from '~/issuable/init_issuable_by_email'; +import IssuableIndex from '~/issuable_index'; import initIssuablesList from '~/issues_list'; import initManualOrdering from '~/manual_ordering'; -import initIssuableByEmail from '~/issuable/init_issuable_by_email'; +import { FILTERED_SEARCH } from '~/pages/constants'; +import { ISSUABLE_INDEX } from '~/pages/projects/constants'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import UsersSelect from '~/users_select'; IssuableFilteredSearchTokenKeys.addExtraTokensForIssues(); diff --git a/app/assets/javascripts/pages/projects/issues/service_desk/filtered_search.js b/app/assets/javascripts/pages/projects/issues/service_desk/filtered_search.js index ccb453a59ea..bec207aa439 100644 --- a/app/assets/javascripts/pages/projects/issues/service_desk/filtered_search.js +++ b/app/assets/javascripts/pages/projects/issues/service_desk/filtered_search.js @@ -1,6 +1,6 @@ /* eslint-disable class-methods-use-this */ -import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; import FilteredSearchManager from 'ee_else_ce/filtered_search/filtered_search_manager'; +import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; const AUTHOR_PARAM_KEY = 'author_username'; diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js index c613ac4de5d..992bf3c54ff 100644 --- a/app/assets/javascripts/pages/projects/issues/show.js +++ b/app/assets/javascripts/pages/projects/issues/show.js @@ -1,20 +1,19 @@ import loadAwardsHandler from '~/awards_handler'; +import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; import initIssuableSidebar from '~/init_issuable_sidebar'; +import initInviteMemberModal from '~/invite_member/init_invite_member_modal'; +import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger'; +import { IssuableType } from '~/issuable_show/constants'; import Issue from '~/issue'; -import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; -import ZenMode from '~/zen_mode'; import '~/notes/index'; -import { store } from '~/notes/stores'; -import { initIssuableApp, initIssueHeaderActions } from '~/issue_show/issue'; import initIncidentApp from '~/issue_show/incident'; -import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning'; -import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace'; -import initRelatedMergeRequestsApp from '~/related_merge_requests'; +import { initIssuableApp, initIssueHeaderActions } from '~/issue_show/issue'; import { parseIssuableData } from '~/issue_show/utils/parse_data'; -import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger'; -import initInviteMemberModal from '~/invite_member/init_invite_member_modal'; - -import { IssuableType } from '~/issuable_show/constants'; +import { store } from '~/notes/stores'; +import initRelatedMergeRequestsApp from '~/related_merge_requests'; +import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace'; +import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning'; +import ZenMode from '~/zen_mode'; export default function initShowIssue() { const initialDataEl = document.getElementById('js-issuable-app'); diff --git a/app/assets/javascripts/pages/projects/issues/show/index.js b/app/assets/javascripts/pages/projects/issues/show/index.js index 64f34633db3..e4f99d1e7fd 100644 --- a/app/assets/javascripts/pages/projects/issues/show/index.js +++ b/app/assets/javascripts/pages/projects/issues/show/index.js @@ -1,5 +1,5 @@ -import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initRelatedIssues from '~/related_issues'; +import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initShow from '../show'; initShow(); diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue index 8626fd18233..81ffaa6f7a3 100644 --- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue +++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue @@ -1,9 +1,9 @@ <script> import { GlSprintf, GlModal } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__, __, sprintf } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; +import { s__, __, sprintf } from '~/locale'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/pages/projects/labels/index/index.js b/app/assets/javascripts/pages/projects/labels/index/index.js index 6954180c670..9f782c07101 100644 --- a/app/assets/javascripts/pages/projects/labels/index/index.js +++ b/app/assets/javascripts/pages/projects/labels/index/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import initLabels from '~/init_labels'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; -import eventHub from '../event_hub'; +import Translate from '~/vue_shared/translate'; import PromoteLabelModal from '../components/promote_label_modal.vue'; +import eventHub from '../event_hub'; Vue.use(Translate); diff --git a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js index 28641104c58..05019915fc9 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js @@ -1,5 +1,5 @@ -import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initMergeConflicts from '~/merge_conflicts/merge_conflicts_bundle'; +import initSidebarBundle from '~/sidebar/sidebar_bundle'; document.addEventListener('DOMContentLoaded', () => { initSidebarBundle(); diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js index eb2692c7cb4..1a0fa6e544e 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/compare.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { localTimeAgo } from '~/lib/utils/datetime_utility'; -import axios from '~/lib/utils/axios_utils'; import initCompareAutocomplete from '~/compare_autocomplete'; +import axios from '~/lib/utils/axios_utils'; +import { localTimeAgo } from '~/lib/utils/datetime_utility'; import initTargetProjectDropdown from './target_project_dropdown'; const updateCommitList = (url, $loadingIndicator, $commitList, params) => { diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js index 01a0b4870c1..0bf0ca1a643 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js @@ -1,5 +1,5 @@ -import MergeRequest from '~/merge_request'; import initPipelines from '~/commit/pipelines/pipelines_bundle'; +import MergeRequest from '~/merge_request'; import initCompare from './compare'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js index e9138d6ab4d..76705256fe2 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/index/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js @@ -1,12 +1,12 @@ import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; -import IssuableIndex from '~/issuable_index'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import UsersSelect from '~/users_select'; -import initFilteredSearch from '~/pages/search/init_filtered_search'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import initIssuableByEmail from '~/issuable/init_issuable_by_email'; +import IssuableIndex from '~/issuable_index'; import { FILTERED_SEARCH } from '~/pages/constants'; import { ISSUABLE_INDEX } from '~/pages/projects/constants'; -import initIssuableByEmail from '~/issuable/init_issuable_by_email'; +import initFilteredSearch from '~/pages/search/init_filtered_search'; +import UsersSelect from '~/users_select'; new IssuableIndex(ISSUABLE_INDEX.MERGE_REQUEST); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js index 76d72efb11b..7d5719cf8a8 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import IssuableForm from 'ee_else_ce/issuable_form'; -import Diff from '~/diff'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import Diff from '~/diff'; import GLForm from '~/gl_form'; import LabelsSelect from '~/labels_select'; import MilestoneSelect from '~/milestone_select'; diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js index 0407129fc75..d4d5e9f2711 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js @@ -1,14 +1,14 @@ import Vue from 'vue'; -import ZenMode from '~/zen_mode'; -import initIssuableSidebar from '~/init_issuable_sidebar'; +import loadAwardsHandler from '~/awards_handler'; import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; -import { handleLocationHash } from '~/lib/utils/common_utils'; import initPipelines from '~/commit/pipelines/pipelines_bundle'; -import initSourcegraph from '~/sourcegraph'; -import loadAwardsHandler from '~/awards_handler'; -import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger'; +import initIssuableSidebar from '~/init_issuable_sidebar'; import initInviteMemberModal from '~/invite_member/init_invite_member_modal'; +import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger'; +import { handleLocationHash } from '~/lib/utils/common_utils'; import StatusBox from '~/merge_request/components/status_box.vue'; +import initSourcegraph from '~/sourcegraph'; +import ZenMode from '~/zen_mode'; export default function initMergeRequestShow() { new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js index e0476f181e3..546fa66eda6 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js @@ -1,8 +1,8 @@ -import initMrNotes from '~/mr_notes'; import { initReviewBar } from '~/batch_comments'; +import initMrNotes from '~/mr_notes'; +import store from '~/mr_notes/stores'; import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning'; -import store from '~/mr_notes/stores'; import initShow from '../init_merge_request_show'; initShow(); diff --git a/app/assets/javascripts/pages/projects/milestones/show/index.js b/app/assets/javascripts/pages/projects/milestones/show/index.js index 84a52421598..a853413e1f7 100644 --- a/app/assets/javascripts/pages/projects/milestones/show/index.js +++ b/app/assets/javascripts/pages/projects/milestones/show/index.js @@ -1,5 +1,5 @@ -import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show'; import milestones from '~/pages/milestones/shared'; +import initMilestonesShow from '~/pages/milestones/shared/init_milestones_show'; document.addEventListener('DOMContentLoaded', () => { initMilestonesShow(); diff --git a/app/assets/javascripts/pages/projects/new/index.js b/app/assets/javascripts/pages/projects/new/index.js index 259e62a4c4f..437594fdf11 100644 --- a/app/assets/javascripts/pages/projects/new/index.js +++ b/app/assets/javascripts/pages/projects/new/index.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { __ } from '~/locale'; import initProjectVisibilitySelector from '../../../project_visibility'; import initProjectNew from '../../../projects/project_new'; diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue index aa7414f3ae7..3b19231720a 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue @@ -1,7 +1,7 @@ <script> import { GlFormRadio, GlFormRadioGroup, GlLink, GlSprintf } from '@gitlab/ui'; -import { s__, sprintf } from '~/locale'; import { getWeekdayNames } from '~/lib/utils/datetime_utility'; +import { s__, sprintf } from '~/locale'; const KEY_EVERY_DAY = 'everyDay'; const KEY_EVERY_WEEK = 'everyWeek'; diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue index e73f78bca78..92b2bc9644b 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue @@ -1,7 +1,7 @@ <script> -import Vue from 'vue'; -import Cookies from 'js-cookie'; import { GlButton } from '@gitlab/ui'; +import Cookies from 'js-cookie'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import Translate from '../../../../../vue_shared/translate'; diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js index d944cfbdbc7..ce0e573fed2 100644 --- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js +++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import Vue from 'vue'; -import Translate from '../../../../vue_shared/translate'; -import GlFieldErrors from '../../../../gl_field_errors'; import setupNativeFormVariableList from '../../../../ci_variable_list/native_form_variable_list'; +import GlFieldErrors from '../../../../gl_field_errors'; +import Translate from '../../../../vue_shared/translate'; import intervalPatternInput from './components/interval_pattern_input.vue'; -import TimezoneDropdown from './components/timezone_dropdown'; import TargetBranchDropdown from './components/target_branch_dropdown'; +import TimezoneDropdown from './components/timezone_dropdown'; Vue.use(Translate); diff --git a/app/assets/javascripts/pages/projects/pipelines/new/index.js b/app/assets/javascripts/pages/projects/pipelines/new/index.js index 08c31f2b3c6..32299287a9c 100644 --- a/app/assets/javascripts/pages/projects/pipelines/new/index.js +++ b/app/assets/javascripts/pages/projects/pipelines/new/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import NewBranchForm from '~/new_branch_form'; import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list'; +import NewBranchForm from '~/new_branch_form'; import initNewPipeline from '~/pipeline_new/index'; const el = document.getElementById('js-new-pipeline'); diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js index 7fd59012e83..da8dc527d79 100644 --- a/app/assets/javascripts/pages/projects/project.js +++ b/app/assets/javascripts/pages/projects/project.js @@ -2,13 +2,13 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; -import { __ } from '~/locale'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; -import { serializeForm } from '~/lib/utils/forms'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as flash } from '~/flash'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import initClonePanel from '~/clone_panel'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { serializeForm } from '~/lib/utils/forms'; +import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import projectSelect from '../../project_select'; export default class Project { diff --git a/app/assets/javascripts/pages/projects/project_members/index.js b/app/assets/javascripts/pages/projects/project_members/index.js index 2730e0f0b84..ed11b07be4a 100644 --- a/app/assets/javascripts/pages/projects/project_members/index.js +++ b/app/assets/javascripts/pages/projects/project_members/index.js @@ -1,13 +1,13 @@ import Vue from 'vue'; -import Members from '~/members'; -import memberExpirationDate from '~/member_expiration_date'; -import UsersSelect from '~/users_select'; +import { deprecatedCreateFlash as flash } from '~/flash'; import groupsSelect from '~/groups_select'; -import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; import { __ } from '~/locale'; -import { deprecatedCreateFlash as flash } from '~/flash'; +import memberExpirationDate from '~/member_expiration_date'; +import Members from '~/members'; +import UsersSelect from '~/users_select'; +import RemoveMemberModal from '~/vue_shared/components/remove_member_modal.vue'; function mountRemoveMemberModal() { const el = document.querySelector('.js-remove-member-modal'); diff --git a/app/assets/javascripts/pages/projects/releases/edit/index.js b/app/assets/javascripts/pages/projects/releases/edit/index.js index ce7fd04209d..e4a8b71eb16 100644 --- a/app/assets/javascripts/pages/projects/releases/edit/index.js +++ b/app/assets/javascripts/pages/projects/releases/edit/index.js @@ -1,5 +1,5 @@ -import ZenMode from '~/zen_mode'; import initEditRelease from '~/releases/mount_edit'; +import ZenMode from '~/zen_mode'; new ZenMode(); // eslint-disable-line no-new initEditRelease(); diff --git a/app/assets/javascripts/pages/projects/releases/new/index.js b/app/assets/javascripts/pages/projects/releases/new/index.js index c911c95a396..31c1715ce2a 100644 --- a/app/assets/javascripts/pages/projects/releases/new/index.js +++ b/app/assets/javascripts/pages/projects/releases/new/index.js @@ -1,5 +1,5 @@ -import ZenMode from '~/zen_mode'; import initNewRelease from '~/releases/mount_new'; +import ZenMode from '~/zen_mode'; new ZenMode(); // eslint-disable-line no-new initNewRelease(); diff --git a/app/assets/javascripts/pages/projects/services/edit/index.js b/app/assets/javascripts/pages/projects/services/edit/index.js index 9f2e87f2e7c..8e603c5c1a2 100644 --- a/app/assets/javascripts/pages/projects/services/edit/index.js +++ b/app/assets/javascripts/pages/projects/services/edit/index.js @@ -1,6 +1,6 @@ import IntegrationSettingsForm from '~/integrations/integration_settings_form'; -import CustomMetrics from '~/prometheus_metrics/custom_metrics'; import PrometheusAlerts from '~/prometheus_alerts'; +import CustomMetrics from '~/prometheus_metrics/custom_metrics'; document.addEventListener('DOMContentLoaded', () => { const integrationSettingsForm = new IntegrationSettingsForm('.js-integration-settings-form'); diff --git a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js index f2dd0da4d62..be9259ec3ca 100644 --- a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js +++ b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js @@ -1,12 +1,12 @@ -import initSettingsPanels from '~/settings_panels'; +import initArtifactsSettings from '~/artifacts_settings'; import SecretValues from '~/behaviors/secret_values'; -import registrySettingsApp from '~/registry/settings/registry_settings_bundle'; +import initSettingsPipelinesTriggers from '~/ci_settings_pipeline_triggers'; import initVariableList from '~/ci_variable_list'; import initDeployFreeze from '~/deploy_freeze'; -import initSettingsPipelinesTriggers from '~/ci_settings_pipeline_triggers'; -import initSharedRunnersToggle from '~/projects/settings/mount_shared_runners_toggle'; -import initArtifactsSettings from '~/artifacts_settings'; import { initInstallRunner } from '~/pages/shared/mount_runner_instructions'; +import initSharedRunnersToggle from '~/projects/settings/mount_shared_runners_toggle'; +import registrySettingsApp from '~/registry/settings/registry_settings_bundle'; +import initSettingsPanels from '~/settings_panels'; document.addEventListener('DOMContentLoaded', () => { // Initialize expandable settings panels diff --git a/app/assets/javascripts/pages/projects/settings/operations/show/index.js b/app/assets/javascripts/pages/projects/settings/operations/show/index.js index 153ccffd472..3a46241e2eb 100644 --- a/app/assets/javascripts/pages/projects/settings/operations/show/index.js +++ b/app/assets/javascripts/pages/projects/settings/operations/show/index.js @@ -1,9 +1,9 @@ -import mountErrorTrackingForm from '~/error_tracking_settings'; import mountAlertsSettings from '~/alerts_settings'; -import mountOperationSettings from '~/operation_settings'; +import mountErrorTrackingForm from '~/error_tracking_settings'; import mountGrafanaIntegration from '~/grafana_integration'; -import initSettingsPanels from '~/settings_panels'; import initIncidentsSettings from '~/incidents_settings'; +import mountOperationSettings from '~/operation_settings'; +import initSettingsPanels from '~/settings_panels'; initIncidentsSettings(); mountErrorTrackingForm(); diff --git a/app/assets/javascripts/pages/projects/settings/repository/form.js b/app/assets/javascripts/pages/projects/settings/repository/form.js index eff45bad603..8d390c8586b 100644 --- a/app/assets/javascripts/pages/projects/settings/repository/form.js +++ b/app/assets/javascripts/pages/projects/settings/repository/form.js @@ -1,13 +1,13 @@ /* eslint-disable no-new */ -import ProtectedTagCreate from '~/protected_tags/protected_tag_create'; -import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list'; -import initSettingsPanels from '~/settings_panels'; import initDeployKeys from '~/deploy_keys'; -import ProtectedBranchCreate from '~/protected_branches/protected_branch_create'; -import ProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list'; import DueDateSelectors from '~/due_date_select'; import fileUpload from '~/lib/utils/file_upload'; +import ProtectedBranchCreate from '~/protected_branches/protected_branch_create'; +import ProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list'; +import ProtectedTagCreate from '~/protected_tags/protected_tag_create'; +import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list'; +import initSettingsPanels from '~/settings_panels'; export default () => { new ProtectedTagCreate(); diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js index 5120b6bee27..0494dad6e33 100644 --- a/app/assets/javascripts/pages/projects/show/index.js +++ b/app/assets/javascripts/pages/projects/show/index.js @@ -1,15 +1,15 @@ import initTree from 'ee_else_ce/repository'; -import { initUploadForm } from '~/blob_edit/blob_bundle'; +import Activities from '~/activities'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; -import NotificationsForm from '~/notifications_form'; -import UserCallout from '~/user_callout'; import BlobViewer from '~/blob/viewer/index'; -import Activities from '~/activities'; -import initReadMore from '~/read_more'; -import leaveByUrl from '~/namespaces/leave_by_url'; -import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; +import { initUploadForm } from '~/blob_edit/blob_bundle'; import initInviteMembersModal from '~/invite_members/init_invite_members_modal'; +import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger'; +import leaveByUrl from '~/namespaces/leave_by_url'; import initVueNotificationsDropdown from '~/notifications'; +import NotificationsForm from '~/notifications_form'; +import initReadMore from '~/read_more'; +import UserCallout from '~/user_callout'; import notificationsDropdown from '../../../notifications_dropdown'; import Star from '../../../star'; diff --git a/app/assets/javascripts/pages/projects/tags/new/index.js b/app/assets/javascripts/pages/projects/tags/new/index.js index b3158f7e939..11a19a673b1 100644 --- a/app/assets/javascripts/pages/projects/tags/new/index.js +++ b/app/assets/javascripts/pages/projects/tags/new/index.js @@ -1,7 +1,7 @@ import $ from 'jquery'; +import GLForm from '../../../../gl_form'; import RefSelectDropdown from '../../../../ref_select_dropdown'; import ZenMode from '../../../../zen_mode'; -import GLForm from '../../../../gl_form'; document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/tags/releases/index.js b/app/assets/javascripts/pages/projects/tags/releases/index.js index d6afc71fb03..abdc97f62d0 100644 --- a/app/assets/javascripts/pages/projects/tags/releases/index.js +++ b/app/assets/javascripts/pages/projects/tags/releases/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import ZenMode from '~/zen_mode'; import GLForm from '~/gl_form'; +import ZenMode from '~/zen_mode'; document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/tags/remove_tag.js b/app/assets/javascripts/pages/projects/tags/remove_tag.js index 7e83dbe0565..7b95560df7b 100644 --- a/app/assets/javascripts/pages/projects/tags/remove_tag.js +++ b/app/assets/javascripts/pages/projects/tags/remove_tag.js @@ -1,6 +1,6 @@ +import initConfirmModal from '~/confirm_modal'; import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import initConfirmModal from '~/confirm_modal'; export const initRemoveTag = ({ onDelete = () => {} }) => { return initConfirmModal({ diff --git a/app/assets/javascripts/pages/registrations/new/index.js b/app/assets/javascripts/pages/registrations/new/index.js index a33d11f3613..4104025aa59 100644 --- a/app/assets/javascripts/pages/registrations/new/index.js +++ b/app/assets/javascripts/pages/registrations/new/index.js @@ -1,6 +1,6 @@ +import NoEmojiValidator from '~/emoji/no_emoji_validator'; import LengthValidator from '~/pages/sessions/new/length_validator'; import UsernameValidator from '~/pages/sessions/new/username_validator'; -import NoEmojiValidator from '~/emoji/no_emoji_validator'; document.addEventListener('DOMContentLoaded', () => { new UsernameValidator(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/sessions/new/index.js b/app/assets/javascripts/pages/sessions/new/index.js index 84c825d129c..d39f56cfd03 100644 --- a/app/assets/javascripts/pages/sessions/new/index.js +++ b/app/assets/javascripts/pages/sessions/new/index.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import NoEmojiValidator from '../../../emoji/no_emoji_validator'; import LengthValidator from './length_validator'; -import UsernameValidator from './username_validator'; -import SigninTabsMemoizer from './signin_tabs_memoizer'; import OAuthRememberMe from './oauth_remember_me'; import preserveUrlFragment from './preserve_url_fragment'; +import SigninTabsMemoizer from './signin_tabs_memoizer'; +import UsernameValidator from './username_validator'; document.addEventListener('DOMContentLoaded', () => { new UsernameValidator(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/sessions/new/username_validator.js b/app/assets/javascripts/pages/sessions/new/username_validator.js index f3b0948a40d..338fe1b66f2 100644 --- a/app/assets/javascripts/pages/sessions/new/username_validator.js +++ b/app/assets/javascripts/pages/sessions/new/username_validator.js @@ -1,9 +1,9 @@ import { debounce } from 'lodash'; -import InputValidator from '~/validators/input_validator'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; +import InputValidator from '~/validators/input_validator'; const debounceTimeoutDuration = 1000; const rootUrl = gon.relative_url_root; diff --git a/app/assets/javascripts/pages/shared/wikis/index.js b/app/assets/javascripts/pages/shared/wikis/index.js index 0679686110d..c8dc75828e4 100644 --- a/app/assets/javascripts/pages/shared/wikis/index.js +++ b/app/assets/javascripts/pages/shared/wikis/index.js @@ -1,12 +1,12 @@ import $ from 'jquery'; import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; -import csrf from '~/lib/utils/csrf'; import ShortcutsWiki from '~/behaviors/shortcuts/shortcuts_wiki'; -import ZenMode from '../../../zen_mode'; +import csrf from '~/lib/utils/csrf'; +import Translate from '~/vue_shared/translate'; import GLForm from '../../../gl_form'; -import Wikis from './wikis'; +import ZenMode from '../../../zen_mode'; import deleteWikiModal from './components/delete_wiki_modal.vue'; +import Wikis from './wikis'; export default () => { new Wikis(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js index 149e666256b..3ff455fad32 100644 --- a/app/assets/javascripts/pages/users/activity_calendar.js +++ b/app/assets/javascripts/pages/users/activity_calendar.js @@ -1,11 +1,11 @@ -import $ from 'jquery'; -import { last } from 'lodash'; import { scaleLinear, scaleThreshold } from 'd3-scale'; import { select } from 'd3-selection'; import dateFormat from 'dateformat'; -import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility'; -import axios from '~/lib/utils/axios_utils'; +import $ from 'jquery'; +import { last } from 'lodash'; import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility'; import { n__, s__, __ } from '~/locale'; const d3 = { select, scaleLinear, scaleThreshold }; diff --git a/app/assets/javascripts/pages/users/user_tabs.js b/app/assets/javascripts/pages/users/user_tabs.js index 7c88aa53e4b..e3aac07097b 100644 --- a/app/assets/javascripts/pages/users/user_tabs.js +++ b/app/assets/javascripts/pages/users/user_tabs.js @@ -1,9 +1,9 @@ -import $ from 'jquery'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; -import axios from '~/lib/utils/axios_utils'; +import $ from 'jquery'; import Activities from '~/activities'; -import { localTimeAgo } from '~/lib/utils/datetime_utility'; import AjaxCache from '~/lib/utils/ajax_cache'; +import axios from '~/lib/utils/axios_utils'; +import { localTimeAgo } from '~/lib/utils/datetime_utility'; import { __ } from '~/locale'; import ActivityCalendar from './activity_calendar'; import UserOverviewBlock from './user_overview_block'; diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js index 0d5c294ea56..522e34753e9 100644 --- a/app/assets/javascripts/performance_bar/index.js +++ b/app/assets/javascripts/performance_bar/index.js @@ -1,13 +1,12 @@ /* eslint-disable @gitlab/require-i18n-strings */ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import axios from '~/lib/utils/axios_utils'; +import Translate from '~/vue_shared/translate'; +import initPerformanceBarLog from './performance_bar_log'; import PerformanceBarService from './services/performance_bar_service'; import PerformanceBarStore from './stores/performance_bar_store'; -import initPerformanceBarLog from './performance_bar_log'; - Vue.use(Translate); const initPerformanceBar = (el) => { diff --git a/app/assets/javascripts/persistent_user_callout.js b/app/assets/javascripts/persistent_user_callout.js index db42966d159..e845c8b9df4 100644 --- a/app/assets/javascripts/persistent_user_callout.js +++ b/app/assets/javascripts/persistent_user_callout.js @@ -1,7 +1,7 @@ -import { parseBoolean } from './lib/utils/common_utils'; +import { deprecatedCreateFlash as Flash } from './flash'; import axios from './lib/utils/axios_utils'; +import { parseBoolean } from './lib/utils/common_utils'; import { __ } from './locale'; -import { deprecatedCreateFlash as Flash } from './flash'; const DEFERRED_LINK_CLASS = 'deferred-link'; diff --git a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue index 6e701f063a7..b40c9a48903 100644 --- a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue +++ b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue @@ -1,10 +1,10 @@ <script> import { mergeUrlParams, redirectTo } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; +import { COMMIT_FAILURE, COMMIT_SUCCESS } from '../../constants'; import commitCIFile from '../../graphql/mutations/commit_ci_file.mutation.graphql'; import getCommitSha from '../../graphql/queries/client/commit_sha.graphql'; -import { COMMIT_FAILURE, COMMIT_SUCCESS } from '../../constants'; import CommitForm from './commit_form.vue'; const MR_SOURCE_BRANCH = 'merge_request[source_branch]'; diff --git a/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue b/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue index e7cba312705..007faa4ed0d 100644 --- a/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue +++ b/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue @@ -1,9 +1,9 @@ <script> -import { uniqueId } from 'lodash'; import { GlAlert, GlIcon } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; import { __, s__ } from '~/locale'; -import { DEFAULT, INVALID_CI_CONFIG } from '~/pipelines/constants'; import { CI_CONFIG_STATUS_INVALID } from '~/pipeline_editor/constants'; +import { DEFAULT, INVALID_CI_CONFIG } from '~/pipelines/constants'; import EditorLite from '~/vue_shared/components/editor_lite.vue'; export default { diff --git a/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue b/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue index 51bfb90e78d..872da88d3e6 100644 --- a/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue +++ b/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue @@ -1,7 +1,7 @@ <script> -import EditorLite from '~/vue_shared/components/editor_lite.vue'; -import { CiSchemaExtension } from '~/editor/extensions/editor_ci_schema_ext'; import { EDITOR_READY_EVENT } from '~/editor/constants'; +import { CiSchemaExtension } from '~/editor/extensions/editor_ci_schema_ext'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; import getCommitSha from '../../graphql/queries/client/commit_sha.graphql'; export default { diff --git a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue index 23f8d3818ab..5d9697c9427 100644 --- a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue +++ b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue @@ -1,9 +1,9 @@ <script> import { GlAlert, GlLink, GlSprintf, GlTable } from '@gitlab/ui'; import { __ } from '~/locale'; -import CiLintWarnings from './ci_lint_warnings.vue'; -import CiLintResultsValue from './ci_lint_results_value.vue'; import CiLintResultsParam from './ci_lint_results_param.vue'; +import CiLintResultsValue from './ci_lint_results_value.vue'; +import CiLintWarnings from './ci_lint_warnings.vue'; const thBorderColor = 'gl-border-gray-100!'; diff --git a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_param.vue b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_param.vue index 23808bcb292..49225a7cac7 100644 --- a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_param.vue +++ b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_param.vue @@ -1,6 +1,6 @@ <script> -import { __ } from '~/locale'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { __ } from '~/locale'; export default { props: { diff --git a/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue b/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue index 63173990710..3bdcf383bee 100644 --- a/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue +++ b/app/assets/javascripts/pipeline_editor/components/pipeline_editor_tabs.vue @@ -11,9 +11,9 @@ import { VISUALIZE_TAB, } from '../constants'; import CiConfigMergedPreview from './editor/ci_config_merged_preview.vue'; +import TextEditor from './editor/text_editor.vue'; import CiLint from './lint/ci_lint.vue'; import EditorTab from './ui/editor_tab.vue'; -import TextEditor from './editor/text_editor.vue'; export default { i18n: { diff --git a/app/assets/javascripts/pipeline_editor/index.js b/app/assets/javascripts/pipeline_editor/index.js index 003feb16281..15385771d25 100644 --- a/app/assets/javascripts/pipeline_editor/index.js +++ b/app/assets/javascripts/pipeline_editor/index.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import typeDefs from './graphql/typedefs.graphql'; import { resolvers } from './graphql/resolvers'; +import typeDefs from './graphql/typedefs.graphql'; import PipelineEditorApp from './pipeline_editor_app.vue'; diff --git a/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue b/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue index 266439c273a..b4a818e2472 100644 --- a/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue +++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import httpStatusCodes from '~/lib/utils/http_status'; +import { __, s__, sprintf } from '~/locale'; import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils'; import ConfirmUnsavedChangesDialog from './components/ui/confirm_unsaved_changes_dialog.vue'; diff --git a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue index dc61bfa8993..8c9aad6ed87 100644 --- a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue +++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue @@ -1,7 +1,7 @@ <script> import CommitSection from './components/commit/commit_section.vue'; -import PipelineEditorTabs from './components/pipeline_editor_tabs.vue'; import PipelineEditorHeader from './components/header/pipeline_editor_header.vue'; +import PipelineEditorTabs from './components/pipeline_editor_tabs.vue'; import { TABS_WITH_COMMIT_FORM, CREATE_TAB } from './constants'; export default { diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index 97cd671e035..5070971c563 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -1,6 +1,4 @@ <script> -import Vue from 'vue'; -import { uniqueId } from 'lodash'; import { GlAlert, GlIcon, @@ -19,12 +17,14 @@ import { GlLoadingIcon, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; -import * as Sentry from '~/sentry/wrapper'; -import { s__, __, n__ } from '~/locale'; +import { uniqueId } from 'lodash'; +import Vue from 'vue'; import axios from '~/lib/utils/axios_utils'; -import { redirectTo } from '~/lib/utils/url_utility'; import { backOff } from '~/lib/utils/common_utils'; import httpStatusCodes from '~/lib/utils/http_status'; +import { redirectTo } from '~/lib/utils/url_utility'; +import { s__, __, n__ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import { VARIABLE_TYPE, FILE_TYPE, CONFIG_VARIABLES_TIMEOUT } from '../constants'; export default { diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue index 23e7ce349cf..e44dedfe2ee 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag.vue @@ -1,14 +1,14 @@ <script> import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { isEmpty } from 'lodash'; -import { __ } from '~/locale'; import { fetchPolicies } from '~/lib/graphql'; +import { __ } from '~/locale'; +import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants'; import getDagVisData from '../../graphql/queries/get_dag_vis_data.query.graphql'; import { parseData } from '../parsing_utils'; -import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants'; -import DagGraph from './dag_graph.vue'; -import DagAnnotations from './dag_annotations.vue'; import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants'; +import DagAnnotations from './dag_annotations.vue'; +import DagGraph from './dag_graph.vue'; export default { // eslint-disable-next-line @gitlab/require-i18n-strings diff --git a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue index 76ccbd74bb6..7646c11773c 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue @@ -1,9 +1,10 @@ <script> import * as d3 from 'd3'; import { uniqueId } from 'lodash'; -import { getMaxNodes, removeOrphanNodes } from '../parsing_utils'; import { PARSE_FAILURE } from '../../constants'; +import { getMaxNodes, removeOrphanNodes } from '../parsing_utils'; import { LINK_SELECTOR, NODE_SELECTOR, ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants'; +import { calculateClip, createLinkPath, createSankey, labelPosition } from './drawing_utils'; import { currentIsLive, getLiveLinksAsDict, @@ -12,7 +13,6 @@ import { toggleLinkHighlight, togglePathHighlights, } from './interactions'; -import { calculateClip, createLinkPath, createSankey, labelPosition } from './drawing_utils'; export default { viewOptions: { diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue index 949d0d30297..1df693704d4 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -1,10 +1,10 @@ <script> import { GlTooltipDirective, GlButton, GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; +import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import { dasherize } from '~/lib/utils/text_utility'; import { __ } from '~/locale'; -import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { reportToSentry } from './utils'; /** diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue index cae26e6ee3f..93156d5d05b 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue @@ -1,9 +1,9 @@ <script> import LinkedGraphWrapper from '../graph_shared/linked_graph_wrapper.vue'; import LinksLayer from '../graph_shared/links_layer.vue'; +import { DOWNSTREAM, MAIN, UPSTREAM, ONE_COL_WIDTH } from './constants'; import LinkedPipelinesColumn from './linked_pipelines_column.vue'; import StageColumnComponent from './stage_column_component.vue'; -import { DOWNSTREAM, MAIN, UPSTREAM, ONE_COL_WIDTH } from './constants'; import { reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component_legacy.vue b/app/assets/javascripts/pipelines/components/graph/graph_component_legacy.vue index 818985a74d1..abbf8df6eed 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component_legacy.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component_legacy.vue @@ -1,10 +1,10 @@ <script> -import { escape, capitalize } from 'lodash'; import { GlLoadingIcon } from '@gitlab/ui'; +import { escape, capitalize } from 'lodash'; import GraphBundleMixin from '../../mixins/graph_pipeline_bundle_mixin'; -import StageColumnComponentLegacy from './stage_column_component_legacy.vue'; -import LinkedPipelinesColumnLegacy from './linked_pipelines_column_legacy.vue'; import { UPSTREAM, DOWNSTREAM, MAIN } from './constants'; +import LinkedPipelinesColumnLegacy from './linked_pipelines_column_legacy.vue'; +import StageColumnComponentLegacy from './stage_column_component_legacy.vue'; import { reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index 52848fe3ade..46ef0457d40 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -1,12 +1,12 @@ <script> import { GlTooltipDirective, GlLink } from '@gitlab/ui'; -import { sprintf } from '~/locale'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; -import ActionComponent from './action_component.vue'; -import JobNameComponent from './job_name_component.vue'; +import { sprintf } from '~/locale'; import { accessValue } from './accessors'; +import ActionComponent from './action_component.vue'; import { REST } from './constants'; +import JobNameComponent from './job_name_component.vue'; import { reportToSentry } from './utils'; /** diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue index 22f9fb72159..add7b3445f7 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipeline.vue @@ -1,8 +1,8 @@ <script> import { GlTooltipDirective, GlButton, GlLink, GlLoadingIcon, GlBadge } from '@gitlab/ui'; -import CiStatus from '~/vue_shared/components/ci_icon.vue'; -import { __, sprintf } from '~/locale'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { __, sprintf } from '~/locale'; +import CiStatus from '~/vue_shared/components/ci_icon.vue'; import { accessValue } from './accessors'; import { DOWNSTREAM, REST, UPSTREAM } from './constants'; import { reportToSentry } from './utils'; diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue index 079e938ddd4..30d64a58675 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column.vue @@ -1,8 +1,8 @@ <script> import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.query.graphql'; import { LOAD_FAILURE } from '../../constants'; -import LinkedPipeline from './linked_pipeline.vue'; import { ONE_COL_WIDTH, UPSTREAM } from './constants'; +import LinkedPipeline from './linked_pipeline.vue'; import { unwrapPipelineData, toggleQueryPollingByVisibility, reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column_legacy.vue b/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column_legacy.vue index 2f1390e07d1..0d1ff94c275 100644 --- a/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column_legacy.vue +++ b/app/assets/javascripts/pipelines/components/graph/linked_pipelines_column_legacy.vue @@ -1,6 +1,6 @@ <script> -import LinkedPipeline from './linked_pipeline.vue'; import { UPSTREAM } from './constants'; +import LinkedPipeline from './linked_pipeline.vue'; import { reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue index b258c885abb..9438c117346 100644 --- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue @@ -1,11 +1,11 @@ <script> import { capitalize, escape, isEmpty } from 'lodash'; import MainGraphWrapper from '../graph_shared/main_graph_wrapper.vue'; -import JobItem from './job_item.vue'; -import JobGroupDropdown from './job_group_dropdown.vue'; +import { accessValue } from './accessors'; import ActionComponent from './action_component.vue'; import { GRAPHQL } from './constants'; -import { accessValue } from './accessors'; +import JobGroupDropdown from './job_group_dropdown.vue'; +import JobItem from './job_item.vue'; import { reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component_legacy.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component_legacy.vue index 059e8f9f8db..2cee2fbbd8f 100644 --- a/app/assets/javascripts/pipelines/components/graph/stage_column_component_legacy.vue +++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component_legacy.vue @@ -1,9 +1,9 @@ <script> import { isEmpty, escape } from 'lodash'; import stageColumnMixin from '../../mixins/stage_column_mixin'; -import JobItem from './job_item.vue'; -import JobGroupDropdown from './job_group_dropdown.vue'; import ActionComponent from './action_component.vue'; +import JobGroupDropdown from './job_group_dropdown.vue'; +import JobItem from './job_item.vue'; import { reportToSentry } from './utils'; export default { diff --git a/app/assets/javascripts/pipelines/components/header_component.vue b/app/assets/javascripts/pipelines/components/header_component.vue index a20bd70e90a..4ce43b92c93 100644 --- a/app/assets/javascripts/pipelines/components/header_component.vue +++ b/app/assets/javascripts/pipelines/components/header_component.vue @@ -1,13 +1,13 @@ <script> import { GlAlert, GlButton, GlLoadingIcon, GlModal, GlModalDirective } from '@gitlab/ui'; +import { setUrlFragment, redirectTo } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import ciHeader from '~/vue_shared/components/header_ci_component.vue'; -import { setUrlFragment, redirectTo } from '~/lib/utils/url_utility'; -import getPipelineQuery from '../graphql/queries/get_pipeline_header_data.query.graphql'; +import { LOAD_FAILURE, POST_FAILURE, DELETE_FAILURE, DEFAULT } from '../constants'; +import cancelPipelineMutation from '../graphql/mutations/cancel_pipeline.mutation.graphql'; import deletePipelineMutation from '../graphql/mutations/delete_pipeline.mutation.graphql'; import retryPipelineMutation from '../graphql/mutations/retry_pipeline.mutation.graphql'; -import cancelPipelineMutation from '../graphql/mutations/cancel_pipeline.mutation.graphql'; -import { LOAD_FAILURE, POST_FAILURE, DELETE_FAILURE, DEFAULT } from '../constants'; +import getPipelineQuery from '../graphql/queries/get_pipeline_header_data.query.graphql'; const DELETE_MODAL_ID = 'pipeline-delete-modal'; const POLL_INTERVAL = 10000; diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue index 678678b87eb..4a7ee3b2af7 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue @@ -2,12 +2,12 @@ import { GlAlert } from '@gitlab/ui'; import { __ } from '~/locale'; import { CI_CONFIG_STATUS_INVALID } from '~/pipeline_editor/constants'; -import { generateLinksData } from '../graph_shared/drawing_utils'; -import { parseData } from '../parsing_utils'; import { DRAW_FAILURE, DEFAULT, INVALID_CI_CONFIG, EMPTY_PIPELINE_DATA } from '../../constants'; import { createJobsHash, generateJobNeedsDict } from '../../utils'; -import StagePill from './stage_pill.vue'; +import { generateLinksData } from '../graph_shared/drawing_utils'; +import { parseData } from '../parsing_utils'; import JobPill from './job_pill.vue'; +import StagePill from './stage_pill.vue'; export default { components: { diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue index 1569b326b31..24b5c85c9d6 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_stop_modal.vue @@ -1,9 +1,9 @@ <script> /* eslint-disable vue/no-v-html */ -import { isEmpty } from 'lodash'; import { GlLink, GlModal } from '@gitlab/ui'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import { isEmpty } from 'lodash'; import { __, s__, sprintf } from '~/locale'; +import CiIcon from '~/vue_shared/components/ci_icon.vue'; /** * Pipeline Stop Modal. diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue index 46c697f8066..3a9d181066c 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue @@ -1,16 +1,16 @@ <script> -import { isEqual } from 'lodash'; import { GlIcon } from '@gitlab/ui'; -import { __, s__ } from '~/locale'; +import { isEqual } from 'lodash'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; -import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; import { getParameterByName } from '~/lib/utils/common_utils'; -import PipelinesPaginationApiMixin from '../../mixins/pipelines_pagination_api_mixin'; +import { __, s__ } from '~/locale'; +import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; +import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../../constants'; import pipelinesMixin from '../../mixins/pipelines'; +import PipelinesPaginationApiMixin from '../../mixins/pipelines_pagination_api_mixin'; import PipelinesService from '../../services/pipelines_service'; import { validateParams } from '../../utils'; -import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../../constants'; import NavigationControls from './nav_controls.vue'; import PipelinesFilteredSearch from './pipelines_filtered_search.vue'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_actions.vue index 13f314a3a45..6890cbb9bed 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_actions.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { s__, __, sprintf } from '~/locale'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; import eventHub from '../../event_hub'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue index 127503f1307..492c562ec5c 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue @@ -2,10 +2,10 @@ import { GlFilteredSearch } from '@gitlab/ui'; import { map } from 'lodash'; import { __, s__ } from '~/locale'; -import PipelineTriggerAuthorToken from './tokens/pipeline_trigger_author_token.vue'; import PipelineBranchNameToken from './tokens/pipeline_branch_name_token.vue'; import PipelineStatusToken from './tokens/pipeline_status_token.vue'; import PipelineTagNameToken from './tokens/pipeline_tag_name_token.vue'; +import PipelineTriggerAuthorToken from './tokens/pipeline_trigger_author_token.vue'; export default { userType: 'username', diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue index 1b08f883b05..24c67184e56 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue @@ -1,8 +1,8 @@ <script> import { GlTooltipDirective } from '@gitlab/ui'; import eventHub from '../../event_hub'; -import PipelinesTableRowComponent from './pipelines_table_row.vue'; import PipelineStopModal from './pipeline_stop_modal.vue'; +import PipelinesTableRowComponent from './pipelines_table_row.vue'; /** * Pipelines Table Component. diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue index 9fdba93f50a..572abe2a24a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table_row.vue @@ -3,13 +3,13 @@ import { GlButton, GlTooltipDirective, GlModalDirective } from '@gitlab/ui'; import { __ } from '~/locale'; import CiBadge from '~/vue_shared/components/ci_badge_link.vue'; import CommitComponent from '~/vue_shared/components/commit.vue'; -import eventHub from '../../event_hub'; import { PIPELINES_TABLE } from '../../constants'; +import eventHub from '../../event_hub'; +import PipelineTriggerer from './pipeline_triggerer.vue'; +import PipelineUrl from './pipeline_url.vue'; import PipelinesActionsComponent from './pipelines_actions.vue'; import PipelinesArtifactsComponent from './pipelines_artifacts.vue'; import PipelineStage from './stage.vue'; -import PipelineUrl from './pipeline_url.vue'; -import PipelineTriggerer from './pipeline_triggerer.vue'; import PipelinesTimeago from './time_ago.vue'; export default { diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/stage.vue b/app/assets/javascripts/pipelines/components/pipelines_list/stage.vue index 460aa427196..f5dfb9e72d5 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/stage.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/stage.vue @@ -11,15 +11,15 @@ * 3. Merge request widget * 4. Commit widget */ -import $ from 'jquery'; import { GlDropdown, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; +import $ from 'jquery'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { PIPELINES_TABLE } from '../../constants'; import eventHub from '../../event_hub'; import JobItem from '../graph/job_item.vue'; -import { PIPELINES_TABLE } from '../../constants'; export default { components: { diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue b/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue index a56dcf48d92..58d60e2a185 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_reports.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mapActions, mapGetters, mapState } from 'vuex'; import TestSuiteTable from './test_suite_table.vue'; import TestSummary from './test_summary.vue'; import TestSummaryTable from './test_summary_table.vue'; diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue index 8f7a2a5025c..51373e712ff 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlModalDirective, GlTooltipDirective, @@ -9,6 +8,7 @@ import { GlButton, GlPagination, } from '@gitlab/ui'; +import { mapState, mapGetters, mapActions } from 'vuex'; import { __ } from '~/locale'; import TestCaseDetails from './test_case_details.vue'; diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue b/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue index 5f9c0be3ccc..2b44ce57faa 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { s__ } from '~/locale'; export default { diff --git a/app/assets/javascripts/pipelines/mixins/pipelines.js b/app/assets/javascripts/pipelines/mixins/pipelines.js index 22cdb6b8f72..bff986261ee 100644 --- a/app/assets/javascripts/pipelines/mixins/pipelines.js +++ b/app/assets/javascripts/pipelines/mixins/pipelines.js @@ -1,13 +1,13 @@ -import Visibility from 'visibilityjs'; import { GlLoadingIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; +import Visibility from 'visibilityjs'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import Poll from '~/lib/utils/poll'; -import EmptyState from '../components/pipelines_list/empty_state.vue'; +import { __ } from '~/locale'; import SvgBlankState from '../components/pipelines_list/blank_state.vue'; +import EmptyState from '../components/pipelines_list/empty_state.vue'; import PipelinesTableComponent from '../components/pipelines_list/pipelines_table.vue'; -import eventHub from '../event_hub'; import { CANCEL_REQUEST } from '../constants'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index 69dbc2039e0..f837851e5c1 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -1,13 +1,13 @@ import Vue from 'vue'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import Translate from '~/vue_shared/translate'; import { __ } from '~/locale'; +import Translate from '~/vue_shared/translate'; import PipelineGraphLegacy from './components/graph/graph_component_legacy.vue'; -import createDagApp from './pipeline_details_dag'; -import GraphBundleMixin from './mixins/graph_pipeline_bundle_mixin'; +import { reportToSentry } from './components/graph/utils'; import TestReports from './components/test_reports/test_reports.vue'; +import GraphBundleMixin from './mixins/graph_pipeline_bundle_mixin'; +import createDagApp from './pipeline_details_dag'; import createTestReportsStore from './stores/test_reports'; -import { reportToSentry } from './components/graph/utils'; Vue.use(Translate); diff --git a/app/assets/javascripts/pipelines/pipeline_details_graph.js b/app/assets/javascripts/pipelines/pipeline_details_graph.js index 2d46bb5ec26..55f3731a3ca 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_graph.js +++ b/app/assets/javascripts/pipelines/pipeline_details_graph.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import PipelineGraphWrapper from './components/graph/graph_component_wrapper.vue'; import { GRAPHQL } from './components/graph/constants'; +import PipelineGraphWrapper from './components/graph/graph_component_wrapper.vue'; import { reportToSentry } from './components/graph/utils'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/pipelines/pipeline_details_mediator.js b/app/assets/javascripts/pipelines/pipeline_details_mediator.js index 474dc828e5e..09637c25654 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_mediator.js +++ b/app/assets/javascripts/pipelines/pipeline_details_mediator.js @@ -2,8 +2,8 @@ import Visibility from 'visibilityjs'; import { deprecatedCreateFlash as Flash } from '../flash'; import Poll from '../lib/utils/poll'; import { __ } from '../locale'; -import PipelineStore from './stores/pipeline_store'; import PipelineService from './services/pipeline_service'; +import PipelineStore from './stores/pipeline_store'; export default class pipelinesMediator { constructor(options = {}) { diff --git a/app/assets/javascripts/pipelines/pipelines_index.js b/app/assets/javascripts/pipelines/pipelines_index.js index 4575a99f60f..7bcc51e18e5 100644 --- a/app/assets/javascripts/pipelines/pipelines_index.js +++ b/app/assets/javascripts/pipelines/pipelines_index.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import { __ } from '~/locale'; -import { doesHashExistInUrl } from '~/lib/utils/url_utility'; +import Vue from 'vue'; import { parseBoolean, historyReplaceState, buildUrlWithCurrentLocation, } from '~/lib/utils/common_utils'; +import { doesHashExistInUrl } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import Translate from '~/vue_shared/translate'; import Pipelines from './components/pipelines_list/pipelines.vue'; import PipelinesStore from './stores/pipelines_store'; diff --git a/app/assets/javascripts/pipelines/stores/test_reports/actions.js b/app/assets/javascripts/pipelines/stores/test_reports/actions.js index 3512734e528..6de345233ae 100644 --- a/app/assets/javascripts/pipelines/stores/test_reports/actions.js +++ b/app/assets/javascripts/pipelines/stores/test_reports/actions.js @@ -1,5 +1,5 @@ -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/pipelines/stores/test_reports/index.js b/app/assets/javascripts/pipelines/stores/test_reports/index.js index 204dfc2fb01..64d4b8bafb1 100644 --- a/app/assets/javascripts/pipelines/stores/test_reports/index.js +++ b/app/assets/javascripts/pipelines/stores/test_reports/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import state from './state'; import * as actions from './actions'; import * as getters from './getters'; import mutations from './mutations'; +import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/pipelines/utils.js b/app/assets/javascripts/pipelines/utils.js index 23046586de7..22820fca43e 100644 --- a/app/assets/javascripts/pipelines/utils.js +++ b/app/assets/javascripts/pipelines/utils.js @@ -1,6 +1,6 @@ import { pickBy } from 'lodash'; -import { SUPPORTED_FILTER_PARAMETERS } from './constants'; import { createNodeDict } from './components/parsing_utils'; +import { SUPPORTED_FILTER_PARAMETERS } from './constants'; export const validateParams = (params) => { return pickBy(params, (val, key) => SUPPORTED_FILTER_PARAMETERS.includes(key) && val); diff --git a/app/assets/javascripts/popovers/index.js b/app/assets/javascripts/popovers/index.js index eebbfbdcc68..7db669b8c52 100644 --- a/app/assets/javascripts/popovers/index.js +++ b/app/assets/javascripts/popovers/index.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { toArray } from 'lodash'; +import Vue from 'vue'; import PopoversComponent from './components/popovers.vue'; let app; diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue index f06dc72d365..2336cb18cb5 100644 --- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue +++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ import { GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import csrf from '~/lib/utils/csrf'; +import { __, s__, sprintf } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index 869fdccc800..c5478aa0226 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -1,9 +1,9 @@ <script> -import { escape } from 'lodash'; import { GlSafeHtmlDirective as SafeHtml, GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; +import { escape } from 'lodash'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { s__, sprintf } from '~/locale'; -import { deprecatedCreateFlash as Flash } from '~/flash'; export default { components: { diff --git a/app/assets/javascripts/profile/account/index.js b/app/assets/javascripts/profile/account/index.js index f6f424db7bd..00fe0bcf89b 100644 --- a/app/assets/javascripts/profile/account/index.js +++ b/app/assets/javascripts/profile/account/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import Translate from '~/vue_shared/translate'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; -import UpdateUsername from './components/update_username.vue'; +import Translate from '~/vue_shared/translate'; import deleteAccountModal from './components/delete_account_modal.vue'; +import UpdateUsername from './components/update_username.vue'; export default () => { Vue.use(Translate); diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js index e6c41c7615c..300dd5ecc51 100644 --- a/app/assets/javascripts/profile/profile.js +++ b/app/assets/javascripts/profile/profile.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import axios from '~/lib/utils/axios_utils'; -import { Rails } from '~/lib/utils/rails_ujs'; import { parseBoolean } from '~/lib/utils/common_utils'; +import { Rails } from '~/lib/utils/rails_ujs'; import TimezoneDropdown, { formatTimezone, } from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; diff --git a/app/assets/javascripts/project_find_file.js b/app/assets/javascripts/project_find_file.js index ddb8956b664..f44661cb139 100644 --- a/app/assets/javascripts/project_find_file.js +++ b/app/assets/javascripts/project_find_file.js @@ -1,12 +1,12 @@ /* eslint-disable func-names, consistent-return, no-return-assign */ -import $ from 'jquery'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; +import $ from 'jquery'; +import { deprecatedCreateFlash as flash } from '~/flash'; import { sanitize } from '~/lib/dompurify'; import axios from '~/lib/utils/axios_utils'; -import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { spriteIcon } from '~/lib/utils/common_utils'; -import { deprecatedCreateFlash as flash } from '~/flash'; +import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; // highlight text(awefwbwgtc -> <b>a</b>wefw<b>b</b>wgt<b>c</b> ) diff --git a/app/assets/javascripts/project_label_subscription.js b/app/assets/javascripts/project_label_subscription.js index 666f6e15e61..e6dd4145cb8 100644 --- a/app/assets/javascripts/project_label_subscription.js +++ b/app/assets/javascripts/project_label_subscription.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { fixTitle } from '~/tooltips'; -import { __ } from './locale'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from './flash'; +import axios from './lib/utils/axios_utils'; +import { __ } from './locale'; const tooltipTitles = { group: { diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js index e68430d7dfd..e1e04d63576 100644 --- a/app/assets/javascripts/project_select.js +++ b/app/assets/javascripts/project_select.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import Api from './api'; -import ProjectSelectComboButton from './project_select_combo_button'; -import { s__ } from './locale'; import { loadCSSFile } from './lib/utils/css_utils'; +import { s__ } from './locale'; +import ProjectSelectComboButton from './project_select_combo_button'; const projectSelect = () => { loadCSSFile(gon.select2_css_path) diff --git a/app/assets/javascripts/projects/commit/components/form_modal.vue b/app/assets/javascripts/projects/commit/components/form_modal.vue index 22f9d04d87c..ed216a91ca0 100644 --- a/app/assets/javascripts/projects/commit/components/form_modal.vue +++ b/app/assets/javascripts/projects/commit/components/form_modal.vue @@ -1,8 +1,8 @@ <script> import { GlModal, GlForm, GlFormCheckbox, GlSprintf, GlFormGroup } from '@gitlab/ui'; import { mapActions, mapState } from 'vuex'; -import csrf from '~/lib/utils/csrf'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import csrf from '~/lib/utils/csrf'; import eventHub from '../event_hub'; import BranchesDropdown from './branches_dropdown.vue'; diff --git a/app/assets/javascripts/projects/commit/index.js b/app/assets/javascripts/projects/commit/index.js index d5d7e62ce32..b5fdfc25236 100644 --- a/app/assets/javascripts/projects/commit/index.js +++ b/app/assets/javascripts/projects/commit/index.js @@ -1,7 +1,7 @@ -import initRevertCommitTrigger from './init_revert_commit_trigger'; -import initRevertCommitModal from './init_revert_commit_modal'; -import initCherryPickCommitTrigger from './init_cherry_pick_commit_trigger'; import initCherryPickCommitModal from './init_cherry_pick_commit_modal'; +import initCherryPickCommitTrigger from './init_cherry_pick_commit_trigger'; +import initRevertCommitModal from './init_revert_commit_modal'; +import initRevertCommitTrigger from './init_revert_commit_trigger'; export default () => { initRevertCommitModal(); diff --git a/app/assets/javascripts/projects/commit/init_cherry_pick_commit_modal.js b/app/assets/javascripts/projects/commit/init_cherry_pick_commit_modal.js index 33184d25c9b..24baa27ff70 100644 --- a/app/assets/javascripts/projects/commit/init_cherry_pick_commit_modal.js +++ b/app/assets/javascripts/projects/commit/init_cherry_pick_commit_modal.js @@ -1,13 +1,13 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import CommitFormModal from './components/form_modal.vue'; -import createStore from './store'; import { I18N_MODAL, I18N_CHERRY_PICK_MODAL, OPEN_CHERRY_PICK_MODAL, CHERRY_PICK_MODAL_ID, } from './constants'; +import createStore from './store'; export default function initInviteMembersModal() { const el = document.querySelector('.js-cherry-pick-commit-modal'); diff --git a/app/assets/javascripts/projects/commit/init_revert_commit_modal.js b/app/assets/javascripts/projects/commit/init_revert_commit_modal.js index 26695089e90..df26aa3c830 100644 --- a/app/assets/javascripts/projects/commit/init_revert_commit_modal.js +++ b/app/assets/javascripts/projects/commit/init_revert_commit_modal.js @@ -1,7 +1,6 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import CommitFormModal from './components/form_modal.vue'; -import createStore from './store'; import { I18N_MODAL, I18N_REVERT_MODAL, @@ -9,6 +8,7 @@ import { OPEN_REVERT_MODAL, REVERT_MODAL_ID, } from './constants'; +import createStore from './store'; export default function initInviteMembersModal() { const el = document.querySelector('.js-revert-commit-modal'); diff --git a/app/assets/javascripts/projects/commit/store/actions.js b/app/assets/javascripts/projects/commit/store/actions.js index a9d1197e955..10135e55351 100644 --- a/app/assets/javascripts/projects/commit/store/actions.js +++ b/app/assets/javascripts/projects/commit/store/actions.js @@ -1,5 +1,5 @@ -import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { PROJECT_BRANCHES_ERROR } from '../constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/projects/commit_box/info/index.js b/app/assets/javascripts/projects/commit_box/info/index.js index cfb7dc8476d..4bbdb5c2357 100644 --- a/app/assets/javascripts/projects/commit_box/info/index.js +++ b/app/assets/javascripts/projects/commit_box/info/index.js @@ -1,7 +1,7 @@ import { fetchCommitMergeRequests } from '~/commit_merge_requests'; import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown'; -import { loadBranches } from './load_branches'; import { initDetailsButton } from './init_details_button'; +import { loadBranches } from './load_branches'; export const initCommitBoxInfo = (containerSelector = '.js-commit-box-info') => { const containerEl = document.querySelector(containerSelector); diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index 752bb594794..1566232751d 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -1,6 +1,4 @@ <script> -import { debounce } from 'lodash'; -import { mapState, mapActions } from 'vuex'; import { GlDropdown, GlDropdownSectionHeader, @@ -9,8 +7,10 @@ import { GlDropdownDivider, GlTooltipDirective, } from '@gitlab/ui'; -import { redirectTo } from '~/lib/utils/url_utility'; +import { debounce } from 'lodash'; +import { mapState, mapActions } from 'vuex'; import { urlParamsToObject } from '~/lib/utils/common_utils'; +import { redirectTo } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; const tooltipMessage = __('Searching by both author and message is currently not supported.'); diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js index 832f6b904f4..72d4f0c31e5 100644 --- a/app/assets/javascripts/projects/commits/store/actions.js +++ b/app/assets/javascripts/projects/commits/store/actions.js @@ -1,8 +1,8 @@ -import * as Sentry from '~/sentry/wrapper'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { __ } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import * as types from './mutation_types'; export default { diff --git a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue index f657f36322d..a5e2c986b12 100644 --- a/app/assets/javascripts/projects/compare/components/revision_dropdown.vue +++ b/app/assets/javascripts/projects/compare/components/revision_dropdown.vue @@ -1,7 +1,7 @@ <script> import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlDropdownSectionHeader } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { s__ } from '~/locale'; export default { diff --git a/app/assets/javascripts/projects/components/shared/delete_button.vue b/app/assets/javascripts/projects/components/shared/delete_button.vue index 051bfcb732a..2e46f437ace 100644 --- a/app/assets/javascripts/projects/components/shared/delete_button.vue +++ b/app/assets/javascripts/projects/components/shared/delete_button.vue @@ -1,8 +1,8 @@ <script> -import { uniqueId } from 'lodash'; import { GlModal, GlModalDirective, GlFormInput, GlButton } from '@gitlab/ui'; -import { __ } from '~/locale'; +import { uniqueId } from 'lodash'; import csrf from '~/lib/utils/csrf'; +import { __ } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue b/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue index ec208b97986..ef61fba88fe 100644 --- a/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue +++ b/app/assets/javascripts/projects/experiment_new_project_creation/components/app.vue @@ -4,9 +4,9 @@ import { GlBreadcrumb, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/u import { __, s__ } from '~/locale'; import blankProjectIllustration from '../illustrations/blank-project.svg'; +import ciCdProjectIllustration from '../illustrations/ci-cd-project.svg'; import createFromTemplateIllustration from '../illustrations/create-from-template.svg'; import importProjectIllustration from '../illustrations/import-project.svg'; -import ciCdProjectIllustration from '../illustrations/ci-cd-project.svg'; import LegacyContainer from './legacy_container.vue'; import WelcomePage from './welcome.vue'; diff --git a/app/assets/javascripts/projects/members/utils.js b/app/assets/javascripts/projects/members/utils.js index cc27a43afa9..a8a635e3ce8 100644 --- a/app/assets/javascripts/projects/members/utils.js +++ b/app/assets/javascripts/projects/members/utils.js @@ -1,5 +1,5 @@ -import { baseRequestFormatter } from '~/members/utils'; import { MEMBER_ACCESS_LEVEL_PROPERTY_NAME } from '~/members/constants'; +import { baseRequestFormatter } from '~/members/utils'; import { PROJECT_MEMBER_BASE_PROPERTY_NAME } from './constants'; export const projectMemberRequestFormatter = baseRequestFormatter( diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue index e9ff30008d0..733f833d51a 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue @@ -1,11 +1,9 @@ <script> -import dateFormat from 'dateformat'; -import { GlColumnChart } from '@gitlab/ui/dist/charts'; import { GlAlert, GlSkeletonLoader } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; +import { GlColumnChart } from '@gitlab/ui/dist/charts'; +import dateFormat from 'dateformat'; import { getDateInPast } from '~/lib/utils/datetime_utility'; -import getPipelineCountByStatus from '../graphql/queries/get_pipeline_count_by_status.query.graphql'; -import getProjectPipelineStatistics from '../graphql/queries/get_project_pipeline_statistics.query.graphql'; +import { __, s__, sprintf } from '~/locale'; import { DEFAULT, CHART_CONTAINER_HEIGHT, @@ -21,8 +19,10 @@ import { LOAD_PIPELINES_FAILURE, UNSUPPORTED_DATA, } from '../constants'; -import StatisticsList from './statistics_list.vue'; +import getPipelineCountByStatus from '../graphql/queries/get_pipeline_count_by_status.query.graphql'; +import getProjectPipelineStatistics from '../graphql/queries/get_project_pipeline_statistics.query.graphql'; import CiCdAnalyticsCharts from './ci_cd_analytics_charts.vue'; +import StatisticsList from './statistics_list.vue'; const defaultAnalyticsValues = { weekPipelinesTotals: [], diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index e5946de3efd..209ae9927cf 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -1,9 +1,9 @@ /* eslint-disable no-underscore-dangle, class-methods-use-this */ import { escape, find, countBy } from 'lodash'; -import axios from '~/lib/utils/axios_utils'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { n__, s__, __, sprintf } from '~/locale'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants'; export default class AccessDropdown { diff --git a/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue b/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue index 51281def7d0..0786a74f6b1 100644 --- a/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue +++ b/app/assets/javascripts/projects/settings/components/shared_runners_toggle.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlToggle, GlTooltip } from '@gitlab/ui'; -import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; const DEFAULT_ERROR_MESSAGE = __('An error occurred while updating the configuration.'); diff --git a/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js b/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js index c5d45fe6fed..eaeb5848b68 100644 --- a/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js +++ b/app/assets/javascripts/projects/settings/mount_shared_runners_toggle.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import SharedRunnersToggle from '~/projects/settings/components/shared_runners_toggle.vue'; import { parseBoolean } from '~/lib/utils/common_utils'; +import SharedRunnersToggle from '~/projects/settings/components/shared_runners_toggle.vue'; export default (containerId = 'toggle-shared-runners-form') => { const containerEl = document.getElementById(containerId); diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue index 7d570d01f85..9b3c0dd2755 100644 --- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue +++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue @@ -1,7 +1,7 @@ <script> import { GlAlert } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { __, sprintf } from '~/locale'; import ServiceDeskSetting from './service_desk_setting.vue'; export default { diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue index 0f01167988d..f3d12e0dd00 100644 --- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue +++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue @@ -1,10 +1,10 @@ <script> -import Visibility from 'visibilityjs'; import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; -import ciIcon from '~/vue_shared/components/ci_icon.vue'; -import Poll from '~/lib/utils/poll'; +import Visibility from 'visibilityjs'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import Poll from '~/lib/utils/poll'; import { __, s__, sprintf } from '~/locale'; +import ciIcon from '~/vue_shared/components/ci_icon.vue'; import CommitPipelineService from '../services/commit_pipeline_service'; export default { diff --git a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue index 91de6d93e19..1a07f5495a1 100644 --- a/app/assets/javascripts/prometheus_alerts/components/reset_key.vue +++ b/app/assets/javascripts/prometheus_alerts/components/reset_key.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/no-v-html */ import { GlButton, GlFormGroup, GlFormInput, GlModal, GlModalDirective } from '@gitlab/ui'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __, sprintf } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; export default { copyToClipboard: __('Copy'), diff --git a/app/assets/javascripts/prometheus_metrics/custom_metrics.js b/app/assets/javascripts/prometheus_metrics/custom_metrics.js index f829b080224..e10b5bf1807 100644 --- a/app/assets/javascripts/prometheus_metrics/custom_metrics.js +++ b/app/assets/javascripts/prometheus_metrics/custom_metrics.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { escape, sortBy } from 'lodash'; import axios from '~/lib/utils/axios_utils'; -import { s__ } from '~/locale'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { s__ } from '~/locale'; import PANEL_STATE from './constants'; import PrometheusMetrics from './prometheus_metrics'; diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js index a1f79084292..c9474f0516c 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_create.js +++ b/app/assets/javascripts/protected_branches/protected_branch_create.js @@ -1,10 +1,10 @@ import $ from 'jquery'; -import AccessDropdown from '~/projects/settings/access_dropdown'; -import axios from '~/lib/utils/axios_utils'; -import AccessorUtilities from '~/lib/utils/accessor'; -import { deprecatedCreateFlash as Flash } from '~/flash'; import CreateItemDropdown from '~/create_item_dropdown'; +import { deprecatedCreateFlash as Flash } from '~/flash'; +import AccessorUtilities from '~/lib/utils/accessor'; +import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; +import AccessDropdown from '~/projects/settings/access_dropdown'; import { ACCESS_LEVELS, LEVEL_TYPES } from './constants'; export default class ProtectedBranchCreate { diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js index 8316b10d49c..986abeecafa 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_edit.js +++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js @@ -1,7 +1,7 @@ import { find } from 'lodash'; -import AccessDropdown from '~/projects/settings/access_dropdown'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; +import AccessDropdown from '~/projects/settings/access_dropdown'; import { deprecatedCreateFlash as flash } from '../flash'; import { ACCESS_LEVELS, LEVEL_TYPES } from './constants'; diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js index 202286a5fb4..4094c300a50 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js +++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; export default class ProtectedTagAccessDropdown { constructor(options) { diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js index ad702a5c3af..ae7855d4638 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -1,7 +1,7 @@ import { deprecatedCreateFlash as flash } from '../flash'; import axios from '../lib/utils/axios_utils'; -import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; import { FAILED_TO_UPDATE_TAG_MESSAGE } from './constants'; +import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; export default class ProtectedTagEdit { constructor(options) { diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue index 20aec3e12be..8f2805b36f6 100644 --- a/app/assets/javascripts/ref/components/ref_selector.vue +++ b/app/assets/javascripts/ref/components/ref_selector.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; import { GlDropdown, GlDropdownDivider, @@ -10,8 +9,9 @@ import { GlLoadingIcon, } from '@gitlab/ui'; import { debounce } from 'lodash'; -import createStore from '../stores'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { SEARCH_DEBOUNCE_MS, DEFAULT_I18N } from '../constants'; +import createStore from '../stores'; import RefResultsSection from './ref_results_section.vue'; export default { diff --git a/app/assets/javascripts/registry/explorer/components/delete_image.vue b/app/assets/javascripts/registry/explorer/components/delete_image.vue index 62e287429ea..22fe9fc1da6 100644 --- a/app/assets/javascripts/registry/explorer/components/delete_image.vue +++ b/app/assets/javascripts/registry/explorer/components/delete_image.vue @@ -1,10 +1,9 @@ <script> import { produce } from 'immer'; +import { GRAPHQL_PAGE_SIZE } from '../constants/index'; import deleteContainerRepositoryMutation from '../graphql/mutations/delete_container_repository.mutation.graphql'; import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.query.graphql'; -import { GRAPHQL_PAGE_SIZE } from '../constants/index'; - export default { props: { id: { diff --git a/app/assets/javascripts/registry/explorer/components/details_page/details_header.vue b/app/assets/javascripts/registry/explorer/components/details_page/details_header.vue index 5f193527a60..a4b4c08bc34 100644 --- a/app/assets/javascripts/registry/explorer/components/details_page/details_header.vue +++ b/app/assets/javascripts/registry/explorer/components/details_page/details_header.vue @@ -1,8 +1,8 @@ <script> import { GlSprintf, GlButton } from '@gitlab/ui'; import { sprintf, n__ } from '~/locale'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; import { DETAILS_PAGE_TITLE, diff --git a/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue index ed4fea0c88e..c66f92bdd67 100644 --- a/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue +++ b/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue @@ -1,13 +1,12 @@ <script> import { GlFormCheckbox, GlTooltipDirective, GlSprintf, GlIcon } from '@gitlab/ui'; +import { formatDate } from '~/lib/utils/datetime_utility'; +import { numberToHumanSize } from '~/lib/utils/number_utils'; import { n__ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import { numberToHumanSize } from '~/lib/utils/number_utils'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import { formatDate } from '~/lib/utils/datetime_utility'; -import ListItem from '~/vue_shared/components/registry/list_item.vue'; import DetailsRow from '~/vue_shared/components/registry/details_row.vue'; -import DeleteButton from '../delete_button.vue'; +import ListItem from '~/vue_shared/components/registry/list_item.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { REMOVE_TAG_BUTTON_TITLE, DIGEST_LABEL, @@ -20,6 +19,7 @@ import { NOT_AVAILABLE_TEXT, NOT_AVAILABLE_SIZE, } from '../../constants/index'; +import DeleteButton from '../delete_button.vue'; export default { components: { diff --git a/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue index 264a3c27cde..9ae5b0f9eb1 100644 --- a/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue +++ b/app/assets/javascripts/registry/explorer/components/list_page/image_list_row.vue @@ -1,12 +1,10 @@ <script> import { GlTooltipDirective, GlIcon, GlSprintf, GlSkeletonLoader } from '@gitlab/ui'; -import { n__ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { n__ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ListItem from '~/vue_shared/components/registry/list_item.vue'; -import DeleteButton from '../delete_button.vue'; - import { ASYNC_DELETE_IMAGE_ERROR_MESSAGE, LIST_DELETE_BUTTON_DISABLED, @@ -16,6 +14,7 @@ import { IMAGE_DELETE_SCHEDULED_STATUS, IMAGE_FAILED_DELETED_STATUS, } from '../../constants/index'; +import DeleteButton from '../delete_button.vue'; export default { name: 'ImageListRow', diff --git a/app/assets/javascripts/registry/explorer/components/list_page/registry_header.vue b/app/assets/javascripts/registry/explorer/components/list_page/registry_header.vue index f01e3c9d24a..8d7505dfbae 100644 --- a/app/assets/javascripts/registry/explorer/components/list_page/registry_header.vue +++ b/app/assets/javascripts/registry/explorer/components/list_page/registry_header.vue @@ -1,8 +1,8 @@ <script> -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; -import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; -import { n__, sprintf } from '~/locale'; import { approximateDuration, calculateRemainingMilliseconds } from '~/lib/utils/datetime_utility'; +import { n__, sprintf } from '~/locale'; +import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import { CONTAINER_REGISTRY_TITLE, diff --git a/app/assets/javascripts/registry/explorer/constants/details.js b/app/assets/javascripts/registry/explorer/constants/details.js index bb084e813af..3f04538a18b 100644 --- a/app/assets/javascripts/registry/explorer/constants/details.js +++ b/app/assets/javascripts/registry/explorer/constants/details.js @@ -1,5 +1,5 @@ -import { s__, __ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { s__, __ } from '~/locale'; // Translations strings export const DETAILS_PAGE_TITLE = s__('ContainerRegistry|%{imageName} tags'); diff --git a/app/assets/javascripts/registry/explorer/index.js b/app/assets/javascripts/registry/explorer/index.js index 0ddbe50441b..f66839a74bf 100644 --- a/app/assets/javascripts/registry/explorer/index.js +++ b/app/assets/javascripts/registry/explorer/index.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import Translate from '~/vue_shared/translate'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import PerformancePlugin from '~/performance/vue_performance_plugin'; -import RegistryExplorer from './pages/index.vue'; +import Translate from '~/vue_shared/translate'; import RegistryBreadcrumb from './components/registry_breadcrumb.vue'; -import createRouter from './router'; import { apolloProvider } from './graphql/index'; +import RegistryExplorer from './pages/index.vue'; +import createRouter from './router'; Vue.use(Translate); Vue.use(GlToast); diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue index 4d992a395af..0403467468a 100644 --- a/app/assets/javascripts/registry/explorer/pages/details.vue +++ b/app/assets/javascripts/registry/explorer/pages/details.vue @@ -2,21 +2,18 @@ import { GlKeysetPagination, GlResizeObserverDirective } from '@gitlab/ui'; import { GlBreakpointInstance } from '@gitlab/ui/dist/utils'; import createFlash from '~/flash'; -import Tracking from '~/tracking'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; +import Tracking from '~/tracking'; +import DeleteImage from '../components/delete_image.vue'; import DeleteAlert from '../components/details_page/delete_alert.vue'; -import PartialCleanupAlert from '../components/details_page/partial_cleanup_alert.vue'; import DeleteModal from '../components/details_page/delete_modal.vue'; import DetailsHeader from '../components/details_page/details_header.vue'; -import TagsList from '../components/details_page/tags_list.vue'; -import TagsLoader from '../components/details_page/tags_loader.vue'; import EmptyState from '../components/details_page/empty_state.vue'; +import PartialCleanupAlert from '../components/details_page/partial_cleanup_alert.vue'; import StatusAlert from '../components/details_page/status_alert.vue'; -import DeleteImage from '../components/delete_image.vue'; - -import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.query.graphql'; -import deleteContainerRepositoryTagsMutation from '../graphql/mutations/delete_container_repository_tags.mutation.graphql'; +import TagsList from '../components/details_page/tags_list.vue'; +import TagsLoader from '../components/details_page/tags_loader.vue'; import { ALERT_SUCCESS_TAG, @@ -29,6 +26,8 @@ import { UNFINISHED_STATUS, MISSING_OR_DELETE_IMAGE_BREADCRUMB, } from '../constants/index'; +import deleteContainerRepositoryTagsMutation from '../graphql/mutations/delete_container_repository_tags.mutation.graphql'; +import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.query.graphql'; export default { name: 'RegistryDetailsPage', diff --git a/app/assets/javascripts/registry/explorer/pages/list.vue b/app/assets/javascripts/registry/explorer/pages/list.vue index c710d125797..8cad9b4ecfc 100644 --- a/app/assets/javascripts/registry/explorer/pages/list.vue +++ b/app/assets/javascripts/registry/explorer/pages/list.vue @@ -10,13 +10,11 @@ import { } from '@gitlab/ui'; import { get } from 'lodash'; import getContainerRepositoriesQuery from 'shared_queries/container_registry/get_container_repositories.query.graphql'; -import Tracking from '~/tracking'; import createFlash from '~/flash'; +import Tracking from '~/tracking'; import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; -import RegistryHeader from '../components/list_page/registry_header.vue'; import DeleteImage from '../components/delete_image.vue'; - -import getContainerRepositoriesDetails from '../graphql/queries/get_container_repositories_details.query.graphql'; +import RegistryHeader from '../components/list_page/registry_header.vue'; import { DELETE_IMAGE_SUCCESS_MESSAGE, @@ -31,6 +29,7 @@ import { FETCH_IMAGES_LIST_ERROR_MESSAGE, SORT_FIELDS, } from '../constants/index'; +import getContainerRepositoriesDetails from '../graphql/queries/get_container_repositories_details.query.graphql'; export default { name: 'RegistryListPage', diff --git a/app/assets/javascripts/registry/explorer/router.js b/app/assets/javascripts/registry/explorer/router.js index d8903cf0931..a0c4417d549 100644 --- a/app/assets/javascripts/registry/explorer/router.js +++ b/app/assets/javascripts/registry/explorer/router.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; -import List from './pages/list.vue'; -import Details from './pages/details.vue'; import { CONTAINER_REGISTRY_TITLE } from './constants/index'; +import Details from './pages/details.vue'; +import List from './pages/list.vue'; Vue.use(VueRouter); diff --git a/app/assets/javascripts/registry/settings/components/registry_settings_app.vue b/app/assets/javascripts/registry/settings/components/registry_settings_app.vue index 66eb681784e..480590ec71e 100644 --- a/app/assets/javascripts/registry/settings/components/registry_settings_app.vue +++ b/app/assets/javascripts/registry/settings/components/registry_settings_app.vue @@ -1,7 +1,6 @@ <script> import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; import { isEqual, get, isEmpty } from 'lodash'; -import expirationPolicyQuery from '../graphql/queries/get_expiration_policy.query.graphql'; import { FETCH_SETTINGS_ERROR_MESSAGE, UNAVAILABLE_FEATURE_TITLE, @@ -9,6 +8,7 @@ import { UNAVAILABLE_USER_FEATURE_TEXT, UNAVAILABLE_ADMIN_FEATURE_TEXT, } from '../constants'; +import expirationPolicyQuery from '../graphql/queries/get_expiration_policy.query.graphql'; import SettingsForm from './settings_form.vue'; diff --git a/app/assets/javascripts/registry/settings/components/settings_form.vue b/app/assets/javascripts/registry/settings/components/settings_form.vue index 7043cea49ba..eb731c382e1 100644 --- a/app/assets/javascripts/registry/settings/components/settings_form.vue +++ b/app/assets/javascripts/registry/settings/components/settings_form.vue @@ -1,6 +1,5 @@ <script> import { GlCard, GlButton, GlSprintf } from '@gitlab/ui'; -import Tracking from '~/tracking'; import { UPDATE_SETTINGS_ERROR_MESSAGE, UPDATE_SETTINGS_SUCCESS_MESSAGE, @@ -19,13 +18,14 @@ import { CADENCE_LABEL, EXPIRATION_POLICY_FOOTER_NOTE, } from '~/registry/settings/constants'; -import { formOptionsGenerator } from '~/registry/settings/utils'; import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql'; import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update'; +import { formOptionsGenerator } from '~/registry/settings/utils'; +import Tracking from '~/tracking'; import ExpirationDropdown from './expiration_dropdown.vue'; import ExpirationInput from './expiration_input.vue'; -import ExpirationToggle from './expiration_toggle.vue'; import ExpirationRunText from './expiration_run_text.vue'; +import ExpirationToggle from './expiration_toggle.vue'; export default { components: { diff --git a/app/assets/javascripts/registry/settings/registry_settings_bundle.js b/app/assets/javascripts/registry/settings/registry_settings_bundle.js index 6a4584b1b28..65af6f846aa 100644 --- a/app/assets/javascripts/registry/settings/registry_settings_bundle.js +++ b/app/assets/javascripts/registry/settings/registry_settings_bundle.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import Translate from '~/vue_shared/translate'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; +import Translate from '~/vue_shared/translate'; import RegistrySettingsApp from './components/registry_settings_app.vue'; import { apolloProvider } from './graphql/index'; diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue index 8d412e14b47..02929062cee 100644 --- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue +++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue @@ -1,7 +1,7 @@ <script> import { GlFormGroup, GlFormRadioGroup, GlButton } from '@gitlab/ui'; -import { __ } from '~/locale'; import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import { issuableTypesMap, diff --git a/app/assets/javascripts/related_issues/components/related_issues_root.vue b/app/assets/javascripts/related_issues/components/related_issues_root.vue index 1ad9d8b7986..c35a1ff0b63 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_root.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_root.vue @@ -25,8 +25,6 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways: */ import { deprecatedCreateFlash as Flash } from '~/flash'; import { __ } from '~/locale'; -import RelatedIssuesStore from '../stores/related_issues_store'; -import RelatedIssuesService from '../services/related_issues_service'; import { relatedIssuesRemoveErrorMap, pathIndeterminateErrorMap, @@ -34,6 +32,8 @@ import { issuableTypesMap, PathIdSeparator, } from '../constants'; +import RelatedIssuesService from '../services/related_issues_service'; +import RelatedIssuesStore from '../stores/related_issues_store'; import RelatedIssuesBlock from './related_issues_block.vue'; export default { diff --git a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue index 7db76ed576c..ccb92d2aedc 100644 --- a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue +++ b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlLink, GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { sprintf, n__, s__ } from '~/locale'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; import { parseIssuableData } from '../../issue_show/utils/parse_data'; diff --git a/app/assets/javascripts/related_merge_requests/store/actions.js b/app/assets/javascripts/related_merge_requests/store/actions.js index 7baab165820..e9f0793a350 100644 --- a/app/assets/javascripts/related_merge_requests/store/actions.js +++ b/app/assets/javascripts/related_merge_requests/store/actions.js @@ -1,7 +1,7 @@ -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__ } from '~/locale'; +import axios from '~/lib/utils/axios_utils'; import { normalizeHeaders } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import * as types from './mutation_types'; const REQUEST_PAGE_COUNT = 100; diff --git a/app/assets/javascripts/related_merge_requests/store/index.js b/app/assets/javascripts/related_merge_requests/store/index.js index dcb70c22bcb..925cc36cd76 100644 --- a/app/assets/javascripts/related_merge_requests/store/index.js +++ b/app/assets/javascripts/related_merge_requests/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/releases/components/app_edit_new.vue b/app/assets/javascripts/releases/components/app_edit_new.vue index 6e159939103..b16bb76c305 100644 --- a/app/assets/javascripts/releases/components/app_edit_new.vue +++ b/app/assets/javascripts/releases/components/app_edit_new.vue @@ -1,11 +1,11 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlButton, GlFormInput, GlFormGroup, GlSprintf } from '@gitlab/ui'; -import { __ } from '~/locale'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; -import { BACK_URL_PARAM } from '~/releases/constants'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; +import { BACK_URL_PARAM } from '~/releases/constants'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import AssetLinksForm from './asset_links_form.vue'; import TagField from './tag_field.vue'; diff --git a/app/assets/javascripts/releases/components/app_index.vue b/app/assets/javascripts/releases/components/app_index.vue index 5064b7dd6ad..32183e454c8 100644 --- a/app/assets/javascripts/releases/components/app_index.vue +++ b/app/assets/javascripts/releases/components/app_index.vue @@ -1,11 +1,11 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlEmptyState, GlLink, GlButton } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { getParameterByName } from '~/lib/utils/common_utils'; import { __ } from '~/locale'; import ReleaseBlock from './release_block.vue'; -import ReleasesPagination from './releases_pagination.vue'; import ReleaseSkeletonLoader from './release_skeleton_loader.vue'; +import ReleasesPagination from './releases_pagination.vue'; import ReleasesSort from './releases_sort.vue'; export default { diff --git a/app/assets/javascripts/releases/components/asset_links_form.vue b/app/assets/javascripts/releases/components/asset_links_form.vue index b6595ea78be..9e095c8a9c2 100644 --- a/app/assets/javascripts/releases/components/asset_links_form.vue +++ b/app/assets/javascripts/releases/components/asset_links_form.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlSprintf, GlLink, @@ -10,6 +9,7 @@ import { GlFormInput, GlFormSelect, } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { s__ } from '~/locale'; import { DEFAULT_ASSET_LINK_TYPE, ASSET_LINK_TYPE } from '../constants'; diff --git a/app/assets/javascripts/releases/components/evidence_block.vue b/app/assets/javascripts/releases/components/evidence_block.vue index 6e6017637d4..78831ceefe9 100644 --- a/app/assets/javascripts/releases/components/evidence_block.vue +++ b/app/assets/javascripts/releases/components/evidence_block.vue @@ -1,9 +1,9 @@ <script> -import dateFormat from 'dateformat'; import { GlLink, GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; -import { truncateSha } from '~/lib/utils/text_utility'; +import dateFormat from 'dateformat'; import { getTimeago } from '~/lib/utils/datetime_utility'; +import { truncateSha } from '~/lib/utils/text_utility'; +import { __, sprintf } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ExpandButton from '~/vue_shared/components/expand_button.vue'; diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index b89e5f2df3f..68bca2fc6b9 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -1,10 +1,10 @@ <script> /* eslint-disable vue/no-v-html */ -import { isEmpty } from 'lodash'; import $ from 'jquery'; +import { isEmpty } from 'lodash'; +import { scrollToElement } from '~/lib/utils/common_utils'; import { slugify } from '~/lib/utils/text_utility'; import { getLocationHash } from '~/lib/utils/url_utility'; -import { scrollToElement } from '~/lib/utils/common_utils'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import '~/behaviors/markdown/render_gfm'; import EvidenceBlock from './evidence_block.vue'; diff --git a/app/assets/javascripts/releases/components/release_block_footer.vue b/app/assets/javascripts/releases/components/release_block_footer.vue index 3beec466c54..cb795b3cba7 100644 --- a/app/assets/javascripts/releases/components/release_block_footer.vue +++ b/app/assets/javascripts/releases/components/release_block_footer.vue @@ -1,8 +1,8 @@ <script> import { GlTooltipDirective, GlLink, GlIcon } from '@gitlab/ui'; +import { __, sprintf } from '~/locale'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { __, sprintf } from '~/locale'; export default { name: 'ReleaseBlockFooter', diff --git a/app/assets/javascripts/releases/components/release_block_header.vue b/app/assets/javascripts/releases/components/release_block_header.vue index 87538244f1a..65b68c93e35 100644 --- a/app/assets/javascripts/releases/components/release_block_header.vue +++ b/app/assets/javascripts/releases/components/release_block_header.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective, GlLink, GlBadge, GlButton } from '@gitlab/ui'; -import { BACK_URL_PARAM } from '~/releases/constants'; import { setUrlParams } from '~/lib/utils/url_utility'; +import { BACK_URL_PARAM } from '~/releases/constants'; export default { name: 'ReleaseBlockHeader', diff --git a/app/assets/javascripts/releases/components/releases_pagination_graphql.vue b/app/assets/javascripts/releases/components/releases_pagination_graphql.vue index cb6f1fa18a1..7d024c47fb9 100644 --- a/app/assets/javascripts/releases/components/releases_pagination_graphql.vue +++ b/app/assets/javascripts/releases/components/releases_pagination_graphql.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlKeysetPagination } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; export default { diff --git a/app/assets/javascripts/releases/components/releases_pagination_rest.vue b/app/assets/javascripts/releases/components/releases_pagination_rest.vue index 334458a2302..24abb0f4498 100644 --- a/app/assets/javascripts/releases/components/releases_pagination_rest.vue +++ b/app/assets/javascripts/releases/components/releases_pagination_rest.vue @@ -1,7 +1,7 @@ <script> import { mapActions, mapState } from 'vuex'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; export default { name: 'ReleasesPaginationRest', diff --git a/app/assets/javascripts/releases/components/tag_field_existing.vue b/app/assets/javascripts/releases/components/tag_field_existing.vue index 046885fe2f6..3345bbecf6e 100644 --- a/app/assets/javascripts/releases/components/tag_field_existing.vue +++ b/app/assets/javascripts/releases/components/tag_field_existing.vue @@ -1,7 +1,7 @@ <script> -import { mapState } from 'vuex'; -import { uniqueId } from 'lodash'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; +import { mapState } from 'vuex'; import FormFieldContainer from './form_field_container.vue'; export default { diff --git a/app/assets/javascripts/releases/components/tag_field_new.vue b/app/assets/javascripts/releases/components/tag_field_new.vue index 4779feae886..660fd7ac950 100644 --- a/app/assets/javascripts/releases/components/tag_field_new.vue +++ b/app/assets/javascripts/releases/components/tag_field_new.vue @@ -1,7 +1,7 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; import { uniqueId } from 'lodash'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { __ } from '~/locale'; import RefSelector from '~/ref/components/ref_selector.vue'; import FormFieldContainer from './form_field_container.vue'; diff --git a/app/assets/javascripts/releases/stores/modules/detail/actions.js b/app/assets/javascripts/releases/stores/modules/detail/actions.js index 54b08ac0dbc..5fa002706c6 100644 --- a/app/assets/javascripts/releases/stores/modules/detail/actions.js +++ b/app/assets/javascripts/releases/stores/modules/detail/actions.js @@ -1,14 +1,14 @@ import api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__ } from '~/locale'; import { redirectTo } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; +import oneReleaseQuery from '~/releases/queries/one_release.query.graphql'; import { releaseToApiJson, apiJsonToRelease, gqClient, convertOneReleaseGraphQLResponse, } from '~/releases/util'; -import oneReleaseQuery from '~/releases/queries/one_release.query.graphql'; import * as types from './mutation_types'; export const initializeRelease = ({ commit, dispatch, getters }) => { diff --git a/app/assets/javascripts/releases/stores/modules/list/actions.js b/app/assets/javascripts/releases/stores/modules/list/actions.js index 9d56323b3c7..f1add54626a 100644 --- a/app/assets/javascripts/releases/stores/modules/list/actions.js +++ b/app/assets/javascripts/releases/stores/modules/list/actions.js @@ -1,14 +1,14 @@ -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { __ } from '~/locale'; import api from '~/api'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { normalizeHeaders, parseIntPagination, convertObjectPropsToCamelCase, } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; -import { gqClient, convertAllReleasesGraphQLResponse } from '../../../util'; import { PAGE_SIZE } from '../../../constants'; +import { gqClient, convertAllReleasesGraphQLResponse } from '../../../util'; import * as types from './mutation_types'; /** diff --git a/app/assets/javascripts/releases/stores/modules/list/index.js b/app/assets/javascripts/releases/stores/modules/list/index.js index 244f41b6609..d5ca191153a 100644 --- a/app/assets/javascripts/releases/stores/modules/list/index.js +++ b/app/assets/javascripts/releases/stores/modules/list/index.js @@ -1,6 +1,6 @@ -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default (initialState) => ({ namespaced: true, diff --git a/app/assets/javascripts/releases/util.js b/app/assets/javascripts/releases/util.js index b24a226cf9c..36c17b5b252 100644 --- a/app/assets/javascripts/releases/util.js +++ b/app/assets/javascripts/releases/util.js @@ -1,10 +1,10 @@ import { pick } from 'lodash'; import createGqClient, { fetchPolicies } from '~/lib/graphql'; -import { truncateSha } from '~/lib/utils/text_utility'; import { convertObjectPropsToCamelCase, convertObjectPropsToSnakeCase, } from '~/lib/utils/common_utils'; +import { truncateSha } from '~/lib/utils/text_utility'; /** * Converts a release object into a JSON object that can sent to the public diff --git a/app/assets/javascripts/reports/accessibility_report/grouped_accessibility_reports_app.vue b/app/assets/javascripts/reports/accessibility_report/grouped_accessibility_reports_app.vue index 6f8ddd01df8..c272e3b1dc4 100644 --- a/app/assets/javascripts/reports/accessibility_report/grouped_accessibility_reports_app.vue +++ b/app/assets/javascripts/reports/accessibility_report/grouped_accessibility_reports_app.vue @@ -1,8 +1,8 @@ <script> import { mapActions, mapGetters } from 'vuex'; import { componentNames } from '~/reports/components/issue_body'; -import ReportSection from '~/reports/components/report_section.vue'; import IssuesList from '~/reports/components/issues_list.vue'; +import ReportSection from '~/reports/components/report_section.vue'; import createStore from './store'; export default { diff --git a/app/assets/javascripts/reports/accessibility_report/store/actions.js b/app/assets/javascripts/reports/accessibility_report/store/actions.js index bb502020a06..e0142a35291 100644 --- a/app/assets/javascripts/reports/accessibility_report/store/actions.js +++ b/app/assets/javascripts/reports/accessibility_report/store/actions.js @@ -1,7 +1,7 @@ import Visibility from 'visibilityjs'; -import Poll from '~/lib/utils/poll'; -import httpStatusCodes from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; +import httpStatusCodes from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; import * as types from './mutation_types'; let eTagPoll; diff --git a/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue b/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue index d0a5615bb57..e5980f1e539 100644 --- a/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue +++ b/app/assets/javascripts/reports/codequality_report/components/codequality_issue_body.vue @@ -4,9 +4,9 @@ * Fixed: [name] in [link]:[line] */ import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { s__ } from '~/locale'; import ReportLink from '~/reports/components/report_link.vue'; import { STATUS_SUCCESS } from '~/reports/constants'; -import { s__ } from '~/locale'; import { SEVERITY_CLASSES, SEVERITY_ICONS } from '../constants'; export default { diff --git a/app/assets/javascripts/reports/codequality_report/grouped_codequality_reports_app.vue b/app/assets/javascripts/reports/codequality_report/grouped_codequality_reports_app.vue index c1de1ab25c1..654508f0736 100644 --- a/app/assets/javascripts/reports/codequality_report/grouped_codequality_reports_app.vue +++ b/app/assets/javascripts/reports/codequality_report/grouped_codequality_reports_app.vue @@ -1,9 +1,9 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; -import { componentNames } from '~/reports/components/issue_body'; import { s__, sprintf } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { componentNames } from '~/reports/components/issue_body'; import ReportSection from '~/reports/components/report_section.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import createStore from './store'; export default { diff --git a/app/assets/javascripts/reports/codequality_report/store/getters.js b/app/assets/javascripts/reports/codequality_report/store/getters.js index f26a41d94c0..c6935291af2 100644 --- a/app/assets/javascripts/reports/codequality_report/store/getters.js +++ b/app/assets/javascripts/reports/codequality_report/store/getters.js @@ -1,5 +1,5 @@ -import { sprintf, __, s__, n__ } from '~/locale'; import { spriteIcon } from '~/lib/utils/common_utils'; +import { sprintf, __, s__, n__ } from '~/locale'; import { LOADING, ERROR, SUCCESS } from '../../constants'; export const hasCodequalityIssues = (state) => diff --git a/app/assets/javascripts/reports/components/grouped_issues_list.vue b/app/assets/javascripts/reports/components/grouped_issues_list.vue index 1826fbaddac..4d3c5f48e94 100644 --- a/app/assets/javascripts/reports/components/grouped_issues_list.vue +++ b/app/assets/javascripts/reports/components/grouped_issues_list.vue @@ -1,7 +1,7 @@ <script> import { s__ } from '~/locale'; -import SmartVirtualList from '~/vue_shared/components/smart_virtual_list.vue'; import ReportItem from '~/reports/components/report_item.vue'; +import SmartVirtualList from '~/vue_shared/components/smart_virtual_list.vue'; export default { components: { diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue index dc09c3d175e..033b8798473 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -1,7 +1,7 @@ <script> -import { mapActions, mapGetters, mapState } from 'vuex'; -import { once } from 'lodash'; import { GlButton } from '@gitlab/ui'; +import { once } from 'lodash'; +import { mapActions, mapGetters, mapState } from 'vuex'; import { sprintf, s__ } from '~/locale'; import Tracking from '~/tracking'; import createStore from '../store'; @@ -12,10 +12,10 @@ import { recentFailuresTextBuilder, } from '../store/utils'; import { componentNames } from './issue_body'; -import ReportSection from './report_section.vue'; -import SummaryRow from './summary_row.vue'; import IssuesList from './issues_list.vue'; import Modal from './modal.vue'; +import ReportSection from './report_section.vue'; +import SummaryRow from './summary_row.vue'; export default { name: 'GroupedTestReportsApp', diff --git a/app/assets/javascripts/reports/components/test_issue_body.vue b/app/assets/javascripts/reports/components/test_issue_body.vue index ad980b334bb..7508e1d1f0d 100644 --- a/app/assets/javascripts/reports/components/test_issue_body.vue +++ b/app/assets/javascripts/reports/components/test_issue_body.vue @@ -1,6 +1,6 @@ <script> -import { mapActions } from 'vuex'; import { GlBadge, GlSprintf } from '@gitlab/ui'; +import { mapActions } from 'vuex'; export default { name: 'TestIssueBody', diff --git a/app/assets/javascripts/reports/store/actions.js b/app/assets/javascripts/reports/store/actions.js index a872cfa7e26..c9b8ee64930 100644 --- a/app/assets/javascripts/reports/store/actions.js +++ b/app/assets/javascripts/reports/store/actions.js @@ -1,7 +1,7 @@ import Visibility from 'visibilityjs'; import axios from '../../lib/utils/axios_utils'; -import Poll from '../../lib/utils/poll'; import httpStatusCodes from '../../lib/utils/http_status'; +import Poll from '../../lib/utils/poll'; import * as types from './mutation_types'; export const setEndpoint = ({ commit }, endpoint) => commit(types.SET_ENDPOINT, endpoint); diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index c9862572b16..28d7dec85f4 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -10,8 +10,8 @@ import permissionsQuery from 'shared_queries/repository/permissions.query.graphq import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { __ } from '../../locale'; import getRefMixin from '../mixins/get_ref'; -import projectShortPathQuery from '../queries/project_short_path.query.graphql'; import projectPathQuery from '../queries/project_path.query.graphql'; +import projectShortPathQuery from '../queries/project_short_path.query.graphql'; const ROW_TYPES = { header: 'header', diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue index 0241c803514..a7176853819 100644 --- a/app/assets/javascripts/repository/components/last_commit.vue +++ b/app/assets/javascripts/repository/components/last_commit.vue @@ -4,10 +4,10 @@ import { GlTooltipDirective, GlLink, GlButton, GlButtonGroup, GlLoadingIcon } fr import defaultAvatarUrl from 'images/no_avatar.png'; import pathLastCommitQuery from 'shared_queries/repository/path_last_commit.query.graphql'; import { sprintf, s__ } from '~/locale'; -import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; -import TimeagoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import ClipboardButton from '../../vue_shared/components/clipboard_button.vue'; +import TimeagoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import getRefMixin from '../mixins/get_ref'; import projectPathQuery from '../queries/project_path.query.graphql'; diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue index c6652c57c1f..22dffb7d2db 100644 --- a/app/assets/javascripts/repository/components/table/index.vue +++ b/app/assets/javascripts/repository/components/table/index.vue @@ -4,8 +4,8 @@ import { sprintf, __ } from '../../../locale'; import getRefMixin from '../../mixins/get_ref'; import projectPathQuery from '../../queries/project_path.query.graphql'; import TableHeader from './header.vue'; -import TableRow from './row.vue'; import ParentRow from './parent_row.vue'; +import TableRow from './row.vue'; export default { components: { diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index d749a8c0dee..70918dd55e4 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -1,6 +1,5 @@ <script> /* eslint-disable vue/no-v-html */ -import { escapeRegExp } from 'lodash'; import { GlBadge, GlLink, @@ -9,9 +8,10 @@ import { GlLoadingIcon, GlIcon, } from '@gitlab/ui'; +import { escapeRegExp } from 'lodash'; import { escapeFileUrl } from '~/lib/utils/url_utility'; -import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; +import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import getRefMixin from '../../mixins/get_ref'; import commitQuery from '../../queries/commit.query.graphql'; diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js index dbe129859bc..4a4b9d115b7 100644 --- a/app/assets/javascripts/repository/graphql.js +++ b/app/assets/javascripts/repository/graphql.js @@ -1,8 +1,8 @@ +import { IntrospectionFragmentMatcher } from 'apollo-cache-inmemory'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { IntrospectionFragmentMatcher } from 'apollo-cache-inmemory'; -import axios from '~/lib/utils/axios_utils'; import createDefaultClient from '~/lib/graphql'; +import axios from '~/lib/utils/axios_utils'; import introspectionQueryResultData from './fragmentTypes.json'; import { fetchLogsTree } from './log_tree'; diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js index aec3d90a6d7..747b85f5c1c 100644 --- a/app/assets/javascripts/repository/index.js +++ b/app/assets/javascripts/repository/index.js @@ -1,17 +1,17 @@ import Vue from 'vue'; import initWebIdeLink from '~/pages/projects/shared/web_ide_link'; -import { escapeFileUrl } from '../lib/utils/url_utility'; import { parseBoolean } from '../lib/utils/common_utils'; +import { escapeFileUrl } from '../lib/utils/url_utility'; import { __ } from '../locale'; -import createRouter from './router'; import App from './components/app.vue'; import Breadcrumbs from './components/breadcrumbs.vue'; +import DirectoryDownloadLinks from './components/directory_download_links.vue'; import LastCommit from './components/last_commit.vue'; import TreeActionLink from './components/tree_action_link.vue'; -import DirectoryDownloadLinks from './components/directory_download_links.vue'; import apolloProvider from './graphql'; -import { setTitle } from './utils/title'; +import createRouter from './router'; import { updateFormAction } from './utils/dom'; +import { setTitle } from './utils/title'; export default function setupVueRepositoryList() { const el = document.getElementById('js-tree-list'); diff --git a/app/assets/javascripts/repository/pages/tree.vue b/app/assets/javascripts/repository/pages/tree.vue index adc332fa370..cbdc62624d4 100644 --- a/app/assets/javascripts/repository/pages/tree.vue +++ b/app/assets/javascripts/repository/pages/tree.vue @@ -1,7 +1,7 @@ <script> import TreeContent from '../components/tree_content.vue'; -import { updateElementsVisibility } from '../utils/dom'; import preloadMixin from '../mixins/preload'; +import { updateElementsVisibility } from '../utils/dom'; export default { components: { diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js index e2924454239..ad6e32d7055 100644 --- a/app/assets/javascripts/repository/router.js +++ b/app/assets/javascripts/repository/router.js @@ -1,6 +1,6 @@ +import { escapeRegExp } from 'lodash'; import Vue from 'vue'; import VueRouter from 'vue-router'; -import { escapeRegExp } from 'lodash'; import { joinPaths } from '../lib/utils/url_utility'; import IndexPage from './pages/index.vue'; import TreePage from './pages/tree.vue'; diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js index 3050b628cd5..10c41315972 100644 --- a/app/assets/javascripts/search/index.js +++ b/app/assets/javascripts/search/index.js @@ -1,11 +1,11 @@ import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result'; +import { queryToObject } from '~/lib/utils/url_utility'; import Project from '~/pages/projects/project'; import refreshCounts from '~/pages/search/show/refresh_counts'; -import { queryToObject } from '~/lib/utils/url_utility'; -import createStore from './store'; -import { initTopbar } from './topbar'; import { initSidebar } from './sidebar'; import { initSearchSort } from './sort'; +import createStore from './store'; +import { initTopbar } from './topbar'; export const initSearchApp = () => { // Similar to url_utility.decodeUrlParameter diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue index e233d18b716..4640259314b 100644 --- a/app/assets/javascripts/search/sidebar/components/app.vue +++ b/app/assets/javascripts/search/sidebar/components/app.vue @@ -1,8 +1,8 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlButton, GlLink } from '@gitlab/ui'; -import StatusFilter from './status_filter.vue'; +import { mapActions, mapState } from 'vuex'; import ConfidentialityFilter from './confidentiality_filter.vue'; +import StatusFilter from './status_filter.vue'; export default { name: 'GlobalSearchSidebar', diff --git a/app/assets/javascripts/search/sidebar/components/radio_filter.vue b/app/assets/javascripts/search/sidebar/components/radio_filter.vue index b27c4e26fb5..73911b9d319 100644 --- a/app/assets/javascripts/search/sidebar/components/radio_filter.vue +++ b/app/assets/javascripts/search/sidebar/components/radio_filter.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlFormRadioGroup, GlFormRadio } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { sprintf, s__ } from '~/locale'; export default { diff --git a/app/assets/javascripts/search/sort/components/app.vue b/app/assets/javascripts/search/sort/components/app.vue index 6ce76467c1e..e4eba655e39 100644 --- a/app/assets/javascripts/search/sort/components/app.vue +++ b/app/assets/javascripts/search/sort/components/app.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlButtonGroup, GlButton, @@ -7,6 +6,7 @@ import { GlDropdownItem, GlTooltipDirective, } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { SORT_DIRECTION_UI } from '../constants'; export default { diff --git a/app/assets/javascripts/search/store/actions.js b/app/assets/javascripts/search/store/actions.js index bdfe966d990..0af679644f3 100644 --- a/app/assets/javascripts/search/store/actions.js +++ b/app/assets/javascripts/search/store/actions.js @@ -1,7 +1,7 @@ import Api from '~/api'; import createFlash from '~/flash'; -import { __ } from '~/locale'; import { visitUrl, setUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; import * as types from './mutation_types'; export const fetchGroups = ({ commit }, search) => { diff --git a/app/assets/javascripts/search/topbar/components/app.vue b/app/assets/javascripts/search/topbar/components/app.vue index 639cff591c3..987735ed811 100644 --- a/app/assets/javascripts/search/topbar/components/app.vue +++ b/app/assets/javascripts/search/topbar/components/app.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlForm, GlSearchBoxByType, GlButton } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import GroupFilter from './group_filter.vue'; import ProjectFilter from './project_filter.vue'; diff --git a/app/assets/javascripts/search/topbar/components/group_filter.vue b/app/assets/javascripts/search/topbar/components/group_filter.vue index 39555ce4fd3..2acab4e805d 100644 --- a/app/assets/javascripts/search/topbar/components/group_filter.vue +++ b/app/assets/javascripts/search/topbar/components/group_filter.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { isEmpty } from 'lodash'; +import { mapState, mapActions } from 'vuex'; import { visitUrl, setUrlParams } from '~/lib/utils/url_utility'; import { ANY_OPTION, GROUP_DATA, PROJECT_DATA } from '../constants'; import SearchableDropdown from './searchable_dropdown.vue'; diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 7ccec640c20..9c133a79607 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import { escape, throttle } from 'lodash'; -import { s__, __, sprintf } from '~/locale'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { getIdenticonBackgroundClass, getIdenticonTitle } from '~/helpers/avatar_helper'; +import { s__, __, sprintf } from '~/locale'; import Tracking from '~/tracking'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import axios from './lib/utils/axios_utils'; import { isInGroupsPage, diff --git a/app/assets/javascripts/search_settings/mount.js b/app/assets/javascripts/search_settings/mount.js index 260c793a769..b1086f9ca1f 100644 --- a/app/assets/javascripts/search_settings/mount.js +++ b/app/assets/javascripts/search_settings/mount.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import { expandSection, closeSection, isExpanded } from '~/settings_panels'; import SearchSettings from '~/search_settings/components/search_settings.vue'; +import { expandSection, closeSection, isExpanded } from '~/settings_panels'; const mountSearch = ({ el }) => new Vue({ diff --git a/app/assets/javascripts/security_configuration/components/configuration_table.vue b/app/assets/javascripts/security_configuration/components/configuration_table.vue index 2d9e8e63826..9475cc1781f 100644 --- a/app/assets/javascripts/security_configuration/components/configuration_table.vue +++ b/app/assets/javascripts/security_configuration/components/configuration_table.vue @@ -9,9 +9,9 @@ import { REPORT_TYPE_COVERAGE_FUZZING, REPORT_TYPE_LICENSE_COMPLIANCE, } from '~/vue_shared/security_reports/constants'; +import { features } from './features_constants'; import ManageSast from './manage_sast.vue'; import Upgrade from './upgrade.vue'; -import { features } from './features_constants'; const borderClasses = 'gl-border-b-1! gl-border-b-solid! gl-border-gray-100!'; const thClass = `gl-text-gray-900 gl-bg-transparent! ${borderClasses}`; diff --git a/app/assets/javascripts/security_configuration/components/features_constants.js b/app/assets/javascripts/security_configuration/components/features_constants.js index c21c18fbf60..d846a2761d9 100644 --- a/app/assets/javascripts/security_configuration/components/features_constants.js +++ b/app/assets/javascripts/security_configuration/components/features_constants.js @@ -1,5 +1,5 @@ -import { s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { s__ } from '~/locale'; import { REPORT_TYPE_SAST, diff --git a/app/assets/javascripts/security_configuration/components/manage_sast.vue b/app/assets/javascripts/security_configuration/components/manage_sast.vue index 49bd3ba64e5..5169096d563 100644 --- a/app/assets/javascripts/security_configuration/components/manage_sast.vue +++ b/app/assets/javascripts/security_configuration/components/manage_sast.vue @@ -1,8 +1,8 @@ <script> import { GlButton } from '@gitlab/ui'; -import configureSastMutation from '~/security_configuration/graphql/configure_sast.mutation.graphql'; import { redirectTo } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; +import configureSastMutation from '~/security_configuration/graphql/configure_sast.mutation.graphql'; export default { components: { diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue index f63fb8228d4..9b7264e92ce 100644 --- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue +++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue @@ -1,11 +1,11 @@ <script> /* eslint-disable vue/no-v-html */ -import Vue from 'vue'; import { GlFormGroup, GlButton, GlModal, GlToast, GlToggle } from '@gitlab/ui'; +import Vue from 'vue'; import { mapState, mapActions } from 'vuex'; -import { __, s__, sprintf } from '~/locale'; -import { visitUrl, getBaseURL } from '~/lib/utils/url_utility'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; +import { visitUrl, getBaseURL } from '~/lib/utils/url_utility'; +import { __, s__, sprintf } from '~/locale'; Vue.use(GlToast); diff --git a/app/assets/javascripts/self_monitor/index.js b/app/assets/javascripts/self_monitor/index.js index 7db87b4c627..384b73e528e 100644 --- a/app/assets/javascripts/self_monitor/index.js +++ b/app/assets/javascripts/self_monitor/index.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import store from './store'; import SelfMonitorForm from './components/self_monitor_form.vue'; +import store from './store'; export default () => { const el = document.querySelector('.js-self-monitoring-settings'); diff --git a/app/assets/javascripts/self_monitor/store/actions.js b/app/assets/javascripts/self_monitor/store/actions.js index 99731309a62..670ee547b02 100644 --- a/app/assets/javascripts/self_monitor/store/actions.js +++ b/app/assets/javascripts/self_monitor/store/actions.js @@ -1,7 +1,7 @@ -import { __, s__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; +import statusCodes from '~/lib/utils/http_status'; +import { __, s__ } from '~/locale'; import * as types from './mutation_types'; const TWO_MINUTES = 120000; diff --git a/app/assets/javascripts/self_monitor/store/index.js b/app/assets/javascripts/self_monitor/store/index.js index 1144fff759a..187c3bdd803 100644 --- a/app/assets/javascripts/self_monitor/store/index.js +++ b/app/assets/javascripts/self_monitor/store/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/sentry/sentry_config.js b/app/assets/javascripts/sentry/sentry_config.js index 631d5448d1e..4277ffec545 100644 --- a/app/assets/javascripts/sentry/sentry_config.js +++ b/app/assets/javascripts/sentry/sentry_config.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import * as Sentry from '~/sentry/wrapper'; import { __ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; const IGNORE_ERRORS = [ // Random plugins/extensions diff --git a/app/assets/javascripts/serverless/components/function_details.vue b/app/assets/javascripts/serverless/components/function_details.vue index 6ab44eec5cd..d2306c2d8bd 100644 --- a/app/assets/javascripts/serverless/components/function_details.vue +++ b/app/assets/javascripts/serverless/components/function_details.vue @@ -1,10 +1,10 @@ <script> import { isString } from 'lodash'; import { mapState, mapActions, mapGetters } from 'vuex'; -import PodBox from './pod_box.vue'; -import Url from './url.vue'; import AreaChart from './area.vue'; import MissingPrometheus from './missing_prometheus.vue'; +import PodBox from './pod_box.vue'; +import Url from './url.vue'; export default { components: { diff --git a/app/assets/javascripts/serverless/components/function_row.vue b/app/assets/javascripts/serverless/components/function_row.vue index aea38b54062..fab9c0a75e7 100644 --- a/app/assets/javascripts/serverless/components/function_row.vue +++ b/app/assets/javascripts/serverless/components/function_row.vue @@ -1,7 +1,7 @@ <script> import { isString } from 'lodash'; -import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { visitUrl } from '~/lib/utils/url_utility'; +import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import Url from './url.vue'; export default { diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue index 19a3c3decd2..b2d7aa75051 100644 --- a/app/assets/javascripts/serverless/components/functions.vue +++ b/app/assets/javascripts/serverless/components/functions.vue @@ -1,10 +1,10 @@ <script> -import { mapState, mapActions, mapGetters } from 'vuex'; import { GlLink, GlLoadingIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { mapState, mapActions, mapGetters } from 'vuex'; import { sprintf, s__ } from '~/locale'; import { CHECKING_INSTALLED } from '../constants'; -import EnvironmentRow from './environment_row.vue'; import EmptyState from './empty_state.vue'; +import EnvironmentRow from './environment_row.vue'; export default { components: { diff --git a/app/assets/javascripts/serverless/serverless_bundle.js b/app/assets/javascripts/serverless/serverless_bundle.js index 24a9b4ac521..e8d87a40fc7 100644 --- a/app/assets/javascripts/serverless/serverless_bundle.js +++ b/app/assets/javascripts/serverless/serverless_bundle.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import Functions from './components/functions.vue'; import FunctionDetails from './components/function_details.vue'; +import Functions from './components/functions.vue'; import { createStore } from './store'; export default class Serverless { diff --git a/app/assets/javascripts/serverless/store/actions.js b/app/assets/javascripts/serverless/store/actions.js index 27d476dc53e..a6c0380a789 100644 --- a/app/assets/javascripts/serverless/store/actions.js +++ b/app/assets/javascripts/serverless/store/actions.js @@ -1,7 +1,7 @@ +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import statusCodes from '~/lib/utils/http_status'; import { __ } from '~/locale'; import { MAX_REQUESTS, CHECKING_INSTALLED, TIMEOUT } from '../constants'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/serverless/survey_banner.vue b/app/assets/javascripts/serverless/survey_banner.vue index 18ab8315840..c48c294c0f7 100644 --- a/app/assets/javascripts/serverless/survey_banner.vue +++ b/app/assets/javascripts/serverless/survey_banner.vue @@ -1,6 +1,6 @@ <script> -import Cookies from 'js-cookie'; import { GlBanner } from '@gitlab/ui'; +import Cookies from 'js-cookie'; import { parseBoolean } from '~/lib/utils/common_utils'; export default { diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index a2b2fbddde7..639cc8a72ef 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -1,14 +1,14 @@ <script> /* eslint-disable vue/no-v-html */ +import { GlToast, GlModal, GlTooltipDirective, GlIcon, GlFormCheckbox } from '@gitlab/ui'; import $ from 'jquery'; import Vue from 'vue'; -import { GlToast, GlModal, GlTooltipDirective, GlIcon, GlFormCheckbox } from '@gitlab/ui'; import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete'; +import * as Emoji from '~/emoji'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { __, s__ } from '~/locale'; import { updateUserStatus } from '~/rest_api'; -import * as Emoji from '~/emoji'; -import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import EmojiMenuInModal from './emoji_menu_in_modal'; import { isUserBusy, isValidAvailibility } from './utils'; diff --git a/app/assets/javascripts/shared/milestones/form.js b/app/assets/javascripts/shared/milestones/form.js index 9ee02f923d5..467cd321fb8 100644 --- a/app/assets/javascripts/shared/milestones/form.js +++ b/app/assets/javascripts/shared/milestones/form.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import ZenMode from '../../zen_mode'; import DueDateSelectors from '../../due_date_select'; import GLForm from '../../gl_form'; +import ZenMode from '../../zen_mode'; export default (initGFM = true) => { new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue index 0eee287e0c2..ca86d6c6c3e 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue @@ -1,7 +1,7 @@ <script> +import actionCable from '~/actioncable_consumer'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import query from '~/issuable_sidebar/queries/issue_sidebar.query.graphql'; -import actionCable from '~/actioncable_consumer'; export default { subscription: null, diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue index 1fd7514b513..9b0d2228395 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue @@ -1,10 +1,10 @@ <script> +import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import Store from '~/sidebar/stores/sidebar_store'; -import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { __ } from '~/locale'; import AssigneeTitle from './assignee_title.vue'; import Assignees from './assignees.vue'; import AssigneesRealtime from './assignees_realtime.vue'; diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue index ce120ff82f3..57b3705e803 100644 --- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue +++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { __, sprintf } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import EditForm from './edit_form.vue'; diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue index d210f9efcb3..154a228c978 100644 --- a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue @@ -1,9 +1,9 @@ <script> -import $ from 'jquery'; import { GlButton } from '@gitlab/ui'; +import $ from 'jquery'; import { mapActions } from 'vuex'; -import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import eventHub from '../../event_hub'; export default { diff --git a/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue b/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue index e01e1f032e3..c9b6616e067 100644 --- a/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue +++ b/app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue @@ -3,13 +3,13 @@ import $ from 'jquery'; import { camelCase, difference, union } from 'lodash'; import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql'; import createFlash from '~/flash'; +import { getIdFromGraphQLId, MutationOperationMode } from '~/graphql_shared/utils'; import { IssuableType } from '~/issue_show/constants'; import { __ } from '~/locale'; import updateMergeRequestLabelsMutation from '~/sidebar/queries/update_merge_request_labels.mutation.graphql'; import { toLabelGid } from '~/sidebar/utils'; import { DropdownVariant } from '~/vue_shared/components/sidebar/labels_select_vue/constants'; import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; -import { getIdFromGraphQLId, MutationOperationMode } from '~/graphql_shared/utils'; const mutationMap = { [IssuableType.Issue]: { diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue index 6439536a6b4..c3f31a3d220 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlButton } from '@gitlab/ui'; +import $ from 'jquery'; import { mapActions } from 'vuex'; import { deprecatedCreateFlash as Flash } from '~/flash'; import { __, sprintf } from '../../../locale'; diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue index b96a2b93712..3468acb38e7 100644 --- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue +++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; import { __ } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import editForm from './edit_form.vue'; diff --git a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue index 4bfae2dfffa..b5cf5df4957 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/sidebar_reviewers.vue @@ -1,12 +1,12 @@ <script> // NOTE! For the first iteration, we are simply copying the implementation of Assignees // It will soon be overhauled in Issue https://gitlab.com/gitlab-org/gitlab/-/issues/233736 -import { deprecatedCreateFlash as Flash } from '~/flash'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; +import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import eventHub from '~/sidebar/event_hub'; import Store from '~/sidebar/stores/sidebar_store'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { __ } from '~/locale'; import ReviewerTitle from './reviewer_title.vue'; import Reviewers from './reviewers.vue'; diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue index ee1c98e9d69..3ad097138a3 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue @@ -1,7 +1,7 @@ <script> -import Store from '../../stores/sidebar_store'; import { deprecatedCreateFlash as Flash } from '../../../flash'; import { __ } from '../../../locale'; +import Store from '../../stores/sidebar_store'; import subscriptions from './subscriptions.vue'; export default { diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue index f66c2540a9e..c70d99ac178 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue @@ -4,9 +4,9 @@ import { intersection } from 'lodash'; import '~/smart_interval'; -import Store from '../../stores/sidebar_store'; -import Mediator from '../../sidebar_mediator'; import eventHub from '../../event_hub'; +import Mediator from '../../sidebar_mediator'; +import Store from '../../stores/sidebar_store'; import IssuableTimeTracker from './time_tracker.vue'; export default { diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index 6d36d16965f..4c095006dd7 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -2,10 +2,10 @@ import { GlIcon } from '@gitlab/ui'; import { s__, __ } from '~/locale'; import eventHub from '../../event_hub'; -import TimeTrackingHelpState from './help_state.vue'; import TimeTrackingCollapsedState from './collapsed_state.vue'; -import TimeTrackingSpentOnlyPane from './spent_only_pane.vue'; import TimeTrackingComparisonPane from './comparison_pane.vue'; +import TimeTrackingHelpState from './help_state.vue'; +import TimeTrackingSpentOnlyPane from './spent_only_pane.vue'; export default { name: 'IssuableTimeTracker', diff --git a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js index 55847fc43f0..21cd24b0842 100644 --- a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js +++ b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { escape } from 'lodash'; -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; function isValidProjectId(id) { return id > 0; diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js index 1af52529be9..bc019f09c85 100644 --- a/app/assets/javascripts/sidebar/mount_sidebar.js +++ b/app/assets/javascripts/sidebar/mount_sidebar.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; +import createFlash from '~/flash'; import createDefaultClient from '~/lib/graphql'; import { isInIssuePage, @@ -8,20 +9,19 @@ import { isInIncidentPage, parseBoolean, } from '~/lib/utils/common_utils'; -import createFlash from '~/flash'; import { __ } from '~/locale'; import Translate from '../vue_shared/translate'; -import SidebarTimeTracking from './components/time_tracking/sidebar_time_tracking.vue'; import SidebarAssignees from './components/assignees/sidebar_assignees.vue'; -import SidebarLabels from './components/labels/sidebar_labels.vue'; -import SidebarReviewers from './components/reviewers/sidebar_reviewers.vue'; import ConfidentialIssueSidebar from './components/confidential/confidential_issue_sidebar.vue'; -import SidebarMoveIssue from './lib/sidebar_move_issue'; +import CopyEmailToClipboard from './components/copy_email_to_clipboard.vue'; +import SidebarLabels from './components/labels/sidebar_labels.vue'; import IssuableLockForm from './components/lock/issuable_lock_form.vue'; import sidebarParticipants from './components/participants/sidebar_participants.vue'; -import sidebarSubscriptions from './components/subscriptions/sidebar_subscriptions.vue'; +import SidebarReviewers from './components/reviewers/sidebar_reviewers.vue'; import SidebarSeverity from './components/severity/sidebar_severity.vue'; -import CopyEmailToClipboard from './components/copy_email_to_clipboard.vue'; +import sidebarSubscriptions from './components/subscriptions/sidebar_subscriptions.vue'; +import SidebarTimeTracking from './components/time_tracking/sidebar_time_tracking.vue'; +import SidebarMoveIssue from './lib/sidebar_move_issue'; Vue.use(Translate); Vue.use(VueApollo); diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js index eef9a22cce5..f31e4a3e0dd 100644 --- a/app/assets/javascripts/sidebar/services/sidebar_service.js +++ b/app/assets/javascripts/sidebar/services/sidebar_service.js @@ -1,7 +1,7 @@ import sidebarDetailsQuery from 'ee_else_ce/sidebar/queries/sidebarDetails.query.graphql'; -import axios from '~/lib/utils/axios_utils'; -import createGqClient, { fetchPolicies } from '~/lib/graphql'; import { convertToGraphQLId } from '~/graphql_shared/utils'; +import createGqClient, { fetchPolicies } from '~/lib/graphql'; +import axios from '~/lib/utils/axios_utils'; import reviewerRereviewMutation from '../queries/reviewer_rereview.mutation.graphql'; export const gqClient = createGqClient( diff --git a/app/assets/javascripts/sidebar/sidebar_bundle.js b/app/assets/javascripts/sidebar/sidebar_bundle.js index 377846db70e..063e3313a3c 100644 --- a/app/assets/javascripts/sidebar/sidebar_bundle.js +++ b/app/assets/javascripts/sidebar/sidebar_bundle.js @@ -1,5 +1,5 @@ -import Mediator from './sidebar_mediator'; import { mountSidebar, getSidebarOptions } from './mount_sidebar'; +import Mediator from './sidebar_mediator'; export default () => { const mediator = new Mediator(getSidebarOptions()); diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js index c4fe1be83fc..bd382ed0fdb 100644 --- a/app/assets/javascripts/sidebar/sidebar_mediator.js +++ b/app/assets/javascripts/sidebar/sidebar_mediator.js @@ -1,8 +1,8 @@ import Store from 'ee_else_ce/sidebar/stores/sidebar_store'; -import toast from '~/vue_shared/plugins/global_toast'; import { __ } from '~/locale'; -import { visitUrl } from '../lib/utils/url_utility'; +import toast from '~/vue_shared/plugins/global_toast'; import { deprecatedCreateFlash as Flash } from '../flash'; +import { visitUrl } from '../lib/utils/url_utility'; import Service from './services/sidebar_service'; export default class SidebarMediator { diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index 5b40140a232..687289b6675 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -2,11 +2,11 @@ import $ from 'jquery'; import { spriteIcon } from '~/lib/utils/common_utils'; -import { __ } from './locale'; -import axios from './lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from './flash'; import FilesCommentButton from './files_comment_button'; +import { deprecatedCreateFlash as createFlash } from './flash'; import initImageDiffHelper from './image_diff/helpers/init_image_diff'; +import axios from './lib/utils/axios_utils'; +import { __ } from './locale'; import syntaxHighlight from './syntax_highlight'; const WRAPPER = '<div class="diff-content"></div>'; diff --git a/app/assets/javascripts/snippet/snippet_edit.js b/app/assets/javascripts/snippet/snippet_edit.js index 88677ddd15f..4fbd0b987fe 100644 --- a/app/assets/javascripts/snippet/snippet_edit.js +++ b/app/assets/javascripts/snippet/snippet_edit.js @@ -1,6 +1,6 @@ -import ZenMode from '~/zen_mode'; -import SnippetsEdit from '~/snippets/components/edit.vue'; import SnippetsAppFactory from '~/snippets'; +import SnippetsEdit from '~/snippets/components/edit.vue'; +import ZenMode from '~/zen_mode'; SnippetsAppFactory(document.getElementById('js-snippet-edit'), SnippetsEdit); new ZenMode(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/snippet/snippet_show.js b/app/assets/javascripts/snippet/snippet_show.js index caa76fc9988..22dffa90cef 100644 --- a/app/assets/javascripts/snippet/snippet_show.js +++ b/app/assets/javascripts/snippet/snippet_show.js @@ -1,7 +1,7 @@ -import initNotes from '~/init_notes'; import loadAwardsHandler from '~/awards_handler'; -import SnippetsShow from '~/snippets/components/show.vue'; +import initNotes from '~/init_notes'; import SnippetsAppFactory from '~/snippets'; +import SnippetsShow from '~/snippets/components/show.vue'; import ZenMode from '~/zen_mode'; SnippetsAppFactory(document.getElementById('js-snippet-view'), SnippetsShow); diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue index 4acfcd2a4d6..9f43ac36df7 100644 --- a/app/assets/javascripts/snippets/components/edit.vue +++ b/app/assets/javascripts/snippets/components/edit.vue @@ -1,28 +1,28 @@ <script> import { GlButton, GlLoadingIcon } from '@gitlab/ui'; +import eventHub from '~/blob/components/eventhub'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import { __, sprintf } from '~/locale'; -import TitleField from '~/vue_shared/components/form/title.vue'; import { redirectTo, joinPaths } from '~/lib/utils/url_utility'; -import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue'; +import { __, sprintf } from '~/locale'; import { SNIPPET_MARK_EDIT_APP_START, SNIPPET_MEASURE_BLOBS_CONTENT, } from '~/performance/constants'; -import eventHub from '~/blob/components/eventhub'; import { performanceMarkAndMeasure } from '~/performance/utils'; +import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue'; +import TitleField from '~/vue_shared/components/form/title.vue'; -import UpdateSnippetMutation from '../mutations/updateSnippet.mutation.graphql'; -import CreateSnippetMutation from '../mutations/createSnippet.mutation.graphql'; -import { getSnippetMixin } from '../mixins/snippets'; import { SNIPPET_CREATE_MUTATION_ERROR, SNIPPET_UPDATE_MUTATION_ERROR } from '../constants'; +import { getSnippetMixin } from '../mixins/snippets'; +import CreateSnippetMutation from '../mutations/createSnippet.mutation.graphql'; +import UpdateSnippetMutation from '../mutations/updateSnippet.mutation.graphql'; import { markBlobPerformance } from '../utils/blob'; import { getErrorMessage } from '../utils/error'; import SnippetBlobActionsEdit from './snippet_blob_actions_edit.vue'; -import SnippetVisibilityEdit from './snippet_visibility_edit.vue'; import SnippetDescriptionEdit from './snippet_description_edit.vue'; +import SnippetVisibilityEdit from './snippet_visibility_edit.vue'; eventHub.$on(SNIPPET_MEASURE_BLOBS_CONTENT, markBlobPerformance); diff --git a/app/assets/javascripts/snippets/components/embed_dropdown.vue b/app/assets/javascripts/snippets/components/embed_dropdown.vue index a5d2c337d67..f6c9c569b5f 100644 --- a/app/assets/javascripts/snippets/components/embed_dropdown.vue +++ b/app/assets/javascripts/snippets/components/embed_dropdown.vue @@ -1,5 +1,4 @@ <script> -import { escape as esc } from 'lodash'; import { GlButton, GlDropdown, @@ -8,6 +7,7 @@ import { GlFormInputGroup, GlTooltipDirective, } from '@gitlab/ui'; +import { escape as esc } from 'lodash'; import { __ } from '~/locale'; const MSG_EMBED = __('Embed'); diff --git a/app/assets/javascripts/snippets/components/show.vue b/app/assets/javascripts/snippets/components/show.vue index 63257785e9d..46629a569ec 100644 --- a/app/assets/javascripts/snippets/components/show.vue +++ b/app/assets/javascripts/snippets/components/show.vue @@ -1,20 +1,20 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; -import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue'; -import { SNIPPET_VISIBILITY_PUBLIC } from '~/snippets/constants'; +import eventHub from '~/blob/components/eventhub'; import { SNIPPET_MARK_VIEW_APP_START, SNIPPET_MEASURE_BLOBS_CONTENT, } from '~/performance/constants'; import { performanceMarkAndMeasure } from '~/performance/utils'; -import eventHub from '~/blob/components/eventhub'; +import { SNIPPET_VISIBILITY_PUBLIC } from '~/snippets/constants'; +import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue'; import { getSnippetMixin } from '../mixins/snippets'; import { markBlobPerformance } from '../utils/blob'; +import EmbedDropdown from './embed_dropdown.vue'; import SnippetBlob from './snippet_blob_view.vue'; -import SnippetTitle from './snippet_title.vue'; import SnippetHeader from './snippet_header.vue'; -import EmbedDropdown from './embed_dropdown.vue'; +import SnippetTitle from './snippet_title.vue'; eventHub.$on(SNIPPET_MEASURE_BLOBS_CONTENT, markBlobPerformance); diff --git a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue index c8545e334a6..4fb27397039 100644 --- a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue +++ b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue @@ -1,12 +1,12 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue'; -import EditorLite from '~/vue_shared/components/editor_lite.vue'; -import { getBaseURL, joinPaths } from '~/lib/utils/url_utility'; -import axios from '~/lib/utils/axios_utils'; -import { SNIPPET_BLOB_CONTENT_FETCH_ERROR } from '~/snippets/constants'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { getBaseURL, joinPaths } from '~/lib/utils/url_utility'; import { sprintf } from '~/locale'; +import { SNIPPET_BLOB_CONTENT_FETCH_ERROR } from '~/snippets/constants'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; export default { components: { diff --git a/app/assets/javascripts/snippets/components/snippet_blob_view.vue b/app/assets/javascripts/snippets/components/snippet_blob_view.vue index 816a7842dda..27b3a30b40a 100644 --- a/app/assets/javascripts/snippets/components/snippet_blob_view.vue +++ b/app/assets/javascripts/snippets/components/snippet_blob_view.vue @@ -1,8 +1,8 @@ <script> import GetBlobContent from 'shared_queries/snippet/snippet_blob_content.query.graphql'; -import BlobHeader from '~/blob/components/blob_header.vue'; import BlobContent from '~/blob/components/blob_content.vue'; +import BlobHeader from '~/blob/components/blob_header.vue'; import { SIMPLE_BLOB_VIEWER, diff --git a/app/assets/javascripts/snippets/components/snippet_description_edit.vue b/app/assets/javascripts/snippets/components/snippet_description_edit.vue index 5e6caf27bdd..bac423f6838 100644 --- a/app/assets/javascripts/snippets/components/snippet_description_edit.vue +++ b/app/assets/javascripts/snippets/components/snippet_description_edit.vue @@ -1,7 +1,7 @@ <script> import { GlFormInput } from '@gitlab/ui'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import setupCollapsibleInputs from '~/snippet/collapsible_input'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; export default { components: { diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index 65df2464dc5..bf19b63650e 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -11,13 +11,13 @@ import { GlButton, GlTooltipDirective, } from '@gitlab/ui'; -import CanCreatePersonalSnippet from 'shared_queries/snippet/user_permissions.query.graphql'; import CanCreateProjectSnippet from 'shared_queries/snippet/project_permissions.query.graphql'; +import CanCreatePersonalSnippet from 'shared_queries/snippet/user_permissions.query.graphql'; +import { fetchPolicies } from '~/lib/graphql'; +import { joinPaths } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import { joinPaths } from '~/lib/utils/url_utility'; -import { fetchPolicies } from '~/lib/graphql'; import DeleteSnippetMutation from '../mutations/deleteSnippet.mutation.graphql'; export default { diff --git a/app/assets/javascripts/snippets/index.js b/app/assets/javascripts/snippets/index.js index 853ccb0c2fe..789332ce5b7 100644 --- a/app/assets/javascripts/snippets/index.js +++ b/app/assets/javascripts/snippets/index.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import Translate from '~/vue_shared/translate'; import createDefaultClient from '~/lib/graphql'; import { SNIPPET_LEVELS_MAP, SNIPPET_VISIBILITY_PRIVATE } from '~/snippets/constants'; +import Translate from '~/vue_shared/translate'; Vue.use(VueApollo); Vue.use(Translate); diff --git a/app/assets/javascripts/snippets/utils/blob.js b/app/assets/javascripts/snippets/utils/blob.js index 49ebd79845f..2a3f590a803 100644 --- a/app/assets/javascripts/snippets/utils/blob.js +++ b/app/assets/javascripts/snippets/utils/blob.js @@ -1,6 +1,6 @@ import { uniqueId } from 'lodash'; -import { performanceMarkAndMeasure } from '~/performance/utils'; import { SNIPPET_MARK_BLOBS_CONTENT, SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; +import { performanceMarkAndMeasure } from '~/performance/utils'; import { SNIPPET_BLOB_ACTION_CREATE, SNIPPET_BLOB_ACTION_UPDATE, diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js index 232c97ecae0..eb3eaa66df5 100644 --- a/app/assets/javascripts/star.js +++ b/app/assets/javascripts/star.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { deprecatedCreateFlash as Flash } from './flash'; -import { __, s__ } from './locale'; -import { spriteIcon } from './lib/utils/common_utils'; import axios from './lib/utils/axios_utils'; +import { spriteIcon } from './lib/utils/common_utils'; +import { __, s__ } from './locale'; export default class Star { constructor(container = '.project-home-panel') { diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue index 3eed05a5915..a51a4f9f604 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_area.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue @@ -1,15 +1,15 @@ <script> -import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; import parseSourceFile from '~/static_site_editor/services/parse_source_file'; import { EDITOR_TYPES } from '~/vue_shared/components/rich_content_editor/constants'; +import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; import imageRepository from '../image_repository'; import formatter from '../services/formatter'; -import templater from '../services/templater'; import renderImage from '../services/renderers/render_image'; -import UnsavedChangesConfirmDialog from './unsaved_changes_confirm_dialog.vue'; +import templater from '../services/templater'; import EditDrawer from './edit_drawer.vue'; import EditHeader from './edit_header.vue'; import PublishToolbar from './publish_toolbar.vue'; +import UnsavedChangesConfirmDialog from './unsaved_changes_confirm_dialog.vue'; export default { components: { diff --git a/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue b/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue index 5ecb242f96a..8c3ee7b9609 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_meta_modal.vue @@ -1,7 +1,7 @@ <script> import { GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; import Api from '~/api'; +import { __, s__, sprintf } from '~/locale'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import { ISSUABLE_TYPE, MR_META_LOCAL_STORAGE_KEY } from '../constants'; diff --git a/app/assets/javascripts/static_site_editor/graphql/index.js b/app/assets/javascripts/static_site_editor/graphql/index.js index bce320ed805..23f800517c9 100644 --- a/app/assets/javascripts/static_site_editor/graphql/index.js +++ b/app/assets/javascripts/static_site_editor/graphql/index.js @@ -1,10 +1,10 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; -import typeDefs from './typedefs.graphql'; import fileResolver from './resolvers/file'; -import submitContentChangesResolver from './resolvers/submit_content_changes'; import hasSubmittedChangesResolver from './resolvers/has_submitted_changes'; +import submitContentChangesResolver from './resolvers/submit_content_changes'; +import typeDefs from './typedefs.graphql'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/static_site_editor/image_repository.js b/app/assets/javascripts/static_site_editor/image_repository.js index 56b2434d2e2..57f32ab4847 100644 --- a/app/assets/javascripts/static_site_editor/image_repository.js +++ b/app/assets/javascripts/static_site_editor/image_repository.js @@ -1,5 +1,5 @@ -import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import { getBinary } from './services/image_service'; const imageRepository = () => { diff --git a/app/assets/javascripts/static_site_editor/index.js b/app/assets/javascripts/static_site_editor/index.js index fbb14be21ba..985579f68e8 100644 --- a/app/assets/javascripts/static_site_editor/index.js +++ b/app/assets/javascripts/static_site_editor/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import App from './components/app.vue'; -import createRouter from './router'; import createApolloProvider from './graphql'; +import createRouter from './router'; const initStaticSiteEditor = (el) => { const { diff --git a/app/assets/javascripts/static_site_editor/pages/home.vue b/app/assets/javascripts/static_site_editor/pages/home.vue index 6c958cb2d22..22f80ead74b 100644 --- a/app/assets/javascripts/static_site_editor/pages/home.vue +++ b/app/assets/javascripts/static_site_editor/pages/home.vue @@ -2,16 +2,16 @@ import { deprecatedCreateFlash as createFlash } from '~/flash'; import Tracking from '~/tracking'; -import SkeletonLoader from '../components/skeleton_loader.vue'; import EditArea from '../components/edit_area.vue'; import EditMetaModal from '../components/edit_meta_modal.vue'; import InvalidContentMessage from '../components/invalid_content_message.vue'; +import SkeletonLoader from '../components/skeleton_loader.vue'; import SubmitChangesError from '../components/submit_changes_error.vue'; -import appDataQuery from '../graphql/queries/app_data.query.graphql'; -import sourceContentQuery from '../graphql/queries/source_content.query.graphql'; +import { LOAD_CONTENT_ERROR, TRACKING_ACTION_INITIALIZE_EDITOR } from '../constants'; import hasSubmittedChangesMutation from '../graphql/mutations/has_submitted_changes.mutation.graphql'; import submitContentChangesMutation from '../graphql/mutations/submit_content_changes.mutation.graphql'; -import { LOAD_CONTENT_ERROR, TRACKING_ACTION_INITIALIZE_EDITOR } from '../constants'; +import appDataQuery from '../graphql/queries/app_data.query.graphql'; +import sourceContentQuery from '../graphql/queries/source_content.query.graphql'; import { SUCCESS_ROUTE } from '../router/constants'; export default { diff --git a/app/assets/javascripts/static_site_editor/pages/success.vue b/app/assets/javascripts/static_site_editor/pages/success.vue index 1ee1a3b0edf..70e692a0c86 100644 --- a/app/assets/javascripts/static_site_editor/pages/success.vue +++ b/app/assets/javascripts/static_site_editor/pages/success.vue @@ -2,8 +2,8 @@ import { GlButton, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; import { s__, __, sprintf } from '~/locale'; -import savedContentMetaQuery from '../graphql/queries/saved_content_meta.query.graphql'; import appDataQuery from '../graphql/queries/app_data.query.graphql'; +import savedContentMetaQuery from '../graphql/queries/saved_content_meta.query.graphql'; import { HOME_ROUTE } from '../router/constants'; export default { diff --git a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js index 84e90deacfc..6391cfd6cc2 100644 --- a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js +++ b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js @@ -1,7 +1,7 @@ import Api from '~/api'; -import Tracking from '~/tracking'; import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils'; import generateBranchName from '~/static_site_editor/services/generate_branch_name'; +import Tracking from '~/tracking'; import { DEFAULT_TARGET_BRANCH, diff --git a/app/assets/javascripts/task_list.js b/app/assets/javascripts/task_list.js index 81d9d9d37a7..bc8a8e425dd 100644 --- a/app/assets/javascripts/task_list.js +++ b/app/assets/javascripts/task_list.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import 'deckar01-task_list'; import { __ } from '~/locale'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as Flash } from './flash'; +import axios from './lib/utils/axios_utils'; export default class TaskList { constructor(options = {}) { diff --git a/app/assets/javascripts/terminal/terminal.js b/app/assets/javascripts/terminal/terminal.js index 26cc538994f..468f9b54ee0 100644 --- a/app/assets/javascripts/terminal/terminal.js +++ b/app/assets/javascripts/terminal/terminal.js @@ -1,5 +1,5 @@ -import { throttle } from 'lodash'; import $ from 'jquery'; +import { throttle } from 'lodash'; import { Terminal } from 'xterm'; import * as fit from 'xterm/lib/addons/fit/fit'; import * as webLinks from 'xterm/lib/addons/webLinks/webLinks'; diff --git a/app/assets/javascripts/terraform/components/states_table.vue b/app/assets/javascripts/terraform/components/states_table.vue index 7c834a74bd7..e4b5a66c3fc 100644 --- a/app/assets/javascripts/terraform/components/states_table.vue +++ b/app/assets/javascripts/terraform/components/states_table.vue @@ -9,8 +9,8 @@ import { GlTable, GlTooltip, } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { s__ } from '~/locale'; import CiBadge from '~/vue_shared/components/ci_badge_link.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; diff --git a/app/assets/javascripts/terraform/components/states_table_actions.vue b/app/assets/javascripts/terraform/components/states_table_actions.vue index aa638be7351..65dcc430f9d 100644 --- a/app/assets/javascripts/terraform/components/states_table_actions.vue +++ b/app/assets/javascripts/terraform/components/states_table_actions.vue @@ -12,8 +12,8 @@ import { import { s__ } from '~/locale'; import addDataToState from '../graphql/mutations/add_data_to_state.mutation.graphql'; import lockState from '../graphql/mutations/lock_state.mutation.graphql'; -import unlockState from '../graphql/mutations/unlock_state.mutation.graphql'; import removeState from '../graphql/mutations/remove_state.mutation.graphql'; +import unlockState from '../graphql/mutations/unlock_state.mutation.graphql'; export default { components: { diff --git a/app/assets/javascripts/terraform/components/terraform_list.vue b/app/assets/javascripts/terraform/components/terraform_list.vue index ea533967ed9..a18f33ebb1f 100644 --- a/app/assets/javascripts/terraform/components/terraform_list.vue +++ b/app/assets/javascripts/terraform/components/terraform_list.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlBadge, GlKeysetPagination, GlLoadingIcon, GlTab, GlTabs } from '@gitlab/ui'; -import getStatesQuery from '../graphql/queries/get_states.query.graphql'; import { MAX_LIST_COUNT } from '../constants'; +import getStatesQuery from '../graphql/queries/get_states.query.graphql'; import EmptyState from './empty_state.vue'; import StatesTable from './states_table.vue'; diff --git a/app/assets/javascripts/toggle_buttons.js b/app/assets/javascripts/toggle_buttons.js index 2f933823842..03c975d5fe8 100644 --- a/app/assets/javascripts/toggle_buttons.js +++ b/app/assets/javascripts/toggle_buttons.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { deprecatedCreateFlash as Flash } from './flash'; -import { __ } from './locale'; import { parseBoolean } from './lib/utils/common_utils'; +import { __ } from './locale'; /* example HAML: diff --git a/app/assets/javascripts/tooltips/index.js b/app/assets/javascripts/tooltips/index.js index a4f74a63d81..a9978c03a6e 100644 --- a/app/assets/javascripts/tooltips/index.js +++ b/app/assets/javascripts/tooltips/index.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { toArray, isElement } from 'lodash'; +import Vue from 'vue'; import Tooltips from './components/tooltips.vue'; let app; diff --git a/app/assets/javascripts/usage_ping_consent.js b/app/assets/javascripts/usage_ping_consent.js index 94d476d13ae..3876aa62b75 100644 --- a/app/assets/javascripts/usage_ping_consent.js +++ b/app/assets/javascripts/usage_ping_consent.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import axios from './lib/utils/axios_utils'; import { deprecatedCreateFlash as Flash, hideFlash } from './flash'; +import axios from './lib/utils/axios_utils'; import { parseBoolean } from './lib/utils/common_utils'; import { __ } from './locale'; diff --git a/app/assets/javascripts/user_lists/components/edit_user_list.vue b/app/assets/javascripts/user_lists/components/edit_user_list.vue index d56c3d61027..18f411f6cf2 100644 --- a/app/assets/javascripts/user_lists/components/edit_user_list.vue +++ b/app/assets/javascripts/user_lists/components/edit_user_list.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__, sprintf } from '~/locale'; import statuses from '../constants/edit'; import UserListForm from './user_list_form.vue'; diff --git a/app/assets/javascripts/user_lists/components/new_user_list.vue b/app/assets/javascripts/user_lists/components/new_user_list.vue index 522e077fb25..17ef4c037d2 100644 --- a/app/assets/javascripts/user_lists/components/new_user_list.vue +++ b/app/assets/javascripts/user_lists/components/new_user_list.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlAlert } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__ } from '~/locale'; import UserListForm from './user_list_form.vue'; diff --git a/app/assets/javascripts/user_lists/components/user_list.vue b/app/assets/javascripts/user_lists/components/user_list.vue index 0e2b72c1423..e33a4b3ffb4 100644 --- a/app/assets/javascripts/user_lists/components/user_list.vue +++ b/app/assets/javascripts/user_lists/components/user_list.vue @@ -1,5 +1,4 @@ <script> -import { mapActions, mapState } from 'vuex'; import { GlAlert, GlButton, @@ -7,6 +6,7 @@ import { GlLoadingIcon, GlModalDirective as GlModal, } from '@gitlab/ui'; +import { mapActions, mapState } from 'vuex'; import { s__, __ } from '~/locale'; import { states, ADD_USER_MODAL_ID } from '../constants/show'; import AddUserModal from './add_user_modal.vue'; diff --git a/app/assets/javascripts/user_lists/store/edit/index.js b/app/assets/javascripts/user_lists/store/edit/index.js index 3b19b2b12ec..9b9df59ed32 100644 --- a/app/assets/javascripts/user_lists/store/edit/index.js +++ b/app/assets/javascripts/user_lists/store/edit/index.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default (initialState) => new Vuex.Store({ diff --git a/app/assets/javascripts/user_lists/store/new/index.js b/app/assets/javascripts/user_lists/store/new/index.js index 3b19b2b12ec..9b9df59ed32 100644 --- a/app/assets/javascripts/user_lists/store/new/index.js +++ b/app/assets/javascripts/user_lists/store/new/index.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default (initialState) => new Vuex.Store({ diff --git a/app/assets/javascripts/user_lists/store/show/index.js b/app/assets/javascripts/user_lists/store/show/index.js index 3b19b2b12ec..9b9df59ed32 100644 --- a/app/assets/javascripts/user_lists/store/show/index.js +++ b/app/assets/javascripts/user_lists/store/show/index.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import createState from './state'; import * as actions from './actions'; import mutations from './mutations'; +import createState from './state'; export default (initialState) => new Vuex.Store({ diff --git a/app/assets/javascripts/users_select/index.js b/app/assets/javascripts/users_select/index.js index 26d1d760454..951f512b784 100644 --- a/app/assets/javascripts/users_select/index.js +++ b/app/assets/javascripts/users_select/index.js @@ -10,11 +10,11 @@ import { } from 'ee_else_ce/users_select/constants'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; import { fixTitle, dispose } from '~/tooltips'; -import axios from '../lib/utils/axios_utils'; -import { s__, __, sprintf } from '../locale'; import ModalStore from '../boards/stores/modal_store'; +import axios from '../lib/utils/axios_utils'; import { parseBoolean, spriteIcon } from '../lib/utils/common_utils'; import { loadCSSFile } from '../lib/utils/css_utils'; +import { s__, __, sprintf } from '../locale'; import { getAjaxUsersSelectOptions, getAjaxUsersSelectParams } from './utils'; // TODO: remove eventHub hack after code splitting refactor diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue index 951dc108c51..a5b83167283 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue @@ -1,8 +1,8 @@ <script> import { GlButton } from '@gitlab/ui'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { s__ } from '~/locale'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; +import { s__ } from '~/locale'; import eventHub from '../../event_hub'; import approvalsMixin from '../../mixins/approvals'; import MrWidgetContainer from '../mr_widget_container.vue'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue index fb342a5d340..ea73ab416de 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue @@ -1,8 +1,8 @@ <script> -import { n__, sprintf } from '~/locale'; import { toNounSeriesText } from '~/lib/utils/grammar'; -import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; +import { n__, sprintf } from '~/locale'; import { APPROVED_MESSAGE } from '~/vue_merge_request_widget/components/approvals/messages'; +import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue index f497936e299..d79da9d3b90 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue @@ -1,7 +1,7 @@ <script> +import { MANUAL_DEPLOY, WILL_DEPLOY, CREATED } from './constants'; import DeploymentActions from './deployment_actions.vue'; import DeploymentInfo from './deployment_info.vue'; -import { MANUAL_DEPLOY, WILL_DEPLOY, CREATED } from './constants'; export default { // name: 'Deployment' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue index 215df8acece..513d88ecab6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue @@ -1,11 +1,9 @@ <script> -import { __, s__ } from '~/locale'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { visitUrl } from '~/lib/utils/url_utility'; +import { __, s__ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import MRWidgetService from '../../services/mr_widget_service'; -import DeploymentActionButton from './deployment_action_button.vue'; -import DeploymentViewButton from './deployment_view_button.vue'; import { MANUAL_DEPLOY, FAILED, @@ -15,6 +13,8 @@ import { REDEPLOYING, ACT_BUTTON_ICONS, } from './constants'; +import DeploymentActionButton from './deployment_action_button.vue'; +import DeploymentViewButton from './deployment_view_button.vue'; export default { name: 'DeploymentActions', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue index 390469dec24..cbace1ad57c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue @@ -3,7 +3,6 @@ import { GlLink, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import MemoryUsage from './memory_usage.vue'; import { MANUAL_DEPLOY, WILL_DEPLOY, @@ -13,6 +12,7 @@ import { CANCELED, SKIPPED, } from './constants'; +import MemoryUsage from './memory_usage.vue'; export default { name: 'DeploymentInfo', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue index 2f27216f2e9..410d2740e1d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue @@ -1,9 +1,9 @@ <script> import { GlLoadingIcon, GlSprintf, GlLink } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import { backOff } from '~/lib/utils/common_utils'; import statusCodes from '~/lib/utils/http_status'; import { bytesToMiB } from '~/lib/utils/number_utils'; -import { backOff } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import MemoryGraph from '~/vue_shared/components/memory_graph.vue'; import MRWidgetService from '../../services/mr_widget_service'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index 26693a8f51c..71ff0fe6fbd 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -1,6 +1,5 @@ <script> /* eslint-disable vue/no-v-html */ -import { escape } from 'lodash'; import { GlButton, GlDropdown, @@ -9,12 +8,13 @@ import { GlTooltipDirective, GlModalDirective, } from '@gitlab/ui'; -import { n__, s__, sprintf } from '~/locale'; +import { escape } from 'lodash'; import { mergeUrlParams, webIDEUrl } from '~/lib/utils/url_utility'; +import { n__, s__, sprintf } from '~/locale'; import clipboardButton from '~/vue_shared/components/clipboard_button.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; -import MrWidgetIcon from './mr_widget_icon.vue'; import MrWidgetHowToMergeModal from './mr_widget_how_to_merge_modal.vue'; +import MrWidgetIcon from './mr_widget_icon.vue'; export default { name: 'MRWidgetHeader', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue index 785e8ef8e8f..7c50df5f104 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable @gitlab/require-i18n-strings */ import { GlModal, GlLink, GlSprintf } from '@gitlab/ui'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { __ } from '~/locale'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; export default { i18n: { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index 8a7f726ad63..d022579ef54 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -11,8 +11,8 @@ import { } from '@gitlab/ui'; import mrWidgetPipelineMixin from 'ee_else_ce/vue_merge_request_widget/mixins/mr_widget_pipeline'; import { s__, n__ } from '~/locale'; -import PipelineStage from '~/pipelines/components/pipelines_list/stage.vue'; import PipelineArtifacts from '~/pipelines/components/pipelines_list/pipelines_artifacts.vue'; +import PipelineStage from '~/pipelines/components/pipelines_list/stage.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue index 9c16bf78c93..428641a1109 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue @@ -2,15 +2,15 @@ import { GlLoadingIcon, GlSkeletonLoader } from '@gitlab/ui'; import autoMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/auto_merge'; import autoMergeEnabledQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/auto_merge_enabled.query.graphql'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { __ } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import { __ } from '~/locale'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { deprecatedCreateFlash as Flash } from '../../../flash'; -import statusIcon from '../mr_widget_status_icon.vue'; -import MrWidgetAuthor from '../mr_widget_author.vue'; -import eventHub from '../../event_hub'; import { AUTO_MERGE_STRATEGIES } from '../../constants'; +import eventHub from '../../event_hub'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; +import MrWidgetAuthor from '../mr_widget_author.vue'; +import statusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetAutoMergeEnabled', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue index a2771bc4bfb..5f8630bf7b3 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -2,9 +2,9 @@ import { GlLoadingIcon, GlButton } from '@gitlab/ui'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import eventHub from '../../event_hub'; -import statusIcon from '../mr_widget_status_icon.vue'; -import autoMergeFailedQuery from '../../queries/states/auto_merge_failed.query.graphql'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; +import autoMergeFailedQuery from '../../queries/states/auto_merge_failed.query.graphql'; +import statusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetAutoMergeFailed', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue index 3d5daa4979b..2335e2984e4 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue @@ -1,14 +1,14 @@ <script> +import { GlButton, GlModalDirective, GlSkeletonLoader } from '@gitlab/ui'; import $ from 'jquery'; import { escape } from 'lodash'; -import { GlButton, GlModalDirective, GlSkeletonLoader } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; import { mouseenter, debouncedMouseleave, togglePopover } from '~/shared/popover'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; -import StatusIcon from '../mr_widget_status_icon.vue'; import userPermissionsQuery from '../../queries/permissions.query.graphql'; import conflictsStateQuery from '../../queries/states/conflicts.query.graphql'; +import StatusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetConflicts', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue index f411f91245d..e973a2350a3 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue @@ -1,9 +1,9 @@ <script> import { GlButton } from '@gitlab/ui'; -import { sprintf, s__, n__ } from '~/locale'; import { stripHtml } from '~/lib/utils/text_utility'; -import statusIcon from '../mr_widget_status_icon.vue'; +import { sprintf, s__, n__ } from '~/locale'; import eventHub from '../../event_hub'; +import statusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetFailedToMerge', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue index 25b268532f5..043d14e32a2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue @@ -3,12 +3,12 @@ import { GlLoadingIcon, GlButton, GlTooltipDirective } from '@gitlab/ui'; import { deprecatedCreateFlash as Flash } from '~/flash'; import { s__, __ } from '~/locale'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import modalEventHub from '~/projects/commit/event_hub'; import { OPEN_REVERT_MODAL, OPEN_CHERRY_PICK_MODAL } from '~/projects/commit/constants'; +import modalEventHub from '~/projects/commit/event_hub'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import eventHub from '../../event_hub'; import MrWidgetAuthorTime from '../mr_widget_author_time.vue'; import statusIcon from '../mr_widget_status_icon.vue'; -import eventHub from '../../event_hub'; export default { name: 'MRWidgetMerged', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue index 0a87edb0c89..f91350d4a82 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue @@ -2,9 +2,9 @@ import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { sprintf, s__ } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import statusIcon from '../mr_widget_status_icon.vue'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; import missingBranchQuery from '../../queries/states/missing_branch.query.graphql'; +import statusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetMissingBranch', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index 6d66a45f382..99aa8395f3d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -4,12 +4,12 @@ import { GlButton, GlSkeletonLoader } from '@gitlab/ui'; import { escape } from 'lodash'; import { __, sprintf } from '~/locale'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { deprecatedCreateFlash as Flash } from '../../../flash'; import simplePoll from '../../../lib/utils/simple_poll'; import eventHub from '../../event_hub'; -import statusIcon from '../mr_widget_status_icon.vue'; -import rebaseQuery from '../../queries/states/rebase.query.graphql'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; -import { deprecatedCreateFlash as Flash } from '../../../flash'; +import rebaseQuery from '../../queries/states/rebase.query.graphql'; +import statusIcon from '../mr_widget_status_icon.vue'; export default { name: 'MRWidgetRebase', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue index c5ab13a7432..b5d2f91c637 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue @@ -1,7 +1,7 @@ <script> import { GlLink, GlSprintf } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; +import { s__ } from '~/locale'; import statusIcon from '../mr_widget_status_icon.vue'; export default { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue index f430bf80cbb..690b6e9c462 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -1,5 +1,4 @@ <script> -import { isEmpty } from 'lodash'; import { GlIcon, GlButton, @@ -11,23 +10,24 @@ import { GlTooltipDirective, GlSkeletonLoader, } from '@gitlab/ui'; +import { isEmpty } from 'lodash'; import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge'; import readyToMergeQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/ready_to_merge.query.graphql'; +import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import simplePoll from '~/lib/utils/simple_poll'; import { __ } from '~/locale'; -import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { deprecatedCreateFlash as Flash } from '../../../flash'; import MergeRequest from '../../../merge_request'; +import { AUTO_MERGE_STRATEGIES, DANGER, INFO, WARNING } from '../../constants'; +import eventHub from '../../event_hub'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; -import { deprecatedCreateFlash as Flash } from '../../../flash'; import MergeRequestStore from '../../stores/mr_widget_store'; import statusIcon from '../mr_widget_status_icon.vue'; -import eventHub from '../../event_hub'; -import { AUTO_MERGE_STRATEGIES, DANGER, INFO, WARNING } from '../../constants'; -import SquashBeforeMerge from './squash_before_merge.vue'; -import CommitsHeader from './commits_header.vue'; import CommitEdit from './commit_edit.vue'; import CommitMessageDropdown from './commit_message_dropdown.vue'; +import CommitsHeader from './commits_header.vue'; +import SquashBeforeMerge from './squash_before_merge.vue'; const PIPELINE_RUNNING_STATE = 'running'; const PIPELINE_FAILED_STATE = 'failed'; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index 3f1db815f95..af305815381 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -1,17 +1,17 @@ <script> -import $ from 'jquery'; import { GlButton } from '@gitlab/ui'; import { produce } from 'immer'; -import { __ } from '~/locale'; +import $ from 'jquery'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { __ } from '~/locale'; import MergeRequest from '~/merge_request'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import eventHub from '../../event_hub'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; import getStateQuery from '../../queries/get_state.query.graphql'; import workInProgressQuery from '../../queries/states/work_in_progress.query.graphql'; import removeWipMutation from '../../queries/toggle_wip.mutation.graphql'; import StatusIcon from '../mr_widget_status_icon.vue'; -import eventHub from '../../event_hub'; export default { name: 'WorkInProgress', diff --git a/app/assets/javascripts/vue_merge_request_widget/components/terraform/mr_widget_terraform_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/terraform/mr_widget_terraform_container.vue index f0d158a41a9..25f339b362f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/terraform/mr_widget_terraform_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/terraform/mr_widget_terraform_container.vue @@ -1,8 +1,8 @@ <script> import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlSprintf } from '@gitlab/ui'; -import { n__ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; import Poll from '~/lib/utils/poll'; +import { n__ } from '~/locale'; import MrWidgetExpanableSection from '../mr_widget_expandable_section.vue'; import TerraformPlan from './terraform_plan.vue'; diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 83370901cc3..2a53eb8b241 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -1,50 +1,50 @@ <script> -import { isEmpty } from 'lodash'; import { GlSafeHtmlDirective } from '@gitlab/ui'; -import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store'; -import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service'; +import { isEmpty } from 'lodash'; import MrWidgetApprovals from 'ee_else_ce/vue_merge_request_widget/components/approvals/approvals.vue'; +import MRWidgetService from 'ee_else_ce/vue_merge_request_widget/services/mr_widget_service'; +import MRWidgetStore from 'ee_else_ce/vue_merge_request_widget/stores/mr_widget_store'; import stateMaps from 'ee_else_ce/vue_merge_request_widget/stores/state_maps'; +import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; +import notify from '~/lib/utils/notify'; import { sprintf, s__, __ } from '~/locale'; import Project from '~/pages/projects/project'; import SmartInterval from '~/smart_interval'; -import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; -import notify from '~/lib/utils/notify'; import { deprecatedCreateFlash as createFlash } from '../flash'; -import GroupedCodequalityReportsApp from '../reports/codequality_report/grouped_codequality_reports_app.vue'; -import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue'; import { setFaviconOverlay } from '../lib/utils/favicon'; import GroupedAccessibilityReportsApp from '../reports/accessibility_report/grouped_accessibility_reports_app.vue'; -import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; +import GroupedCodequalityReportsApp from '../reports/codequality_report/grouped_codequality_reports_app.vue'; +import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue'; import Loading from './components/loading.vue'; +import MrWidgetAlertMessage from './components/mr_widget_alert_message.vue'; import WidgetHeader from './components/mr_widget_header.vue'; -import WidgetSuggestPipeline from './components/mr_widget_suggest_pipeline.vue'; import WidgetMergeHelp from './components/mr_widget_merge_help.vue'; import MrWidgetPipelineContainer from './components/mr_widget_pipeline_container.vue'; import WidgetRelatedLinks from './components/mr_widget_related_links.vue'; -import MrWidgetAlertMessage from './components/mr_widget_alert_message.vue'; -import MergedState from './components/states/mr_widget_merged.vue'; -import ClosedState from './components/states/mr_widget_closed.vue'; -import MergingState from './components/states/mr_widget_merging.vue'; -import RebaseState from './components/states/mr_widget_rebase.vue'; -import WorkInProgressState from './components/states/work_in_progress.vue'; +import WidgetSuggestPipeline from './components/mr_widget_suggest_pipeline.vue'; +import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue'; import ArchivedState from './components/states/mr_widget_archived.vue'; +import MrWidgetAutoMergeEnabled from './components/states/mr_widget_auto_merge_enabled.vue'; +import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue'; +import CheckingState from './components/states/mr_widget_checking.vue'; +import ClosedState from './components/states/mr_widget_closed.vue'; import ConflictsState from './components/states/mr_widget_conflicts.vue'; -import NothingToMergeState from './components/states/nothing_to_merge.vue'; +import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue'; +import MergedState from './components/states/mr_widget_merged.vue'; +import MergingState from './components/states/mr_widget_merging.vue'; import MissingBranchState from './components/states/mr_widget_missing_branch.vue'; import NotAllowedState from './components/states/mr_widget_not_allowed.vue'; -import ReadyToMergeState from './components/states/ready_to_merge.vue'; -import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue'; import PipelineBlockedState from './components/states/mr_widget_pipeline_blocked.vue'; +import RebaseState from './components/states/mr_widget_rebase.vue'; +import NothingToMergeState from './components/states/nothing_to_merge.vue'; import PipelineFailedState from './components/states/pipeline_failed.vue'; -import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue'; -import MrWidgetAutoMergeEnabled from './components/states/mr_widget_auto_merge_enabled.vue'; -import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue'; -import CheckingState from './components/states/mr_widget_checking.vue'; +import ReadyToMergeState from './components/states/ready_to_merge.vue'; +import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue'; +import WorkInProgressState from './components/states/work_in_progress.vue'; // import ExtensionsContainer from './components/extensions/container'; -import eventHub from './event_hub'; -import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue'; import TerraformPlan from './components/terraform/mr_widget_terraform_container.vue'; +import eventHub from './event_hub'; +import mergeRequestQueryVariablesMixin from './mixins/merge_request_query_variables'; import getStateQuery from './queries/get_state.query.graphql'; export default { diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/actions.js b/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/actions.js index 419793977f0..5fd5950859b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/actions.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/actions.js @@ -1,7 +1,7 @@ import Visibility from 'visibilityjs'; import axios from '~/lib/utils/axios_utils'; -import Poll from '~/lib/utils/poll'; import httpStatusCodes from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; import * as types from './mutation_types'; diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/index.js b/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/index.js index e6cb5ead089..a2edfa94a48 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/artifacts_list/index.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import Vuex from 'vuex'; import * as actions from './actions'; -import mutations from './mutations'; import * as getters from './getters'; +import mutations from './mutations'; import state from './state'; Vue.use(Vuex); diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue index d1cfa84248c..bcea7ca654e 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue @@ -11,25 +11,25 @@ import { GlButton, GlSafeHtmlDirective, } from '@gitlab/ui'; -import * as Sentry from '~/sentry/wrapper'; -import { s__ } from '~/locale'; -import { fetchPolicies } from '~/lib/graphql'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import highlightCurrentUser from '~/behaviors/markdown/highlight_current_user'; -import initUserPopovers from '~/user_popovers'; +import { fetchPolicies } from '~/lib/graphql'; +import { toggleContainerClasses } from '~/lib/utils/dom_utils'; import { visitUrl, joinPaths } from '~/lib/utils/url_utility'; +import { s__ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import Tracking from '~/tracking'; -import { toggleContainerClasses } from '~/lib/utils/dom_utils'; +import initUserPopovers from '~/user_popovers'; import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; -import alertQuery from '../graphql/queries/alert_details.query.graphql'; -import sidebarStatusQuery from '../graphql/queries/alert_sidebar_status.query.graphql'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { SEVERITY_LEVELS } from '../constants'; import createIssueMutation from '../graphql/mutations/alert_issue_create.mutation.graphql'; import toggleSidebarStatusMutation from '../graphql/mutations/alert_sidebar_status.mutation.graphql'; -import SystemNote from './system_notes/system_note.vue'; -import AlertSidebar from './alert_sidebar.vue'; +import alertQuery from '../graphql/queries/alert_details.query.graphql'; +import sidebarStatusQuery from '../graphql/queries/alert_sidebar_status.query.graphql'; import AlertMetrics from './alert_metrics.vue'; +import AlertSidebar from './alert_sidebar.vue'; import AlertSummaryRow from './alert_summary_row.vue'; +import SystemNote from './system_notes/system_note.vue'; const containerEl = document.querySelector('.page-with-contextual-sidebar'); diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_sidebar.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_sidebar.vue index 4584023380c..a01bd462196 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/alert_sidebar.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_sidebar.vue @@ -1,9 +1,9 @@ <script> import sidebarStatusQuery from '../graphql/queries/alert_sidebar_status.query.graphql'; +import SidebarAssignees from './sidebar/sidebar_assignees.vue'; import SidebarHeader from './sidebar/sidebar_header.vue'; -import SidebarTodo from './sidebar/sidebar_todo.vue'; import SidebarStatus from './sidebar/sidebar_status.vue'; -import SidebarAssignees from './sidebar/sidebar_assignees.vue'; +import SidebarTodo from './sidebar/sidebar_todo.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue b/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue index 5520f7ff045..8d5eb24ed1d 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/alert_status.vue @@ -1,8 +1,8 @@ <script> import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import updateAlertStatusMutation from '~/graphql_shared/mutations/alert_status_update.mutation.graphql'; import { s__ } from '~/locale'; import Tracking from '~/tracking'; -import updateAlertStatusMutation from '~/graphql_shared/mutations/alert_status_update.mutation.graphql'; export default { i18n: { diff --git a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue index 216b429fcbe..39ac6c7feca 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_todo.vue @@ -1,8 +1,8 @@ <script> import produce from 'immer'; +import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; import { s__ } from '~/locale'; import Todo from '~/sidebar/components/todo_toggle/todo.vue'; -import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; import createAlertTodoMutation from '../../graphql/mutations/alert_todo_create.mutation.graphql'; import alertQuery from '../../graphql/queries/alert_details.query.graphql'; diff --git a/app/assets/javascripts/vue_shared/alert_details/index.js b/app/assets/javascripts/vue_shared/alert_details/index.js index eba8adf416a..3ea43d7a843 100644 --- a/app/assets/javascripts/vue_shared/alert_details/index.js +++ b/app/assets/javascripts/vue_shared/alert_details/index.js @@ -4,9 +4,9 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import AlertDetails from './components/alert_details.vue'; +import { PAGE_CONFIG } from './constants'; import sidebarStatusQuery from './graphql/queries/alert_sidebar_status.query.graphql'; import createRouter from './router'; -import { PAGE_CONFIG } from './constants'; Vue.use(VueApollo); diff --git a/app/assets/javascripts/vue_shared/components/alert_details_table.vue b/app/assets/javascripts/vue_shared/components/alert_details_table.vue index 655b867574d..3d49a1cb1c5 100644 --- a/app/assets/javascripts/vue_shared/components/alert_details_table.vue +++ b/app/assets/javascripts/vue_shared/components/alert_details_table.vue @@ -1,12 +1,12 @@ <script> import { GlLoadingIcon, GlTable } from '@gitlab/ui'; import { reduce } from 'lodash'; -import { s__ } from '~/locale'; import { capitalizeFirstCharacter, convertToSentenceCase, splitCamelCase, } from '~/lib/utils/text_utility'; +import { s__ } from '~/locale'; const thClass = 'gl-bg-transparent! gl-border-1! gl-border-b-solid! gl-border-gray-200!'; const tdClass = 'gl-border-gray-100! gl-p-5!'; diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue index 4fefce47da5..ce67d33d4a1 100644 --- a/app/assets/javascripts/vue_shared/components/awards_list.vue +++ b/app/assets/javascripts/vue_shared/components/awards_list.vue @@ -1,7 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ -import { groupBy } from 'lodash'; import { GlIcon, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { groupBy } from 'lodash'; import { __, sprintf } from '~/locale'; import { glEmojiTag } from '../../emoji'; diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js b/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js index 6f7723955bf..db61d0f6b05 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js @@ -1,5 +1,5 @@ -import { SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; import eventHub from '~/blob/components/eventhub'; +import { SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; export default { props: { diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue index 98e6fdead3a..a8a053c0d9e 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue @@ -1,7 +1,7 @@ <script> import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue'; import { handleBlobRichViewer } from '~/blob/viewer'; +import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue'; import ViewerMixin from './mixins'; export default { diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue index 646e1703f1e..5bb31f55e6c 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue @@ -1,8 +1,8 @@ <script> /* eslint-disable vue/no-v-html */ import { GlIcon } from '@gitlab/ui'; -import ViewerMixin from './mixins'; import { HIGHLIGHT_CLASS_NAME } from './constants'; +import ViewerMixin from './mixins'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/clone_dropdown.vue b/app/assets/javascripts/vue_shared/components/clone_dropdown.vue index 5c6bd5892ae..cd5f63afc79 100644 --- a/app/assets/javascripts/vue_shared/components/clone_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/clone_dropdown.vue @@ -6,8 +6,8 @@ import { GlButton, GlTooltipDirective, } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; import { getHTTPProtocol } from '~/lib/utils/url_utility'; +import { __, sprintf } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index 27f136059fa..d1eee62683b 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -1,6 +1,6 @@ <script> -import { isString, isEmpty } from 'lodash'; import { GlTooltipDirective, GlLink, GlIcon } from '@gitlab/ui'; +import { isString, isEmpty } from 'lodash'; import { __, sprintf } from '~/locale'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import UserAvatarLink from './user_avatar/user_avatar_link.vue'; diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue index 9ff35132ac9..1370f7b2a8c 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue @@ -1,7 +1,7 @@ <script> -import MarkdownViewer from './viewers/markdown_viewer.vue'; -import ImageViewer from './viewers/image_viewer.vue'; import DownloadViewer from './viewers/download_viewer.vue'; +import ImageViewer from './viewers/image_viewer.vue'; +import MarkdownViewer from './viewers/markdown_viewer.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue index d0c2672b162..1a96cabf755 100644 --- a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue +++ b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue @@ -1,8 +1,7 @@ <script> import { GlIcon, GlButton, GlDropdown, GlDropdownItem, GlFormGroup } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; - import { convertToFixedRange, isEqualTimeRanges, findTimeRange } from '~/lib/utils/datetime_range'; +import { __, sprintf } from '~/locale'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import DateTimePickerInput from './date_time_picker_input.vue'; diff --git a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker_input.vue b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker_input.vue index 39c1caf928e..190d4e1f104 100644 --- a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker_input.vue +++ b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker_input.vue @@ -1,6 +1,6 @@ <script> -import { uniqueId } from 'lodash'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { uniqueId } from 'lodash'; import { __, sprintf } from '~/locale'; import { dateFormats } from './date_time_picker_lib'; diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue index e755494a668..7080e046b30 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue @@ -1,9 +1,9 @@ <script> import { diffViewerModes, diffModes } from '~/ide/constants'; -import ImageDiffViewer from './viewers/image_diff_viewer.vue'; import DownloadDiffViewer from './viewers/download_diff_viewer.vue'; -import RenamedFile from './viewers/renamed.vue'; +import ImageDiffViewer from './viewers/image_diff_viewer.vue'; import ModeChanged from './viewers/mode_changed.vue'; +import RenamedFile from './viewers/renamed.vue'; export default { props: { diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue index 433aafdeb9e..a3d9b0ace34 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue @@ -1,6 +1,6 @@ <script> -import { pixeliseValue } from '../../../lib/utils/dom_utils'; import ImageViewer from '../../../content_viewer/viewers/image_viewer.vue'; +import { pixeliseValue } from '../../../lib/utils/dom_utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue index acca6ba117f..41acc63cea9 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue @@ -1,7 +1,7 @@ <script> import { throttle } from 'lodash'; -import { pixeliseValue } from '../../../lib/utils/dom_utils'; import ImageViewer from '../../../content_viewer/viewers/image_viewer.vue'; +import { pixeliseValue } from '../../../lib/utils/dom_utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue index 31dbe6c4c1a..f5ac65bcd1f 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue @@ -1,9 +1,9 @@ <script> import ImageViewer from '../../content_viewer/viewers/image_viewer.vue'; import { diffModes, imageViewMode } from '../constants'; -import TwoUpViewer from './image_diff/two_up_viewer.vue'; -import SwipeViewer from './image_diff/swipe_viewer.vue'; import OnionSkinViewer from './image_diff/onion_skin_viewer.vue'; +import SwipeViewer from './image_diff/swipe_viewer.vue'; +import TwoUpViewer from './image_diff/two_up_viewer.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue index eba6dd4d14c..d6f99e9a049 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.vue @@ -1,8 +1,7 @@ <script> -import { mapActions } from 'vuex'; import { GlAlert, GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import { mapActions } from 'vuex'; -import { __ } from '~/locale'; import { TRANSITION_LOAD_START, TRANSITION_LOAD_ERROR, @@ -14,6 +13,7 @@ import { RENAMED_DIFF_TRANSITIONS, } from '~/diffs/constants'; import { truncateSha } from '~/lib/utils/text_utility'; +import { __ } from '~/locale'; export default { STATE_LOADING, diff --git a/app/assets/javascripts/vue_shared/components/dismissible_feedback_alert.vue b/app/assets/javascripts/vue_shared/components/dismissible_feedback_alert.vue index 2a28b13e7bf..c4dfcf93a18 100644 --- a/app/assets/javascripts/vue_shared/components/dismissible_feedback_alert.vue +++ b/app/assets/javascripts/vue_shared/components/dismissible_feedback_alert.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import { slugifyWithUnderscore } from '~/lib/utils/text_utility'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/editor_lite.vue b/app/assets/javascripts/vue_shared/components/editor_lite.vue index b5b5330973c..c3bddabea21 100644 --- a/app/assets/javascripts/vue_shared/components/editor_lite.vue +++ b/app/assets/javascripts/vue_shared/components/editor_lite.vue @@ -1,7 +1,7 @@ <script> import { debounce } from 'lodash'; -import Editor from '~/editor/editor_lite'; import { CONTENT_UPDATE_DEBOUNCE, EDITOR_READY_EVENT } from '~/editor/constants'; +import Editor from '~/editor/editor_lite'; function initEditorLite({ el, ...args }) { const editor = new Editor({ diff --git a/app/assets/javascripts/vue_shared/components/file_finder/index.vue b/app/assets/javascripts/vue_shared/components/file_finder/index.vue index c3cebf079ea..4ec54b33bce 100644 --- a/app/assets/javascripts/vue_shared/components/file_finder/index.vue +++ b/app/assets/javascripts/vue_shared/components/file_finder/index.vue @@ -1,8 +1,8 @@ <script> +import { GlIcon } from '@gitlab/ui'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; import Mousetrap from 'mousetrap'; import VirtualList from 'vue-virtual-scroll-list'; -import { GlIcon } from '@gitlab/ui'; import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes'; import Item from './item.vue'; diff --git a/app/assets/javascripts/vue_shared/components/file_finder/item.vue b/app/assets/javascripts/vue_shared/components/file_finder/item.vue index 4c496ba3f9b..7816c1d74ec 100644 --- a/app/assets/javascripts/vue_shared/components/file_finder/item.vue +++ b/app/assets/javascripts/vue_shared/components/file_finder/item.vue @@ -1,8 +1,8 @@ <script> -import fuzzaldrinPlus from 'fuzzaldrin-plus'; import { GlIcon } from '@gitlab/ui'; -import FileIcon from '../file_icon.vue'; +import fuzzaldrinPlus from 'fuzzaldrin-plus'; import ChangedFileIcon from '../changed_file_icon.vue'; +import FileIcon from '../file_icon.vue'; const MAX_PATH_LENGTH = 60; diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue index 17ebdce232a..0b0a416b7ef 100644 --- a/app/assets/javascripts/vue_shared/components/file_row.vue +++ b/app/assets/javascripts/vue_shared/components/file_row.vue @@ -1,8 +1,8 @@ <script> import { GlTruncate } from '@gitlab/ui'; -import FileHeader from '~/vue_shared/components/file_row_header.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; import { escapeFileUrl } from '~/lib/utils/url_utility'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; +import FileHeader from '~/vue_shared/components/file_row_header.vue'; export default { name: 'FileRow', diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue index a4c5ca28494..97a8f681faf 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue @@ -10,14 +10,13 @@ import { } from '@gitlab/ui'; import RecentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys'; -import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; - -import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'; import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; +import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { __ } from '~/locale'; -import { stripQuotes, uniqueTokens } from './filtered_search_utils'; import { SortDirection } from './constants'; +import { stripQuotes, uniqueTokens } from './filtered_search_utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js index 411654d15f4..4dfc61f1fff 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js @@ -1,7 +1,7 @@ +import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import Api from '~/api'; import * as types from './mutation_types'; export const setEndpoints = ({ commit }, params) => { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js index 665bb29a17e..cdcbecdd313 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js @@ -1,6 +1,6 @@ -import state from './state'; import * as actions from './actions'; import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue index d59e9200e6c..9c2a644b7a9 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/label_token.vue @@ -9,12 +9,11 @@ import { import { debounce } from 'lodash'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { __ } from '~/locale'; - import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; -import { stripQuotes } from '../filtered_search_utils'; import { DEFAULT_LABELS, DEBOUNCE_DELAY } from '../constants'; +import { stripQuotes } from '../filtered_search_utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue index 0dd7820073a..cda6e4d6726 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue @@ -10,8 +10,8 @@ import { debounce } from 'lodash'; import createFlash from '~/flash'; import { __ } from '~/locale'; -import { stripQuotes } from '../filtered_search_utils'; import { DEFAULT_MILESTONES, DEBOUNCE_DELAY } from '../constants'; +import { stripQuotes } from '../filtered_search_utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue b/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue index c9e5f433c3c..96d99faa952 100644 --- a/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue +++ b/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlModal } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; /** diff --git a/app/assets/javascripts/vue_shared/components/issuable/issuable_header_warnings.vue b/app/assets/javascripts/vue_shared/components/issuable/issuable_header_warnings.vue index 37995b434c4..56adbe8c606 100644 --- a/app/assets/javascripts/vue_shared/components/issuable/issuable_header_warnings.vue +++ b/app/assets/javascripts/vue_shared/components/issuable/issuable_header_warnings.vue @@ -1,6 +1,6 @@ <script> -import { mapGetters } from 'vuex'; import { GlIcon } from '@gitlab/ui'; +import { mapGetters } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue b/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue index c745ea61f8b..6a0c21602bd 100644 --- a/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue +++ b/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue @@ -1,8 +1,8 @@ <script> import { GlTooltip, GlIcon } from '@gitlab/ui'; +import { timeFor, parsePikadayDate, dateInWords } from '~/lib/utils/datetime_utility'; import { __, sprintf } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { timeFor, parsePikadayDate, dateInWords } from '~/lib/utils/datetime_utility'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue index d5a8e10f5c0..be0c843ef00 100644 --- a/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +++ b/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue @@ -2,8 +2,8 @@ /* eslint-disable vue/no-v-html */ import '~/commons/bootstrap'; import { GlIcon, GlTooltip, GlTooltipDirective, GlButton } from '@gitlab/ui'; -import { sprintf } from '~/locale'; import IssueDueDate from '~/boards/components/issue_due_date.vue'; +import { sprintf } from '~/locale'; import relatedIssuableMixin from '../../mixins/related_issuable_mixin'; import CiIcon from '../ci_icon.vue'; import IssueAssignees from './issue_assignees.vue'; diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index d75bff04e32..1699329bf4d 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -4,16 +4,16 @@ import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; import { unescape } from 'lodash'; import { GlIcon } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; -import { stripHtml } from '~/lib/utils/text_utility'; import { deprecatedCreateFlash as Flash } from '~/flash'; import GLForm from '~/gl_form'; +import axios from '~/lib/utils/axios_utils'; +import { stripHtml } from '~/lib/utils/text_utility'; +import { __, sprintf } from '~/locale'; import GfmAutocomplete from '~/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue'; import Suggestions from '~/vue_shared/components/markdown/suggestions.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import axios from '~/lib/utils/axios_utils'; -import MarkdownToolbar from './toolbar.vue'; import MarkdownHeader from './header.vue'; +import MarkdownToolbar from './toolbar.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 7ea1a2e5ee8..5bc1786d692 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -1,8 +1,8 @@ <script> -import $ from 'jquery'; import { GlPopover, GlButton, GlTooltipDirective, GlIcon } from '@gitlab/ui'; -import { s__ } from '~/locale'; +import $ from 'jquery'; import { getSelectedFragment } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import { CopyAsGFM } from '../../../behaviors/markdown/copy_as_gfm'; import ToolbarButton from './toolbar_button.vue'; diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index c86f16e0254..53d1cca7af3 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -1,8 +1,8 @@ <script> -import Vue from 'vue'; import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import { __ } from '~/locale'; +import Vue from 'vue'; import { deprecatedCreateFlash as Flash } from '~/flash'; +import { __ } from '~/locale'; import SuggestionDiff from './suggestion_diff.vue'; export default { diff --git a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue index 653ee7f20e9..a069d1cd756 100644 --- a/app/assets/javascripts/vue_shared/components/navigation_tabs.vue +++ b/app/assets/javascripts/vue_shared/components/navigation_tabs.vue @@ -1,6 +1,6 @@ <script> -import $ from 'jquery'; import { GlBadge, GlTabs, GlTab } from '@gitlab/ui'; +import $ from 'jquery'; /** * Given an array of tabs, renders non linked bootstrap tabs. diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue index c66b1112bf4..50972a8c32c 100644 --- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue @@ -18,8 +18,6 @@ * }" * /> */ -import $ from 'jquery'; -import { mapGetters, mapActions, mapState } from 'vuex'; import { GlButton, GlDeprecatedSkeletonLoading as GlSkeletonLoading, @@ -27,10 +25,12 @@ import { GlIcon, GlSafeHtmlDirective as SafeHtml, } from '@gitlab/ui'; +import $ from 'jquery'; +import { mapGetters, mapActions, mapState } from 'vuex'; import descriptionVersionHistoryMixin from 'ee_else_ce/notes/mixins/description_version_history'; +import initMRPopovers from '~/mr_popover/'; import noteHeader from '~/notes/components/note_header.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import initMRPopovers from '~/mr_popover/'; import { spriteIcon } from '../../../lib/utils/common_utils'; import TimelineEntryItem from './timeline_entry_item.vue'; diff --git a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue index 7b766e2f818..e2591362611 100644 --- a/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue +++ b/app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue @@ -1,9 +1,9 @@ <script> import { GlAlert, GlBadge, GlPagination, GlTab, GlTabs } from '@gitlab/ui'; import Api from '~/api'; -import Tracking from '~/tracking'; -import { __ } from '~/locale'; import { updateHistory, setUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; +import Tracking from '~/tracking'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue'; import { initialPaginationState, defaultI18n, defaultPageSize } from './constants'; diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue index 65bd4e4382d..ddc8bbf9b27 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue @@ -2,9 +2,9 @@ /* eslint-disable vue/no-v-html */ import { GlButton, GlIcon } from '@gitlab/ui'; import { isString } from 'lodash'; -import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue'; import highlight from '~/lib/utils/highlight'; import { truncateNamespace } from '~/lib/utils/text_utility'; +import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue'; export default { name: 'ProjectListItem', diff --git a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue index e659e2155fb..a0c5a0559de 100644 --- a/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue +++ b/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue @@ -1,6 +1,6 @@ <script> -import { debounce } from 'lodash'; import { GlLoadingIcon, GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui'; +import { debounce } from 'lodash'; import { __, n__, sprintf } from '~/locale'; import ProjectListItem from './project_list_item.vue'; diff --git a/app/assets/javascripts/vue_shared/components/registry/code_instruction.vue b/app/assets/javascripts/vue_shared/components/registry/code_instruction.vue index 08ee23d25bf..bc7f8a2b17a 100644 --- a/app/assets/javascripts/vue_shared/components/registry/code_instruction.vue +++ b/app/assets/javascripts/vue_shared/components/registry/code_instruction.vue @@ -1,7 +1,7 @@ <script> import { uniqueId } from 'lodash'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import Tracking from '~/tracking'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; export default { name: 'CodeInstruction', diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue b/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue index 5d4c192c78f..8988dab85d2 100644 --- a/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue +++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue @@ -2,9 +2,9 @@ import 'codemirror/lib/codemirror.css'; import '@toast-ui/editor/dist/toastui-editor.css'; +import { EDITOR_TYPES, EDITOR_HEIGHT, EDITOR_PREVIEW_STYLE, CUSTOM_EVENTS } from './constants'; import AddImageModal from './modals/add_image/add_image_modal.vue'; import InsertVideoModal from './modals/insert_video_modal.vue'; -import { EDITOR_TYPES, EDITOR_HEIGHT, EDITOR_PREVIEW_STYLE, CUSTOM_EVENTS } from './constants'; import { registerHTMLToMarkdownRenderer, diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js index 624b5b09b38..6ffd280e005 100644 --- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js +++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js @@ -1,12 +1,12 @@ import { union, mapValues } from 'lodash'; -import renderBlockHtml from './renderers/render_html_block'; +import renderAttributeDefinition from './renderers/render_attribute_definition'; +import renderFontAwesomeHtmlInline from './renderers/render_font_awesome_html_inline'; import renderHeading from './renderers/render_heading'; +import renderBlockHtml from './renderers/render_html_block'; import renderIdentifierInstanceText from './renderers/render_identifier_instance_text'; import renderIdentifierParagraph from './renderers/render_identifier_paragraph'; -import renderFontAwesomeHtmlInline from './renderers/render_font_awesome_html_inline'; -import renderSoftbreak from './renderers/render_softbreak'; -import renderAttributeDefinition from './renderers/render_attribute_definition'; import renderListItem from './renderers/render_list_item'; +import renderSoftbreak from './renderers/render_softbreak'; const htmlInlineRenderers = [renderFontAwesomeHtmlInline]; const htmlBlockRenderers = [renderBlockHtml]; diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js index f7bd49c7def..026a4069d9b 100644 --- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js +++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import { defaults } from 'lodash'; -import ToolbarItem from '../toolbar_item.vue'; +import Vue from 'vue'; import { TOOLBAR_ITEM_CONFIGS, VIDEO_ATTRIBUTES } from '../constants'; -import buildHtmlToMarkdownRenderer from './build_html_to_markdown_renderer'; +import ToolbarItem from '../toolbar_item.vue'; import buildCustomHTMLRenderer from './build_custom_renderer'; +import buildHtmlToMarkdownRenderer from './build_html_to_markdown_renderer'; import sanitizeHTML from './sanitize_html'; const buildWrapper = (propsData) => { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue index 80c61627b8f..a1dca65a423 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue @@ -1,7 +1,7 @@ <script> +import { dateInWords, timeFor } from '~/lib/utils/datetime_utility'; import { __ } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { dateInWords, timeFor } from '~/lib/utils/datetime_utility'; import collapsedCalendarIcon from './collapsed_calendar_icon.vue'; export default { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue index 30daabc1e24..075681de320 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue @@ -1,10 +1,10 @@ <script> import { GlLoadingIcon } from '@gitlab/ui'; import { __ } from '~/locale'; -import datePicker from '../pikaday.vue'; import { dateInWords } from '../../../lib/utils/datetime_utility'; -import toggleSidebar from './toggle_sidebar.vue'; +import datePicker from '../pikaday.vue'; import collapsedCalendarIcon from './collapsed_calendar_icon.vue'; +import toggleSidebar from './toggle_sidebar.vue'; export default { name: 'SidebarDatePicker', diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue index d014139504f..88c4d132d61 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue @@ -1,19 +1,19 @@ <script> -import $ from 'jquery'; import { GlLoadingIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; +import $ from 'jquery'; import LabelsSelect from '~/labels_select'; +import { __ } from '~/locale'; import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import { DropdownVariant } from '../labels_select_vue/constants'; -import DropdownTitle from './dropdown_title.vue'; -import DropdownValue from './dropdown_value.vue'; -import DropdownValueCollapsed from './dropdown_value_collapsed.vue'; import DropdownButton from './dropdown_button.vue'; +import DropdownCreateLabel from './dropdown_create_label.vue'; +import DropdownFooter from './dropdown_footer.vue'; import DropdownHeader from './dropdown_header.vue'; import DropdownSearchInput from './dropdown_search_input.vue'; -import DropdownFooter from './dropdown_footer.vue'; -import DropdownCreateLabel from './dropdown_create_label.vue'; +import DropdownTitle from './dropdown_title.vue'; +import DropdownValue from './dropdown_value.vue'; +import DropdownValueCollapsed from './dropdown_value_collapsed.vue'; export default { DropdownVariant, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue index c65266fce5a..60111210f5d 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue @@ -1,6 +1,6 @@ <script> -import { mapActions, mapGetters } from 'vuex'; import { GlButton, GlIcon } from '@gitlab/ui'; +import { mapActions, mapGetters } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue index 267c3be5f50..e3704198ad0 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue @@ -1,8 +1,8 @@ <script> import { mapState } from 'vuex'; -import DropdownContentsLabelsView from './dropdown_contents_labels_view.vue'; import DropdownContentsCreateView from './dropdown_contents_create_view.vue'; +import DropdownContentsLabelsView from './dropdown_contents_labels_view.vue'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue index 41308e352e3..f8cc981ba3d 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlTooltipDirective, GlButton, GlFormInput, GlLink, GlLoadingIcon } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue index a365673f7a1..6065b6c160c 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapGetters, mapActions } from 'vuex'; import { GlIntersectionObserver, GlLoadingIcon, @@ -8,6 +7,7 @@ import { GlLink, } from '@gitlab/ui'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; +import { mapState, mapGetters, mapActions } from 'vuex'; import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes'; diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue index 2d6a4a9758c..5d1663bc1fd 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue @@ -1,6 +1,6 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue index a6f99289df4..f173c8db540 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue @@ -1,6 +1,6 @@ <script> -import { mapState } from 'vuex'; import { GlLabel } from '@gitlab/ui'; +import { mapState } from 'vuex'; import { isScopedLabel } from '~/lib/utils/common_utils'; diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue index 9efc17908a2..93fdae19a8d 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue @@ -7,14 +7,12 @@ import { __ } from '~/locale'; import DropdownValueCollapsed from '~/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue'; -import labelsSelectModule from './store'; - -import DropdownTitle from './dropdown_title.vue'; -import DropdownValue from './dropdown_value.vue'; +import { DropdownVariant } from './constants'; import DropdownButton from './dropdown_button.vue'; import DropdownContents from './dropdown_contents.vue'; - -import { DropdownVariant } from './constants'; +import DropdownTitle from './dropdown_title.vue'; +import DropdownValue from './dropdown_value.vue'; +import labelsSelectModule from './store'; Vue.use(Vuex); diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js index 14b46c1c431..89f96ab916b 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js @@ -1,6 +1,6 @@ import { deprecatedCreateFlash as flash } from '~/flash'; -import { __ } from '~/locale'; import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; import * as types from './mutation_types'; export const setInitialState = ({ commit }, props) => commit(types.SET_INITIAL_STATE, props); diff --git a/app/assets/javascripts/vue_shared/components/split_button.vue b/app/assets/javascripts/vue_shared/components/split_button.vue index 61b317d0d1d..994fa68fb1a 100644 --- a/app/assets/javascripts/vue_shared/components/split_button.vue +++ b/app/assets/javascripts/vue_shared/components/split_button.vue @@ -1,6 +1,6 @@ <script> -import { isString } from 'lodash'; import { GlDropdown, GlDropdownDivider, GlDropdownItem } from '@gitlab/ui'; +import { isString } from 'lodash'; const isValidItem = (item) => isString(item.eventName) && isString(item.title) && isString(item.description); diff --git a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue index 9b6d0a87374..e639a2d966b 100644 --- a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue +++ b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective } from '@gitlab/ui'; -import { __ } from '~/locale'; import { roundDownFloat } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; export default { directives: { diff --git a/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue b/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue index f1db26ff4fc..b9ee74d6a03 100644 --- a/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue @@ -1,8 +1,8 @@ <script> import { GlDropdown, GlDropdownItem, GlSearchBoxByType } from '@gitlab/ui'; +import { secondsToHours } from '~/lib/utils/datetime_utility'; import { __ } from '~/locale'; import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; -import { secondsToHours } from '~/lib/utils/datetime_utility'; export default { name: 'TimezoneDropdown', diff --git a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue index 01ba2cf5c39..5a08e992084 100644 --- a/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue +++ b/app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue @@ -1,8 +1,8 @@ <script> import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import { __ } from '~/locale'; -import { isValidImage } from './utils'; import { VALID_DATA_TRANSFER_TYPE, VALID_IMAGE_FILE_MIMETYPE } from './constants'; +import { isValidImage } from './utils'; export default { components: { diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index 2ab4c55d9b0..f121036540e 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -7,8 +7,8 @@ import { GlIcon, } from '@gitlab/ui'; import UserAvailabilityStatus from '~/set_status_modal/components/user_availability_status.vue'; -import UserAvatarImage from '../user_avatar/user_avatar_image.vue'; import { glEmojiTag } from '../../../emoji'; +import UserAvatarImage from '../user_avatar/user_avatar_image.vue'; const MAX_SKELETON_LINES = 4; diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue index c957876f8ab..4bd3e352fd2 100644 --- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue +++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue @@ -1,8 +1,8 @@ <script> import $ from 'jquery'; import { __ } from '~/locale'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import ActionsButton from '~/vue_shared/components/actions_button.vue'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; const KEY_EDIT = 'edit'; const KEY_WEB_IDE = 'webide'; diff --git a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js index 56da2637825..52ded0e0cc1 100644 --- a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js +++ b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js @@ -1,6 +1,6 @@ import { isEmpty } from 'lodash'; -import { sprintf, __ } from '~/locale'; import { formatDate } from '~/lib/utils/datetime_utility'; +import { sprintf, __ } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; const mixins = { diff --git a/app/assets/javascripts/vue_shared/plugins/global_toast.js b/app/assets/javascripts/vue_shared/plugins/global_toast.js index 7a2e5d80a5d..bfea2bedd40 100644 --- a/app/assets/javascripts/vue_shared/plugins/global_toast.js +++ b/app/assets/javascripts/vue_shared/plugins/global_toast.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; +import Vue from 'vue'; Vue.use(GlToast); const instance = new Vue(); diff --git a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue index b6b32167ed6..b27dd33835f 100644 --- a/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue +++ b/app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue @@ -1,21 +1,21 @@ <script> import { mapActions, mapGetters } from 'vuex'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import createFlash from '~/flash'; +import { s__ } from '~/locale'; import ReportSection from '~/reports/components/report_section.vue'; import { ERROR, SLOT_SUCCESS, SLOT_LOADING, SLOT_ERROR } from '~/reports/constants'; -import { s__ } from '~/locale'; -import createFlash from '~/flash'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import HelpIcon from './components/help_icon.vue'; import SecurityReportDownloadDropdown from './components/security_report_download_dropdown.vue'; import SecuritySummary from './components/security_summary.vue'; -import store from './store'; -import { MODULE_SAST, MODULE_SECRET_DETECTION } from './store/constants'; import { REPORT_TYPE_SAST, REPORT_TYPE_SECRET_DETECTION, reportTypeToSecurityReportTypeEnum, } from './constants'; import securityReportDownloadPathsQuery from './queries/security_report_download_paths.query.graphql'; +import store from './store'; +import { MODULE_SAST, MODULE_SECRET_DETECTION } from './store/constants'; import { extractSecurityReportArtifacts } from './utils'; export default { diff --git a/app/assets/javascripts/vue_shared/security_reports/store/getters.js b/app/assets/javascripts/vue_shared/security_reports/store/getters.js index 819b0a4af31..08f6bcca15b 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/getters.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/getters.js @@ -1,7 +1,7 @@ import { s__, sprintf } from '~/locale'; import { LOADING, ERROR, SUCCESS } from '~/reports/constants'; -import { countVulnerabilities, groupedTextBuilder } from './utils'; import { TRANSLATION_IS_LOADING } from './messages'; +import { countVulnerabilities, groupedTextBuilder } from './utils'; export const summaryCounts = (state) => countVulnerabilities( diff --git a/app/assets/javascripts/vue_shared/security_reports/store/index.js b/app/assets/javascripts/vue_shared/security_reports/store/index.js index 10705e04a21..164faa86744 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/index.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/index.js @@ -1,9 +1,9 @@ import Vuex from 'vuex'; -import * as getters from './getters'; -import state from './state'; import { MODULE_SAST, MODULE_SECRET_DETECTION } from './constants'; +import * as getters from './getters'; import sast from './modules/sast'; import secretDetection from './modules/secret_detection'; +import state from './state'; export default () => new Vuex.Store({ diff --git a/app/assets/javascripts/vue_shared/security_reports/store/modules/sast/index.js b/app/assets/javascripts/vue_shared/security_reports/store/modules/sast/index.js index 68c81bb4509..1d5af1d4fe5 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/modules/sast/index.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/modules/sast/index.js @@ -1,6 +1,6 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; +import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/vue_shared/security_reports/store/modules/secret_detection/index.js b/app/assets/javascripts/vue_shared/security_reports/store/modules/secret_detection/index.js index 68c81bb4509..1d5af1d4fe5 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/modules/secret_detection/index.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/modules/secret_detection/index.js @@ -1,6 +1,6 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; +import mutations from './mutations'; +import state from './state'; export default { namespaced: true, diff --git a/app/assets/javascripts/vue_shared/security_reports/store/utils.js b/app/assets/javascripts/vue_shared/security_reports/store/utils.js index fd6613ae11c..458bacce915 100644 --- a/app/assets/javascripts/vue_shared/security_reports/store/utils.js +++ b/app/assets/javascripts/vue_shared/security_reports/store/utils.js @@ -1,5 +1,5 @@ -import pollUntilComplete from '~/lib/utils/poll_until_complete'; import axios from '~/lib/utils/axios_utils'; +import pollUntilComplete from '~/lib/utils/poll_until_complete'; import { __, n__, sprintf } from '~/locale'; import { CRITICAL, HIGH } from '~/vulnerabilities/constants'; import { diff --git a/app/assets/javascripts/vuex_shared/modules/modal/index.js b/app/assets/javascripts/vuex_shared/modules/modal/index.js index c349d875c24..21ebfb22e2e 100644 --- a/app/assets/javascripts/vuex_shared/modules/modal/index.js +++ b/app/assets/javascripts/vuex_shared/modules/modal/index.js @@ -1,6 +1,6 @@ -import state from './state'; -import mutations from './mutations'; import * as actions from './actions'; +import mutations from './mutations'; +import state from './state'; export default () => ({ namespaced: true, diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue index a5c8aad01be..f4ac4f81eac 100644 --- a/app/assets/javascripts/whats_new/components/app.vue +++ b/app/assets/javascripts/whats_new/components/app.vue @@ -1,5 +1,4 @@ <script> -import { mapState, mapActions } from 'vuex'; import { GlDrawer, GlInfiniteScroll, @@ -9,10 +8,11 @@ import { GlBadge, GlLoadingIcon, } from '@gitlab/ui'; +import { mapState, mapActions } from 'vuex'; import Tracking from '~/tracking'; import { getDrawerBodyHeight } from '../utils/get_drawer_body_height'; -import SkeletonLoader from './skeleton_loader.vue'; import Feature from './feature.vue'; +import SkeletonLoader from './skeleton_loader.vue'; const trackingMixin = Tracking.mixin(); diff --git a/app/assets/javascripts/zen_mode.js b/app/assets/javascripts/zen_mode.js index 06ba2496a99..134c2858849 100644 --- a/app/assets/javascripts/zen_mode.js +++ b/app/assets/javascripts/zen_mode.js @@ -5,8 +5,8 @@ /*= provides zen_mode:enter */ /*= provides zen_mode:leave */ -import $ from 'jquery'; import Dropzone from 'dropzone'; +import $ from 'jquery'; import Mousetrap from 'mousetrap'; import 'mousetrap/plugins/pause/mousetrap-pause'; import { scrollToElement } from '~/lib/utils/common_utils'; |