@jbrowse/plugin-data-management 2.4.1 → 2.5.0

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 (141) hide show
  1. package/dist/AddConnectionWidget/components/AddConnectionWidget.d.ts +2 -4
  2. package/dist/AddConnectionWidget/components/AddConnectionWidget.js +24 -45
  3. package/dist/AddConnectionWidget/components/AddConnectionWidget.js.map +1 -1
  4. package/dist/AddConnectionWidget/components/ConfigureConnection.d.ts +2 -3
  5. package/dist/AddConnectionWidget/components/ConfigureConnection.js +1 -3
  6. package/dist/AddConnectionWidget/components/ConfigureConnection.js.map +1 -1
  7. package/dist/AddConnectionWidget/components/ConnectionTypeSelect.d.ts +4 -5
  8. package/dist/AddConnectionWidget/components/ConnectionTypeSelect.js +3 -4
  9. package/dist/AddConnectionWidget/components/ConnectionTypeSelect.js.map +1 -1
  10. package/dist/AddTrackWidget/components/AddTrackWidget.d.ts +0 -1
  11. package/dist/AddTrackWidget/components/ConfirmTrack.d.ts +0 -1
  12. package/dist/AddTrackWidget/components/DefaultAddTrackWorkflow.d.ts +0 -1
  13. package/dist/AddTrackWidget/components/DefaultAddTrackWorkflow.js +1 -1
  14. package/dist/AddTrackWidget/components/DefaultAddTrackWorkflow.js.map +1 -1
  15. package/dist/AddTrackWidget/components/PasteConfigWorkflow.d.ts +0 -1
  16. package/dist/AddTrackWidget/components/TextIndexingConfig.d.ts +1 -2
  17. package/dist/AddTrackWidget/components/TextIndexingConfig.js +4 -10
  18. package/dist/AddTrackWidget/components/TextIndexingConfig.js.map +1 -1
  19. package/dist/AddTrackWidget/components/TrackAdapterSelector.d.ts +0 -1
  20. package/dist/AddTrackWidget/components/TrackSourceSelect.d.ts +0 -1
  21. package/dist/AddTrackWidget/components/TrackTypeSelector.d.ts +0 -1
  22. package/dist/AssemblyManager/AssemblyAddForm.d.ts +0 -1
  23. package/dist/AssemblyManager/AssemblyEditor.d.ts +0 -1
  24. package/dist/AssemblyManager/AssemblyManager.d.ts +0 -1
  25. package/dist/AssemblyManager/AssemblyTable.d.ts +0 -1
  26. package/dist/HierarchicalTrackSelectorWidget/components/HierarchicalFab.d.ts +0 -1
  27. package/dist/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.d.ts +0 -1
  28. package/dist/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.js +1 -1
  29. package/dist/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.js.map +1 -1
  30. package/dist/HierarchicalTrackSelectorWidget/components/ShoppingCart.d.ts +0 -1
  31. package/dist/HierarchicalTrackSelectorWidget/components/dialogs/CloseConnectionDialog.d.ts +0 -1
  32. package/dist/HierarchicalTrackSelectorWidget/components/dialogs/DeleteConnectionDialog.d.ts +1 -2
  33. package/dist/HierarchicalTrackSelectorWidget/components/dialogs/ManageConnectionsDialog.d.ts +0 -1
  34. package/dist/HierarchicalTrackSelectorWidget/components/dialogs/ToggleConnectionsDialog.d.ts +0 -1
  35. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetFilters.d.ts +0 -1
  36. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedDialog.d.ts +0 -1
  37. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.d.ts +3 -2
  38. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.js +7 -1
  39. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.js.map +1 -1
  40. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.d.ts +0 -1
  41. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.js +10 -6
  42. package/dist/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.js.map +1 -1
  43. package/dist/HierarchicalTrackSelectorWidget/components/tree/HamburgerMenu.d.ts +0 -1
  44. package/dist/HierarchicalTrackSelectorWidget/components/tree/HierarchicalHeader.d.ts +0 -1
  45. package/dist/HierarchicalTrackSelectorWidget/components/tree/HierarchicalTree.d.ts +0 -1
  46. package/dist/HierarchicalTrackSelectorWidget/components/tree/TrackCategory.d.ts +0 -1
  47. package/dist/HierarchicalTrackSelectorWidget/components/tree/TrackLabel.d.ts +0 -1
  48. package/dist/HierarchicalTrackSelectorWidget/components/tree/TrackListNode.d.ts +0 -1
  49. package/dist/HierarchicalTrackSelectorWidget/configSchema.d.ts +1 -1
  50. package/dist/PluginStoreWidget/components/CustomPluginForm.d.ts +0 -1
  51. package/dist/PluginStoreWidget/components/CustomPluginForm.js +10 -33
  52. package/dist/PluginStoreWidget/components/CustomPluginForm.js.map +1 -1
  53. package/dist/PluginStoreWidget/components/InstalledPlugin.d.ts +0 -1
  54. package/dist/PluginStoreWidget/components/InstalledPluginsList.d.ts +0 -1
  55. package/dist/PluginStoreWidget/components/PluginCard.d.ts +0 -1
  56. package/dist/PluginStoreWidget/components/PluginStoreWidget.d.ts +0 -1
  57. package/dist/PluginStoreWidget/components/PluginStoreWidget.js +5 -8
  58. package/dist/PluginStoreWidget/components/PluginStoreWidget.js.map +1 -1
  59. package/dist/SetDefaultSession/SetDefaultSession.d.ts +0 -1
  60. package/dist/ucsc-trackhub/configSchema.d.ts +32 -1
  61. package/dist/ucsc-trackhub/model.d.ts +26 -1
  62. package/dist/ucsc-trackhub/model.js +3 -2
  63. package/dist/ucsc-trackhub/model.js.map +1 -1
  64. package/esm/AddConnectionWidget/components/AddConnectionWidget.d.ts +2 -4
  65. package/esm/AddConnectionWidget/components/AddConnectionWidget.js +24 -45
  66. package/esm/AddConnectionWidget/components/AddConnectionWidget.js.map +1 -1
  67. package/esm/AddConnectionWidget/components/ConfigureConnection.d.ts +2 -3
  68. package/esm/AddConnectionWidget/components/ConfigureConnection.js +1 -3
  69. package/esm/AddConnectionWidget/components/ConfigureConnection.js.map +1 -1
  70. package/esm/AddConnectionWidget/components/ConnectionTypeSelect.d.ts +4 -5
  71. package/esm/AddConnectionWidget/components/ConnectionTypeSelect.js +3 -4
  72. package/esm/AddConnectionWidget/components/ConnectionTypeSelect.js.map +1 -1
  73. package/esm/AddTrackWidget/components/AddTrackWidget.d.ts +0 -1
  74. package/esm/AddTrackWidget/components/ConfirmTrack.d.ts +0 -1
  75. package/esm/AddTrackWidget/components/DefaultAddTrackWorkflow.d.ts +0 -1
  76. package/esm/AddTrackWidget/components/DefaultAddTrackWorkflow.js +1 -1
  77. package/esm/AddTrackWidget/components/DefaultAddTrackWorkflow.js.map +1 -1
  78. package/esm/AddTrackWidget/components/PasteConfigWorkflow.d.ts +0 -1
  79. package/esm/AddTrackWidget/components/TextIndexingConfig.d.ts +1 -2
  80. package/esm/AddTrackWidget/components/TextIndexingConfig.js +4 -10
  81. package/esm/AddTrackWidget/components/TextIndexingConfig.js.map +1 -1
  82. package/esm/AddTrackWidget/components/TrackAdapterSelector.d.ts +0 -1
  83. package/esm/AddTrackWidget/components/TrackSourceSelect.d.ts +0 -1
  84. package/esm/AddTrackWidget/components/TrackTypeSelector.d.ts +0 -1
  85. package/esm/AssemblyManager/AssemblyAddForm.d.ts +0 -1
  86. package/esm/AssemblyManager/AssemblyEditor.d.ts +0 -1
  87. package/esm/AssemblyManager/AssemblyManager.d.ts +0 -1
  88. package/esm/AssemblyManager/AssemblyTable.d.ts +0 -1
  89. package/esm/HierarchicalTrackSelectorWidget/components/HierarchicalFab.d.ts +0 -1
  90. package/esm/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.d.ts +0 -1
  91. package/esm/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.js +1 -1
  92. package/esm/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.js.map +1 -1
  93. package/esm/HierarchicalTrackSelectorWidget/components/ShoppingCart.d.ts +0 -1
  94. package/esm/HierarchicalTrackSelectorWidget/components/dialogs/CloseConnectionDialog.d.ts +0 -1
  95. package/esm/HierarchicalTrackSelectorWidget/components/dialogs/DeleteConnectionDialog.d.ts +1 -2
  96. package/esm/HierarchicalTrackSelectorWidget/components/dialogs/ManageConnectionsDialog.d.ts +0 -1
  97. package/esm/HierarchicalTrackSelectorWidget/components/dialogs/ToggleConnectionsDialog.d.ts +0 -1
  98. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetFilters.d.ts +0 -1
  99. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedDialog.d.ts +0 -1
  100. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.d.ts +3 -2
  101. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.js +7 -1
  102. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.js.map +1 -1
  103. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.d.ts +0 -1
  104. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.js +9 -5
  105. package/esm/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.js.map +1 -1
  106. package/esm/HierarchicalTrackSelectorWidget/components/tree/HamburgerMenu.d.ts +0 -1
  107. package/esm/HierarchicalTrackSelectorWidget/components/tree/HierarchicalHeader.d.ts +0 -1
  108. package/esm/HierarchicalTrackSelectorWidget/components/tree/HierarchicalTree.d.ts +0 -1
  109. package/esm/HierarchicalTrackSelectorWidget/components/tree/TrackCategory.d.ts +0 -1
  110. package/esm/HierarchicalTrackSelectorWidget/components/tree/TrackLabel.d.ts +0 -1
  111. package/esm/HierarchicalTrackSelectorWidget/components/tree/TrackListNode.d.ts +0 -1
  112. package/esm/HierarchicalTrackSelectorWidget/configSchema.d.ts +1 -1
  113. package/esm/PluginStoreWidget/components/CustomPluginForm.d.ts +0 -1
  114. package/esm/PluginStoreWidget/components/CustomPluginForm.js +10 -33
  115. package/esm/PluginStoreWidget/components/CustomPluginForm.js.map +1 -1
  116. package/esm/PluginStoreWidget/components/InstalledPlugin.d.ts +0 -1
  117. package/esm/PluginStoreWidget/components/InstalledPluginsList.d.ts +0 -1
  118. package/esm/PluginStoreWidget/components/PluginCard.d.ts +0 -1
  119. package/esm/PluginStoreWidget/components/PluginStoreWidget.d.ts +0 -1
  120. package/esm/PluginStoreWidget/components/PluginStoreWidget.js +5 -8
  121. package/esm/PluginStoreWidget/components/PluginStoreWidget.js.map +1 -1
  122. package/esm/SetDefaultSession/SetDefaultSession.d.ts +0 -1
  123. package/esm/ucsc-trackhub/configSchema.d.ts +32 -1
  124. package/esm/ucsc-trackhub/model.d.ts +26 -1
  125. package/esm/ucsc-trackhub/model.js +3 -2
  126. package/esm/ucsc-trackhub/model.js.map +1 -1
  127. package/package.json +3 -3
  128. package/src/AddConnectionWidget/components/AddConnectionWidget.test.tsx +0 -2
  129. package/src/AddConnectionWidget/components/AddConnectionWidget.tsx +46 -85
  130. package/src/AddConnectionWidget/components/ConfigureConnection.tsx +17 -18
  131. package/src/AddConnectionWidget/components/ConnectionTypeSelect.tsx +7 -6
  132. package/src/AddConnectionWidget/components/__snapshots__/AddConnectionWidget.test.tsx.snap +1 -0
  133. package/src/AddTrackWidget/components/DefaultAddTrackWorkflow.tsx +1 -1
  134. package/src/AddTrackWidget/components/TextIndexingConfig.tsx +10 -10
  135. package/src/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.tsx +1 -1
  136. package/src/HierarchicalTrackSelectorWidget/components/dialogs/DeleteConnectionDialog.tsx +1 -1
  137. package/src/HierarchicalTrackSelectorWidget/components/faceted/FacetedHeader.tsx +10 -0
  138. package/src/HierarchicalTrackSelectorWidget/components/faceted/FacetedSelector.tsx +17 -9
  139. package/src/PluginStoreWidget/components/CustomPluginForm.tsx +11 -36
  140. package/src/PluginStoreWidget/components/PluginStoreWidget.tsx +7 -10
  141. package/src/ucsc-trackhub/model.ts +3 -4
