diff --git a/app/assets/javascripts/vue_shared/components/users_table/users_table.vue b/app/assets/javascripts/vue_shared/components/users_table/users_table.vue index ac523e9af0167b36858caa54bb89bc42ebe70f9e..6709fdde1d27134ae2cf75ef74a66bd74e765633 100644 --- a/app/assets/javascripts/vue_shared/components/users_table/users_table.vue +++ b/app/assets/javascripts/vue_shared/components/users_table/users_table.vue @@ -1,7 +1,8 @@ <script> import NO_USERS_SVG from '@gitlab/svgs/dist/illustrations/empty-state/empty-user-settings-md.svg'; -import { GlSkeletonLoader, GlTable, GlEmptyState } from '@gitlab/ui'; +import { GlSkeletonLoader, GlTable } from '@gitlab/ui'; import { __ } from '~/locale'; +import EmptyResult from '~/vue_shared/components/empty_result.vue'; import UserDate from '~/vue_shared/components/user_date.vue'; import UserAvatar from './user_avatar.vue'; @@ -11,7 +12,7 @@ export default { GlTable, UserAvatar, UserDate, - GlEmptyState, + EmptyResult, }, props: { users: { @@ -106,9 +107,5 @@ export default { <slot name="user-actions" :user="user"></slot> </template> </gl-table> - <gl-empty-state - v-else - :svg-path="$options.NO_USERS_SVG" - :title="s__('AdminUsers|No users found')" - /> + <empty-result v-else /> </template> diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 3d766665aee197e7efc1367295b56ce8ba8c4edf..2e7584eeac295591a77e1e31808d36fae40ac796 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -19,7 +19,6 @@ %ul.content-list = render @groups - else - = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-groups-md.svg', - title: _('No groups found')) + = render ::Layouts::EmptyResultComponent.new(type: :search) = paginate @groups, theme: "gitlab" diff --git a/app/views/admin/projects/_projects.html.haml b/app/views/admin/projects/_projects.html.haml index 1fd65a787efcfbc4a5d9eeadd05a683bfdcf9719..66644d9691fce1e36e9defaf78a129fb7d9e8e0c 100644 --- a/app/views/admin/projects/_projects.html.haml +++ b/app/views/admin/projects/_projects.html.haml @@ -30,7 +30,6 @@ = paginate @projects, theme: 'gitlab' - else - = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-projects-md.svg', - title: _('No projects found')) + = render ::Layouts::EmptyResultComponent.new(type: :search) #delete-project-modal diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5667dc3f8b89f5ffdfabb60d63b6c13cc33a18aa..334b18b231876c145f85a28b2787a42dadeead22 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4627,9 +4627,6 @@ msgstr "" msgid "AdminUsers|New user" msgstr "" -msgid "AdminUsers|No users found" -msgstr "" - msgid "AdminUsers|Owned groups will be left" msgstr "" @@ -35886,9 +35883,6 @@ msgstr "" msgid "No group provided" msgstr "" -msgid "No groups found" -msgstr "" - msgid "No groups or projects found" msgstr "" diff --git a/spec/frontend/vue_shared/components/users_table/users_table_spec.js b/spec/frontend/vue_shared/components/users_table/users_table_spec.js index 45d1d291d47b7c180e3783760a7cf2298a4bf563..d557f9e167aa1b534c49dc4db206d20a6f8914cc 100644 --- a/spec/frontend/vue_shared/components/users_table/users_table_spec.js +++ b/spec/frontend/vue_shared/components/users_table/users_table_spec.js @@ -1,4 +1,5 @@ import { GlTable, GlSkeletonLoader } from '@gitlab/ui'; +import EmptyResult from '~/vue_shared/components/empty_result.vue'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import UsersTable from '~/vue_shared/components/users_table/users_table.vue'; import UserAvatar from '~/vue_shared/components/users_table/user_avatar.vue'; @@ -56,8 +57,8 @@ describe('UsersTable component', () => { initComponent({ users: [] }); }); - it('renders a "No users found" message', () => { - expect(wrapper.text()).toContain('No users found'); + it('renders EmptyResult component', () => { + expect(wrapper.findComponent(EmptyResult).exists()).toBe(true); }); });