diff options
Diffstat (limited to 'app/assets/javascripts/groups')
5 files changed, 28 insertions, 29 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index 9d2c7cfe581..2a95b242510 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -1,10 +1,8 @@ <script> -/* global Flash */ - import { GlLoadingIcon, GlModal } from '@gitlab/ui'; -import { getParameterByName } from '~/lib/utils/common_utils'; +import createFlash from '~/flash'; import { HIDDEN_CLASS } from '~/lib/utils/constants'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { mergeUrlParams, getParameterByName } from '~/lib/utils/url_utility'; import { __, s__, sprintf } from '~/locale'; import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants'; @@ -116,7 +114,7 @@ export default { this.isLoading = false; window.scrollTo({ top: 0, behavior: 'smooth' }); - Flash(COMMON_STR.FAILURE); + createFlash({ message: COMMON_STR.FAILURE }); }); }, fetchAllGroups() { @@ -202,7 +200,7 @@ export default { if (err.status === 403) { message = COMMON_STR.LEAVE_FORBIDDEN; } - Flash(message); + createFlash({ message }); this.targetGroup.isBeingRemoved = false; }); }, diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index dbad2688451..ad0b27c9693 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -1,5 +1,6 @@ <script> import { + GlAvatar, GlLoadingIcon, GlBadge, GlIcon, @@ -7,7 +8,6 @@ import { GlSafeHtmlDirective, } from '@gitlab/ui'; import { visitUrl } from '~/lib/utils/url_utility'; -import identicon from '~/vue_shared/components/identicon.vue'; import UserAccessRoleBadge from '~/vue_shared/components/user_access_role_badge.vue'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '../constants'; import eventHub from '../event_hub'; @@ -23,11 +23,11 @@ export default { SafeHtml: GlSafeHtmlDirective, }, components: { + GlAvatar, GlBadge, GlLoadingIcon, GlIcon, UserAccessRoleBadge, - identicon, itemCaret, itemTypeIcon, itemStats, @@ -125,21 +125,21 @@ export default { size="lg" class="d-none d-sm-inline-flex flex-shrink-0 gl-mr-3" /> - <div - :class="{ 'd-sm-flex': !group.isChildrenLoading }" - class="avatar-container rect-avatar s32 d-none flex-grow-0 flex-shrink-0" + <a + :class="{ 'gl-sm-display-flex': !group.isChildrenLoading }" + class="gl-display-none gl-text-decoration-none! gl-mr-3" + :href="group.relativePath" + :aria-label="group.name" > - <a :href="group.relativePath" class="no-expand"> - <img - v-if="hasAvatar" - :src="group.avatarUrl" - data-testid="group-avatar" - class="avatar s40" - :itemprop="microdata.imageItemprop" - /> - <identicon v-else :entity-id="group.id" :entity-name="group.name" size-class="s40" /> - </a> - </div> + <gl-avatar + shape="rect" + :entity-name="group.name" + :src="group.avatarUrl" + :alt="group.name" + :size="32" + :itemprop="microdata.imageItemprop" + /> + </a> <div class="group-text-container d-flex flex-fill align-items-center"> <div class="group-text flex-grow-1 flex-shrink-1"> <div class="d-flex align-items-center flex-wrap title namespace-title gl-mr-3"> @@ -178,7 +178,7 @@ export default { </div> </div> <div v-if="isGroupPendingRemoval"> - <gl-badge variant="warning">{{ __('pending removal') }}</gl-badge> + <gl-badge variant="warning">{{ __('pending deletion') }}</gl-badge> </div> <div class="metadata d-flex flex-grow-1 flex-shrink-0 flex-wrap justify-content-md-between"> <item-actions diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index d407fdd2b90..59a37b2a1d5 100644 --- a/app/assets/javascripts/groups/components/groups.vue +++ b/app/assets/javascripts/groups/components/groups.vue @@ -1,6 +1,6 @@ <script> import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import { getParameterByName } from '../../lib/utils/common_utils'; +import { getParameterByName } from '../../lib/utils/url_utility'; import eventHub from '../event_hub'; export default { diff --git a/app/assets/javascripts/groups/components/item_stats.vue b/app/assets/javascripts/groups/components/item_stats.vue index e09df8a5d26..7a37d1eb93d 100644 --- a/app/assets/javascripts/groups/components/item_stats.vue +++ b/app/assets/javascripts/groups/components/item_stats.vue @@ -73,7 +73,7 @@ export default { icon-name="star" /> <div v-if="isProjectPendingRemoval"> - <gl-badge variant="warning">{{ __('pending removal') }}</gl-badge> + <gl-badge variant="warning">{{ __('pending deletion') }}</gl-badge> </div> <div v-if="isProject" class="last-updated"> <time-ago-tooltip :time="item.updatedAt" tooltip-placement="bottom" /> diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js index cedf16cd7f1..a7d44322eb1 100644 --- a/app/assets/javascripts/groups/groups_filterable_list.js +++ b/app/assets/javascripts/groups/groups_filterable_list.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import FilterableList from '~/filterable_list'; -import { normalizeHeaders, getParameterByName } from '../lib/utils/common_utils'; +import { normalizeHeaders } from '../lib/utils/common_utils'; +import { getParameterByName } from '../lib/utils/url_utility'; import eventHub from './event_hub'; export default class GroupFilterableList extends FilterableList { @@ -45,7 +46,7 @@ export default class GroupFilterableList extends FilterableList { onFilterInput() { const queryData = {}; const $form = $(this.form); - const archivedParam = getParameterByName('archived', window.location.href); + const archivedParam = getParameterByName('archived'); const filterGroupsParam = $form.find(`[name="${this.filterInputField}"]`).val(); if (filterGroupsParam) { @@ -85,11 +86,11 @@ export default class GroupFilterableList extends FilterableList { // Get option query param, also preserve currently applied query param const sortParam = getParameterByName( 'sort', - isOptionFilterBySort ? e.currentTarget.href : window.location.href, + isOptionFilterBySort ? e.currentTarget.search : window.location.search, ); const archivedParam = getParameterByName( 'archived', - isOptionFilterByArchivedProjects ? e.currentTarget.href : window.location.href, + isOptionFilterByArchivedProjects ? e.currentTarget.search : window.location.search, ); if (sortParam) { |