From 819b875dd0788d909957e48997798b0478becd6f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Mon, 19 Oct 2020 10:40:59 +0200
Subject: [PATCH] fix: hubl-804

---
 .gitlab-ci.yml                 |  1 +
 src/menu-left.pug              | 50 ++++++++++++++++------------------
 src/styles/base/menu-left.scss | 12 ++++----
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ada6528..cbb1b51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,6 +100,7 @@ test3:
   script:
     - echo "$APP_CONFIG_TEST3" > config.json
     - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
+    - sed -i -E 's/component-chat@([0-9]+).([0-9]+)/component-chat@beta/g' src/dependencies.pug
     - npm run build
     - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* test3@astral.startinblox.com:~/front/
   only:
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 5b19711..65874d8 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -21,31 +21,33 @@ solid-widget(name='hubl-create')
 
 solid-widget(name='hubl-menu-fix-url-circle')
   template
-    solid-display(
-      data-src='${value}'
-      fields='status, name, jabberID, badge'
-      value-badge='${value}'
-      widget-status='hubl-menu-publicprivate'
-      widget-badge='hubl-counter'
-      widget-jabberID='hubl-menu-jabberid'
-      widget-name='solid-display-div'
-      order-by="name"
-    )
+    solid-link(data-src="${value}" next="circle")
+      solid-display(
+        data-src='${value}'
+        fields='status, name, jabberID, badge'
+        value-badge='${value}'
+        widget-status='hubl-menu-publicprivate'
+        widget-badge='hubl-counter'
+        widget-jabberID='hubl-menu-jabberid'
+        widget-name='solid-display-div'
+        order-by="name"
+      )
 
 solid-widget(name='hubl-menu-fix-url-project')
   template
-    solid-display(
-      data-src='${value}'
-      fields='status, project(customer.name, name, jabberID), badge'
-      class-name='project-name'
-      class-customer.name='project-customer'
-      value-badge='${value}'
-      widget-status='hubl-menu-publicprivate'
-      widget-jabberID='hubl-menu-jabberid'
-      widget-badge='hubl-counter'
-      widget-name='solid-display-div'
-      order-by="customer.name"
-    )
+    solid-link(data-src="${value}" next="project")
+      solid-display(
+        data-src='${value}'
+        fields='status, project(customer.name, name, jabberID), badge'
+        class-name='project-name'
+        class-customer.name='project-customer'
+        value-badge='${value}'
+        widget-status='hubl-menu-publicprivate'
+        widget-jabberID='hubl-menu-jabberid'
+        widget-badge='hubl-counter'
+        widget-name='solid-display-div'
+        order-by="customer.name"
+      )
 
 
 solid-router#navbar-router(default-route='dashboard')
@@ -94,8 +96,6 @@ solid-router#navbar-router(default-route='dashboard')
           empty-widget='hubl-create'
           empty-value='projet'
           widget-project='hubl-menu-fix-url-project'
-          order-by='project.customer.name'
-          next='project'
         )
     div.divider
   if endpoints.circles || (endpoints.get && endpoints.get.circles)
@@ -123,8 +123,6 @@ solid-router#navbar-router(default-route='dashboard')
           empty-widget='hubl-create'
           empty-value='cercle'
           widget-circle='hubl-menu-fix-url-circle'
-          order-by='circle.name'
-          next='circle'
         )
     div.divider
   if endpoints.users || (endpoints.get && endpoints.get.users)
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 6996fb6..27daa84 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -238,8 +238,8 @@
             color: var(--color-white);
             cursor: pointer;
 
-            >hubl-menu-fix-url-circle>solid-display>div,
-            >hubl-menu-fix-url-project>solid-display>div {
+            >hubl-menu-fix-url-circle>solid-link>solid-display>div,
+            >hubl-menu-fix-url-project>solid-link>solid-display>div {
               padding: 1rem 1rem 1rem 3rem;
             }
           }
@@ -250,8 +250,8 @@
         }
 
         &>solid-display[active]>div,
-        &>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div,
-        &>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div {
+        &>solid-display>div>hubl-menu-fix-url-circle>solid-link>solid-display[active]>div,
+        &>solid-display>div>hubl-menu-fix-url-project>solid-link>solid-display[active]>div {
           background-color: var(--color-menu-highlight-primary);
           color: var(--color-menu-text-active);
           font-weight: bold;
@@ -266,8 +266,8 @@
         }
 
         >solid-display>div>solid-display>div,
-        >solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div,
-        >solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div {
+        >solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-link>solid-display>div,
+        >solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-link>solid-display>div {
           display: flex;
           justify-content: space-between;
         }