Added component to display funding information to tool form and update tool footer view

client/src/components/SchemaOrg/Funding.vue

@@ -0,0 +1,27 @@
+<template>
+    <span>
+        {{ title }}
+        <div v-for="(grant, index) in funding" :key="index">
+            <GrantViewer :grant="grant" />
+        </div>
+    </span>
+</template>
+
+<script>
+import GrantViewer from "./GrantViewer";
+
+export default {
+    components: {
+        GrantViewer,
+    },
+    props: {
+        title: {
+            type: String,
+            default: "",
+        },
+        funding: {
+            type: Array,
+        },
+    },
+};
+</script>

client/src/components/SchemaOrg/GrantViewer.vue

@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faCoins, faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { computed } from "vue";
+
+const props = defineProps({
+    grant: {
+        type: Object,
+        required: true,
+    },
+    hoverPlacement: {
+        type: String,
+        default: "left",
+    },
+});
+
+library.add(faExternalLinkAlt, faCoins);
+
+type item = {
+    attribute: string;
+    value: string;
+};
+
+const items = computed(() => {
+    const items: item[] = [];
+    for (const key in props.grant) {
+        if (key == "class") {
+            continue;
+        }
+        items.push({ attribute: key, value: props.grant[key] });
+    }
+    return items;
+});
+
+const implicitMicrodataProperties = ["name", "description", "url", "identifier"];
+
+const explicitMetaAttributes = computed(() => {
+    return items.value.filter((i: item) => implicitMicrodataProperties.includes(i.attribute));
+});
+</script>
+
+<template>
+    <span itemprop="funding" itemscope itemtype="https://schema.org/Grant">
+        <b-button
+            ref="button"
+            v-b-modal.funding-details
+            class="py-0 px-1"
+            size="sm"
+            variant="link"
+            title="Grant details">
+            <FontAwesomeIcon icon="coins" fixed-width />
+        </b-button>
+        <b-modal id="funding-details" title="Grant" hide-footer>
+            <b-table striped :items="items"> </b-table>
+        </b-modal>
+        <span v-if="props.grant.name">
+            {{ props.grant.name }}
+        </span>
+        <span v-if="props.grant.description"> - {{ props.grant.description }} </span>
+        <span v-if="props.grant.identifier"> ({{ props.grant.identifier }}) </span>
+        <a v-if="props.grant.url" v-b-tooltip.hover title="Grant URL" :href="props.grant.url" target="_blank">
+            <link itemprop="url" :href="props.grant.url" />
+            <FontAwesomeIcon icon="external-link-alt" />
+        </a>
+        <meta
+            v-for="attribute in explicitMetaAttributes"
+            :key="attribute.attribute"
+            :itemprop="attribute.attribute"
+            :content="attribute.value" />
+        <slot name="buttons"></slot>
+    </span>
+</template>

client/src/components/SchemaOrg/OrganizationViewer.vue

@@ -1,13 +1,17 @@
 <template>
     <span itemprop="creator" itemscope itemtype="https://schema.org/Organization">
-        <FontAwesomeIcon ref="button" icon="building" />
-        <b-popover
-            triggers="click blur"
-            :placement="hoverPlacement"
-            :target="$refs['button'] || 'works-lazily'"
-            title="Organization">
+        <b-button
+            ref="button"
+            v-b-modal.organization-details
+            class="py-0 px-1"
+            size="sm"
+            variant="link"
+            title="Organization details">
+            <FontAwesomeIcon icon="building" fixed-width />
+        </b-button>
+        <b-modal id="organization-details" title="Organization" hide-footer>
             <b-table striped :items="items"> </b-table>
-        </b-popover>
+        </b-modal>
         <span v-if="name">
             <span itemprop="name">{{ name }}</span>
             <span v-if="email">

client/src/components/SchemaOrg/PersonViewer.vue

@@ -1,13 +1,17 @@
 <template>
     <span itemprop="creator" itemscope itemtype="https://schema.org/Person">
-        <FontAwesomeIcon ref="button" icon="user" />
-        <b-popover
-            triggers="click blur"
-            :placement="hoverPlacement"
-            :target="$refs['button'] || 'works-lazily'"
-            title="Person">
+        <b-button
+            ref="button"
+            v-b-modal.person-details
+            class="py-0 px-1"
+            size="sm"
+            variant="link"
+            title="Person details">
+            <FontAwesomeIcon icon="user" fixed-width />
+        </b-button>
+        <b-modal id="person-details" title="Person" hide-footer>
             <b-table striped :items="items"> </b-table>
-        </b-popover>
+        </b-modal>
         <span v-if="name">
             <meta v-if="person.name" itemprop="name" :content="person.name" />
             <meta v-if="person.givenName" itemprop="givenName" :content="person.givenName" />

client/src/components/Tool/ToolCard.vue

