@jupyterlab/apputils-extension 4.0.0-alpha.20 → 4.0.0-alpha.22

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 (8) hide show
  1. package/lib/index.js +10 -5
  2. package/lib/index.js.map +1 -1
  3. package/lib/statusbarplugin.js +8 -6
  4. package/lib/statusbarplugin.js.map +1 -1
  5. package/package.json +21 -20
  6. package/schema/sanitizer.json +6 -0
  7. package/src/index.ts +20 -7
  8. package/src/statusbarplugin.ts +10 -10
package/lib/index.js CHANGED
@@ -7,11 +7,11 @@
7
7
  * @module apputils-extension
8
8
  */
9
9
  import { ILayoutRestorer, IRouter, JupyterFrontEnd } from '@jupyterlab/application';
10
- import { Dialog, ICommandPalette, ISanitizer, ISessionContextDialogs, ISplashScreen, IWindowResolver, MainAreaWidget, Printing, Sanitizer, sessionContextDialogs, WindowResolver } from '@jupyterlab/apputils';
10
+ import { Dialog, ICommandPalette, ISanitizer, ISessionContextDialogs, ISplashScreen, IWindowResolver, MainAreaWidget, Printing, Sanitizer, SessionContextDialogs, WindowResolver } from '@jupyterlab/apputils';
11
11
  import { PageConfig, PathExt, URLExt } from '@jupyterlab/coreutils';
12
12
  import { ISettingRegistry } from '@jupyterlab/settingregistry';
13
13
  import { IStateDB, StateDB } from '@jupyterlab/statedb';
14
- import { ITranslator } from '@jupyterlab/translation';
14
+ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
15
15
  import { jupyterFaviconIcon } from '@jupyterlab/ui-components';
16
16
  import { PromiseDelegate } from '@lumino/coreutils';
17
17
  import { DisposableDelegate } from '@lumino/disposable';
@@ -273,7 +273,7 @@ async function updateTabTitle(workspace, db, name) {
273
273
  }
