Send matched semantic public IDs so remote rows can render icons

Author: pChou19

framework/src/main/java/dev/ikm/komet/framework/search/SearchPanelController.java

@@ -374,9 +374,29 @@ public String toString() {
         }
     }
 
-    public record NidTextRecord(int nid, String text, boolean active, List<UUID> publicIds) {
+    /**
+     * A top-level search result row.
+     *
+     * <p>{@code publicIds} and {@code semanticPublicIds} exist for results that came from
+     * a remote search service, where {@code nid} is meaningless — nids are assigned per
+     * data store, so a remote row has no local entity to resolve identity from. Locally
+     * sourced rows leave both empty and resolve everything from {@code nid} instead.
+     *
+     * @param nid               the local nid, or 0 for a remote row
+     * @param text              display label, which may carry {@code <B>…</B>} markup
+     * @param active            whether the concept is active
+     * @param publicIds         UUIDs of the concept, for remote rows
+     * @param semanticPublicIds UUIDs of each matched semantic, positionally aligned with
+     *                          the row's description list, for remote rows
+     */
+    public record NidTextRecord(int nid, String text, boolean active, List<UUID> publicIds,
+                                List<List<UUID>> semanticPublicIds) {
         public NidTextRecord(int nid, String text, boolean active) {
-            this(nid, text, active, List.of());
+            this(nid, text, active, List.of(), List.of());
+        }
+
+        public NidTextRecord(int nid, String text, boolean active, List<UUID> publicIds) {
+            this(nid, text, active, publicIds, List.of());
         }
     }
 }

kview/src/main/java/dev/ikm/komet/kview/mvvm/view/search/NextGenSearchController.java

