diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/groups | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/groups')
6 files changed, 11 insertions, 14 deletions
diff --git a/app/assets/javascripts/groups/components/group_folder.vue b/app/assets/javascripts/groups/components/group_folder.vue index 5f169832ee4..042d818338a 100644 --- a/app/assets/javascripts/groups/components/group_folder.vue +++ b/app/assets/javascripts/groups/components/group_folder.vue @@ -1,6 +1,6 @@ <script> import { GlIcon } from '@gitlab/ui'; -import { n__ } from '../../locale'; +import { n__ } from '~/locale'; import { MAX_CHILDREN_COUNT } from '../constants'; export default { diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 707008ec493..4f21f68fa65 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -9,6 +9,7 @@ import { } from '@gitlab/ui'; import { visitUrl } from '~/lib/utils/url_utility'; import UserAccessRoleBadge from '~/vue_shared/components/user_access_role_badge.vue'; +import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '../constants'; import eventHub from '../event_hub'; @@ -112,6 +113,7 @@ export default { }, }, safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, + AVATAR_SHAPE_OPTION_RECT, }; </script> @@ -131,7 +133,7 @@ export default { > <div class="folder-toggle-wrap gl-mr-2 d-flex align-items-center"> <item-caret :is-group-open="group.isOpen" /> - <item-type-icon :item-type="group.type" :is-group-open="group.isOpen" /> + <item-type-icon :item-type="group.type" /> </div> <gl-loading-icon v-if="group.isChildrenLoading" @@ -145,7 +147,7 @@ export default { :aria-label="group.name" > <gl-avatar - shape="rect" + :shape="$options.AVATAR_SHAPE_OPTION_RECT" :entity-name="group.name" :src="group.avatarUrl" :alt="group.name" diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index 18a6d487703..313c8dadd1f 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/url_utility'; +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 3620c884c5f..2aa812250a0 100644 --- a/app/assets/javascripts/groups/components/item_stats.vue +++ b/app/assets/javascripts/groups/components/item_stats.vue @@ -55,7 +55,7 @@ export default { :title="__('Subgroups')" :value="item.subgroupCount" css-class="number-subgroups gl-ml-5" - icon-name="folder-o" + icon-name="subgroup" data-testid="subgroups-count" /> <item-stats-value @@ -63,7 +63,7 @@ export default { :title="__('Projects')" :value="item.projectCount" css-class="number-projects gl-ml-5" - icon-name="bookmark" + icon-name="project" data-testid="projects-count" /> <item-stats-value diff --git a/app/assets/javascripts/groups/components/item_type_icon.vue b/app/assets/javascripts/groups/components/item_type_icon.vue index c3787c2df21..7821e604700 100644 --- a/app/assets/javascripts/groups/components/item_type_icon.vue +++ b/app/assets/javascripts/groups/components/item_type_icon.vue @@ -11,18 +11,13 @@ export default { type: String, required: true, }, - isGroupOpen: { - type: Boolean, - required: true, - default: false, - }, }, computed: { iconClass() { if (this.itemType === ITEM_TYPE.GROUP) { - return this.isGroupOpen ? 'folder-open' : 'folder-o'; + return 'subgroup'; } - return 'bookmark'; + return 'project'; }, }, }; diff --git a/app/assets/javascripts/groups/constants.js b/app/assets/javascripts/groups/constants.js index 005bac1e7b5..cacba2dfd23 100644 --- a/app/assets/javascripts/groups/constants.js +++ b/app/assets/javascripts/groups/constants.js @@ -1,4 +1,4 @@ -import { __, s__ } from '../locale'; +import { __, s__ } from '~/locale'; export const MAX_CHILDREN_COUNT = 20; |