assembly view bug fixes

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 [Semantic Versioning](https://semver.org/)
 
-## [3.0.6] - 2023-05-16
+## [3.0.8] - 2023-05-19
+### Bug fix
+- Chain check box display bug fixed in assembly view 
+- PFV onchange selection bug fixed in assembly view
+
+## [3.0.7] - 2023-05-16
 ### Dependency update
 - rcsb-saguaro-app v5.0.7
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcsb/rcsb-saguaro-3d",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "RCSB Molstar/Saguaro Web App",
   "main": "build/dist/app.js",
   "files": [

src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/AssemblyPfvComponents/ChainDisplayComponent.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 
 import {RcsbFvStateInterface} from "../../../../../RcsbFvState/RcsbFvStateInterface";
+import {Subscription} from "rxjs";
 
 interface ChainDisplayInterface {
 
@@ -18,6 +19,30 @@ export class ChainDisplayComponent extends React.Component<ChainDisplayInterface
         display: 'visible'
     };
 
+    private subscription: Subscription;
+
+    render(): React.ReactElement{
+        return(
+            <input style={{marginLeft:5, marginRight:5}} type={'checkbox'} checked={this.state.display === 'visible'} onChange={this.changeDisplay.bind(this)}/>
+        );
+    }
+
+    componentDidMount(): void {
+        this.subscribe();
+        this.requestInfo();
+    }
+
+    componentWillUnmount(): void {
+        this.subscription.unsubscribe();
+    }
+
+    private subscribe(): void{
+        this.subscription = this.props.stateManager.subscribe<"component-info",ChainDisplayState & {label:string}>((o)=>{
+            if(o.type == "component-info" && o.view == "3d-view" && o.data)
+                this.componentInfo(o.data);
+        });
+    }
+
     private changeDisplay(): void{
         const display = this.state.display === "visible" ? "hidden" : "visible";
         this.setState({display}, ()=>{
@@ -32,10 +57,19 @@ export class ChainDisplayComponent extends React.Component<ChainDisplayInterface
         });
     }
 
-    render(): JSX.Element{
-        return(
-                <input style={{marginLeft:5, marginRight:5}} type={'checkbox'} checked={this.state.display === 'visible'} onChange={this.changeDisplay.bind(this)}/>
-        );
+    private componentInfo(data: ChainDisplayState & {label:string}): void {
+        if(data.label === this.props.label)
+            this.setState({display: data.display});
+    }
+
+    private requestInfo(): void {
+        this.props.stateManager.next<"component-info", {label:string}>({
+            type: "component-info",
+            view: "1d-view",
+            data: {
+                label: this.props.label
+            }
+        });
     }
 
 }

src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/AssemblyPfvManagerFactory.tsx

@@ -75,7 +75,7 @@ class AssemblyPfvManager extends AbstractPfvManager<{instanceSequenceConfig?: In
                     ...this.instanceSequenceConfig,
                     defaultValue: config.defaultAuthId ?? this.instanceSequenceConfig?.defaultValue,
                     onChangeCallback: (context,module)=>{
-                        onChangeCallback.get(this.stateManager.assemblyModelSate.getString("entryId"));
+                        onChangeCallback.get(this.stateManager.assemblyModelSate.getString("entryId"))?.(context);
                         const entryMap:[string, {entryId: string, assemblyId: string, chains: ChainInfo[]}] | undefined = Array.from(this.stateManager.assemblyModelSate.entries()).find((e)=>(e[1].entryId === context.entryId));
                         const operator: OperatorInfo|undefined = entryMap && entryMap[0] ? getOperator(this.stateManager.assemblyModelSate.getMap().get(entryMap[0])!, config.defaultAuthId, operatorNameContainer.get()) : undefined;
                         this.stateManager.pfvContext.set({...context, operator});

src/RcsbFvStructure/StructureViewerBehaviour/AssemblyBehaviour.ts

@@ -58,7 +58,7 @@ class AssemblyBehaviour<R,L> implements StructureViewerBehaviourInterface {
     }
 
     private subscribe(): Subscription {
-        return this.stateManager.subscribe<"visibility-change",{display:'visible' | 'hidden'; label:string;}>(async o=>{
+        return this.stateManager.subscribe<"visibility-change"|"component-info",{display:'visible' | 'hidden'; label:string;}>(async o=>{
             if(o.type == "selection-change" && o.view == "1d-view")
                 this.selectionChange();
             if(o.type == "hover-change" && o.view == "1d-view")
@@ -71,6 +71,8 @@ class AssemblyBehaviour<R,L> implements StructureViewerBehaviourInterface {
                 this.resetPluginView();
             if(o.type == "visibility-change" && o.view == "1d-view" && o.data)
                 this.visibilityChange(o.data);
+            if(o.type == "component-info" && o.view == "1d-view" && o.data)
+                this.componentInfo(o.data);
         });
     }
 
@@ -170,4 +172,15 @@ class AssemblyBehaviour<R,L> implements StructureViewerBehaviourInterface {
         }
     }
 
+    private componentInfo(data:{label:string;}): void {
+        this.stateManager.next<"component-info",{label:string;display:'visible' | 'hidden';}>({
+            type: "component-info",
+            view: "3d-view",
+            data: {
+                label: data.label,
+                display: this.structureViewer.displayComponent(data.label) ? "visible" : "hidden"
+            }
+        });
+    }
+
 }