From c72948efc18eb6bc378da168b069c783adce2cee Mon Sep 17 00:00:00 2001
From: Julien Calixte <julienc@bam.tech>
Date: Sun, 30 Jul 2023 16:44:42 +0200
Subject: [PATCH] fix feature steps glitch

---
 src/modules/FlowArticle.vue                   | 13 +++--
 src/modules/feature/FeatureStep.vue           | 58 ++++++++++++++-----
 src/modules/feature/FeatureSteps.vue          |  2 +-
 src/modules/feature/FlowDashboard.vue         |  9 +--
 .../simulation/SimulationDashboard.vue        |  5 +-
 src/modules/simulation/simulation-store.ts    |  2 +
 6 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/src/modules/FlowArticle.vue b/src/modules/FlowArticle.vue
index 1919f08..cb5fea7 100644
--- a/src/modules/FlowArticle.vue
+++ b/src/modules/FlowArticle.vue
@@ -15,11 +15,9 @@ import SimulationDashboard from '@/modules/simulation/SimulationDashboard.vue'
     <FlowHypothesis class="text" />
     <SeparatorIcon />
     <FeatureSteps alias="introducing" />
-    <SeparatorIcon />
-    <FlowDashboard />
+    <FlowDashboard class="above" />
     <FeatureSteps alias="playground" />
-    <SeparatorIcon />
-    <SimulationControls />
+    <SimulationControls class="above" />
     <SimulationDashboard />
   </div>
 </template>
@@ -27,6 +25,7 @@ import SimulationDashboard from '@/modules/simulation/SimulationDashboard.vue'
 <style lang="scss">
 .flow-article {
   color: black;
+  background-color: white;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -40,5 +39,11 @@ import SimulationDashboard from '@/modules/simulation/SimulationDashboard.vue'
     margin: auto;
     text-align: justify;
   }
+
+  .above {
+    z-index: 1;
+    padding-top: 1rem;
+    background-color: white;
+  }
 }
 </style>
diff --git a/src/modules/feature/FeatureStep.vue b/src/modules/feature/FeatureStep.vue
index 5a370e9..fa02c80 100644
--- a/src/modules/feature/FeatureStep.vue
+++ b/src/modules/feature/FeatureStep.vue
@@ -2,7 +2,8 @@
 import FeatureItem from '@/modules/feature/FeatureItem.vue'
 import { Feature } from '@/modules/feature/feature'
 import { FeatureStep } from '@/modules/feature/feature-steps'
