@jupyterlab/lsp-extension 4.6.0 → 4.7.0-alpha.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/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/renderer.js +27 -14
- package/lib/renderer.js.map +1 -1
- package/package.json +8 -8
- package/schema/plugin.json +2 -0
- package/src/index.ts +7 -5
- package/src/renderer.tsx +75 -41
package/lib/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
3
|
/**
|
|
5
4
|
* @packageDocumentation
|
|
6
5
|
* @module lsp-extension
|
|
@@ -107,7 +106,7 @@ function activateSettings(app, connectionManager, settingRegistry, translator, s
|
|
|
107
106
|
languageServerManager.sessions.forEach((_, key) => {
|
|
108
107
|
defaultValue[key] = { rank: 50, configuration: {} };
|
|
109
108
|
});
|
|
110
|
-
schema[LANGUAGE_SERVERS]
|
|
109
|
+
schema[LANGUAGE_SERVERS].default = defaultValue;
|
|
111
110
|
return plugin;
|
|
112
111
|
},
|
|
113
112
|
compose: plugin => {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAaH,OAAO,EACL,qBAAqB,EACrB,yBAAyB,EACzB,cAAc,EACd,yBAAyB,EACzB,6BAA6B,EAC7B,kBAAkB,EAClB,wBAAwB,EACxB,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjD,MAAM,MAAM,GAAyD;IACnE,QAAQ;IACR,EAAE,EAAE,kCAAkC;IACtC,WAAW,EAAE,kDAAkD;IAC/D,QAAQ,EAAE,CAAC,WAAW,EAAE,wBAAwB,CAAC;IACjD,QAAQ,EAAE,CAAC,uBAAuB,CAAC;IACnC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,aAAa,GAA8C;IAC/D,EAAE,EAAE,mCAAmC;IACvC,WAAW,EAAE,+CAA+C;IAC5D,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE;IACpC,QAAQ,EAAE,kBAAkB;IAC5B,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,cAAc,GAAgC;IAClD,QAAQ,EAAE,gBAAgB;IAC1B,EAAE,EAAE,oCAAoC;IACxC,WAAW,EAAE,wCAAwC;IACrD,QAAQ,EAAE,CAAC,6BAA6B,EAAE,gBAAgB,EAAE,WAAW,CAAC;IACxE,QAAQ,EAAE,CAAC,qBAAqB,CAAC;IACjC,SAAS,EAAE,IAAI;CAChB,CAAC;AAEF,MAAM,0BAA0B,GAC9B;IACE,EAAE,EAAE,kDAAkD;IACtD,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,sCAAsC;IACnD,QAAQ,EAAE,yBAAyB;IACnC,QAAQ,EAAE,GAAG,CAAC,EAAE;QACd,MAAM,gBAAgB,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAErD,MAAM,qBAAqB,GAAG,IAAI,wBAAwB,CAAC;YACzD,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,QAAQ,EAAE,CAAC,UAAU,CAAC;SACvB,CAAC,CAAC;QACH,gBAAgB,CAAC,QAAQ,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,gBAAgB,GAAG,IAAI,wBAAwB,CAAC;YACpD,QAAQ,EAAE,MAAM;YAChB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,KAAK;YACrB,QAAQ,EAAE,CAAC,KAAK,CAAC;SAClB,CAAC,CAAC;QACH,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAClD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;CACF,CAAC;AAEJ;;GAEG;AACH,SAAS,QAAQ,CACf,GAAoB,EACpB,UAAuB,EACvB,OAAiC,EACjC,sBAAsD;IAEtD,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CAAC;QACtD,QAAQ,EAAE,GAAG,CAAC,cAAc,CAAC,cAAc;KAC5C,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,IAAI,yBAAyB,CAAC;QACtD,qBAAqB;QACrB,cAAc,EAAE,OAAO;KACxB,CAAC,CAAC;IAEH,+DAA+D;IAC/D,IAAI,sBAAsB,EAAE,CAAC;QAC3B,wBAAwB,CACtB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,CACX,CAAC;IACJ,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CACvB,GAAoB,EACpB,iBAAgD,EAChD,eAAiC,EACjC,UAAuB,EACvB,uBAAqD;IAErD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;IAC3C,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,qBAAqB,CAAC;IAEtE,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE;QAC7D,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAkD,CAAC;QAC5E,MAAM,sBAAsB,GAAG,CAAC,OAAO,CAAC,eAAe;YACrD,EAAE,CAAkC,CAAC;QACvC,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,CAAC;YAClE,qBAAqB,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;YACzE,qBAAqB,CAAC,OAAO,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QACD,iBAAiB,CAAC,qBAAqB,GAAG,sBAAsB,CAAC;QACjE,gDAAgD;QAChD,iBAAiB,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;QAC9D,iBAAiB,CAAC,0BAA0B,CAAC,sBAAsB,CAAC,CAAC;QACrE,iBAAiB,CAAC,aAAa,CAC7B,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,QAAQ,CACjB,CAAC;IACJ,CAAC,CAAC;IAEF,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE;QACnC,KAAK,EAAE,MAAM,CAAC,EAAE;YACd,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAW,CAAC;YACzC,MAAM,YAAY,GAAsB,EAAE,CAAC;YAC3C,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;gBAChD,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC;YAChD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,MAAM,CAAC,EAAE;YAChB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,UAAW,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YAE9B,MAAM,qBAAqB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CACxD,SAAS,CACW,CAAC;YACvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAEnC,CAAC;YACd,IAAI,eAAe,GAAG,EAAE,GAAG,qBAAqB,EAAE,CAAC;YACnD,IAAI,kBAAkB,EAAE,CAAC;gBACvB,eAAe,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,kBAAkB,EAAE,CAAC;YAClE,CAAC;YACD,MAAM,SAAS,GAAsB;gBACnC,CAAC,gBAAgB,CAAC,EAAE,eAAe;aACpC,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAClD,IAAI,GAAG,KAAK,gBAAgB,EAAE,CAAC;oBAC7B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;wBAChB,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC7B,CAAC;yBAAM,CAAC;wBACN,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;oBACjC,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;YAClC,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC,CAAC;IACH,qBAAqB,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;QACvD,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,eAAe;SACZ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;SACf,IAAI,CAAC,QAAQ,CAAC,EAAE;QACf,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;YAC5B,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,qBAAqB,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,MAAa,EAAE,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEL,IAAI,uBAAuB,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAkB;YAC9B,aAAa,EAAE,CAAC,KAAiB,EAAE,EAAE;gBACnC,OAAO,mBAAmB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAChD,CAAC;SACF,CAAC;QACF,uBAAuB,CAAC,WAAW,CACjC,GAAG,MAAM,CAAC,EAAE,IAAI,gBAAgB,EAAE,EAClC,QAAQ,CACT,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,qBAAqB;IAChC,YACE,UAA0B,EAC1B,OAAsC;QAEtC,IAAI,CAAC,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;IACnD,CAAC;IACD;;OAEG;IACH,IAAI;QACF,YAAY;IACd,CAAC;IACD,IAAI;QACF,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,KAAK;;QACH,OAAO,GAAG,MAAA,IAAI,CAAC,iBAAiB,mCAAI,EAAE,KAAK,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,GAAG,CAAC;IAC3E,CAAC;IACD,QAAQ;QACN,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAsC,CAAC,CAAC;IACxE,CAAC;CAKF;AAED;;GAEG;AACH,SAAS,wBAAwB,CAC/B,QAAiC,EACjC,SAAwC,EACxC,UAAuB;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAI,MAAM,CAGvB,SAAS,CAAC,CAAC;IACb,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1D,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7D,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACvD,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACjE,IAAI,cAAc,GAA4B,EAAE,CAAC;IACjD,QAAQ,CAAC,GAAG,CAAC;QACX,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC;QAClC,qBAAqB,EAAE,KAAK;QAC5B,OAAO,EAAE,GAAG,EAAE;YACZ,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAEjE,cAAc,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CACnC,IAAI,CAAC,EAAE,CAAC,IAAI,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CACnD,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,cAAc,EAAE,GAAG,EAAE;YACnB,OAAO,KAAK,CAAC,CAAC;QAChB,CAAC;QACD,cAAc,EAAE,MAAM;QACtB,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC;QACpC,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC;QAC3C,2BAA2B,EAAE,KAAK,CAAC,EAAE,CACnC,8EAA8E,CAC/E;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,oBAAoB,GAAoD;IAC5E,EAAE,EAAE,mCAAmC;IACvC,WAAW,EAAE,6CAA6C;IAC1D,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,CAAC,GAA8B,EAA4B,EAAE;QACrE,OAAO,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,eAAe;IACb,MAAM;IACN,aAAa;IACb,cAAc;IACd,0BAA0B;IAC1B,oBAAoB;CACrB,CAAC"}
|
package/lib/renderer.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
3
|
import { closeIcon } from '@jupyterlab/ui-components';
|
|
5
4
|
import { UUID } from '@lumino/coreutils';
|
|
6
5
|
import { Debouncer } from '@lumino/polling';
|
|
@@ -14,6 +13,8 @@ const SERVER_SETTINGS = 'configuration';
|
|
|
14
13
|
function BuildSettingForm(props) {
|
|
15
14
|
const { [SERVER_SETTINGS]: serverSettingsSchema, ...otherSettingsSchema } = props.schema;
|
|
16
15
|
const { [SERVER_SETTINGS]: serverSettings, serverName, ...otherSettings } = props.settings;
|
|
16
|
+
const serverSettingsData = (serverSettings !== null && serverSettings !== void 0 ? serverSettings : {});
|
|
17
|
+
const serverSettingsSchemaData = (serverSettingsSchema !== null && serverSettingsSchema !== void 0 ? serverSettingsSchema : {});
|
|
17
18
|
const [currentServerName, setCurrentServerName] = useState(serverName);
|
|
18
19
|
/**
|
|
19
20
|
* Callback on server name field change event
|
|
@@ -27,7 +28,10 @@ function BuildSettingForm(props) {
|
|
|
27
28
|
setCurrentServerName(e.target.value);
|
|
28
29
|
};
|
|
29
30
|
const serverSettingWithType = {};
|
|
30
|
-
Object.entries(
|
|
31
|
+
Object.entries(serverSettingsData).forEach(([key, value]) => {
|
|
32
|
+
if (value === undefined) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
31
35
|
const newProps = {
|
|
32
36
|
property: key,
|
|
33
37
|
type: typeof value,
|
|
@@ -38,8 +42,9 @@ function BuildSettingForm(props) {
|
|
|
38
42
|
const [propertyMap, setPropertyMap] = useState(serverSettingWithType);
|
|
39
43
|
const defaultOtherSettings = {};
|
|
40
44
|
Object.entries(otherSettingsSchema).forEach(([key, value]) => {
|
|
45
|
+
var _a;
|
|
41
46
|
if (key in otherSettings) {
|
|
42
|
-
defaultOtherSettings[key] = otherSettings[key];
|
|
47
|
+
defaultOtherSettings[key] = ((_a = otherSettings[key]) !== null && _a !== void 0 ? _a : null);
|
|
43
48
|
}
|
|
44
49
|
else {
|
|
45
50
|
defaultOtherSettings[key] = value['default'];
|
|
@@ -52,7 +57,7 @@ function BuildSettingForm(props) {
|
|
|
52
57
|
const onOtherSettingsChange = (property, value, type) => {
|
|
53
58
|
let settingValue = value;
|
|
54
59
|
if (type === 'number') {
|
|
55
|
-
settingValue = parseFloat(value);
|
|
60
|
+
settingValue = parseFloat(String(value));
|
|
56
61
|
}
|
|
57
62
|
const newProps = {
|
|
58
63
|
...otherSettingsComposite,
|
|
@@ -140,25 +145,28 @@ function BuildSettingForm(props) {
|
|
|
140
145
|
React.createElement("ul", { className: "error-detail bs-callout bs-callout-info" },
|
|
141
146
|
React.createElement("li", { className: "text-danger" }, props.trans.__('is a required property'))))))),
|
|
142
147
|
Object.entries(otherSettingsSchema).map(([property, value], idx) => {
|
|
148
|
+
const schemaValue = value;
|
|
149
|
+
const inputType = schemaValue.type;
|
|
143
150
|
return (React.createElement("div", { key: `${idx}-${property}`, className: "form-group small-field" },
|
|
144
151
|
React.createElement("div", { className: "jp-FormGroup-content" },
|
|
145
|
-
React.createElement("h3", { className: "jp-FormGroup-fieldLabel jp-FormGroup-contentItem" },
|
|
152
|
+
React.createElement("h3", { className: "jp-FormGroup-fieldLabel jp-FormGroup-contentItem" }, schemaValue.title),
|
|
146
153
|
React.createElement("div", { className: "jp-inputFieldWrapper jp-FormGroup-contentItem" },
|
|
147
|
-
React.createElement("input", { className: "form-control", placeholder: "", type:
|
|
148
|
-
React.createElement("div", { className: "jp-FormGroup-description" },
|
|
154
|
+
React.createElement("input", { className: "form-control", placeholder: "", type: inputType, value: otherSettingsComposite[property], onChange: e => onOtherSettingsChange(property, e.target.value, inputType) })),
|
|
155
|
+
React.createElement("div", { className: "jp-FormGroup-description" }, schemaValue.description),
|
|
149
156
|
React.createElement("div", { className: "validationErrors" }))));
|
|
150
157
|
}),
|
|
151
158
|
React.createElement("fieldset", null,
|
|
152
|
-
React.createElement("legend", null,
|
|
159
|
+
React.createElement("legend", null, serverSettingsSchemaData['title']),
|
|
153
160
|
Object.entries(propertyMap).map(([hash, property]) => {
|
|
154
161
|
return (React.createElement(PropertyFrom, { key: hash, hash: hash, property: property, removeProperty: removeProperty, setProperty: debouncedSetProperty, trans: props.trans }));
|
|
155
162
|
}),
|
|
156
|
-
React.createElement("span", null,
|
|
163
|
+
React.createElement("span", null, serverSettingsSchemaData['description'])))))),
|
|
157
164
|
React.createElement("div", { className: "jp-ArrayOperations" },
|
|
158
165
|
React.createElement("button", { className: "jp-mod-styled jp-mod-reject", onClick: addProperty }, props.trans.__('Add property')),
|
|
159
166
|
React.createElement("button", { className: "jp-mod-styled jp-mod-warn jp-FormGroup-removeButton", onClick: () => props.removeSetting(props.serverHash) }, props.trans.__('Remove server')))));
|
|
160
167
|
}
|
|
161
168
|
function PropertyFrom(props) {
|
|
169
|
+
var _a;
|
|
162
170
|
const [state, setState] = useState({ ...props.property });
|
|
163
171
|
const TYPE_MAP = { string: 'text', number: 'number', boolean: 'checkbox' };
|
|
164
172
|
const removeItem = () => {
|
|
@@ -172,7 +180,7 @@ function PropertyFrom(props) {
|
|
|
172
180
|
const changeValue = (newValue, type) => {
|
|
173
181
|
let value = newValue;
|
|
174
182
|
if (type === 'number') {
|
|
175
|
-
value = parseFloat(newValue);
|
|
183
|
+
value = parseFloat(String(newValue));
|
|
176
184
|
}
|
|
177
185
|
const newState = { ...state, value };
|
|
178
186
|
props.setProperty.invoke(props.hash, newState).catch(console.error);
|
|
@@ -202,7 +210,11 @@ function PropertyFrom(props) {
|
|
|
202
210
|
React.createElement("option", { value: "string" }, props.trans.__('String')),
|
|
203
211
|
React.createElement("option", { value: "number" }, props.trans.__('Number')),
|
|
204
212
|
React.createElement("option", { value: "boolean" }, props.trans.__('Boolean'))),
|
|
205
|
-
React.createElement("input", { className: "form-control", type: TYPE_MAP[state.type], required: false, placeholder: props.trans.__('Property value'), value: state.type !== 'boolean'
|
|
213
|
+
React.createElement("input", { className: "form-control", type: TYPE_MAP[state.type], required: false, placeholder: props.trans.__('Property value'), value: state.type !== 'boolean'
|
|
214
|
+
? ((_a = state.value) !== null && _a !== void 0 ? _a : '')
|
|
215
|
+
: undefined, checked: state.type === 'boolean'
|
|
216
|
+
? state.value
|
|
217
|
+
: undefined, onChange: state.type !== 'boolean'
|
|
206
218
|
? e => changeValue(e.target.value, state.type)
|
|
207
219
|
: e => changeValue(e.target.checked, state.type) }),
|
|
208
220
|
React.createElement("button", { className: "jp-mod-minimal jp-Button", onClick: removeItem },
|
|
@@ -294,8 +306,9 @@ class SettingRenderer extends React.Component {
|
|
|
294
306
|
this._setting = props.formContext.settings;
|
|
295
307
|
this._trans = props.translator.load('jupyterlab');
|
|
296
308
|
const schema = this._setting.schema['definitions'];
|
|
297
|
-
|
|
298
|
-
this.
|
|
309
|
+
const languageServerSchema = schema['languageServer'];
|
|
310
|
+
this._defaultSetting = languageServerSchema['default'];
|
|
311
|
+
this._schema = languageServerSchema['properties'];
|
|
299
312
|
const title = props.schema.title;
|
|
300
313
|
const desc = props.schema.description;
|
|
301
314
|
const settings = props.formContext.settings;
|
|
@@ -303,7 +316,7 @@ class SettingRenderer extends React.Component {
|
|
|
303
316
|
let items = {};
|
|
304
317
|
if (compositeData) {
|
|
305
318
|
Object.entries(compositeData).forEach(([key, value]) => {
|
|
306
|
-
if (value) {
|
|
319
|
+
if (value && typeof value === 'object' && !Array.isArray(value)) {
|
|
307
320
|
const hash = UUID.uuid4();
|
|
308
321
|
items[hash] = { serverName: key, ...value };
|
|
309
322
|
}
|
package/lib/renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/lsp-extension",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.0-alpha.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -36,13 +36,13 @@
|
|
|
36
36
|
"watch": "tsc -b --watch"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@jupyterlab/application": "^4.
|
|
40
|
-
"@jupyterlab/apputils": "^4.
|
|
41
|
-
"@jupyterlab/lsp": "^4.
|
|
42
|
-
"@jupyterlab/running": "^4.
|
|
43
|
-
"@jupyterlab/settingregistry": "^4.
|
|
44
|
-
"@jupyterlab/translation": "^4.
|
|
45
|
-
"@jupyterlab/ui-components": "^4.
|
|
39
|
+
"@jupyterlab/application": "^4.7.0-alpha.0",
|
|
40
|
+
"@jupyterlab/apputils": "^4.8.0-alpha.0",
|
|
41
|
+
"@jupyterlab/lsp": "^4.7.0-alpha.0",
|
|
42
|
+
"@jupyterlab/running": "^4.7.0-alpha.0",
|
|
43
|
+
"@jupyterlab/settingregistry": "^4.7.0-alpha.0",
|
|
44
|
+
"@jupyterlab/translation": "^4.7.0-alpha.0",
|
|
45
|
+
"@jupyterlab/ui-components": "^4.7.0-alpha.0",
|
|
46
46
|
"@lumino/coreutils": "^2.2.2",
|
|
47
47
|
"@lumino/polling": "^2.1.5",
|
|
48
48
|
"@lumino/signaling": "^2.1.5",
|
package/schema/plugin.json
CHANGED
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"activate": {
|
|
40
40
|
"title": "Activate",
|
|
41
41
|
"description": "Enable or disable the language server services.",
|
|
42
|
+
"type": "string",
|
|
42
43
|
"oneOf": [
|
|
43
44
|
{ "const": "off", "title": "Off" },
|
|
44
45
|
{ "const": "on", "title": "On" }
|
|
@@ -58,6 +59,7 @@
|
|
|
58
59
|
},
|
|
59
60
|
"setTrace": {
|
|
60
61
|
"title": "Ask servers to send trace notifications",
|
|
62
|
+
"type": "string",
|
|
61
63
|
"oneOf": [
|
|
62
64
|
{ "const": "off", "title": "Off" },
|
|
63
65
|
{ "const": "messages", "title": "Messages" },
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
3
|
/**
|
|
5
4
|
* @packageDocumentation
|
|
6
5
|
* @module lsp-extension
|
|
@@ -161,12 +160,12 @@ function activateSettings(
|
|
|
161
160
|
settingRegistry.transform(plugin.id, {
|
|
162
161
|
fetch: plugin => {
|
|
163
162
|
const schema = plugin.schema.properties!;
|
|
164
|
-
const defaultValue:
|
|
163
|
+
const defaultValue: PartialJSONObject = {};
|
|
165
164
|
languageServerManager.sessions.forEach((_, key) => {
|
|
166
165
|
defaultValue[key] = { rank: 50, configuration: {} };
|
|
167
166
|
});
|
|
168
167
|
|
|
169
|
-
schema[LANGUAGE_SERVERS]
|
|
168
|
+
schema[LANGUAGE_SERVERS].default = defaultValue;
|
|
170
169
|
return plugin;
|
|
171
170
|
},
|
|
172
171
|
compose: plugin => {
|
|
@@ -183,7 +182,7 @@ function activateSettings(
|
|
|
183
182
|
if (serverUserSettings) {
|
|
184
183
|
serverComposite = { ...serverComposite, ...serverUserSettings };
|
|
185
184
|
}
|
|
186
|
-
const composite:
|
|
185
|
+
const composite: PartialJSONObject = {
|
|
187
186
|
[LANGUAGE_SERVERS]: serverComposite
|
|
188
187
|
};
|
|
189
188
|
Object.entries(properties).forEach(([key, value]) => {
|
|
@@ -275,7 +274,10 @@ function addRunningSessionManager(
|
|
|
275
274
|
translator: ITranslator
|
|
276
275
|
) {
|
|
277
276
|
const trans = translator.load('jupyterlab');
|
|
278
|
-
const signal = new Signal<
|
|
277
|
+
const signal = new Signal<
|
|
278
|
+
ILSPDocumentConnectionManager,
|
|
279
|
+
ILSPDocumentConnectionManager
|
|
280
|
+
>(lsManager);
|
|
279
281
|
lsManager.connected.connect(() => signal.emit(lsManager));
|
|
280
282
|
lsManager.disconnected.connect(() => signal.emit(lsManager));
|
|
281
283
|
lsManager.closed.connect(() => signal.emit(lsManager));
|
package/src/renderer.tsx
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
3
|
|
|
5
4
|
import type { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
6
5
|
import type { ITranslator, TranslationBundle } from '@jupyterlab/translation';
|
|
7
6
|
import { closeIcon } from '@jupyterlab/ui-components';
|
|
7
|
+
import type { PartialJSONObject, PartialJSONValue } from '@lumino/coreutils';
|
|
8
8
|
import { UUID } from '@lumino/coreutils';
|
|
9
9
|
import { Debouncer } from '@lumino/polling';
|
|
10
10
|
import React, { useRef, useState } from 'react';
|
|
11
11
|
import { DOMUtils } from '@jupyterlab/apputils';
|
|
12
12
|
|
|
13
13
|
import type { FieldProps } from '@rjsf/utils';
|
|
14
|
-
type
|
|
14
|
+
type TSchemaDict = { [key: string]: unknown };
|
|
15
|
+
type TDict = PartialJSONObject;
|
|
16
|
+
type TSettingItem = TDict & { serverName: string };
|
|
17
|
+
type TItemMap = Record<string, TSettingItem>;
|
|
15
18
|
|
|
16
19
|
interface ISettingPropertyMap {
|
|
17
20
|
[key: string]: ISettingProperty;
|
|
@@ -28,7 +31,7 @@ interface ISettingProperty {
|
|
|
28
31
|
/**
|
|
29
32
|
* Value of setting property
|
|
30
33
|
*/
|
|
31
|
-
value:
|
|
34
|
+
value: PartialJSONValue;
|
|
32
35
|
}
|
|
33
36
|
const SETTING_NAME = 'languageServers';
|
|
34
37
|
const SERVER_SETTINGS = 'configuration';
|
|
@@ -47,7 +50,7 @@ interface ISettingFormProps {
|
|
|
47
50
|
/**
|
|
48
51
|
* Callback to update the setting item.
|
|
49
52
|
*/
|
|
50
|
-
updateSetting: Debouncer<void,
|
|
53
|
+
updateSetting: Debouncer<void, unknown, [hash: string, newSetting: TDict]>;
|
|
51
54
|
|
|
52
55
|
/**
|
|
53
56
|
* Hash to differentiate the setting fields.
|
|
@@ -57,12 +60,12 @@ interface ISettingFormProps {
|
|
|
57
60
|
/**
|
|
58
61
|
* Setting value.
|
|
59
62
|
*/
|
|
60
|
-
settings:
|
|
63
|
+
settings: TSettingItem;
|
|
61
64
|
|
|
62
65
|
/**
|
|
63
66
|
* Setting schema.
|
|
64
67
|
*/
|
|
65
|
-
schema:
|
|
68
|
+
schema: TSchemaDict;
|
|
66
69
|
}
|
|
67
70
|
|
|
68
71
|
/**
|
|
@@ -76,6 +79,8 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
76
79
|
serverName,
|
|
77
80
|
...otherSettings
|
|
78
81
|
} = props.settings;
|
|
82
|
+
const serverSettingsData = (serverSettings ?? {}) as TDict;
|
|
83
|
+
const serverSettingsSchemaData = (serverSettingsSchema ?? {}) as TSchemaDict;
|
|
79
84
|
|
|
80
85
|
const [currentServerName, setCurrentServerName] =
|
|
81
86
|
useState<string>(serverName);
|
|
@@ -93,7 +98,10 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
93
98
|
};
|
|
94
99
|
|
|
95
100
|
const serverSettingWithType: ISettingPropertyMap = {};
|
|
96
|
-
Object.entries(
|
|
101
|
+
Object.entries(serverSettingsData).forEach(([key, value]) => {
|
|
102
|
+
if (value === undefined) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
97
105
|
const newProps: ISettingProperty = {
|
|
98
106
|
property: key,
|
|
99
107
|
type: typeof value as 'string' | 'number' | 'boolean',
|
|
@@ -110,9 +118,12 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
110
118
|
|
|
111
119
|
Object.entries(otherSettingsSchema).forEach(([key, value]) => {
|
|
112
120
|
if (key in otherSettings) {
|
|
113
|
-
defaultOtherSettings[key] = otherSettings[key]
|
|
121
|
+
defaultOtherSettings[key] = (otherSettings[key] ??
|
|
122
|
+
null) as PartialJSONValue;
|
|
114
123
|
} else {
|
|
115
|
-
defaultOtherSettings[key] = value[
|
|
124
|
+
defaultOtherSettings[key] = (value as TSchemaDict)[
|
|
125
|
+
'default'
|
|
126
|
+
] as PartialJSONValue;
|
|
116
127
|
}
|
|
117
128
|
});
|
|
118
129
|
|
|
@@ -124,14 +135,14 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
124
135
|
*/
|
|
125
136
|
const onOtherSettingsChange = (
|
|
126
137
|
property: string,
|
|
127
|
-
value:
|
|
138
|
+
value: unknown,
|
|
128
139
|
type: string
|
|
129
140
|
) => {
|
|
130
|
-
let settingValue = value;
|
|
141
|
+
let settingValue = value as PartialJSONValue;
|
|
131
142
|
if (type === 'number') {
|
|
132
|
-
settingValue = parseFloat(value);
|
|
143
|
+
settingValue = parseFloat(String(value));
|
|
133
144
|
}
|
|
134
|
-
const newProps = {
|
|
145
|
+
const newProps: TDict = {
|
|
135
146
|
...otherSettingsComposite,
|
|
136
147
|
[property]: settingValue
|
|
137
148
|
};
|
|
@@ -202,7 +213,7 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
202
213
|
};
|
|
203
214
|
const debouncedSetProperty = new Debouncer<
|
|
204
215
|
void,
|
|
205
|
-
|
|
216
|
+
unknown,
|
|
206
217
|
[hash: string, property: ISettingProperty]
|
|
207
218
|
>(setProperty);
|
|
208
219
|
const textInputId = useRef<string>(
|
|
@@ -248,6 +259,8 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
248
259
|
</div>
|
|
249
260
|
{Object.entries(otherSettingsSchema).map(
|
|
250
261
|
([property, value], idx) => {
|
|
262
|
+
const schemaValue = value as TSchemaDict;
|
|
263
|
+
const inputType = schemaValue.type as string;
|
|
251
264
|
return (
|
|
252
265
|
<div
|
|
253
266
|
key={`${idx}-${property}`}
|
|
@@ -255,25 +268,31 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
255
268
|
>
|
|
256
269
|
<div className="jp-FormGroup-content">
|
|
257
270
|
<h3 className="jp-FormGroup-fieldLabel jp-FormGroup-contentItem">
|
|
258
|
-
{
|
|
271
|
+
{schemaValue.title as string | undefined}
|
|
259
272
|
</h3>
|
|
260
273
|
<div className="jp-inputFieldWrapper jp-FormGroup-contentItem">
|
|
261
274
|
<input
|
|
262
275
|
className="form-control"
|
|
263
276
|
placeholder=""
|
|
264
|
-
type={
|
|
265
|
-
value={
|
|
277
|
+
type={inputType}
|
|
278
|
+
value={
|
|
279
|
+
otherSettingsComposite[property] as
|
|
280
|
+
| string
|
|
281
|
+
| number
|
|
282
|
+
| readonly string[]
|
|
283
|
+
| undefined
|
|
284
|
+
}
|
|
266
285
|
onChange={e =>
|
|
267
286
|
onOtherSettingsChange(
|
|
268
287
|
property,
|
|
269
288
|
e.target.value,
|
|
270
|
-
|
|
289
|
+
inputType
|
|
271
290
|
)
|
|
272
291
|
}
|
|
273
292
|
/>
|
|
274
293
|
</div>
|
|
275
294
|
<div className="jp-FormGroup-description">
|
|
276
|
-
{
|
|
295
|
+
{schemaValue.description as string | undefined}
|
|
277
296
|
</div>
|
|
278
297
|
<div className="validationErrors"></div>
|
|
279
298
|
</div>
|
|
@@ -282,7 +301,7 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
282
301
|
}
|
|
283
302
|
)}
|
|
284
303
|
<fieldset>
|
|
285
|
-
<legend>{
|
|
304
|
+
<legend>{serverSettingsSchemaData['title'] as string}</legend>
|
|
286
305
|
{Object.entries(propertyMap).map(([hash, property]) => {
|
|
287
306
|
return (
|
|
288
307
|
<PropertyFrom
|
|
@@ -295,7 +314,7 @@ function BuildSettingForm(props: ISettingFormProps): JSX.Element {
|
|
|
295
314
|
/>
|
|
296
315
|
);
|
|
297
316
|
})}
|
|
298
|
-
<span>{
|
|
317
|
+
<span>{serverSettingsSchemaData['description'] as string}</span>
|
|
299
318
|
</fieldset>
|
|
300
319
|
</fieldset>
|
|
301
320
|
</div>
|
|
@@ -320,13 +339,17 @@ function PropertyFrom(props: {
|
|
|
320
339
|
hash: string;
|
|
321
340
|
property: ISettingProperty;
|
|
322
341
|
removeProperty: (hash: string) => void;
|
|
323
|
-
setProperty: Debouncer<
|
|
342
|
+
setProperty: Debouncer<
|
|
343
|
+
void,
|
|
344
|
+
unknown,
|
|
345
|
+
[hash: string, property: ISettingProperty]
|
|
346
|
+
>;
|
|
324
347
|
trans: TranslationBundle;
|
|
325
348
|
}): JSX.Element {
|
|
326
349
|
const [state, setState] = useState<{
|
|
327
350
|
property: string;
|
|
328
351
|
type: 'boolean' | 'string' | 'number';
|
|
329
|
-
value:
|
|
352
|
+
value: PartialJSONValue;
|
|
330
353
|
}>({ ...props.property });
|
|
331
354
|
const TYPE_MAP = { string: 'text', number: 'number', boolean: 'checkbox' };
|
|
332
355
|
|
|
@@ -341,12 +364,12 @@ function PropertyFrom(props: {
|
|
|
341
364
|
};
|
|
342
365
|
|
|
343
366
|
const changeValue = (
|
|
344
|
-
newValue:
|
|
367
|
+
newValue: unknown,
|
|
345
368
|
type: 'string' | 'boolean' | 'number'
|
|
346
369
|
) => {
|
|
347
|
-
let value = newValue;
|
|
370
|
+
let value: PartialJSONValue = newValue as PartialJSONValue;
|
|
348
371
|
if (type === 'number') {
|
|
349
|
-
value = parseFloat(newValue);
|
|
372
|
+
value = parseFloat(String(newValue));
|
|
350
373
|
}
|
|
351
374
|
const newState = { ...state, value };
|
|
352
375
|
props.setProperty.invoke(props.hash, newState).catch(console.error);
|
|
@@ -396,8 +419,16 @@ function PropertyFrom(props: {
|
|
|
396
419
|
type={TYPE_MAP[state.type]}
|
|
397
420
|
required={false}
|
|
398
421
|
placeholder={props.trans.__('Property value')}
|
|
399
|
-
value={
|
|
400
|
-
|
|
422
|
+
value={
|
|
423
|
+
state.type !== 'boolean'
|
|
424
|
+
? ((state.value ?? '') as string | number)
|
|
425
|
+
: undefined
|
|
426
|
+
}
|
|
427
|
+
checked={
|
|
428
|
+
state.type === 'boolean'
|
|
429
|
+
? (state.value as boolean | undefined)
|
|
430
|
+
: undefined
|
|
431
|
+
}
|
|
401
432
|
onChange={
|
|
402
433
|
state.type !== 'boolean'
|
|
403
434
|
? e => changeValue(e.target.value, state.type)
|
|
@@ -427,7 +458,7 @@ interface IState {
|
|
|
427
458
|
/**
|
|
428
459
|
* Items of setting section
|
|
429
460
|
*/
|
|
430
|
-
items:
|
|
461
|
+
items: TItemMap;
|
|
431
462
|
}
|
|
432
463
|
interface IProps extends FieldProps {
|
|
433
464
|
translator: ITranslator;
|
|
@@ -442,21 +473,24 @@ class SettingRenderer extends React.Component<IProps, IState> {
|
|
|
442
473
|
this._setting = props.formContext.settings;
|
|
443
474
|
this._trans = props.translator.load('jupyterlab');
|
|
444
475
|
|
|
445
|
-
const schema = this._setting.schema['definitions'] as
|
|
476
|
+
const schema = this._setting.schema['definitions'] as TSchemaDict;
|
|
477
|
+
const languageServerSchema = schema['languageServer'] as TSchemaDict;
|
|
446
478
|
|
|
447
|
-
this._defaultSetting =
|
|
448
|
-
this._schema =
|
|
479
|
+
this._defaultSetting = languageServerSchema['default'] as TDict;
|
|
480
|
+
this._schema = languageServerSchema['properties'] as TSchemaDict;
|
|
449
481
|
const title = props.schema.title;
|
|
450
482
|
const desc = props.schema.description;
|
|
451
483
|
const settings: ISettingRegistry.ISettings = props.formContext.settings;
|
|
452
|
-
const compositeData = settings.get(SETTING_NAME).composite as
|
|
484
|
+
const compositeData = settings.get(SETTING_NAME).composite as
|
|
485
|
+
| TDict
|
|
486
|
+
| undefined;
|
|
453
487
|
|
|
454
|
-
let items:
|
|
488
|
+
let items: TItemMap = {};
|
|
455
489
|
if (compositeData) {
|
|
456
490
|
Object.entries(compositeData).forEach(([key, value]) => {
|
|
457
|
-
if (value) {
|
|
491
|
+
if (value && typeof value === 'object' && !Array.isArray(value)) {
|
|
458
492
|
const hash = UUID.uuid4();
|
|
459
|
-
items[hash] = { serverName: key, ...value };
|
|
493
|
+
items[hash] = { serverName: key, ...(value as TDict) };
|
|
460
494
|
}
|
|
461
495
|
});
|
|
462
496
|
}
|
|
@@ -471,7 +505,7 @@ class SettingRenderer extends React.Component<IProps, IState> {
|
|
|
471
505
|
*/
|
|
472
506
|
removeSetting = (hash: string): void => {
|
|
473
507
|
if (hash in this.state.items) {
|
|
474
|
-
const items:
|
|
508
|
+
const items: TItemMap = {};
|
|
475
509
|
for (const key in this.state.items) {
|
|
476
510
|
if (key !== hash) {
|
|
477
511
|
items[key] = this.state.items[key];
|
|
@@ -496,7 +530,7 @@ class SettingRenderer extends React.Component<IProps, IState> {
|
|
|
496
530
|
*/
|
|
497
531
|
updateSetting = (hash: string, newSetting: TDict): void => {
|
|
498
532
|
if (hash in this.state.items) {
|
|
499
|
-
const items:
|
|
533
|
+
const items: TItemMap = {};
|
|
500
534
|
for (const key in this.state.items) {
|
|
501
535
|
if (key === hash) {
|
|
502
536
|
items[key] = { ...this.state.items[key], ...newSetting };
|
|
@@ -547,7 +581,7 @@ class SettingRenderer extends React.Component<IProps, IState> {
|
|
|
547
581
|
* Save the value of setting items to the setting registry.
|
|
548
582
|
*/
|
|
549
583
|
saveServerSetting = () => {
|
|
550
|
-
const settings:
|
|
584
|
+
const settings: PartialJSONObject = {};
|
|
551
585
|
Object.values(this.state.items).forEach(item => {
|
|
552
586
|
const { serverName, ...setting } = item;
|
|
553
587
|
settings[serverName] = setting;
|
|
@@ -607,11 +641,11 @@ class SettingRenderer extends React.Component<IProps, IState> {
|
|
|
607
641
|
/**
|
|
608
642
|
* The setting schema.
|
|
609
643
|
*/
|
|
610
|
-
private _schema:
|
|
644
|
+
private _schema: TSchemaDict;
|
|
611
645
|
|
|
612
646
|
private _debouncedUpdateSetting: Debouncer<
|
|
613
647
|
void,
|
|
614
|
-
|
|
648
|
+
unknown,
|
|
615
649
|
[hash: string, newSetting: TDict]
|
|
616
650
|
>;
|
|
617
651
|
}
|