Issue #820: refactoring: assembly-tm renamed to TmFv3DApp

package.json

@@ -15,7 +15,7 @@
     "buildAll": "npm run cleanAll && npm run tsc && npm run cpStyles && npm run mkDist && npm run copyConfig && npm run copyDef && npm run build && npm run buildDoc",
     "buildApp": "npm run cleanAll && npm run tsc && npm run cpStyles && npm run mkDist && npm run copyConfig && npm run copyDef && npm run build",
     "cpStyles": "ncp src/styles lib/styles",
-    "cpPublic": "ncp public build/TmFeatureViewer && ncp src/examples/assembly-tm/index.html build/TmFeatureViewer/index.html",
+    "cpPublic": "ncp public build/TmFeatureViewer && ncp src/TmFv3DApp/index.html build/TmFeatureViewer/index.html",
     "mkDist": "mkdirp build/dist",
     "initTmFvBuild": "mkdirp build/TmFeatureViewer && npm run cpPublic && npm run cpStyles",
     "copyConfig": "ncp lib/config.js build/dist/config.js",

src/RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager.ts

@@ -28,7 +28,7 @@ import {
     StructureRepresentationPresetProvider
 } from "molstar/lib/mol-plugin-state/builder/structure/representation-preset";
 // import { TmDetDescriptorCache } from "@rcsb/rcsb-molstar/build/src/tmdet-extension/prop";
-import { DebugUtil } from "../../../examples/assembly-tm/tmdet-extension/debug-utils";
+import { DebugUtil } from "../../../TmFv3DApp/tmdet-extension/debug-utils";
 
 export enum LoadMethod {
     loadPdbId = "loadPdbId",

src/examples/assembly-tm/FeatureViewConfig.ts → src/TmFv3DApp/FeatureViewConfig.ts

@@ -2,25 +2,25 @@ import {
     CustomViewInterface,
     FeatureBlockInterface,
     FeatureViewInterface
-} from "../../RcsbFvSequence/SequenceViews/CustomView/CustomView";
+} from "../RcsbFvSequence/SequenceViews/CustomView/CustomView";
 import {
     RcsbFv,
     RcsbFvDisplayTypes,
     RcsbFvRowConfigInterface,
     RcsbFvTrackDataElementInterface
 } from "@rcsb/rcsb-saguaro";
-import { RegionSelectionInterface } from "../../RcsbFvState/RcsbFvSelectorManager";
+import { RegionSelectionInterface } from "../RcsbFvState/RcsbFvSelectorManager";
 import {
     StructureViewerPublicInterface, SaguaroRegionList
-} from "../../RcsbFvStructure/StructureViewerInterface";
+} from "../RcsbFvStructure/StructureViewerInterface";
 import {
     LoadMethod,
     LoadMolstarInterface,
     LoadMolstarReturnType
-} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
-import {RcsbFvStateManager} from "../../RcsbFvState/RcsbFvStateManager";
+} from "../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
+import {RcsbFvStateManager} from "../RcsbFvState/RcsbFvStateManager";
 
-import {RcsbFvStructureConfigInterface} from "../../RcsbFvStructure/RcsbFvStructure";
+import {RcsbFvStructureConfigInterface} from "../RcsbFvStructure/RcsbFvStructure";
 import {ViewerProps} from "@rcsb/rcsb-molstar/build/src/viewer";
 import { updateSiteColors } from "./UniTmpColor";
 import { fetchHtpDescriptor, fetchPdbtmJsvLibDescriptor, htpDescriptorToTrackData, jsvLibDescriptorToTrackData } from "./UniTmpHelper";

src/examples/assembly-tm/index.ts → src/TmFv3DApp/index.ts

@@ -1,4 +1,4 @@
-import { RcsbFv3DCustomInterface} from "../../RcsbFv3D/RcsbFv3DCustom";
+import { RcsbFv3DCustomInterface} from "../RcsbFv3D/RcsbFv3DCustom";
 import { DebugUtil } from "./tmdet-extension/debug-utils";
 import { createFeatureViewerConfing } from "./FeatureViewConfig";
 import { fetchDescriptor, registerRegionDescriptorData } from "./UniTmpHelper";

src/examples/assembly-tm/tmdet-viewer/TmFv3DCustom.tsx → src/TmFv3DApp/tmdet-viewer/TmFv3DCustom.tsx

@@ -1,18 +1,18 @@
 