@@ -91,14 +91,11 @@ function PluginStoreWidget({ model }) {
91
91
  React.createElement(Typography, { variant: "h5" }, "Available plugins")),
92
92
  error ? (React.createElement(Typography, { color: "error" }, `${error}`)) : pluginArray ? (pluginArray
93
93
  .filter(plugin => {
94
- // If pugin only has cjsUrl, don't display outside desktop
95
- if (!isElectron &&
96
- !(plugin.esmUrl || plugin.url || plugin.umdUrl)) {
97
- return false;
98
- }
99
- return plugin.name
100
- .toLowerCase()
101
- .includes(model.filterText.toLowerCase());
94
+ // If plugin only has cjsUrl, don't display outside desktop
95
+ return (!(isElectron && plugin.cjsUrl) &&
96
+ plugin.name
97
+ .toLowerCase()
98
+ .includes(model.filterText.toLowerCase()));
102
99
  })
103
100
  .map(plugin => (React.createElement(PluginCard, { key: plugin.name, plugin: plugin, model: model, adminMode: !!adminMode })))) : (React.createElement(LoadingEllipses, null)))));
104
101
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PluginStoreWidget.js","sourceRoot":"","sources":["../../../src/PluginStoreWidget/components/PluginStoreWidget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PluginStoreWidget.js","sourceRoot":"","sources":["../../../src/PluginStoreWidget/components/PluginStoreWidget.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  declare const SetDefaultSession: ({ rootModel, onClose }: {
3
2
  rootModel?: unknown;
4
3
  onClose: () => void;
@@ -1,2 +1,33 @@
1
- declare const UCSCTrackHubConnection: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
1
+ declare const UCSCTrackHubConnection: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
2
+ /**
3
+ * #slot
4
+ */
5
+ hubTxtLocation: {
6
+ type: string;
7
+ defaultValue: {
8
+ uri: string;
9
+ locationType: string;
10
+ };
11
+ description: string;
12
+ };
13
+ /**
14
+ * #slot
15
+ */
16
+ assemblyNames: {
17
+ type: string;
18
+ defaultValue: never[];
19
+ description: string;
20
+ };
21
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
22
+ name: {
23
+ type: string;
24
+ defaultValue: string;
25
+ description: string;
26
+ };
27
+ assemblyNames: {
28
+ type: string;
29
+ defaultValue: never[];
30
+ description: string;
31
+ };
32
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "connectionId">>, undefined>>;
2
33
  export default UCSCTrackHubConnection;
@@ -3,7 +3,32 @@ export default function UCSCTrackHubConnection(pluginManager: PluginManager): im
3
3
  name: import("mobx-state-tree").ISimpleType<string>;
4
4
  tracks: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IAnyModelType>;
5
5
  } & {
6
- configuration: import("mobx-state-tree").ITypeUnion<any, any, any>;
6
+ configuration: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
7
+ hubTxtLocation: {
8
+ type: string;
9
+ defaultValue: {
10
+ uri: string;
11
+ locationType: string;
12
+ };
13
+ description: string;
14
+ };
15
+ assemblyNames: {
16
+ type: string;
17
+ defaultValue: never[];
18
+ description: string;
19
+ };
20
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
21
+ name: {
22
+ type: string;
23
+ defaultValue: string;
24
+ description: string;
25
+ };
26
+ assemblyNames: {
27
+ type: string;
28
+ defaultValue: never[];
29
+ description: string;
30
+ };
31
+ }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "connectionId">>, undefined>>;
7
32
  type: import("mobx-state-tree").ISimpleType<"UCSCTrackHubConnection">;
8
33
  }, {
9
34
  afterAttach(): void;
@@ -13,9 +13,10 @@ export default function UCSCTrackHubConnection(pluginManager) {
13
13
  }))
