Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

4 files changed, 13 insertions, 14 deletions

diff --git a/app/assets/javascripts/environments/components/enable_review_app_modal.vue b/app/assets/javascripts/environments/components/enable_review_app_modal.vue
index 4d43ee156fb..6343fe8702a 100644
--- a/app/assets/javascripts/environments/components/enable_review_app_modal.vue
+++ b/app/assets/javascripts/environments/components/enable_review_app_modal.vue
@@ -45,6 +45,8 @@ export default {
     copyToClipboardText: s__('EnableReviewApp|Copy snippet text'),
     title: s__('ReviewApp|Enable Review App'),
   },
+  visualReviewsDocs: helpPagePath('ci/review_apps/index.md', { anchor: 'visual-reviews' }),
+  connectClusterDocs: helpPagePath('user/clusters/agent/index'),
   data() {
     const modalInfoCopyId = uniqueId('enable-review-app-copy-string-');
 
@@ -64,9 +66,6 @@ export default {
   except:
     - ${this.defaultBranchName}`;
     },
-    visualReviewsDocs() {
-      return helpPagePath('ci/review_apps/index.md', { anchor: 'visual-reviews' });
-    },
   },
 };
 </script>
@@ -88,11 +87,7 @@ export default {
           <strong>{{ content }}</strong>
         </template>
         <template #link="{ content }">
-          <gl-link
-            href="https://docs.gitlab.com/ee/user/project/clusters/add_remove_clusters.html"
-            target="_blank"
-            >{{ content }}</gl-link
-          >
+          <gl-link :href="$options.connectClusterDocs" target="_blank">{{ content }}</gl-link>
         </template>
       </gl-sprintf>
     </p>
@@ -134,7 +129,7 @@ export default {
           <strong>{{ content }}</strong>
         </template>
         <template #link="{ content }">
-          <gl-link :href="visualReviewsDocs" target="_blank">{{ content }}</gl-link>
+          <gl-link :href="$options.visualReviewsDocs" target="_blank">{{ content }}</gl-link>
         </template>
       </gl-sprintf>
     </p>
diff --git a/app/assets/javascripts/environments/components/environment_folder.vue b/app/assets/javascripts/environments/components/environment_folder.vue
index d5c6d26cfd0..788c3ba6fed 100644
--- a/app/assets/javascripts/environments/components/environment_folder.vue
+++ b/app/assets/javascripts/environments/components/environment_folder.vue
@@ -34,9 +34,6 @@ export default {
       variables() {
         return { environment: this.nestedEnvironment.latest, scope: this.scope };
       },
-      pollInterval() {
-        return this.interval;
-      },
     },
     interval: {
       query: pollIntervalQuery,
@@ -73,6 +70,11 @@ export default {
   methods: {
     toggleCollapse() {
       this.visible = !this.visible;
+      if (this.visible) {
+        this.$apollo.queries.folder.startPolling(this.interval);
+      } else {
+        this.$apollo.queries.folder.stopPolling();
+      }
     },
     isFirstEnvironment(index) {
       return index === 0;
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 7b8b756487b..7fcd6e5fff8 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -146,7 +146,7 @@ export default {
         {{ tableData.autoStop.title }}
       </div>
     </div>
-    <template v-for="(model, i) in sortedEnvironments" :model="model">
+    <template v-for="(model, i) in sortedEnvironments">
       <environment-item
         :key="`environment-item-${i}`"
         :model="model"
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.vue b/app/assets/javascripts/environments/folder/environments_folder_view.vue
index 3c608ad0ba9..adb14ce3d6f 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue
@@ -54,7 +54,9 @@ export default {
         :key="`${tab.name}-${i}`"
         :active="tab.isActive"
         :title-item-class="tab.isActive ? 'gl-outline-none' : ''"
-        :title-link-attributes="{ 'data-testid': `environments-tab-${tab.scope}` }"
+        :title-link-attributes="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
+          'data-testid': `environments-tab-${tab.scope}`,
+        } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
         @click="onChangeTab(tab.scope)"
       >
         <template #title>