@jbrowse/plugin-dotplot-view 2.17.0 → 3.0.0

package/esm/DotplotView/components/ImportForm/ImportSyntenyOpenCustomTrack.js

@@ -0,0 +1,124 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { ErrorMessage, FileSelector } from '@jbrowse/core/ui';
+import HelpIcon from '@mui/icons-material/Help';
+import { Button, FormControlLabel, Grid2, Paper, Radio, RadioGroup, Tooltip, Typography, } from '@mui/material';
+import { observer } from 'mobx-react';
+import { getAdapter } from './getAdapter';
+import { basename, extName, getName, stripGz } from './util';
+const ImportSyntenyOpenCustomTrack = observer(function ({ model, assembly1, assembly2, }) {
+    const [swap, setSwap] = useState(false);
+    const [bed2Location, setBed2Location] = useState();
+    const [bed1Location, setBed1Location] = useState();
+    const [fileLocation, setFileLocation] = useState();
+    const [indexFileLocation, setIndexFileLocation] = useState();
+    const [value, setValue] = useState('');
+    const [error, setError] = useState();
+    const fileName = getName(fileLocation);
+    const radioOption = value || (fileName ? extName(stripGz(fileName)) : '');
+    useEffect(() => {
+        try {
+            if (fileLocation) {
+                const fn = fileName ? basename(fileName) : 'MyTrack';
+                const trackId = `${fn}-${Date.now()}-sessionTrack`;
+                setError(undefined);
+                model.setImportFormSyntenyTrack(0, {
+                    type: 'userOpened',
+                    value: {
+                        trackId,
+                        name: fn,
+                        assemblyNames: [assembly2, assembly1],
+                        type: 'SyntenyTrack',
+                        adapter: getAdapter({
+                            radioOption,
+                            assembly1: swap ? assembly2 : assembly1,
+                            assembly2: swap ? assembly1 : assembly2,
+                            fileLocation,
+                            indexFileLocation,
+                            bed1Location,
+                            bed2Location,
+                        }),
+                    },
+                });
+            }
+        }
+        catch (e) {
+            console.error(e);
+            setError(e);
+        }
+    }, [
+        swap,
+        model,
+        fileName,
+        assembly1,
+        assembly2,
+        bed1Location,
+        bed2Location,
+        fileLocation,
+        indexFileLocation,
+        radioOption,
+    ]);
+    const helpStrings = {
+        '.paf': 'minimap2 target.fa query.fa',
+        '.pif.gz': 'minimap2 target.fa query.fa',
+        '.out': 'mashmap target.fa query.fa',
+        '.delta': 'mummer target.fa query.fa',
+        '.chain': 'e.g. queryToTarget.chain',
+    };
+    return (_jsxs(Paper, { style: { padding: 12 }, children: [error ? _jsx(ErrorMessage, { error: error }) : null, _jsx(Typography, { style: { textAlign: 'center' }, children: "Add a .paf (minimap2), .delta (Mummer), .chain (UCSC liftover), .anchors or .anchors.simple (MCScan), or .pif.gz (jbrowse CLI make-pif) file to view. These file types can also be gzipped." }), _jsx(RadioGroup, { value: radioOption, onChange: event => {
+                    setValue(event.target.value);
+                }, children: _jsx(Grid2, { container: true, justifyContent: "center", children: [
+                        '.paf',
+                        '.delta',
+                        '.out',
+                        '.chain',
+                        '.anchors',
+                        '.anchors.simple',
+                        '.pif.gz',
+                    ].map(extension => (_jsx(FormControlLabel, { value: extension, control: _jsx(Radio, {}), label: extension }, extension))) }) }), _jsx(Grid2, { container: true, justifyContent: "center", children: radioOption === '.paf' ||
+                    radioOption === '.out' ||
+                    radioOption === '.delta' ||
+                    radioOption === '.chain' ||
+                    radioOption === '.pif.gz' ? (_jsxs("div", { style: {
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: 10,
+                    }, children: [_jsx(FileSelector, { name: `${radioOption} location`, inline: true, description: "", location: fileLocation, setLocation: loc => {
+                                setFileLocation(loc);
+                            } }), _jsxs("div", { children: [_jsxs("div", { children: ["Verify or click swap", _jsx(Tooltip, { title: _jsx("code", { children: helpStrings[radioOption] }), children: _jsx(HelpIcon, {}) })] }), _jsxs("div", { style: {
+                                        display: 'flex',
+                                        gap: 20,
+                                    }, children: [_jsxs("div", { style: {
+                                                display: 'grid',
+                                                gridTemplateColumns: '1fr 1fr',
+                                                gap: 4,
+                                                alignItems: 'center',
+                                            }, children: [_jsx("div", { children: _jsx("i", { children: swap ? assembly2 : assembly1 }) }), _jsx("div", { children: "query assembly" }), _jsx("div", { children: _jsx("i", { children: swap ? assembly1 : assembly2 }) }), _jsx("div", { children: "target assembly" })] }), _jsx(Button, { variant: "contained", onClick: () => {
+                                                setSwap(!swap);
+                                            }, children: "Swap?" })] })] })] })) : value === '.anchors' || value === '.anchors.simple' ? (_jsxs("div", { children: [_jsxs("div", { style: { margin: 20 }, children: ["Open the ", value, " and .bed files for both genome assemblies from the MCScan (Python version) pipeline", ' ', _jsx("a", { href: "https://github.com/tanghaibao/jcvi/wiki/MCscan-(Python-version)", children: "(more info)" })] }), _jsxs("div", { children: [_jsx(FileSelector, { inline: true, name: value, location: fileLocation, setLocation: loc => {
+                                        setFileLocation(loc);
+                                    } }), _jsx(FileSelector, { inline: true, name: "genome 1 .bed (left column of anchors file)", description: "", location: bed1Location, setLocation: loc => {
+                                        setBed1Location(loc);
+                                    } }), _jsx(FileSelector, { inline: true, name: "genome 2 .bed (right column of anchors file)", description: "", location: bed2Location, setLocation: loc => {
+                                        setBed2Location(loc);
+                                    } })] }), _jsxs("div", { style: {
+                                margin: 'auto',
+                                display: 'flex',
+                                justifyContent: 'center',
+                                gap: 20,
+                            }, children: [_jsxs("div", { style: {
+                                        display: 'grid',
+                                        gridTemplateColumns: '1fr 1fr',
+                                        gap: 4,
+                                        alignItems: 'center',
+                                    }, children: [_jsx("div", { children: _jsx("i", { children: swap ? assembly2 : assembly1 }) }), _jsx("div", { children: "bed1 assembly" }), _jsx("div", { children: _jsx("i", { children: swap ? assembly1 : assembly2 }) }), _jsx("div", { children: "bed2 assembly" })] }), _jsx(Button, { variant: "contained", onClick: () => {
+                                        setSwap(!swap);
+                                    }, children: "Swap?" })] })] })) : value === '.pif.gz' ? (_jsxs("div", { style: { display: 'flex' }, children: [_jsx("div", { children: _jsx(FileSelector, { name: `${value} location`, description: "", location: fileLocation, setLocation: loc => {
+                                    setFileLocation(loc);
+                                } }) }), _jsx("div", { children: _jsx(FileSelector, { name: `${value} index location`, description: "", location: indexFileLocation, setLocation: loc => {
+                                    setIndexFileLocation(loc);
+                                } }) })] })) : (_jsx(FileSelector, { name: value ? `${value} location` : '', description: "", location: fileLocation, setLocation: loc => {
+                        setFileLocation(loc);
+                    } })) })] }));
+});
+export default ImportSyntenyOpenCustomTrack;

