#1320 Search results

ontrack-model/src/main/java/net/nemerosa/ontrack/model/structure/SearchResult.kt

@@ -43,5 +43,6 @@ constructor(
 ) {
     companion object {
         const val SEARCH_RESULT_ITEM = "item"
+        const val SEARCH_RESULT_PROJECT = "project"
     }
 }

ontrack-ui/src/main/java/net/nemerosa/ontrack/boot/ProjectSearchProvider.kt

@@ -35,10 +35,10 @@ class ProjectSearchProvider(
 ) : SearchIndexer<ProjectSearchItem>, EventListener {
 
     override val searchResultType = SearchResultType(
-            feature = CoreExtensionFeature.INSTANCE.featureDescription,
-            id = PROJECT_SEARCH_RESULT_TYPE,
-            name = "Project",
-            description = "Project name in Ontrack"
+        feature = CoreExtensionFeature.INSTANCE.featureDescription,
+        id = PROJECT_SEARCH_RESULT_TYPE,
+        name = "Project",
+        description = "Project name in Ontrack"
     )
 
     override val indexerName: String = "Projects"
@@ -59,12 +59,15 @@ class ProjectSearchProvider(
     override fun toSearchResult(id: String, score: Double, source: JsonNode): SearchResult? {
         return structureService.findProjectByID(ID.of(id.toInt()))?.run {
             SearchResult(
-                    title = entityDisplayName,
-                    description = description ?: "",
-                    uri = uriBuilder.getEntityURI(this),
-                    page = uriBuilder.getEntityPage(this),
-                    accuracy = score,
-                    type = searchResultType
+                title = entityDisplayName,
+                description = description ?: "",
+                uri = uriBuilder.getEntityURI(this),
+                page = uriBuilder.getEntityPage(this),
+                accuracy = score,
+                type = searchResultType,
+                data = mapOf(
+                    SearchResult.SEARCH_RESULT_PROJECT to this,
+                )
             )
         }
     }
@@ -75,10 +78,12 @@ class ProjectSearchProvider(
                 val project = event.getEntity<Project>(ProjectEntityType.PROJECT)
                 searchIndexService.createSearchIndex(this, project.asSearchItem())
             }
+
             EventFactory.UPDATE_PROJECT -> {
                 val project = event.getEntity<Project>(ProjectEntityType.PROJECT)
                 searchIndexService.updateSearchIndex(this, project.asSearchItem())
             }
+
             EventFactory.DELETE_PROJECT -> {
                 val projectId = event.getIntValue("PROJECT_ID")
                 searchIndexService.deleteSearchIndex(this, projectId)
@@ -91,19 +96,19 @@ class ProjectSearchProvider(
 }
 
 class ProjectSearchItem(
-        override val id: String,
-        val name: String,
-        val description: String
+    override val id: String,
+    val name: String,
+    val description: String
 ) : SearchItem {
     constructor(project: Project) : this(
-            id = project.id.toString(),
-            name = project.name,
-            description = project.description ?: ""
+        id = project.id.toString(),
+        name = project.name,
+        description = project.description ?: ""
     )
 
     override val fields: Map<String, Any> = mapOf(
-            "name" to name,
-            "description" to description
+        "name" to name,
+        "description" to description
     )
 
 }

ontrack-web-core/components/framework/search/SearchResultComponent.js

@@ -0,0 +1,19 @@
+import {Space, Typography} from "antd";
+import Link from "next/link";
+
+export default function SearchResultComponent({title, link, description}) {
+    return (
+        <>
+            <Space direction="vertical">
+                {
+                    link &&
+                    <Link href={link}>{title}</Link>
+                }
+                {
+                    !link && title
+                }
+                <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
+            </Space>
+        </>
+    )
+}

ontrack-web-core/components/framework/search/branch/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/build-link/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/build-meta-info/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/build-release/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/build/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/git-branch/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/git-commit/Result.js

@@ -1,6 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
 export default function Result({data}) {
-    return {
-        title: data.item.commitShort,
-        description: data.item.commitMessage,
-    }
+    return <SearchResultComponent
+        title={data.item.commitShort}
+        description={data.item.commitMessage}
+    />
 }

ontrack-web-core/components/framework/search/git-issue/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/framework/search/project/Result.js

@@ -0,0 +1,9 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+import ProjectLink from "@components/projects/ProjectLink";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title={<ProjectLink project={data.project}/>}
+        description=""
+    />
+}

ontrack-web-core/components/framework/search/scm-catalog/Result.js

@@ -0,0 +1,8 @@
+import SearchResultComponent from "@components/framework/search/SearchResultComponent";
+
+export default function Result({data}) {
+    return <SearchResultComponent
+        title="TODO"
+        description={JSON.stringify(data)}
+    />
+}

ontrack-web-core/components/search/SearchResult.js

@@ -1,43 +1,9 @@
-import {Space, Typography} from "antd";
-import Link from "next/link";
-import {callDynamicFunction} from "@components/common/DynamicFunction";
-import {useEffect, useState} from "react";
+import {Dynamic} from "@components/common/Dynamic";
 
 export default function SearchResult({type, result}) {
-
-    const [typedResult, setTypedResult] = useState({
-        title: '',
-        link: '',
-        description: ''
-    })
-
-    useEffect(() => {
-
-        const loadTypedResult = async () => {
-            const data = await callDynamicFunction(`framework/search/${type.id}/Result`, result);
-            setTypedResult(data)
-        }
-
-        // noinspection JSIgnoredPromiseFromCall
-        loadTypedResult()
-    }, [type, result])
-
-
     return (
         <>
-            {
-                typedResult &&
-                <Space direction="vertical">
-                    {
-                        typedResult.link &&
-                        <Link href={typedResult.link}>{typedResult.title}</Link>
-                    }
-                    {
-                        !typedResult.link && typedResult.title
-                    }
-                    <Typography.Paragraph type="secondary">{typedResult.description}</Typography.Paragraph>
-                </Space>
-            }
+            <Dynamic path={`framework/search/${type.id}/Result`} props={result}/>
         </>
     )
 }

ontrack-web-core/components/search/SearchView.js

@@ -6,7 +6,6 @@ import {homeUri} from "@components/common/Links";
 import {CloseCommand} from "@components/common/Commands";
 import {homeBreadcrumbs} from "@components/common/Breadcrumbs";
 import MainPage from "@components/layouts/MainPage";
-import {useEffect, useState} from "react";
 import {Space} from "antd";
 import SearchTypeSection from "@components/search/SearchTypeSection";