From 6ea260619a64555ef6f2632ab4c95df6d6872a46 Mon Sep 17 00:00:00 2001
From: Fatimah Zulfiqar <fatimah0zulfiqar@gmail.com>
Date: Wed, 16 Oct 2024 15:27:44 +0200
Subject: [PATCH 1/4] ui: passing collections to communities_home

---
 .../semantic-ui/invenio_communities/collections/macros.html | 6 +++---
 invenio_app_rdm/communities_ui/views/communities.py         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
index 87f73ef43..6c4e12089 100644
--- a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
+++ b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
@@ -1,10 +1,10 @@
 {% macro render_depth_one_collection(community, tree, collection) %}
 {% set root_collection=collection[collection.root] %}
-<div class="ui card borderless facet mt-0 mb-0 rel-ml-1">
+<div class="ui mt-0 mb-0 rel-ml-1">
   <div class="content rel-mb-1">
     {% set logo_url = url_for("static", filename="images/collections/" ~ root_collection.slug ~ ".jpg") %}
     <div class="ui grid">
-      <div class="four wide column collection-logo mr-0 computer only">
+      <div class="three wide column collection-logo mr-0 computer only">
         <img src="{{ logo_url }}" width="45" height="auto" alt=""
           onerror="null;"/>
       </div>
@@ -16,7 +16,7 @@ <h4 class="theme-primary-text">
           </a>
         </h4>
       </div>
-      <div class="two wide column collection-number middle aligned">
+      <div class="three wide column collection-number middle aligned">
         <label class="ui small label middle aligned">{{ root_collection.num_records }}</label>
       </div>
     </div>
diff --git a/invenio_app_rdm/communities_ui/views/communities.py b/invenio_app_rdm/communities_ui/views/communities.py
index f81f806c8..4ab760bee 100644
--- a/invenio_app_rdm/communities_ui/views/communities.py
+++ b/invenio_app_rdm/communities_ui/views/communities.py
@@ -54,7 +54,7 @@ def communities_detail(pid_value, community, community_ui):
 def communities_home(pid_value, community, community_ui):
     """Community home page."""
     query_params = request.args
-
+    collections_service = current_rdm_records.collections_service
     permissions = community.has_permissions_to(HEADER_PERMISSIONS)
     if not permissions["can_read"]:
         raise PermissionDeniedError()
@@ -94,6 +94,8 @@ def communities_home(pid_value, community, community_ui):
             expand=True,
         )
 
+        collections = collections_service.list_trees(g.identity, community.id, depth=0)
+
         # TODO resultitem does not expose aggregations except labelled facets
         _metric_aggs = recent_uploads._results.aggregations
         metrics = {
@@ -113,6 +115,7 @@ def communities_home(pid_value, community, community_ui):
             permissions=permissions,
             records=records_ui,
             metrics=metrics,
+            collections=collections.to_dict(),
         )
 
 

From 37177028d8da94e42ce25adc9ba8172901e5c948 Mon Sep 17 00:00:00 2001
From: Fatimah Zulfiqar <fatimah0zulfiqar@gmail.com>
Date: Thu, 17 Oct 2024 11:17:16 +0200
Subject: [PATCH 2/4] ui: updated collection grid styling

---
 .../semantic-ui/invenio_communities/collections/macros.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
index 6c4e12089..f928c42f4 100644
--- a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
+++ b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
@@ -8,7 +8,7 @@
         <img src="{{ logo_url }}" width="45" height="auto" alt=""
           onerror="null;"/>
       </div>
-      <div class="ten wide column collection-header middle aligned left floated pl-0">
+      <div class="nine wide column collection-header middle aligned right floated pl-0">
         <h4 class="theme-primary-text">
           <a
             href='{{ url_for("invenio_app_rdm_communities.community_collection", pid_value=community.slug, collection_slug=root_collection.slug, tree_slug=tree.slug )}}'>