@@ -342,8 +342,14 @@ private void doSearch(ActionEvent actionEvent) {
                                 // means it cannot look the label up locally, so use the name the
                                 // service resolved -- displayName() prefers the highlighted
                                 // preferred name, matching what the local branch shows.
+                                // Positionally aligned with the semantics list built below,
+                                // so the cell can pair each row with its own identity.
+                                List<List<UUID>> semanticUuids = g.matchingSemantics().stream()
+                                        .map(m -> m.publicId().stream().map(UUID::fromString).toList())
+                                        .toList();
                                 SearchPanelController.NidTextRecord key =
-                                        new SearchPanelController.NidTextRecord(0, g.displayName(), g.active(), uuids);
+                                        new SearchPanelController.NidTextRecord(
+                                                0, g.displayName(), g.active(), uuids, semanticUuids);
                                 List<LatestVersionSearchResult> semantics = g.matchingSemantics().stream()
                                         .map(m -> new LatestVersionSearchResult(
                                                 new Latest<>(SemanticEntityVersion.class),

kview/src/main/java/dev/ikm/komet/kview/mvvm/view/search/SearchCellTopComponent.java

@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -111,7 +112,8 @@ protected void updateItem(Object item, boolean empty) {
                     controller.setData(entity);
                     controller.setComponentText(highlightedTitle(topText));
 
-                    controller.getDescriptionListViewItems().setAll(mapEntry.getValue());
+                    controller.getDescriptionListViewItems().setAll(
+                            descriptionRows(mapEntry.getValue(), List.of()));
 
                     if (entityVersion.active()) {
                         controller.getRetiredHBox().getChildren().remove(controller.getRetiredLabel());
@@ -133,7 +135,8 @@ protected void updateItem(Object item, boolean empty) {
                     controller.setData(null);
                     controller.setRemotePublicIds(nidTextRecord.publicIds());
                     controller.setComponentText(nidTextRecord.text());
-                    controller.getDescriptionListViewItems().setAll(mapEntry.getValue());
+                    controller.getDescriptionListViewItems().setAll(
+                            descriptionRows(mapEntry.getValue(), nidTextRecord.semanticPublicIds()));
                     if (nidTextRecord.active()) {
                         controller.getRetiredHBox().getChildren().remove(controller.getRetiredLabel());
                     } else if (!controller.getRetiredHBox().getChildren().contains(controller.getRetiredLabel())) {
@@ -148,6 +151,28 @@ protected void updateItem(Object item, boolean empty) {
         }
     }
 
+    /**
+     * Pairs each search result with the public ID of the semantic it matched.
+     *
+     * <p>The two lists arrive positionally aligned — the service returns the matches in
+     * one order and they are carried through unchanged — so they are zipped once here
+     * rather than having the cell look IDs up by row index. {@code semanticPublicIds} is
+     * empty for locally sourced results, which resolve identity from their own version.
+     *
+     * @param results           the matched semantics for one concept
+     * @param semanticPublicIds UUIDs per result, or empty for local results
+     * @return one row per result, in the same order
+     */
+    private static List<SortResultConceptEntryController.DescriptionSemanticRow> descriptionRows(
+            List<LatestVersionSearchResult> results, List<List<UUID>> semanticPublicIds) {
+        List<SortResultConceptEntryController.DescriptionSemanticRow> rows = new ArrayList<>(results.size());
+        for (int i = 0; i < results.size(); i++) {
+            List<UUID> ids = i < semanticPublicIds.size() ? semanticPublicIds.get(i) : List.of();
+            rows.add(new SortResultConceptEntryController.DescriptionSemanticRow(results.get(i), ids));
+        }
+        return rows;
+    }
+
     /**
      * Mark up the concept title with the same {@code <B>...</B>} convention
      * Lucene's highlighter uses for description-semantic snippets, so the

kview/src/main/java/dev/ikm/komet/kview/mvvm/view/search/SortResultConceptEntryController.java

@@ -30,12 +30,15 @@
 import dev.ikm.komet.kview.events.pattern.MakePatternWindowEvent;
 import dev.ikm.komet.kview.mvvm.view.AbstractBasicController;
 import dev.ikm.komet.layout.editor.StandardEditorWindows;
+import dev.ikm.tinkar.common.id.PublicIds;
+import dev.ikm.tinkar.coordinate.stamp.calculator.Latest;
 import dev.ikm.tinkar.coordinate.stamp.calculator.LatestVersionSearchResult;
 import dev.ikm.tinkar.entity.ConceptEntity;
 import dev.ikm.tinkar.entity.Entity;
 import dev.ikm.tinkar.entity.EntityService;
 import dev.ikm.tinkar.entity.EntityVersion;
 import dev.ikm.tinkar.entity.PatternEntity;
+import dev.ikm.tinkar.entity.SemanticEntityVersion;
 import dev.ikm.tinkar.events.EvtBus;
 import dev.ikm.tinkar.events.EvtBusFactory;
 import dev.ikm.tinkar.common.service.RemoteConceptSearchService;
@@ -87,7 +90,7 @@ public class SortResultConceptEntryController extends AbstractBasicController {
     private Label retiredLabel;
 
     @FXML
-    private ListView<LatestVersionSearchResult> descriptionsListView;
+    private ListView<DescriptionSemanticRow> descriptionsListView;
 
     @FXML
     private Node dragIndicator;
@@ -143,7 +146,7 @@ public void initialize() {
         });
 
         descriptionsListView.setFixedCellSize(LIST_VIEW_CELL_SIZE);
-        descriptionsListView.getItems().addListener((ListChangeListener<? super LatestVersionSearchResult>) change -> updateListViewPrefHeight());
+        descriptionsListView.getItems().addListener((ListChangeListener<? super DescriptionSemanticRow>) change -> updateListViewPrefHeight());
         updateListViewPrefHeight();
 
         descriptionsListView.setCellFactory(param -> new DescriptionSemanticListCell());
@@ -203,7 +206,24 @@ public void setComponentText(String highlightedTopText) {
         HighlightedSegments.renderHighlightedInto(componentTextFlow, highlightedTopText);
     }
 
-    public ObservableList<LatestVersionSearchResult> getDescriptionListViewItems() { return descriptionsListView.getItems(); }
+    public ObservableList<DescriptionSemanticRow> getDescriptionListViewItems() { return descriptionsListView.getItems(); }
+
+    /**
+     * One row of the expanded description-semantics list.
+     *
+     * <p>{@code publicIds} is populated only for rows from a remote search service, whose
+     * {@code result} carries an absent {@link Latest} because there is no local entity
+     * behind it. It is the row's only identity in that case; locally sourced rows leave it
+     * empty and resolve identity from the result's own version.
+     *
+     * @param result    the search result backing this row
+     * @param publicIds UUIDs of the matched semantic, for remote rows
+     */
+    public record DescriptionSemanticRow(LatestVersionSearchResult result, List<UUID> publicIds) {
+        public DescriptionSemanticRow(LatestVersionSearchResult result) {
+            this(result, List.of());
+        }
+    }
 
     @Override
     public void updateView() {
@@ -288,7 +308,7 @@ private void updateListViewPrefHeight() {
      *                                                                         *
      **************************************************************************/
 
-    class DescriptionSemanticListCell extends ListCell<LatestVersionSearchResult> {
+    class DescriptionSemanticListCell extends ListCell<DescriptionSemanticRow> {
         private HBox cellContainer = new HBox();
         private TextFlow textFlow = new TextFlow();
         private ImageView identicon = new ImageView();
@@ -326,17 +346,32 @@ public DescriptionSemanticListCell() {
         }
 
         @Override
-        protected void updateItem(LatestVersionSearchResult item, boolean empty) {
+        protected void updateItem(DescriptionSemanticRow item, boolean empty) {
             if (item == null || empty) {
                 setGraphic(null);
+                identicon.setImage(null);
                 currentNid = -1;
             } else {
-                item.latestVersion().ifPresent(semanticEntityVersion -> {
+                // Reset first: cells are recycled, and a remote row resolves neither the
+                // image nor the nid, so a stale one would otherwise show the previous
+                // row's icon and open the previous row's semantic on double-click.
+                identicon.setImage(null);
+                currentNid = -1;
+
+                LatestVersionSearchResult result = item.result();
+                if (result.latestVersion() != null && result.latestVersion().isPresent()) {
+                    SemanticEntityVersion semanticEntityVersion = result.latestVersion().get();
                     identicon.setImage(Identicon.generateIdenticonImage(semanticEntityVersion.publicId()));
                     currentNid = semanticEntityVersion.nid();
                     setUpDraggable(cellContainer, semanticEntityVersion.entity(), getDragAndDropType(semanticEntityVersion.entity()));
-                });
-                HighlightedSegments.renderHighlightedInto(textFlow, item.highlightedString());
+                } else if (!item.publicIds().isEmpty()) {
+                    // Remote row: no local entity, so the public ID sent with the match is
+                    // the only identity available. Enough to draw the icon; opening and
+                    // dragging still need a real entity and stay disabled.
+                    identicon.setImage(Identicon.generateIdenticonImage(
+                            PublicIds.of(item.publicIds().toArray(new UUID[0]))));
+                }
+                HighlightedSegments.renderHighlightedInto(textFlow, result.highlightedString());
                 setGraphic(cellContainer);
             }
         }