jbrowse-plugin-msaview 2.8.1 → 2.9.0

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastRIDPanel.d.ts → BlastQuery/BlastAutomaticPanel.d.ts}

@@ -1,10 +1,9 @@
 import React from 'react';
 import type { AbstractTrackModel, Feature } from '@jbrowse/core/util';
-declare const NCBIBlastRIDPanel: ({ handleClose, feature, model, children, baseUrl, }: {
+declare const BlastAutomaticPanel: ({ handleClose, feature, model, children, }: {
     model: AbstractTrackModel;
     feature: Feature;
-    baseUrl: string;
     handleClose: () => void;
     children: React.ReactNode;
 }) => React.JSX.Element;
-export default NCBIBlastRIDPanel;
+export default BlastAutomaticPanel;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastAutomaticPanel.js → BlastQuery/BlastAutomaticPanel.js}

@@ -6,7 +6,7 @@ import { makeStyles } from 'tss-react/mui';
 import CachedBlastResults from './CachedBlastResults';
 import MsaAlgorithmSelect from './MsaAlgorithmSelect';
 import { blastLaunchView } from './blastLaunchView';
-import { blastDatabaseOptions, blastPrograms } from './consts';
+import { blastDatabaseOptions, defaultBlastDatabase } from './consts';
 import { useCachedBlastResults } from './useCachedBlastResults';
 import TextField2 from '../../../components/TextField2';
 import { getBlastViewTitle, getGeneIdentifiers, getLinearGenomeView, } from '../../util';
@@ -18,13 +18,6 @@ const useStyles = makeStyles()({
     selectField: {
         width: 150,
     },
-    databaseFieldContainer: {
-        display: 'flex',
-    },
-    clusterSeqMessage: {
-        marginLeft: 4,
-        alignContent: 'center',
-    },
     cachedResultsAccordion: {
         marginTop: 20,
     },
@@ -32,13 +25,12 @@ const useStyles = makeStyles()({
         marginTop: 20,
     },
 });
-const NCBIBlastAutomaticPanel = observer(function ({ handleClose, feature, model, children, baseUrl, }) {
+const BlastAutomaticPanel = observer(function ({ handleClose, feature, model, children, }) {
     const { classes } = useStyles();
     const view = getLinearGenomeView(model);
     const [launchViewError, setLaunchViewError] = useState();
-    const [selectedBlastDatabase, setSelectedBlastDatabase] = useState('nr');
+    const [selectedBlastDatabase, setSelectedBlastDatabase] = useState(defaultBlastDatabase);
     const [selectedMsaAlgorithm, setSelectedMsaAlgorithm] = useState('clustalo');
-    const [selectedBlastProgram, setSelectedBlastProgram] = useState('quick-blastp');
     const geneIds = useMemo(() => getGeneIdentifiers(feature), [feature]);
     const { results: cachedResults, error: cachedResultsError } = useCachedBlastResults(geneIds);
     const transcriptSelection = useTranscriptSelection({ feature, view });
@@ -48,20 +40,11 @@ const NCBIBlastAutomaticPanel = observer(function ({ handleClose, feature, model
         React.createElement(LaunchPanelContent, { error: e },
             children,
             React.createElement(TextField2, { variant: "outlined", label: "BLAST database", className: classes.selectField, select: true, value: selectedBlastDatabase, onChange: event => {
-                    const newDb = event.target.value;
-                    setSelectedBlastDatabase(newDb);
-                    if (newDb === 'nr_cluster_seq') {
-                        setSelectedBlastProgram('blastp');
-                    }
+                    setSelectedBlastDatabase(event.target.value);
                 } }, blastDatabaseOptions.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
             React.createElement(MsaAlgorithmSelect, { className: classes.selectField, value: selectedMsaAlgorithm, onChange: setSelectedMsaAlgorithm }),
-            React.createElement("div", { className: classes.databaseFieldContainer },
-                React.createElement(TextField2, { variant: "outlined", label: "BLAST program", disabled: selectedBlastDatabase === 'nr_cluster_seq', className: classes.selectField, select: true, value: selectedBlastProgram, onChange: event => {
-                        setSelectedBlastProgram(event.target.value);
-                    } }, blastPrograms.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
-                selectedBlastDatabase === 'nr_cluster_seq' ? (React.createElement(Typography, { variant: "subtitle2", className: classes.clusterSeqMessage }, "Can only use blastp on nr_cluster_seq")) : null),
             React.createElement(TranscriptSelector, { feature: feature, ...transcriptSelection }),
-            React.createElement(Typography, { className: classes.infoText }, "This panel will automatically submit a query to NCBI. Using blastp can take 10+ minutes to run, quick-blastp is generally a lot faster but is not available for the clustered database. After completion, all the hits will be run through a multiple sequence alignment. Note: we are not able to currently run NCBI COBALT automatically on the BLAST results, even though that is the method NCBI uses on their website. If you need a COBALT alignment, please use the manual approach of submitting BLAST yourself and downloading the resulting files"),
+            React.createElement(Typography, { className: classes.infoText }, "This panel will automatically submit a blastp query to EBI, which searches UniProtKB. Searches usually finish in under a minute, and swissprot returns curated sequences that align more cleanly than the many near-identical entries a TrEMBL search brings back. After completion, all the hits will be run through a multiple sequence alignment. Searching NCBI's nr needs the manual approach: NCBI no longer lets a browser read responses from Blast.cgi."),
             cachedResults.length > 0 ? (React.createElement(Accordion, { className: classes.cachedResultsAccordion },
                 React.createElement(AccordionSummary, { expandIcon: React.createElement(ExpandMoreIcon, null) },
                     React.createElement(Typography, null, "Previous BLAST Results")),
@@ -76,8 +59,6 @@ const NCBIBlastAutomaticPanel = observer(function ({ handleClose, feature, model
                             view,
                             newViewTitle: getBlastViewTitle(feature, selectedTranscript),
                             blastParams: {
-                                baseUrl,
-                                blastProgram: selectedBlastProgram,
                                 blastDatabase: selectedBlastDatabase,
                                 msaAlgorithm: selectedMsaAlgorithm,
                                 selectedTranscript,
@@ -93,4 +74,4 @@ const NCBIBlastAutomaticPanel = observer(function ({ handleClose, feature, model
                 }
             }, onCancel: handleClose })));
 });
-export default NCBIBlastAutomaticPanel;
+export default BlastAutomaticPanel;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastManualPanel.d.ts → BlastQuery/BlastManualPanel.d.ts}

@@ -1,10 +1,9 @@
 import React from 'react';
 import type { AbstractTrackModel, Feature } from '@jbrowse/core/util';
-declare const NCBIBlastManualPanel: ({ handleClose, feature, model, children, baseUrl, }: {
+declare const BlastManualPanel: ({ handleClose, feature, model, children, }: {
     children: React.ReactNode;
     model: AbstractTrackModel;
     feature: Feature;
-    baseUrl: string;
     handleClose: () => void;
 }) => React.JSX.Element;
-export default NCBIBlastManualPanel;
+export default BlastManualPanel;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastManualPanel.js → BlastQuery/BlastManualPanel.js}

@@ -3,6 +3,7 @@ import { shorten2 } from '@jbrowse/core/util';
 import { Button, DialogActions, Typography } from '@mui/material';
 import { observer } from 'mobx-react';
 import { makeStyles } from 'tss-react/mui';
+import { BASE_BLAST_URL } from './consts';
 import ExternalLink from '../../../components/ExternalLink';
 import { cleanProteinSequence, getLinearGenomeView } from '../../util';
 import LaunchPanelContent from '../LaunchPanelContent';
@@ -18,14 +19,16 @@ const useStyles = makeStyles()({
         marginTop: 20,
     },
 });
-const NCBIBlastManualPanel = observer(function ({ handleClose, feature, model, children, baseUrl, }) {
+const BlastManualPanel = observer(function ({ handleClose, feature, model, children, }) {
     const { classes } = useStyles();
     const view = getLinearGenomeView(model);
     const transcriptSelection = useTranscriptSelection({ feature, view });
     const { proteinSequence, error } = transcriptSelection;
     const s2 = cleanProteinSequence(proteinSequence);
-    const link = `${baseUrl}?PAGE_TYPE=BlastSearch&PAGE=Proteins&PROGRAM=blastp&QUERY=${s2}`;
-    const link2 = `${baseUrl}?PAGE_TYPE=BlastSearch&PAGE=Proteins&PROGRAM=blastp&QUERY=${shorten2(s2, 10)}`;
+    // a link the user follows to NCBI's own site, not something we fetch — which
+    // is exactly why this route still works when the automatic one cannot
+    const link = `${BASE_BLAST_URL}?PAGE_TYPE=BlastSearch&PAGE=Proteins&PROGRAM=blastp&QUERY=${s2}`;
+    const link2 = `${BASE_BLAST_URL}?PAGE_TYPE=BlastSearch&PAGE=Proteins&PROGRAM=blastp&QUERY=${shorten2(s2, 10)}`;
     return (React.createElement(React.Fragment, null,
         React.createElement(LaunchPanelContent, { error: error },
             children,
@@ -39,4 +42,4 @@ const NCBIBlastManualPanel = observer(function ({ handleClose, feature, model, c
                     handleClose();
                 } }, "Close"))));
 });
-export default NCBIBlastManualPanel;
+export default BlastManualPanel;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastMethodSelector.d.ts → BlastQuery/BlastMethodSelector.d.ts}

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { BlastLookupMethod } from './NCBIBlastPanel';
-export default function NCBIBlastMethodSelector({ lookupMethod, setLookupMethod, }: {
+import type { BlastLookupMethod } from './BlastPanel';
+export default function BlastMethodSelector({ lookupMethod, setLookupMethod, }: {
     lookupMethod: BlastLookupMethod;
     setLookupMethod: (method: BlastLookupMethod) => void;
 }): React.JSX.Element;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastMethodSelector.js → BlastQuery/BlastMethodSelector.js}

@@ -1,11 +1,10 @@
 import React from 'react';
 import { FormControl, FormControlLabel, Radio, RadioGroup } from '@mui/material';
-export default function NCBIBlastMethodSelector({ lookupMethod, setLookupMethod, }) {
+export default function BlastMethodSelector({ lookupMethod, setLookupMethod, }) {
     return (React.createElement(FormControl, { component: "fieldset" },
         React.createElement(RadioGroup, { row: true, value: lookupMethod, onChange: event => {
                 setLookupMethod(event.target.value);
             } },
             React.createElement(FormControlLabel, { value: "automatic", control: React.createElement(Radio, null), label: "Automatic" }),
-            React.createElement(FormControlLabel, { value: "rid", control: React.createElement(Radio, null), label: "Load from RID" }),
             React.createElement(FormControlLabel, { value: "manual", control: React.createElement(Radio, null), label: "Manual" }))));
 }

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastPanel.d.ts → BlastQuery/BlastPanel.d.ts}

@@ -1,30 +1,21 @@
 import React from 'react';
 import type { AbstractTrackModel, Feature } from '@jbrowse/core/util';
 declare const panelMap: {
-    readonly automatic: ({ handleClose, feature, model, children, baseUrl, }: {
+    readonly automatic: ({ handleClose, feature, model, children, }: {
         model: AbstractTrackModel;
         feature: Feature;
-        baseUrl: string;
         handleClose: () => void;
         children: React.ReactNode;
     }) => React.JSX.Element;
-    readonly rid: ({ handleClose, feature, model, children, baseUrl, }: {
-        model: AbstractTrackModel;
-        feature: Feature;
-        baseUrl: string;
-        handleClose: () => void;
-        children: React.ReactNode;
-    }) => React.JSX.Element;
-    readonly manual: ({ handleClose, feature, model, children, baseUrl, }: {
+    readonly manual: ({ handleClose, feature, model, children, }: {
         children: React.ReactNode;
         model: AbstractTrackModel;
         feature: Feature;
-        baseUrl: string;
         handleClose: () => void;
     }) => React.JSX.Element;
 };
 export type BlastLookupMethod = keyof typeof panelMap;
-export default function NCBIBlastPanel({ handleClose, model, feature, }: {
+export default function BlastPanel({ handleClose, model, feature, }: {
     handleClose: () => void;
     model: AbstractTrackModel;
     feature: Feature;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBIBlastPanel.js → BlastQuery/BlastPanel.js}

@@ -2,12 +2,11 @@ import React, { useState } from 'react';
 import SettingsIcon from '@mui/icons-material/Settings';
 import { IconButton } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
-import NCBIBlastAutomaticPanel from './NCBIBlastAutomaticPanel';
-import NCBIBlastManualPanel from './NCBIBlastManualPanel';
-import NCBIBlastMethodSelector from './NCBIBlastMethodSelector';
-import NCBIBlastRIDPanel from './NCBIBlastRIDPanel';
-import NCBISettingsDialog from './NCBISettingsDialog';
-import { BASE_BLAST_URL } from './consts';
+import BlastAutomaticPanel from './BlastAutomaticPanel';
+import BlastManualPanel from './BlastManualPanel';
+import BlastMethodSelector from './BlastMethodSelector';
+import BlastSettingsDialog from './BlastSettingsDialog';
+import { DEFAULT_EBI_EMAIL, EBI_EMAIL_STORAGE_KEY, } from '../../../utils/ebiJobDispatcher';
 import { useLocalStorage } from '../../../utils/useLocalStorage';
 const useStyles = makeStyles()({
     settingsButton: {
@@ -15,13 +14,12 @@ const useStyles = makeStyles()({
     },
 });
 const panelMap = {
-    automatic: NCBIBlastAutomaticPanel,
-    rid: NCBIBlastRIDPanel,
-    manual: NCBIBlastManualPanel,
+    automatic: BlastAutomaticPanel,
+    manual: BlastManualPanel,
 };
-export default function NCBIBlastPanel({ handleClose, model, feature, }) {
+export default function BlastPanel({ handleClose, model, feature, }) {
     const [lookupMethod, setLookupMethod] = useState('automatic');
-    const [baseUrl, setBaseUrl] = useLocalStorage('msa-blastRootUrl', BASE_BLAST_URL);
+    const [ebiEmail, setEbiEmail] = useLocalStorage(EBI_EMAIL_STORAGE_KEY, DEFAULT_EBI_EMAIL);
     const [settingsOpen, setSettingsOpen] = useState(false);
     const { classes } = useStyles();
     const Panel = panelMap[lookupMethod];
@@ -30,11 +28,11 @@ export default function NCBIBlastPanel({ handleClose, model, feature, }) {
                 setSettingsOpen(true);
             } },
             React.createElement(SettingsIcon, null)),
-        React.createElement(Panel, { model: model, feature: feature, handleClose: handleClose, baseUrl: baseUrl },
-            React.createElement(NCBIBlastMethodSelector, { lookupMethod: lookupMethod, setLookupMethod: setLookupMethod })),
-        settingsOpen ? (React.createElement(NCBISettingsDialog, { baseUrl: baseUrl, handleClose: newUrl => {
-                if (newUrl) {
-                    setBaseUrl(newUrl);
+        React.createElement(Panel, { model: model, feature: feature, handleClose: handleClose },
+            React.createElement(BlastMethodSelector, { lookupMethod: lookupMethod, setLookupMethod: setLookupMethod })),
+        settingsOpen ? (React.createElement(BlastSettingsDialog, { ebiEmail: ebiEmail, handleClose: settings => {
+                if (settings) {
+                    setEbiEmail(settings.ebiEmail);
                 }
                 setSettingsOpen(false);
             } })) : null));

package/dist/LaunchMsaView/components/BlastQuery/BlastSettingsDialog.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export interface BlastSettings {
+    ebiEmail: string;
+}
+export default function BlastSettingsDialog({ handleClose, ebiEmail, }: {
+    handleClose: (arg?: BlastSettings) => void;
+    ebiEmail: string;
+}): React.JSX.Element;

package/dist/LaunchMsaView/components/{NCBIBlastQuery/NCBISettingsDialog.js → BlastQuery/BlastSettingsDialog.js}

@@ -1,32 +1,36 @@
 import React, { useState } from 'react';
-import { Button, Dialog, DialogActions, DialogContent, DialogTitle, } from '@mui/material';
+import { Button, Dialog, DialogActions, DialogContent, DialogTitle, Typography, } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
-import { BASE_BLAST_URL } from './consts';
 import TextField2 from '../../../components/TextField2';
+import { DEFAULT_EBI_EMAIL } from '../../../utils/ebiJobDispatcher';
 const useStyles = makeStyles()({
-    urlField: {
+    field: {
         minWidth: 300,
     },
+    help: {
+        marginBottom: 8,
+    },
 });
-export default function NCBISettingsDialog({ handleClose, baseUrl, }) {
+export default function BlastSettingsDialog({ handleClose, ebiEmail, }) {
     const { classes } = useStyles();
-    const [tempBaseUrl, setTempBaseUrl] = useState(baseUrl);
+    const [tempEbiEmail, setTempEbiEmail] = useState(ebiEmail);
     return (React.createElement(Dialog, { open: true, maxWidth: "lg", onClose: () => {
             handleClose();
         } },
         React.createElement(DialogTitle, null, "BLAST Settings"),
         React.createElement(DialogContent, null,
-            React.createElement(TextField2, { autoFocus: true, margin: "dense", label: "BLAST Base URL", fullWidth: true, variant: "outlined", value: tempBaseUrl, className: classes.urlField, onChange: e => {
-                    setTempBaseUrl(e.target.value);
+            React.createElement(Typography, { variant: "subtitle2", className: classes.help }, "Searches run at EBI, which asks for a contact address on every job so they can reach whoever is generating the load. If your site sends real volume, use your own."),
+            React.createElement(TextField2, { autoFocus: true, margin: "dense", label: "EBI contact email", fullWidth: true, variant: "outlined", value: tempEbiEmail, className: classes.field, onChange: e => {
+                    setTempEbiEmail(e.target.value);
                 } }),
             React.createElement(Button, { variant: "contained", onClick: () => {
-                    setTempBaseUrl(BASE_BLAST_URL);
+                    setTempEbiEmail(DEFAULT_EBI_EMAIL);
                 } }, "Reset")),
         React.createElement(DialogActions, null,
             React.createElement(Button, { variant: "contained", color: "secondary", onClick: () => {
                     handleClose();
                 } }, "Cancel"),
             React.createElement(Button, { color: "primary", variant: "contained", onClick: () => {
-                    handleClose(tempBaseUrl);
+                    handleClose({ ebiEmail: tempEbiEmail });
                 } }, "Save"))));
 }

package/dist/LaunchMsaView/components/{NCBIBlastQuery → BlastQuery}/CachedBlastResults.js

@@ -83,6 +83,6 @@ const CachedBlastResults = observer(function ({ model, handleClose, feature, })
             React.createElement(ListItemButton, { onClick: () => {
                     handleUseCached(result);
                 } },
-                React.createElement(ListItemText, { primary: `${getResultDisplayName(result)} - ${result.blastDatabase}/${result.blastProgram} (${result.msaAlgorithm})`, secondary: `${new Date(result.timestamp).toLocaleString()} - Seq: ${result.proteinSequence.slice(0, 30)}...` }))))))));
+                React.createElement(ListItemText, { primary: `${getResultDisplayName(result)} - ${result.blastDatabase}${result.blastProgram ? `/${result.blastProgram}` : ''} (${result.msaAlgorithm})`, secondary: `${new Date(result.timestamp).toLocaleString()} - Seq: ${result.proteinSequence.slice(0, 30)}...` }))))))));
 });
 export default CachedBlastResults;

package/dist/LaunchMsaView/components/BlastQuery/consts.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Only used to build the link-out on the manual panel, which sends the user to
+ * NCBI's own site to run BLAST there. Nothing fetches this url: NCBI stopped
+ * sending Access-Control-Allow-Origin to third-party origins, so a browser
+ * cannot read a response from it at all. See docs/blast.md.
+ */
+export declare const BASE_BLAST_URL = "https://blast.ncbi.nlm.nih.gov/Blast.cgi";
+export declare const msaAlgorithms: readonly ["clustalo", "muscle", "kalign", "mafft"];
+export type MsaAlgorithm = (typeof msaAlgorithms)[number];
+export declare const blastDatabaseOptions: readonly ["uniprotkb_swissprot", "uniprotkb", "uniprotkb_reference_proteomes", "uniprotkb_trembl"];
+export type BlastDatabase = (typeof blastDatabaseOptions)[number];
+export declare const defaultBlastDatabase: BlastDatabase;

package/dist/LaunchMsaView/components/BlastQuery/consts.js

@@ -0,0 +1,17 @@
+/**
+ * Only used to build the link-out on the manual panel, which sends the user to
+ * NCBI's own site to run BLAST there. Nothing fetches this url: NCBI stopped
+ * sending Access-Control-Allow-Origin to third-party origins, so a browser
+ * cannot read a response from it at all. See docs/blast.md.
+ */
+export const BASE_BLAST_URL = 'https://blast.ncbi.nlm.nih.gov/Blast.cgi';
+export const msaAlgorithms = ['clustalo', 'muscle', 'kalign', 'mafft'];
+export const blastDatabaseOptions = [
+    'uniprotkb_swissprot',
+    'uniprotkb',
+    'uniprotkb_reference_proteomes',
+    'uniprotkb_trembl',
+];
+// curated, so it returns roughly one good sequence per species rather than the
+// many near-identical TrEMBL entries an alignment reads poorly
+export const defaultBlastDatabase = 'uniprotkb_swissprot';

package/dist/LaunchMsaView/components/LaunchMsaViewDialog.js

@@ -2,8 +2,8 @@ import React, { useState } from 'react';
 import { Dialog } from '@jbrowse/core/ui';
 import { getSession } from '@jbrowse/core/util';
 import { Tab, Tabs } from '@mui/material';
+import BlastPanel from './BlastQuery/BlastPanel';
 import ManualMSALoader from './ManualMSALoader/ManualMSALoader';
-import NCBIBlastPanel from './NCBIBlastQuery/NCBIBlastPanel';
 import OrthologPanel from './OrthologQuery/OrthologPanel';
 import PreLoadedMSA from './PreLoadedMSA/PreLoadedMSADataPanel';
 import { readMsaDatasets } from './PreLoadedMSA/types';
@@ -20,13 +20,13 @@ export default function LaunchMsaViewDialog({ handleClose, feature, model, }) {
                 setValue(newValue);
             } },
             React.createElement(Tab, { label: "Orthologs (fast)", value: "orthologs" }),
-            React.createElement(Tab, { label: "NCBI BLAST query", value: "ncbi_blast" }),
+            React.createElement(Tab, { label: "BLAST query", value: "ncbi_blast" }),
             hasPreloadedDatasets ? (React.createElement(Tab, { label: "Pre-loaded MSA datasets", value: "preloaded_msa" })) : null,
             React.createElement(Tab, { label: "Manual upload", value: "manual_msa" })),
         React.createElement(TabPanel, { value: value, index: "orthologs" },
             React.createElement(OrthologPanel, { handleClose: handleClose, feature: feature, model: model })),
         React.createElement(TabPanel, { value: value, index: "ncbi_blast" },
-            React.createElement(NCBIBlastPanel, { handleClose: handleClose, feature: feature, model: model })),
+            React.createElement(BlastPanel, { handleClose: handleClose, feature: feature, model: model })),
         hasPreloadedDatasets ? (React.createElement(TabPanel, { value: value, index: "preloaded_msa" },
             React.createElement(PreLoadedMSA, { model: model, feature: feature, handleClose: handleClose }))) : null,
         React.createElement(TabPanel, { value: value, index: "manual_msa" },

package/dist/LaunchMsaView/components/OrthologQuery/OrthologPanel.js

@@ -6,8 +6,8 @@ import { orthologLaunchView } from './orthologLaunchView';
 import TextField2 from '../../../components/TextField2';
 import { COMMON_SPECIES } from '../../../utils/ncbiOrthologs';
 import { getGeneDisplayName, getGeneIdentifiers, getLinearGenomeView, getTranscriptDisplayName, } from '../../util';
+import MsaAlgorithmSelect from '../BlastQuery/MsaAlgorithmSelect';
 import LaunchPanelContent from '../LaunchPanelContent';
-import MsaAlgorithmSelect from '../NCBIBlastQuery/MsaAlgorithmSelect';
 import SubmitCancelActions from '../SubmitCancelActions';
 import TranscriptSelector from '../TranscriptSelector';
 import { useTranscriptSelection } from '../useTranscriptSelection';

package/dist/LaunchMsaViewExtensionPoint/index.js

@@ -1,12 +1,19 @@
 export default function LaunchMsaViewExtensionPointF(pluginManager) {
     pluginManager.addToExtensionPoint('LaunchView-MsaView', (args) => {
         const { session, data, msaFileLocation, msaIndexedLocation, msaName, treeFileLocation, querySeqName, ...rest } = args;
-        if (!data && !msaFileLocation && !msaIndexedLocation) {
-            throw new Error('No MSA data or file location provided when launching MSA view');
+        // `orthologParams` is a fourth source, and unlike the other three it names
+        // no alignment at all — the view builds one from NCBI at launch, which is
+        // the dialog's Orthologs tab reached declaratively.
+        if (!data &&
+            !msaFileLocation &&
+            !msaIndexedLocation &&
+            !rest.orthologParams) {
+            throw new Error('No MSA data, file location or orthologParams provided when launching MSA view');
         }
         // inline data and the tree URL are native react-msaview snapshot props, set
-        // directly. Only sources needing launch-time resolution go through `init`:
-        // msaUrl (AlphaFold sniff) and the name-indexed bgzip block (no native loader).
+        // directly, and so is orthologParams (the model's own autorun picks it up).
+        // Only sources needing launch-time resolution go through `init`: msaUrl
+        // (AlphaFold sniff) and the name-indexed bgzip block (no native loader).
         session.addView('MsaView', {
             type: 'MsaView',
             ...rest,

package/dist/MsaViewPanel/components/JobLink.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare function JobLink({ jobId }: {
+    jobId: string;
+}): React.JSX.Element;
+export default JobLink;

package/dist/MsaViewPanel/components/JobLink.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import { Typography } from '@mui/material';
+import ExternalLink from '../../components/ExternalLink';
+import { ebiBlastResultUrl } from '../../utils/ebiBlast';
+function JobLink({ jobId }) {
+    return (React.createElement(Typography, null,
+        "Job ",
+        jobId,
+        " (",
+        React.createElement(ExternalLink, { href: ebiBlastResultUrl(jobId) }, "see status"),
+        ")"));
+}
+export default JobLink;

package/dist/MsaViewPanel/components/LoadingBLAST.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 import type { JBrowsePluginMsaViewModel } from '../model';
-declare const LoadingBLAST: ({ model, baseUrl, }: {
+declare const LoadingBLAST: ({ model, }: {
     model: JBrowsePluginMsaViewModel;
-    baseUrl: string;
 }) => React.JSX.Element;
 export default LoadingBLAST;

package/dist/MsaViewPanel/components/LoadingBLAST.js

@@ -3,7 +3,7 @@ import { ErrorMessage, LoadingEllipses } from '@jbrowse/core/ui';
 import { Typography } from '@mui/material';
 import { observer } from 'mobx-react';
 import { makeStyles } from 'tss-react/mui';
-import RIDLink from './RIDLink';
+import JobLink from './JobLink';
 const useStyles = makeStyles()(theme => ({
     margin: {
         padding: 20,
@@ -12,22 +12,15 @@ const useStyles = makeStyles()(theme => ({
         background: theme.palette.background.paper,
     },
 }));
-function RIDError({ baseUrl, rid, error, }) {
-    return (React.createElement("div", null,
-        rid ? React.createElement(RIDLink, { rid: rid, baseUrl: baseUrl }) : null,
-        React.createElement(ErrorMessage, { error: error })));
-}
-function RIDProgress({ baseUrl, rid, progress, }) {
-    const { classes } = useStyles();
-    return (React.createElement("div", { className: classes.loading },
-        rid ? React.createElement(RIDLink, { baseUrl: baseUrl, rid: rid }) : null,
-        React.createElement(Typography, null, progress)));
-}
-const LoadingBLAST = observer(function LoadingBLAST2({ model, baseUrl, }) {
+const LoadingBLAST = observer(function LoadingBLAST2({ model, }) {
     const { progress, rid, error } = model;
     const { classes } = useStyles();
     return (React.createElement("div", { className: classes.margin },
-        React.createElement(LoadingEllipses, { message: "Running NCBI BLAST", variant: "h5" }),
-        error ? (React.createElement(RIDError, { baseUrl: baseUrl, rid: rid, error: error })) : rid ? (React.createElement(RIDProgress, { baseUrl: baseUrl, rid: rid, progress: progress })) : (React.createElement(Typography, null, progress || 'Initializing BLAST query'))));
+        React.createElement(LoadingEllipses, { message: "Running EBI BLAST", variant: "h5" }),
+        error ? (React.createElement("div", null,
+            rid ? React.createElement(JobLink, { jobId: rid }) : null,
+            React.createElement(ErrorMessage, { error: error }))) : rid ? (React.createElement("div", { className: classes.loading },
+            React.createElement(JobLink, { jobId: rid }),
+            React.createElement(Typography, null, progress))) : (React.createElement(Typography, null, progress || 'Initializing BLAST query'))));
 });
 export default LoadingBLAST;

package/dist/MsaViewPanel/components/MsaViewPanel.js

@@ -14,7 +14,7 @@ const MsaViewPanel = observer(function MsaViewPanel2({ model, }) {
     const { classes } = useStyles();
     const { blastParams, loadingStoredData } = model;
     return (React.createElement(ErrorBoundary, null,
-        React.createElement("div", null, blastParams ? (React.createElement(LoadingBLAST, { model: model, baseUrl: blastParams.baseUrl })) : loadingStoredData ? (React.createElement("div", { className: classes.loadingContainer },
+        React.createElement("div", null, blastParams ? (React.createElement(LoadingBLAST, { model: model })) : loadingStoredData ? (React.createElement("div", { className: classes.loadingContainer },
             React.createElement(LoadingEllipses, { message: "Loading MSA data", variant: "h6" }))) : (React.createElement(MSAView, { model: model })))));
 });
 export default MsaViewPanel;

package/dist/MsaViewPanel/doLaunchBlast.js

@@ -1,32 +1,25 @@
 import { makeId, strip } from '../LaunchMsaView/components/util';
 import { cleanProteinSequence } from '../LaunchMsaView/util';
 import { saveBlastResult } from '../utils/blastCache';
+import { queryEbiBlast } from '../utils/ebiBlast';
 import { launchMSA } from '../utils/msa';
-import { queryBlast, queryBlastFromRid } from '../utils/ncbiBlast';
 import { fetchTaxonomyInfo } from '../utils/taxonomyNames';
 export async function doLaunchBlast({ self, }) {
-    const { baseUrl, blastDatabase, blastProgram, msaAlgorithm, proteinSequence, selectedTranscript, rid: existingRid, } = self.blastParams;
+    const { blastDatabase, msaAlgorithm, proteinSequence, selectedTranscript } = self.blastParams;
     const cleanedSeq = cleanProteinSequence(proteinSequence);
     const onProgress = (arg) => {
         self.setProgress(arg);
     };
-    if (existingRid) {
-        // publish it before the first poll so the view can link out to NCBI while
+    const { hits, rid } = await queryEbiBlast({
+        query: cleanedSeq,
+        blastDatabase,
+        onProgress,
+        // publish the job id before the first poll so the view can link out while
         // the job is still running
-        self.setRid(existingRid);
-    }
-    const { hits, rid } = existingRid
-        ? await queryBlastFromRid({ rid: existingRid, baseUrl, onProgress })
-        : await queryBlast({
-            query: cleanedSeq,
-            blastDatabase,
-            blastProgram,
-            baseUrl,
-            onProgress,
-            onRid: r => {
-                self.setRid(r);
-            },
-        });
+        onRid: r => {
+            self.setRid(r);
+        },
+    });
     self.setProgress('Fetching species taxonomy info...');
     const taxids = hits
         .map(h => h.description[0]?.taxid)
@@ -53,7 +46,6 @@ export async function doLaunchBlast({ self, }) {
     await saveBlastResult({
         proteinSequence: cleanedSeq,
         blastDatabase,
-        blastProgram,
         msaAlgorithm,
         msa: result.msa,
         tree: result.tree,