From 7e4e5ec6e4c35853db87f8618ff7567eb4e7359b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Doumenjou <jb.doumenjou@gmail.com>
Date: Wed, 9 Oct 2019 17:34:05 +0200
Subject: [PATCH] Add a service sticky details vue component

---
 .../_commons/PanelServiceDetails.vue          | 48 +++++--------
 .../_commons/StickyServiceDetails.vue         | 68 +++++++++++++++++++
 2 files changed, 84 insertions(+), 32 deletions(-)
 create mode 100644 webui/src/components/_commons/StickyServiceDetails.vue

diff --git a/webui/src/components/_commons/PanelServiceDetails.vue b/webui/src/components/_commons/PanelServiceDetails.vue
index 7acfe1045..9bde9603d 100644
--- a/webui/src/components/_commons/PanelServiceDetails.vue
+++ b/webui/src/components/_commons/PanelServiceDetails.vue
@@ -54,37 +54,8 @@
         </div>
       </q-card-section>
 
-      <q-separator v-if="data.weighted && data.weighted.sticky" />
-      <q-card-section v-if="data.weighted && data.weighted.sticky" >
-        <div class="row items-start no-wrap">
-          <div class="text-subtitle1">Sticky: Cookie</div>
-        </div>
-      </q-card-section>
-      <q-card-section v-if="data.weighted && data.weighted.sticky" >
-        <div class="row items-start no-wrap">
-          <div class="col" v-if="data.weighted.sticky.cookie && data.weighted.sticky.cookie.name">
-            <div class="text-subtitle2">NAME</div>
-            <q-chip
-              dense
-              class="app-chip app-chip-entry-points">
-              {{ data.weighted.sticky.cookie.name }}
-            </q-chip>
-          </div>
-        </div>
-      </q-card-section>
-      <q-card-section v-if="data.weighted && data.weighted.sticky" >
-        <div class="row items-start no-wrap">
-          <div class="col">
-            <div class="text-subtitle2">SECURE</div>
-            <boolean-state :value="data.weighted.sticky.cookie.secure"/>
-          </div>
-
-          <div class="col">
-            <div class="text-subtitle2">HTTP Only</div>
-            <boolean-state :value="data.weighted.sticky.cookie.httpOnly"/>
-          </div>
-        </div>
-      </q-card-section>
+      <q-separator v-if="sticky" />
+      <StickyServiceDetails v-if="sticky" :sticky="sticky" :dense="dense"/>
     </q-scroll-area>
   </q-card>
 </template>
@@ -92,17 +63,30 @@
 <script>
 import AvatarState from './AvatarState'
 import BooleanState from './BooleanState'
+import StickyServiceDetails from './StickyServiceDetails'
 
 export default {
   name: 'PanelServiceDetails',
   props: ['data', 'dense'],
   components: {
     BooleanState,
-    AvatarState
+    AvatarState,
+    StickyServiceDetails
   },
   computed: {
     isDense () {
       return this.dense !== undefined
+    },
+    sticky () {
+      if (this.data.weighted && this.data.weighted.sticky) {
+        return this.data.weighted.sticky
+      }
+
+      if (this.data.loadBalancer && this.data.loadBalancer.sticky) {
+        return this.data.loadBalancer.sticky
+      }
+
+      return null
     }
   },
   filters: {
diff --git a/webui/src/components/_commons/StickyServiceDetails.vue b/webui/src/components/_commons/StickyServiceDetails.vue
new file mode 100644
index 000000000..bfdb8e5b1
--- /dev/null
+++ b/webui/src/components/_commons/StickyServiceDetails.vue
@@ -0,0 +1,68 @@
+<template>
+    <div>
+      <q-card-section>
+        <div class="row items-start no-wrap">
+          <div class="text-subtitle1">Sticky: Cookie </div>
+        </div>
+      </q-card-section>
+      <q-card-section>
+        <div class="row items-start no-wrap">
+          <div class="col" v-if="sticky.cookie && sticky.cookie.name">
+            <div class="text-subtitle2">NAME</div>
+            <q-chip
+              dense
+              class="app-chip app-chip-entry-points">
+              {{ sticky.cookie.name }}
+            </q-chip>
+          </div>
+        </div>
+      </q-card-section>
+      <q-card-section>
+        <div class="row items-start no-wrap">
+          <div class="col">
+            <div class="text-subtitle2">SECURE</div>
+            <boolean-state :value="sticky.cookie.secure"/>
+          </div>
+
+          <div class="col">
+            <div class="text-subtitle2">HTTP Only</div>
+            <boolean-state :value="sticky.cookie.httpOnly"/>
+          </div>
+        </div>
+      </q-card-section>
+    </div>
+</template>
+
+<script>
+import BooleanState from './BooleanState'
+
+export default {
+  name: 'StickyServiceDetails',
+  components: {
+    BooleanState
+  },
+  props: ['sticky', 'dense']
+}
+</script>
+<style scoped lang="scss">
+  @import "../../css/sass/variables";
+
+  .q-card__section {
+    padding: 24px;
+    + .q-card__section {
+      padding-top: 0;
+    }
+  }
+
+  .text-subtitle2 {
+    font-size: 11px;
+    color: $app-text-grey;
+    line-height: 16px;
+    margin-bottom: 4px;
+    text-align: left;
+    letter-spacing: 2px;
+    font-weight: 600;
+    text-transform: uppercase;
+  }
+
+</style>