Skip to content

Commit 29e7cb4

Browse files
authored
fix: UX in instances list for tags (#4553)
1 parent 56ef640 commit 29e7cb4

File tree

1 file changed

+44
-48
lines changed

1 file changed

+44
-48
lines changed

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

Lines changed: 44 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,61 +20,57 @@
2020
v-for="instance in instances"
2121
:key="instance.id"
2222
:data-testid="instance.id"
23-
class="flex items-center hover:bg-gray-100 p-2 pr-6"
23+
class="flex p-2 sm:pr-6 hover:bg-gray-100 gap-2 odd:bg-gray-50"
2424
@click.stop="showDetails(instance)"
2525
>
26-
<div class="pr-3 md:w-16 text-center">
26+
<div class="pt-1 md:w-16 text-center">
2727
<sba-status
2828
:date="instance.statusTimestamp"
2929
:status="instance.statusInfo.status"
3030
/>
3131
</div>
32-
<div class="flex-auto xl:flex-1 xl:w-1/4 truncate">
33-
<template v-if="instance.showUrl()">
34-
<a
35-
:href="
36-
instance.registration.serviceUrl ||
37-
instance.registration.healthUrl
38-
"
39-
@click.stop
40-
v-text="
41-
instance.registration.serviceUrl ||
42-
instance.registration.healthUrl
43-
"
44-
/>
45-
<sba-tag
46-
v-if="instance.registration.metadata?.['group']"
47-
class="ml-2"
48-
:value="instance.registration.metadata?.['group']"
49-
small
50-
/>
51-
<br />
52-
<span class="text-sm italic" v-text="instance.id" />
53-
</template>
54-
<template v-else>
55-
<span v-text="instance.id"></span>
56-
<sba-tag
57-
v-if="instance.registration.metadata?.['group']"
58-
class="ml-2"
59-
:value="instance.registration.metadata?.['group']"
60-
small
61-
/>
62-
</template>
63-
</div>
64-
<div
65-
class="hidden xl:block w-1/4"
66-
:class="{
67-
'overflow-x-auto': Object.keys(instance.tags ?? {}).length > 0,
68-
}"
69-
>
70-
<sba-tags :small="true" :tags="instance.tags" :wrap="false" />
71-
</div>
72-
<div
73-
class="hidden xl:block w-2/12 text-center"
74-
v-text="instance.buildVersion"
75-
/>
76-
<div class="hidden md:block flex-1 text-right">
77-
<slot :instance="instance" name="actions" />
32+
<div class="flex-1 overflow-hidden">
33+
<div class="flex gap-2 items-center">
34+
<div class="flex-1">
35+
<template v-if="instance.showUrl()">
36+
<a
37+
:href="
38+
instance.registration.serviceUrl ||
39+
instance.registration.healthUrl
40+
"
41+
@click.stop
42+
v-text="
43+
instance.registration.serviceUrl ||
44+
instance.registration.healthUrl
45+
"
46+
/>
47+
<sba-tag
48+
v-if="instance.registration.metadata?.['group']"
49+
class="ml-2"
50+
:value="instance.registration.metadata?.['group']"
51+
small
52+
/>
53+
<br />
54+
<span class="text-sm italic" v-text="instance.id" />
55+
</template>
56+
<template v-else>
57+
<span v-text="instance.id"></span>
58+
<sba-tag
59+
v-if="instance.registration.metadata?.['group']"
60+
class="ml-2"
61+
:value="instance.registration.metadata?.['group']"
62+
small
63+
/>
64+
</template>
65+
</div>
66+
<div class="hidden lg:block" v-text="instance.buildVersion" />
67+
<div class="pt-1 hidden lg:block text-right">
68+
<slot :instance="instance" name="actions" />
69+
</div>
70+
</div>
71+
<div class="mt-2 hidden lg:block overflow-x-auto">
72+
<sba-tags :small="true" :tags="instance.tags" />
73+
</div>
7874
</div>
7975
</li>
8076
</ul>

0 commit comments

Comments
 (0)