Merge branch...

Merge branch '299509-improve-the-location-of-where-the-runner-registration-information-lives' into 'master'

Remove redundant help text from runners

See merge request gitlab-org/gitlab!71915

app/assets/javascripts/runner/admin_runners/admin_runners_app.vue

@@ -9,7 +9,6 @@ import RunnerList from '../components/runner_list.vue';
 import RunnerManualSetupHelp from '../components/runner_manual_setup_help.vue';
 import RunnerName from '../components/runner_name.vue';
 import RunnerPagination from '../components/runner_pagination.vue';
-import RunnerTypeHelp from '../components/runner_type_help.vue';
 import { statusTokenConfig } from '../components/search_tokens/status_token_config';
 import { tagTokenConfig } from '../components/search_tokens/tag_token_config';
 import { typeTokenConfig } from '../components/search_tokens/type_token_config';
@@ -29,7 +28,6 @@ export default {
     RunnerFilteredSearchBar,
     RunnerList,
     RunnerManualSetupHelp,
-    RunnerTypeHelp,
     RunnerName,
     RunnerPagination,
   },
@@ -128,17 +126,10 @@ export default {
 </script>
 <template>
   <div>
-    <div class="row">
-      <div class="col-sm-6">
-        <runner-type-help />
-      </div>
-      <div class="col-sm-6">
-        <runner-manual-setup-help
-          :registration-token="registrationToken"
-          :type="$options.INSTANCE_TYPE"
-        />
-      </div>
-    </div>
+    <runner-manual-setup-help
+      :registration-token="registrationToken"
+      :type="$options.INSTANCE_TYPE"
+    />
 
     <runner-filtered-search-bar
       v-model="search"

app/assets/javascripts/runner/components/runner_type_help.vue

-<script>
-import {
-  INSTANCE_TYPE,
-  GROUP_TYPE,
-  PROJECT_TYPE,
-  I18N_INSTANCE_RUNNER_DESCRIPTION,
-  I18N_GROUP_RUNNER_DESCRIPTION,
-  I18N_PROJECT_RUNNER_DESCRIPTION,
-  I18N_LOCKED_RUNNER_DESCRIPTION,
-  I18N_PAUSED_RUNNER_DESCRIPTION,
-} from '../constants';
-import RunnerTypeBadge from './runner_type_badge.vue';
-import RunnerStateLockedBadge from './runner_state_locked_badge.vue';
-import RunnerStatePausedBadge from './runner_state_paused_badge.vue';
-
-export default {
-  components: {
-    RunnerTypeBadge,
-    RunnerStateLockedBadge,
-    RunnerStatePausedBadge,
-  },
-  runnerTypes: {
-    INSTANCE_TYPE,
-    GROUP_TYPE,
-    PROJECT_TYPE,
-  },
-  i18n: {
-    I18N_INSTANCE_RUNNER_DESCRIPTION,
-    I18N_GROUP_RUNNER_DESCRIPTION,
-    I18N_PROJECT_RUNNER_DESCRIPTION,
-    I18N_LOCKED_RUNNER_DESCRIPTION,
-    I18N_PAUSED_RUNNER_DESCRIPTION,
-  },
-};
-</script>
-
-<template>
-  <div class="bs-callout">
-    <p>{{ __('Runners are processes that pick up and execute CI/CD jobs for GitLab.') }}</p>
-    <p>
-      {{
-        __(
-          'You can register runners as separate users, on separate servers, and on your local machine. Register as many runners as you want.',
-        )
-      }}
-    </p>
-
-    <div>
-      <span> {{ __('Runners can be:') }}</span>
-      <ul>
-        <li>
-          <runner-type-badge :type="$options.runnerTypes.INSTANCE_TYPE" size="sm" />
-          - {{ $options.i18n.I18N_INSTANCE_RUNNER_DESCRIPTION }}
-        </li>
-        <li>
-          <runner-type-badge :type="$options.runnerTypes.GROUP_TYPE" size="sm" />
-          - {{ $options.i18n.I18N_GROUP_RUNNER_DESCRIPTION }}
-        </li>
-        <li>
-          <runner-type-badge :type="$options.runnerTypes.PROJECT_TYPE" size="sm" />
-          - {{ $options.i18n.I18N_PROJECT_RUNNER_DESCRIPTION }}
-        </li>
-        <li>
-          <runner-state-locked-badge size="sm" />
-          - {{ $options.i18n.I18N_LOCKED_RUNNER_DESCRIPTION }}
-        </li>
-        <li>
-          <runner-state-paused-badge size="sm" />
-          - {{ $options.i18n.I18N_PAUSED_RUNNER_DESCRIPTION }}
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>

app/assets/javascripts/runner/group_runners/group_runners_app.vue

@@ -10,7 +10,6 @@ import RunnerList from '../components/runner_list.vue';
 import RunnerManualSetupHelp from '../components/runner_manual_setup_help.vue';
 import RunnerName from '../components/runner_name.vue';
 import RunnerPagination from '../components/runner_pagination.vue';
-import RunnerTypeHelp from '../components/runner_type_help.vue';
 
 import { statusTokenConfig } from '../components/search_tokens/status_token_config';
 import { typeTokenConfig } from '../components/search_tokens/type_token_config';
@@ -36,7 +35,6 @@ export default {
     RunnerList,
     RunnerManualSetupHelp,
     RunnerName,
-    RunnerTypeHelp,
     RunnerPagination,
   },
   props: {
@@ -146,17 +144,7 @@ export default {
 
 <template>
   <div>
-    <div class="row">
-      <div class="col-sm-6">
-        <runner-type-help />
-      </div>
-      <div class="col-sm-6">
-        <runner-manual-setup-help
-          :registration-token="registrationToken"
-          :type="$options.GROUP_TYPE"
-        />
-      </div>
-    </div>
+    <runner-manual-setup-help :registration-token="registrationToken" :type="$options.GROUP_TYPE" />
 
     <runner-filtered-search-bar
       v-model="search"

locale/gitlab.pot

@@ -29241,9 +29241,6 @@ msgstr ""
 msgid "Runners are processes that pick up and execute CI/CD jobs for GitLab."
 msgstr ""
 
-msgid "Runners can be:"
-msgstr ""
-
 msgid "Runners currently online: %{active_runners_count}"
 msgstr ""
 
@@ -38863,9 +38860,6 @@ msgstr ""
 msgid "You can recover this project until %{date}"
 msgstr ""
 
-msgid "You can register runners as separate users, on separate servers, and on your local machine. Register as many runners as you want."
-msgstr ""
-
 msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
 msgstr ""
 

spec/frontend/runner/admin_runners/admin_runners_app_spec.js

@@ -14,7 +14,6 @@ import RunnerFilteredSearchBar from '~/runner/components/runner_filtered_search_
 import RunnerList from '~/runner/components/runner_list.vue';
 import RunnerManualSetupHelp from '~/runner/components/runner_manual_setup_help.vue';
 import RunnerPagination from '~/runner/components/runner_pagination.vue';
-import RunnerTypeHelp from '~/runner/components/runner_type_help.vue';
 
 import {
   ADMIN_FILTERED_SEARCH_NAMESPACE,
@@ -51,7 +50,6 @@ describe('AdminRunnersApp', () => {
   let wrapper;
   let mockRunnersQuery;
 
-  const findRunnerTypeHelp = () => wrapper.findComponent(RunnerTypeHelp);
   const findRunnerManualSetupHelp = () => wrapper.findComponent(RunnerManualSetupHelp);
   const findRunnerList = () => wrapper.findComponent(RunnerList);
   const findRunnerPagination = () => extendedWrapper(wrapper.findComponent(RunnerPagination));
@@ -88,10 +86,6 @@ describe('AdminRunnersApp', () => {
     wrapper.destroy();
   });
 
-  it('shows the runner type help', () => {
-    expect(findRunnerTypeHelp().exists()).toBe(true);
-  });
-
   it('shows the runner setup instructions', () => {
     expect(findRunnerManualSetupHelp().props('registrationToken')).toBe(mockRegistrationToken);
   });

spec/frontend/runner/components/runner_type_help_spec.js

-import { GlBadge } from '@gitlab/ui';
-import { mount } from '@vue/test-utils';
-import RunnerTypeHelp from '~/runner/components/runner_type_help.vue';
-
-describe('RunnerTypeHelp', () => {
-  let wrapper;
-
-  const findBadges = () => wrapper.findAllComponents(GlBadge);
-
-  const createComponent = () => {
-    wrapper = mount(RunnerTypeHelp);
-  };
-
-  beforeEach(() => {
-    createComponent();
-  });
-
-  afterEach(() => {
-    wrapper.destroy();
-  });
-
-  it('Displays each of the runner types', () => {
-    expect(findBadges().at(0).text()).toBe('shared');
-    expect(findBadges().at(1).text()).toBe('group');
-    expect(findBadges().at(2).text()).toBe('specific');
-  });
-
-  it('Displays runner states', () => {
-    expect(findBadges().at(3).text()).toBe('locked');
-    expect(findBadges().at(4).text()).toBe('paused');
-  });
-});

spec/frontend/runner/group_runners/group_runners_app_spec.js

@@ -13,7 +13,6 @@ import RunnerFilteredSearchBar from '~/runner/components/runner_filtered_search_
 import RunnerList from '~/runner/components/runner_list.vue';
 import RunnerManualSetupHelp from '~/runner/components/runner_manual_setup_help.vue';
 import RunnerPagination from '~/runner/components/runner_pagination.vue';
-import RunnerTypeHelp from '~/runner/components/runner_type_help.vue';
 
 import {
   CREATED_ASC,
@@ -49,7 +48,6 @@ describe('GroupRunnersApp', () => {
   let wrapper;
   let mockGroupRunnersQuery;
 
-  const findRunnerTypeHelp = () => wrapper.findComponent(RunnerTypeHelp);
   const findRunnerManualSetupHelp = () => wrapper.findComponent(RunnerManualSetupHelp);
   const findRunnerList = () => wrapper.findComponent(RunnerList);
   const findRunnerPagination = () => extendedWrapper(wrapper.findComponent(RunnerPagination));
@@ -83,10 +81,6 @@ describe('GroupRunnersApp', () => {
     await waitForPromises();
   });
 
-  it('shows the runner type help', () => {
-    expect(findRunnerTypeHelp().exists()).toBe(true);
-  });
-
   it('shows the runner setup instructions', () => {
     expect(findRunnerManualSetupHelp().props('registrationToken')).toBe(mockRegistrationToken);
   });