@@ -16,7 +16,7 @@ <h4 class="theme-primary-text">
           </a>
         </h4>
       </div>
-      <div class="three wide column collection-number middle aligned">
+      <div class="four wide column collection-number middle aligned left floated">
         <label class="ui small label middle aligned">{{ root_collection.num_records }}</label>
       </div>
     </div>

From 554d61650fd69a1f308d65d52de1d16cfd82789f Mon Sep 17 00:00:00 2001
From: Pablo Tamarit <pablo.tamarit@cern.ch>
Date: Thu, 17 Oct 2024 17:33:38 +0200
Subject: [PATCH 3/4] ui: fixed space between logo and title, number formatting

---
 .../collections/macros.html                   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
index f928c42f4..f717fe3f3 100644
--- a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
+++ b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
@@ -4,20 +4,20 @@
   <div class="content rel-mb-1">
     {% set logo_url = url_for("static", filename="images/collections/" ~ root_collection.slug ~ ".jpg") %}
     <div class="ui grid">
-      <div class="three wide column collection-logo mr-0 computer only">
-        <img src="{{ logo_url }}" width="45" height="auto" alt=""
-          onerror="null;"/>
-      </div>
-      <div class="nine wide column collection-header middle aligned right floated pl-0">
-        <h4 class="theme-primary-text">
-          <a
-            href='{{ url_for("invenio_app_rdm_communities.community_collection", pid_value=community.slug, collection_slug=root_collection.slug, tree_slug=tree.slug )}}'>
-            {{ root_collection.title }}
-          </a>
-        </h4>
+      <div class="twelve wide column middle aligned left floated">
+        <div class="flex align-items-center">
+          <img class="computer only rel-mr-1" src="{{ logo_url }}" width="45" height="auto" alt=""
+            onerror="null;"/>
+          <h4 class="theme-primary-text mt-0">
+            <a
+              href='{{ url_for("invenio_app_rdm_communities.community_collection", pid_value=community.slug, collection_slug=root_collection.slug, tree_slug=tree.slug )}}'>
+              {{ root_collection.title }}
+            </a>
+          </h4>
+        </div>
       </div>
       <div class="four wide column collection-number middle aligned left floated">
-        <label class="ui small label middle aligned">{{ root_collection.num_records }}</label>
+        <label class="ui small label middle aligned">{{ "{:,}".format(root_collection.num_records) }}</label>
       </div>
     </div>
 
@@ -33,7 +33,7 @@ <h5 class="theme-primary-text">
           collection_slug=child_collection.slug, tree_slug=tree.slug )}}'>
           {{ child_collection.title }}
         </a>
-        <label class="ui tiny text-muted">{{ "(" ~ child_collection.num_records ~ ")"}}</label>
+        <label class="ui tiny text-muted">{{ "(" ~ "{:,}".format(child_collection.num_records) ~ ")"}}</label>
       </h5>
     </div>
     {%- endfor -%}

From 1606a477a0a885600f22da180857792629a75b8d Mon Sep 17 00:00:00 2001
From: Pablo Tamarit <pablo.tamarit@cern.ch>
Date: Thu, 17 Oct 2024 17:37:05 +0200
Subject: [PATCH 4/4] ui: more space under breadcrumbs

---
 .../semantic-ui/invenio_communities/collections/collection.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html
index f6a627db7..5286cb024 100644
--- a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html
+++ b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html
@@ -51,7 +51,7 @@ <h1 class="ui medium header">
     {%- endif -%}
   </div>
 </div>
-<div class="ui divider mt-0 mb-0" aria-hidden="true"></div>
+<div class="ui divider mt-10 mb-0" aria-hidden="true"></div>
 <!-- Collection record search -->
 <div id="collection-search"
   data-invenio-search-config='{{search_app_collection_config(app_id="InvenioAppRDM.CollectionsSearch", endpoint=root_collection["links"]["search"], hidden_params=[["collection_id", root_collection["id"]]]) | tojson }}'