Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 34 insertions, 10 deletions

diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index cbce887f491..f82d3065ca5 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -188,15 +188,37 @@ export default {
         </div>
 
         <template v-else>
-          <div
-            is="environment-item"
-            v-for="(children, index) in model.children"
-            :key="`env-item-${i}-${index}`"
-            :model="children"
-            :can-read-environment="canReadEnvironment"
-            :table-data="tableData"
-            data-qa-selector="environment_item"
-          />
+          <template v-for="(child, index) in model.children">
+            <div
+              is="environment-item"
+              :key="`environment-row-${i}-${index}`"
+              :model="child"
+              :can-read-environment="canReadEnvironment"
+              :table-data="tableData"
+              data-qa-selector="environment_item"
+            />
+
+            <div
+              v-if="shouldRenderDeployBoard(child)"
+              :key="`deploy-board-row-${i}-${index}`"
+              class="js-deploy-board-row"
+            >
+              <div class="deploy-board-container">
+                <deploy-board
+                  :deploy-board-data="child.deployBoardData"
+                  :is-loading="child.isLoadingDeployBoard"
+                  :is-empty="child.isEmptyDeployBoard"
+                  :logs-path="child.logs_path"
+                  @changeCanaryWeight="changeCanaryWeight(child, $event)"
+                />
+              </div>
+            </div>
+            <environment-alert
+              v-if="shouldRenderAlert(model)"
+              :key="`alert-row-${i}-${index}`"
+              :environment="child"
+            />
+          </template>
 
           <div :key="`sub-div-${i}`">
             <div class="text-center gl-mt-3">
diff --git a/app/assets/javascripts/environments/stores/environments_store.js b/app/assets/javascripts/environments/stores/environments_store.js
index f7fdbb03f04..a67e44b3348 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js
+++ b/app/assets/javascripts/environments/stores/environments_store.js
@@ -185,6 +185,8 @@ export default class EnvironmentsStore {
 
       updated.isChildren = true;
 
+      updated = setDeployBoard(env, updated);
+
       return updated;
     });
 
diff --git a/app/assets/javascripts/environments/stores/helpers.js b/app/assets/javascripts/environments/stores/helpers.js
index 89457da0614..3330edd8830 100644
--- a/app/assets/javascripts/environments/stores/helpers.js
+++ b/app/assets/javascripts/environments/stores/helpers.js
@@ -4,7 +4,7 @@
  */
 export const setDeployBoard = (oldEnvironmentState, environment) => {
   let parsedEnvironment = environment;
-  if (environment.size === 1 && environment.rollout_status) {
+  if (!environment.isFolder && environment.rollout_status) {
     parsedEnvironment = {
       ...environment,
       hasDeployBoard: true,