@jupyterlab/apputils-extension 4.4.0-beta.0 → 4.4.0-beta.2
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.
- package/lib/announcements.js +13 -16
- package/lib/announcements.js.map +1 -1
- package/lib/index.js +7 -1
- package/lib/index.js.map +1 -1
- package/lib/licensesplugin.d.ts +10 -0
- package/lib/licensesplugin.js +174 -0
- package/lib/licensesplugin.js.map +1 -0
- package/lib/settingconnector.d.ts +2 -2
- package/lib/settingconnector.js.map +1 -1
- package/lib/settingsplugin.d.ts +7 -1
- package/lib/settingsplugin.js +19 -6
- package/lib/settingsplugin.js.map +1 -1
- package/lib/statusbarplugin.js +3 -1
- package/lib/statusbarplugin.js.map +1 -1
- package/lib/subshell-settings.d.ts +2 -0
- package/lib/subshell-settings.js +35 -0
- package/lib/subshell-settings.js.map +1 -0
- package/package.json +14 -14
- package/schema/sessions-settings.json +25 -0
- package/src/announcements.ts +16 -11
- package/src/index.ts +7 -1
- package/src/licensesplugin.ts +228 -0
- package/src/settingconnector.ts +8 -5
- package/src/settingsplugin.ts +29 -6
- package/src/statusbarplugin.ts +6 -4
- package/src/subshell-settings.ts +51 -0
- package/schema/running-sessions-status.json +0 -14
package/lib/announcements.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Notification } from '@jupyterlab/apputils';
|
|
6
6
|
import { URLExt } from '@jupyterlab/coreutils';
|
|
7
|
-
import {
|
|
7
|
+
import { IConfigSectionManager, ServerConnection } from '@jupyterlab/services';
|
|
8
8
|
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
9
9
|
import { ITranslator, nullTranslator } from '@jupyterlab/translation';
|
|
10
10
|
const COMMAND_HELP_OPEN = 'help:open';
|
|
@@ -39,18 +39,18 @@ export const announcements = {
|
|
|
39
39
|
id: '@jupyterlab/apputils-extension:announcements',
|
|
40
40
|
description: 'Add the announcement feature. It will fetch news on the internet and check for application updates.',
|
|
41
41
|
autoStart: true,
|
|
42
|
-
optional: [ISettingRegistry, ITranslator],
|
|
43
|
-
activate: (app, settingRegistry, translator) => {
|
|
44
|
-
var _a;
|
|
42
|
+
optional: [IConfigSectionManager, ISettingRegistry, ITranslator],
|
|
43
|
+
activate: (app, configSectionManager, settingRegistry, translator) => {
|
|
44
|
+
var _a, _b;
|
|
45
45
|
const CONFIG_SECTION_NAME = announcements.id.replace(/[^\w]/g, '');
|
|
46
46
|
void Promise.all([
|
|
47
47
|
app.restored,
|
|
48
48
|
(_a = settingRegistry === null || settingRegistry === void 0 ? void 0 : settingRegistry.load('@jupyterlab/apputils-extension:notification')) !== null && _a !== void 0 ? _a : Promise.resolve(null),
|
|
49
49
|
// Use config instead of state to store independently of the workspace
|
|
50
50
|
// if a news has been displayed or not.
|
|
51
|
-
|
|
51
|
+
(_b = configSectionManager === null || configSectionManager === void 0 ? void 0 : configSectionManager.create({
|
|
52
52
|
name: CONFIG_SECTION_NAME
|
|
53
|
-
})
|
|
53
|
+
})) !== null && _b !== void 0 ? _b : Promise.resolve(null)
|
|
54
54
|
]).then(async ([_, settings, config]) => {
|
|
55
55
|
const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
|
|
56
56
|
// Store dismiss state
|
|
@@ -64,7 +64,7 @@ export const announcements = {
|
|
|
64
64
|
if ((tags !== null && tags !== void 0 ? tags : []).some(tag => ['news', 'update'].includes(tag)) && id) {
|
|
65
65
|
const update = {};
|
|
66
66
|
update[id] = { seen: true, dismissed: true };
|
|
67
|
-
config.update(update).catch(reason => {
|
|
67
|
+
config === null || config === void 0 ? void 0 : config.update(update).catch(reason => {
|
|
68
68
|
console.error(`Failed to update the announcements config:\n${reason}`);
|
|
69
69
|
});
|
|
70
70
|
}
|
|
@@ -95,10 +95,7 @@ export const announcements = {
|
|
|
95
95
|
label: trans.__('Yes'),
|
|
96
96
|
callback: () => {
|
|
97
97
|
Notification.dismiss(notificationId);
|
|
98
|
-
config
|
|
99
|
-
.update({})
|
|
100
|
-
.then(() => fetchNews())
|
|
101
|
-
.catch(reason => {
|
|
98
|
+
config === null || config === void 0 ? void 0 : config.update({}).then(() => fetchNews()).catch(reason => {
|
|
102
99
|
console.error(`Failed to get the news:\n${reason}`);
|
|
103
100
|
});
|
|
104
101
|
settings === null || settings === void 0 ? void 0 : settings.set('fetchNews', 'true').catch((reason) => {
|
|
@@ -130,7 +127,7 @@ export const announcements = {
|
|
|
130
127
|
// @ts-expect-error data has no index
|
|
131
128
|
const id = options.data['id'];
|
|
132
129
|
// Filter those notifications
|
|
133
|
-
const state = (_b = config.data[id]) !== null && _b !== void 0 ? _b : {
|
|
130
|
+
const state = (_b = config === null || config === void 0 ? void 0 : config.data[id]) !== null && _b !== void 0 ? _b : {
|
|
134
131
|
seen: false,
|
|
135
132
|
dismissed: false
|
|
136
133
|
};
|
|
@@ -142,7 +139,7 @@ export const announcements = {
|
|
|
142
139
|
callback: () => {
|
|
143
140
|
const update = {};
|
|
144
141
|
update[id] = { seen: true, dismissed: true };
|
|
145
|
-
config.update(update).catch(reason => {
|
|
142
|
+
config === null || config === void 0 ? void 0 : config.update(update).catch(reason => {
|
|
146
143
|
console.error(`Failed to update the announcements config:\n${reason}`);
|
|
147
144
|
});
|
|
148
145
|
}
|
|
@@ -162,7 +159,7 @@ export const announcements = {
|
|
|
162
159
|
options.autoClose = 5000;
|
|
163
160
|
const update = {};
|
|
164
161
|
update[id] = { seen: true };
|
|
165
|
-
config.update(update).catch(reason => {
|
|
162
|
+
config === null || config === void 0 ? void 0 : config.update(update).catch(reason => {
|
|
166
163
|
console.error(`Failed to update the announcements config:\n${reason}`);
|
|
167
164
|
});
|
|
168
165
|
}
|
|
@@ -180,7 +177,7 @@ export const announcements = {
|
|
|
180
177
|
const { link, message, type, options } = response.notification;
|
|
181
178
|
// @ts-expect-error data has no index
|
|
182
179
|
const id = options.data['id'];
|
|
183
|
-
const state = (_d = config.data[id]) !== null && _d !== void 0 ? _d : {
|
|
180
|
+
const state = (_d = config === null || config === void 0 ? void 0 : config.data[id]) !== null && _d !== void 0 ? _d : {
|
|
184
181
|
seen: false,
|
|
185
182
|
dismissed: false
|
|
186
183
|
};
|
|
@@ -215,7 +212,7 @@ export const announcements = {
|
|
|
215
212
|
options.autoClose = 5000;
|
|
216
213
|
const update = {};
|
|
217
214
|
update[id] = { seen: true };
|
|
218
|
-
config.update(update).catch(reason => {
|
|
215
|
+
config === null || config === void 0 ? void 0 : config.update(update).catch(reason => {
|
|
219
216
|
console.error(`Failed to update the announcements config:\n${reason}`);
|
|
220
217
|
});
|
|
221
218
|
}
|
package/lib/announcements.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"announcements.js","sourceRoot":"","sources":["../src/announcements.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"announcements.js","sourceRoot":"","sources":["../src/announcements.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -17,10 +17,12 @@ import { PromiseDelegate } from '@lumino/coreutils';
|
|
|
17
17
|
import { DisposableDelegate } from '@lumino/disposable';
|
|
18
18
|
import { Debouncer, Throttler } from '@lumino/polling';
|
|
19
19
|
import { announcements } from './announcements';
|
|
20
|
+
import { licensesClient, licensesPlugin } from './licensesplugin';
|
|
20
21
|
import { notificationPlugin } from './notificationplugin';
|
|
21
22
|
import { Palette } from './palette';
|
|
22
|
-
import { settingsPlugin } from './settingsplugin';
|
|
23
|
+
import { settingsConnector, settingsPlugin } from './settingsplugin';
|
|
23
24
|
import { kernelStatus, runningSessionsStatus } from './statusbarplugin';
|
|
25
|
+
import { subshellsSettings } from './subshell-settings';
|
|
24
26
|
import { themesPaletteMenuPlugin, themesPlugin } from './themesplugins';
|
|
25
27
|
import { toolbarRegistry } from './toolbarregistryplugin';
|
|
26
28
|
import { workspacesPlugin } from './workspacesplugin';
|
|
@@ -590,13 +592,17 @@ const sanitizer = {
|
|
|
590
592
|
const plugins = [
|
|
591
593
|
announcements,
|
|
592
594
|
kernelStatus,
|
|
595
|
+
licensesClient,
|
|
596
|
+
licensesPlugin,
|
|
593
597
|
notificationPlugin,
|
|
594
598
|
palette,
|
|
595
599
|
paletteRestorer,
|
|
596
600
|
print,
|
|
597
601
|
resolver,
|
|
598
602
|
runningSessionsStatus,
|
|
603
|
+
subshellsSettings,
|
|
599
604
|
sanitizer,
|
|
605
|
+
settingsConnector,
|
|
600
606
|
settingsPlugin,
|
|
601
607
|
state,
|
|
602
608
|
splash,
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { JupyterFrontEndPlugin } from '@jupyterlab/application';
|
|
2
|
+
import { ILicensesClient } from '@jupyterlab/apputils';
|
|
3
|
+
/**
|
|
4
|
+
* The license client plugin for fetching licenses.
|
|
5
|
+
*/
|
|
6
|
+
export declare const licensesClient: JupyterFrontEndPlugin<ILicensesClient>;
|
|
7
|
+
/**
|
|
8
|
+
* A plugin to add a licenses reporting tools.
|
|
9
|
+
*/
|
|
10
|
+
export declare const licensesPlugin: JupyterFrontEndPlugin<void>;
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Jupyter Development Team.
|
|
3
|
+
* Distributed under the terms of the Modified BSD License.
|
|
4
|
+
*/
|
|
5
|
+
import { ILayoutRestorer } from '@jupyterlab/application';
|
|
6
|
+
import { ICommandPalette, ILicensesClient, Licenses, MainAreaWidget, WidgetTracker } from '@jupyterlab/apputils';
|
|
7
|
+
import { PageConfig, URLExt } from '@jupyterlab/coreutils';
|
|
8
|
+
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
9
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
10
|
+
import { CommandToolbarButton, copyrightIcon, refreshIcon, Toolbar } from '@jupyterlab/ui-components';
|
|
11
|
+
/**
|
|
12
|
+
* The command IDs used by the licenses plugin.
|
|
13
|
+
*/
|
|
14
|
+
var CommandIDs;
|
|
15
|
+
(function (CommandIDs) {
|
|
16
|
+
CommandIDs.licenses = 'apputils:licenses';
|
|
17
|
+
CommandIDs.licenseReport = 'apputils:license-report';
|
|
18
|
+
CommandIDs.refreshLicenses = 'apputils:licenses-refresh';
|
|
19
|
+
})(CommandIDs || (CommandIDs = {}));
|
|
20
|
+
/**
|
|
21
|
+
* The license client plugin for fetching licenses.
|
|
22
|
+
*/
|
|
23
|
+
export const licensesClient = {
|
|
24
|
+
id: '@jupyterlab/apputils-extension:licenses-client',
|
|
25
|
+
description: 'The licenses client plugin for fetching licenses.',
|
|
26
|
+
autoStart: true,
|
|
27
|
+
provides: ILicensesClient,
|
|
28
|
+
activate: (app) => {
|
|
29
|
+
const licensesUrl = URLExt.join(PageConfig.getBaseUrl(), PageConfig.getOption('licensesUrl')) + '/';
|
|
30
|
+
const serverSettings = app.serviceManager.serverSettings;
|
|
31
|
+
return new Licenses.LicensesClient({ licensesUrl, serverSettings });
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
/**
|
|
35
|
+
* A plugin to add a licenses reporting tools.
|
|
36
|
+
*/
|
|
37
|
+
export const licensesPlugin = {
|
|
38
|
+
id: '@jupyterlab/apputils-extension:licenses-plugin',
|
|
39
|
+
description: 'Adds licenses reporting tools.',
|
|
40
|
+
requires: [ILicensesClient, ITranslator],
|
|
41
|
+
optional: [ILayoutRestorer, IMainMenu, ICommandPalette],
|
|
42
|
+
autoStart: true,
|
|
43
|
+
activate: (app, client, translator, restorer, menu, palette) => {
|
|
44
|
+
const { commands, shell } = app;
|
|
45
|
+
const trans = translator.load('jupyterlab');
|
|
46
|
+
const category = trans.__('Help');
|
|
47
|
+
const downloadAsText = trans.__('Download All Licenses as');
|
|
48
|
+
const refreshLicenses = trans.__('Refresh Licenses');
|
|
49
|
+
const licensesNamespace = 'help-licenses';
|
|
50
|
+
const licensesTracker = new WidgetTracker({
|
|
51
|
+
namespace: licensesNamespace
|
|
52
|
+
});
|
|
53
|
+
// translation strings
|
|
54
|
+
const licensesText = trans.__('Licenses');
|
|
55
|
+
// an incrementer for license widget ids
|
|
56
|
+
let counter = 0;
|
|
57
|
+
/**
|
|
58
|
+
* Create a MainAreaWidget for a license viewer
|
|
59
|
+
*/
|
|
60
|
+
function createLicenseWidget(args) {
|
|
61
|
+
const licensesModel = new Licenses.Model({
|
|
62
|
+
...args,
|
|
63
|
+
client,
|
|
64
|
+
trans
|
|
65
|
+
});
|
|
66
|
+
const content = new Licenses({ model: licensesModel });
|
|
67
|
+
content.id = `${licensesNamespace}-${++counter}`;
|
|
68
|
+
content.title.label = licensesText;
|
|
69
|
+
content.title.icon = copyrightIcon;
|
|
70
|
+
const main = new MainAreaWidget({
|
|
71
|
+
content,
|
|
72
|
+
reveal: licensesModel.licensesReady
|
|
73
|
+
});
|
|
74
|
+
main.toolbar.addItem('refresh-licenses', new CommandToolbarButton({
|
|
75
|
+
id: CommandIDs.refreshLicenses,
|
|
76
|
+
args: { noLabel: 1 },
|
|
77
|
+
commands
|
|
78
|
+
}));
|
|
79
|
+
main.toolbar.addItem('spacer', Toolbar.createSpacerItem());
|
|
80
|
+
for (const format of Object.keys(Licenses.REPORT_FORMATS)) {
|
|
81
|
+
const button = new CommandToolbarButton({
|
|
82
|
+
id: CommandIDs.licenseReport,
|
|
83
|
+
args: { format, noLabel: 1 },
|
|
84
|
+
commands
|
|
85
|
+
});
|
|
86
|
+
main.toolbar.addItem(`download-${format}`, button);
|
|
87
|
+
}
|
|
88
|
+
return main;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Return a full license report format based on a format name
|
|
92
|
+
*/
|
|
93
|
+
function formatOrDefault(format) {
|
|
94
|
+
return (Licenses.REPORT_FORMATS[format] ||
|
|
95
|
+
Licenses.REPORT_FORMATS[Licenses.DEFAULT_FORMAT]);
|
|
96
|
+
}
|
|
97
|
+
// register license-related commands
|
|
98
|
+
commands.addCommand(CommandIDs.licenses, {
|
|
99
|
+
label: licensesText,
|
|
100
|
+
execute: (args) => {
|
|
101
|
+
// bail if no license API is available from the server
|
|
102
|
+
if (!PageConfig.getOption('licensesUrl')) {
|
|
103
|
+
console.warn('No license API available from the server');
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
const licenseMain = createLicenseWidget(args);
|
|
107
|
+
shell.add(licenseMain, 'main', { type: 'Licenses' });
|
|
108
|
+
// add to tracker so it can be restored, and update when choices change
|
|
109
|
+
void licensesTracker.add(licenseMain);
|
|
110
|
+
licenseMain.content.model.trackerDataChanged.connect(() => {
|
|
111
|
+
void licensesTracker.save(licenseMain);
|
|
112
|
+
});
|
|
113
|
+
return licenseMain;
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
commands.addCommand(CommandIDs.refreshLicenses, {
|
|
117
|
+
label: args => (args.noLabel ? '' : refreshLicenses),
|
|
118
|
+
caption: refreshLicenses,
|
|
119
|
+
icon: refreshIcon,
|
|
120
|
+
execute: async () => {
|
|
121
|
+
var _a;
|
|
122
|
+
return (_a = licensesTracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content.model.initLicenses();
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
commands.addCommand(CommandIDs.licenseReport, {
|
|
126
|
+
label: args => {
|
|
127
|
+
if (args.noLabel) {
|
|
128
|
+
return '';
|
|
129
|
+
}
|
|
130
|
+
const format = formatOrDefault(`${args.format}`);
|
|
131
|
+
return `${downloadAsText} ${format.title}`;
|
|
132
|
+
},
|
|
133
|
+
caption: args => {
|
|
134
|
+
const format = formatOrDefault(`${args.format}`);
|
|
135
|
+
return `${downloadAsText} ${format.title}`;
|
|
136
|
+
},
|
|
137
|
+
icon: args => {
|
|
138
|
+
const format = formatOrDefault(`${args.format}`);
|
|
139
|
+
return format.icon;
|
|
140
|
+
},
|
|
141
|
+
execute: async (args) => {
|
|
142
|
+
var _a;
|
|
143
|
+
const format = formatOrDefault(`${args.format}`);
|
|
144
|
+
return await ((_a = licensesTracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content.model.download({
|
|
145
|
+
format: format.id
|
|
146
|
+
}));
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
// handle optional integrations
|
|
150
|
+
if (palette) {
|
|
151
|
+
palette.addItem({ command: CommandIDs.licenses, category });
|
|
152
|
+
}
|
|
153
|
+
if (menu) {
|
|
154
|
+
const helpMenu = menu.helpMenu;
|
|
155
|
+
helpMenu.addGroup([{ command: CommandIDs.licenses }], 0);
|
|
156
|
+
}
|
|
157
|
+
if (restorer) {
|
|
158
|
+
void restorer.restore(licensesTracker, {
|
|
159
|
+
command: CommandIDs.licenses,
|
|
160
|
+
name: widget => 'licenses',
|
|
161
|
+
args: widget => {
|
|
162
|
+
const { currentBundleName, currentPackageIndex, packageFilter } = widget.content.model;
|
|
163
|
+
const args = {
|
|
164
|
+
currentBundleName,
|
|
165
|
+
currentPackageIndex,
|
|
166
|
+
packageFilter
|
|
167
|
+
};
|
|
168
|
+
return args;
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
};
|
|
174
|
+
//# sourceMappingURL=licensesplugin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"licensesplugin.js","sourceRoot":"","sources":["../src/licensesplugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
1
|
+
import { ISettingConnector, ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
2
2
|
import { DataConnector, IDataConnector } from '@jupyterlab/statedb';
|
|
3
3
|
/**
|
|
4
4
|
* A data connector for fetching settings.
|
|
@@ -6,7 +6,7 @@ import { DataConnector, IDataConnector } from '@jupyterlab/statedb';
|
|
|
6
6
|
* #### Notes
|
|
7
7
|
* This connector adds a query parameter to the base services setting manager.
|
|
8
8
|
*/
|
|
9
|
-
export declare class SettingConnector extends DataConnector<ISettingRegistry.IPlugin, string> {
|
|
9
|
+
export declare class SettingConnector extends DataConnector<ISettingRegistry.IPlugin, string> implements ISettingConnector {
|
|
10
10
|
constructor(connector: IDataConnector<ISettingRegistry.IPlugin, string>);
|
|
11
11
|
/**
|
|
12
12
|
* Fetch settings for a plugin.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAKnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBACX,SAAQ,aAA+C;IAGvD,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAkDF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAjDtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC;YACxB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,IAAI,CACR,QAAkC,KAAK;QAEvC,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QAC5C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAChD,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACpC,CAAC;QAEF,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}
|
package/lib/settingsplugin.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { JupyterFrontEndPlugin } from '@jupyterlab/application';
|
|
2
|
-
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
2
|
+
import { ISettingConnector, ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
3
|
+
/**
|
|
4
|
+
* Provides the settings connector as a separate plugin to allow for alternative
|
|
5
|
+
* implementations that may want to fetch settings from a different source or
|
|
6
|
+
* endpoint.
|
|
7
|
+
*/
|
|
8
|
+
export declare const settingsConnector: JupyterFrontEndPlugin<ISettingConnector>;
|
|
3
9
|
/**
|
|
4
10
|
* The default setting registry provider.
|
|
5
11
|
*/
|
package/lib/settingsplugin.js
CHANGED
|
@@ -3,17 +3,32 @@
|
|
|
3
3
|
| Distributed under the terms of the Modified BSD License.
|
|
4
4
|
|----------------------------------------------------------------------------*/
|
|
5
5
|
import { PageConfig } from '@jupyterlab/coreutils';
|
|
6
|
-
import { ISettingRegistry, SettingRegistry } from '@jupyterlab/settingregistry';
|
|
6
|
+
import { ISettingConnector, ISettingRegistry, SettingRegistry } from '@jupyterlab/settingregistry';
|
|
7
7
|
import { SettingConnector } from './settingconnector';
|
|
8
|
+
/**
|
|
9
|
+
* Provides the settings connector as a separate plugin to allow for alternative
|
|
10
|
+
* implementations that may want to fetch settings from a different source or
|
|
11
|
+
* endpoint.
|
|
12
|
+
*/
|
|
13
|
+
export const settingsConnector = {
|
|
14
|
+
id: '@jupyterlab/apputils-extension:settings-connector',
|
|
15
|
+
description: 'Provides the settings connector.',
|
|
16
|
+
autoStart: true,
|
|
17
|
+
provides: ISettingConnector,
|
|
18
|
+
activate: (app) => new SettingConnector(app.serviceManager.settings)
|
|
19
|
+
};
|
|
8
20
|
/**
|
|
9
21
|
* The default setting registry provider.
|
|
10
22
|
*/
|
|
11
23
|
export const settingsPlugin = {
|
|
12
24
|
id: '@jupyterlab/apputils-extension:settings',
|
|
25
|
+
autoStart: true,
|
|
26
|
+
provides: ISettingRegistry,
|
|
27
|
+
optional: [ISettingConnector],
|
|
13
28
|
description: 'Provides the setting registry.',
|
|
14
|
-
activate: async (app) => {
|
|
29
|
+
activate: async (app, settingsConnector) => {
|
|
15
30
|
const { isDisabled } = PageConfig.Extension;
|
|
16
|
-
const connector = new SettingConnector(app.serviceManager.settings);
|
|
31
|
+
const connector = settingsConnector !== null && settingsConnector !== void 0 ? settingsConnector : new SettingConnector(app.serviceManager.settings);
|
|
17
32
|
// On startup, check if a plugin is available in the application.
|
|
18
33
|
// This helps avoid loading plugin files from other lab-based applications
|
|
19
34
|
// that have placed their schemas next to the JupyterLab schemas. Different lab-based
|
|
@@ -48,8 +63,6 @@ export const settingsPlugin = {
|
|
|
48
63
|
});
|
|
49
64
|
});
|
|
50
65
|
return registry;
|
|
51
|
-
}
|
|
52
|
-
autoStart: true,
|
|
53
|
-
provides: ISettingRegistry
|
|
66
|
+
}
|
|
54
67
|
};
|
|
55
68
|
//# sourceMappingURL=settingsplugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsplugin.js","sourceRoot":"","sources":["../src/settingsplugin.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAM/E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"settingsplugin.js","sourceRoot":"","sources":["../src/settingsplugin.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAM/E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAA6C;IACzE,EAAE,EAAE,mDAAmD;IACvD,WAAW,EAAE,kCAAkC;IAC/C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,iBAAiB;IAC3B,QAAQ,EAAE,CAAC,GAAoB,EAAE,EAAE,CACjC,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC;CACpD,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAA4C;IACrE,EAAE,EAAE,yCAAyC;IAC7C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,gBAAgB;IAC1B,QAAQ,EAAE,CAAC,iBAAiB,CAAC;IAC7B,WAAW,EAAE,gCAAgC;IAC7C,QAAQ,EAAE,KAAK,EACb,GAAoB,EACpB,iBAA2C,EAChB,EAAE;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QAC5C,MAAM,SAAS,GACb,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEzE,iEAAiE;QACjE,0EAA0E;QAC1E,qFAAqF;QACrF,0EAA0E;QAC1E,yFAAyF;QACzF,uFAAuF;QACvF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,SAAS;YACT,OAAO,EAAE,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9D,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CACxB;SACF,CAAC,CAAC;QAEH,qEAAqE;QACrE,yEAAyE;QACzE,qEAAqE;QACrE,oBAAoB;QACpB,KAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACnE,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;oBAC3D,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC/B,OAAO,CAAC,IAAI,CACV,6DAA6D;4BAC3D,wCAAwC,EAAE,gBAAgB;4BAC1D,+CAA+C,CAClD,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAC"}
|
package/lib/statusbarplugin.js
CHANGED
|
@@ -132,7 +132,9 @@ export const runningSessionsStatus = {
|
|
|
132
132
|
disposable = registerItem();
|
|
133
133
|
}
|
|
134
134
|
};
|
|
135
|
-
void settingRegistry
|
|
135
|
+
void settingRegistry
|
|
136
|
+
.load('@jupyterlab/apputils-extension:sessions-settings')
|
|
137
|
+
.then(settings => {
|
|
136
138
|
onSettingsUpdated(settings);
|
|
137
139
|
settings.changed.connect(onSettingsUpdated);
|
|
138
140
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statusbarplugin.js","sourceRoot":"","sources":["../src/statusbarplugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"statusbarplugin.js","sourceRoot":"","sources":["../src/statusbarplugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/* -----------------------------------------------------------------------------
|
|
2
|
+
| Copyright (c) Jupyter Development Team.
|
|
3
|
+
| Distributed under the terms of the Modified BSD License.
|
|
4
|
+
|----------------------------------------------------------------------------*/
|
|
5
|
+
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
6
|
+
/*
|
|
7
|
+
* A plugin loading kernel subshell settings.
|
|
8
|
+
*/
|
|
9
|
+
export const subshellsSettings = {
|
|
10
|
+
id: '@jupyterlab/apputils-extension:subshell-settings',
|
|
11
|
+
description: 'Kernel subshell settings.',
|
|
12
|
+
autoStart: true,
|
|
13
|
+
requires: [],
|
|
14
|
+
optional: [ISettingRegistry],
|
|
15
|
+
activate: (app, settingRegistry) => {
|
|
16
|
+
if (settingRegistry) {
|
|
17
|
+
app.started
|
|
18
|
+
.then(async () => {
|
|
19
|
+
const subshellsSettings = await settingRegistry.load('@jupyterlab/apputils-extension:sessions-settings');
|
|
20
|
+
const commsOverSubshells = subshellsSettings.get('commsOverSubshells')
|
|
21
|
+
.composite;
|
|
22
|
+
app.serviceManager.kernels.commsOverSubshells = commsOverSubshells;
|
|
23
|
+
subshellsSettings.changed.connect(() => {
|
|
24
|
+
const commsOverSubshells = subshellsSettings.get('commsOverSubshells').composite;
|
|
25
|
+
app.serviceManager.kernels.commsOverSubshells = commsOverSubshells;
|
|
26
|
+
});
|
|
27
|
+
})
|
|
28
|
+
.catch(reason => {
|
|
29
|
+
console.error('Fail to load settings for the subshells.');
|
|
30
|
+
console.error(reason);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
//# sourceMappingURL=subshell-settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subshell-settings.js","sourceRoot":"","sources":["../src/subshell-settings.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAO/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAgC;IAC5D,EAAE,EAAE,kDAAkD;IACtD,WAAW,EAAE,2BAA2B;IACxC,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,CAAC,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,CACR,GAAoB,EACpB,eAAwC,EACxC,EAAE;QACF,IAAI,eAAe,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO;iBACR,IAAI,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,IAAI,CAClD,kDAAkD,CACnD,CAAC;gBAEF,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,CAAC;qBACnE,SAA+B,CAAC;gBAEnC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;gBAEnE,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;oBACrC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,GAAG,CAC9C,oBAAoB,CACrB,CAAC,SAA+B,CAAC;oBAClC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;gBACrE,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,MAAM,CAAC,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC1D,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/apputils-extension",
|
|
3
|
-
"version": "4.4.0-beta.
|
|
3
|
+
"version": "4.4.0-beta.2",
|
|
4
4
|
"description": "JupyterLab - Application Utilities Extension",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -37,19 +37,19 @@
|
|
|
37
37
|
"watch": "tsc -b --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@jupyterlab/application": "^4.4.0-beta.
|
|
41
|
-
"@jupyterlab/apputils": "^4.5.0-beta.
|
|
42
|
-
"@jupyterlab/coreutils": "^6.4.0-beta.
|
|
43
|
-
"@jupyterlab/docregistry": "^4.4.0-beta.
|
|
44
|
-
"@jupyterlab/mainmenu": "^4.4.0-beta.
|
|
45
|
-
"@jupyterlab/rendermime-interfaces": "^3.12.0-beta.
|
|
46
|
-
"@jupyterlab/services": "^7.4.0-beta.
|
|
47
|
-
"@jupyterlab/settingregistry": "^4.4.0-beta.
|
|
48
|
-
"@jupyterlab/statedb": "^4.4.0-beta.
|
|
49
|
-
"@jupyterlab/statusbar": "^4.4.0-beta.
|
|
50
|
-
"@jupyterlab/translation": "^4.4.0-beta.
|
|
51
|
-
"@jupyterlab/ui-components": "^4.4.0-beta.
|
|
52
|
-
"@jupyterlab/workspaces": "^4.4.0-beta.
|
|
40
|
+
"@jupyterlab/application": "^4.4.0-beta.2",
|
|
41
|
+
"@jupyterlab/apputils": "^4.5.0-beta.2",
|
|
42
|
+
"@jupyterlab/coreutils": "^6.4.0-beta.2",
|
|
43
|
+
"@jupyterlab/docregistry": "^4.4.0-beta.2",
|
|
44
|
+
"@jupyterlab/mainmenu": "^4.4.0-beta.2",
|
|
45
|
+
"@jupyterlab/rendermime-interfaces": "^3.12.0-beta.2",
|
|
46
|
+
"@jupyterlab/services": "^7.4.0-beta.2",
|
|
47
|
+
"@jupyterlab/settingregistry": "^4.4.0-beta.2",
|
|
48
|
+
"@jupyterlab/statedb": "^4.4.0-beta.2",
|
|
49
|
+
"@jupyterlab/statusbar": "^4.4.0-beta.2",
|
|
50
|
+
"@jupyterlab/translation": "^4.4.0-beta.2",
|
|
51
|
+
"@jupyterlab/ui-components": "^4.4.0-beta.2",
|
|
52
|
+
"@jupyterlab/workspaces": "^4.4.0-beta.2",
|
|
53
53
|
"@lumino/algorithm": "^2.0.2",
|
|
54
54
|
"@lumino/commands": "^2.3.1",
|
|
55
55
|
"@lumino/coreutils": "^2.2.0",
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
{
|
|
2
|
+
"title": "Terminals and Kernels sessions settings",
|
|
3
|
+
"description": "Terminals and Kernels sessions settings",
|
|
4
|
+
"additionalProperties": false,
|
|
5
|
+
"properties": {
|
|
6
|
+
"showStatusBarItem": {
|
|
7
|
+
"type": "boolean",
|
|
8
|
+
"title": "Show the status bar item",
|
|
9
|
+
"description": "Whether to show the running terminals and kernels item in the status bar",
|
|
10
|
+
"default": true
|
|
11
|
+
},
|
|
12
|
+
"commsOverSubshells": {
|
|
13
|
+
"type": "string",
|
|
14
|
+
"title": "Kernel Comms over subshells",
|
|
15
|
+
"description": "Whether comm messages should be sent to kernel subshells, if the kernel supports it.",
|
|
16
|
+
"default": "perCommTarget",
|
|
17
|
+
"oneOf": [
|
|
18
|
+
{ "const": "disabled", "title": "Disabled" },
|
|
19
|
+
{ "const": "perComm", "title": "One subshell per comm" },
|
|
20
|
+
{ "const": "perCommTarget", "title": "One subshell per comm-target" }
|
|
21
|
+
]
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
"type": "object"
|
|
25
|
+
}
|
package/src/announcements.ts
CHANGED
|
@@ -9,7 +9,11 @@ import {
|
|
|
9
9
|
} from '@jupyterlab/application';
|
|
10
10
|
import { Notification } from '@jupyterlab/apputils';
|
|
11
11
|
import { URLExt } from '@jupyterlab/coreutils';
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
ConfigSection,
|
|
14
|
+
IConfigSectionManager,
|
|
15
|
+
ServerConnection
|
|
16
|
+
} from '@jupyterlab/services';
|
|
13
17
|
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
14
18
|
import { ITranslator, nullTranslator } from '@jupyterlab/translation';
|
|
15
19
|
|
|
@@ -55,9 +59,10 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
55
59
|
description:
|
|
56
60
|
'Add the announcement feature. It will fetch news on the internet and check for application updates.',
|
|
57
61
|
autoStart: true,
|
|
58
|
-
optional: [ISettingRegistry, ITranslator],
|
|
62
|
+
optional: [IConfigSectionManager, ISettingRegistry, ITranslator],
|
|
59
63
|
activate: (
|
|
60
64
|
app: JupyterFrontEnd,
|
|
65
|
+
configSectionManager: ConfigSection.IManager | null,
|
|
61
66
|
settingRegistry: ISettingRegistry | null,
|
|
62
67
|
translator: ITranslator | null
|
|
63
68
|
): void => {
|
|
@@ -69,9 +74,9 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
69
74
|
Promise.resolve(null),
|
|
70
75
|
// Use config instead of state to store independently of the workspace
|
|
71
76
|
// if a news has been displayed or not.
|
|
72
|
-
|
|
77
|
+
configSectionManager?.create({
|
|
73
78
|
name: CONFIG_SECTION_NAME
|
|
74
|
-
})
|
|
79
|
+
}) ?? Promise.resolve(null)
|
|
75
80
|
]).then(async ([_, settings, config]) => {
|
|
76
81
|
const trans = (translator ?? nullTranslator).load('jupyterlab');
|
|
77
82
|
|
|
@@ -85,7 +90,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
85
90
|
if ((tags ?? []).some(tag => ['news', 'update'].includes(tag)) && id) {
|
|
86
91
|
const update: { [k: string]: INewsState } = {};
|
|
87
92
|
update[id] = { seen: true, dismissed: true };
|
|
88
|
-
config
|
|
93
|
+
config?.update(update as any).catch(reason => {
|
|
89
94
|
console.error(
|
|
90
95
|
`Failed to update the announcements config:\n${reason}`
|
|
91
96
|
);
|
|
@@ -127,7 +132,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
127
132
|
callback: () => {
|
|
128
133
|
Notification.dismiss(notificationId);
|
|
129
134
|
config
|
|
130
|
-
|
|
135
|
+
?.update({})
|
|
131
136
|
.then(() => fetchNews())
|
|
132
137
|
.catch(reason => {
|
|
133
138
|
console.error(`Failed to get the news:\n${reason}`);
|
|
@@ -170,7 +175,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
170
175
|
// @ts-expect-error data has no index
|
|
171
176
|
const id = options.data!['id'] as string;
|
|
172
177
|
// Filter those notifications
|
|
173
|
-
const state = (config
|
|
178
|
+
const state = (config?.data[id] as INewsState) ?? {
|
|
174
179
|
seen: false,
|
|
175
180
|
dismissed: false
|
|
176
181
|
};
|
|
@@ -182,7 +187,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
182
187
|
callback: () => {
|
|
183
188
|
const update: { [k: string]: INewsState } = {};
|
|
184
189
|
update[id] = { seen: true, dismissed: true };
|
|
185
|
-
config
|
|
190
|
+
config?.update(update as any).catch(reason => {
|
|
186
191
|
console.error(
|
|
187
192
|
`Failed to update the announcements config:\n${reason}`
|
|
188
193
|
);
|
|
@@ -204,7 +209,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
204
209
|
options.autoClose = 5000;
|
|
205
210
|
const update: { [k: string]: INewsState } = {};
|
|
206
211
|
update[id] = { seen: true };
|
|
207
|
-
config
|
|
212
|
+
config?.update(update as any).catch(reason => {
|
|
208
213
|
console.error(
|
|
209
214
|
`Failed to update the announcements config:\n${reason}`
|
|
210
215
|
);
|
|
@@ -232,7 +237,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
232
237
|
const { link, message, type, options } = response.notification;
|
|
233
238
|
// @ts-expect-error data has no index
|
|
234
239
|
const id = options.data!['id'] as string;
|
|
235
|
-
const state = (config
|
|
240
|
+
const state = (config?.data[id] as INewsState) ?? {
|
|
236
241
|
seen: false,
|
|
237
242
|
dismissed: false
|
|
238
243
|
};
|
|
@@ -275,7 +280,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
275
280
|
options.autoClose = 5000;
|
|
276
281
|
const update: { [k: string]: INewsState } = {};
|
|
277
282
|
update[id] = { seen: true };
|
|
278
|
-
config
|
|
283
|
+
config?.update(update as any).catch(reason => {
|
|
279
284
|
console.error(
|
|
280
285
|
`Failed to update the announcements config:\n${reason}`
|
|
281
286
|
);
|
package/src/index.ts
CHANGED
|
@@ -35,10 +35,12 @@ import { PromiseDelegate } from '@lumino/coreutils';
|
|
|
35
35
|
import { DisposableDelegate } from '@lumino/disposable';
|
|
36
36
|
import { Debouncer, Throttler } from '@lumino/polling';
|
|
37
37
|
import { announcements } from './announcements';
|
|
38
|
+
import { licensesClient, licensesPlugin } from './licensesplugin';
|
|
38
39
|
import { notificationPlugin } from './notificationplugin';
|
|
39
40
|
import { Palette } from './palette';
|
|
40
|
-
import { settingsPlugin } from './settingsplugin';
|
|
41
|
+
import { settingsConnector, settingsPlugin } from './settingsplugin';
|
|
41
42
|
import { kernelStatus, runningSessionsStatus } from './statusbarplugin';
|
|
43
|
+
import { subshellsSettings } from './subshell-settings';
|
|
42
44
|
import { themesPaletteMenuPlugin, themesPlugin } from './themesplugins';
|
|
43
45
|
import { toolbarRegistry } from './toolbarregistryplugin';
|
|
44
46
|
import { workspacesPlugin } from './workspacesplugin';
|
|
@@ -732,13 +734,17 @@ const sanitizer: JupyterFrontEndPlugin<IRenderMime.ISanitizer> = {
|
|
|
732
734
|
const plugins: JupyterFrontEndPlugin<any>[] = [
|
|
733
735
|
announcements,
|
|
734
736
|
kernelStatus,
|
|
737
|
+
licensesClient,
|
|
738
|
+
licensesPlugin,
|
|
735
739
|
notificationPlugin,
|
|
736
740
|
palette,
|
|
737
741
|
paletteRestorer,
|
|
738
742
|
print,
|
|
739
743
|
resolver,
|
|
740
744
|
runningSessionsStatus,
|
|
745
|
+
subshellsSettings,
|
|
741
746
|
sanitizer,
|
|
747
|
+
settingsConnector,
|
|
742
748
|
settingsPlugin,
|
|
743
749
|
state,
|
|
744
750
|
splash,
|
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Jupyter Development Team.
|
|
3
|
+
* Distributed under the terms of the Modified BSD License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
ILayoutRestorer,
|
|
8
|
+
JupyterFrontEnd,
|
|
9
|
+
JupyterFrontEndPlugin
|
|
10
|
+
} from '@jupyterlab/application';
|
|
11
|
+
import {
|
|
12
|
+
ICommandPalette,
|
|
13
|
+
ILicensesClient,
|
|
14
|
+
Licenses,
|
|
15
|
+
MainAreaWidget,
|
|
16
|
+
WidgetTracker
|
|
17
|
+
} from '@jupyterlab/apputils';
|
|
18
|
+
import { PageConfig, URLExt } from '@jupyterlab/coreutils';
|
|
19
|
+
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
20
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
21
|
+
import {
|
|
22
|
+
CommandToolbarButton,
|
|
23
|
+
copyrightIcon,
|
|
24
|
+
refreshIcon,
|
|
25
|
+
Toolbar
|
|
26
|
+
} from '@jupyterlab/ui-components';
|
|
27
|
+
import { ReadonlyJSONObject } from '@lumino/coreutils';
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* The command IDs used by the licenses plugin.
|
|
31
|
+
*/
|
|
32
|
+
namespace CommandIDs {
|
|
33
|
+
export const licenses = 'apputils:licenses';
|
|
34
|
+
|
|
35
|
+
export const licenseReport = 'apputils:license-report';
|
|
36
|
+
|
|
37
|
+
export const refreshLicenses = 'apputils:licenses-refresh';
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* The license client plugin for fetching licenses.
|
|
42
|
+
*/
|
|
43
|
+
export const licensesClient: JupyterFrontEndPlugin<ILicensesClient> = {
|
|
44
|
+
id: '@jupyterlab/apputils-extension:licenses-client',
|
|
45
|
+
description: 'The licenses client plugin for fetching licenses.',
|
|
46
|
+
autoStart: true,
|
|
47
|
+
provides: ILicensesClient,
|
|
48
|
+
activate: (app: JupyterFrontEnd) => {
|
|
49
|
+
const licensesUrl =
|
|
50
|
+
URLExt.join(
|
|
51
|
+
PageConfig.getBaseUrl(),
|
|
52
|
+
PageConfig.getOption('licensesUrl')
|
|
53
|
+
) + '/';
|
|
54
|
+
const serverSettings = app.serviceManager.serverSettings;
|
|
55
|
+
return new Licenses.LicensesClient({ licensesUrl, serverSettings });
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* A plugin to add a licenses reporting tools.
|
|
61
|
+
*/
|
|
62
|
+
export const licensesPlugin: JupyterFrontEndPlugin<void> = {
|
|
63
|
+
id: '@jupyterlab/apputils-extension:licenses-plugin',
|
|
64
|
+
description: 'Adds licenses reporting tools.',
|
|
65
|
+
requires: [ILicensesClient, ITranslator],
|
|
66
|
+
optional: [ILayoutRestorer, IMainMenu, ICommandPalette],
|
|
67
|
+
autoStart: true,
|
|
68
|
+
activate: (
|
|
69
|
+
app: JupyterFrontEnd,
|
|
70
|
+
client: ILicensesClient,
|
|
71
|
+
translator: ITranslator,
|
|
72
|
+
restorer: ILayoutRestorer | null,
|
|
73
|
+
menu: IMainMenu | null,
|
|
74
|
+
palette: ICommandPalette | null
|
|
75
|
+
) => {
|
|
76
|
+
const { commands, shell } = app;
|
|
77
|
+
|
|
78
|
+
const trans = translator.load('jupyterlab');
|
|
79
|
+
|
|
80
|
+
const category = trans.__('Help');
|
|
81
|
+
const downloadAsText = trans.__('Download All Licenses as');
|
|
82
|
+
const refreshLicenses = trans.__('Refresh Licenses');
|
|
83
|
+
|
|
84
|
+
const licensesNamespace = 'help-licenses';
|
|
85
|
+
const licensesTracker = new WidgetTracker<MainAreaWidget<Licenses>>({
|
|
86
|
+
namespace: licensesNamespace
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
// translation strings
|
|
90
|
+
const licensesText = trans.__('Licenses');
|
|
91
|
+
|
|
92
|
+
// an incrementer for license widget ids
|
|
93
|
+
let counter = 0;
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* Create a MainAreaWidget for a license viewer
|
|
97
|
+
*/
|
|
98
|
+
function createLicenseWidget(args: Licenses.ICreateArgs) {
|
|
99
|
+
const licensesModel = new Licenses.Model({
|
|
100
|
+
...args,
|
|
101
|
+
client,
|
|
102
|
+
trans
|
|
103
|
+
});
|
|
104
|
+
const content = new Licenses({ model: licensesModel });
|
|
105
|
+
content.id = `${licensesNamespace}-${++counter}`;
|
|
106
|
+
content.title.label = licensesText;
|
|
107
|
+
content.title.icon = copyrightIcon;
|
|
108
|
+
const main = new MainAreaWidget({
|
|
109
|
+
content,
|
|
110
|
+
reveal: licensesModel.licensesReady
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
main.toolbar.addItem(
|
|
114
|
+
'refresh-licenses',
|
|
115
|
+
new CommandToolbarButton({
|
|
116
|
+
id: CommandIDs.refreshLicenses,
|
|
117
|
+
args: { noLabel: 1 },
|
|
118
|
+
commands
|
|
119
|
+
})
|
|
120
|
+
);
|
|
121
|
+
|
|
122
|
+
main.toolbar.addItem('spacer', Toolbar.createSpacerItem());
|
|
123
|
+
|
|
124
|
+
for (const format of Object.keys(Licenses.REPORT_FORMATS)) {
|
|
125
|
+
const button = new CommandToolbarButton({
|
|
126
|
+
id: CommandIDs.licenseReport,
|
|
127
|
+
args: { format, noLabel: 1 },
|
|
128
|
+
commands
|
|
129
|
+
});
|
|
130
|
+
main.toolbar.addItem(`download-${format}`, button);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
return main;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* Return a full license report format based on a format name
|
|
138
|
+
*/
|
|
139
|
+
function formatOrDefault(format: string): Licenses.IReportFormat {
|
|
140
|
+
return (
|
|
141
|
+
Licenses.REPORT_FORMATS[format] ||
|
|
142
|
+
Licenses.REPORT_FORMATS[Licenses.DEFAULT_FORMAT]
|
|
143
|
+
);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
// register license-related commands
|
|
147
|
+
commands.addCommand(CommandIDs.licenses, {
|
|
148
|
+
label: licensesText,
|
|
149
|
+
execute: (args: any) => {
|
|
150
|
+
// bail if no license API is available from the server
|
|
151
|
+
if (!PageConfig.getOption('licensesUrl')) {
|
|
152
|
+
console.warn('No license API available from the server');
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
const licenseMain = createLicenseWidget(args as Licenses.ICreateArgs);
|
|
156
|
+
shell.add(licenseMain, 'main', { type: 'Licenses' });
|
|
157
|
+
|
|
158
|
+
// add to tracker so it can be restored, and update when choices change
|
|
159
|
+
void licensesTracker.add(licenseMain);
|
|
160
|
+
licenseMain.content.model.trackerDataChanged.connect(() => {
|
|
161
|
+
void licensesTracker.save(licenseMain);
|
|
162
|
+
});
|
|
163
|
+
return licenseMain;
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
commands.addCommand(CommandIDs.refreshLicenses, {
|
|
168
|
+
label: args => (args.noLabel ? '' : refreshLicenses),
|
|
169
|
+
caption: refreshLicenses,
|
|
170
|
+
icon: refreshIcon,
|
|
171
|
+
execute: async () => {
|
|
172
|
+
return licensesTracker.currentWidget?.content.model.initLicenses();
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
commands.addCommand(CommandIDs.licenseReport, {
|
|
177
|
+
label: args => {
|
|
178
|
+
if (args.noLabel) {
|
|
179
|
+
return '';
|
|
180
|
+
}
|
|
181
|
+
const format = formatOrDefault(`${args.format}`);
|
|
182
|
+
return `${downloadAsText} ${format.title}`;
|
|
183
|
+
},
|
|
184
|
+
caption: args => {
|
|
185
|
+
const format = formatOrDefault(`${args.format}`);
|
|
186
|
+
return `${downloadAsText} ${format.title}`;
|
|
187
|
+
},
|
|
188
|
+
icon: args => {
|
|
189
|
+
const format = formatOrDefault(`${args.format}`);
|
|
190
|
+
return format.icon;
|
|
191
|
+
},
|
|
192
|
+
execute: async args => {
|
|
193
|
+
const format = formatOrDefault(`${args.format}`);
|
|
194
|
+
return await licensesTracker.currentWidget?.content.model.download({
|
|
195
|
+
format: format.id
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
// handle optional integrations
|
|
201
|
+
if (palette) {
|
|
202
|
+
palette.addItem({ command: CommandIDs.licenses, category });
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
if (menu) {
|
|
206
|
+
const helpMenu = menu.helpMenu;
|
|
207
|
+
helpMenu.addGroup([{ command: CommandIDs.licenses }], 0);
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
if (restorer) {
|
|
211
|
+
void restorer.restore(licensesTracker, {
|
|
212
|
+
command: CommandIDs.licenses,
|
|
213
|
+
name: widget => 'licenses',
|
|
214
|
+
args: widget => {
|
|
215
|
+
const { currentBundleName, currentPackageIndex, packageFilter } =
|
|
216
|
+
widget.content.model;
|
|
217
|
+
|
|
218
|
+
const args: Licenses.ICreateArgs = {
|
|
219
|
+
currentBundleName,
|
|
220
|
+
currentPackageIndex,
|
|
221
|
+
packageFilter
|
|
222
|
+
};
|
|
223
|
+
return args as ReadonlyJSONObject;
|
|
224
|
+
}
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
};
|
package/src/settingconnector.ts
CHANGED
|
@@ -4,7 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { PageConfig } from '@jupyterlab/coreutils';
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
ISettingConnector,
|
|
9
|
+
ISettingRegistry
|
|
10
|
+
} from '@jupyterlab/settingregistry';
|
|
8
11
|
import { DataConnector, IDataConnector } from '@jupyterlab/statedb';
|
|
9
12
|
import { Throttler } from '@lumino/polling';
|
|
10
13
|
|
|
@@ -14,10 +17,10 @@ import { Throttler } from '@lumino/polling';
|
|
|
14
17
|
* #### Notes
|
|
15
18
|
* This connector adds a query parameter to the base services setting manager.
|
|
16
19
|
*/
|
|
17
|
-
export class SettingConnector
|
|
18
|
-
ISettingRegistry.IPlugin,
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
export class SettingConnector
|
|
21
|
+
extends DataConnector<ISettingRegistry.IPlugin, string>
|
|
22
|
+
implements ISettingConnector
|
|
23
|
+
{
|
|
21
24
|
constructor(connector: IDataConnector<ISettingRegistry.IPlugin, string>) {
|
|
22
25
|
super();
|
|
23
26
|
this._connector = connector;
|
package/src/settingsplugin.ts
CHANGED
|
@@ -8,18 +8,43 @@ import {
|
|
|
8
8
|
JupyterFrontEndPlugin
|
|
9
9
|
} from '@jupyterlab/application';
|
|
10
10
|
import { PageConfig } from '@jupyterlab/coreutils';
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
ISettingConnector,
|
|
13
|
+
ISettingRegistry,
|
|
14
|
+
SettingRegistry
|
|
15
|
+
} from '@jupyterlab/settingregistry';
|
|
12
16
|
import { SettingConnector } from './settingconnector';
|
|
13
17
|
|
|
18
|
+
/**
|
|
19
|
+
* Provides the settings connector as a separate plugin to allow for alternative
|
|
20
|
+
* implementations that may want to fetch settings from a different source or
|
|
21
|
+
* endpoint.
|
|
22
|
+
*/
|
|
23
|
+
export const settingsConnector: JupyterFrontEndPlugin<ISettingConnector> = {
|
|
24
|
+
id: '@jupyterlab/apputils-extension:settings-connector',
|
|
25
|
+
description: 'Provides the settings connector.',
|
|
26
|
+
autoStart: true,
|
|
27
|
+
provides: ISettingConnector,
|
|
28
|
+
activate: (app: JupyterFrontEnd) =>
|
|
29
|
+
new SettingConnector(app.serviceManager.settings)
|
|
30
|
+
};
|
|
31
|
+
|
|
14
32
|
/**
|
|
15
33
|
* The default setting registry provider.
|
|
16
34
|
*/
|
|
17
35
|
export const settingsPlugin: JupyterFrontEndPlugin<ISettingRegistry> = {
|
|
18
36
|
id: '@jupyterlab/apputils-extension:settings',
|
|
37
|
+
autoStart: true,
|
|
38
|
+
provides: ISettingRegistry,
|
|
39
|
+
optional: [ISettingConnector],
|
|
19
40
|
description: 'Provides the setting registry.',
|
|
20
|
-
activate: async (
|
|
41
|
+
activate: async (
|
|
42
|
+
app: JupyterFrontEnd,
|
|
43
|
+
settingsConnector: ISettingConnector | null
|
|
44
|
+
): Promise<ISettingRegistry> => {
|
|
21
45
|
const { isDisabled } = PageConfig.Extension;
|
|
22
|
-
const connector =
|
|
46
|
+
const connector =
|
|
47
|
+
settingsConnector ?? new SettingConnector(app.serviceManager.settings);
|
|
23
48
|
|
|
24
49
|
// On startup, check if a plugin is available in the application.
|
|
25
50
|
// This helps avoid loading plugin files from other lab-based applications
|
|
@@ -61,7 +86,5 @@ export const settingsPlugin: JupyterFrontEndPlugin<ISettingRegistry> = {
|
|
|
61
86
|
});
|
|
62
87
|
|
|
63
88
|
return registry;
|
|
64
|
-
}
|
|
65
|
-
autoStart: true,
|
|
66
|
-
provides: ISettingRegistry
|
|
89
|
+
}
|
|
67
90
|
};
|
package/src/statusbarplugin.ts
CHANGED
|
@@ -199,10 +199,12 @@ export const runningSessionsStatus: JupyterFrontEndPlugin<void> = {
|
|
|
199
199
|
}
|
|
200
200
|
};
|
|
201
201
|
|
|
202
|
-
void settingRegistry
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
202
|
+
void settingRegistry
|
|
203
|
+
.load('@jupyterlab/apputils-extension:sessions-settings')
|
|
204
|
+
.then(settings => {
|
|
205
|
+
onSettingsUpdated(settings);
|
|
206
|
+
settings.changed.connect(onSettingsUpdated);
|
|
207
|
+
});
|
|
206
208
|
} else {
|
|
207
209
|
registerItem();
|
|
208
210
|
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/* -----------------------------------------------------------------------------
|
|
2
|
+
| Copyright (c) Jupyter Development Team.
|
|
3
|
+
| Distributed under the terms of the Modified BSD License.
|
|
4
|
+
|----------------------------------------------------------------------------*/
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
JupyterFrontEnd,
|
|
8
|
+
JupyterFrontEndPlugin
|
|
9
|
+
} from '@jupyterlab/application';
|
|
10
|
+
import { CommsOverSubshells } from '@jupyterlab/services';
|
|
11
|
+
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
12
|
+
|
|
13
|
+
/*
|
|
14
|
+
* A plugin loading kernel subshell settings.
|
|
15
|
+
*/
|
|
16
|
+
export const subshellsSettings: JupyterFrontEndPlugin<void> = {
|
|
17
|
+
id: '@jupyterlab/apputils-extension:subshell-settings',
|
|
18
|
+
description: 'Kernel subshell settings.',
|
|
19
|
+
autoStart: true,
|
|
20
|
+
requires: [],
|
|
21
|
+
optional: [ISettingRegistry],
|
|
22
|
+
activate: (
|
|
23
|
+
app: JupyterFrontEnd,
|
|
24
|
+
settingRegistry: ISettingRegistry | null
|
|
25
|
+
) => {
|
|
26
|
+
if (settingRegistry) {
|
|
27
|
+
app.started
|
|
28
|
+
.then(async () => {
|
|
29
|
+
const subshellsSettings = await settingRegistry.load(
|
|
30
|
+
'@jupyterlab/apputils-extension:sessions-settings'
|
|
31
|
+
);
|
|
32
|
+
|
|
33
|
+
const commsOverSubshells = subshellsSettings.get('commsOverSubshells')
|
|
34
|
+
.composite as CommsOverSubshells;
|
|
35
|
+
|
|
36
|
+
app.serviceManager.kernels.commsOverSubshells = commsOverSubshells;
|
|
37
|
+
|
|
38
|
+
subshellsSettings.changed.connect(() => {
|
|
39
|
+
const commsOverSubshells = subshellsSettings.get(
|
|
40
|
+
'commsOverSubshells'
|
|
41
|
+
).composite as CommsOverSubshells;
|
|
42
|
+
app.serviceManager.kernels.commsOverSubshells = commsOverSubshells;
|
|
43
|
+
});
|
|
44
|
+
})
|
|
45
|
+
.catch(reason => {
|
|
46
|
+
console.error('Fail to load settings for the subshells.');
|
|
47
|
+
console.error(reason);
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
};
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"title": "Running Terminals and Kernels",
|
|
3
|
-
"description": "Running Terminals and Kernels settings",
|
|
4
|
-
"additionalProperties": false,
|
|
5
|
-
"properties": {
|
|
6
|
-
"showStatusBarItem": {
|
|
7
|
-
"type": "boolean",
|
|
8
|
-
"title": "Show the status bar item",
|
|
9
|
-
"description": "Whether to show the running terminals and kernels item in the status bar",
|
|
10
|
-
"default": true
|
|
11
|
-
}
|
|
12
|
-
},
|
|
13
|
-
"type": "object"
|
|
14
|
-
}
|