-import { computed } from 'vue'
+import { useElementSize } from '@vueuse/core'
+import { computed, ref } from 'vue'
 import { Starport } from 'vue-starport'
 
 const props = defineProps<{
@@ -14,20 +15,26 @@ const featuresInProgress = computed(() =>
   props.features.filter((feature) => feature.status === 'doing')
 )
 const featuresDone = computed(() =>
-  props.features
-    .filter((feature) => feature.status === 'done')
-    .sort((a, b) => (a.leadTime > b.leadTime ? -1 : 1))
+  props.features.filter((feature) => feature.status === 'done')
 )
 
-const remainingBlueBins = computed(() =>
-  Math.max(0, props.step.blueBins - featuresDone.value.length)
-)
 const hasFeaturesInProgress = computed(
   () => featuresInProgress.value.length > 0
 )
 const isLive = computed(
   () => props.step.title.toLocaleLowerCase() === 'release'
 )
+
+const binContainer = ref<HTMLElement | null>(null)
+
+const { width } = useElementSize(binContainer)
+
+const binContainerWidth = computed(() => {
+  if (!width) {
+    return ''
+  }
+  return `width: ${width.value}px`
+})
 </script>
 
 <template>
@@ -48,14 +55,18 @@ const isLive = computed(
     </section>
     <section class="done">
       <h5>✅ [{{ featuresDone.length }}]</h5>
-      <div>
-        <div v-if="!isLive" class="blue-bin-container">
+      <div ref="binContainer">
+        <div
+          v-if="!isLive"
+          class="blue-bin-container"
+          :style="binContainerWidth"
+        >
           <div
-            v-for="blueBin in remainingBlueBins"
+            v-for="blueBin in step.blueBins"
             :key="blueBin"
             class="bin blue-bin"
           >
-            Blue bin
+            blue bin
           </div>
         </div>
         <div v-if="isLive" class="live">
@@ -72,7 +83,7 @@ const isLive = computed(
           <li v-for="feature in featuresDone" :key="feature.name">
             <Starport
               :port="`${props.prefix}-${feature.name}`"
-              style="height: calc(var(--feature-item-height) + 0.2rem)"
+              style="height: var(--feature-item-height)"
             >
               <FeatureItem :feature="feature" :is-live="isLive" />
             </Starport>
@@ -120,12 +131,29 @@ const isLive = computed(
     color: var(--color);
   }
 
-  li {
+  ul {
+    margin-top: 0.5rem;
+    display: flex;
     flex-direction: column;
+    gap: 1rem;
+
+    li {
+      z-index: 1;
+    }
   }
 
-  .done-list {
-    flex: 1;
+  .bin {
+    height: var(--feature-item-height);
+    border: none;
+  }
+
+  .blue-bin-container {
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    margin-top: 0.5rem;
+    z-index: 0;
   }
 
   .live {
diff --git a/src/modules/feature/FeatureSteps.vue b/src/modules/feature/FeatureSteps.vue
index 162e325..dcd6128 100644
--- a/src/modules/feature/FeatureSteps.vue
+++ b/src/modules/feature/FeatureSteps.vue
@@ -33,7 +33,7 @@ onMounted(() => featureStore.initBoard(NUMBER_OF_FEATURES))
   align-items: stretch;
   margin: 0 1rem;
   border: 3px solid var(--primary-color);
-  height: 50vh;
+  height: 60vh;
   width: 100%;
   overflow-y: hidden;
 
diff --git a/src/modules/feature/FlowDashboard.vue b/src/modules/feature/FlowDashboard.vue
index 9f8eab0..3168c47 100644
--- a/src/modules/feature/FlowDashboard.vue
+++ b/src/modules/feature/FlowDashboard.vue
@@ -14,9 +14,8 @@ const featureStore = useFeatureStore()
       <div class="card">
         Features
         <span class="numeric">
-          {{ featureStore.totalFeaturesDone }}/<span class="sub">
-            {{ featureStore.totalFeaturesCount }}
-          </span>
+          {{ featureStore.totalFeaturesDone
+          }}<span class="sub">/{{ featureStore.totalFeaturesCount }} </span>
         </span>
       </div>
       <div class="card">
@@ -94,10 +93,6 @@ const featureStore = useFeatureStore()
     justify-content: center;
   }
 
-  .sub {
-    font-size: 12pt;
-  }
-
   .cards {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/modules/simulation/SimulationDashboard.vue b/src/modules/simulation/SimulationDashboard.vue
index 14cacbc..63f2d1c 100644
--- a/src/modules/simulation/SimulationDashboard.vue
+++ b/src/modules/simulation/SimulationDashboard.vue
@@ -11,9 +11,8 @@ const strategies: Strategy[] = ['push', 'pull', 'push-dps', 'pull-dps']
   <div class="simulation-dashboard">
     <h3>Dashboard</h3>
     <h4>
-      {{ simulationStore.simulationsDone }}/{{
-        simulationStore.requestedSimulation
-      }}
+      {{ simulationStore.simulationsDone
+      }}<span class="sub">/{{ simulationStore.requestedSimulation }}</span>
       simulations
     </h4>
     <table>
diff --git a/src/modules/simulation/simulation-store.ts b/src/modules/simulation/simulation-store.ts
index e7e6a46..910169d 100644
--- a/src/modules/simulation/simulation-store.ts
+++ b/src/modules/simulation/simulation-store.ts
@@ -119,6 +119,8 @@ export const useSimulationStore = defineStore('dashboard', {
       this.mean.pull = newMean()
       this.mean['pull-dps'] = newMean()
       this.mean['push-dps'] = newMean()
+      this.simulationsDone = 0
+      this.requestedSimulation = 0
     }
   },
   getters: {