Skip to content

Commit 071ab25

Browse files
Standardize abort errors, give better descriptions
1 parent 4d080a2 commit 071ab25

File tree

10 files changed

+60
-12
lines changed

10 files changed

+60
-12
lines changed

packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/components/AuthTypeSelector.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ export const AuthTypeSelector = ({
5757
}
5858
})
5959
return () => {
60-
controller.abort('AuthTypeSelector')
60+
controller.abort(
61+
new DOMException(
62+
'Error retrieving valid authentication types',
63+
'AbortError',
64+
),
65+
)
6166
}
6267
}, [baseURL])
6368

packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/model.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,9 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
503503
beforeDestroy() {
504504
self.removeBeforeUnloadListener()
505505
self.removeVisibilityChangeListener()
506-
self.controller.abort('internet account beforeDestroy')
506+
self.controller.abort(
507+
new DOMException('Cleaning up Apollo connection', 'AbortError'),
508+
)
507509
self.socket.close()
508510
},
509511
}))

packages/jbrowse-plugin-apollo/src/ChangeManager.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ export class ChangeManager {
5656
statusMessage: 'Pre-validating',
5757
progressPct: 0,
5858
cancelCallback: () => {
59-
controller.abort('ChangeManager')
59+
controller.abort(
60+
new DOMException(
61+
`Cancelling change "${change.typeName}"`,
62+
'AbortError',
63+
),
64+
)
6065
},
6166
}
6267

packages/jbrowse-plugin-apollo/src/components/AddAssembly.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,12 @@ export function AddAssembly({
200200
statusMessage: 'Pre-validating',
201201
progressPct: 0,
202202
cancelCallback: () => {
203-
controller.abort('AddAssembly')
203+
controller.abort(
204+
new DOMException(
205+
`Canceling adding of assembly "${assemblyName}"`,
206+
'AbortError',
207+
),
208+
)
204209
jobsManager.abortJob(job.name)
205210
},
206211
}

packages/jbrowse-plugin-apollo/src/components/ImportFeatures.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,12 @@ export function ImportFeatures({
182182
statusMessage: 'Uploading file, this may take awhile',
183183
progressPct: 0,
184184
cancelCallback: () => {
185-
controller.abort('ImportFeatures')
185+
controller.abort(
186+
new DOMException(
187+
`Canceling importing of features to ${selectedAssembly.displayName}`,
188+
'AbortError',
189+
),
190+
)
186191
jobsManager.abortJob(job.name)
187192
},
188193
}

packages/jbrowse-plugin-apollo/src/components/OntologyTermAutocomplete.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ export function OntologyTermAutocomplete({
9393
)
9494
}
9595
return () => {
96-
controller.abort('OntologyTermAutocomplete matcher')
96+
controller.abort(
97+
new DOMException(
98+
'Cancel getting current term from ontology store',
99+
'AbortError',
100+
),
101+
)
97102
}
98103
}, [session, valueString, filterTerms, ontologyStore, needToLoadCurrentTerm])
99104

@@ -119,7 +124,12 @@ export function OntologyTermAutocomplete({
119124
)
120125
}
121126
return () => {
122-
controller.abort('OntologyTermAutocomplete loader')
127+
controller.abort(
128+
new DOMException(
129+
'Canceling getting valid terms from ontology store',
130+
'AbortError',
131+
),
132+
)
123133
}
124134
}, [
125135
needToLoadTermChoices,

packages/jbrowse-plugin-apollo/src/components/OntologyTermMultiSelect.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ function TermTagWithTooltip({
8989
})
9090

9191
return () => {
92-
controller.abort('TermTagWithTooltip ')
92+
controller.abort(
93+
new DOMException(
94+
'Cancel fetching term description from ontology store',
95+
'AbortError',
96+
),
97+
)
9398
}
9499
}, [termId, ontology, manager])
95100

@@ -211,7 +216,9 @@ export function OntologyTermMultiSelect({
211216
})
212217

213218
return () => {
214-
aborter.abort('OntologyTermMultiSelect')
219+
aborter.abort(
220+
new DOMException('Cancel getting ontology terms', 'AbortError'),
221+
)
215222
}
216223
}, [getOntologyTerms, ontology, includeDeprecated, inputValue, value])
217224

packages/jbrowse-plugin-apollo/src/makeDisplayComponent.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ const ResizeHandle = ({
9797
const controller = new AbortController()
9898
const { signal } = controller
9999
function abortDrag() {
100-
controller.abort('makeDisplayComponent')
100+
controller.abort(
101+
new DOMException('Canceling drag event listener', 'AbortError'),
102+
)
101103
}
102104
globalThis.addEventListener('mousemove', mouseMove, { signal })
103105
globalThis.addEventListener('mouseup', abortDrag, { signal })

packages/jbrowse-plugin-apollo/src/session/ClientDataStore.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,12 @@ export function clientDataStoreFactory(
204204
statusMessage: `Loading ontology "${name}", version "${version}", this may take a while`,
205205
progressPct: 0,
206206
cancelCallback: () => {
207-
controller.abort('ClientDataStore')
207+
controller.abort(
208+
new DOMException(
209+
`Canceling loading of ontology "${name}"`,
210+
'AbortError',
211+
),
212+
)
208213
jobsManager.abortJob(job.name)
209214
},
210215
}

packages/jbrowse-plugin-apollo/src/session/session.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ export function extendSession(
347347
)
348348
},
349349
beforeDestroy() {
350-
self.abortController.abort('destroying session model')
350+
self.abortController.abort(
351+
new DOMException('Clean up Apollo session', 'AbortError'),
352+
)
351353
},
352354
}))
353355

0 commit comments

Comments
 (0)