Merge branch 'afontaine/update-text-on-project-modal-env-dashboard' into 'master'

Add helpful text to project select modal

See merge request gitlab-org/gitlab!73766

ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue

@@ -31,6 +31,9 @@ export default {
   ),
 
   viewDocumentationButton: __('View documentation'),
+  informationText: s__(
+    'EnvironmentsDashboard|This dashboard displays 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{linkStart}More information%{linkEnd}',
+  ),
 
   components: {
     Environment,
@@ -165,6 +168,19 @@ export default {
       @hidden="onModalHidden"
       @ok="onOk"
     >
+      <p>
+        <gl-sprintf :message="$options.informationText">
+          <template #link="{ content }">
+            <gl-link
+              :href="environmentsDashboardHelpPath"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {{ content }}
+            </gl-link>
+          </template>
+        </gl-sprintf>
+      </p>
       <project-selector
         ref="projectSelector"
         :project-search-results="projectSearchResults"
@@ -188,16 +204,10 @@ export default {
       </gl-button>
     </div>
     <p class="mt-2 mb-4 js-page-limits-message">
-      <gl-sprintf
-        :message="
-          s__(
-            'EnvironmentsDashboard|This dashboard displays 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{readMoreLink}',
-          )
-        "
-      >
-        <template #readMoreLink>
+      <gl-sprintf :message="$options.informationText">
+        <template #link="{ content }">
           <gl-link :href="environmentsDashboardHelpPath" target="_blank" rel="noopener noreferrer">
-            {{ s__('EnvironmentsDashboard|More information') }}
+            {{ content }}
           </gl-link>
         </template>
       </gl-sprintf>

ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap

@@ -15,6 +15,19 @@ exports[`dashboard should match the snapshot 1`] = `
     title="Add projects"
     titletag="h4"
   >
+    <p>
+      This dashboard displays 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. 
+      <gl-link-stub
+        href="/help/user/operations_dashboard/index.html"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        
+            More information
+          
+      </gl-link-stub>
+    </p>
+     
     <project-selector-stub
       maxlistheight="402"
       projectsearchresults=""

locale/gitlab.pot

@@ -13050,16 +13050,13 @@ msgstr ""
 msgid "EnvironmentsDashboard|More actions"
 msgstr ""
 
-msgid "EnvironmentsDashboard|More information"
-msgstr ""
-
 msgid "EnvironmentsDashboard|Remove"
 msgstr ""
 
 msgid "EnvironmentsDashboard|The environments dashboard provides a summary of each project's environments' status, including pipeline and alert statuses."
 msgstr ""
 
-msgid "EnvironmentsDashboard|This dashboard displays 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{readMoreLink}"
+msgid "EnvironmentsDashboard|This dashboard displays 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{linkStart}More information%{linkEnd}"
 msgstr ""
 
 msgid "Environments|An error occurred while canceling the auto stop, please try again"