diff options
Diffstat (limited to 'app/assets/javascripts/serverless')
8 files changed, 23 insertions, 25 deletions
diff --git a/app/assets/javascripts/serverless/components/area.vue b/app/assets/javascripts/serverless/components/area.vue index 056b342cf39..a9584c070fe 100644 --- a/app/assets/javascripts/serverless/components/area.vue +++ b/app/assets/javascripts/serverless/components/area.vue @@ -2,9 +2,9 @@ import { GlAreaChart } from '@gitlab/ui/dist/charts'; import dateFormat from 'dateformat'; import { debounceByAnimationFrame } from '~/lib/utils/common_utils'; +import { __ } from '~/locale'; import { X_INTERVAL } from '../constants'; import { validateGraphData } from '../utils'; -import { __ } from '~/locale'; let debouncedResize; diff --git a/app/assets/javascripts/serverless/components/environment_row.vue b/app/assets/javascripts/serverless/components/environment_row.vue index c46dfb66afe..01030172ea8 100644 --- a/app/assets/javascripts/serverless/components/environment_row.vue +++ b/app/assets/javascripts/serverless/components/environment_row.vue @@ -1,6 +1,6 @@ <script> -import FunctionRow from './function_row.vue'; import ItemCaret from '~/groups/components/item_caret.vue'; +import FunctionRow from './function_row.vue'; export default { components: { 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 aac7c46a295..fab9c0a75e7 100644 --- a/app/assets/javascripts/serverless/components/function_row.vue +++ b/app/assets/javascripts/serverless/components/function_row.vue @@ -1,8 +1,8 @@ <script> import { isString } from 'lodash'; +import { visitUrl } from '~/lib/utils/url_utility'; import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import Url from './url.vue'; -import { visitUrl } from '~/lib/utils/url_utility'; export default { components: { diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue index d662cc7b802..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 EnvironmentRow from './environment_row.vue'; -import EmptyState from './empty_state.vue'; import { CHECKING_INSTALLED } from '../constants'; +import EmptyState from './empty_state.vue'; +import EnvironmentRow from './environment_row.vue'; export default { components: { @@ -69,18 +69,16 @@ export default { <div v-else-if="isInstalled"> <div v-if="hasFunctionData"> - <template> - <div class="groups-list-tree-container js-functions-wrapper"> - <ul class="content-list group-list-tree"> - <environment-row - v-for="(env, index) in getFunctions" - :key="index" - :env="env" - :env-name="index" - /> - </ul> - </div> - </template> + <div class="groups-list-tree-container js-functions-wrapper"> + <ul class="content-list group-list-tree"> + <environment-row + v-for="(env, index) in getFunctions" + :key="index" + :env="env" + :env-name="index" + /> + </ul> + </div> <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3 js-functions-loader" /> </div> <div v-else class="empty-state js-empty-state"> 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 acd7020f70f..a6c0380a789 100644 --- a/app/assets/javascripts/serverless/store/actions.js +++ b/app/assets/javascripts/serverless/store/actions.js @@ -1,10 +1,10 @@ -import * as types from './mutation_types'; +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'; export const requestFunctionsLoading = ({ commit }) => commit(types.REQUEST_FUNCTIONS_LOADING); export const receiveFunctionsSuccess = ({ commit }, data) => 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 { |