From b7d5229534faf0727ab257ca53bd7d823b8b1ceb Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Wed, 10 May 2023 10:54:41 -0700
Subject: [PATCH] fix: fixes logic for extracing swarm ids. fixed #2184 (#2185)

---
 assets/components/LogViewer/ContainerTitle.vue | 2 +-
 assets/components/SideMenu.vue                 | 2 +-
 assets/models/Container.ts                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/components/LogViewer/ContainerTitle.vue b/assets/components/LogViewer/ContainerTitle.vue
index c541e72e..7b2ab0c4 100644
--- a/assets/components/LogViewer/ContainerTitle.vue
+++ b/assets/components/LogViewer/ContainerTitle.vue
@@ -4,7 +4,7 @@
       <container-health :health="container.health"></container-health>
     </div>
     <div class="column is-ellipsis">
-      {{ container.name }}<span v-if="container.isSwarm">.{{ container.swarmId }}</span>
+      {{ container.name }}<span v-if="container.isSwarm">{{ container.swarmId }}</span>
       <span class="tag is-dark">{{ container.image.replace(/@sha.*/, "") }}</span>
     </div>
   </div>
diff --git a/assets/components/SideMenu.vue b/assets/components/SideMenu.vue
index 97492431..f71e594c 100644
--- a/assets/components/SideMenu.vue
+++ b/assets/components/SideMenu.vue
@@ -66,7 +66,7 @@
             <div class="container is-flex is-align-items-center">
               <div class="is-flex-grow-1 is-ellipsis">
                 <span>{{ item.name }}</span
-                ><span class="has-text-weight-light has-light-opacity" v-if="item.isSwarm">.{{ item.swarmId }}</span>
+                ><span class="has-text-weight-light has-light-opacity" v-if="item.isSwarm">{{ item.swarmId }}</span>
               </div>
               <div class="is-flex-shrink-1 is-flex icons">
                 <div
diff --git a/assets/models/Container.ts b/assets/models/Container.ts
index 81de2de7..55380f11 100644
--- a/assets/models/Container.ts
+++ b/assets/models/Container.ts
@@ -29,7 +29,7 @@ export class Container {
 
     if (match) {
       this.swarmId = match[1];
-      this.name = name.replace(`.${this.swarmId}`, "");
+      this.name = name.replace(`${this.swarmId}`, "");
       this.isSwarm = true;
     }
   }