move actions back to PluginSpec

src/mol-plugin-ui/context.ts

@@ -13,6 +13,7 @@ export class PluginUIContext extends PluginContext {
     readonly customParamEditors = new Map<string, StateTransformParameters.Class>();
 
     private initDataActions() {
+        if (!this.spec.actions) return;
         for (const a of this.spec.actions) {
             this.state.data.actions.add(a.action);
         }

src/mol-plugin-ui/spec.ts

@@ -16,7 +16,6 @@ import { BoxifyVolumeStreaming, CreateVolumeStreamingBehavior, InitVolumeStreami
 export { PluginUISpec };
 
 interface PluginUISpec extends PluginSpec {
-    actions: PluginUISpec.Action[],
     customParamEditors?: [StateAction | StateTransformer, StateTransformParameters.Class][],
     components?: {
         controls?: PluginUISpec.LayoutControls
@@ -31,16 +30,6 @@ interface PluginUISpec extends PluginSpec {
 }
 
 namespace PluginUISpec {
-    export interface Action {
-        action: StateAction | StateTransformer,
-        customControl?: StateTransformParameters.Class,
-        autoUpdate?: boolean
-    }
-
-    export function Action(action: StateAction | StateTransformer, params?: { customControl?: StateTransformParameters.Class, autoUpdate?: boolean }): Action {
-        return { action, customControl: params && params.customControl, autoUpdate: params && params.autoUpdate };
-    }
-
     export interface LayoutControls {
         top?: React.ComponentClass | 'none',
         left?: React.ComponentClass | 'none',
@@ -52,49 +41,49 @@ namespace PluginUISpec {
 export const DefaultPluginUISpec = (): PluginUISpec => ({
     ...DefaultPluginSpec(),
     actions: [
-        PluginUISpec.Action(StateActions.Structure.DownloadStructure),
-        PluginUISpec.Action(StateActions.Structure.AddTrajectory),
-        PluginUISpec.Action(StateActions.Volume.DownloadDensity),
-        PluginUISpec.Action(StateActions.DataFormat.DownloadFile),
-        PluginUISpec.Action(StateActions.DataFormat.OpenFiles),
-        PluginUISpec.Action(StateActions.Structure.EnableModelCustomProps),
-        PluginUISpec.Action(StateActions.Structure.EnableStructureCustomProps),
+        PluginSpec.Action(StateActions.Structure.DownloadStructure),
+        PluginSpec.Action(StateActions.Structure.AddTrajectory),
+        PluginSpec.Action(StateActions.Volume.DownloadDensity),
+        PluginSpec.Action(StateActions.DataFormat.DownloadFile),
+        PluginSpec.Action(StateActions.DataFormat.OpenFiles),
+        PluginSpec.Action(StateActions.Structure.EnableModelCustomProps),
+        PluginSpec.Action(StateActions.Structure.EnableStructureCustomProps),
 
         // Volume streaming
-        PluginUISpec.Action(InitVolumeStreaming),
-        PluginUISpec.Action(BoxifyVolumeStreaming),
-        PluginUISpec.Action(CreateVolumeStreamingBehavior),
+        PluginSpec.Action(InitVolumeStreaming),
+        PluginSpec.Action(BoxifyVolumeStreaming),
+        PluginSpec.Action(CreateVolumeStreamingBehavior),
 
-        PluginUISpec.Action(StateTransforms.Data.Download),
-        PluginUISpec.Action(StateTransforms.Data.ParseCif),
-        PluginUISpec.Action(StateTransforms.Data.ParseCcp4),
-        PluginUISpec.Action(StateTransforms.Data.ParseDsn6),
+        PluginSpec.Action(StateTransforms.Data.Download),
+        PluginSpec.Action(StateTransforms.Data.ParseCif),
+        PluginSpec.Action(StateTransforms.Data.ParseCcp4),
+        PluginSpec.Action(StateTransforms.Data.ParseDsn6),
 
-        PluginUISpec.Action(StateTransforms.Model.TrajectoryFromMmCif),
-        PluginUISpec.Action(StateTransforms.Model.TrajectoryFromCifCore),
-        PluginUISpec.Action(StateTransforms.Model.TrajectoryFromPDB),
-        PluginUISpec.Action(StateTransforms.Model.TransformStructureConformation),
-        PluginUISpec.Action(StateTransforms.Model.StructureFromModel),
-        PluginUISpec.Action(StateTransforms.Model.StructureFromTrajectory),
-        PluginUISpec.Action(StateTransforms.Model.ModelFromTrajectory),
-        PluginUISpec.Action(StateTransforms.Model.StructureSelectionFromScript),
-        PluginUISpec.Action(StateTransforms.Representation.StructureRepresentation3D),
-        PluginUISpec.Action(StateTransforms.Representation.StructureSelectionsDistance3D),
-        PluginUISpec.Action(StateTransforms.Representation.StructureSelectionsAngle3D),
-        PluginUISpec.Action(StateTransforms.Representation.StructureSelectionsDihedral3D),
-        PluginUISpec.Action(StateTransforms.Representation.StructureSelectionsLabel3D),
-        PluginUISpec.Action(StateTransforms.Representation.StructureSelectionsOrientation3D),
-        PluginUISpec.Action(StateTransforms.Representation.ModelUnitcell3D),
-        PluginUISpec.Action(StateTransforms.Representation.ExplodeStructureRepresentation3D),
-        PluginUISpec.Action(StateTransforms.Representation.UnwindStructureAssemblyRepresentation3D),
-        PluginUISpec.Action(StateTransforms.Representation.OverpaintStructureRepresentation3DFromScript),
-        PluginUISpec.Action(StateTransforms.Representation.TransparencyStructureRepresentation3DFromScript),
+        PluginSpec.Action(StateTransforms.Model.TrajectoryFromMmCif),
+        PluginSpec.Action(StateTransforms.Model.TrajectoryFromCifCore),
+        PluginSpec.Action(StateTransforms.Model.TrajectoryFromPDB),
+        PluginSpec.Action(StateTransforms.Model.TransformStructureConformation),
+        PluginSpec.Action(StateTransforms.Model.StructureFromModel),
+        PluginSpec.Action(StateTransforms.Model.StructureFromTrajectory),
+        PluginSpec.Action(StateTransforms.Model.ModelFromTrajectory),
+        PluginSpec.Action(StateTransforms.Model.StructureSelectionFromScript),
+        PluginSpec.Action(StateTransforms.Representation.StructureRepresentation3D),
+        PluginSpec.Action(StateTransforms.Representation.StructureSelectionsDistance3D),
+        PluginSpec.Action(StateTransforms.Representation.StructureSelectionsAngle3D),
+        PluginSpec.Action(StateTransforms.Representation.StructureSelectionsDihedral3D),
+        PluginSpec.Action(StateTransforms.Representation.StructureSelectionsLabel3D),
+        PluginSpec.Action(StateTransforms.Representation.StructureSelectionsOrientation3D),
+        PluginSpec.Action(StateTransforms.Representation.ModelUnitcell3D),
+        PluginSpec.Action(StateTransforms.Representation.ExplodeStructureRepresentation3D),
+        PluginSpec.Action(StateTransforms.Representation.UnwindStructureAssemblyRepresentation3D),
+        PluginSpec.Action(StateTransforms.Representation.OverpaintStructureRepresentation3DFromScript),
+        PluginSpec.Action(StateTransforms.Representation.TransparencyStructureRepresentation3DFromScript),
 
-        PluginUISpec.Action(AssignColorVolume),
-        PluginUISpec.Action(StateTransforms.Volume.VolumeFromCcp4),
-        PluginUISpec.Action(StateTransforms.Volume.VolumeFromDsn6),
-        PluginUISpec.Action(StateTransforms.Volume.VolumeFromCube),
-        PluginUISpec.Action(StateTransforms.Volume.VolumeFromDx),
-        PluginUISpec.Action(StateTransforms.Representation.VolumeRepresentation3D),
+        PluginSpec.Action(AssignColorVolume),
+        PluginSpec.Action(StateTransforms.Volume.VolumeFromCcp4),
+        PluginSpec.Action(StateTransforms.Volume.VolumeFromDsn6),
+        PluginSpec.Action(StateTransforms.Volume.VolumeFromCube),
+        PluginSpec.Action(StateTransforms.Volume.VolumeFromDx),
+        PluginSpec.Action(StateTransforms.Representation.VolumeRepresentation3D),
     ]
 });

src/mol-plugin/context.ts

@@ -175,7 +175,7 @@ export class PluginContext {
     readonly customModelProperties = new CustomProperty.Registry<Model>();
     readonly customStructureProperties = new CustomProperty.Registry<Structure>();
 
-    readonly customStructureControls = new Map<string, { new(): any /* contructible react components */ }>();
+    readonly customStructureControls = new Map<string, { new(): any /* constructible react components with <action.customControl /> */ }>();
     readonly genericRepresentationControls = new Map<string, (selection: StructureHierarchyManager['selection']) => [StructureHierarchyRef[], string]>();
 
     /**

src/mol-plugin/spec.ts

@@ -12,7 +12,7 @@ import { AnimateModelIndex } from '../mol-plugin-state/animation/built-in/model-
 import { AnimateStateSnapshots } from '../mol-plugin-state/animation/built-in/state-snapshots';
 import { PluginStateAnimation } from '../mol-plugin-state/animation/model';
 import { DataFormatProvider } from '../mol-plugin-state/formats/provider';
-import { StateTransformer } from '../mol-state';
+import { StateAction, StateTransformer } from '../mol-state';
 import { PluginBehaviors } from './behavior';
 import { StructureFocusRepresentation } from './behavior/dynamic/selection/structure-focus-representation';
 import { PluginConfigItem } from './config';
@@ -21,6 +21,7 @@ import { PluginLayoutStateProps } from './layout';
 export { PluginSpec };
 
 interface PluginSpec {
+    actions?: PluginSpec.Action[],
     behaviors: PluginSpec.Behavior[],
     animations?: PluginStateAnimation[],
     customFormats?: [string, DataFormatProvider][],
@@ -32,6 +33,17 @@ interface PluginSpec {
 }
 
 namespace PluginSpec {
+    export interface Action {
+        action: StateAction | StateTransformer,
+        /* constructible react component with <action.customControl /> */
+        customControl?: any,
+        autoUpdate?: boolean
+    }
+
+    export function Action(action: StateAction | StateTransformer, params?: { customControl?: any /* constructible react component with <action.customControl /> */, autoUpdate?: boolean }): Action {
+        return { action, customControl: params && params.customControl, autoUpdate: params && params.autoUpdate };
+    }
+
     export interface Behavior {
         transformer: StateTransformer,
         defaultParams?: any