Issue #805: hard-wired 1afo model id

src/examples/assembly-tm/FeatureViewConfig.ts

@@ -13,6 +13,7 @@ import {
     LoadMolstarInterface, LoadMolstarReturnType
 } from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
 import {RcsbFvStateManager} from "../../RcsbFvState/RcsbFvStateManager";
+import { pdbEntry } from ".";
 
 export const rowConfig: Array<RcsbFvRowConfigInterface> = [
     {
@@ -31,18 +32,22 @@ export const rowConfig: Array<RcsbFvRowConfigInterface> = [
     }
 ];
 
+// TODO: must be set by a more clever way
+const modelId = `1afo_model`;
+console.log('PDBENTRY:', pdbEntry);
+
 export const fvConfig: FeatureViewInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType> = {
-    boardId:"7ynk_board",
+    boardId: `${pdbEntry}_board`,
     boardConfig: {
         rowTitleWidth: 190,
         includeAxis: true
     },
     rowConfig: rowConfig,
     sequenceSelectionChangeCallback: (plugin: StructureViewerPublicInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType>, stateManager: RcsbFvStateManager, sequenceRegion: Array<RcsbFvTrackDataElementInterface>) => {
-        stateManager.selectionState.clearSelection("select", {modelId:"7ynk_model", labelAsymId:"A"});
+        stateManager.selectionState.clearSelection("select", {modelId: modelId, labelAsymId:"A"});
         if(sequenceRegion.length > 0) {
             const regions = sequenceRegion.map(r => ({
-                modelId: "7ynk_model",
+                modelId: modelId,
                 labelAsymId: "A",
                 region: {begin: r.begin, end: r.end ?? r.begin, source: "sequence"} as RegionSelectionInterface
             }));
@@ -53,27 +58,36 @@ export const fvConfig: FeatureViewInterface<LoadMolstarInterface<unknown,unknown
                 end: r.region.end
             })), "select", "set");
         }else{
-            plugin.clearSelection("select", {modelId: "7ynk_model", labelAsymId: "A"})
+            plugin.clearSelection("select", {modelId: modelId, labelAsymId: "A"})
             plugin.resetCamera();
         }
     },
     sequenceElementClickCallback: (plugin: StructureViewerPublicInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType>, stateManager: RcsbFvStateManager, d: RcsbFvTrackDataElementInterface) => {
         if(d!=null)
-            plugin.cameraFocus("7ynk_model", "A", d.begin, d.end ?? d.begin);
+            plugin.cameraFocus(modelId, "A", d.begin, d.end ?? d.begin);
     },
     sequenceHoverCallback: (plugin: StructureViewerPublicInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType>, stateManager: RcsbFvStateManager, elements: Array<RcsbFvTrackDataElementInterface>) => {
+        console.log('HOEVER...', elements);
         if(elements == null || elements.length == 0)
             plugin.clearSelection("hover");
-        else
+        else {
+            const e = elements[0];
+            console.log({
+                    modelId: modelId,
+                    labelAsymId: "A",
+                    begin: e.begin,
+                    end: e.end ?? e.begin
+            });
             plugin.select(elements.map(e=>({
-                modelId: "7ynk_model",
+                modelId: modelId,
                 labelAsymId: "A",
                 begin: e.begin,
                 end: e.end ?? e.begin
             })), "hover", "set");
+        }
     },
     structureSelectionCallback: (plugin: StructureViewerPublicInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType>, pfv: RcsbFv, stateManager: RcsbFvStateManager) => {
-        const sel: SaguaroRegionList | undefined = stateManager.selectionState.getSelectionWithCondition("7ynk_model", "A", "select");
+        const sel: SaguaroRegionList | undefined = stateManager.selectionState.getSelectionWithCondition(modelId, "A", "select");
         if(sel == null) {
             pfv.clearSelection("select");
             plugin.resetCamera();
@@ -82,7 +96,7 @@ export const fvConfig: FeatureViewInterface<LoadMolstarInterface<unknown,unknown
         }
     },
     structureHoverCallback: (plugin: StructureViewerPublicInterface<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType>, pfv: RcsbFv, stateManager: RcsbFvStateManager) => {
-        const sel: SaguaroRegionList | undefined = stateManager.selectionState.getSelectionWithCondition("7ynk_model", "A", "hover");
+        const sel: SaguaroRegionList | undefined = stateManager.selectionState.getSelectionWithCondition(modelId, "A", "hover");
         if(sel == null)
             pfv.clearSelection("hover");
         else

src/examples/assembly-tm/index.ts

@@ -22,7 +22,7 @@ import { RcsbPreset } from "@rcsb/rcsb-molstar/build/src/viewer/helpers/preset";
 
 const side1 = "Inside";
 const htpEntry = "GLPA_HUMAN";
-const pdbEntry = "1afo";
+export const pdbEntry = "1afo";
 const pdbtmEntry = `${pdbEntry}_A`;