Skip to content

Commit a399de9

Browse files
committed
add advancedOptionsOverride token to avoid token mismatch in extensions
1 parent 45d538b commit a399de9

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/index.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,13 @@ const schedulerPlugin: JupyterFrontEndPlugin<void> = {
8282
INotebookTracker,
8383
ITranslator,
8484
ILayoutRestorer,
85-
Scheduler.IAdvancedOptions,
8685
Scheduler.TelemetryHandler
8786
],
88-
optional: [ILauncher],
87+
optional: [
88+
ILauncher,
89+
Scheduler.IAdvancedOptionsOverride,
90+
Scheduler.IAdvancedOptions
91+
],
8992
autoStart: true,
9093
activate: activatePlugin
9194
};
@@ -190,10 +193,13 @@ function activatePlugin(
190193
notebookTracker: INotebookTracker,
191194
translator: ITranslator,
192195
restorer: ILayoutRestorer,
193-
advancedOptions: Scheduler.IAdvancedOptions,
194196
telemetryHandler: Scheduler.TelemetryHandler,
195-
launcher: ILauncher | null
197+
launcher: ILauncher | null,
198+
advancedOptionsOverride: Scheduler.IAdvancedOptions | null,
199+
advancedOptionsDefault: Scheduler.IAdvancedOptions | null
196200
): void {
201+
const advancedOptions =
202+
advancedOptionsOverride || advancedOptionsDefault || AdvancedOptions;
197203
const trans = translator.load('jupyterlab');
198204
const api = new SchedulerService({});
199205
verifyServerExtension({ api, translator });

src/tokens.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ export namespace Scheduler {
4646
'@jupyterlab/scheduler:IAdvancedOptions'
4747
);
4848

49+
export const IAdvancedOptionsOverride = new Token<IAdvancedOptions>(
50+
'@jupyterlab/scheduler:IAdvancedOptionsOverride'
51+
);
52+
4953
export interface IEvent {
5054
name: string;
5155
}

0 commit comments

Comments
 (0)