From d0b2de72fea71aa2f9d9b20854a3438d3f319558 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Thu, 8 Feb 2024 16:20:41 +0100
Subject: [PATCH] ui: When folded, show services summary + button

---
 .../components/domains/SubdomainItem.svelte   | 26 +++++++++++++++++--
 ui/src/lib/locales/en.json                    |  3 ++-
 ui/src/lib/locales/fr.json                    |  3 ++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ui/src/lib/components/domains/SubdomainItem.svelte b/ui/src/lib/components/domains/SubdomainItem.svelte
index a5d1fc3..29c4405 100644
--- a/ui/src/lib/components/domains/SubdomainItem.svelte
+++ b/ui/src/lib/components/domains/SubdomainItem.svelte
@@ -38,6 +38,7 @@
  import type { Domain, DomainInList } from '$lib/model/domain';
  import type { ServiceCombined } from '$lib/model/service';
  import { ZoneViewGrid } from '$lib/model/usersettings';
+ import { servicesSpecs } from '$lib/stores/services';
  import { userSession } from '$lib/stores/usersession';
  import { t } from '$lib/translations';
 
@@ -224,12 +225,31 @@
                     {/if}
                 </span>
             </h2>
+            {#if !showResources}
+                <Badge
+                    id={"popoversvc-" + dn.replace('.', '__')}
+                    style="cursor: pointer;"
+                >
+                    {$t('domains.n-services', {count: services.length})}
+                </Badge>
+                <Popover
+                    dismissible
+                    placement="bottom"
+                    target={"popoversvc-" + dn.replace('.', '__')}
+                >
+                    {#each services as service}
+                        <strong>{$servicesSpecs[service._svctype].name}:</strong>
+                        <span class="text-muted">{service._comment}</span>
+                        <br>
+                    {/each}
+                </Popover>
+            {/if}
             {#if aliases.length != 0}
                 <Badge
                     id={"popoverbadge-" + dn.replace('.', '__')}
                     style="cursor: pointer;"
                 >
-                    + {$t('domains.n-aliases', {n: aliases.length})}
+                    + {$t('domains.n-aliases', {count: aliases.length})}
                 </Badge>
                 <Popover
                     dismissible
@@ -245,7 +265,7 @@
                     {/each}
                 </Popover>
             {/if}
-            {#if $userSession && $userSession.settings.zoneview !== ZoneViewGrid}
+            {#if !showResources || ($userSession && $userSession.settings.zoneview !== ZoneViewGrid)}
                 <Button
                     type="button"
                     color="primary"
@@ -256,6 +276,7 @@
                     {$t('domains.add-a-service')}
                 </Button>
             {/if}
+            {#if showResources}
             <Button
                 type="button"
                 color="primary"
@@ -266,6 +287,7 @@
                 <Icon name="link" />
                 {$t('domains.add-an-alias')}
             </Button>
+            {/if}
         </div>
         {#if showResources}
             <div
diff --git a/ui/src/lib/locales/en.json b/ui/src/lib/locales/en.json
index a252661..0a93103 100644
--- a/ui/src/lib/locales/en.json
+++ b/ui/src/lib/locales/en.json
@@ -108,7 +108,8 @@
         "give-explicit-name": "Give an explicit name in order to easily find this service.",
         "history": "History",
         "list": "List importable domains",
-        "n-aliases": "{{n:lt; 2:{{n}} alias; default:{{n}} aliases}}",
+        "n-aliases": "{{count:lt; 2:{{count}} alias; default:{{count}} aliases}}",
+        "n-services": "{{count:lt; 2:{{count}} service; default:{{count}} services}}",
         "please-fill-fields": "Please fill the following fields:",
         "removal": "Confirm Domain Removal",
         "save-modifications": "Save those modifications",
diff --git a/ui/src/lib/locales/fr.json b/ui/src/lib/locales/fr.json
index 82c9023..8e706c3 100644
--- a/ui/src/lib/locales/fr.json
+++ b/ui/src/lib/locales/fr.json
@@ -108,7 +108,8 @@
         "give-explicit-name": "Donnez un nom explicite afin de trouver facilement ce service.",
         "history": "Historique",
         "list": "Liste des domaines importables",
-        "n-aliases": "{{n:lt; 2:{{n}} alias; default:{{n}} alias}}",
+        "n-aliases": "{{count:lt; 2:{{count}} alias; default:{{count}} alias}}",
+        "n-services": "{{count:lt; 2:{{count}} service; default:{{count}} services}}",
         "please-fill-fields": "Veuillez remplir les champs suivants :",
         "removal": "Confirmer la suppression du domaine",
         "save-modifications": "Enregistrer ces modifications",