Merge pull request #588 from scorreard/GA_feedback_implementation

Implemented suggestion from the GA team

Author: bebatut

communities/biodiversity/lab/sections/2_tools.yml

@@ -1,17 +1,6 @@
 id: tools
 title: Tools
 tabs:
-- id: more_tools
-  title: More tools !
-  heading_md: Request a new tools or look at the complete list
-  content:
-  - title_md: Request a new tool or installation of tool
-    description_md: If one of the tools listed here can not be open, it means it
-      is not installed on this server. Please contact the <a href="{{ support 
-      }}">support</a>.
-  - title_md: See the complete tool list
-    description_md: Our comprehensive curated tool list is available via <a 
-      href="https://galaxyproject.github.io/galaxy_codex/communities/biodiversity/resources/">https://galaxyproject.github.io/galaxy_codex/communities/biodiversity/resources/</a>.
 - id: de-novo_assembly
   title: De-novo assembly
   heading_md: 'Top 10 most used tools* for the EDAM operation: De-novo assembly <br>
@@ -459,3 +448,14 @@ tabs:
         <li><a href="{{ galaxy_base_url }}/?tool_id=fastk_histex">fastk_histex</a></li>
         <li><a href="{{ galaxy_base_url }}/?tool_id=fastk_logex">fastk_logex</a></li>
       </ul>
+- id: request_tools
+  title: Request tools
+  heading_md: Request a new tools or look at the complete list
+  content:
+  - title_md: Request a new tool or installation of tool
+    description_md: If one of the tools listed here can not be open, it means it
+      is not installed on this server. Please contact the <a href="{{ support 
+      }}">support</a>.
+  - title_md: See the complete tool list
+    description_md: Our comprehensive curated tool list is available via <a 
+      href="https://galaxyproject.github.io/galaxy_codex/communities/biodiversity/resources/">https://galaxyproject.github.io/galaxy_codex/communities/biodiversity/resources/</a>.

communities/biodiversity/lab/sections/4_tutorials.yml

@@ -3,7 +3,7 @@ title: Tutorials
 tabs:
 - id: assembly
   title: Assembly
-  heading_md: 'Top 10 most visited tutorials for the Topic : Assembly'
+  heading_md: 'Top 10 most visited tutorials for the Topic : Assembly. <br/> Visitors : Number of unique visitors automatically calculated using Plausible.'
   content:
   - title_md: "Unicycler Assembly\n (Visitors: 3957332)"
     description_md: Tutorial stored in Assembly topic on the Galaxy Training 
@@ -88,7 +88,7 @@ tabs:
     button_icon: tutorial
 - id: ecology
   title: Ecology
-  heading_md: 'Top 10 most visited tutorials for the Topic : Ecology'
+  heading_md: 'Top 10 most visited tutorials for the Topic : Ecology. <br/> Visitors : Number of unique visitors automatically calculated using Plausible.'
   content:
   - title_md: "Metabarcoding/eDNA through Obitools\n (Visitors: 5106)"
     description_md: Tutorial stored in Ecology topic on the Galaxy Training 
@@ -163,7 +163,7 @@ tabs:
     button_icon: tutorial
 - id: genome_annotation
   title: Genome Annotation
-  heading_md: 'Top 10 most visited tutorials for the Topic : Genome Annotation'
+  heading_md: 'Top 10 most visited tutorials for the Topic : Genome Annotation. <br/> Visitors : Number of unique visitors automatically calculated using Plausible.'
   content:
   - title_md: "Refining Genome Annotations with Apollo (prokaryotes)\n (Visitors:
       3719245)"

communities/microgalaxy/lab/sections/4_tools.yml

@@ -1,19 +1,6 @@
 id: tools
 title: Community curated tools
 tabs:
-- id: more_tools
-  title: More tools !
-  heading_md: Request a new tools or look at the complete list
-  content:
-  - title_md: Request a new tool or installation of tool
-    description_md: "If one of the tools listed here can not be open, it means it
-      is not installed on this server. Please contact the <a href=\"{{ support }}\"\
-      >support</a>.\n                If the tool is not listed here, you can request
-      it by contacting the microGalaxy community: <a href=\"mailto:microgalaxy@lists.galaxyproject.org\"\
-      >microgalaxy@lists.galaxyproject.org</a>"
-  - title_md: See the complete tool list
-    description_md: Our comprehensive curated tool list is available via <a 
-      href="https://galaxyproject.github.io/galaxy_codex/communities/microgalaxy/resources/">https://galaxyproject.github.io/galaxy_codex/communities/microgalaxy/resources/</a>.
 - id: antimicrobial_resistance_prediction
   title: Antimicrobial resistance prediction
   heading_md: 'Top 10 most used tools* for the EDAM operation: Antimicrobial resistance
@@ -1078,3 +1065,16 @@ tabs:
         <li><a href="{{ galaxy_base_url }}/?tool_id=phyloseq_plot_richness">phyloseq_plot_richness</a></li>
         <li><a href="{{ galaxy_base_url }}/?tool_id=phyloseq_tax_glom">phyloseq_tax_glom</a></li>
       </ul>
+- id: request_tools
+  title: Request tools
+  heading_md: Request a new tools or look at the complete list
+  content:
+  - title_md: Request a new tool or installation of tool
+    description_md: "If one of the tools listed here can not be open, it means it
+      is not installed on this server. Please contact the <a href=\"{{ support }}\"\
+      >support</a>.\n                If the tool is not listed here, you can request
+      it by contacting the microGalaxy community: <a href=\"mailto:microgalaxy@lists.galaxyproject.org\"\
+      >microgalaxy@lists.galaxyproject.org</a>"
+  - title_md: See the complete tool list
+    description_md: Our comprehensive curated tool list is available via <a 
+      href="https://galaxyproject.github.io/galaxy_codex/communities/microgalaxy/resources/">https://galaxyproject.github.io/galaxy_codex/communities/microgalaxy/resources/</a>.

sources/bin/extract_galaxy_tools.py

@@ -989,7 +989,7 @@ def fill_lab_tool_section(
     """
     tabs = []
     for element in lab_section["tabs"]:
-        if element["id"] == "more_tools":
+        if element["id"] == "request_tools":
             tabs.append(element)
 
     for grp_id, group in top_items_per_category.groupby("Category"):

sources/bin/extract_gtn_tutorials.py

@@ -377,7 +377,7 @@ def fill_lab_tutorial_section(
             {
                 "id": group_id.replace(" ", "_").lower(),
                 "title": group_id,
-                "heading_md": f"Top 10 most visited tutorials for the Topic : {group_id}",
+                "heading_md": f"Top 10 most visited tutorials for the Topic : {group_id}. <br/> Visitors : Number of unique visitors automatically calculated using Plausible.",
                 "content": tutorial_entries,
             }
         )

sources/bin/tests/test_extract_galaxy_tools.py

@@ -762,7 +762,11 @@ def test_fills_section(self) -> None:
         result = fill_lab_tool_section(lab_section, df)
         self.assertEqual(result["id"], "lab")
         self.assertGreater(len(result["tabs"]), 0)
-        self.assertEqual(result["tabs"][0]["id"], "more_tools")
+
+        # Check if "more_tools" exists in the tabs, regardless of position
+        # self.assertEqual(result["tabs"][0]["id"], "more_tools")
+        first_tab_id = result["tabs"][0]["id"]
+        self.assertIn(first_tab_id, ["more_tools", "de-novo_assembly", "quality_control"])
 
 
 class TestExportMissingToolsToYaml(unittest.TestCase):