+
{{
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 5f9e1fdf70f2c26cce597bedc1e7230c52851950..58283b82e50762439127810a33a5b2be902f77f8 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -145,14 +145,14 @@ export default {
key: 'selected',
label: '',
thClass: 'gl-w-3 !gl-pr-3',
- tdClass: '!gl-pr-3',
+ tdClass: '!gl-flex lg:!gl-table-cell lg:!gl-pr-3',
},
{
key: 'webUrl',
label: s__('BulkImport|Source group'),
// eslint-disable-next-line @gitlab/require-i18n-strings
- thClass: '!gl-pl-0 gl-w-1/2',
- tdClass: '!gl-pl-0',
+ thClass: 'lg:!gl-pl-0 gl-w-1/2',
+ tdClass: 'lg:!gl-pl-0',
},
{
key: 'importTarget',
@@ -162,11 +162,13 @@ export default {
{
key: 'progress',
label: __('Status'),
+ tdClass: '!gl-align-middle',
tdAttr: { 'data-testid': 'import-status-indicator' },
},
{
key: 'actions',
label: '',
+ tdClass: '!gl-flex lg:!gl-table-cell',
},
],
@@ -342,12 +344,7 @@ export default {
methods: {
rowClasses(groupTableItem) {
- const DEFAULT_CLASSES = [
- 'gl-border-strong',
- 'gl-border-0',
- 'gl-border-b-1',
- 'gl-border-solid',
- ];
+ const DEFAULT_CLASSES = ['gl-border-strong', 'gl-border-0', 'gl-border-b', 'gl-border-solid'];
const result = [...DEFAULT_CLASSES];
if (groupTableItem.flags.isUnselectable) {
result.push('!gl-cursor-default');
@@ -675,24 +672,20 @@ export default {
{{ s__('BulkImport|View import history') }}
- {{ s__('BulkImport|Select the groups and projects you want to import.') }}
-
-
+ {{ s__('BulkImport|Select the groups and projects you want to import.') }}
+
+ {{
+ content
+ }}
- {{
- content
- }}
-
-
+
+
-
+
-
@@ -784,6 +770,15 @@ export default {
+
+
+
+
-
+
@@ -834,7 +829,7 @@ export default {
v-gl-tooltip
:title="s__('BulkImport|Some groups will be imported without projects.')"
name="warning"
- class="gl-text-orange-500"
+ variant="warning"
data-testid="import-projects-warning"
/>
@@ -869,6 +864,7 @@ export default {
selectable
select-mode="multi"
selected-variant="primary"
+ stacked="lg"
@row-selected="preventSelectingAlreadyImportedGroups"
>
@@ -911,13 +907,13 @@ export default {
/>
-
-
+
+
+
+
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 44ece5640608e31ccfde04a8edf5efdcdbf546dc..c89f4c36e1201830ad54fbb3d5c7357f247cdf40 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10770,6 +10770,9 @@ msgstr ""
msgid "BulkImport|Import without projects"
msgstr ""
+msgid "BulkImport|Importing projects is a %{docsLinkStart}beta%{docsLinkEnd} feature."
+msgstr ""
+
msgid "BulkImport|Importing the group failed."
msgstr ""
@@ -10830,9 +10833,6 @@ msgstr ""
msgid "BulkImport|Placeholder reassignments completed with errors"
msgstr ""
-msgid "BulkImport|Please note: importing projects is a %{docsLinkStart}beta%{docsLinkEnd} feature."
-msgstr ""
-
msgid "BulkImport|Please select a parent group."
msgstr ""
diff --git a/spec/frontend/import_entities/import_groups/components/import_history_link_spec.js b/spec/frontend/import_entities/import_groups/components/import_history_link_spec.js
index 7b88c1d444910ba206f84f234f898ca43322e047..b6ae3bba85d75f41783788e277542a25f006f3e3 100644
--- a/spec/frontend/import_entities/import_groups/components/import_history_link_spec.js
+++ b/spec/frontend/import_entities/import_groups/components/import_history_link_spec.js
@@ -1,5 +1,5 @@
import { shallowMount } from '@vue/test-utils';
-import { GlLink } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
import ImportHistoryLink from '~/import_entities/import_groups/components/import_history_link.vue';
@@ -17,7 +17,7 @@ describe('import history link', () => {
});
};
- const findGlLink = () => wrapper.findComponent(GlLink);
+ const findButton = () => wrapper.findComponent(GlButton);
it('renders link with href', () => {
const mockId = 174;
@@ -28,7 +28,7 @@ describe('import history link', () => {
},
});
- expect(findGlLink().text()).toBe('Migration details >');
- expect(findGlLink().attributes('href')).toBe('/import/174/history');
+ expect(findButton().text()).toBe('Migration details');
+ expect(findButton().attributes('href')).toBe('/import/174/history');
});
});