diff options
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/issues/index.js | 11 | ||||
-rw-r--r-- | app/assets/javascripts/issues/service_desk/filtered_search_service_desk.js (renamed from app/assets/javascripts/issues/filtered_search_service_desk.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/issues/service_desk/index.js | 11 | ||||
-rw-r--r-- | app/assets/javascripts/organizations/index/components/app.vue | 33 | ||||
-rw-r--r-- | app/assets/javascripts/organizations/index/components/organizations_view.vue | 32 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/issues/service_desk/index.js | 4 |
7 files changed, 52 insertions, 40 deletions
diff --git a/app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue b/app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue index a8fb762b2b7..64e2d4176bf 100644 --- a/app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue +++ b/app/assets/javascripts/ci/pipelines_page/components/pipelines_status_badge.vue @@ -43,7 +43,6 @@ export default { class="gl-mb-3" :status="pipelineStatus" :show-text="!isChildView" - data-testidr="pipeline-commit-status" @ciStatusBadgeClick="trackClick" /> <pipelines-timeago :pipeline="pipeline" /> diff --git a/app/assets/javascripts/issues/index.js b/app/assets/javascripts/issues/index.js index 3bd28c50800..eea5207801c 100644 --- a/app/assets/javascripts/issues/index.js +++ b/app/assets/javascripts/issues/index.js @@ -17,17 +17,6 @@ import initSidebarBundle from '~/sidebar/sidebar_bundle'; import initWorkItemLinks from '~/work_items/components/work_item_links'; import ZenMode from '~/zen_mode'; import initAwardsApp from '~/emoji/awards_app'; -import FilteredSearchServiceDesk from './filtered_search_service_desk'; - -export function initFilteredSearchServiceDesk() { - if (document.querySelector('.filtered-search')) { - const supportBotData = JSON.parse( - document.querySelector('.js-service-desk-issues').dataset.supportBot, - ); - const filteredSearchManager = new FilteredSearchServiceDesk(supportBotData); - filteredSearchManager.setup(); - } -} export function initForm() { new IssuableForm($('.issue-form')); // eslint-disable-line no-new diff --git a/app/assets/javascripts/issues/filtered_search_service_desk.js b/app/assets/javascripts/issues/service_desk/filtered_search_service_desk.js index bec207aa439..bec207aa439 100644 --- a/app/assets/javascripts/issues/filtered_search_service_desk.js +++ b/app/assets/javascripts/issues/service_desk/filtered_search_service_desk.js diff --git a/app/assets/javascripts/issues/service_desk/index.js b/app/assets/javascripts/issues/service_desk/index.js index 579cf343477..cc5f6b40a91 100644 --- a/app/assets/javascripts/issues/service_desk/index.js +++ b/app/assets/javascripts/issues/service_desk/index.js @@ -3,8 +3,19 @@ import VueApollo from 'vue-apollo'; import VueRouter from 'vue-router'; import { parseBoolean } from '~/lib/utils/common_utils'; import ServiceDeskListApp from 'ee_else_ce/issues/service_desk/components/service_desk_list_app.vue'; +import FilteredSearchServiceDesk from './filtered_search_service_desk'; import { gqlClient } from './graphql'; +export function initFilteredSearchServiceDesk() { + if (document.querySelector('.filtered-search')) { + const supportBotData = JSON.parse( + document.querySelector('.js-service-desk-issues').dataset.supportBot, + ); + const filteredSearchManager = new FilteredSearchServiceDesk(supportBotData); + filteredSearchManager.setup(); + } +} + export async function mountServiceDeskListApp() { const el = document.querySelector('.js-service-desk-list'); diff --git a/app/assets/javascripts/organizations/index/components/app.vue b/app/assets/javascripts/organizations/index/components/app.vue index 21a11c82196..c47f4ed52c5 100644 --- a/app/assets/javascripts/organizations/index/components/app.vue +++ b/app/assets/javascripts/organizations/index/components/app.vue @@ -1,6 +1,8 @@ <script> import { GlButton } from '@gitlab/ui'; import { __, s__ } from '~/locale'; +import { createAlert } from '~/alert'; +import organizationsQuery from '../graphql/organizations.query.graphql'; import OrganizationsView from './organizations_view.vue'; export default { @@ -8,18 +10,45 @@ export default { i18n: { organizations: __('Organizations'), newOrganization: s__('Organization|New organization'), + errorMessage: s__( + 'Organization|An error occurred loading user organizations. Please refresh the page to try again.', + ), }, components: { GlButton, OrganizationsView, }, inject: ['newOrganizationUrl'], + data() { + return { + organizations: [], + }; + }, + apollo: { + organizations: { + query: organizationsQuery, + update(data) { + return data.currentUser.organizations.nodes; + }, + error(error) { + createAlert({ message: this.$options.i18n.errorMessage, error, captureError: true }); + }, + }, + }, + computed: { + showHeader() { + return this.loading || this.organizations.length; + }, + loading() { + return this.$apollo.queries.organizations.loading; + }, + }, }; </script> <template> <section> - <div class="gl-display-flex gl-align-items-center"> + <div v-if="showHeader" class="gl-display-flex gl-align-items-center"> <h1 class="gl-my-4 gl-font-size-h-display">{{ $options.i18n.organizations }}</h1> <div class="gl-ml-auto"> <gl-button :href="newOrganizationUrl" variant="confirm">{{ @@ -27,6 +56,6 @@ export default { }}</gl-button> </div> </div> - <organizations-view /> + <organizations-view :organizations="organizations" :loading="loading" /> </section> </template> diff --git a/app/assets/javascripts/organizations/index/components/organizations_view.vue b/app/assets/javascripts/organizations/index/components/organizations_view.vue index 51aff482c8a..9720646bca3 100644 --- a/app/assets/javascripts/organizations/index/components/organizations_view.vue +++ b/app/assets/javascripts/organizations/index/components/organizations_view.vue @@ -1,16 +1,11 @@ <script> import { GlLoadingIcon, GlEmptyState } from '@gitlab/ui'; -import { createAlert } from '~/alert'; import { s__ } from '~/locale'; -import organizationsQuery from '../graphql/organizations.query.graphql'; import OrganizationsList from './organizations_list.vue'; export default { name: 'OrganizationsView', i18n: { - errorMessage: s__( - 'Organization|An error occurred loading user organizations. Please refresh the page to try again.', - ), emptyStateTitle: s__('Organization|Get started with organizations'), emptyStateDescription: s__( 'Organization|Create an organization to contain all of your groups and projects.', @@ -23,32 +18,23 @@ export default { GlEmptyState, }, inject: ['newOrganizationUrl', 'organizationsEmptyStateSvgPath'], - data() { - return { - organizations: [], - }; - }, - apollo: { + props: { organizations: { - query: organizationsQuery, - update(data) { - return data.currentUser.organizations.nodes; - }, - error(error) { - createAlert({ message: this.$options.i18n.errorMessage, error, captureError: true }); - }, + type: Array, + required: false, + default: () => [], }, - }, - computed: { - isLoading() { - return this.$apollo.queries.organizations.loading; + loading: { + type: Boolean, + required: false, + default: false, }, }, }; </script> <template> - <gl-loading-icon v-if="isLoading" class="gl-mt-5" size="md" /> + <gl-loading-icon v-if="loading" class="gl-mt-5" size="md" /> <organizations-list v-else-if="organizations.length" :organizations="organizations" diff --git a/app/assets/javascripts/pages/projects/issues/service_desk/index.js b/app/assets/javascripts/pages/projects/issues/service_desk/index.js index ead15143072..4118541d973 100644 --- a/app/assets/javascripts/pages/projects/issues/service_desk/index.js +++ b/app/assets/javascripts/pages/projects/issues/service_desk/index.js @@ -1,6 +1,4 @@ -import { initFilteredSearchServiceDesk } from '~/issues'; -import { mountServiceDeskListApp } from '~/issues/service_desk'; +import { initFilteredSearchServiceDesk, mountServiceDeskListApp } from '~/issues/service_desk'; initFilteredSearchServiceDesk(); - mountServiceDeskListApp(); |