Skip to content

Commit ecdf0b5

Browse files
committed
fix: remove unappealing gap when no tags are assigned to instances
1 parent 18afe94 commit ecdf0b5

File tree

2 files changed

+56
-45
lines changed

2 files changed

+56
-45
lines changed

spring-boot-admin-server-ui/src/main/frontend/views/applications/InstancesList.vue

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
v-for="instance in instances"
2121
:key="instance.id"
2222
:data-testid="instance.id"
23-
class="flex p-2 sm:pr-6 hover:bg-gray-100 gap-2 odd:bg-gray-50"
23+
class="flex p-2 sm:pr-6 hover:bg-gray-100 gap-2 odd:bg-gray-50 items-center"
2424
@click.stop="showDetails(instance)"
2525
>
2626
<div class="pt-1 md:w-16 text-center">
@@ -30,55 +30,59 @@
3030
/>
3131
</div>
3232
<div class="flex-1 overflow-hidden">
33-
<div class="flex gap-2 items-center">
34-
<div class="flex-1">
33+
<section class="flex gap-2 items-center">
34+
<div class="w-80" data-name="">
35+
<!-- Section when URLs are visible -->
3536
<template v-if="instance.showUrl()">
36-
<span
37-
v-text="
38-
instance.registration.serviceUrl ||
39-
instance.registration.healthUrl
40-
"
41-
/>
42-
<div class="ml-1 inline-flex gap-1">
43-
<sba-button
44-
as="a"
45-
:href="instance.registration.serviceUrl"
46-
size="2xs"
47-
referrerpolicy="no-referrer"
48-
target="_blank"
49-
>
50-
<font-awesome-icon :icon="faHome" size="xs" />
51-
</sba-button>
52-
<sba-button
53-
as="a"
54-
:href="instance.registration.managementUrl"
55-
size="2xs"
56-
referrerpolicy="no-referrer"
57-
target="_blank"
58-
>
59-
<font-awesome-icon :icon="faClipboardList" size="xs" />
60-
</sba-button>
61-
<sba-button
62-
as="a"
63-
:href="instance.registration.healthUrl"
64-
size="2xs"
65-
referrerpolicy="no-referrer"
66-
target="_blank"
67-
>
68-
<font-awesome-icon :icon="faHeart" size="xs" />
69-
</sba-button>
37+
<div class="flex gap-1">
38+
<div
39+
class="overflow-hidden text-ellipsis"
40+
v-text="
41+
instance.registration.serviceUrl ||
42+
instance.registration.healthUrl
43+
"
44+
/>
45+
<div class="ml-1 inline-flex gap-1">
46+
<sba-button
47+
as="a"
48+
:href="instance.registration.serviceUrl"
49+
size="2xs"
50+
referrerpolicy="no-referrer"
51+
target="_blank"
52+
>
53+
<font-awesome-icon :icon="faHome" size="xs" />
54+
</sba-button>
55+
<sba-button
56+
as="a"
57+
:href="instance.registration.managementUrl"
58+
size="2xs"
59+
referrerpolicy="no-referrer"
60+
target="_blank"
61+
>
62+
<font-awesome-icon :icon="faClipboardList" size="xs" />
63+
</sba-button>
64+
<sba-button
65+
as="a"
66+
:href="instance.registration.healthUrl"
67+
size="2xs"
68+
referrerpolicy="no-referrer"
69+
target="_blank"
70+
>
71+
<font-awesome-icon :icon="faHeart" size="xs" />
72+
</sba-button>
73+
</div>
7074
</div>
7175
<sba-tag
7276
v-if="instance.registration.metadata?.['group']"
7377
class="ml-2"
7478
:value="instance.registration.metadata?.['group']"
7579
small
7680
/>
77-
<br />
7881
<span class="text-sm italic" v-text="instance.id" />
7982
</template>
83+
<!-- asd -->
8084
<template v-else>
81-
<span v-text="instance.id"></span>
85+
<div v-text="instance.id"></div>
8286
<sba-tag
8387
v-if="instance.registration.metadata?.['group']"
8488
class="ml-2"
@@ -87,14 +91,17 @@
8791
/>
8892
</template>
8993
</div>
90-
<div class="hidden lg:block" v-text="instance.buildVersion" />
91-
<div class="pt-1 hidden lg:block text-right">
94+
<div class="flex-1 hidden lg:block" v-text="instance.buildVersion" />
95+
<div class="hidden lg:block text-right">
9296
<slot :instance="instance" name="actions" />
9397
</div>
94-
</div>
95-
<div class="mt-2 hidden lg:block overflow-x-auto">
98+
</section>
99+
<section
100+
v-if="instance.tags.length > 0"
101+
class="mt-2 hidden lg:block overflow-x-auto"
102+
>
96103
<sba-tags :small="true" :tags="instance.tags" />
97-
</div>
104+
</section>
98105
</div>
99106
</li>
100107
</ul>

spring-boot-admin-server-ui/src/main/frontend/views/applications/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@
120120
</template>
121121

122122
<template v-if="singleVersionInGroup(group)" #version>
123-
<span v-text="group.instances[0].buildVersion" />
123+
<span
124+
v-text="group.instances[0].buildVersion"
125+
class="transition-[opacity]"
126+
:class="{ 'opacity-0': isExpanded(group.name) }"
127+
/>
124128
</template>
125129

126130
<template v-if="isGroupedByApplication" #actions>

0 commit comments

Comments
 (0)