package/esm/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.d.ts

@@ -1,9 +1,7 @@
-import React from 'react';
-import { DotplotViewModel } from '../../model';
-declare const Selector: ({ model, assembly1, assembly2, setShowTrackId, }: {
+import type { DotplotViewModel } from '../../model';
+declare const ImportSyntenyTrackSelector: ({ model, assembly1, assembly2, }: {
     model: DotplotViewModel;
     assembly1: string;
     assembly2: string;
-    setShowTrackId: (arg: string) => void;
-}) => React.JSX.Element;
-export default Selector;
+}) => import("react/jsx-runtime").JSX.Element;
+export default ImportSyntenyTrackSelector;

package/esm/DotplotView/components/ImportForm/ImportSyntenyTrackSelector.js

@@ -1,19 +1,19 @@
-import React, { useState, useEffect } from 'react';
-import { Select, MenuItem, Paper, Typography } from '@mui/material';
-import { getTrackName } from '@jbrowse/core/util/tracks';
-import { getSession } from '@jbrowse/core/util';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { readConfObject } from '@jbrowse/core/configuration';
 import { ErrorMessage } from '@jbrowse/core/ui';
-import { readConfObject, } from '@jbrowse/core/configuration';
-import { observer } from 'mobx-react';
-// icons
 import { TrackSelector as TrackSelectorIcon } from '@jbrowse/core/ui/Icons';
