diff --git a/src/mol-plugin/state/actions/basic.ts b/src/mol-plugin/state/actions/basic.ts
index bb7a990df0dc084cdb1f27bd7d54d9602ced27ad..dae5e96b5161567c5b088aca58983999a021d9c7 100644
--- a/src/mol-plugin/state/actions/basic.ts
+++ b/src/mol-plugin/state/actions/basic.ts
@@ -21,64 +21,48 @@ import { ElementSymbolColorThemeParams } from 'mol-theme/color/element-symbol';
// TODO: "structure parser provider"
export { DownloadStructure }
-namespace DownloadStructure {
- export type Source = PD.NamedParamUnion<ObtainStructureHelpers.ControlMap>
- export interface Params {
- source: Source
- }
-}
-namespace ObtainStructureHelpers {
- export const ControlMap = {
- 'pdbe-updated': PD.Text('1cbs', { label: 'Id' }),
- 'rcsb': PD.Text('1tqn', { label: 'Id' }),
- 'bcif-static': PD.Text('1tqn', { label: 'Id' }),
- 'url': PD.Group({ url: PD.Text(''), isBinary: PD.Boolean(false) }, { isExpanded: true })
+type DownloadStructure = typeof DownloadStructure
+const DownloadStructure = StateAction.build({
+ from: PluginStateObject.Root,
+ display: { name: 'Download Structure', description: 'Load a structure from the provided source and create its default Assembly and visual.' },
+ params: {
+ source: PD.MappedStatic('bcif-static', {
+ 'pdbe-updated': PD.Text('1cbs', { label: 'Id' }),
+ 'rcsb': PD.Text('1tqn', { label: 'Id' }),
+ 'bcif-static': PD.Text('1tqn', { label: 'Id' }),
+ 'url': PD.Group({ url: PD.Text(''), isBinary: PD.Boolean(false) }, { isExpanded: true })
+ }, {
+ options: [
+ ['pdbe-updated', 'PDBe Updated'],
+ ['rcsb', 'RCSB'],
+ ['bcif-static', 'BinaryCIF (static PDBe Updated)'],
+ ['url', 'URL']
+ ]
+ })
}
- export type ControlMap = typeof ControlMap
- export const SourceOptions: [keyof ControlMap, string][] = [
- ['pdbe-updated', 'PDBe Updated'],
- ['rcsb', 'RCSB'],
- ['bcif-static', 'BinaryCIF (static PDBe Updated)'],
- ['url', 'URL']
- ];
-
- export function getControls(key: string) { return (ControlMap as any)[key]; }
- export function getUrl(src: DownloadStructure.Source): Transformer.Params<Download> {
- switch (src.name) {
- case 'url': return src.params;
- case 'pdbe-updated': return { url: `https://www.ebi.ac.uk/pdbe/static/entry/${src.params.toLowerCase()}_updated.cif`, isBinary: false, label: `PDBe: ${src.params}` };
- case 'rcsb': return { url: `https://files.rcsb.org/download/${src.params.toUpperCase()}.cif`, isBinary: false, label: `RCSB: ${src.params}` };
- case 'bcif-static': return { url: `https://webchem.ncbr.muni.cz/ModelServer/static/bcif/${src.params.toLowerCase()}`, isBinary: true, label: `BinaryCIF: ${src.params}` };
- default: throw new Error(`${(src as any).name} not supported.`);
- }
+})(({ params, state }) => {
+ const b = state.build();
+ const src = params.source;
+ let url: Transformer.Params<Download>;
+
+ switch (src.name) {
+ case 'url':
+ url = src.params;
+ break;
+ case 'pdbe-updated':
+ url = { url: `https://www.ebi.ac.uk/pdbe/static/entry/${src.params.toLowerCase()}_updated.cif`, isBinary: false, label: `PDBe: ${src.params}` };
+ break;
+ case 'rcsb':
+ url = { url: `https://files.rcsb.org/download/${src.params.toUpperCase()}.cif`, isBinary: false, label: `RCSB: ${src.params}` };
+ break;
+ case 'bcif-static':
+ url = { url: `https://webchem.ncbr.muni.cz/ModelServer/static/bcif/${src.params.toLowerCase()}`, isBinary: true, label: `BinaryCIF: ${src.params}` };
+ break;
+ default: throw new Error(`${(src as any).name} not supported.`);
}
-}
-const DownloadStructure = StateAction.create<PluginStateObject.Root, void, DownloadStructure.Params>({
- from: [PluginStateObject.Root],
- display: {
- name: 'Download Structure',
- description: 'Load a structure from PDBe and create its default Assembly and visual'
- },
- params: () => ({ source: PD.Mapped('bcif-static', ObtainStructureHelpers.SourceOptions, ObtainStructureHelpers.getControls) }),
- run({ params, state }) {
- const b = state.build();
-
- // const query = MolScriptBuilder.struct.generator.atomGroups({
- // // 'atom-test': MolScriptBuilder.core.rel.eq([
- // // MolScriptBuilder.struct.atomProperty.macromolecular.label_comp_id(),
- // // MolScriptBuilder.es('C')
- // // ]),
- // 'residue-test': MolScriptBuilder.core.rel.eq([
- // MolScriptBuilder.struct.atomProperty.macromolecular.label_comp_id(),
- // 'ALA'
- // ])
- // });
- const url = ObtainStructureHelpers.getUrl(params.source);
-
- const data = b.toRoot().apply(StateTransforms.Data.Download, url);
- return state.update(createStructureTree(data));
- }
+ const data = b.toRoot().apply(StateTransforms.Data.Download, url);
+ return state.update(createStructureTree(data));
});
export const OpenStructure = StateAction.build({
diff --git a/src/mol-util/param-definition.ts b/src/mol-util/param-definition.ts
index 77848d8e78ccea62444eb56f929756b53ff0ea4b..403fa613690465eb60d988359a5e94bcb13206a8 100644
--- a/src/mol-util/param-definition.ts
+++ b/src/mol-util/param-definition.ts
@@ -151,17 +151,29 @@ export namespace ParamDefinition {
export interface NamedParams<T = any, K = string> { name: K, params: T }
export type NamedParamUnion<P extends Params, K = keyof P> = K extends any ? NamedParams<P[K]['defaultValue'], K> : never
- export interface Mapped<T> extends Base<NamedParams<T>> {
+ export interface Mapped<T extends NamedParams<any, any>> extends Base<T> {
type: 'mapped',
select: Select<string>,
map(name: string): Any
}
- export function Mapped<T>(defaultKey: string, names: [string, string][], map: Mapped<T>['map'], info?: Info): Mapped<T> {
- return setInfo<Mapped<T>>({
+ export function Mapped<T>(defaultKey: string, names: [string, string][], map: (name: string) => Any, info?: Info): Mapped<NamedParams<T>> {
+ return setInfo<Mapped<NamedParams<T>>>({
type: 'mapped',
defaultValue: { name: defaultKey, params: map(defaultKey).defaultValue as any },
select: Select<string>(defaultKey, names, info),
- map }, info);
+ map
+ }, info);
+ }
+ export function MappedStatic<C extends Params>(defaultKey: keyof C, map: C, info?: Info & { options?: [keyof C, string][] }): Mapped<NamedParamUnion<C>> {
+ const options: [string, string][] = info && info.options
+ ? info.options as [string, string][]
+ : Object.keys(map).map(k => [k, k]) as [string, string][];
+ return setInfo<Mapped<NamedParamUnion<C>>>({
+ type: 'mapped',
+ defaultValue: { name: defaultKey, params: map[defaultKey].defaultValue } as any,
+ select: Select<string>(defaultKey as string, options, info),
+ map: key => map[key]
+ }, info);
}
export interface Converted<T, C> extends Base<T> {