jbrowse-plugin-msaview 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/dist/AddHighlightModel/MsaToGenomeHighlight.js.map +1 -1
  2. package/dist/AddHighlightModel/util.js +1 -1
  3. package/dist/AddHighlightModel/util.js.map +1 -1
  4. package/dist/LaunchMsaView/components/LaunchMsaViewDialog.js +8 -3
  5. package/dist/LaunchMsaView/components/LaunchMsaViewDialog.js.map +1 -1
  6. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/NcbiBlastPanel.js +12 -4
  7. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/NcbiBlastPanel.js.map +1 -1
  8. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/calculateProteinSequence.js +1 -1
  9. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/calculateProteinSequence.js.map +1 -1
  10. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/useFeatureSequence.js +50 -29
  11. package/dist/LaunchMsaView/components/NewNCBIBlastQuery/useFeatureSequence.js.map +1 -1
  12. package/dist/LaunchMsaView/components/PreLoadedMSA/PreLoadedMSADataPanel.js +6 -2
  13. package/dist/LaunchMsaView/components/PreLoadedMSA/PreLoadedMSADataPanel.js.map +1 -1
  14. package/dist/LaunchMsaView/components/TabUtils.d.ts +1 -5
  15. package/dist/LaunchMsaView/components/TabUtils.js +1 -7
  16. package/dist/LaunchMsaView/components/TabUtils.js.map +1 -1
  17. package/dist/LaunchMsaView/components/tabUtil.d.ts +4 -0
  18. package/dist/LaunchMsaView/components/tabUtil.js +7 -0
  19. package/dist/LaunchMsaView/components/tabUtil.js.map +1 -0
  20. package/dist/LaunchMsaView/index.js +2 -3
  21. package/dist/LaunchMsaView/index.js.map +1 -1
  22. package/dist/LaunchMsaView/util.d.ts +1 -1
  23. package/dist/LaunchMsaView/util.js +1 -1
  24. package/dist/LaunchMsaView/util.js.map +1 -1
  25. package/dist/MsaViewPanel/components/LoadingBLAST.js +1 -1
  26. package/dist/MsaViewPanel/components/LoadingBLAST.js.map +1 -1
  27. package/dist/MsaViewPanel/doLaunchBlast.js +17 -4
  28. package/dist/MsaViewPanel/doLaunchBlast.js.map +1 -1
  29. package/dist/MsaViewPanel/model.d.ts +33 -24
  30. package/dist/MsaViewPanel/model.js +3 -1
  31. package/dist/MsaViewPanel/model.js.map +1 -1
  32. package/dist/MsaViewPanel/msaCoordToGenomeCoord.js +4 -4
  33. package/dist/MsaViewPanel/msaCoordToGenomeCoord.js.map +1 -1
  34. package/dist/jbrowse-plugin-msaview.umd.production.min.js +27 -27
  35. package/dist/jbrowse-plugin-msaview.umd.production.min.js.map +4 -4
  36. package/dist/utils/msa.js +4 -0
  37. package/dist/utils/msa.js.map +1 -1
  38. package/dist/utils/ncbiBlast.js +8 -5
  39. package/dist/utils/ncbiBlast.js.map +1 -1
  40. package/package.json +8 -8
  41. package/src/AddHighlightModel/MsaToGenomeHighlight.tsx +4 -2
  42. package/src/AddHighlightModel/util.ts +1 -1
  43. package/src/LaunchMsaView/components/LaunchMsaViewDialog.tsx +11 -3
  44. package/src/LaunchMsaView/components/NewNCBIBlastQuery/NcbiBlastPanel.tsx +12 -4
  45. package/src/LaunchMsaView/components/NewNCBIBlastQuery/calculateProteinSequence.ts +2 -2
  46. package/src/LaunchMsaView/components/NewNCBIBlastQuery/useFeatureSequence.ts +69 -34
  47. package/src/LaunchMsaView/components/PreLoadedMSA/PreLoadedMSADataPanel.tsx +6 -2
  48. package/src/LaunchMsaView/components/TabUtils.tsx +1 -7
  49. package/src/LaunchMsaView/components/tabUtil.ts +6 -0
  50. package/src/LaunchMsaView/index.ts +36 -31
  51. package/src/LaunchMsaView/util.ts +2 -2
  52. package/src/MsaViewPanel/components/LoadingBLAST.tsx +2 -2
  53. package/src/MsaViewPanel/doLaunchBlast.ts +22 -4
  54. package/src/MsaViewPanel/model.ts +4 -2
  55. package/src/MsaViewPanel/msaCoordToGenomeCoord.ts +4 -4
  56. package/src/utils/msa.ts +3 -0
  57. package/src/utils/ncbiBlast.ts +22 -10