+import { getSession } from '@jbrowse/core/util';
+import { getTrackName } from '@jbrowse/core/util/tracks';
+import { MenuItem, Paper, Select, Typography } from '@mui/material';
+import { observer } from 'mobx-react';
 function f(track, assembly1, assembly2) {
     const assemblyNames = readConfObject(track, 'assemblyNames');
     return (assemblyNames.includes(assembly1) &&
         assemblyNames.includes(assembly2) &&
         track.type.includes('Synteny'));
 }
-const Selector = observer(({ model, assembly1, assembly2, setShowTrackId, }) => {
+const ImportSyntenyTrackSelector = observer(function ({ model, assembly1, assembly2, }) {
     var _a;
     const session = getSession(model);
     const { tracks, sessionTracks } = session;
@@ -25,24 +25,16 @@ const Selector = observer(({ model, assembly1, assembly2, setShowTrackId, }) =>
     const resetTrack = ((_a = filteredTracks[0]) === null || _a === void 0 ? void 0 : _a.trackId) || '';
     const [value, setValue] = useState(resetTrack);
     useEffect(() => {
-        // if assembly1/assembly2 changes, then we will want to use this effect to change
-        // the state of the useState because it otherwise gets locked to a stale value
         setValue(resetTrack);
     }, [resetTrack]);
     useEffect(() => {
-        // sets track data in a useEffect because the initial load is needed as well as
-        // onChange's to the select box
-        setShowTrackId(value);
-    }, [value, setShowTrackId]);
-    return (React.createElement(Paper, { style: { padding: 12 } },
-        React.createElement(Typography, { paragraph: true }, "Select a track from the select box below, the track will be shown when you hit \"Launch\"."),
-        React.createElement(Typography, { paragraph: true },
-            "Note: there is a track selector ",
-            React.createElement("i", null, "inside"),
-            " the DotplotView, which can turn on one or more SyntenyTracks (more than one can be displayed at once). Look for the track selector icon ",
-            React.createElement(TrackSelectorIcon, null)),
-        filteredTracks.length ? (React.createElement(Select, { value: value, onChange: event => {
-                setValue(event.target.value);
-            } }, filteredTracks.map(track => (React.createElement(MenuItem, { key: track.trackId, value: track.trackId }, getTrackName(track, session)))))) : (React.createElement(ErrorMessage, { error: `No synteny tracks found for ${assembly1},${assembly2}` }))));
+        model.setImportFormSyntenyTrack(0, {
+            type: 'preConfigured',
+            value,
+        });
+    }, [model, value]);
+    return (_jsxs(Paper, { style: { padding: 12 }, children: [_jsxs(Typography, { children: ["Select a track from the select box below, the track will be shown when you hit \"Launch\". Note: there is a track selector ", _jsx("i", { children: "inside" }), " the DotplotView, which can turn on one or more SyntenyTracks (more than one can be displayed at once). Look for the track selector icon", ' ', _jsx(TrackSelectorIcon, {})] }), filteredTracks.length ? (_jsx(Select, { value: value, onChange: event => {
+                    setValue(event.target.value);
+                }, children: filteredTracks.map(track => (_jsx(MenuItem, { value: track.trackId, children: getTrackName(track, session) }, track.trackId))) })) : (_jsx(ErrorMessage, { error: `No synteny tracks found for ${assembly1},${assembly2}` }))] }));
 });
-export default Selector;
+export default ImportSyntenyTrackSelector;

package/esm/DotplotView/components/ImportForm/TrackSelector.d.ts

@@ -0,0 +1,7 @@
+import type { DotplotViewModel } from '../../model';
+declare const TrackSelector: ({ assembly1, assembly2, model, }: {
+    model: DotplotViewModel;
+    assembly1: string;
+    assembly2: string;
+}) => import("react/jsx-runtime").JSX.Element;
+export default TrackSelector;

package/esm/DotplotView/components/ImportForm/TrackSelector.js

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { FormControl, FormControlLabel, FormLabel, Radio, RadioGroup, } from '@mui/material';
+import { observer } from 'mobx-react';
+import ImportSyntenyOpenCustomTrack from './ImportSyntenyOpenCustomTrack';
+import ImportSyntenyTrackSelector from './ImportSyntenyTrackSelector';
+const TrackSelector = observer(function ({ assembly1, assembly2, model, }) {
+    const [choice, setChoice] = useState('tracklist');
+    useEffect(() => {
+        if (choice === 'none') {
+            model.setImportFormSyntenyTrack(0, { type: 'none' });
+        }
+    }, [model, choice]);
+    return (_jsxs(_Fragment, { children: [_jsxs(FormControl, { children: [_jsx(FormLabel, { id: "group-label", children: "(Optional) Select or add a synteny track" }), _jsxs(RadioGroup, { row: true, value: choice, onChange: event => {
+                            setChoice(event.target.value);
+                        }, "aria-labelledby": "group-label", children: [_jsx(FormControlLabel, { value: "none", control: _jsx(Radio, {}), label: "None" }), _jsx(FormControlLabel, { value: "tracklist", control: _jsx(Radio, {}), label: "Existing track" }), _jsx(FormControlLabel, { value: "custom", control: _jsx(Radio, {}), label: "New track" })] })] }), choice === 'custom' ? (_jsx(ImportSyntenyOpenCustomTrack, { model: model, assembly2: assembly2, assembly1: assembly1 })) : null, choice === 'tracklist' ? (_jsx(ImportSyntenyTrackSelector, { model: model, assembly1: assembly1, assembly2: assembly2 })) : null] }));
+});
+export default TrackSelector;

package/esm/DotplotView/components/ImportForm/getAdapter.d.ts

@@ -0,0 +1,117 @@
+import type { FileLocation } from '@jbrowse/core/util';
+export declare function getAdapter({ radioOption, assembly1, assembly2, fileLocation, indexFileLocation, bed1Location, bed2Location, }: {
+    radioOption: string;
+    assembly1: string;
+    assembly2: string;
+    fileLocation?: FileLocation;
+    indexFileLocation?: FileLocation;
+    bed1Location?: FileLocation;
+    bed2Location?: FileLocation;
+}): {
+    type: string;
+    pafLocation: FileLocation | undefined;
+    queryAssembly: string;
+    targetAssembly: string;
+    outLocation?: undefined;
+    deltaLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    bed1Location?: undefined;
+    bed2Location?: undefined;
+    assemblyNames?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    outLocation: FileLocation | undefined;
+    queryAssembly: string;
+    targetAssembly: string;
+    pafLocation?: undefined;
+    deltaLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    bed1Location?: undefined;
+    bed2Location?: undefined;
+    assemblyNames?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    deltaLocation: FileLocation | undefined;
+    queryAssembly: string;
+    targetAssembly: string;
+    pafLocation?: undefined;
+    outLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    bed1Location?: undefined;
+    bed2Location?: undefined;
+    assemblyNames?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    chainLocation: FileLocation | undefined;
+    queryAssembly: string;
+    targetAssembly: string;
+    pafLocation?: undefined;
+    outLocation?: undefined;
+    deltaLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    bed1Location?: undefined;
+    bed2Location?: undefined;
+    assemblyNames?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    mcscanAnchorsLocation: FileLocation | undefined;
+    bed1Location: FileLocation | undefined;
+    bed2Location: FileLocation | undefined;
+    assemblyNames: string[];
+    pafLocation?: undefined;
+    queryAssembly?: undefined;
+    targetAssembly?: undefined;
+    outLocation?: undefined;
+    deltaLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    mcscanSimpleAnchorsLocation: FileLocation | undefined;
+    bed1Location: FileLocation | undefined;
+    bed2Location: FileLocation | undefined;
+    assemblyNames: string[];
+    pafLocation?: undefined;
+    queryAssembly?: undefined;
+    targetAssembly?: undefined;
+    outLocation?: undefined;
+    deltaLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    pifGzLocation?: undefined;
+    index?: undefined;
+} | {
+    type: string;
+    pifGzLocation: FileLocation | undefined;
+    index: {
+        location: FileLocation | undefined;
+    };
+    assemblyNames: string[];
+    pafLocation?: undefined;
+    queryAssembly?: undefined;
+    targetAssembly?: undefined;
+    outLocation?: undefined;
+    deltaLocation?: undefined;
+    chainLocation?: undefined;
+    mcscanAnchorsLocation?: undefined;
+    bed1Location?: undefined;
+    bed2Location?: undefined;
+    mcscanSimpleAnchorsLocation?: undefined;
+};

package/esm/DotplotView/components/ImportForm/getAdapter.js

@@ -0,0 +1,65 @@
+export function getAdapter({ radioOption, assembly1, assembly2, fileLocation, indexFileLocation, bed1Location, bed2Location, }) {
+    if (radioOption === '.paf') {
+        return {
+            type: 'PAFAdapter',
+            pafLocation: fileLocation,
+            queryAssembly: assembly1,
+            targetAssembly: assembly2,
+        };
+    }
+    else if (radioOption === '.out') {
+        return {
+            type: 'MashMapAdapter',
+            outLocation: fileLocation,
+            queryAssembly: assembly1,
+            targetAssembly: assembly2,
+        };
+    }
+    else if (radioOption === '.delta') {
+        return {
+            type: 'DeltaAdapter',
+            deltaLocation: fileLocation,
+            queryAssembly: assembly1,
+            targetAssembly: assembly2,
+        };
+    }
+    else if (radioOption === '.chain') {
+        return {
+            type: 'ChainAdapter',
+            chainLocation: fileLocation,
+            queryAssembly: assembly1,
+            targetAssembly: assembly2,
+        };
+    }
+    else if (radioOption === '.anchors') {
+        return {
+            type: 'MCScanAnchorsAdapter',
+            mcscanAnchorsLocation: fileLocation,
+            bed1Location,
+            bed2Location,
+            assemblyNames: [assembly1, assembly2],
+        };
+    }
+    else if (radioOption === '.anchors.simple') {
+        return {
+            type: 'MCScanSimpleAnchorsAdapter',
+            mcscanSimpleAnchorsLocation: fileLocation,
+            bed1Location,
+            bed2Location,
+            assemblyNames: [assembly1, assembly2],
+        };
+    }
+    else if (radioOption === '.pif.gz') {
+        return {
+            type: 'PairwiseIndexedPAFAdapter',
+            pifGzLocation: fileLocation,
+            index: {
+                location: indexFileLocation,
+            },
+            assemblyNames: [assembly1, assembly2],
+        };
+    }
+    else {
+        throw new Error(`Unknown to detect type ${radioOption} from filename (select radio button to clarify)`);
+    }
+}

package/esm/DotplotView/components/ImportForm/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
-import { DotplotViewModel } from '../../model';
-declare const DotplotImportForm: ({ model }: {
+import type { DotplotViewModel } from '../../model';
+declare const DotplotImportForm: ({ model, }: {
     model: DotplotViewModel;
-}) => React.JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default DotplotImportForm;

package/esm/DotplotView/components/ImportForm/index.js

@@ -1,12 +1,12 @@
-import React, { useState, useEffect } from 'react';
-import { Button, Container, FormControl, FormLabel, FormControlLabel, Grid, Paper, Radio, RadioGroup, Typography, } from '@mui/material';
-import { makeStyles } from 'tss-react/mui';
-import { observer } from 'mobx-react';
-import { transaction } from 'mobx';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { AssemblySelector, ErrorMessage } from '@jbrowse/core/ui';
 import { getSession, isSessionWithAddTracks } from '@jbrowse/core/util';
-import { ErrorMessage, AssemblySelector } from '@jbrowse/core/ui';
-import ImportCustomTrack from './ImportCustomTrack';
-import ImportSyntenyTrackSelector from './ImportSyntenyTrackSelector';
+import { Button, Container, FormControl, Grid2, Paper, Typography, } from '@mui/material';
+import { toJS, transaction } from 'mobx';
+import { observer } from 'mobx-react';
+import { makeStyles } from 'tss-react/mui';
+import TrackSelector from './TrackSelector';
 const useStyles = makeStyles()(theme => ({
     importFormContainer: {
         padding: theme.spacing(4),
@@ -17,82 +17,55 @@ const useStyles = makeStyles()(theme => ({
         margin: '0 auto',
     },
 }));
-function TrackSelector({ setSessionTrackData, setShowTrackId, sessionTrackData, assembly1, assembly2, model, }) {
-    const [choice, setChoice] = useState('tracklist');
-    useEffect(() => {
-        if (choice === 'none') {
-            setSessionTrackData(undefined);
-            setShowTrackId(undefined);
+function doSubmit({ model, assembly1, assembly2, }) {
+    const session = getSession(model);
+    const { importFormSyntenyTrackSelections } = model;
+    model.setError(undefined);
+    transaction(() => {
+        if (isSessionWithAddTracks(session)) {
+            toJS(importFormSyntenyTrackSelections).map((f, idx) => {
+                var _a;
+                if (f.type === 'userOpened') {
+                    session.addTrackConf(f.value);
+                    model.toggleTrack((_a = f.value) === null || _a === void 0 ? void 0 : _a.trackId);
+                }
+                else if (f.type === 'preConfigured') {
+                    model.showTrack(f.value, idx);
+                }
+            });
         }
-    }, [choice, setSessionTrackData, setShowTrackId]);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(FormControl, null,
-            React.createElement(FormLabel, { id: "group-label" }, "(Optional) Select or add a synteny track"),
-            React.createElement(RadioGroup, { row: true, value: choice, onChange: event => {
-                    setChoice(event.target.value);
-                }, "aria-labelledby": "group-label" },
-                React.createElement(FormControlLabel, { value: "none", control: React.createElement(Radio, null), label: "None" }),
-                React.createElement(FormControlLabel, { value: "tracklist", control: React.createElement(Radio, null), label: "Existing track" }),
-                React.createElement(FormControlLabel, { value: "custom", control: React.createElement(Radio, null), label: "New track" }))),
-        choice === 'custom' ? (React.createElement(ImportCustomTrack, { setSessionTrackData: setSessionTrackData, sessionTrackData: sessionTrackData, assembly2: assembly2, assembly1: assembly1 })) : null,
-        choice === 'tracklist' ? (React.createElement(ImportSyntenyTrackSelector, { model: model, assembly1: assembly1, assembly2: assembly2, setShowTrackId: setShowTrackId })) : null));
+        model.showAllRegions();
+        model.setAssemblyNames(assembly2, assembly1);
+    });
 }
-const DotplotImportForm = observer(({ model }) => {
+const DotplotImportForm = observer(function ({ model, }) {
     const { classes } = useStyles();
     const session = getSession(model);
     const { assemblyNames } = session;
     const [assembly2, setAssembly2] = useState(assemblyNames[0] || '');
     const [assembly1, setAssembly1] = useState(assemblyNames[0] || '');
     const [error, setError] = useState();
-    const [sessionTrackData, setSessionTrackData] = useState();
-    const [showTrackId, setShowTrackId] = useState();
-    function onOpenClick() {
-        try {
-            if (!isSessionWithAddTracks(session)) {
-                return;
-            }
-            setError(undefined);
-            model.setError(undefined);
-            transaction(() => {
-                if (sessionTrackData) {
-                    session.addTrackConf(sessionTrackData);
-                    model.toggleTrack(sessionTrackData.trackId);
-                }
-                else if (showTrackId) {
-                    model.showTrack(showTrackId);
-                }
-                model.setViews([
-                    { bpPerPx: 0.1, offsetPx: 0 },
-                    { bpPerPx: 0.1, offsetPx: 0 },
-                ]);
-                model.setAssemblyNames(assembly2, assembly1);
-            });
-        }
-        catch (e) {
-            console.error(e);
-            setError(e);
-        }
-    }
-    // this is a combination of any displayed error message we have
     const displayError = error || model.error;
-    return (React.createElement(Container, { className: classes.importFormContainer },
-        displayError ? React.createElement(ErrorMessage, { error: displayError }) : null,
-        React.createElement(Grid, { container: true, spacing: 1, justifyContent: "center", alignItems: "center", className: classes.assemblySelector },
-            React.createElement(Grid, { item: true },
-                React.createElement(Paper, { style: { padding: 12 } },
-                    React.createElement(Typography, { style: { textAlign: 'center' } }, "Select assemblies for dotplot view"),
-                    React.createElement(Grid, { container: true, spacing: 1, justifyContent: "center", alignItems: "center" },
-                        React.createElement(Grid, { item: true },
-                            React.createElement(AssemblySelector, { selected: assembly1, onChange: val => {
-                                    setAssembly1(val);
-                                }, session: session })),
-                        React.createElement(Grid, { item: true },
-                            React.createElement(AssemblySelector, { selected: assembly2, onChange: val => {
+    return (_jsxs(Container, { className: classes.importFormContainer, children: [displayError ? _jsx(ErrorMessage, { error: displayError }) : null, _jsxs(Paper, { style: { padding: 12 }, children: [_jsx(Typography, { style: { textAlign: 'center' }, children: "Select assemblies for dotplot view" }), _jsxs(Grid2, { container: true, spacing: 1, justifyContent: "center", alignItems: "center", children: [_jsx(AssemblySelector, { helperText: "x-axis assembly", selected: assembly2, session: session, onChange: val => {
                                     setAssembly2(val);
-                                }, session: session })),
-                        React.createElement(Grid, { item: true },
-                            React.createElement(FormControl, null,
-                                React.createElement(Button, { onClick: onOpenClick, variant: "contained", color: "primary" }, "Launch"))))),
-                React.createElement(TrackSelector, { setShowTrackId: setShowTrackId, assembly2: assembly2, assembly1: assembly1, setSessionTrackData: setSessionTrackData, sessionTrackData: sessionTrackData, model: model })))));
+                                } }), _jsx(AssemblySelector, { helperText: "y-axis assembly", selected: assembly1, session: session, onChange: val => {
+                                    setAssembly1(val);
+                                } }), _jsx(FormControl, { children: _jsx(Button, { onClick: () => {
+                                        ;
+                                        (async () => {
+                                            try {
+                                                setError(undefined);
+                                                doSubmit({
+                                                    assembly1,
+                                                    assembly2,
+                                                    model,
+                                                });
+                                            }
+                                            catch (e) {
+                                                console.error(e);
+                                                setError(e);
+                                            }
+                                        })();
+                                    }, variant: "contained", color: "primary", children: "Launch" }) })] }), _jsx(TrackSelector, { assembly2: assembly2, assembly1: assembly1, model: model })] })] }));
 });
 export default DotplotImportForm;

package/esm/DotplotView/components/ImportForm/util.js

@@ -1,10 +1,8 @@
 export function getName(sessionTrackData) {
     return sessionTrackData
-        ? // @ts-expect-error
+        ?
             sessionTrackData.uri ||
-                // @ts-expect-error
                 sessionTrackData.localPath ||
-                // @ts-expect-error
                 sessionTrackData.name
         : undefined;
 }

package/esm/DotplotView/components/PanButtons.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
-import { DotplotViewModel } from '../model';
+import type { DotplotViewModel } from '../model';
 declare const PanButtons: ({ model, }: {
     model: DotplotViewModel;
-}) => React.JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default PanButtons;