@@ -186,6 +186,7 @@ function onUpdatePreferredObjectStoreId(selectedToolPreferredObjectStoreId) {
                 :xrefs="props.options.xrefs"
                 :license="props.options.license"
                 :creators="props.options.creator"
+                :funding="props.options.funding"
                 :requirements="props.options.requirements" />
         </div>
     </div>

client/src/components/Tool/ToolFooter.vue

@@ -25,7 +25,8 @@
                 title="Learn more about Galaxy Requirements"
                 href="https://galaxyproject.org/tools/requirements/"
                 target="_blank">
-                See details <FontAwesomeIcon icon="external-link-alt" />
+                See details
+                <FontAwesomeIcon icon="external-link-alt" />
             </a>
             <div v-for="(requirement, index) in requirements" :key="index">
                 - {{ requirement.name }}
@@ -68,6 +69,10 @@
             <span class="font-weight-bold">Creators:</span>
             <Creators :creators="creators" />
         </div>
+        <div v-if="hasFunding" class="mb-1">
+            <span class="font-weight-bold">Funding:</span>
+            <Funding :funding="funding" />
+        </div>
     </b-card>
 </template>
 
@@ -79,6 +84,7 @@ import Citation from "components/Citation/Citation";
 import { getCitations } from "components/Citation/services";
 import License from "components/License/License";
 import Creators from "components/SchemaOrg/Creators";
+import Funding from "components/SchemaOrg/Funding";
 import { copy } from "utils/clipboard";
 
 library.add(faQuestion, faCopy, faAngleDoubleDown, faAngleDoubleUp);
@@ -88,6 +94,7 @@ export default {
         Citation,
         License,
         Creators,
+        Funding,
         FontAwesomeIcon,
     },
     props: {
@@ -107,6 +114,9 @@ export default {
         creators: {
             type: Array,
         },
+        funding: {
+            type: Array,
+        },
         requirements: {
             type: Array,
         },
@@ -126,12 +136,20 @@ export default {
         hasCreators() {
             return this.creators && this.creators.length > 0;
         },
+        hasFunding() {
+            return this.funding && this.funding.length > 0;
+        },
         hasLicense() {
             return !!this.license;
         },
         hasContent() {
             return (
-                this.hasRequirements || this.hasReferences || this.hasCreators || this.hasCitations || this.hasLicense
+                this.hasRequirements ||
+                this.hasReferences ||
+                this.hasCreators ||
+                this.hasFunding ||
+                this.hasCitations ||
+                this.hasLicense
             );
         },
     },
@@ -172,6 +190,7 @@ export default {
 .footer-section-name {
     font-weight: bold;
 }
+
 .footer-section-name::after {
     content: ":";
 }

lib/galaxy/schema/schema.py

@@ -2068,9 +2068,9 @@ class SubworkflowStep(WorkflowStepBase):
     )
 
 
-class Creator(Model):
-    class_: str = Field(..., alias="class", title="Class", description="The class representing this creator.")
-    name: str = Field(..., title="Name", description="The name of the creator.")
+class Thing(Model):
+    class_: str = Field(..., alias="class", title="Class", description="The class representing this thing.")
+    name: str = Field(..., title="Name", description="The name of the thing.")
     address: Optional[str] = Field(
         None,
         title="Address",
@@ -2104,6 +2104,10 @@ class Creator(Model):
     )
 
 
+class Creator(Thing):
+    class_: str = Field(..., alias="class", title="Class", description="The class representing this creator.")
+
+
 class Organization(Creator):
     class_: str = Field(
         "Organization",
@@ -2144,6 +2148,10 @@ class Person(Creator):
     )
 
 
+class Grant(Thing):
+    class_: str = Field(..., alias="class", title="Class", description="The class representing this Grant.")
+
+
 class StoredWorkflowDetailed(StoredWorkflowSummary):
     annotation: Optional[str] = AnnotationField  # Inconsistency? See comment on StoredWorkflowSummary.annotations
     license: Optional[str] = Field(

lib/galaxy/tool_util/linters/xml_order.py

@@ -26,6 +26,8 @@
     "tests",
     "help",
     "citations",
+    "creator",
+    "funding",
 ]
 
 DATASOURCE_TAG_ORDER = [
@@ -40,6 +42,8 @@
     "options",
     "help",
     "citations",
+    "creator",
+    "funding",
 ]
 
 

lib/galaxy/tool_util/parser/interface.py

@@ -296,6 +296,13 @@ def parse_creator(self):
         """
         return []
 
+    def parse_funding(self):
+        """Return list of metadata relating to funding of tool development.
+
+        Result should be list of schema.org data model Grant objects.
+        """
+        return []
+
     @property
     def macro_paths(self):
         return []

lib/galaxy/tool_util/parser/xml.py

@@ -5,6 +5,7 @@
 import re
 import uuid
 from typing import (
+    Dict,
     List,
     Optional,
 )
@@ -587,7 +588,7 @@ def parse_python_template_version(self):
     def parse_creator(self):
         creators_el = self.root.find("creator")
         if creators_el is None:
-            return None
+            return []
 
         creators = []
         for creator_el in creators_el:
@@ -603,6 +604,25 @@ def parse_creator(self):
             creators.append(creator_as_dict)
         return creators
 
+    def parse_funding(self) -> List[Dict[str, str]]:
+        """Parse the funding information from the XML tool file.
+
+        Returns:
+            funding: dict with array of grants holding the funding information
+        """
+        funding_el = self.root.find("funding")
+        if funding_el is None:
+            return []
+
+        funding = []
+        for grant_el in funding_el:
+            grant_as_dict = {}
+            if grant_el.tag == "grant":
+                grant_as_dict["class"] = "Grant"
+                grant_as_dict.update(grant_el.attrib)
+                funding.append(grant_as_dict)
+        return funding
+
 
 def _test_elem_to_dict(test_elem, i, profile=None) -> ToolSourceTest:
     rval: ToolSourceTest = dict(

lib/galaxy/tool_util/parser/yaml.py

@@ -68,6 +68,14 @@ def parse_xrefs(self):
         xrefs = self.root_dict.get("xrefs", [])
         return [dict(value=xref["value"], reftype=xref["type"]) for xref in xrefs if xref["type"]]
 
+    def parse_creator(self) -> List[Dict[str, Dict[str, str]]]:
+        creator = self.root_dict.get("creator")
+        return creator if creator else []
+
+    def parse_funding(self) -> List[Dict[str, Dict[str, str]]]:
+        funding = self.root_dict.get("funding")
+        return funding if funding else []
+
     def parse_sanitize(self):
         return self.root_dict.get("sanitize", True)