274
274
  else {
275
275
  // File name from current path
276
- let currentFile = PathExt.basename(window.location.href);
276
+ let currentFile = PathExt.basename(decodeURIComponent(window.location.href));
277
277
  // Truncate to first 12 characters of current document name + ... if length > 15
278
278
  currentFile =
279
279
  currentFile.length > 15
@@ -441,9 +441,12 @@ const state = {
441
441
  const sessionDialogs = {
442
442
  id: '@jupyterlab/apputils-extension:sessionDialogs',
443
443
  provides: ISessionContextDialogs,
444
+ optional: [ITranslator],
444
445
  autoStart: true,
445
- activate: () => {
446
- return sessionContextDialogs;
446
+ activate: async (app, translator) => {
447
+ return new SessionContextDialogs({
448
+ translator: translator !== null && translator !== void 0 ? translator : nullTranslator
449
+ });
447
450
  }
448
451
  };
449
452
  /**
@@ -509,9 +512,11 @@ const sanitizer = {
509
512
  const loadSetting = (setting) => {
510
513
  const allowedSchemes = setting.get('allowedSchemes')
511
514
  .composite;
515
+ const autolink = setting.get('autolink').composite;
512
516
  if (allowedSchemes) {
513
517
  sanitizer.setAllowedSchemes(allowedSchemes);
514
518
  }
519
+ sanitizer.setAutolink(autolink);
515
520
  };
516
521
  // Wait for the application to be restored and
517
522
  // for the settings for this plugin to be loaded
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":"AAAA;;;+EAG+E;AAC/E;;;GAGG;AAEH,OAAO,EACL,eAAe,EACf,OAAO,EACP,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,MAAM,EACN,eAAe,EACf,UAAU,EACV,sBAAsB,EACtB,aAAa,EACb,eAAe,EACf,cAAc,EACd,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,cAAc,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD;;GAEG;AACH,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAErC;;GAEG;AACH,IAAU,UAAU,CAcnB;AAdD,WAAU,UAAU;IACL,oBAAS,GAAG,uBAAuB,CAAC;IAEpC,gBAAK,GAAG,gBAAgB,CAAC;IAEzB,gBAAK,GAAG,gBAAgB,CAAC;IAEzB,sBAAW,GAAG,wBAAwB,CAAC;IAEvC,0BAAe,GAAG,4BAA4B,CAAC;IAE/C,wBAAa,GAAG,0BAA0B,CAAC;IAE3C,uBAAY,GAAG,wBAAwB,CAAC;AACvD,CAAC,EAdS,UAAU,KAAV,UAAU,QAcnB;AAED;;GAEG;AACH,MAAM,OAAO,GAA2C;IACtD,EAAE,EAAE,wCAAwC;IAC5C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,CACR,GAAoB,EACpB,UAAuB,EACvB,eAAwC,EACxC,EAAE;QACF,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,eAAe,GAAgC;IACnD,EAAE,EAAE,iDAAiD;IACrD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,eAAe,EAAE,WAAW,CAAC;IACxC,QAAQ,EAAE,CACR,GAAoB,EACpB,QAAyB,EACzB,UAAuB,EACvB,EAAE;QACF,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,QAAQ,GAA2C;IACvD,EAAE,EAAE,yCAAyC;IAC7C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3C,QAAQ,EAAE,KAAK,EACb,GAAoB,EACpB,KAA6B,EAC7B,MAAe,EACf,EAAE;QACF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,IAAI,GACR,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,iFAAiF;QACjF,+GAA+G;QAC/G,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACtE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAI;YACF,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAChC,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,wEAAwE;YACxE,sEAAsE;YACtE,kCAAkC;YAClC,OAAO,IAAI,OAAO,CAAkB,GAAG,EAAE;gBACvC,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC5B,MAAM,IAAI,GACR,gEAAgE,CAAC;gBACnE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC7D,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,MAAM,EAAE,CAAC,CAAC;gBACnE,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAEjE,+BAA+B;gBAC/B,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;gBAEpB,MAAM,GAAG,GAAG,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;gBACpE,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,GAAyC;IACnD,EAAE,EAAE,uCAAuC;IAC3C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,QAAQ,EAAE,aAAa;IACvB,QAAQ,EAAE,CAAC,GAAoB,EAAE,UAAuB,EAAE,EAAE;QAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;QAEnC,yCAAyC;QACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAE3C,MAAM,CAAC,EAAE,GAAG,mBAAmB,CAAC;QAChC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;QACrB,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC;QAEtB,kBAAkB,CAAC,OAAO,CAAC;YACzB,SAAS,EAAE,IAAI;YAEf,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;QAEH,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YAC3B,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE7C,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;YAC9B,MAAM,CAAC,EAAE,GAAG,SAAS,EAAE,EAAE,CAAC;YAC1B,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC;YAE5B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACzB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE3B,6CAA6C;QAC7C,IAAI,MAA8B,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,SAAS,CAC5B,KAAK,IAAI,EAAE;YACT,IAAI,MAAM,EAAE;gBACV,OAAO;aACR;YAED,MAAM,GAAG,IAAI,MAAM,CAAC;gBAClB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC;gBAC3B,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;uDAC8B,CAAC;gBAC9C,OAAO,EAAE;oBACP,MAAM,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;oBACxD,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;iBAC1D;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;gBACrC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,GAAG,IAAI,CAAC;gBACd,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBACjE,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;iBAC3C;gBAED,kDAAkD;gBAClD,qBAAqB,CAAC,GAAG,EAAE;oBACzB,gEAAgE;oBAChE,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,WAAW;aACZ;QACH,CAAC,EACD,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,UAAU,EAAE,CACpD,CAAC;QAEF,wBAAwB;QACxB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,OAAO;YACL,IAAI,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,EAAE;gBACrB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBACvC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACxC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;gBACxC,WAAW,EAAE,CAAC;gBACd,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAElC,gEAAgE;gBAChE,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;gBAE7C,OAAO,IAAI,kBAAkB,CAAC,KAAK,IAAI,EAAE;oBACvC,MAAM,QAAQ,CAAC;oBACf,IAAI,EAAE,WAAW,KAAK,CAAC,EAAE;wBACvB,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;wBAErB,IAAI,MAAM,EAAE;4BACV,MAAM,CAAC,OAAO,EAAE,CAAC;4BACjB,MAAM,GAAG,IAAI,CAAC;yBACf;wBAED,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;wBACpC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;4BACrB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;wBACpC,CAAC,EAAE,GAAG,CAAC,CAAC;qBACT;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAM,KAAK,GAAgC;IACzC,EAAE,EAAE,sCAAsC;IAC1C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,QAAQ,EAAE,CAAC,GAAoB,EAAE,UAAuB,EAAE,EAAE;QAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE;YACxC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;YACzB,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC;gBACvC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;YACpD,CAAC;YACD,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC;gBACvC,MAAM,aAAa,GAAG,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBACxD,IAAI,aAAa,EAAE;oBACjB,MAAM,aAAa,EAAE,CAAC;iBACvB;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAgC;IACvD,EAAE,EAAE,8CAA8C;IAClD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,QAAQ,EAAE,CAAC,eAAe,CAAC;IAC3B,QAAQ,EAAE,CACR,GAAoB,EACpB,UAAuB,EACvB,OAA+B,EAC/B,EAAE;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAW,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;QAC/C,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;YAC/C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC;YAC5C,SAAS,EAAE,GAAG,EAAE,CACd,GAAG,CAAC,KAAK,CAAC,aAAa,YAAY,cAAc;gBACjD,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU;gBACjD,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAC1D,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC;gBACvC,OAAO,MAAM,YAAY,cAAc;oBACrC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ;oBAChC,CAAC,CAAC,KAAK,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC;gBACvC,IAAI,MAAM,YAAY,cAAc,EAAE;oBACpC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;iBAChE;YACH,CAAC;SACF,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC;SACjE;IACH,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,KAAK,UAAU,cAAc,CAAC,SAAiB,EAAE,EAAY,EAAE,IAAY;;IACzE,MAAM,IAAI,GAAQ,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,OAAO,GAAW,MAAA,MAAA,IAAI,CAAC,sBAAsB,CAAC,0CAAE,IAAI,0CAAE,OAAO,CAAC;IAClE,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,QAAQ,CAAC,KAAK,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,YAAY,GACjE,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,CAAC,CAAC,CAAC,EACtD,EAAE,CAAC;KACJ;SAAM;QACL,8BAA8B;QAC9B,IAAI,WAAW,GAAW,OAAO,CAAC,QAAQ,CACxC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CACzC,CAAC;QACF,gFAAgF;QAChF,WAAW;YACT,WAAW,CAAC,MAAM,GAAG,EAAE;gBACrB,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;gBACtC,CAAC,CAAC,WAAW,CAAC;QAClB,kEAAkE;QAClE,MAAM,KAAK,GAAW,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAC5C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CACjE,CAAC,MAAM,CAAC;QAET,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YACjC,QAAQ,CAAC,KAAK,GAAG,GAAG,WAAW,KAAK,SAAS,GAC3C,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAC9B,OAAO,IAAI,EAAE,CAAC;SACf;aAAM;YACL,QAAQ,CAAC,KAAK,GAAG,GAAG,WAAW,GAC7B,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAC9B,MAAM,IAAI,EAAE,CAAC;SACd;KACF;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,KAAK,GAAoC;IAC7C,EAAE,EAAE,sCAAsC;IAC1C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC;IACxD,QAAQ,EAAE,CAAC,eAAe,CAAC;IAC3B,QAAQ,EAAE,CACR,GAAoB,EACpB,KAA6B,EAC7B,MAAe,EACf,UAAuB,EACvB,QAAgC,EAChC,EAAE;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE5C,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,OAAO,IAAI,OAAO,EAAE,CAAC;SACtB;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QAC/C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACtC,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;QAChC,MAAM,SAAS,GAAG,IAAI,eAAe,EAAyB,CAAC;QAC/D,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE;YACpC,MAAM,EAAE,GAAG,SAAS,CAAC;YACrB,MAAM,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;YAC/B,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,iEAAiE;QACjE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACjD,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QAE9D,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,EAAE;YACxC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,uCAAuC,CAAC;YACxD,OAAO,EAAE,KAAK,EAAE,IAAuB,EAAE,EAAE;gBACzC,uEAAuE;gBACvE,0CAA0C;gBAC1C,IAAI,QAAQ,EAAE;oBACZ,OAAO;iBACR;gBAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBACpC,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;gBACvD,MAAM,KAAK,GACT,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,QAAQ;oBAChC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE;wBACrB,CAAC,CAAC,UAAU,CAAC,gBAAgB;wBAC7B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;oBAClB,CAAC,CAAC,IAAI,CAAC;gBACX,MAAM,MAAM,GAAG,KAAK,IAAI,SAAS,IAAI,IAAI,CAAC;gBAE1C,IAAI,MAAM,KAAK,IAAI,EAAE;oBACnB,OAAO,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,SAAS,8BAA8B,CAAC,CAAC;oBACrE,OAAO;iBACR;gBAED,IAAI;oBACF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAE7C,8DAA8D;oBAC9D,4BAA4B;oBAC5B,IAAI,CAAC,QAAQ,EAAE;wBACb,QAAQ,GAAG,IAAI,CAAC;wBAChB,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;qBAChE;iBACF;gBAAC,OAAO,EAAE,OAAO,EAAE,EAAE;oBACpB,OAAO,CAAC,IAAI,CAAC,uBAAuB,SAAS,WAAW,EAAE,OAAO,CAAC,CAAC;oBAEnE,kEAAkE;oBAClE,yDAAyD;oBACzD,IAAI,CAAC,QAAQ,EAAE;wBACb,QAAQ,GAAG,IAAI,CAAC;wBAChB,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;qBACvD;iBACF;gBAED,IAAI,MAAM,KAAK,KAAK,EAAE;oBACpB,2DAA2D;oBAC3D,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;oBAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;oBAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAErD,wDAAwD;oBACxD,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;wBACpB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;oBAEH,OAAO,MAAM,CAAC;iBACf;gBAED,0DAA0D;gBAC1D,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;SACF,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE;YACpC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC;YAC1C,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAuB,EAAE,EAAE;gBACjD,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpB,IAAI,MAAM,EAAE;oBACV,MAAM,CAAC,MAAM,EAAE,CAAC;iBACjB;YACH,CAAC;SACF,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;YAC1C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,6CAA6C,CAAC;YAC9D,OAAO,EAAE,CAAC,IAAuB,EAAE,EAAE;gBACnC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBACpC,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;gBACvD,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,CAAC;gBAC/B,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,CAAC;gBAE/B,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO;iBACR;gBAED,gEAAgE;gBAChE,gCAAgC;gBAChC,IAAI,QAAQ,EAAE;oBACZ,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;iBACxB;gBAED,4BAA4B;gBAC5B,QAAQ,GAAG,IAAI,CAAC;gBAChB,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAErD,2DAA2D;gBAC3D,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBAC5D,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAErD,uDAAuD;gBACvD,IAAI,KAAK,EAAE;oBACT,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;wBACrB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACvC,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;wBACrB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC,CAAC,CAAC;iBACJ;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ,CAAC;YACd,OAAO,EAAE,UAAU,CAAC,SAAS;YAC7B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,CAAC,yBAAyB;SACnC,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ,CAAC;YACd,OAAO,EAAE,UAAU,CAAC,WAAW;YAC/B,OAAO,EAAE,wBAAwB;YACjC,IAAI,EAAE,EAAE,CAAC,yBAAyB;SACnC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,cAAc,GAAkD;IACpE,EAAE,EAAE,+CAA+C;IACnD,QAAQ,EAAE,sBAAsB;IAChC,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,KAAK,EAAE,GAAoB,EAAE,UAA8B,EAAE,EAAE;QACvE,OAAO,IAAI,qBAAqB,CAAC;YAC/B,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,cAAc;SACzC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,eAAe,GAAgC;IACnD,EAAE,EAAE,gDAAgD;IACpD,QAAQ,EAAE,CAAC,WAAW,CAAC;IACvB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,CAAC,GAAoB,EAAE,UAAuB,EAAE,EAAE;QAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;QACzB,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,EAAE;YAC9C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC;YAC5C,OAAO,EAAE,IAAI,CAAC,EAAE;gBACd,MAAM,QAAQ,GAAa,IAAI,CAAC,QAAoB,CAAC;gBACrD,MAAM,WAAW,GAAQ,IAAI,CAAC,IAAI,CAAC;gBACnC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACxB,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;oBACnD,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;wBACpC,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;qBACvC;iBACF;YACH,CAAC;SACF,CAAC,CAAC;QAEH,mEAAmE;QACnE,wCAAwC;QACxC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,aAAa,EAAE;YAC5C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,yCAAyC,CAAC;YAC1D,OAAO,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBACpB,MAAM,QAAQ,GAAa,IAAI,CAAC,QAAoB,CAAC;gBACrD,MAAM,WAAW,GAAQ,IAAI,CAAC,IAAI,CAAC;gBACnC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACpC,MAAM,iBAAiB,GAAY,IAAI,CAAC,iBAA4B,CAAC;gBACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACxB,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;oBACnD,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;wBACpC,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;qBACtC;yBAAM;wBACL,IAAI,iBAAiB,EAAE;4BACrB,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,kBAAkB,CAAC,CAAC;yBACzC;qBACF;iBACF;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,SAAS,GAAkD;IAC/D,EAAE,EAAE,0CAA0C;IAC9C,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,CACR,GAAoB,EACpB,QAA0B,EACF,EAAE;QAC1B,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,CAAC,OAAmC,EAAQ,EAAE;YAChE,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;iBACjD,SAA0B,CAAC;YAE9B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,SAAoB,CAAC;YAE9D,IAAI,cAAc,EAAE;gBAClB,SAAS,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;aAC7C;YAED,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC;QAEF,8CAA8C;QAC9C,gDAAgD;QAChD,QAAQ;aACL,IAAI,CAAC,0CAA0C,CAAC;aAChD,IAAI,CAAC,OAAO,CAAC,EAAE;YACd,oBAAoB;YACpB,WAAW,CAAC,OAAO,CAAC,CAAC;YAErB,sDAAsD;YACtD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEL,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,OAAO,GAAiC;IAC5C,aAAa;IACb,YAAY;IACZ,kBAAkB;IAClB,OAAO;IACP,eAAe;IACf,KAAK;IACL,QAAQ;IACR,qBAAqB;IACrB,SAAS;IACT,cAAc;IACd,KAAK;IACL,MAAM;IACN,cAAc;IACd,YAAY;IACZ,uBAAuB;IACvB,YAAY;IACZ,eAAe;IACf,eAAe;IACf,gBAAgB;CACjB,CAAC;AACF,eAAe,OAAO,CAAC"}
package/lib/statusbarplugin.js CHANGED
@@ -3,26 +3,28 @@
3
3
  | Distributed under the terms of the Modified BSD License.
4
4
  |----------------------------------------------------------------------------*/
5
5
  import { ILabShell } from '@jupyterlab/application';
6
- import { IKernelStatusModel, ISessionContextDialogs, KernelStatus, RunningSessions, sessionContextDialogs } from '@jupyterlab/apputils';
6
+ import { IKernelStatusModel, ISessionContextDialogs, KernelStatus, RunningSessions, SessionContextDialogs } from '@jupyterlab/apputils';
7
7
  import { IStatusBar } from '@jupyterlab/statusbar';
8
- import { ITranslator } from '@jupyterlab/translation';
8
+ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
9
9
  /**
10
10
  * A plugin that provides a kernel status item to the status bar.
11
11
  */
12
12
  export const kernelStatus = {
13
13
  id: '@jupyterlab/apputils-extension:kernel-status',
14
14
  autoStart: true,
15
- requires: [IStatusBar, ITranslator],
15
+ requires: [IStatusBar],
16
16
  provides: IKernelStatusModel,
17
- optional: [ISessionContextDialogs, ILabShell],
18
- activate: (app, statusBar, translator, sessionDialogs, labShell) => {
17
+ optional: [ISessionContextDialogs, ITranslator, ILabShell],
18
+ activate: (app, statusBar, sessionDialogs_, translator_, labShell) => {
19
+ const translator = translator_ !== null && translator_ !== void 0 ? translator_ : nullTranslator;
20
+ const sessionDialogs = sessionDialogs_ !== null && sessionDialogs_ !== void 0 ? sessionDialogs_ : new SessionContextDialogs({ translator });
19
21
  // When the status item is clicked, launch the kernel
20
22
  // selection dialog for the current session.
21
23
  const changeKernel = async () => {
22
24
  if (!item.model.sessionContext) {
23
25
  return;
24
26
  }
25
- await (sessionDialogs !== null && sessionDialogs !== void 0 ? sessionDialogs : sessionContextDialogs).selectKernel(item.model.sessionContext, translator);
27
+ await sessionDialogs.selectKernel(item.model.sessionContext);
26
28
  };
27
29
  // Create the status item.
28
30
  const item = new KernelStatus({ onClick: changeKernel }, translator);
package/lib/statusbarplugin.js.map CHANGED
@@ -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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/apputils-extension",
3
- "version": "4.0.0-alpha.20",
3
+ "version": "4.0.0-alpha.22",
4
4
  "description": "JupyterLab - Application Utilities Extension",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -38,24 +38,25 @@
38
38
  "watch": "tsc -b --watch"
39
39
  },
40
40
  "dependencies": {
41
- "@jupyterlab/application": "^4.0.0-alpha.20",
42
- "@jupyterlab/apputils": "^4.0.0-alpha.20",
43
- "@jupyterlab/coreutils": "^6.0.0-alpha.20",
44
- "@jupyterlab/docregistry": "^4.0.0-alpha.20",
45
- "@jupyterlab/filebrowser": "^4.0.0-alpha.20",
46
- "@jupyterlab/mainmenu": "^4.0.0-alpha.20",
47
- "@jupyterlab/services": "^7.0.0-alpha.20",
48
- "@jupyterlab/settingregistry": "^4.0.0-alpha.20",
49
- "@jupyterlab/statedb": "^4.0.0-alpha.20",
50
- "@jupyterlab/statusbar": "^4.0.0-alpha.20",
51
- "@jupyterlab/translation": "^4.0.0-alpha.20",
52
- "@jupyterlab/ui-components": "^4.0.0-alpha.35",
53
- "@lumino/algorithm": "^2.0.0-rc.0",
54
- "@lumino/commands": "^2.0.0-rc.0",
55
- "@lumino/coreutils": "^2.0.0-rc.0",
56
- "@lumino/disposable": "^2.0.0-rc.0",
57
- "@lumino/polling": "^2.0.0-rc.0",
58
- "@lumino/widgets": "^2.0.0-rc.0",
41
+ "@jupyterlab/application": "^4.0.0-alpha.22",
42
+ "@jupyterlab/apputils": "^4.0.0-alpha.22",
43
+ "@jupyterlab/coreutils": "^6.0.0-alpha.22",
44
+ "@jupyterlab/docregistry": "^4.0.0-alpha.22",
45
+ "@jupyterlab/filebrowser": "^4.0.0-alpha.22",
46
+ "@jupyterlab/mainmenu": "^4.0.0-alpha.22",
47
+ "@jupyterlab/rendermime-interfaces": "^3.8.0-alpha.22",
48
+ "@jupyterlab/services": "^7.0.0-alpha.22",
49
+ "@jupyterlab/settingregistry": "^4.0.0-alpha.22",
50
+ "@jupyterlab/statedb": "^4.0.0-alpha.22",
51
+ "@jupyterlab/statusbar": "^4.0.0-alpha.22",
52
+ "@jupyterlab/translation": "^4.0.0-alpha.22",
53
+ "@jupyterlab/ui-components": "^4.0.0-alpha.37",
54
+ "@lumino/algorithm": "^2.0.0",
55
+ "@lumino/commands": "^2.0.0",
56
+ "@lumino/coreutils": "^2.0.0",
57
+ "@lumino/disposable": "^2.0.0",
58
+ "@lumino/polling": "^2.0.0",
59
+ "@lumino/widgets": "^2.0.0",
59
60
  "react": "^18.2.0",
60
61
  "react-dom": "^18.2.0",
61
62
  "react-toastify": "^9.0.8"
@@ -63,7 +64,7 @@
63
64
  "devDependencies": {
64
65
  "rimraf": "~3.0.0",
65
66
  "typedoc": "~0.23.25",
66
- "typescript": "~5.0.0-beta"
67
+ "typescript": "~5.0.2"
67
68
  },
68
69
  "publishConfig": {
69
70
  "access": "public"
package/schema/sanitizer.json CHANGED
@@ -13,6 +13,12 @@
13
13
  "type": "string"
14
14
  },
15
15
  "default": ["http", "https", "ftp", "mailto", "tel"]
16
+ },
17
+ "autolink": {
18
+ "type": "boolean",
19
+ "title": "Autolink URL replacement",
20
+ "description": "Whether to replace URLs with links or not.",
21
+ "default": true
16
22
  }
17
23
  },
18
24
  "type": "object"
package/src/index.ts CHANGED
@@ -23,13 +23,13 @@ import {
23
23
  MainAreaWidget,
24
24
  Printing,
25
25
  Sanitizer,
26
- sessionContextDialogs,
26
+ SessionContextDialogs,
27
27
  WindowResolver
28
28
  } from '@jupyterlab/apputils';
29
29
  import { PageConfig, PathExt, URLExt } from '@jupyterlab/coreutils';
30
30
  import { ISettingRegistry } from '@jupyterlab/settingregistry';
31
31
  import { IStateDB, StateDB } from '@jupyterlab/statedb';
32
- import { ITranslator } from '@jupyterlab/translation';
32
+ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
33
33
  import { jupyterFaviconIcon } from '@jupyterlab/ui-components';
34
34
  import { PromiseDelegate } from '@lumino/coreutils';
35
35
  import { DisposableDelegate } from '@lumino/disposable';
@@ -42,6 +42,7 @@ import { kernelStatus, runningSessionsStatus } from './statusbarplugin';
42
42
  import { themesPaletteMenuPlugin, themesPlugin } from './themesplugins';
43
43
  import { toolbarRegistry } from './toolbarregistryplugin';
44
44
  import { workspacesPlugin } from './workspacesplugin';
45
+ import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
45
46
 
46
47
  /**
47
48
  * The interval in milliseconds before recover options appear during splash.
@@ -345,7 +346,9 @@ async function updateTabTitle(workspace: string, db: IStateDB, name: string) {
345
346
  }`;
346
347
  } else {
347
348
  // File name from current path
348
- let currentFile: string = PathExt.basename(window.location.href);
349
+ let currentFile: string = PathExt.basename(
350
+ decodeURIComponent(window.location.href)
351
+ );
349
352
  // Truncate to first 12 characters of current document name + ... if length > 15
350
353
  currentFile =
351
354
  currentFile.length > 15
@@ -552,9 +555,12 @@ const state: JupyterFrontEndPlugin<IStateDB> = {
552
555
  const sessionDialogs: JupyterFrontEndPlugin<ISessionContextDialogs> = {
553
556
  id: '@jupyterlab/apputils-extension:sessionDialogs',
554
557
  provides: ISessionContextDialogs,
558
+ optional: [ITranslator],
555
559
  autoStart: true,
556
- activate: () => {
557
- return sessionContextDialogs;
560
+ activate: async (app: JupyterFrontEnd, translator: ITranslator | null) => {
561
+ return new SessionContextDialogs({
562
+ translator: translator ?? nullTranslator
563
+ });
558
564
  }
559
565
  };
560
566
 
@@ -612,20 +618,27 @@ const utilityCommands: JupyterFrontEndPlugin<void> = {
612
618
  /**
613
619
  * The default HTML sanitizer.
614
620
  */
615
- const sanitizer: JupyterFrontEndPlugin<ISanitizer> = {
621
+ const sanitizer: JupyterFrontEndPlugin<IRenderMime.ISanitizer> = {
616
622
  id: '@jupyterlab/apputils-extension:sanitizer',
617
623
  autoStart: true,
618
624
  provides: ISanitizer,
619
625
  requires: [ISettingRegistry],
620
- activate: (app: JupyterFrontEnd, settings: ISettingRegistry): ISanitizer => {
626
+ activate: (
627
+ app: JupyterFrontEnd,
628
+ settings: ISettingRegistry
629
+ ): IRenderMime.ISanitizer => {
621
630
  const sanitizer = new Sanitizer();
622
631
  const loadSetting = (setting: ISettingRegistry.ISettings): void => {
623
632
  const allowedSchemes = setting.get('allowedSchemes')
624
633
  .composite as Array<string>;
625
634
 
635
+ const autolink = setting.get('autolink').composite as boolean;
636
+
626
637
  if (allowedSchemes) {
627
638
  sanitizer.setAllowedSchemes(allowedSchemes);
628
639
  }
640
+
641
+ sanitizer.setAutolink(autolink);
629
642
  };
630
643
 
631
644
  // Wait for the application to be restored and
package/src/statusbarplugin.ts CHANGED
@@ -14,10 +14,10 @@ import {
14
14
  ISessionContextDialogs,
15
15
  KernelStatus,
16
16
  RunningSessions,
17
- sessionContextDialogs
17
+ SessionContextDialogs
18
18
  } from '@jupyterlab/apputils';
19
19
  import { IStatusBar } from '@jupyterlab/statusbar';
20
- import { ITranslator } from '@jupyterlab/translation';
20
+ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
21
21
  import { Title, Widget } from '@lumino/widgets';
22
22
 
23
23
  /**
@@ -26,26 +26,26 @@ import { Title, Widget } from '@lumino/widgets';
26
26
  export const kernelStatus: JupyterFrontEndPlugin<IKernelStatusModel> = {
27
27
  id: '@jupyterlab/apputils-extension:kernel-status',
28
28
  autoStart: true,
29
- requires: [IStatusBar, ITranslator],
29
+ requires: [IStatusBar],
30
30
  provides: IKernelStatusModel,
31
- optional: [ISessionContextDialogs, ILabShell],
31
+ optional: [ISessionContextDialogs, ITranslator, ILabShell],
32
32
  activate: (
33
33
  app: JupyterFrontEnd,
34
34
  statusBar: IStatusBar,
35
- translator: ITranslator,
36
- sessionDialogs: ISessionContextDialogs | null,
35
+ sessionDialogs_: ISessionContextDialogs | null,
36
+ translator_: ITranslator | null,
37
37
  labShell: ILabShell | null
38
38
  ): IKernelStatusModel => {
39
+ const translator = translator_ ?? nullTranslator;
40
+ const sessionDialogs =
41
+ sessionDialogs_ ?? new SessionContextDialogs({ translator });
39
42
  // When the status item is clicked, launch the kernel
40
43
  // selection dialog for the current session.
41
44
  const changeKernel = async () => {
42
45
  if (!item.model.sessionContext) {
43
46
  return;
44
47
  }
45
- await (sessionDialogs ?? sessionContextDialogs).selectKernel(
46
- item.model.sessionContext,
47
- translator
48
- );
48
+ await sessionDialogs.selectKernel(item.model.sessionContext);
49
49
  };
50
50
 
51
51
  // Create the status item.