-import {RcsbFvStructure} from "../../../RcsbFvStructure/RcsbFvStructure";
+import {RcsbFvStructure} from "../../RcsbFvStructure/RcsbFvStructure";
 import uniqid from "uniqid";
 import {
     LoadMolstarInterface,
     LoadMolstarReturnType
-} from "../../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
+} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
 import {ViewerProps} from "@rcsb/rcsb-molstar/build/src/viewer";
-import {StructureViewer} from "../../../RcsbFvStructure/StructureViewers/StructureViewer";
-import {NullBehaviourObserver} from "../../../RcsbFvStructure/StructureViewerBehaviour/NullBehaviour";
-import {MolstarTools} from "../../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarUtils/MolstarTools";
+import {StructureViewer} from "../../RcsbFvStructure/StructureViewers/StructureViewer";
+import {NullBehaviourObserver} from "../../RcsbFvStructure/StructureViewerBehaviour/NullBehaviour";
+import {MolstarTools} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarUtils/MolstarTools";
 import getModelIdFromTrajectory = MolstarTools.getModelIdFromTrajectory;
-import {RcsbFv3DCustomAbstract} from "../../../RcsbFv3D/RcsbFv3DCustomAbstract";
+import {RcsbFv3DCustomAbstract} from "../../RcsbFv3D/RcsbFv3DCustomAbstract";
 import { TmMolstarManagerFactory } from "./TmMolstarManagerFactory";
-import { RcsbFv3DCustomInterface } from "../../../RcsbFv3D/RcsbFv3DCustom";
+import { RcsbFv3DCustomInterface } from "../../RcsbFv3D/RcsbFv3DCustom";
 
 export class TmFv3DCustom extends RcsbFv3DCustomAbstract<LoadMolstarInterface<unknown,unknown>,LoadMolstarReturnType,{viewerElement:string|HTMLElement,viewerProps:Partial<ViewerProps>}> {
 

src/examples/assembly-tm/tmdet-viewer/TmMolstarManagerFactory.ts → src/TmFv3DApp/tmdet-viewer/TmMolstarManagerFactory.ts

@@ -1,11 +1,11 @@
-import {ViewerManagerFactoryInterface} from "../../../RcsbFvStructure/StructureViewerInterface";
-import {LoadMolstarInterface, MolstarActionManager} from "../../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
+import {ViewerManagerFactoryInterface} from "../../RcsbFvStructure/StructureViewerInterface";
+import {LoadMolstarInterface, MolstarActionManager} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarActionManager";
 import { ViewerProps} from "@rcsb/rcsb-molstar/build/src/viewer";
 import { TmViewer } from "./TmViewer";
-import {MolstarModelMapManager} from "../../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarModelMapManager";
-import {MolstarCallbackManager} from "../../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarCallbackManager";
-import {DataContainer} from "../../../Utils/DataContainer";
-import {RcsbFvStateInterface} from "../../../RcsbFvState/RcsbFvStateInterface";
+import {MolstarModelMapManager} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarModelMapManager";
+import {MolstarCallbackManager} from "../../RcsbFvStructure/StructureViewers/MolstarViewer/MolstarCallbackManager";
+import {DataContainer} from "../../Utils/DataContainer";
+import {RcsbFvStateInterface} from "../../RcsbFvState/RcsbFvStateInterface";
 
 export class TmMolstarManagerFactory<P,L> implements ViewerManagerFactoryInterface<LoadMolstarInterface<P,L>,L,{viewerElement:string|HTMLElement,viewerProps:Partial<ViewerProps>}> {
 

webpack.server.dev.config.js

@@ -39,8 +39,7 @@ const commonConfig = {
     devtool: 'source-map'
 };
 
-const examples = ['assembly-tm', 'assembly','uniprot','structural-alignment','sequence-identity','single-chain','multiple-chain','alignment-provider'];
-//const examples = ['assembly-tm'];
+const examples = ['assembly','uniprot','structural-alignment','sequence-identity','single-chain','multiple-chain','alignment-provider'];
 const entries = examples.reduce((prev,current)=>{
         prev[current]= fs.existsSync(`./src/examples/${current}/index.ts`) ? `./src/examples/${current}/index.ts` : `./src/examples/${current}/index.tsx`;
         return prev;

webpack.tm-saguaro.config.js

@@ -48,7 +48,7 @@ const examples = [];
 examples.push({
     ...commonConfig,
     entry: {
-        "tm-saguaro": './lib/examples/assembly-tm/index.js'
+        "tm-saguaro": './lib/TmFv3DApp/index.js'
     },
     output: {
         filename: '[name].js',