#1236 Displaying license features parameters

nemerosa · Dec 2, 2024 · e58e50a · e58e50a
1 parent 003eaef
commit e58e50a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 6 deletions.
diff --git a/...extension-license/src/main/java/net/nemerosa/ontrack/extension/license/LicensedFeature.kt b/...extension-license/src/main/java/net/nemerosa/ontrack/extension/license/LicensedFeature.kt
@@ -1,7 +1,10 @@
 package net.nemerosa.ontrack.extension.license
 
+import net.nemerosa.ontrack.model.support.NameValue
+
 data class LicensedFeature(
     val id: String,
     val name: String,
     val enabled: Boolean,
+    val data: List<NameValue>,
 )
diff --git a/...src/main/java/net/nemerosa/ontrack/extension/license/control/LicenseControlServiceImpl.kt b/...src/main/java/net/nemerosa/ontrack/extension/license/control/LicenseControlServiceImpl.kt
@@ -41,6 +41,7 @@ class LicenseControlServiceImpl(
                 id = it.id,
                 name = it.name,
                 enabled = it.alwaysEnabled || license.isFeatureEnabled(it.id),
+                data = license.findFeatureData(it.id)?.data ?: emptyList(),
             )
         }.sortedBy { it.name }
 

diff --git a/ontrack-extension-license/src/main/resources/graphql/extension-license.graphqls b/ontrack-extension-license/src/main/resources/graphql/extension-license.graphqls
@@ -17,10 +17,16 @@ type License {
     licensedFeatures: [LicensedFeature!]!
 }
 
+type LicensedFeatureData {
+    name: String!,
+    value: String!,
+}
+
 type LicensedFeature {
     id: String!
     name: String!
     enabled: Boolean!
+    data: [LicensedFeatureData!]!
 }
 
 enum LicenseExpiration {

diff --git a/ontrack-web-core/ontrack.graphql b/ontrack-web-core/ontrack.graphql
@@ -3213,11 +3213,17 @@ type LicenseResponse {
 }
 
 type LicensedFeature {
+    data: [LicensedFeatureData!]!
     enabled: Boolean!
     id: String!
     name: String!
 }
 
+type LicensedFeatureData {
+    name: String!
+    value: String!
+}
+
 "Output type for the linkBuildById mutation."
 type LinkBuildByIdPayload implements Payload {
     "Build linked from"

diff --git a/ontrack-web-core/pages/extension/license/info.js b/ontrack-web-core/pages/extension/license/info.js
@@ -3,7 +3,7 @@ import StandardPage from "@components/layouts/StandardPage";
 import {useGraphQLClient} from "@components/providers/ConnectionContextProvider";
 import LoadingContainer from "@components/common/LoadingContainer";
 import {gql} from "graphql-request";
-import {Alert, Card, Col, Descriptions, Row, Space, Tag, Typography} from "antd";
+import {Alert, Card, Col, Descriptions, Row, Space, Table, Tag, Typography} from "antd";
 import PageSection from "@components/common/PageSection";
 import LicenseActive from "@components/extension/license/LicenseActive";
 import LicenseValidUntil from "@components/extension/license/LicenseValidUntil";
@@ -35,6 +35,10 @@ export default function LicenseInfoPage() {
                                     id
                                     name
                                     enabled
+                                    data {
+                                        name
+                                        value
+                                    }
                                 }
                             }
                             licenseControl {
@@ -129,11 +133,32 @@ export default function LicenseInfoPage() {
                                             <Card
                                                 title={feature.name}
                                             >
-                                                {
-                                                    feature.enabled ?
-                                                        <Tag color="success">Enabled</Tag> :
-                                                        <Tag color="error">Disabled</Tag>
-                                                }
+                                                <Space direction="vertical" className="ot-line">
+                                                    {
+                                                        feature.enabled ?
+                                                            <Tag color="success">Enabled</Tag> :
+                                                            <Tag color="error">Disabled</Tag>
+                                                    }
+                                                    {
+                                                        feature.data.length > 0 &&
+                                                        <Table
+                                                            dataSource={feature.data}
+                                                            size="small"
+                                                            pagination={false}
+                                                        >
+                                                            <Table.Column
+                                                                key="name"
+                                                                title="Name"
+                                                                dataIndex="name"
+                                                            />
+                                                            <Table.Column
+                                                                key="value"
+                                                                title="Value"
+                                                                dataIndex="value"
+                                                            />
+                                                        </Table>
+                                                    }
+                                                </Space>
                                             </Card>
                                         </Col>
                                     ))