@grafana/plugin-ui 0.9.2 → 0.9.4
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/dist/components/ConfigEditor/Auth/auth-method/AuthMethodSettings.js +7 -6
- package/dist/components/ConfigEditor/Auth/auth-method/AuthMethodSettings.js.map +1 -1
- package/dist/components/ConfigEditor/Auth/utils.js +4 -3
- package/dist/components/ConfigEditor/Auth/utils.js.map +1 -1
- package/dist/components/ConfigEditor/Connection/ConnectionSettings.js +2 -1
- package/dist/components/ConfigEditor/Connection/ConnectionSettings.js.map +1 -1
- package/dist/components/ConfigEditor/index.js +3 -1
- package/dist/components/ConfigEditor/index.js.map +1 -1
- package/dist/src/components/ConfigEditor/index.d.ts +2 -0
- package/dist/src/components/ConfigEditor/types.d.ts +13 -1
- package/package.json +1 -1
|
@@ -84,10 +84,10 @@ const AuthMethodSettings = ({ selectedMethod, mostCommonMethod, visibleMethods:
|
|
|
84
84
|
else if (selected.startsWith('custom-')) {
|
|
85
85
|
AuthFieldsComponent = (_b = (_a = customMethods === null || customMethods === void 0 ? void 0 : customMethods.find((m) => m.id === selected)) === null || _a === void 0 ? void 0 : _a.component) !== null && _b !== void 0 ? _b : null;
|
|
86
86
|
}
|
|
87
|
-
const title = hasSelect ? 'Authentication methods' : (
|
|
87
|
+
const title = hasSelect ? 'Authentication methods' : (_c = preparedOptions[0].label) !== null && _c !== void 0 ? _c : '';
|
|
88
88
|
const description = hasSelect
|
|
89
89
|
? 'Choose an authentication method to access the data source'
|
|
90
|
-
: (
|
|
90
|
+
: (_d = preparedOptions[0].description) !== null && _d !== void 0 ? _d : '';
|
|
91
91
|
const styles = {
|
|
92
92
|
authMethods: (0, css_1.css)(Object.assign({ marginTop: spacing(2.5) }, (hasSelect && {
|
|
93
93
|
padding: spacing(2),
|
|
@@ -99,10 +99,11 @@ const AuthMethodSettings = ({ selectedMethod, mostCommonMethod, visibleMethods:
|
|
|
99
99
|
};
|
|
100
100
|
return (react_1.default.createElement(ConfigSection_1.ConfigSubSection, { title: title, description: description },
|
|
101
101
|
react_1.default.createElement("div", { className: styles.authMethods },
|
|
102
|
-
hasSelect && (react_1.default.createElement(ui_1.
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
102
|
+
hasSelect && (react_1.default.createElement(ui_1.Field, { label: "Authentication method" },
|
|
103
|
+
react_1.default.createElement(ui_1.Select, { inputId: "auth-method-select", options: preparedOptions, value: selected, onChange: (option) => {
|
|
104
|
+
setAuthMethodChanged(true);
|
|
105
|
+
onAuthMethodSelect(option.value);
|
|
106
|
+
}, disabled: readOnly }))),
|
|
106
107
|
AuthFieldsComponent && react_1.default.createElement("div", { className: styles.selectedMethodFields }, AuthFieldsComponent))));
|
|
107
108
|
};
|
|
108
109
|
exports.AuthMethodSettings = AuthMethodSettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthMethodSettings.js","sourceRoot":"","sources":["../../../../../src/components/ConfigEditor/Auth/auth-method/AuthMethodSettings.tsx"],"names":[],"mappings":";;;;AAAA,uDAA+D;AAC/D,sCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"AuthMethodSettings.js","sourceRoot":"","sources":["../../../../../src/components/ConfigEditor/Auth/auth-method/AuthMethodSettings.tsx"],"names":[],"mappings":"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"}
|
|
@@ -46,10 +46,11 @@ function getBasicAuthProps(config, onChange) {
|
|
|
46
46
|
}
|
|
47
47
|
exports.getBasicAuthProps = getBasicAuthProps;
|
|
48
48
|
function getTLSProps(config, onChange) {
|
|
49
|
+
var _a, _b, _c;
|
|
49
50
|
return {
|
|
50
51
|
selfSignedCertificate: {
|
|
51
52
|
enabled: Boolean(config.jsonData.tlsAuthWithCACert),
|
|
52
|
-
certificateConfigured: config.secureJsonFields.tlsCACert,
|
|
53
|
+
certificateConfigured: !!((_a = config.secureJsonFields) === null || _a === void 0 ? void 0 : _a.tlsCACert),
|
|
53
54
|
onToggle: (enabled) => enabled
|
|
54
55
|
? onChange(Object.assign(Object.assign({}, config), { jsonData: Object.assign(Object.assign({}, config.jsonData), { tlsAuthWithCACert: enabled }) }))
|
|
55
56
|
: onChange(Object.assign(Object.assign({}, config), { jsonData: Object.assign(Object.assign({}, config.jsonData), { tlsAuthWithCACert: enabled }), secureJsonData: Object.assign(Object.assign({}, config.secureJsonData), { tlsCACert: '' }), secureJsonFields: Object.assign(Object.assign({}, config.secureJsonFields), { tlsCACert: false }) })),
|
|
@@ -59,8 +60,8 @@ function getTLSProps(config, onChange) {
|
|
|
59
60
|
TLSClientAuth: {
|
|
60
61
|
enabled: config.jsonData.tlsAuth,
|
|
61
62
|
serverName: config.jsonData.serverName,
|
|
62
|
-
clientCertificateConfigured: config.secureJsonFields.tlsClientCert,
|
|
63
|
-
clientKeyConfigured: config.secureJsonFields.tlsClientKey,
|
|
63
|
+
clientCertificateConfigured: !!((_b = config.secureJsonFields) === null || _b === void 0 ? void 0 : _b.tlsClientCert),
|
|
64
|
+
clientKeyConfigured: !!((_c = config.secureJsonFields) === null || _c === void 0 ? void 0 : _c.tlsClientKey),
|
|
64
65
|
onToggle: (enabled) => enabled
|
|
65
66
|
? onChange(Object.assign(Object.assign({}, config), { jsonData: Object.assign(Object.assign({}, config.jsonData), { tlsAuth: enabled }) }))
|
|
66
67
|
: onChange(Object.assign(Object.assign({}, config), { jsonData: Object.assign(Object.assign({}, config.jsonData), { tlsAuth: enabled, serverName: '' }), secureJsonData: Object.assign(Object.assign({}, config.secureJsonData), { tlsClientCert: '', tlsClientKey: '' }), secureJsonFields: Object.assign(Object.assign({}, config.secureJsonFields), { tlsClientCert: false, tlsClientKey: false }) })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/ConfigEditor/Auth/utils.ts"],"names":[],"mappings":";;;AACA,mCAA6D;AAG7D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAC1C,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAgB,sBAAsB,CAA4B,EAChE,MAAM,EACN,QAAQ,GAIT;IACC,MAAM,KAAK,GAAc;QACvB,cAAc,EAAE,iBAAiB,CAAI,MAAM,CAAC;QAC5C,kBAAkB,EAAE,4BAA4B,CAAI,MAAM,EAAE,QAAQ,CAAC;QACrE,SAAS,EAAE,iBAAiB,CAAI,MAAM,EAAE,QAAQ,CAAC;QACjD,GAAG,EAAE,WAAW,CAAI,MAAM,EAAE,QAAQ,CAAC;QACrC,aAAa,EAAE,gBAAgB,CAAI,MAAM,EAAE,QAAQ,CAAC;QACpD,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAjBD,wDAiBC;AAED,SAAgB,iBAAiB,CAA4B,MAAS;IACpE,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,OAAO,kBAAU,CAAC,SAAS,CAAC;KAC7B;IACD,IAAI,MAAM,CAAC,eAAe,EAAE;QAC1B,OAAO,kBAAU,CAAC,oBAAoB,CAAC;KACxC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE;QACjC,OAAO,kBAAU,CAAC,YAAY,CAAC;KAChC;IACD,OAAO,kBAAU,CAAC,MAAM,CAAC;AAC3B,CAAC;AAXD,8CAWC;AAED,SAAgB,4BAA4B,CAC1C,MAAS,EACT,QAA4B;IAE5B,OAAO,CAAC,MAAmC,EAAE,EAAE;QAC7C,QAAQ,iCACH,MAAM,KACT,SAAS,EAAE,MAAM,KAAK,kBAAU,CAAC,SAAS,EAC1C,eAAe,EAAE,MAAM,KAAK,kBAAU,CAAC,oBAAoB,EAC3D,QAAQ,kCACH,MAAM,CAAC,QAAQ,KAClB,aAAa,EAAE,MAAM,KAAK,kBAAU,CAAC,YAAY,OAEnD,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAfD,oEAeC;AAED,SAAgB,iBAAiB,CAC/B,MAAS,EACT,QAA4B;IAE5B,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,aAAa;QAC1B,kBAAkB,EAAE,MAAM,CAAC,gBAAgB,CAAC,iBAAiB;QAC7D,YAAY,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,iCAAM,MAAM,KAAE,aAAa,EAAE,IAAI,IAAG;QAC5E,gBAAgB,EAAE,CAAC,QAAgB,EAAE,EAAE,CACrC,QAAQ,iCACH,MAAM,KACT,cAAc,kCACT,MAAM,CAAC,cAAc,KACxB,iBAAiB,EAAE,QAAQ,OAE7B;QACJ,eAAe,EAAE,GAAG,EAAE,CACpB,QAAQ,iCACH,MAAM,KACT,cAAc,kCAAO,MAAM,CAAC,cAAc,KAAE,iBAAiB,EAAE,EAAE,KACjE,gBAAgB,kCACX,MAAM,CAAC,gBAAgB,KAC1B,iBAAiB,EAAE,KAAK,OAE1B;KACL,CAAC;AACJ,CAAC;AA1BD,8CA0BC;AAED,SAAgB,WAAW,CAA4B,MAAS,EAAE,QAA4B
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/ConfigEditor/Auth/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ const css_1 = require("@emotion/css");
|
|
|
7
7
|
const ui_1 = require("@grafana/ui");
|
|
8
8
|
const ConfigSection_1 = require("../ConfigSection");
|
|
9
9
|
const ConnectionSettings = ({ config, onChange, description, urlPlaceholder, urlTooltip, urlLabel, className, }) => {
|
|
10
|
-
const isValidUrl =
|
|
10
|
+
const isValidUrl = config.url !== undefined &&
|
|
11
|
+
/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/.test(config.url);
|
|
11
12
|
const styles = {
|
|
12
13
|
container: (0, css_1.css)({
|
|
13
14
|
maxWidth: 578,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionSettings.js","sourceRoot":"","sources":["../../../../src/components/ConfigEditor/Connection/ConnectionSettings.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,sCAAuC;AACvC,oCAAiE;AACjE,oDAAiD;AAa1C,MAAM,kBAAkB,GAAgE,CAAC,EAC9F,MAAM,EACN,QAAQ,EACR,WAAW,EACX,cAAc,EACd,UAAU,EACV,QAAQ,EACR,SAAS,GACV,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,qFAAqF,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"ConnectionSettings.js","sourceRoot":"","sources":["../../../../src/components/ConfigEditor/Connection/ConnectionSettings.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,sCAAuC;AACvC,oCAAiE;AACjE,oDAAiD;AAa1C,MAAM,kBAAkB,GAAgE,CAAC,EAC9F,MAAM,EACN,QAAQ,EACR,WAAW,EACX,cAAc,EACd,UAAU,EACV,QAAQ,EACR,SAAS,GACV,EAAE,EAAE;IACH,MAAM,UAAU,GACd,MAAM,CAAC,GAAG,KAAK,SAAS;QACxB,qFAAqF,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEzG,MAAM,MAAM,GAAG;QACb,SAAS,EAAE,IAAA,SAAG,EAAC;YACb,QAAQ,EAAE,GAAG;SACd,CAAC;KACH,CAAC;IAEF,OAAO,CACL;QACE,8BAAC,6BAAa,IAAC,KAAK,EAAC,YAAY,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,IAAA,QAAE,EAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;YACpG,8BAAC,gBAAW,IACV,OAAO,EAAC,gBAAgB,EACxB,KAAK,EAAE,QAAQ,IAAI,KAAK,EACxB,UAAU,EAAE,EAAE,EACd,OAAO,EACL,UAAU,IAAI,CACZ;;oBAEE,yCAAM;6DAEL,CACJ,EAEH,IAAI,QACJ,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,QAAQ,QACR,OAAO,EAAE,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,QAAQ,EACxC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0BAA0B,EACnD,WAAW;gBAEX,8BAAC,UAAK,IACJ,EAAE,EAAC,gBAAgB,gBACR,4BAA4B,EACvC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,QAAQ,iCACH,MAAM,KACT,GAAG,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,IAC9B,EAEJ,KAAK,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE,EACvB,WAAW,EAAE,cAAc,IAAI,KAAK,GACpC,CACU,CACA,CACf,CACJ,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,kBAAkB,sBA0D7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AdvancedHttpSettings = exports.ConnectionSettings = exports.convertLegacyAuthProps = exports.AuthMethod = exports.Auth = exports.ConfigDescriptionLink = exports.ConfigSubSection = exports.ConfigSection = exports.DataSourceDescription = exports.SecureSocksProxyToggle = void 0;
|
|
3
|
+
exports.AdvancedHttpSettings = exports.ConnectionSettings = exports.TLSSettings = exports.convertLegacyAuthProps = exports.AuthMethod = exports.Auth = exports.ConfigDescriptionLink = exports.ConfigSubSection = exports.ConfigSection = exports.DataSourceDescription = exports.SecureSocksProxyToggle = void 0;
|
|
4
4
|
var SecureSocksProxyToggle_1 = require("./SecureSocksProxyToggle");
|
|
5
5
|
Object.defineProperty(exports, "SecureSocksProxyToggle", { enumerable: true, get: function () { return SecureSocksProxyToggle_1.SecureSocksProxyToggle; } });
|
|
6
6
|
var DataSourceDescription_1 = require("./DataSourceDescription");
|
|
@@ -13,6 +13,8 @@ var Auth_1 = require("./Auth");
|
|
|
13
13
|
Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return Auth_1.Auth; } });
|
|
14
14
|
Object.defineProperty(exports, "AuthMethod", { enumerable: true, get: function () { return Auth_1.AuthMethod; } });
|
|
15
15
|
Object.defineProperty(exports, "convertLegacyAuthProps", { enumerable: true, get: function () { return Auth_1.convertLegacyAuthProps; } });
|
|
16
|
+
var TLSSettings_1 = require("./Auth/tls/TLSSettings");
|
|
17
|
+
Object.defineProperty(exports, "TLSSettings", { enumerable: true, get: function () { return TLSSettings_1.TLSSettings; } });
|
|
16
18
|
var Connection_1 = require("./Connection");
|
|
17
19
|
Object.defineProperty(exports, "ConnectionSettings", { enumerable: true, get: function () { return Connection_1.ConnectionSettings; } });
|
|
18
20
|
var AdvancedSettings_1 = require("./AdvancedSettings");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ConfigEditor/index.ts"],"names":[],"mappings":";;;AAAA,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,iDAAyF;AAAhF,8GAAA,aAAa,OAAA;AAAE,iHAAA,gBAAgB,OAAA;AAAE,sHAAA,qBAAqB,OAAA;AAC/D,+BAAkE;AAAzD,4FAAA,IAAI,OAAA;AAAE,kGAAA,UAAU,OAAA;AAAE,8GAAA,sBAAsB,OAAA;AAEjD,2CAAkD;AAAzC,gHAAA,kBAAkB,OAAA;AAC3B,uDAA0D;AAAjD,wHAAA,oBAAoB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ConfigEditor/index.ts"],"names":[],"mappings":";;;AAAA,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,iEAAgE;AAAvD,8HAAA,qBAAqB,OAAA;AAC9B,iDAAyF;AAAhF,8GAAA,aAAa,OAAA;AAAE,iHAAA,gBAAgB,OAAA;AAAE,sHAAA,qBAAqB,OAAA;AAC/D,+BAAkE;AAAzD,4FAAA,IAAI,OAAA;AAAE,kGAAA,UAAU,OAAA;AAAE,8GAAA,sBAAsB,OAAA;AAEjD,sDAAqD;AAA5C,0GAAA,WAAW,OAAA;AAEpB,2CAAkD;AAAzC,gHAAA,kBAAkB,OAAA;AAC3B,uDAA0D;AAAjD,wHAAA,oBAAoB,OAAA"}
|
|
@@ -3,5 +3,7 @@ export { DataSourceDescription } from './DataSourceDescription';
|
|
|
3
3
|
export { ConfigSection, ConfigSubSection, ConfigDescriptionLink } from './ConfigSection';
|
|
4
4
|
export { Auth, AuthMethod, convertLegacyAuthProps } from './Auth';
|
|
5
5
|
export type { AuthProps } from './Auth';
|
|
6
|
+
export { TLSSettings } from './Auth/tls/TLSSettings';
|
|
7
|
+
export type { Props as TLSSettingsProps } from './Auth/tls/TLSSettings';
|
|
6
8
|
export { ConnectionSettings } from './Connection';
|
|
7
9
|
export { AdvancedHttpSettings } from './AdvancedSettings';
|
|
@@ -1,3 +1,15 @@
|
|
|
1
1
|
import { DataSourceSettings, DataSourceJsonData } from '@grafana/data';
|
|
2
|
-
|
|
2
|
+
type DataSourceExclusiveConfig = {
|
|
3
|
+
readOnly: DataSourceSettings['readOnly'];
|
|
4
|
+
url: DataSourceSettings['url'];
|
|
5
|
+
basicAuth: DataSourceSettings['basicAuth'];
|
|
6
|
+
basicAuthUser: DataSourceSettings['basicAuthUser'];
|
|
7
|
+
withCredentials: DataSourceSettings['withCredentials'];
|
|
8
|
+
};
|
|
9
|
+
export type Config<JSONData extends DataSourceJsonData = any, SecureJSONData = {}> = {
|
|
10
|
+
jsonData: DataSourceSettings<JSONData>['jsonData'];
|
|
11
|
+
secureJsonData: DataSourceSettings<JSONData, SecureJSONData>['secureJsonData'];
|
|
12
|
+
secureJsonFields: DataSourceSettings['secureJsonFields'];
|
|
13
|
+
} & Partial<DataSourceExclusiveConfig>;
|
|
3
14
|
export type OnChangeHandler<C extends Config = Config> = (config: C) => void;
|
|
15
|
+
export {};
|