@@ -1 +1 @@
1
- {"version":3,"file":"MsaToGenomeHighlight.js","sourceRoot":"","sources":["../../src/AddHighlightModel/MsaToGenomeHighlight.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAO/C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAIlC,SAAS,gBAAgB,CAAC,QAAkB,EAAE,CAAS;IACrD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC;AAED,MAAM,oBAAoB,GAAG,QAAQ,CAAC,SAAS,qBAAqB,CAAC,EACnE,KAAK,GAGN;IACC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAA8B,CAAA;IAC5E,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAChB,0CACG,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;QACrD,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACnD,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;YAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAA;YAC9D,OAAO,CACL,6BACE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAClC,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GACtB,CACH,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CACD,CACJ,CAAC,CAAC,CAAC,IAAI,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,eAAe,oBAAoB,CAAA"}
1
+ {"version":3,"file":"MsaToGenomeHighlight.js","sourceRoot":"","sources":["../../src/AddHighlightModel/MsaToGenomeHighlight.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAO/C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAIlC,SAAS,gBAAgB,CAAC,QAAkB,EAAE,CAAS;IACrD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC;AAED,MAAM,oBAAoB,GAAG,QAAQ,CAAC,SAAS,qBAAqB,CAAC,EACnE,KAAK,GAGN;IACC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAEjC,CAAA;IACb,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC,CAAA;IAC7D,OAAO,QAAQ,CAAC,CAAC,CAAC,CAChB,0CACG,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;QACrD,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QACnD,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QACjD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;YAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAA;YAC9D,OAAO,CACL,6BACE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAClC,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GACtB,CACH,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CACD,CACJ,CAAC,CAAC,CAAC,IAAI,CAAA;AACV,CAAC,CAAC,CAAA;AAEF,eAAe,oBAAoB,CAAA"}
@@ -5,7 +5,7 @@ export const useStyles = makeStyles()({
5
5
  background: 'rgba(255,255,0,0.2)',
6
6
  border: '1px solid rgba(50,50,0,0.2)',
7
7
  position: 'absolute',
8
- zIndex: 1000,
8
+ zIndex: 99,
9
9
  textAlign: 'center',
10
10
  pointerEvents: 'none',
11
11
  overflow: 'hidden',
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/AddHighlightModel/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,qBAAqB;QACjC,MAAM,EAAE,6BAA6B;QACrC,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,QAAQ;QACnB,aAAa,EAAE,MAAM;QACrB,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC,CAAA"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/AddHighlightModel/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,UAAU,EAAE,qBAAqB;QACjC,MAAM,EAAE,6BAA6B;QACrC,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,QAAQ;QACnB,aAAa,EAAE,MAAM;QACrB,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC,CAAA"}
@@ -2,14 +2,19 @@ import React, { useState } from 'react';
2
2
  import { Dialog } from '@jbrowse/core/ui';
3
3
  import { Box, Tab, Tabs } from '@mui/material';
4
4
  // locals
5
- import { CustomTabPanel, a11yProps } from './TabUtils';
5
+ import CustomTabPanel from './TabUtils';
6
6
  import NewNcbiBlastQueryPanel from './NewNCBIBlastQuery';
7
7
  import PreLoadedMSA from './PreLoadedMSA/PreLoadedMSADataPanel';
8
+ import { a11yProps } from './tabUtil';
8
9
  export default function LaunchProteinViewDialog({ handleClose, feature, model, }) {
9
10
  const [value, setValue] = useState(0);
10
- return (React.createElement(Dialog, { maxWidth: "xl", title: "Launch MSA view", onClose: () => handleClose(), open: true },
11
+ return (React.createElement(Dialog, { maxWidth: "xl", title: "Launch MSA view", onClose: () => {
12
+ handleClose();
13
+ }, open: true },
11
14
  React.createElement(Box, { sx: { borderBottom: 1, borderColor: 'divider' } },
12
- React.createElement(Tabs, { value: value, onChange: (_, val) => setValue(val) },
15
+ React.createElement(Tabs, { value: value, onChange: (_, val) => {
16
+ setValue(val);
17
+ } },
13
18
  React.createElement(Tab, { label: "NCBI BLAST query", ...a11yProps(0) }),
14
19
  React.createElement(Tab, { label: "UCSC 100-way dataset", ...a11yProps(1) }))),
15
20
  React.createElement(CustomTabPanel, { value: value, index: 0 },
@@ -1 +1 @@
1
- {"version":3,"file":"LaunchMsaViewDialog.js","sourceRoot":"","sources":["../../../src/LaunchMsaView/components/LaunchMsaViewDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAG9C,SAAS;AAET,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,sBAAsB,MAAM,qBAAqB,CAAA;AACxD,OAAO,YAAY,MAAM,sCAAsC,CAAA;AAE/D,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,WAAW,EACX,OAAO,EACP,KAAK,GAKN;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAErC,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAC,IAAI,EACb,KAAK,EAAC,iBAAiB,EACvB,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,EAC5B,IAAI;QAEJ,oBAAC,GAAG,IAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE;YAClD,oBAAC,IAAI,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACrD,oBAAC,GAAG,IAAC,KAAK,EAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAI;gBAClD,oBAAC,GAAG,IAAC,KAAK,EAAC,sBAAsB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAI,CACjD,CACH;QACN,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACpC,oBAAC,sBAAsB,IACrB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,GACZ,CACa;QACjB,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACpC,oBAAC,YAAY,IACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACxB,CACa,CACV,CACV,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"LaunchMsaViewDialog.js","sourceRoot":"","sources":["../../../src/LaunchMsaView/components/LaunchMsaViewDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAG9C,SAAS;AAET,OAAO,cAAc,MAAM,YAAY,CAAA;AACvC,OAAO,sBAAsB,MAAM,qBAAqB,CAAA;AACxD,OAAO,YAAY,MAAM,sCAAsC,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,WAAW,EACX,OAAO,EACP,KAAK,GAKN;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAErC,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAC,IAAI,EACb,KAAK,EAAC,iBAAiB,EACvB,OAAO,EAAE,GAAG,EAAE;YACZ,WAAW,EAAE,CAAA;QACf,CAAC,EACD,IAAI;QAEJ,oBAAC,GAAG,IAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE;YAClD,oBAAC,IAAI,IACH,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;oBACnB,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACf,CAAC;gBAED,oBAAC,GAAG,IAAC,KAAK,EAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAI;gBAClD,oBAAC,GAAG,IAAC,KAAK,EAAC,sBAAsB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAI,CACjD,CACH;QACN,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACpC,oBAAC,sBAAsB,IACrB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,GACZ,CACa;QACjB,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACpC,oBAAC,YAAY,IACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACxB,CACa,CACV,CACV,CAAA;AACH,CAAC"}
@@ -40,9 +40,15 @@ const NcbiBlastPanel = observer(function NcbiBlastPanel2({ handleClose, feature,
40
40
  const msaAlgorithms = ['clustalo', 'muscle', 'kalign', 'mafft'];
41
41
  return (React.createElement(DialogContent, { className: classes.dialogContent },
42
42
  error ? React.createElement(ErrorMessage, { error: error }) : null,
43
- React.createElement(TextField2, { value: blastDatabase, onChange: event => setBlastDatabase(event.target.value), label: "BLAST blastDatabase", select: true }, blastDatabaseOptions.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
44
- React.createElement(TextField2, { value: msaAlgorithm, onChange: event => setMsaAlgorithm(event.target.value), label: "MSA Algorithm", select: true }, msaAlgorithms.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
45
- React.createElement(TextField2, { value: userSelection, onChange: event => setUserSelection(event.target.value), label: "Choose isoform to BLAST", select: true }, options.map(val => (React.createElement(MenuItem, { value: getId(val), key: val.id() },
43
+ React.createElement(TextField2, { value: blastDatabase, onChange: event => {
44
+ setBlastDatabase(event.target.value);
45
+ }, label: "BLAST blastDatabase", select: true }, blastDatabaseOptions.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
46
+ React.createElement(TextField2, { value: msaAlgorithm, onChange: event => {
47
+ setMsaAlgorithm(event.target.value);
48
+ }, label: "MSA Algorithm", select: true }, msaAlgorithms.map(val => (React.createElement(MenuItem, { value: val, key: val }, val)))),
49
+ React.createElement(TextField2, { value: userSelection, onChange: event => {
50
+ setUserSelection(event.target.value);
51
+ }, label: "Choose isoform to BLAST", select: true }, options.map(val => (React.createElement(MenuItem, { value: getId(val), key: val.id() },
46
52
  getGeneDisplayName(feature),
47
53
  " - ",
48
54
  getTranscriptDisplayName(val))))),
@@ -70,7 +76,9 @@ const NcbiBlastPanel = observer(function NcbiBlastPanel2({ handleClose, feature,
70
76
  });
71
77
  handleClose();
72
78
  }, disabled: !proteinSequence }, "Submit"),
73
- React.createElement(Button, { color: "secondary", variant: "contained", onClick: () => handleClose() }, "Cancel"))));
79
+ React.createElement(Button, { color: "secondary", variant: "contained", onClick: () => {
80
+ handleClose();
81
+ } }, "Cancel"))));
74
82
  });
75
83
  export default NcbiBlastPanel;
76
84
  //# sourceMappingURL=NcbiBlastPanel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NcbiBlastPanel.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/NcbiBlastPanel.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NcbiBlastPanel.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/NcbiBlastPanel.tsx"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ export function calculateProteinSequence({ cds, sequence, codonTable, }) {
7
7
  let protein = '';
8
8
  for (let i = 0; i < str.length; i += 3) {
9
9
  // use & symbol for undefined codon, or partial slice
10
- protein += codonTable[str.slice(i, i + 3)] || '&';
10
+ protein += codonTable[str.slice(i, i + 3)] ?? '&';
11
11
  }
12
12
  return protein;
13
13
  }
@@ -1 +1 @@
1
- {"version":3,"file":"calculateProteinSequence.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/calculateProteinSequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,GACP,MAAM,oBAAoB,CAAA;AAQ3B,MAAM,UAAU,MAAM,CAAC,QAAgB,EAAE,QAAgB;IACvD,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACzE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EACvC,GAAG,EACH,QAAQ,EACR,UAAU,GAKX;IACC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IACjC,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,qDAAqD;QACrD,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAA;IACnD,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,IAAoD,EACpD,MAAc;IAEd,OAAO,IAAI;SACR,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACX,GAAG,GAAG;QACN,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,GAAG;QACvB,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,KAAK;KACxB,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,sDAAsD;AACtD,SAAS,SAAS,CAAC,IAAU;IAC3B,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAA;AACpC,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,MAAM,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,MAAM,CAChB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CACxE,CAAA;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EACjC,kBAAkB,EAClB,GAAG,GAIJ;IACC,mBAAmB;IACnB,MAAM,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAMlC,CAAA;IACD,MAAM,GAAG,GAAG,MAAM,CAChB,CAAC,CAAC,WAAW;SACV,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACX,GAAG,GAAG;QACN,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK;QAC1B,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK;KACvB,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CACjC,CAAA;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;QACrD,QAAQ,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG;QAC7C,UAAU,EAAE,kBAAkB,CAAC,iBAAiB,CAAC;KAClD,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"calculateProteinSequence.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/calculateProteinSequence.ts"],"names":[],"mappings":"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"}
@@ -2,42 +2,44 @@ import { useEffect, useState } from 'react';
2
2
  import { getSession } from '@jbrowse/core/util';
3
3
  import { getConf } from '@jbrowse/core/configuration';
4
4
  const BPLIMIT = 500_000;
5
+ async function fetchSeq({ start, end, refName, session, assemblyName, }) {
6
+ const { assemblyManager, rpcManager } = session;
7
+ const assembly = await assemblyManager.waitForAssembly(assemblyName);
8
+ if (!assembly) {
9
+ throw new Error('assembly not found');
10
+ }
11
+ const sessionId = 'getSequence';
12
+ const feats = (await rpcManager.call(sessionId, 'CoreGetFeatures', {
13
+ adapterConfig: getConf(assembly, ['sequence', 'adapter']),
14
+ sessionId,
15
+ regions: [
16
+ {
17
+ start,
18
+ end,
19
+ refName: assembly.getCanonicalRefName(refName),
20
+ assemblyName,
21
+ },
22
+ ],
23
+ }));
24
+ return feats[0]?.get('seq') ?? '';
25
+ }
5
26
  export function useFeatureSequence({ view, feature, upDownBp = 0, forceLoad = true, }) {
6
27
  const [sequence, setSequence] = useState();
7
28
  const [error, setError] = useState();
29
+ const assemblyName = view?.assemblyNames?.[0];
8
30
  useEffect(() => {
9
31
  if (view) {
10
- const { assemblyManager, rpcManager } = getSession(view);
11
- const [assemblyName] = view?.assemblyNames || [];
12
- async function fetchSeq(start, end, refName) {
13
- const assembly = await assemblyManager.waitForAssembly(assemblyName);
14
- if (!assembly) {
15
- throw new Error('assembly not found');
16
- }
17
- const sessionId = 'getSequence';
18
- const feats = await rpcManager.call(sessionId, 'CoreGetFeatures', {
19
- adapterConfig: getConf(assembly, ['sequence', 'adapter']),
20
- sessionId,
21
- regions: [
22
- {
23
- start,
24
- end,
25
- refName: assembly.getCanonicalRefName(refName),
26
- assemblyName,
27
- },
28
- ],
29
- });
30
- const [feat] = feats;
31
- return feat?.get('seq') || '';
32
- }
33
32
  // eslint-disable-next-line @typescript-eslint/no-floating-promises
34
33
  ;
35
34
  (async () => {
36
35
  try {
37
36
  setError(undefined);
38
37
  setSequence(undefined);
39
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
38
+ const session = getSession(view);
40
39
  const { start, end, refName } = feature.toJSON();
40
+ if (!assemblyName) {
41
+ throw new Error('No assembly found');
42
+ }
41
43
  if (!forceLoad && end - start > BPLIMIT) {
42
44
  setSequence({
43
45
  error: `Genomic sequence larger than ${BPLIMIT}bp, use "force load" button to display`,
@@ -46,10 +48,29 @@ export function useFeatureSequence({ view, feature, upDownBp = 0, forceLoad = tr
46
48
  else {
47
49
  const b = start - upDownBp;
48
50
  const e = end + upDownBp;
49
- const seq = await fetchSeq(start, end, refName);
50
- const up = await fetchSeq(Math.max(0, b), start, refName);
51
- const down = await fetchSeq(end, e, refName);
52
- setSequence({ seq, upstream: up, downstream: down });
51
+ setSequence({
52
+ seq: await fetchSeq({
53
+ start,
54
+ end,
55
+ refName,
56
+ assemblyName,
57
+ session,
58
+ }),
59
+ upstream: await fetchSeq({
60
+ start: Math.max(0, b),
61
+ end: start,
62
+ refName,
63
+ assemblyName,
64
+ session,
65
+ }),
66
+ downstream: await fetchSeq({
67
+ start: end,
68
+ end: e,
69
+ refName,
70
+ assemblyName,
71
+ session,
72
+ }),
73
+ });
53
74
  }
54
75
  }
55
76
  catch (e) {
@@ -58,7 +79,7 @@ export function useFeatureSequence({ view, feature, upDownBp = 0, forceLoad = tr
58
79
  }
59
80
  })();
60
81
  }
61
- }, [feature, view, upDownBp, forceLoad]);
82
+ }, [feature, view, upDownBp, assemblyName, forceLoad]);
62
83
  return { sequence, error };
63
84
  }
64
85
  //# sourceMappingURL=useFeatureSequence.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useFeatureSequence.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/useFeatureSequence.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useFeatureSequence.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/NewNCBIBlastQuery/useFeatureSequence.ts"],"names":[],"mappings":"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"}
@@ -51,7 +51,9 @@ const PreLoadedMSA = observer(function PreLoadedMSA2({ model, feature, handleClo
51
51
  React.createElement("a", { href: "https://hgdownload.soe.ucsc.edu/goldenPath/hg38/multiz100way/alignments/" }, "knownCanonical.multiz100way.protAA.fa.gz")),
52
52
  error ? React.createElement(ErrorMessage, { error: error }) : null,
53
53
  geneNameList && !ret ? (React.createElement("div", { style: { color: 'red' } }, "No MSA data for this gene found")) : null,
54
- React.createElement(TextField, { value: userSelection, onChange: event => setUserSelection(event.target.value), label: "Choose isoform to view MSA for", select: true },
54
+ React.createElement(TextField, { value: userSelection, onChange: event => {
55
+ setUserSelection(event.target.value);
56
+ }, label: "Choose isoform to view MSA for", select: true },
55
57
  options
56
58
  .filter(val => set.has(getId(val)))
57
59
  .map(val => (React.createElement(MenuItem, { value: getId(val), key: val.id() },
@@ -84,7 +86,9 @@ const PreLoadedMSA = observer(function PreLoadedMSA2({ model, feature, handleClo
84
86
  }
85
87
  })();
86
88
  } }, "Submit"),
87
- React.createElement(Button, { color: "secondary", variant: "contained", onClick: () => handleClose() }, "Cancel"))));
89
+ React.createElement(Button, { color: "secondary", variant: "contained", onClick: () => {
90
+ handleClose();
91
+ } }, "Cancel"))));
88
92
  });
89
93
  export default PreLoadedMSA;
90
94
  //# sourceMappingURL=PreLoadedMSADataPanel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PreLoadedMSADataPanel.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/PreLoadedMSA/PreLoadedMSADataPanel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EACL,MAAM,EACN,aAAa,EACb,aAAa,EACb,QAAQ,EACR,SAAS,EACT,UAAU,GACX,MAAM,eAAe,CAAA;AACtB,OAAO,EAGL,iBAAiB,EACjB,UAAU,GACX,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG1C,SAAS;AACT,OAAO,EACL,wBAAwB,EACxB,KAAK,EACL,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC7B,aAAa,EAAE;QACb,KAAK,EAAE,MAAM;KACd;CACF,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,aAAa,CAAC,EACnD,KAAK,EACL,OAAO,EACP,WAAW,GAKZ;IACC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,CAA0B,CAAA;IAC9D,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC7C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAY,CAAA;IAC5D,SAAS,CAAC,GAAG,EAAE;QACb,mEAAmE;QACnE,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAA;gBAClC,eAAe,CAAC,IAAI,CAAC,CAAA;gBACrB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;gBACzB,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;gBAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACpD,IAAI,GAAG,EAAE,CAAC;oBACR,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAChB,QAAQ,CAAC,CAAC,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;IACN,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IACb,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAA;IACjC,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAErE,OAAO,CACL;QACE,oBAAC,aAAa,IAAC,SAAS,EAAE,OAAO,CAAC,aAAa;YAC7C,oBAAC,UAAU;;gBACsD,GAAG;gBAClE,2BAAG,IAAI,EAAC,0EAA0E,+CAE9E,CACO;YACZ,KAAK,CAAC,CAAC,CAAC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI;YAC7C,YAAY,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CACtB,6BAAK,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAuC,CACpE,CAAC,CAAC,CAAC,IAAI;YACR,oBAAC,SAAS,IACR,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EACvD,KAAK,EAAC,gCAAgC,EACtC,MAAM;gBAEL,OAAO;qBACL,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;qBAClC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CACV,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;oBACvC,wBAAwB,CAAC,GAAG,CAAC;kCACrB,CACZ,CAAC;gBACH,OAAO;qBACL,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;qBACnC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CACV,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,UACjD,wBAAwB,CAAC,GAAG,CAAC,CACrB,CACZ,CAAC,CACM,CACE;QAEhB,oBAAC,aAAa;YACZ,oBAAC,MAAM,IACL,KAAK,EAAC,SAAS,EACf,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,GAAG,EAAE;oBACZ,mEAAmE;oBACnE,CAAC;oBAAA,CAAC,KAAK,IAAI,EAAE;wBACX,IAAI,CAAC;4BACH,IAAI,CAAC,GAAG,EAAE,CAAC;gCACT,OAAM;4BACR,CAAC;4BACD,MAAM,uBAAuB,CAAC;gCAC5B,aAAa;gCACb,OAAO;gCACP,YAAY,EAAE,kBAAkB,CAAC,GAAG,CAAC;gCACrC,IAAI;gCACJ,OAAO,EAAE,GAAG;6BACb,CAAC,CAAA;4BACF,WAAW,EAAE,CAAA;wBACf,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;4BAChB,QAAQ,CAAC,CAAC,CAAC,CAAA;wBACb,CAAC;oBACH,CAAC,CAAC,EAAE,CAAA;gBACN,CAAC,aAGM;YACT,oBAAC,MAAM,IACL,KAAK,EAAC,WAAW,EACjB,OAAO,EAAC,WAAW,EACnB,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,aAGrB,CACK,CACf,CACJ,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,YAAY,CAAA"}
1
+ {"version":3,"file":"PreLoadedMSADataPanel.js","sourceRoot":"","sources":["../../../../src/LaunchMsaView/components/PreLoadedMSA/PreLoadedMSADataPanel.tsx"],"names":[],"mappings":"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"}
@@ -4,9 +4,5 @@ interface TabPanelProps {
4
4
  index: number;
5
5
  value: number;
6
6
  }
7
- export declare function CustomTabPanel(props: TabPanelProps): React.JSX.Element;
8
- export declare function a11yProps(index: number): {
9
- id: string;
10
- 'aria-controls': string;
11
- };
7
+ export default function CustomTabPanel(props: TabPanelProps): React.JSX.Element;
12
8
  export {};
@@ -1,13 +1,7 @@
1
1
  import React from 'react';
2
2
  import { Box } from '@mui/material';
3
- export function CustomTabPanel(props) {
3
+ export default function CustomTabPanel(props) {
4
4
  const { children, value, index, ...other } = props;
5
5
  return (React.createElement("div", { role: "tabpanel", hidden: value !== index, id: `gtabpanel-${index}`, "aria-labelledby": `gtab-${index}`, ...other }, value === index && React.createElement(Box, { sx: { p: 3 } }, children)));
6
6
  }
7
- export function a11yProps(index) {
8
- return {
9
- id: `gtab-${index}`,
10
- 'aria-controls': `gtabpanel-${index}`,
11
- };
12
- }
13
7
  //# sourceMappingURL=TabUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"TabUtils.js","sourceRoot":"","sources":["../../../src/LaunchMsaView/components/TabUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQnC,MAAM,UAAU,cAAc,CAAC,KAAoB;IACjD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAA;IAElD,OAAO,CACL,6BACE,IAAI,EAAC,UAAU,EACf,MAAM,EAAE,KAAK,KAAK,KAAK,EACvB,EAAE,EAAE,aAAa,KAAK,EAAE,qBACP,QAAQ,KAAK,EAAE,KAC5B,KAAK,IAER,KAAK,KAAK,KAAK,IAAI,oBAAC,GAAG,IAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAO,CACnD,CACP,CAAA;AACH,CAAC;AACD,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,OAAO;QACL,EAAE,EAAE,QAAQ,KAAK,EAAE;QACnB,eAAe,EAAE,aAAa,KAAK,EAAE;KACtC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"TabUtils.js","sourceRoot":"","sources":["../../../src/LaunchMsaView/components/TabUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQnC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAoB;IACzD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAA;IAElD,OAAO,CACL,6BACE,IAAI,EAAC,UAAU,EACf,MAAM,EAAE,KAAK,KAAK,KAAK,EACvB,EAAE,EAAE,aAAa,KAAK,EAAE,qBACP,QAAQ,KAAK,EAAE,KAC5B,KAAK,IAER,KAAK,KAAK,KAAK,IAAI,oBAAC,GAAG,IAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAG,QAAQ,CAAO,CACnD,CACP,CAAA;AACH,CAAC"}
@@ -0,0 +1,4 @@
1
+ export declare function a11yProps(index: number): {
2
+ id: string;
3
+ 'aria-controls': string;
4
+ };
@@ -0,0 +1,7 @@
1
+ export function a11yProps(index) {
2
+ return {
3
+ id: `gtab-${index}`,
4
+ 'aria-controls': `gtabpanel-${index}`,
5
+ };
6
+ }
7
+ //# sourceMappingURL=tabUtil.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tabUtil.js","sourceRoot":"","sources":["../../../src/LaunchMsaView/components/tabUtil.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,OAAO;QACL,EAAE,EAAE,QAAQ,KAAK,EAAE;QACnB,eAAe,EAAE,aAAa,KAAK,EAAE;KACtC,CAAA;AACH,CAAC"}
@@ -7,7 +7,7 @@ function isDisplay(elt) {
7
7
  return elt.name === 'LinearBasicDisplay';
8
8
  }
9
9
  function extendStateModel(stateModel) {
10
- return stateModel.views(self => {
10
+ return stateModel.views((self) => {
11
11
  const superContextMenuItems = self.contextMenuItems;
12
12
  return {
13
13
  contextMenuItems() {
@@ -21,8 +21,7 @@ function extendStateModel(stateModel) {
21
21
  label: 'Launch MSA view',
22
22
  icon: AddIcon,
23
23
  onClick: () => {
24
- const session = getSession(track);
25
- session.queueDialog(handleClose => [
24
+ getSession(track).queueDialog(handleClose => [
26
25
  LaunchMsaViewDialog,
27
26
  {
28
27
  model: track,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LaunchMsaView/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEnE,QAAQ;AACR,OAAO,OAAO,MAAM,yBAAyB,CAAA;AAE7C,SAAS;AACT,OAAO,mBAAmB,MAAM,kCAAkC,CAAA;AAElE,SAAS,SAAS,CAAC,GAAqB;IACtC,OAAO,GAAG,CAAC,IAAI,KAAK,oBAAoB,CAAA;AAC1C,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAyB;IACjD,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAA;QACnD,OAAO;YACL,gBAAgB;gBACd,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAA;gBACvC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;gBACtC,OAAO;oBACL,GAAG,qBAAqB,EAAE;oBAC1B,GAAG,CAAC,OAAO;wBACT,CAAC,CAAC;4BACE;gCACE,KAAK,EAAE,iBAAiB;gCACxB,IAAI,EAAE,OAAO;gCACb,OAAO,EAAE,GAAG,EAAE;oCACZ,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;oCACjC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;wCACjC,mBAAmB;wCACnB;4CACE,KAAK,EAAE,KAAK;4CACZ,WAAW;4CACX,OAAO;yCACR;qCACF,CAAC,CAAA;gCACJ,CAAC;6BACF;yBACF;wBACH,CAAC,CAAC,EAAE,CAAC;iBACR,CAAA;YACH,CAAC;SACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,aAA4B;IACjE,aAAa,CAAC,mBAAmB,CAC/B,6BAA6B,EAC7B,CAAC,GAAyB,EAAE,EAAE;QAC5B,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,GAAG,CAAC,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/LaunchMsaView/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAW,MAAM,oBAAoB,CAAA;AAE5E,QAAQ;AACR,OAAO,OAAO,MAAM,yBAAyB,CAAA;AAE7C,SAAS;AACT,OAAO,mBAAmB,MAAM,kCAAkC,CAAA;AAGlE,SAAS,SAAS,CAAC,GAAqB;IACtC,OAAO,GAAG,CAAC,IAAI,KAAK,oBAAoB,CAAA;AAC1C,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAyB;IACjD,OAAO,UAAU,CAAC,KAAK,CACrB,CAAC,IAGA,EAAE,EAAE;QACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAA;QACnD,OAAO;YACL,gBAAgB;gBACd,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAA;gBACvC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;gBACtC,OAAO;oBACL,GAAG,qBAAqB,EAAE;oBAC1B,GAAG,CAAC,OAAO;wBACT,CAAC,CAAC;4BACE;gCACE,KAAK,EAAE,iBAAiB;gCACxB,IAAI,EAAE,OAAO;gCACb,OAAO,EAAE,GAAG,EAAE;oCACZ,UAAU,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;wCAC3C,mBAAmB;wCACnB;4CACE,KAAK,EAAE,KAAK;4CACZ,WAAW;4CACX,OAAO;yCACR;qCACF,CAAC,CAAA;gCACJ,CAAC;6BACF;yBACF;wBACH,CAAC,CAAC,EAAE,CAAC;iBACR,CAAA;YACH,CAAC;SACF,CAAA;IACH,CAAC,CACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,aAA4B;IACjE,aAAa,CAAC,mBAAmB,CAC/B,6BAA6B,EAC7B,CAAC,GAAyB,EAAE,EAAE;QAC5B,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,GAAG,CAAC,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CACF,CAAA;AACH,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { Feature } from '@jbrowse/core/util';
2
2
  export declare function getTranscriptFeatures(feature: Feature): Feature[];
3
- export declare function getId(val?: Feature): any;
3
+ export declare function getId(val?: Feature): string;
4
4
  export declare function getTranscriptDisplayName(val?: Feature): string;
5
5
  export declare function getGeneDisplayName(val?: Feature): string;
@@ -8,7 +8,7 @@ export function getTranscriptFeatures(feature) {
8
8
  subfeatures.filter(f => f.get('subfeatures')?.some(f => f.get('type') === 'CDS'));
9
9
  }
10
10
  export function getId(val) {
11
- return val === undefined ? '' : val.get('name') || val.get('id');
11
+ return val?.get('name') || val?.get('id') || '';
12
12
  }
13
13
  export function getTranscriptDisplayName(val) {
14
14
  return val === undefined
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/LaunchMsaView/util.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,uEAAuE;IACvE,wEAAwE;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;IACpD,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC;QACnD,CAAC,CAAC,CAAC,OAAO,CAAC;QACX,CAAC,CAAC,oEAAoE;YACpE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC,CACzD,CAAA;AACP,CAAC;AACD,MAAM,UAAU,KAAK,CAAC,GAAa;IACjC,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAClE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,GAAa;IACpD,OAAO,GAAG,KAAK,SAAS;QACtB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAa;IAC9C,OAAO,GAAG,KAAK,SAAS;QACtB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/LaunchMsaView/util.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,uEAAuE;IACvE,wEAAwE;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;IACpD,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC;QACnD,CAAC,CAAC,CAAC,OAAO,CAAC;QACX,CAAC,CAAC,oEAAoE;YACpE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC,CACzD,CAAA;AACP,CAAC;AACD,MAAM,UAAU,KAAK,CAAC,GAAa;IACjC,OAAO,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,GAAa;IACpD,OAAO,GAAG,KAAK,SAAS;QACtB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAa;IAC9C,OAAO,GAAG,KAAK,SAAS;QACtB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,GAAG,CAAC,CAAA;AAClB,CAAC"}
@@ -29,7 +29,7 @@ const LoadingBLAST = observer(function LoadingBLAST2({ model, }) {
29
29
  const { classes } = useStyles();
30
30
  return (React.createElement("div", { className: classes.margin },
31
31
  React.createElement(LoadingEllipses, { message: "Running NCBI BLAST", variant: "h5" }),
32
- error ? (React.createElement(RIDError, { rid: rid, error: error })) : rid ? (React.createElement(RIDProgress, { rid: rid, progress: progress })) : null,
32
+ error ? (React.createElement(RIDError, { rid: rid, error: error })) : (rid ? (React.createElement(RIDProgress, { rid: rid, progress: progress })) : null),
33
33
  React.createElement(Typography, null, processing || 'Initializing BLAST query')));
34
34
  });
35
35
  export default LoadingBLAST;
@@ -1 +1 @@
1
- {"version":3,"file":"LoadingBLAST.js","sourceRoot":"","sources":["../../../src/MsaViewPanel/components/LoadingBLAST.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEhE,SAAS;AACT,OAAO,OAAO,MAAM,WAAW,CAAA;AAE/B,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE;QACN,OAAO,EAAE,EAAE;KACZ;IACD,OAAO,EAAE;QACP,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK;KAC3C;CACF,CAAC,CAAC,CAAA;AAEH,SAAS,QAAQ,CAAC,EAAE,GAAG,EAAE,KAAK,EAAoC;IAChE,OAAO,CACL;QACG,GAAG,CAAC,CAAC,CAAC,oBAAC,OAAO,IAAC,GAAG,EAAE,GAAG,GAAI,CAAC,CAAC,CAAC,IAAI;QACnC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,CAC1B,CACP,CAAA;AACH,CAAC;AAED,SAAS,WAAW,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAqC;IACvE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAE,OAAO,CAAC,OAAO;QAC5B,GAAG,CAAC,CAAC,CAAC,oBAAC,OAAO,IAAC,GAAG,EAAE,GAAG,GAAI,CAAC,CAAC,CAAC,IAAI;QACnC,oBAAC,UAAU,QAAE,QAAQ,CAAc,CAC/B,CACP,CAAA;AACH,CAAC;AAED,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,aAAa,CAAC,EACnD,KAAK,GAGN;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IAClD,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAE,OAAO,CAAC,MAAM;QAC5B,oBAAC,eAAe,IAAC,OAAO,EAAC,oBAAoB,EAAC,OAAO,EAAC,IAAI,GAAG;QAC5D,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAI,CACrC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CACR,oBAAC,WAAW,IAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAC9C,CAAC,CAAC,CAAC,IAAI;QACR,oBAAC,UAAU,QAAE,UAAU,IAAI,0BAA0B,CAAc,CAC/D,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,YAAY,CAAA"}
1
+ {"version":3,"file":"LoadingBLAST.js","sourceRoot":"","sources":["../../../src/MsaViewPanel/components/LoadingBLAST.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEhE,SAAS;AACT,OAAO,OAAO,MAAM,WAAW,CAAA;AAE/B,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE;QACN,OAAO,EAAE,EAAE;KACZ;IACD,OAAO,EAAE;QACP,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK;KAC3C;CACF,CAAC,CAAC,CAAA;AAEH,SAAS,QAAQ,CAAC,EAAE,GAAG,EAAE,KAAK,EAAoC;IAChE,OAAO,CACL;QACG,GAAG,CAAC,CAAC,CAAC,oBAAC,OAAO,IAAC,GAAG,EAAE,GAAG,GAAI,CAAC,CAAC,CAAC,IAAI;QACnC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,CAC1B,CACP,CAAA;AACH,CAAC;AAED,SAAS,WAAW,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAqC;IACvE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAE,OAAO,CAAC,OAAO;QAC5B,GAAG,CAAC,CAAC,CAAC,oBAAC,OAAO,IAAC,GAAG,EAAE,GAAG,GAAI,CAAC,CAAC,CAAC,IAAI;QACnC,oBAAC,UAAU,QAAE,QAAQ,CAAc,CAC/B,CACP,CAAA;AACH,CAAC;AAED,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,aAAa,CAAC,EACnD,KAAK,GAGN;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IAClD,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAA;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAE,OAAO,CAAC,MAAM;QAC5B,oBAAC,eAAe,IAAC,OAAO,EAAC,oBAAoB,EAAC,OAAO,EAAC,IAAI,GAAG;QAC5D,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAI,CACrC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CACT,oBAAC,WAAW,IAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAC9C,CAAC,CAAC,CAAC,IAAI,CAAC;QACT,oBAAC,UAAU,QAAE,UAAU,IAAI,0BAA0B,CAAc,CAC/D,CACP,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,eAAe,YAAY,CAAA"}
@@ -8,19 +8,32 @@ export async function doLaunchBlast({ self, }) {
8
8
  query,
9
9
  blastDatabase,
10
10
  blastProgram,
11
- onProgress: arg => self.setProgress(arg),
12
- onRid: rid => self.setRid(rid),
11
+ onProgress: arg => {
12
+ self.setProgress(arg);
13
+ },
14
+ onRid: rid => {
15
+ self.setRid(rid);
16
+ },
13
17
  });
14
18
  const sequence = [
15
19
  `>QUERY\n${query}`,
16
20
  ...hits
17
- .map(h => [makeId(h.description[0]), strip(h.hsps[0].hseq)])
21
+ .map(h => [
22
+ makeId(h.description[0] ?? {
23
+ accession: 'unknown',
24
+ id: 'unknown',
25
+ sciname: 'unknown',
26
+ }),
27
+ strip(h.hsps[0]?.hseq ?? ''),
28
+ ])
18
29
  .map(([id, seq]) => `>${id}\n${seq}`),
19
30
  ].join('\n');
20
31
  const data = await launchMSA({
21
32
  algorithm: msaAlgorithm,
22
33
  sequence,
23
- onProgress: arg => self.setProgress(arg),
34
+ onProgress: arg => {
35
+ self.setProgress(arg);
36
+ },
24
37
  });
25
38
  return data;
26
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"doLaunchBlast.js","sourceRoot":"","sources":["../../src/MsaViewPanel/doLaunchBlast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EACL,MAAM,EACN,KAAK,GACN,MAAM,oDAAoD,CAAA;AAG3D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,IAAI,GAGL;IACC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,GAClE,IAAI,CAAC,WAAY,CAAA;IACnB,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACrE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,UAAU,CAAC;QAChC,KAAK;QACL,aAAa;QACb,YAAY;QACZ,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QACxC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;KAC/B,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG;QACf,WAAW,KAAK,EAAE;QAClB,GAAG,IAAI;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAU,CAAC;aACpE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEZ,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC;QAC3B,SAAS,EAAE,YAAY;QACvB,QAAQ;QACR,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;KACzC,CAAC,CAAA;IACF,OAAO,IAAI,CAAA;AACb,CAAC"}
1
+ {"version":3,"file":"doLaunchBlast.js","sourceRoot":"","sources":["../../src/MsaViewPanel/doLaunchBlast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EACL,MAAM,EACN,KAAK,GACN,MAAM,oDAAoD,CAAA;AAG3D,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,IAAI,GAGL;IACC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,GAClE,IAAI,CAAC,WAAY,CAAA;IACnB,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACrE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,UAAU,CAAC;QAChC,KAAK;QACL,aAAa;QACb,YAAY;QACZ,UAAU,EAAE,GAAG,CAAC,EAAE;YAChB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;QACD,KAAK,EAAE,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG;QACf,WAAW,KAAK,EAAE;QAClB,GAAG,IAAI;aACJ,GAAG,CACF,CAAC,CAAC,EAAE,CACF;YACE,MAAM,CACJ,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;gBAClB,SAAS,EAAE,SAAS;gBACpB,EAAE,EAAE,SAAS;gBACb,OAAO,EAAE,SAAS;aACnB,CACF;YACD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;SACpB,CACb;aACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEZ,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC;QAC3B,SAAS,EAAE,YAAY;QACvB,QAAQ;QACR,UAAU,EAAE,GAAG,CAAC,EAAE;YAChB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;KACF,CAAC,CAAA;IACF,OAAO,IAAI,CAAA;AACb,CAAC"}