@jupyterlab/apputils-extension 4.5.0-beta.0 → 4.5.0-rc.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.
- package/lib/announcements.js +5 -4
- package/lib/announcements.js.map +1 -1
- package/lib/licensesplugin.js +2 -3
- package/lib/licensesplugin.js.map +1 -1
- package/lib/themesplugins.js +2 -2
- package/lib/themesplugins.js.map +1 -1
- package/package.json +14 -14
- package/src/announcements.ts +6 -4
- package/src/licensesplugin.ts +2 -7
- package/src/themesplugins.ts +5 -2
package/lib/announcements.js
CHANGED
|
@@ -16,11 +16,12 @@ const PRIVACY_URL = 'https://jupyterlab.readthedocs.io/en/latest/privacy_policie
|
|
|
16
16
|
*
|
|
17
17
|
* @param endpoint Endpoint to request
|
|
18
18
|
* @param init Initial values for the request
|
|
19
|
+
* @param serverSettings The server settings to use for the request
|
|
19
20
|
* @returns The response body interpreted as JSON
|
|
20
21
|
*/
|
|
21
|
-
async function requestAPI(endpoint, init = {}) {
|
|
22
|
+
async function requestAPI(endpoint, init = {}, serverSettings) {
|
|
22
23
|
// Make request to Jupyter API
|
|
23
|
-
const settings = ServerConnection.makeSettings();
|
|
24
|
+
const settings = serverSettings !== null && serverSettings !== void 0 ? serverSettings : ServerConnection.makeSettings();
|
|
24
25
|
const requestUrl = URLExt.join(settings.baseUrl, endpoint);
|
|
25
26
|
let response;
|
|
26
27
|
try {
|
|
@@ -122,7 +123,7 @@ export const announcements = {
|
|
|
122
123
|
var _a, _b, _c, _d;
|
|
123
124
|
if (((_a = settings === null || settings === void 0 ? void 0 : settings.get('fetchNews').composite) !== null && _a !== void 0 ? _a : 'false') === 'true') {
|
|
124
125
|
try {
|
|
125
|
-
const response = await requestAPI(NEWS_API_URL);
|
|
126
|
+
const response = await requestAPI(NEWS_API_URL, {}, app.serviceManager.serverSettings);
|
|
126
127
|
for (const { link, message, type, options } of response.news) {
|
|
127
128
|
// @ts-expect-error data has no index
|
|
128
129
|
const id = options.data['id'];
|
|
@@ -172,7 +173,7 @@ export const announcements = {
|
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
if ((_c = settings === null || settings === void 0 ? void 0 : settings.get('checkForUpdates').composite) !== null && _c !== void 0 ? _c : true) {
|
|
175
|
-
const response = await requestAPI(UPDATE_API_URL);
|
|
176
|
+
const response = await requestAPI(UPDATE_API_URL, {}, app.serviceManager.serverSettings);
|
|
176
177
|
if (response.notification) {
|
|
177
178
|
const { link, message, type, options } = response.notification;
|
|
178
179
|
// @ts-expect-error data has no index
|
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,EAEL,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,iBAAiB,GAAG,WAAW,CAAC;AACtC,MAAM,YAAY,GAAG,eAAe,CAAC;AACrC,MAAM,cAAc,GAAG,iBAAiB,CAAC;AACzC,MAAM,WAAW,GACf,mEAAmE,CAAC;AAEtE
|
|
1
|
+
{"version":3,"file":"announcements.js","sourceRoot":"","sources":["../src/announcements.ts"],"names":[],"mappings":"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"}
|
package/lib/licensesplugin.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { ILayoutRestorer } from '@jupyterlab/application';
|
|
6
6
|
import { ICommandPalette, ILicensesClient, Licenses, MainAreaWidget, WidgetTracker } from '@jupyterlab/apputils';
|
|
7
|
-
import { PageConfig
|
|
7
|
+
import { PageConfig } from '@jupyterlab/coreutils';
|
|
8
8
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
9
9
|
import { ITranslator } from '@jupyterlab/translation';
|
|
10
10
|
import { CommandToolbarButton, copyrightIcon, refreshIcon, Toolbar } from '@jupyterlab/ui-components';
|
|
@@ -26,9 +26,8 @@ export const licensesClient = {
|
|
|
26
26
|
autoStart: true,
|
|
27
27
|
provides: ILicensesClient,
|
|
28
28
|
activate: (app) => {
|
|
29
|
-
const licensesUrl = URLExt.join(PageConfig.getBaseUrl(), PageConfig.getOption('licensesUrl')) + '/';
|
|
30
29
|
const serverSettings = app.serviceManager.serverSettings;
|
|
31
|
-
return new Licenses.LicensesClient({
|
|
30
|
+
return new Licenses.LicensesClient({ serverSettings });
|
|
32
31
|
}
|
|
33
32
|
};
|
|
34
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"licensesplugin.js","sourceRoot":"","sources":["../src/licensesplugin.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,eAAe,EAGhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,eAAe,EACf,eAAe,EACf,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"licensesplugin.js","sourceRoot":"","sources":["../src/licensesplugin.ts"],"names":[],"mappings":"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"}
|
package/lib/themesplugins.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|----------------------------------------------------------------------------*/
|
|
5
5
|
import { JupyterFrontEnd } from '@jupyterlab/application';
|
|
6
6
|
import { ICommandPalette, ISplashScreen, IThemeManager, ThemeManager } from '@jupyterlab/apputils';
|
|
7
|
-
import {
|
|
7
|
+
import { URLExt } from '@jupyterlab/coreutils';
|
|
8
8
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
9
9
|
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
10
10
|
import { ITranslator } from '@jupyterlab/translation';
|
|
@@ -38,7 +38,7 @@ export const themesPlugin = {
|
|
|
38
38
|
const trans = translator.load('jupyterlab');
|
|
39
39
|
const host = app.shell;
|
|
40
40
|
const commands = app.commands;
|
|
41
|
-
const url = URLExt.join(
|
|
41
|
+
const url = URLExt.join(app.serviceManager.serverSettings.baseUrl, paths.urls.themes);
|
|
42
42
|
const key = themesPlugin.id;
|
|
43
43
|
const manager = new ThemeManager({
|
|
44
44
|
key,
|
package/lib/themesplugins.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/apputils-extension",
|
|
3
|
-
"version": "4.5.0-
|
|
3
|
+
"version": "4.5.0-rc.0",
|
|
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.5.0-
|
|
41
|
-
"@jupyterlab/apputils": "^4.6.0-
|
|
42
|
-
"@jupyterlab/coreutils": "^6.5.0-
|
|
43
|
-
"@jupyterlab/docregistry": "^4.5.0-
|
|
44
|
-
"@jupyterlab/mainmenu": "^4.5.0-
|
|
45
|
-
"@jupyterlab/rendermime-interfaces": "^3.13.0-
|
|
46
|
-
"@jupyterlab/services": "^7.5.0-
|
|
47
|
-
"@jupyterlab/settingregistry": "^4.5.0-
|
|
48
|
-
"@jupyterlab/statedb": "^4.5.0-
|
|
49
|
-
"@jupyterlab/statusbar": "^4.5.0-
|
|
50
|
-
"@jupyterlab/translation": "^4.5.0-
|
|
51
|
-
"@jupyterlab/ui-components": "^4.5.0-
|
|
52
|
-
"@jupyterlab/workspaces": "^4.5.0-
|
|
40
|
+
"@jupyterlab/application": "^4.5.0-rc.0",
|
|
41
|
+
"@jupyterlab/apputils": "^4.6.0-rc.0",
|
|
42
|
+
"@jupyterlab/coreutils": "^6.5.0-rc.0",
|
|
43
|
+
"@jupyterlab/docregistry": "^4.5.0-rc.0",
|
|
44
|
+
"@jupyterlab/mainmenu": "^4.5.0-rc.0",
|
|
45
|
+
"@jupyterlab/rendermime-interfaces": "^3.13.0-rc.0",
|
|
46
|
+
"@jupyterlab/services": "^7.5.0-rc.0",
|
|
47
|
+
"@jupyterlab/settingregistry": "^4.5.0-rc.0",
|
|
48
|
+
"@jupyterlab/statedb": "^4.5.0-rc.0",
|
|
49
|
+
"@jupyterlab/statusbar": "^4.5.0-rc.0",
|
|
50
|
+
"@jupyterlab/translation": "^4.5.0-rc.0",
|
|
51
|
+
"@jupyterlab/ui-components": "^4.5.0-rc.0",
|
|
52
|
+
"@jupyterlab/workspaces": "^4.5.0-rc.0",
|
|
53
53
|
"@lumino/algorithm": "^2.0.3",
|
|
54
54
|
"@lumino/commands": "^2.3.2",
|
|
55
55
|
"@lumino/coreutils": "^2.2.1",
|
package/src/announcements.ts
CHANGED
|
@@ -28,14 +28,16 @@ const PRIVACY_URL =
|
|
|
28
28
|
*
|
|
29
29
|
* @param endpoint Endpoint to request
|
|
30
30
|
* @param init Initial values for the request
|
|
31
|
+
* @param serverSettings The server settings to use for the request
|
|
31
32
|
* @returns The response body interpreted as JSON
|
|
32
33
|
*/
|
|
33
34
|
async function requestAPI<T>(
|
|
34
35
|
endpoint: string,
|
|
35
|
-
init: RequestInit = {}
|
|
36
|
+
init: RequestInit = {},
|
|
37
|
+
serverSettings?: ServerConnection.ISettings
|
|
36
38
|
): Promise<T> {
|
|
37
39
|
// Make request to Jupyter API
|
|
38
|
-
const settings = ServerConnection.makeSettings();
|
|
40
|
+
const settings = serverSettings ?? ServerConnection.makeSettings();
|
|
39
41
|
const requestUrl = URLExt.join(settings.baseUrl, endpoint);
|
|
40
42
|
|
|
41
43
|
let response: Response;
|
|
@@ -169,7 +171,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
169
171
|
news: (Notification.INotification & {
|
|
170
172
|
link?: [string, string];
|
|
171
173
|
})[];
|
|
172
|
-
}>(NEWS_API_URL);
|
|
174
|
+
}>(NEWS_API_URL, {}, app.serviceManager.serverSettings);
|
|
173
175
|
|
|
174
176
|
for (const { link, message, type, options } of response.news) {
|
|
175
177
|
// @ts-expect-error data has no index
|
|
@@ -231,7 +233,7 @@ export const announcements: JupyterFrontEndPlugin<void> = {
|
|
|
231
233
|
link?: [string, string];
|
|
232
234
|
})
|
|
233
235
|
| null;
|
|
234
|
-
}>(UPDATE_API_URL);
|
|
236
|
+
}>(UPDATE_API_URL, {}, app.serviceManager.serverSettings);
|
|
235
237
|
|
|
236
238
|
if (response.notification) {
|
|
237
239
|
const { link, message, type, options } = response.notification;
|
package/src/licensesplugin.ts
CHANGED
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
MainAreaWidget,
|
|
16
16
|
WidgetTracker
|
|
17
17
|
} from '@jupyterlab/apputils';
|
|
18
|
-
import { PageConfig
|
|
18
|
+
import { PageConfig } from '@jupyterlab/coreutils';
|
|
19
19
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
20
20
|
import { ITranslator } from '@jupyterlab/translation';
|
|
21
21
|
import {
|
|
@@ -46,13 +46,8 @@ export const licensesClient: JupyterFrontEndPlugin<ILicensesClient> = {
|
|
|
46
46
|
autoStart: true,
|
|
47
47
|
provides: ILicensesClient,
|
|
48
48
|
activate: (app: JupyterFrontEnd) => {
|
|
49
|
-
const licensesUrl =
|
|
50
|
-
URLExt.join(
|
|
51
|
-
PageConfig.getBaseUrl(),
|
|
52
|
-
PageConfig.getOption('licensesUrl')
|
|
53
|
-
) + '/';
|
|
54
49
|
const serverSettings = app.serviceManager.serverSettings;
|
|
55
|
-
return new Licenses.LicensesClient({
|
|
50
|
+
return new Licenses.LicensesClient({ serverSettings });
|
|
56
51
|
}
|
|
57
52
|
};
|
|
58
53
|
|
package/src/themesplugins.ts
CHANGED
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
IThemeManager,
|
|
14
14
|
ThemeManager
|
|
15
15
|
} from '@jupyterlab/apputils';
|
|
16
|
-
import {
|
|
16
|
+
import { URLExt } from '@jupyterlab/coreutils';
|
|
17
17
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
18
18
|
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
19
19
|
import { ITranslator } from '@jupyterlab/translation';
|
|
@@ -63,7 +63,10 @@ export const themesPlugin: JupyterFrontEndPlugin<IThemeManager> = {
|
|
|
63
63
|
const trans = translator.load('jupyterlab');
|
|
64
64
|
const host = app.shell;
|
|
65
65
|
const commands = app.commands;
|
|
66
|
-
const url = URLExt.join(
|
|
66
|
+
const url = URLExt.join(
|
|
67
|
+
app.serviceManager.serverSettings.baseUrl,
|
|
68
|
+
paths.urls.themes
|
|
69
|
+
);
|
|
67
70
|
const key = themesPlugin.id;
|
|
68
71
|
const manager = new ThemeManager({
|
|
69
72
|
key,
|