14
14
  .actions(self => ({
15
15
  async connect() {
16
+ var _a;
16
17
  const session = getSession(self);
17
18
  try {
18
- const connectionName = getConf(self, 'name');
19
+ const connectionName = getConf(self, 'name'); // NOTE: name comes from the base configuration
19
20
  const hubFileLocation = getConf(self, 'hubTxtLocation');
20
21
  const hubFile = await fetchHubFile(hubFileLocation);
21
22
  const genomeFile = hubFile.get('genomesFile');
@@ -40,7 +41,7 @@ export default function UCSCTrackHubConnection(pluginManager) {
40
41
  !assemblyNames.includes(genomeName)) {
41
42
  continue;
42
43
  }
43
- const conf = session.assemblies.find(a => readConfObject(a, 'name') === genomeName);
44
+ const conf = (_a = session.assemblyManager.get(genomeName)) === null || _a === void 0 ? void 0 : _a.configuration;
44
45
  if (!conf) {
45
46
  throw new Error(`Cannot find assembly for "${genomeName}" from the genomes file for connection "${connectionName}"`);
46
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/ucsc-trackhub/model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/ucsc-trackhub/model.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jbrowse/plugin-data-management",
3
- "version": "2.4.1",
3
+ "version": "2.5.0",
4
4
  "description": "JBrowse 2 linear genome view",
5
5
  "keywords": [
6
6
  "jbrowse",
@@ -39,7 +39,7 @@
39
39
  "dependencies": {
40
40
  "@gmod/ucsc-hub": "^0.1.6",
41
41
  "@mui/icons-material": "^5.0.1",
42
- "@mui/x-data-grid": "^5.0.1",
42
+ "@mui/x-data-grid": "^6.0.1",
43
43
  "clsx": "^1.1.0",
44
44
  "react-virtualized-auto-sizer": "^1.0.2",
45
45
  "react-vtree": "^3.0.0-beta.1",
@@ -61,5 +61,5 @@
61
61
  "distModule": "esm/index.js",
62
62
  "srcModule": "src/index.ts",
63
63
  "module": "esm/index.js",
64
- "gitHead": "747c50c4edc0184827efa4f8dfc576ca9a72caeb"
64
+ "gitHead": "d1ca073996d008f0fe9a52f7c1a47ae649dcfdaf"
65
65
  }
@@ -7,8 +7,6 @@ import AddConnectionWidget from './AddConnectionWidget'
7
7
 
8
8
  jest.mock('@jbrowse/web/src/makeWorkerInstance', () => () => {})
9
9
 
10
- // window.fetch = jest.fn(() => new Promise(resolve => resolve()))
11
-
12
10
  describe('<AddConnectionWidget />', () => {
13
11
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
14
12
  let model: any
@@ -1,21 +1,14 @@
1
1
  import React, { useState } from 'react'
2
+ import { Button, Step, StepContent, StepLabel, Stepper } from '@mui/material'
2
3
  import { getSession, getEnv } from '@jbrowse/core/util'
3
- import {
4
- Button,
5
- Step,
6
- StepContent,
7
- StepLabel,
8
- Stepper,
9
- Typography,
10
- } from '@mui/material'
11
4
  import { makeStyles } from 'tss-react/mui'
12
5
  import { observer } from 'mobx-react'
6
+ import { AnyConfigurationModel } from '@jbrowse/core/configuration'
13
7
  import { ConnectionType } from '@jbrowse/core/pluggableElementTypes'
14
8
 
15
9
  // locals
16
10
  import ConfigureConnection from './ConfigureConnection'
17
11
  import ConnectionTypeSelect from './ConnectionTypeSelect'
18
- import { AnyConfigurationModel } from '@jbrowse/core/configuration'
19
12
 
20
13
  const useStyles = makeStyles()(theme => ({
21
14
  root: {
@@ -35,82 +28,18 @@ const useStyles = makeStyles()(theme => ({
35
28
 
36
29
  const steps = ['Select a Connection Type', 'Configure Connection']
37
30
 
38
- function AddConnectionWidget({ model }: { model: unknown }) {
31
+ export default observer(function AddConnectionWidget({
32
+ model,
33
+ }: {
34
+ model: unknown
35
+ }) {
39
36
  const [connectionType, setConnectionType] = useState<ConnectionType>()
40
37
  const [configModel, setConfigModel] = useState<AnyConfigurationModel>()
41
38
  const [activeStep, setActiveStep] = useState(0)
42
39
  const { classes } = useStyles()
43
-
44
40
  const session = getSession(model)
45
-
46
41
  const { pluginManager } = getEnv(session)
47
42
 
48
- function stepContent() {
49
- switch (activeStep) {
50
- case 0:
51
- return (
52
- <ConnectionTypeSelect
53
- connectionTypeChoices={
54
- pluginManager.getElementTypesInGroup(
55
- 'connection',
56
- ) as ConnectionType[]
57
- }
58
- connectionType={connectionType}
59
- setConnectionType={c => {
60
- setConnectionType(c)
61
- if (c) {
62
- setConfigModel(
63
- c.configSchema.create(
64
- {
65
- connectionId: `${c.name}-${Date.now()}`,
66
- },
67
- getEnv(model),
68
- ),
69
- )
70
- }
71
- }}
72
- />
73
- )
74
- case 1:
75
- return connectionType && configModel ? (
76
- <ConfigureConnection
77
- connectionType={connectionType}
78
- model={configModel}
79
- session={session}
80
- />
81
- ) : null
82
-
83
- default:
84
- return <Typography>Unknown step</Typography>
85
- }
86
- }
87
-
88
- function handleNext() {
89
- if (activeStep === steps.length - 1) {
90
- handleFinish()
91
- } else {
92
- setActiveStep(activeStep + 1)
93
- }
94
- }
95
-
96
- function handleBack() {
97
- setActiveStep(activeStep - 1)
98
- }
99
-
100
- function handleFinish() {
101
- const connectionConf = session.addConnectionConf(configModel)
102
- if (session.makeConnection) {
103
- session.makeConnection(connectionConf)
104
- }
105
- session.hideWidget(model)
106
- }
107
-
108
- function checkNextEnabled() {
109
- return (
110
- (activeStep === 0 && connectionType) || (activeStep === 1 && configModel)
111
- )
112
- }
113
-
114
43
  return (
115
44
  <div className={classes.root}>
116
45
  <Stepper
@@ -122,20 +51,54 @@ function AddConnectionWidget({ model }: { model: unknown }) {
122
51
  <Step key={label}>
123
52
  <StepLabel>{label}</StepLabel>
124
53
  <StepContent>
125
- {stepContent()}
54
+ {activeStep === 0 ? (
55
+ <ConnectionTypeSelect
56
+ connectionTypeChoices={pluginManager.getConnectionElements()}
57
+ connectionType={connectionType}
58
+ setConnectionType={c => {
59
+ setConnectionType(c)
60
+ if (!c) {
61
+ return
62
+ }
63
+ const connectionId = `${c.name}-${Date.now()}`
64
+ setConfigModel(
65
+ c.configSchema.create({ connectionId }, getEnv(model)),
66
+ )
67
+ }}
68
+ />
69
+ ) : connectionType && configModel ? (
70
+ <ConfigureConnection
71
+ connectionType={connectionType}
72
+ model={configModel}
73
+ session={session}
74
+ />
75
+ ) : null}
126
76
  <div className={classes.actionsContainer}>
127
77
  <Button
128
78
  disabled={activeStep === 0}
129
- onClick={handleBack}
79
+ onClick={() => setActiveStep(activeStep - 1)}
130
80
  className={classes.button}
131
81
  >
132
82
  Back
133
83
  </Button>
134
84
  <Button
135
- disabled={!checkNextEnabled()}
85
+ disabled={
86
+ !(
87
+ (activeStep === 0 && connectionType) ||
88
+ (activeStep === 1 && configModel)
89
+ )
90
+ }
136
91
  variant="contained"
137
92
  color="primary"
138
- onClick={handleNext}
93
+ onClick={() => {
94
+ if (activeStep === steps.length - 1) {
95
+ const conf = session.addConnectionConf(configModel)
96
+ session.makeConnection?.(conf)
97
+ session.hideWidget(model)
98
+ } else {
99
+ setActiveStep(activeStep + 1)
100
+ }
101
+ }}
139
102
  className={classes.button}
140
103
  data-testid="addConnectionNext"
141
104
  >
@@ -148,6 +111,4 @@ function AddConnectionWidget({ model }: { model: unknown }) {
148
111
  </Stepper>
149
112
  </div>
150
113
  )
151
- }
152
-
153
- export default observer(AddConnectionWidget)
114
+ })
@@ -6,22 +6,21 @@ import { AnyConfigurationModel } from '@jbrowse/core/configuration'
6
6
  import { AbstractSessionModel } from '@jbrowse/core/util'
7
7
  import { LoadingEllipses } from '@jbrowse/core/ui'
8
8
 
9
- const ConfigureConnection = observer(
10
- (props: {
11
- connectionType: ConnectionType
12
- model: AnyConfigurationModel
13
- session: AbstractSessionModel
14
- }) => {
15
- const { connectionType, model, session } = props
16
- const ConfigEditorComponent =
17
- connectionType.configEditorComponent || ConfigurationEditor
9
+ export default observer(function ({
10
+ connectionType,
11
+ model,
12
+ session,
13
+ }: {
14
+ connectionType: ConnectionType
15
+ model: AnyConfigurationModel
16
+ session: AbstractSessionModel
17
+ }) {
18
+ const ConfigEditorComponent =
19
+ connectionType.configEditorComponent || ConfigurationEditor
18
20
 
19
- return (
20
- <Suspense fallback={<LoadingEllipses />}>
21
- <ConfigEditorComponent model={{ target: model }} session={session} />
22
- </Suspense>
23
- )
24
- },
25
- )
26
-
27
- export default ConfigureConnection
21
+ return (
22
+ <Suspense fallback={<LoadingEllipses />}>
23
+ <ConfigEditorComponent model={{ target: model }} session={session} />
24
+ </Suspense>
25
+ )
26
+ })
@@ -1,17 +1,20 @@
1
1
  import React, { useEffect } from 'react'
2
2
  import { IconButton, MenuItem, TextField } from '@mui/material'
3
3
  import { ConnectionType } from '@jbrowse/core/pluggableElementTypes'
4
+ import { observer } from 'mobx-react'
4
5
 
5
6
  // icons
6
7
  import OpenInNewIcon from '@mui/icons-material/OpenInNew'
7
8
 
8
- function ConnectionTypeSelect(props: {
9
+ export default observer(function ConnectionTypeSelect({
10
+ connectionTypeChoices,
11
+ connectionType,
12
+ setConnectionType,
13
+ }: {
9
14
  connectionTypeChoices: ConnectionType[]
10
15
  connectionType?: ConnectionType
11
16
  setConnectionType: (c?: ConnectionType) => void
12
17
  }) {
13
- const { connectionTypeChoices, connectionType, setConnectionType } = props
14
-
15
18
  useEffect(() => {
16
19
  if (!connectionType) {
17
20
  setConnectionType(connectionTypeChoices[0])
@@ -58,6 +61,4 @@ function ConnectionTypeSelect(props: {
58
61
  ) : null}
59
62
  </form>
60
63
  )
61
- }
62
-
63
- export default ConnectionTypeSelect
64
+ })
@@ -92,6 +92,7 @@ exports[`<AddConnectionWidget /> renders 1`] = `
92
92
  </div>
93
93
  <input
94
94
  aria-hidden="true"
95
+ aria-invalid="false"
95
96
  class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput"
96
97
  tabindex="-1"
97
98
  value="UCSCTrackHubConnection"
@@ -87,7 +87,7 @@ function AddTrackWorkflow({ model }: { model: AddTrackModel }) {
87
87
 
88
88
  const assemblyInstance = session.assemblyManager.get(assembly)
89
89
 
90
- if (trackAdapter && trackAdapter.type !== 'UNKNOWN') {
90
+ if (assemblyInstance && trackAdapter && trackAdapter.type !== 'UNKNOWN') {
91
91
  session.addTrackConf({
92
92
  trackId,
93
93
  type: trackType,
@@ -32,7 +32,11 @@ const useStyles = makeStyles()(theme => ({
32
32
  },
33
33
  }))
34
34
 
35
- const TextIndexingConfig = observer(({ model }: { model: AddTrackModel }) => {
35
+ const TextIndexingConfig = observer(function ({
36
+ model,
37
+ }: {
38
+ model: AddTrackModel
39
+ }) {
36
40
  const { classes } = useStyles()
37
41
  const [value1, setValue1] = useState('')
38
42
  const [value2, setValue2] = useState('')
@@ -69,9 +73,9 @@ const TextIndexingConfig = observer(({ model }: { model: AddTrackModel }) => {
69
73
  <InputAdornment position="end">
70
74
  <IconButton
71
75
  onClick={() => {
72
- const newAttr = section.values.filter((a, i) => {
73
- return i !== idx
74
- })
76
+ const newAttr = section.values.filter(
77
+ (_, i) => i !== idx,
78
+ )
75
79
  index === 0
76
80
  ? setAttributes(newAttr)
77
81
  : setExclude(newAttr)
@@ -100,14 +104,10 @@ const TextIndexingConfig = observer(({ model }: { model: AddTrackModel }) => {
100
104
  <IconButton
101
105
  onClick={() => {
102
106
  if (index === 0) {
103
- const newAttr: string[] = attributes
104
- newAttr.push(value1)
105
- setAttributes(newAttr)
107
+ setAttributes([...attributes, value1])
106
108
  setValue1('')
107
109
  } else {
108
- const newFeat: string[] = exclude
109
- newFeat.push(value2)
110
- setExclude(newFeat)
110
+ setExclude([...exclude, value2])
111
111
  setValue2('')
112
112
  }
113
113
  }}
@@ -24,7 +24,7 @@ const AutoSizedHierarchicalTree = ({
24
24
  {({ height }) => {
25
25
  return (
26
26
  <HierarchicalTree
27
- height={height - offset}
27
+ height={(height || offset) - offset}
28
28
  model={model}
29
29
  tree={tree}
30
30
  />
@@ -8,7 +8,7 @@ import {
8
8
  Button,
9
9
  } from '@mui/material'
10
10
  import { observer } from 'mobx-react'
11
- import { AnyConfigurationModel } from '@jbrowse/core/configuration/configurationSchema'
11
+ import { AnyConfigurationModel } from '@jbrowse/core/configuration'
12
12
  import { AbstractSessionModel } from '@jbrowse/core/util'
13
13
 
14
14
  function DeleteConnectionDialog({
@@ -14,6 +14,8 @@ export default function FacetedHeader({
14
14
  setFilterText,
15
15
  setUseShoppingCart,
16
16
  setHideSparse,
17
+ setShowOptions,
18
+ showOptions,
17
19
  hideSparse,
18
20
  useShoppingCart,
19
21
  filterText,
@@ -22,7 +24,9 @@ export default function FacetedHeader({
22
24
  setFilterText: (arg: string) => void
23
25
  setUseShoppingCart: (arg: boolean) => void
24
26
  setHideSparse: (arg: boolean) => void
27
+ setShowOptions: (arg: boolean) => void
25
28
  filterText: string
29
+ showOptions: boolean
26
30
  useShoppingCart: boolean
27
31
  hideSparse: boolean
28
32
  model: HierarchicalTrackSelectorModel
@@ -79,6 +83,12 @@ export default function FacetedHeader({
79
83
  checked: hideSparse,
80
84
  type: 'checkbox',
81
85
  },
86
+ {
87
+ label: 'Show extra table options',
88
+ onClick: () => setShowOptions(!showOptions),
89
+ checked: showOptions,
90
+ type: 'checkbox',
91
+ },
82
92
  ]}
83
93
  />
84
94
  </>
@@ -3,11 +3,12 @@ import { IconButton } from '@mui/material'
3
3
  import { transaction } from 'mobx'
4
4
  import { observer } from 'mobx-react'
5
5
  import { getRoot, resolveIdentifier } from 'mobx-state-tree'
6
- import { DataGrid, GridCellParams } from '@mui/x-data-grid'
6
+ import { DataGrid, GridCellParams, GridToolbar } from '@mui/x-data-grid'
7
7
 
8
8
  // jbrowse
9
9
  import { getTrackName } from '@jbrowse/core/util/tracks'
10
- import { ResizeHandle, SanitizedHTML } from '@jbrowse/core/ui'
10
+ import { ResizeHandle } from '@jbrowse/core/ui'
11
+ import SanitizedHTML from '@jbrowse/core/ui/SanitizedHTML'
11
12
  import JBrowseMenu from '@jbrowse/core/ui/Menu'
12
13
  import ResizeBar, { useResizeBar } from '@jbrowse/core/ui/ResizeBar'
13
14
  import {
@@ -50,6 +51,7 @@ export default observer(function FacetedSelector({
50
51
  const { ref, scrollLeft } = useResizeBar()
51
52
 
52
53
  const [filterText, setFilterText] = useState('')
54
+ const [showOptions, setShowOptions] = useState(false)
53
55
  const [info, setInfo] = useState<InfoArgs>()
54
56
  const [useShoppingCart, setUseShoppingCart] = useState(false)
55
57
  const [hideSparse, setHideSparse] = useState(true)
@@ -185,7 +187,7 @@ export default observer(function FacetedSelector({
185
187
  const { value, id, row } = params
186
188
  return (
187
189
  <>
188
- <SanitizedHTML html={value} />
190
+ <SanitizedHTML html={value as string} />
189
191
  <IconButton
190
192
  onClick={e =>
191
193
  setInfo({
@@ -207,7 +209,7 @@ export default observer(function FacetedSelector({
207
209
  width: widthsDebounced[e] || 100, // can be undefined before useEffect update
208
210
  renderCell: (params: GridCellParams) => {
209
211
  const { value } = params
210
- return value ? <SanitizedHTML html={value} /> : ''
212
+ return value ? <SanitizedHTML html={value as string} /> : ''
211
213
  },
212
214
  })),
213
215
  ...filteredMetadataKeys.map(e => ({
@@ -215,7 +217,7 @@ export default observer(function FacetedSelector({
215
217
  width: widthsDebounced[e] || 100, // can be undefined before useEffect update
216
218
  renderCell: (params: GridCellParams) => {
217
219
  const { value } = params
218
- return value ? <SanitizedHTML html={value} /> : ''
220
+ return value ? <SanitizedHTML html={value as string} /> : ''
219
221
  },
220
222
  })),
221
223
  ]
@@ -242,9 +244,11 @@ export default observer(function FacetedSelector({
242
244
  ) : null}
243
245
  <FacetedHeader
244
246
  setHideSparse={setHideSparse}
247
+ setShowOptions={setShowOptions}
245
248
  setFilterText={setFilterText}
246
249
  setUseShoppingCart={setUseShoppingCart}
247
250
  hideSparse={hideSparse}
251
+ showOptions={showOptions}
248
252
  filterText={filterText}
249
253
  useShoppingCart={useShoppingCart}
250
254
  model={model}
@@ -286,11 +290,11 @@ export default observer(function FacetedSelector({
286
290
  )}
287
291
  columnVisibilityModel={visible}
288
292
  onColumnVisibilityModelChange={newModel => setVisible(newModel)}
289
- headerHeight={35}
293
+ columnHeaderHeight={35}
290
294
  checkboxSelection
291
- disableSelectionOnClick
295
+ disableRowSelectionOnClick
292
296
  keepNonExistentRowsSelected
293
- onSelectionModelChange={userSelectedIds => {
297
+ onRowSelectionModelChange={userSelectedIds => {
294
298
  if (!useShoppingCart) {
295
299
  const a1 = shownTrackIds
296
300
  const a2 = userSelectedIds as string[]
@@ -309,9 +313,13 @@ export default observer(function FacetedSelector({
309
313
  model.setSelection(tracks)
310
314
  }
311
315
  }}
312
- selectionModel={
316
+ rowSelectionModel={
313
317
  useShoppingCart ? selection.map(s => s.trackId) : shownTrackIds
314
318
  }
319
+ slots={{ toolbar: showOptions ? GridToolbar : null }}
320
+ slotProps={{
321
+ toolbar: { printOptions: { disableToolbarButton: true } },
322
+ }}
315
323
  columns={columns}
316
324
  rowHeight={25}
317
325
  />