@grafana/plugin-ui 0.14.1-dsconfig.0d5c985 → 0.14.1-dsconfig.7535e54

package/dist/cjs/index.cjs

@@ -17,11 +17,13 @@ var AutoSizer = require('react-virtualized-auto-sizer');
 var sqlFormatter = require('sql-formatter');
 var rxjs = require('rxjs');
 var operators$1 = require('rxjs/operators');
+var useDatasourceSchema = require('./useDatasourceSchema-DLkP-L1p.js');
 var reactHookForm = require('react-hook-form');
+require('@marcbachmann/cel-js');
 var dnd = require('@hello-pangea/dnd');
 var reactPopperTooltip = require('react-popper-tooltip');
 var Prism = require('prismjs');
-var yaml = require('js-yaml');
+require('js-yaml');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -29,7 +31,6 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var Calendar__default = /*#__PURE__*/_interopDefaultCompat(Calendar);
 var AutoSizer__default = /*#__PURE__*/_interopDefaultCompat(AutoSizer);
 var Prism__default = /*#__PURE__*/_interopDefaultCompat(Prism);
-var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
 
 const QueryEditorRow = (props) => {
   var _a, _b;
@@ -78,7 +79,7 @@ function Segment(props) {
   );
 }
 
-const getStyles$v = (theme) => {
+const getStyles$x = (theme) => {
   const containerBorder = theme.isDark ? theme.v1.palette.dark9 : theme.v1.palette.gray5;
   return {
     container: css.css`
@@ -228,7 +229,7 @@ const getBodyStyles = (theme) => {
 
 const DatePicker = React.memo((props) => {
   const theme = ui.useTheme2();
-  const styles = getStyles$v(theme);
+  const styles = getStyles$x(theme);
   const { isOpen, onClose } = props;
   if (!isOpen) {
     return null;
@@ -258,7 +259,7 @@ const Body = React.memo(({ value, onChange }) => {
 });
 Body.displayName = "Body";
 
-function getStyles$u() {
+function getStyles$w() {
   return {
     input: css.css({
       /* hides the native Calendar picker icon given when using type=date */
@@ -274,7 +275,7 @@ const formatDate = (date) => date.toISOString().split("T")[0];
 const DatePickerWithInput = (props) => {
   const { value, onChange, className, ...rest } = props;
   const [open, setOpen] = React.useState(false);
-  const styles = getStyles$u();
+  const styles = getStyles$w();
   return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement(
     ui.Input,
     {
@@ -341,15 +342,15 @@ function getSignatureDisplayModel(signature) {
 }
 PluginSignatureBadge.displayName = "PluginSignatureBadge";
 
-var __defProp$3 = Object.defineProperty;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
 class DataSourcePicker extends React.PureComponent {
   constructor(props) {
     super(props);
-    __publicField$3(this, "dataSourceSrv", runtime.getDataSourceSrv());
-    __publicField$3(this, "state", {});
-    __publicField$3(this, "onChange", (item) => {
+    __publicField$4(this, "dataSourceSrv", runtime.getDataSourceSrv());
+    __publicField$4(this, "state", {});
+    __publicField$4(this, "onChange", (item) => {
       const dsSettings = this.dataSourceSrv.getInstanceSettings(item.value);
       if (dsSettings) {
         this.props.onChange(dsSettings);
@@ -429,14 +430,14 @@ class DataSourcePicker extends React.PureComponent {
     ));
   }
 }
-__publicField$3(DataSourcePicker, "defaultProps", {
+__publicField$4(DataSourcePicker, "defaultProps", {
   autoFocus: false,
   openMenuOnFocus: false,
   placeholder: "Select datasource"
 });
 
 const { FormField, Switch } = ui.LegacyForms;
-const getStyles$t = ui.stylesFactory(() => ({
+const getStyles$v = ui.stylesFactory(() => ({
   firstRow: css.css`
     display: flex;
   `,
@@ -453,7 +454,7 @@ const getStyles$t = ui.stylesFactory(() => ({
 }));
 const DataLink = (props) => {
   const { value, onChange, onDelete, suggestions, className } = props;
-  const styles = getStyles$t();
+  const styles = getStyles$v();
   const [showInternalLink, setShowInternalLink] = useInternalLink(value.datasourceUid);
   const handleChange = (field) => (event) => {
     onChange({
@@ -570,7 +571,7 @@ function useInternalLink(datasourceUid) {
   return [showInternalLink, setShowInternalLink];
 }
 
-const getStyles$s = (theme) => ({
+const getStyles$u = (theme) => ({
   infoText: css.css`
     padding-bottom: ${theme.v1.spacing.md};
     color: ${theme.v1.colors.textWeak};
@@ -582,7 +583,7 @@ const getStyles$s = (theme) => ({
 const DataLinks = (props) => {
   const { value, onChange } = props;
   const theme = ui.useTheme2();
-  const styles = getStyles$s(theme);
+  const styles = getStyles$u(theme);
   return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement("h3", { className: "page-heading" }, "Data links"), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.infoText }, "Add links to existing fields. Links will be shown in log row details next to the field value."), /* @__PURE__ */ React__default.default.createElement("div", { className: "gf-form-group" }, value && value.map((field, index) => {
     return /* @__PURE__ */ React__default.default.createElement(
       DataLink,
@@ -5478,7 +5479,7 @@ const getButtonStyles = (theme) => ({
 });
 
 const InputGroup = ({ children }) => {
-  const styles = ui.useStyles2(getStyles$r);
+  const styles = ui.useStyles2(getStyles$t);
   const modifiedChildren = React.Children.map(children, (child) => {
     if (React.isValidElement(child) && child.props.invalid) {
       return React.cloneElement(child, { className: css.cx(child.props.className, styles.invalidChild) });
@@ -5496,7 +5497,7 @@ const borderPriority = [
   "focused"
   // highest priority
 ];
-const getStyles$r = () => ({
+const getStyles$t = () => ({
   root: css.css({
     display: "flex",
     // Style the direct children of the component
@@ -5579,10 +5580,10 @@ const EditorFieldGroup = ({ children }) => {
 };
 
 const EditorHeader = ({ children }) => {
-  const styles = ui.useStyles2(getStyles$q);
+  const styles = ui.useStyles2(getStyles$s);
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.root }, children);
 };
-const getStyles$q = (theme) => ({
+const getStyles$s = (theme) => ({
   root: css.css({
     display: "flex",
     flexWrap: "wrap",
@@ -5595,12 +5596,12 @@ const getStyles$q = (theme) => ({
 const EditorField$1 = (props) => {
   var _a;
   const { label, optional, tooltip, tooltipInteractive, children, width, ...fieldProps } = props;
-  const styles = ui.useStyles2(getStyles$p, width);
+  const styles = ui.useStyles2(getStyles$r, width);
   const childInputId = (fieldProps == null ? void 0 : fieldProps.htmlFor) || ((_a = ui.ReactUtils) == null ? void 0 : _a.getChildId(children));
   const labelEl = /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement("label", { className: styles.label, htmlFor: childInputId }, label, optional && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.optional }, " - optional"), tooltip && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { placement: "top", content: tooltip, theme: "info", interactive: tooltipInteractive }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { tabIndex: 0, name: "info-circle", size: "sm", className: styles.icon }))), /* @__PURE__ */ React__default.default.createElement(ui.Space, { v: 0.5 }));
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.root }, /* @__PURE__ */ React__default.default.createElement(ui.Field, { className: styles.field, label: labelEl, ...fieldProps }, children));
 };
-const getStyles$p = (theme, width) => {
+const getStyles$r = (theme, width) => {
   return {
     root: css.css({
       minWidth: theme.spacing(width != null ? width : 0)
@@ -5628,10 +5629,10 @@ const getStyles$p = (theme, width) => {
 };
 
 const EditorRow$1 = ({ children }) => {
-  const styles = ui.useStyles2(getStyles$o);
+  const styles = ui.useStyles2(getStyles$q);
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.root }, /* @__PURE__ */ React__default.default.createElement(EditorStack, { gap: 2 }, children));
 };
-const getStyles$o = (theme) => {
+const getStyles$q = (theme) => {
   return {
     root: css.css({
       padding: theme.spacing(1),
@@ -5646,10 +5647,10 @@ const EditorRows$1 = ({ children }) => {
 };
 
 const EditorSwitch = (props) => {
-  const styles = getStyles$n();
+  const styles = getStyles$p();
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.switch }, /* @__PURE__ */ React__default.default.createElement(ui.Switch, { ...props }));
 };
-const getStyles$n = () => {
+const getStyles$p = () => {
   return {
     switch: css.css({
       display: "flex",
@@ -5707,10 +5708,10 @@ const getSelectStyles = (theme) => ({
 });
 
 const Space = ({ v = 0, h = 0, layout = "block" }) => {
-  const styles = ui.useStyles2(getStyles$m, v, h, layout);
+  const styles = ui.useStyles2(getStyles$o, v, h, layout);
   return /* @__PURE__ */ React__default.default.createElement("span", { className: css.cx(styles.wrapper) });
 };
-const getStyles$m = (theme, v, h, layout) => ({
+const getStyles$o = (theme, v, h, layout) => ({
   wrapper: css.css([
     {
       paddingRight: theme.spacing(h != null ? h : 0),
@@ -6322,7 +6323,7 @@ function RawEditor({
   language = "sql"
 }) {
   const theme = ui.useTheme2();
-  const styles = ui.useStyles2(getStyles$l);
+  const styles = ui.useStyles2(getStyles$n);
   const [isExpanded, setIsExpanded] = React.useState(false);
   const [toolboxRef, toolboxMeasure] = reactUse.useMeasure();
   const [editorRef, editorMeasure] = reactUse.useMeasure();
@@ -6392,7 +6393,7 @@ function RawEditor({
     renderEditor(true)
   ));
 }
-function getStyles$l(theme) {
+function getStyles$n(theme) {
   return {
     modal: css.css`
       width: 95vw;
@@ -6407,7 +6408,7 @@ function getStyles$l(theme) {
 
 function Preview({ rawSql, language = "sql" }) {
   const [_, copyToClipboard] = reactUse.useCopyToClipboard();
-  const styles = ui.useStyles2(getStyles$k);
+  const styles = ui.useStyles2(getStyles$m);
   const labelElement = /* @__PURE__ */ React__default.default.createElement("div", { className: styles.labelWrapper }, /* @__PURE__ */ React__default.default.createElement("label", { className: styles.label }, "Preview"), /* @__PURE__ */ React__default.default.createElement(ui.IconButton, { tooltip: "Copy to clipboard", onClick: () => copyToClipboard(rawSql), name: "copy" }));
   return /* @__PURE__ */ React__default.default.createElement(ui.Field, { label: labelElement, className: styles.grow }, /* @__PURE__ */ React__default.default.createElement(
     ui.CodeEditor,
@@ -6421,7 +6422,7 @@ function Preview({ rawSql, language = "sql" }) {
     }
   ));
 }
-function getStyles$k(theme) {
+function getStyles$m(theme) {
   return {
     grow: css.css({ flexGrow: 1 }),
     label: css.css({ fontSize: 12, fontWeight: theme.typography.fontWeightMedium }),
@@ -6540,7 +6541,7 @@ function SQLOrderByRow({ fields, query, onQueryChange, db }) {
 const asteriskValue = { label: "*", value: "*" };
 function SelectRow({ sql, columns, onSqlChange, functions }) {
   var _a;
-  const styles = ui.useStyles2(getStyles$j);
+  const styles = ui.useStyles2(getStyles$l);
   const columnsWithAsterisk = [asteriskValue, ...columns || []];
   const onColumnChange = React.useCallback(
     (item, index) => (column) => {
@@ -6636,7 +6637,7 @@ function SelectRow({ sql, columns, onSqlChange, functions }) {
     }
   ));
 }
-const getStyles$j = () => {
+const getStyles$l = () => {
   return { addButton: css.css({ alignSelf: "flex-start" }) };
 };
 function getColumnValue({ parameters }) {
@@ -6982,10 +6983,10 @@ function mapFieldsToTypes(columns) {
 }
 
 const EditorRow = ({ children }) => {
-  const styles = ui.useStyles2(getStyles$i);
+  const styles = ui.useStyles2(getStyles$k);
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.root }, /* @__PURE__ */ React__default.default.createElement(EditorStack, { gap: 2 }, children));
 };
-const getStyles$i = (theme) => {
+const getStyles$k = (theme) => {
   return {
     root: css.css({
       padding: theme.spacing(1),
@@ -6999,12 +7000,12 @@ const EditorField = (props) => {
   var _a;
   const { label, optional, tooltip, children, width, ...fieldProps } = props;
   const theme = ui.useTheme2();
-  const styles = getStyles$h(theme, width);
+  const styles = getStyles$j(theme, width);
   const childInputId = (fieldProps == null ? void 0 : fieldProps.htmlFor) || ((_a = ui.ReactUtils) == null ? void 0 : _a.getChildId(children));
   const labelEl = /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, /* @__PURE__ */ React__default.default.createElement("label", { className: styles.label, htmlFor: childInputId }, label, optional && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.optional }, " - optional"), tooltip && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { placement: "top", content: tooltip, theme: "info" }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "sm", className: styles.icon }))), /* @__PURE__ */ React__default.default.createElement(Space, { v: 0.5 }));
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.root }, /* @__PURE__ */ React__default.default.createElement(ui.Field, { className: styles.field, label: labelEl, ...fieldProps }, children));
 };
-const getStyles$h = ui.stylesFactory((theme, width) => {
+const getStyles$j = ui.stylesFactory((theme, width) => {
   return {
     root: css.css({
       minWidth: theme.spacing(width != null ? width : 0)
@@ -7067,20 +7068,20 @@ const MACRO_NAMES = [
   "$__unixEpochGroupAlias"
 ];
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
 class SqlDatasource extends runtime.DataSourceWithBackend {
   constructor(instanceSettings, templateSrv = runtime.getTemplateSrv()) {
     super(instanceSettings);
     this.templateSrv = templateSrv;
-    __publicField$2(this, "id");
-    __publicField$2(this, "name");
-    __publicField$2(this, "interval");
-    __publicField$2(this, "db");
-    __publicField$2(this, "dataset");
-    __publicField$2(this, "annotations", {});
-    __publicField$2(this, "interpolateVariable", (value, variable) => {
+    __publicField$3(this, "id");
+    __publicField$3(this, "name");
+    __publicField$3(this, "interval");
+    __publicField$3(this, "db");
+    __publicField$3(this, "dataset");
+    __publicField$3(this, "annotations", {});
+    __publicField$3(this, "interpolateVariable", (value, variable) => {
       if (typeof value === "string") {
         if (variable.multi || variable.includeAll) {
           const result = this.getQueryModel().quoteLiteral(value);
@@ -7454,7 +7455,7 @@ const ConfigSubSection = ({ children, ...props }) => {
 function ConfigDescriptionLink(props) {
   const { description, suffix, feature } = props;
   const text = `Learn more about ${feature}`;
-  const styles = ui.useStyles2(getStyles$g);
+  const styles = ui.useStyles2(getStyles$i);
   return /* @__PURE__ */ React__default.default.createElement("span", { className: styles.container }, description, /* @__PURE__ */ React__default.default.createElement(
     "a",
     {
@@ -7466,7 +7467,7 @@ function ConfigDescriptionLink(props) {
     text
   ));
 }
-const getStyles$g = (theme) => {
+const getStyles$i = (theme) => {
   return {
     container: css.css({
       color: theme.colors.text.secondary,
@@ -8435,240 +8436,53 @@ const AdvancedHttpSettings = ({
   ));
 };
 
-function resolveGroups(schema) {
-  const fieldMap = /* @__PURE__ */ new Map();
-  for (const f of schema.fields) {
-    fieldMap.set(f.id, f);
-  }
-  if (schema.groups && schema.groups.length > 0) {
-    return schema.groups.slice().sort((a, b) => {
-      var _a, _b;
-      return ((_a = a.order) != null ? _a : 0) - ((_b = b.order) != null ? _b : 0);
-    }).map((g) => ({
-      group: g,
-      fields: g.fieldRefs.map((ref) => fieldMap.get(ref)).filter((f) => f != null)
-    }));
-  }
-  const allFields = schema.fields.filter((f) => f.kind !== "virtual" && !f.isItemField);
-  return [
-    {
-      group: { id: "default", title: "Configuration", fieldRefs: allFields.map((f) => f.id) },
-      fields: allFields
-    }
-  ];
+const SECURE_FIELD_CONFIGURED = "__CONFIGURED__";
+function resolveSecureKeyTemplate(template, item, index) {
+  return template.replace(/\{index1\}/g, String(index + 1)).replace(/\{index\}/g, String(index)).replace(/\{item\.(\w+)\}/g, (_, key) => {
+    var _a;
+    return String((_a = item[key]) != null ? _a : "");
+  });
 }
-function resolveRequiredFieldsGroup(schema) {
-  var _a;
-  const fieldMap = /* @__PURE__ */ new Map();
-  for (const f of schema.fields) {
-    fieldMap.set(f.id, f);
-  }
-  const requiredIds = /* @__PURE__ */ new Set();
-  for (const f of schema.fields) {
-    if (f.required) {
-      requiredIds.add(f.id);
-    }
-  }
-  const authGroup = (_a = schema.groups) == null ? void 0 : _a.find((g) => g.id === "auth");
-  if (authGroup) {
-    for (const ref of authGroup.fieldRefs) {
-      if (fieldMap.has(ref)) {
-        requiredIds.add(ref);
-      }
-    }
-  }
-  if (requiredIds.size === 0) {
-    return null;
-  }
-  const includeIds = /* @__PURE__ */ new Set();
-  for (const id of requiredIds) {
-    includeIds.add(id);
-    const f = fieldMap.get(id);
-    if (f == null ? void 0 : f.dependsOn) {
-      const parsed = parseDependsOn(f.dependsOn);
-      if (parsed && fieldMap.has(parsed.field)) {
-        includeIds.add(parsed.field);
-      }
-    }
+function evaluateItemCondition(condition, item) {
+  const trimmed = condition.trim();
+  if (trimmed === "true") {
+    return true;
   }
-  for (const f of schema.fields) {
-    if (f.dependsOn && !includeIds.has(f.id)) {
-      const parsed = parseDependsOn(f.dependsOn);
-      if (parsed && requiredIds.has(parsed.field)) {
-        includeIds.add(f.id);
-      }
-    }
+  const match = trimmed.match(/^item\.(\w+)\s*==\s*(.+)$/);
+  if (!match) {
+    return false;
   }
-  const virtualFields = schema.fields.filter((f) => includeIds.has(f.id));
-  if (virtualFields.length === 0) {
-    return null;
+  const [, key, rawValue] = match;
+  const actualValue = item[key];
+  const expected = rawValue.trim();
+  if (expected === "true") {
+    return actualValue === true;
   }
-  return {
-    group: {
-      id: "_required",
-      title: "Required",
-      fieldRefs: virtualFields.map((f) => f.id)
-    },
-    fields: virtualFields
-  };
-}
-function formKey(field) {
-  return field.section ? `${field.section}.${field.key}` : field.key;
-}
-function parseDependsOn(expr) {
-  var _a, _b;
-  const m = expr.match(/^(.+?)\s*==\s*(?:'([^']*)'|"([^"]*)"|(.+))$/);
-  if (!m) {
-    return null;
+  if (expected === "false") {
+    return actualValue === false;
   }
-  return { field: m[1].trim(), value: ((_b = (_a = m[2]) != null ? _a : m[3]) != null ? _b : m[4]).trim() };
+  const unquoted = expected.replace(/^['"]|['"]$/g, "");
+  return String(actualValue) === unquoted;
 }
-function resolveActiveOverride(field, watchedValues, fieldById) {
-  var _a;
-  if (!field.overrides || field.overrides.length === 0) {
-    return void 0;
-  }
-  for (const ov of field.overrides) {
-    const parsed = parseDependsOn(ov.when);
-    if (!parsed) {
+function findActiveSecureOverride(itemFields, item, index) {
+  for (const field of itemFields) {
+    if (!field.overrides) {
       continue;
     }
-    const depField = fieldById.get(parsed.field);
-    const depKey = depField ? formKey(depField) : parsed.field;
-    if (String((_a = watchedValues[depKey]) != null ? _a : "") === parsed.value) {
-      return ov;
-    }
-  }
-  return void 0;
-}
-function resolveFieldValue(ref, values, fields) {
-  if (ref in values) {
-    return values[ref];
-  }
-  const field = fields.find((f) => f.id === ref);
-  if (field) {
-    const fk = formKey(field);
-    if (fk in values) {
-      return values[fk];
-    }
-  }
-  return void 0;
-}
-function evaluateComputedRead(expr, values, fields) {
-  function evalExpr(s) {
-    var _a;
-    s = s.trim();
-    if (s.startsWith("(") && findMatchingParen(s, 0) === s.length - 1) {
-      s = s.slice(1, -1).trim();
-    }
-    const qIdx = findTopLevel(s, "?");
-    if (qIdx !== -1) {
-      const condition = s.slice(0, qIdx).trim();
-      const rest = s.slice(qIdx + 1);
-      const cIdx = findTopLevel(rest, ":");
-      if (cIdx !== -1) {
-        const trueExpr = rest.slice(0, cIdx).trim();
-        const falseExpr = rest.slice(cIdx + 1).trim();
-        return evalCondition(condition) ? evalExpr(trueExpr) : evalExpr(falseExpr);
-      }
-    }
-    const strMatch = (_a = s.match(/^'([^']*)'$/)) != null ? _a : s.match(/^"([^"]*)"$/);
-    if (strMatch) {
-      return strMatch[1];
-    }
-    if (s === "true") {
-      return true;
-    }
-    if (s === "false") {
-      return false;
-    }
-    if (/^-?\d+(\.\d+)?$/.test(s)) {
-      return Number(s);
-    }
-    return resolveFieldValue(s, values, fields);
-  }
-  function evalCondition(cond) {
-    const eqMatch = cond.match(/^(.+?)\s*(==|!=)\s*(.+)$/);
-    if (eqMatch) {
-      const left = evalExpr(eqMatch[1]);
-      const right = evalExpr(eqMatch[3]);
-      const eq = String(left) === String(right);
-      return eqMatch[2] === "==" ? eq : !eq;
-    }
-    return !!evalExpr(cond);
-  }
-  function findMatchingParen(s, start) {
-    let depth = 0;
-    for (let i = start; i < s.length; i++) {
-      if (s[i] === "(") {
-        depth++;
-      } else if (s[i] === ")") {
-        depth--;
-        if (depth === 0) {
-          return i;
-        }
-      }
-    }
-    return -1;
-  }
-  function findTopLevel(s, char) {
-    let depth = 0;
-    let inStr = null;
-    for (let i = 0; i < s.length; i++) {
-      const c = s[i];
-      if (inStr) {
-        if (c === inStr) {
-          inStr = null;
-        }
-        continue;
-      }
-      if (c === "'" || c === '"') {
-        inStr = c;
-        continue;
-      }
-      if (c === "(") {
-        depth++;
+    for (const override of field.overrides) {
+      if (!override.secureKey) {
         continue;
       }
-      if (c === ")") {
-        depth--;
-        continue;
-      }
-      if (depth === 0 && c === char) {
-        return i;
-      }
-    }
-    return -1;
-  }
-  try {
-    return evalExpr(expr);
-  } catch (e) {
-    return void 0;
-  }
-}
-function computeVirtualFieldValues(schema, existingValues) {
-  var _a;
-  const virtualValues = {};
-  for (const field of schema.fields) {
-    if (field.kind !== "virtual") {
-      continue;
-    }
-    const fk = formKey(field);
-    if (((_a = field.storage) == null ? void 0 : _a.type) === "computed" && field.storage.read) {
-      const val = evaluateComputedRead(field.storage.read, existingValues, schema.fields);
-      if (val !== void 0) {
-        virtualValues[fk] = val;
-      } else if (field.defaultValue !== void 0) {
-        virtualValues[fk] = field.defaultValue;
+      if (evaluateItemCondition(override.when, item)) {
+        return {
+          fieldKey: field.key,
+          resolvedKey: resolveSecureKeyTemplate(override.secureKey, item, index)
+        };
       }
-    } else if (field.defaultValue !== void 0) {
-      virtualValues[fk] = field.defaultValue;
     }
   }
-  return virtualValues;
+  return null;
 }
-
-const SECURE_FIELD_CONFIGURED = "__CONFIGURED__";
 function patternToRegex(pattern) {
   const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   return new RegExp("^" + escaped.replace("\\{index\\}", "(\\d+)") + "$");
@@ -8775,7 +8589,7 @@ function resolveRawPath(ref, ds) {
   return void 0;
 }
 async function fetchExistingValues(dsUid, fields) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   try {
     const ds = await runtime.getBackendSrv().get(`/api/datasources/uid/${dsUid}`, void 0, void 0, {
       showErrorAlert: false
@@ -8786,7 +8600,7 @@ async function fetchExistingValues(dsUid, fields) {
         values[field.key] = expandIndexedPair(field, ds);
         continue;
       }
-      const fk = formKey(field);
+      const fk = useDatasourceSchema.formKey(field);
       switch (field.target) {
         case "root":
           if (ds[field.key] !== void 0) {
@@ -8816,6 +8630,32 @@ async function fetchExistingValues(dsUid, fields) {
         }
       }
     }
+    for (const field of fields) {
+      if (field.valueType !== "array" || !((_f = field.item) == null ? void 0 : _f.fields)) {
+        continue;
+      }
+      const itemFields = field.item.fields;
+      const hasSecureOverride = itemFields.some((f) => {
+        var _a2;
+        return (_a2 = f.overrides) == null ? void 0 : _a2.some((o) => o.secureKey);
+      });
+      if (!hasSecureOverride) {
+        continue;
+      }
+      const fk = useDatasourceSchema.formKey(field);
+      const arr = values[fk];
+      if (!Array.isArray(arr)) {
+        continue;
+      }
+      values[fk] = arr.map((item, idx) => {
+        var _a2;
+        const match = findActiveSecureOverride(itemFields, item, idx);
+        if (match && ((_a2 = ds.secureJsonFields) == null ? void 0 : _a2[match.resolvedKey])) {
+          return { ...item, [match.fieldKey]: SECURE_FIELD_CONFIGURED };
+        }
+        return item;
+      });
+    }
     return { values, readOnly: !!ds.readOnly };
   } catch (err) {
     const message = err instanceof Error ? err.message : "Failed to load datasource configuration";
@@ -8823,7 +8663,7 @@ async function fetchExistingValues(dsUid, fields) {
   }
 }
 function buildDatasourceConfigPayload(data, fields, existing, isFieldVisible) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const rootFields = {};
   const jsonData = { ...(_a = existing.jsonData) != null ? _a : {} };
   const secureJsonData = {};
@@ -8838,7 +8678,7 @@ function buildDatasourceConfigPayload(data, fields, existing, isFieldVisible) {
     if (!isManagedByEffect && !isFieldVisible(field)) {
       continue;
     }
-    const fk = formKey(field);
+    const fk = useDatasourceSchema.formKey(field);
     const value = data[fk];
     if (field.target === "secureJsonData") {
       if (value === SECURE_FIELD_CONFIGURED) {
@@ -8872,6 +8712,60 @@ function buildDatasourceConfigPayload(data, fields, existing, isFieldVisible) {
         break;
     }
   }
+  for (const field of fields) {
+    if (field.valueType !== "array" || !((_e = field.item) == null ? void 0 : _e.fields) || field.target !== "jsonData") {
+      continue;
+    }
+    const itemFields = field.item.fields;
+    const hasSecureOverride = itemFields.some((f) => {
+      var _a2;
+      return (_a2 = f.overrides) == null ? void 0 : _a2.some((o) => o.secureKey);
+    });
+    if (!hasSecureOverride) {
+      continue;
+    }
+    const arr = field.section ? (_f = jsonData[field.section]) == null ? void 0 : _f[field.key] : jsonData[field.key];
+    if (!Array.isArray(arr)) {
+      continue;
+    }
+    const secureKeyOverrides = [];
+    for (const f of itemFields) {
+      for (const o of (_g = f.overrides) != null ? _g : []) {
+        if (o.secureKey) {
+          secureKeyOverrides.push({ fieldKey: f.key, override: o });
+        }
+      }
+    }
+    const activeSecureKeys = /* @__PURE__ */ new Set();
+    for (let i = 0; i < arr.length; i++) {
+      const item = arr[i];
+      const match = findActiveSecureOverride(itemFields, item, i);
+      if (!match) {
+        continue;
+      }
+      const resolvedKey = match.resolvedKey;
+      activeSecureKeys.add(resolvedKey);
+      const itemValue = item[match.fieldKey];
+      if (itemValue === SECURE_FIELD_CONFIGURED) {
+        secureJsonFields[resolvedKey] = true;
+      } else if (itemValue && itemValue !== "") {
+        secureJsonData[resolvedKey] = String(itemValue);
+        secureJsonFields[resolvedKey] = false;
+        item[match.fieldKey] = "";
+      }
+    }
+    const existingSecureFields = (_h = existing.secureJsonFields) != null ? _h : {};
+    for (const existingKey of Object.keys(existingSecureFields)) {
+      const couldBeFromThisField = secureKeyOverrides.some((sko) => {
+        const staticPrefix = sko.override.secureKey.split("{")[0];
+        return staticPrefix && existingKey.startsWith(staticPrefix);
+      });
+      if (couldBeFromThisField && !activeSecureKeys.has(existingKey)) {
+        secureJsonFields[existingKey] = false;
+        secureJsonData[existingKey] = "";
+      }
+    }
+  }
   return { rootFields, jsonData, secureJsonData, secureJsonFields };
 }
 async function submitDatasourceConfig(dsUid, data, fields, isFieldVisible) {
@@ -8909,23 +8803,25 @@ function evaluateEffectCondition(when, fieldValue) {
   const eq = String(fieldValue) === String(target);
   return op === "==" ? eq : !eq;
 }
-function isFieldRequired(field, watchedValues, fieldById) {
-  var _a;
+function isFieldRequired(field, watchedValues, fieldById, celContext) {
   if (field.required) {
     return true;
   }
   if (field.requiredWhen) {
-    const parsed = parseDependsOn(field.requiredWhen);
+    if (celContext) {
+      return useDatasourceSchema.evaluateCelExpression(field.requiredWhen, celContext);
+    }
+    const parsed = useDatasourceSchema.parseDependsOn(field.requiredWhen);
     if (parsed) {
       const depField = fieldById.get(parsed.field);
-      const depKey = depField ? formKey(depField) : parsed.field;
-      return String((_a = watchedValues[depKey]) != null ? _a : "") === parsed.value;
+      const depKey = depField ? useDatasourceSchema.formKey(depField) : parsed.field;
+      return useDatasourceSchema.evaluateDependsOn(parsed, useDatasourceSchema.getWatchedValue(watchedValues, depKey));
     }
   }
   return false;
 }
 function buildValidationRules(field, required) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const rules = {};
   const label = (_a = field.label) != null ? _a : field.key;
   if (required) {
@@ -8943,29 +8839,65 @@ function buildValidationRules(field, required) {
       rules.required = `${label} is required`;
     }
   }
+  if (field.valueType === "array" && ((_b = field.item) == null ? void 0 : _b.valueType) === "object" && ((_c = field.item.fields) == null ? void 0 : _c.length)) {
+    const requiredItemFields = field.item.fields.filter((f) => f.required);
+    if (requiredItemFields.length > 0) {
+      const existingValidate = rules.validate;
+      rules.validate = (value) => {
+        var _a2;
+        if (existingValidate) {
+          const r = existingValidate(value);
+          if (r !== true) {
+            return r;
+          }
+        }
+        if (!Array.isArray(value)) {
+          return true;
+        }
+        const itemErrors = {};
+        for (let i = 0; i < value.length; i++) {
+          const item = value[i];
+          const missing = [];
+          for (const rf of requiredItemFields) {
+            const v = item[rf.key];
+            if (v === void 0 || v === null || v === "") {
+              missing.push((_a2 = rf.label) != null ? _a2 : rf.key);
+            }
+          }
+          if (missing.length > 0) {
+            itemErrors[i] = `${missing.join(", ")} required`;
+          }
+        }
+        if (Object.keys(itemErrors).length === 0) {
+          return true;
+        }
+        return `__ITEM_ERRORS__${JSON.stringify(itemErrors)}`;
+      };
+    }
+  }
   if (field.validations) {
     for (const v of field.validations) {
       switch (v.type) {
         case "pattern":
           rules.pattern = {
             value: new RegExp(v.pattern),
-            message: (_b = v.message) != null ? _b : `Invalid ${label}`
+            message: (_d = v.message) != null ? _d : `Invalid ${label}`
           };
           break;
         case "range":
           if (v.min !== void 0) {
-            rules.min = { value: v.min, message: (_c = v.message) != null ? _c : `Minimum value is ${v.min}` };
+            rules.min = { value: v.min, message: (_e = v.message) != null ? _e : `Minimum value is ${v.min}` };
           }
           if (v.max !== void 0) {
-            rules.max = { value: v.max, message: (_d = v.message) != null ? _d : `Maximum value is ${v.max}` };
+            rules.max = { value: v.max, message: (_f = v.message) != null ? _f : `Maximum value is ${v.max}` };
           }
           break;
         case "length":
           if (v.min !== void 0) {
-            rules.minLength = { value: v.min, message: (_e = v.message) != null ? _e : `Minimum length is ${v.min}` };
+            rules.minLength = { value: v.min, message: (_g = v.message) != null ? _g : `Minimum length is ${v.min}` };
           }
           if (v.max !== void 0) {
-            rules.maxLength = { value: v.max, message: (_f = v.message) != null ? _f : `Maximum length is ${v.max}` };
+            rules.maxLength = { value: v.max, message: (_h = v.message) != null ? _h : `Maximum length is ${v.max}` };
           }
           break;
       }
@@ -8973,16 +8905,24 @@ function buildValidationRules(field, required) {
   }
   return rules;
 }
+const ITEM_ERRORS_PREFIX = "__ITEM_ERRORS__";
+function parseItemErrors(errorMessage) {
+  if (!errorMessage || !errorMessage.startsWith(ITEM_ERRORS_PREFIX)) {
+    return null;
+  }
+  try {
+    return JSON.parse(errorMessage.slice(ITEM_ERRORS_PREFIX.length));
+  } catch (e) {
+    return null;
+  }
+}
 
-function PdcFieldNote({
-  enabled,
-  description,
-  configUrl
-}) {
-  const styles = ui.useStyles2(getStyles$f);
+const PdcFieldNote = (props) => {
+  const { enabled, description, configUrl } = props;
+  const styles = ui.useStyles2(getStyles$h);
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.wrapper }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.note }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "shield", size: "xs" }), /* @__PURE__ */ React__default.default.createElement("span", null, "Private data source connect: ", /* @__PURE__ */ React__default.default.createElement("strong", null, enabled ? "Enabled" : "Disabled")), description && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: description }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs" }))), /* @__PURE__ */ React__default.default.createElement(ui.LinkButton, { variant: "secondary", size: "sm", icon: "external-link-alt", href: configUrl }, "Configure in settings"));
-}
-const getStyles$f = (theme) => ({
+};
+const getStyles$h = (theme) => ({
   wrapper: css.css({
     display: "flex",
     alignItems: "center",
@@ -9002,18 +8942,14 @@ const getStyles$f = (theme) => ({
   })
 });
 
-function SecureFieldInput({
-  formField,
-  placeholder,
-  disabled,
-  label
-}) {
+function SecureFieldInput(props) {
   var _a;
+  const { formField, placeholder, disabled } = props;
   const isConfigured = formField.value === SECURE_FIELD_CONFIGURED;
   const [revealed, setRevealed] = React.useState(false);
   const styles = ui.useStyles2(getSecureFieldStyles);
   if (isConfigured) {
-    return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.configuredRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.configuredBadge }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "lock", size: "xs" }), label, " configured"), !disabled && /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", fill: "text", size: "sm", onClick: () => formField.onChange(""), type: "button" }, "Reset"));
+    return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.configuredRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.configuredBadge }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "lock", size: "xs" }), "Configured"), !disabled && /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", fill: "text", size: "sm", onClick: () => formField.onChange(""), type: "button" }, "Reset"));
   }
   return /* @__PURE__ */ React__default.default.createElement(
     ui.Input,
@@ -9042,7 +8978,8 @@ const getSecureFieldStyles = (theme) => ({
   configuredRow: css.css({
     display: "flex",
     alignItems: "center",
-    gap: theme.spacing(1)
+    gap: theme.spacing(1),
+    whiteSpace: "nowrap"
   }),
   configuredBadge: css.css({
     display: "inline-flex",
@@ -9052,108 +8989,180 @@ const getSecureFieldStyles = (theme) => ({
     borderRadius: theme.shape.radius.pill,
     backgroundColor: theme.colors.success.transparent,
     color: theme.colors.success.text,
-    fontSize: theme.typography.bodySmall.fontSize
+    fontSize: theme.typography.bodySmall.fontSize,
+    whiteSpace: "nowrap"
   })
 });
 
-function StringArrayInput({
-  value,
-  onChange,
-  placeholder,
-  disabled
-}) {
-  const [draft, setDraft] = React.useState("");
+const ComplexFieldNote = (props) => {
+  const { count, label } = props;
+  const styles = ui.useStyles2(getStyles$g);
+  return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.note }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs" }), /* @__PURE__ */ React__default.default.createElement("span", null, count > 0 ? `${count} ${label.toLowerCase()} configured.` : `No ${label.toLowerCase()} configured.`, " Configure in Grafana UI."));
+};
+const getStyles$g = (theme) => ({
+  note: css.css({
+    display: "inline-flex",
+    alignItems: "center",
+    gap: theme.spacing(0.5),
+    padding: `${theme.spacing(0.5)} ${theme.spacing(0.75)}`,
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.secondary,
+    backgroundColor: theme.colors.background.secondary,
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`
+  })
+});
+
+function FileUploadField(props) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  const { field, formField, disabled, setValue } = props;
+  const [mode, setModeLocal] = React.useState("upload");
+  const [error, setError] = React.useState(null);
+  const theme = ui.useTheme2();
+  const mapping = (_a = field.ui) == null ? void 0 : _a.fileMapping;
+  const accept = (_c = (_b = field.ui) == null ? void 0 : _b.accept) != null ? _c : [".json"];
+  const setMode = React.useCallback(
+    (next) => {
+      setModeLocal(next);
+      formField.onChange(next);
+    },
+    [formField]
+  );
+  const processJson = React.useCallback(
+    (text) => {
+      const fileMapping = mapping != null ? mapping : {};
+      try {
+        const parsed = JSON.parse(text);
+        if (typeof parsed !== "object" || parsed === null) {
+          setError("Invalid JSON object");
+          return;
+        }
+        const requiredKeys = Object.keys(fileMapping);
+        const missingKeys = requiredKeys.filter((k) => parsed[k] === void 0);
+        if (missingKeys.length > 0) {
+          setError(`Missing keys: ${missingKeys.join(", ")}`);
+          return;
+        }
+        for (const [jsonKey, targetFieldId] of Object.entries(fileMapping)) {
+          if (parsed[jsonKey] !== void 0) {
+            const parts = targetFieldId.split(".");
+            const fk = parts.length === 2 ? parts[1] : targetFieldId;
+            setValue(fk, parsed[jsonKey]);
+          }
+        }
+        setError(null);
+        setModeLocal("manual");
+        formField.onChange("manual");
+      } catch (e) {
+        setError("Invalid JSON");
+      }
+    },
+    [mapping, setValue, formField]
+  );
+  const styles = getStyles$f(theme);
+  if (mode === "manual") {
+    return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.buttonRow }, /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("paste"), disabled }, "Paste JWT Token"), /* @__PURE__ */ React__default.default.createElement("span", { className: styles.separator }, "or"), /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("upload"), disabled }, "Upload JWT Token"));
+  }
+  if (mode === "paste") {
+    return /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(
+      ui.TextArea,
+      {
+        placeholder: (_e = (_d = field.ui) == null ? void 0 : _d.placeholder) != null ? _e : "Paste Google JWT token here",
+        rows: (_g = (_f = field.ui) == null ? void 0 : _f.rows) != null ? _g : 10,
+        onBlur: (e) => {
+          const val = e.currentTarget.value;
+          if (val.trim()) {
+            processJson(val);
+          }
+        },
+        disabled
+      }
+    ), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.buttonRow }, /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("upload"), disabled }, "Upload JWT Token"), /* @__PURE__ */ React__default.default.createElement("span", { className: styles.separator }, "or"), /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("manual"), disabled }, "Fill In JWT Token manually")), error && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.error }, error));
+  }
+  return /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(
+    ui.FileDropzone,
+    {
+      options: { multiple: false, accept: accept.join(",") },
+      readAs: "readAsText",
+      onLoad: (result) => {
+        if (typeof result === "string") {
+          processJson(result);
+        }
+      }
+    }
+  ), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.buttonRow }, /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("paste"), disabled }, "Paste JWT Token"), /* @__PURE__ */ React__default.default.createElement("span", { className: styles.separator }, "or"), /* @__PURE__ */ React__default.default.createElement(ui.Button, { type: "button", fill: "outline", size: "sm", onClick: () => setMode("manual"), disabled }, "Fill In JWT Token manually")), error && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.error }, error));
+}
+function getStyles$f(theme) {
+  return {
+    buttonRow: css.css({
+      marginTop: theme.spacing(1),
+      display: "flex",
+      alignItems: "center",
+      gap: theme.spacing(0.5)
+    }),
+    separator: css.css({
+      padding: `0 ${theme.spacing(0.5)}`,
+      color: theme.colors.text.secondary
+    }),
+    error: css.css({
+      color: theme.colors.error.text,
+      fontSize: theme.typography.bodySmall.fontSize,
+      marginTop: theme.spacing(0.5),
+      display: "block"
+    })
+  };
+}
+
+const IndexedPairEditor = (props) => {
+  const { value, onChange, maxItems = 10, disabled, hideControls, itemLabel = "header" } = props;
   const styles = ui.useStyles2(getStyles$e);
-  const addTag = () => {
-    const trimmed = draft.trim();
-    if (trimmed && !value.includes(trimmed)) {
-      onChange([...value, trimmed]);
+  const items = Array.isArray(value) ? value : [];
+  const addItem = () => {
+    if (items.length >= maxItems) {
+      return;
     }
-    setDraft("");
+    onChange([...items, { index: 0, name: "", value: "" }]);
+  };
+  const removeItem = (index) => {
+    onChange(items.filter((_, i) => i !== index));
   };
-  const removeTag = (tag) => {
-    onChange(value.filter((v) => v !== tag));
+  const updateItem = (index, key, val) => {
+    const updated = items.map((item, i) => i === index ? { ...item, [key]: val } : item);
+    onChange(updated);
   };
-  return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.container }, value.length > 0 && /* @__PURE__ */ React__default.default.createElement("div", { className: styles.tags }, value.map((tag) => /* @__PURE__ */ React__default.default.createElement("span", { key: tag, className: styles.tag }, tag, !disabled && /* @__PURE__ */ React__default.default.createElement(
-    "button",
+  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "column", gap: 0.5 }, items.map((item, i) => /* @__PURE__ */ React__default.default.createElement(
+    IndexedPairRow,
     {
-      type: "button",
-      className: styles.tagRemove,
-      onClick: () => removeTag(tag),
-      "aria-label": `Remove ${tag}`
-    },
-    /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "times", size: "xs" })
-  )))), /* @__PURE__ */ React__default.default.createElement(
+      key: item.index || `new-${i}`,
+      item,
+      index: i,
+      disabled,
+      onUpdate: updateItem,
+      onRemove: removeItem,
+      hideControls,
+      itemLabel
+    }
+  )), !hideControls && items.length < maxItems && /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", size: "sm", icon: "plus", disabled, onClick: addItem, type: "button" }, "Add ", itemLabel)), !hideControls && items.length >= maxItems && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.limitNote }, "Maximum ", maxItems, " ", itemLabel, "s reached"));
+};
+const IndexedPairRow = (props) => {
+  const { item, index, disabled, onUpdate, onRemove, hideControls, itemLabel = "header" } = props;
+  const styles = ui.useStyles2(getStyles$e);
+  const secureStyles = ui.useStyles2(getSecureFieldStyles);
+  const isConfigured = item.value === SECURE_FIELD_CONFIGURED;
+  const [editing, setEditing] = React.useState(false);
+  const [revealed, setRevealed] = React.useState(false);
+  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "row", gap: 1 }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.inputCell }, /* @__PURE__ */ React__default.default.createElement(
     ui.Input,
     {
-      value: draft,
-      onChange: (e) => setDraft(e.currentTarget.value),
+      value: item.name,
+      placeholder: "key",
+      disabled: disabled || hideControls,
+      onChange: (e) => onUpdate(index, "name", e.currentTarget.value),
       onKeyDown: (e) => {
         if (e.key === "Enter") {
           e.preventDefault();
-          addTag();
         }
-      },
-      onBlur: addTag,
-      placeholder,
-      disabled
-    }
-  ));
-}
-const getStyles$e = (theme) => ({
-  container: css.css({
-    display: "flex",
-    flexDirection: "column",
-    gap: theme.spacing(0.5)
-  }),
-  tags: css.css({
-    display: "flex",
-    flexWrap: "wrap",
-    gap: theme.spacing(0.5)
-  }),
-  tag: css.css({
-    display: "inline-flex",
-    alignItems: "center",
-    gap: theme.spacing(0.25),
-    padding: `${theme.spacing(0.25)} ${theme.spacing(0.75)}`,
-    borderRadius: theme.shape.radius.pill,
-    backgroundColor: theme.colors.background.secondary,
-    border: `1px solid ${theme.colors.border.weak}`,
-    fontSize: theme.typography.bodySmall.fontSize,
-    color: theme.colors.text.primary
-  }),
-  tagRemove: css.css({
-    display: "inline-flex",
-    alignItems: "center",
-    padding: 0,
-    border: "none",
-    backgroundColor: "transparent",
-    cursor: "pointer",
-    color: theme.colors.text.secondary,
-    "&:hover": { color: theme.colors.text.primary }
-  })
-});
-
-function IndexedPairRow({
-  item,
-  index,
-  disabled,
-  onUpdate,
-  onRemove,
-  hideControls
-}) {
-  const styles = ui.useStyles2(getStyles$d);
-  const secureStyles = ui.useStyles2(getSecureFieldStyles);
-  const isConfigured = item.value === SECURE_FIELD_CONFIGURED;
-  const [editing, setEditing] = React.useState(false);
-  const [revealed, setRevealed] = React.useState(false);
-  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "row", gap: 1 }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.inputCell }, /* @__PURE__ */ React__default.default.createElement(
-    ui.Input,
-    {
-      value: item.name,
-      placeholder: "Header name",
-      disabled: disabled || hideControls,
-      onChange: (e) => onUpdate(index, "name", e.currentTarget.value)
+      }
     }
   )), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.inputCell }, isConfigured && !editing ? /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "row", gap: 1, alignItems: "center" }, /* @__PURE__ */ React__default.default.createElement("span", { className: secureStyles.configuredBadge }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "lock", size: "xs" }), "Configured"), !disabled && /* @__PURE__ */ React__default.default.createElement(
     ui.Button,
@@ -9172,10 +9181,15 @@ function IndexedPairRow({
     ui.Input,
     {
       value: item.value === SECURE_FIELD_CONFIGURED ? "" : item.value,
-      placeholder: "Header value",
+      placeholder: `${itemLabel} value`,
       disabled,
       type: revealed ? "text" : "password",
       onChange: (e) => onUpdate(index, "value", e.currentTarget.value),
+      onKeyDown: (e) => {
+        if (e.key === "Enter") {
+          e.preventDefault();
+        }
+      },
       suffix: /* @__PURE__ */ React__default.default.createElement(
         ui.Button,
         {
@@ -9189,34 +9203,56 @@ function IndexedPairRow({
         }
       )
     }
-  )), !hideControls && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: "Remove header" }, /* @__PURE__ */ React__default.default.createElement(
+  )), !hideControls && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: `Remove ${itemLabel}` }, /* @__PURE__ */ React__default.default.createElement(
     ui.Button,
     {
       variant: "secondary",
       fill: "text",
       size: "sm",
       icon: "trash-alt",
-      "aria-label": "Remove header",
+      "aria-label": `Remove ${itemLabel}`,
       disabled,
       onClick: () => onRemove(index),
       type: "button"
     }
   )));
-}
-function IndexedPairEditor({
-  value,
-  onChange,
-  maxItems = 10,
-  disabled,
-  hideControls
-}) {
+};
+const getStyles$e = (theme) => ({
+  inputCell: css.css({
+    flex: "1 1 0",
+    minWidth: 0,
+    overflow: "hidden"
+  }),
+  limitNote: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.secondary
+  })
+});
+
+function ObjectArrayEditor(props) {
+  var _a, _b, _c, _d, _e, _f;
+  const { field, value, onChange, disabled, errorMessage } = props;
   const styles = ui.useStyles2(getStyles$d);
+  const itemFields = (_b = (_a = field.item) == null ? void 0 : _a.fields) != null ? _b : [];
+  const layoutRows = computeLayoutRows(itemFields);
   const items = Array.isArray(value) ? value : [];
+  const maxItems = (_e = (_d = (_c = field.validations) == null ? void 0 : _c.find((v) => v.type === "itemCount")) == null ? void 0 : _d.max) != null ? _e : 20;
+  const label = (_f = field.label) != null ? _f : field.key;
+  const itemErrors = parseItemErrors(errorMessage);
   const addItem = () => {
+    var _a2, _b2;
     if (items.length >= maxItems) {
       return;
     }
-    onChange([...items, { index: 0, name: "", value: "" }]);
+    const empty = {};
+    for (const f of itemFields) {
+      if (f.valueType === "boolean") {
+        empty[f.key] = (_a2 = f.defaultValue) != null ? _a2 : false;
+      } else {
+        empty[f.key] = (_b2 = f.defaultValue) != null ? _b2 : "";
+      }
+    }
+    onChange([...items, empty]);
   };
   const removeItem = (index) => {
     onChange(items.filter((_, i) => i !== index));
@@ -9225,78 +9261,241 @@ function IndexedPairEditor({
     const updated = items.map((item, i) => i === index ? { ...item, [key]: val } : item);
     onChange(updated);
   };
-  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "column", gap: 0.5 }, items.map((item, i) => /* @__PURE__ */ React__default.default.createElement(
-    IndexedPairRow,
+  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "column", gap: 1 }, items.map((item, i) => /* @__PURE__ */ React__default.default.createElement(
+    ObjectArrayItemRow,
     {
-      key: item.index || `new-${i}`,
+      key: i,
       item,
       index: i,
-      disabled,
+      itemFields,
+      layoutRows,
+      disabled: !!disabled,
       onUpdate: updateItem,
       onRemove: removeItem,
-      hideControls
+      showLabels: true,
+      error: itemErrors == null ? void 0 : itemErrors[i]
+    }
+  )), items.length < maxItems && /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", size: "sm", icon: "plus", disabled, onClick: addItem, type: "button" }, "Add ", label.toLowerCase())), items.length >= maxItems && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.limitNote }, "Maximum ", maxItems, " items reached"));
+}
+function computeLayoutRows(fields) {
+  var _a;
+  const hasExplicitRow = fields.some((f) => {
+    var _a2;
+    return ((_a2 = f.ui) == null ? void 0 : _a2.row) !== void 0;
+  });
+  if (!hasExplicitRow) {
+    if (fields.length <= 3) {
+      return [fields];
+    }
+    return fields.map((f) => [f]);
+  }
+  const rowMap = /* @__PURE__ */ new Map();
+  const noRow = [];
+  for (const f of fields) {
+    if (((_a = f.ui) == null ? void 0 : _a.row) !== void 0) {
+      const existing = rowMap.get(f.ui.row);
+      if (existing) {
+        existing.push(f);
+      } else {
+        rowMap.set(f.ui.row, [f]);
+      }
+    } else {
+      noRow.push(f);
+    }
+  }
+  const sortedKeys = [...rowMap.keys()].sort((a, b) => a - b);
+  const rows = sortedKeys.map((k) => rowMap.get(k));
+  for (const f of noRow) {
+    rows.push([f]);
+  }
+  return rows;
+}
+function makeItemFormField(item, index, fieldKey, onUpdate) {
+  return {
+    name: `item-${index}-${fieldKey}`,
+    value: item[fieldKey],
+    onChange: (eventOrValue) => {
+      if (eventOrValue != null && typeof eventOrValue === "object" && "target" in eventOrValue) {
+        onUpdate(index, fieldKey, eventOrValue.target.value);
+      } else {
+        onUpdate(index, fieldKey, eventOrValue);
+      }
+    },
+    onBlur: () => {
+    }
+  };
+}
+function effectiveItemField(field, isSecure) {
+  if (!isSecure) {
+    return field;
+  }
+  return { ...field, semanticType: "password" };
+}
+function ObjectArrayItemRow({
+  item,
+  index,
+  itemFields,
+  layoutRows,
+  disabled,
+  onUpdate,
+  onRemove,
+  showLabels,
+  error
+}) {
+  const styles = ui.useStyles2(getStyles$d);
+  const secureOverride = findActiveSecureOverride(itemFields, item, index);
+  return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.itemRow }, layoutRows.map((row, rowIdx) => /* @__PURE__ */ React__default.default.createElement(ui.Stack, { key: rowIdx, direction: "row", gap: 1, alignItems: "flex-end", wrap: "wrap" }, row.map((field) => {
+    var _a;
+    const isSecureTarget = (secureOverride == null ? void 0 : secureOverride.fieldKey) === field.key;
+    const eff = effectiveItemField(field, !!isSecureTarget);
+    const formField = makeItemFormField(item, index, field.key, onUpdate);
+    if (isSecureTarget && item[field.key] === SECURE_FIELD_CONFIGURED) {
+      formField.value = SECURE_FIELD_CONFIGURED;
+    }
+    return /* @__PURE__ */ React__default.default.createElement("div", { key: field.key, className: field.valueType === "boolean" ? styles.boolCell : styles.inputCell }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.cellLabel }, (_a = field.label) != null ? _a : field.key, field.required && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.required }, " *")), renderFieldInput(eff, formField, disabled));
+  }), rowIdx === 0 && /* @__PURE__ */ React__default.default.createElement("div", { className: styles.removeCellWithLabel }, /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: "Remove" }, /* @__PURE__ */ React__default.default.createElement(
+    ui.Button,
+    {
+      variant: "secondary",
+      fill: "text",
+      size: "sm",
+      icon: "trash-alt",
+      "aria-label": "Remove item",
+      disabled,
+      onClick: () => onRemove(index),
+      type: "button"
     }
-  )), !hideControls && items.length < maxItems && /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", size: "sm", icon: "plus", disabled, onClick: addItem, type: "button" }, "Add header")), !hideControls && items.length >= maxItems && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.limitNote }, "Maximum ", maxItems, " headers reached"));
+  ))))), error && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.itemError }, error));
 }
 const getStyles$d = (theme) => ({
+  itemRow: css.css({
+    display: "flex",
+    flexDirection: "column",
+    gap: theme.spacing(0.5),
+    padding: theme.spacing(1),
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`
+  }),
   inputCell: css.css({
-    flex: "1 1 0",
-    minWidth: 0,
+    flex: "1 1 120px",
+    minWidth: 120,
     overflow: "hidden"
   }),
+  boolCell: css.css({
+    flex: "0 0 auto",
+    minWidth: 0
+  }),
+  cellLabel: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.secondary,
+    marginBottom: theme.spacing(0.25)
+  }),
+  required: css.css({
+    color: theme.colors.error.text
+  }),
+  removeCellWithLabel: css.css({
+    flex: "0 0 auto",
+    display: "flex",
+    alignItems: "flex-end",
+    paddingBottom: theme.spacing(0.25)
+  }),
+  itemError: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.error.text
+  }),
   limitNote: css.css({
     fontSize: theme.typography.bodySmall.fontSize,
     color: theme.colors.text.secondary
   })
 });
 
-function ComplexFieldNote({ count, label }) {
+const StringArrayInput = (props) => {
+  const { value, onChange, placeholder, disabled, itemLabel = "item" } = props;
   const styles = ui.useStyles2(getStyles$c);
-  return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.note }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs" }), /* @__PURE__ */ React__default.default.createElement("span", null, count > 0 ? `${count} ${label.toLowerCase()} configured.` : `No ${label.toLowerCase()} configured.`, " Configure in Grafana UI."));
-}
+  const items = Array.isArray(value) ? value : [];
+  const lastInputRef = React.useRef(null);
+  const shouldFocusLastRef = React.useRef(false);
+  React.useEffect(() => {
+    if (shouldFocusLastRef.current && lastInputRef.current) {
+      lastInputRef.current.focus();
+      shouldFocusLastRef.current = false;
+    }
+  }, [items.length]);
+  const addItem = () => {
+    shouldFocusLastRef.current = true;
+    onChange([...items, ""]);
+  };
+  const removeItem = (index) => {
+    onChange(items.filter((_, i) => i !== index));
+  };
+  const updateItem = (index, val) => {
+    onChange(items.map((item, i) => i === index ? val : item));
+  };
+  const isItemValid = (index, val) => {
+    const trimmed = val.trim();
+    if (trimmed === "") {
+      return false;
+    }
+    return !items.some((item, i) => i !== index && item.trim() === trimmed);
+  };
+  const handleEnter = (index, currentValue) => {
+    if (!isItemValid(index, currentValue)) {
+      return;
+    }
+    if (index === items.length - 1) {
+      shouldFocusLastRef.current = true;
+      onChange([...items, ""]);
+    }
+  };
+  return /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "column", gap: 0.5 }, items.map((item, i) => /* @__PURE__ */ React__default.default.createElement(ui.Stack, { direction: "row", gap: 1, key: i }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.inputCell }, /* @__PURE__ */ React__default.default.createElement(
+    ui.Input,
+    {
+      ref: i === items.length - 1 ? lastInputRef : void 0,
+      value: item,
+      placeholder: placeholder != null ? placeholder : itemLabel,
+      disabled,
+      onChange: (e) => updateItem(i, e.currentTarget.value),
+      onKeyDown: (e) => {
+        if (e.key === "Enter") {
+          e.preventDefault();
+          handleEnter(i, e.currentTarget.value);
+        }
+      }
+    }
+  )), !disabled && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: `Remove ${itemLabel}` }, /* @__PURE__ */ React__default.default.createElement(
+    ui.Button,
+    {
+      variant: "secondary",
+      fill: "text",
+      size: "sm",
+      icon: "trash-alt",
+      "aria-label": `Remove ${itemLabel}`,
+      onClick: () => removeItem(i),
+      type: "button"
+    }
+  )))), !disabled && /* @__PURE__ */ React__default.default.createElement("div", null, /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "secondary", size: "sm", icon: "plus", onClick: addItem, type: "button" }, "Add")));
+};
 const getStyles$c = (theme) => ({
-  note: css.css({
-    display: "inline-flex",
-    alignItems: "center",
-    gap: theme.spacing(0.5),
-    padding: `${theme.spacing(0.5)} ${theme.spacing(0.75)}`,
-    fontSize: theme.typography.bodySmall.fontSize,
-    color: theme.colors.text.secondary,
-    backgroundColor: theme.colors.background.secondary,
-    borderRadius: theme.shape.radius.default,
-    border: `1px solid ${theme.colors.border.weak}`
+  inputCell: css.css({
+    flex: "1 1 0",
+    minWidth: 0,
+    overflow: "hidden"
   })
 });
 
-function renderFieldInput(field, formField, disabled) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+function renderFieldInput(field, formField, disabled, errorMessage, setValue) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
   const value = formField.value;
   const placeholder = (_a = field.ui) == null ? void 0 : _a.placeholder;
   const label = (_b = field.label) != null ? _b : field.key;
+  if (((_c = field.ui) == null ? void 0 : _c.component) === "fileUpload" && field.ui.fileMapping && setValue) {
+    return /* @__PURE__ */ React__default.default.createElement(FileUploadField, { field, formField, disabled, setValue });
+  }
   if (field.target === "secureJsonData" || field.semanticType === "password" || field.semanticType === "token") {
     return /* @__PURE__ */ React__default.default.createElement(SecureFieldInput, { formField, placeholder: placeholder != null ? placeholder : label, disabled, label });
   }
-  if (field.valueType === "boolean") {
-    return /* @__PURE__ */ React__default.default.createElement(ui.Switch, { value: !!value, onChange: (e) => formField.onChange(e.currentTarget.checked), disabled });
-  }
-  if (field.valueType === "number") {
-    return /* @__PURE__ */ React__default.default.createElement(
-      ui.Input,
-      {
-        ...formField,
-        value: value !== void 0 && value !== null ? Number(value) : "",
-        type: "number",
-        placeholder,
-        disabled,
-        onChange: (e) => {
-          const n = e.currentTarget.valueAsNumber;
-          formField.onChange(Number.isNaN(n) ? void 0 : n);
-        }
-      }
-    );
-  }
-  if (((_c = field.ui) == null ? void 0 : _c.component) === "radio") {
-    const options = ((_e = (_d = field.ui) == null ? void 0 : _d.options) != null ? _e : []).map((opt) => ({
+  if (((_d = field.ui) == null ? void 0 : _d.component) === "radio") {
+    const options = ((_f = (_e = field.ui) == null ? void 0 : _e.options) != null ? _f : []).map((opt) => ({
       label: opt.label,
       value: String(opt.value),
       description: opt.description
@@ -9306,13 +9505,20 @@ function renderFieldInput(field, formField, disabled) {
       {
         options,
         value: String(value != null ? value : ""),
-        onChange: (v) => formField.onChange(v),
+        onChange: (v) => {
+          if (field.valueType === "number") {
+            const n = Number(v);
+            formField.onChange(Number.isNaN(n) ? v : n);
+          } else {
+            formField.onChange(v);
+          }
+        },
         disabled
       }
     ));
   }
-  if (((_f = field.ui) == null ? void 0 : _f.component) === "select") {
-    const options = ((_h = (_g = field.ui) == null ? void 0 : _g.options) != null ? _h : []).map((opt) => ({
+  if (((_g = field.ui) == null ? void 0 : _g.component) === "select") {
+    const options = ((_i = (_h = field.ui) == null ? void 0 : _h.options) != null ? _i : []).map((opt) => ({
       label: opt.label,
       value: String(opt.value),
       description: opt.description
@@ -9327,10 +9533,29 @@ function renderFieldInput(field, formField, disabled) {
       }
     );
   }
+  if (field.valueType === "boolean") {
+    return /* @__PURE__ */ React__default.default.createElement(ui.Switch, { value: !!value, onChange: (e) => formField.onChange(e.currentTarget.checked), disabled });
+  }
+  if (field.valueType === "number") {
+    return /* @__PURE__ */ React__default.default.createElement(
+      ui.Input,
+      {
+        ...formField,
+        value: value !== void 0 && value !== null ? Number(value) : "",
+        type: "number",
+        placeholder,
+        disabled,
+        onChange: (e) => {
+          const n = e.currentTarget.valueAsNumber;
+          formField.onChange(Number.isNaN(n) ? void 0 : n);
+        }
+      }
+    );
+  }
   if (field.semanticType === "url") {
     return /* @__PURE__ */ React__default.default.createElement(ui.Input, { ...formField, value: String(value != null ? value : ""), type: "url", placeholder, disabled });
   }
-  if (((_i = field.ui) == null ? void 0 : _i.component) === "textarea") {
+  if (((_j = field.ui) == null ? void 0 : _j.component) === "textarea") {
     return /* @__PURE__ */ React__default.default.createElement(
       ui.TextArea,
       {
@@ -9338,245 +9563,54 @@ function renderFieldInput(field, formField, disabled) {
         value: String(value != null ? value : ""),
         placeholder,
         disabled,
-        rows: (_k = (_j = field.ui) == null ? void 0 : _j.rows) != null ? _k : 3
+        rows: (_l = (_k = field.ui) == null ? void 0 : _k.rows) != null ? _l : 3
       }
     );
   }
-  if (field.valueType === "array" && ((_l = field.item) == null ? void 0 : _l.valueType) === "string") {
+  if (((_m = field.storage) == null ? void 0 : _m.type) === "indexedPair") {
+    const items = Array.isArray(value) ? value : [];
+    const maxItems = (_p = (_o = (_n = field.validations) == null ? void 0 : _n.find((v) => v.type === "itemCount")) == null ? void 0 : _o.max) != null ? _p : 10;
+    const itemLabel = (_r = (_q = field.label) == null ? void 0 : _q.toLowerCase().replace(/s$/, "")) != null ? _r : "header";
     return /* @__PURE__ */ React__default.default.createElement(
-      StringArrayInput,
+      IndexedPairEditor,
       {
-        value: Array.isArray(value) ? value : [],
+        value: items,
         onChange: formField.onChange,
-        placeholder: placeholder != null ? placeholder : `Add ${label.toLowerCase()}\u2026`,
-        disabled
+        maxItems,
+        disabled,
+        itemLabel
       }
     );
   }
-  if (((_m = field.storage) == null ? void 0 : _m.type) === "indexedPair") {
-    const items = Array.isArray(value) ? value : [];
-    const maxItems = (_p = (_o = (_n = field.validations) == null ? void 0 : _n.find((v) => v.type === "itemCount")) == null ? void 0 : _o.max) != null ? _p : 10;
-    return /* @__PURE__ */ React__default.default.createElement(IndexedPairEditor, { value: items, onChange: formField.onChange, maxItems, disabled });
-  }
-  if (field.valueType === "object" || field.valueType === "map" || field.valueType === "array" && (((_q = field.item) == null ? void 0 : _q.valueType) === "object" || ((_r = field.item) == null ? void 0 : _r.valueType) === "map")) {
-    const count = Array.isArray(value) ? value.length : 0;
-    return /* @__PURE__ */ React__default.default.createElement(ComplexFieldNote, { count, label });
-  }
-  return /* @__PURE__ */ React__default.default.createElement(ui.Input, { ...formField, value: String(value != null ? value : ""), placeholder, disabled });
-}
-
-const getWizardStyles = (theme) => ({
-  container: css.css({
-    position: "relative",
-    display: "flex",
-    flexDirection: "column",
-    gap: theme.spacing(1),
-    padding: theme.spacing(1.5),
-    backgroundColor: theme.colors.background.secondary,
-    borderRadius: theme.shape.radius.default,
-    border: `1px solid ${theme.colors.border.weak}`,
-    overflow: "hidden"
-  }),
-  overlay: css.css({
-    position: "absolute",
-    inset: 0,
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    gap: theme.spacing(1),
-    background: theme.colors.background.secondary,
-    borderRadius: theme.shape.radius.default,
-    zIndex: 1,
-    fontSize: theme.typography.bodySmall.fontSize,
-    color: theme.colors.text.primary,
-    opacity: 0.95
-  }),
-  readOnlyBanner: css.css({
-    display: "inline-flex",
-    alignItems: "center",
-    gap: theme.spacing(0.5),
-    padding: `${theme.spacing(0.25)} ${theme.spacing(0.75)}`,
-    fontSize: theme.typography.bodySmall.fontSize,
-    color: theme.colors.text.secondary,
-    backgroundColor: theme.colors.background.secondary,
-    borderRadius: theme.shape.radius.default,
-    border: `1px solid ${theme.colors.border.weak}`
-  }),
-  navBar: css.css({
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "space-between"
-  }),
-  navTitle: css.css({
-    display: "inline-flex",
-    alignItems: "center",
-    gap: theme.spacing(0.5),
-    fontSize: theme.typography.body.fontSize,
-    fontWeight: theme.typography.fontWeightBold,
-    color: theme.colors.text.primary
-  }),
-  stepCount: css.css({
-    fontSize: "11px",
-    fontWeight: "normal",
-    color: theme.colors.text.secondary
-  }),
-  navActions: css.css({
-    display: "flex",
-    alignItems: "center",
-    gap: theme.spacing(0.25)
-  }),
-  form: css.css({
-    display: "flex",
-    flexDirection: "column",
-    gap: theme.spacing(0.75)
-  }),
-  buttons: css.css({
-    display: "flex",
-    gap: theme.spacing(1),
-    paddingTop: theme.spacing(0.25)
-  }),
-  fieldRow: css.css({
-    display: "grid",
-    gridTemplateColumns: "minmax(80px, 1fr) minmax(0, 2fr)",
-    gap: theme.spacing(0.75),
-    alignItems: "start"
-  }),
-  fieldRowCenter: css.css({
-    display: "grid",
-    gridTemplateColumns: "minmax(80px, 1fr) minmax(0, 2fr)",
-    gap: theme.spacing(0.75),
-    alignItems: "center",
-    padding: `${theme.spacing(0.5)} 0`
-  }),
-  fieldLabelRow: css.css({
-    display: "flex",
-    alignItems: "center",
-    gap: theme.spacing(0.5),
-    paddingTop: theme.spacing(0.5)
-  }),
-  fieldLabelRowCompact: css.css({
-    display: "flex",
-    alignItems: "center",
-    gap: theme.spacing(0.5)
-  }),
-  fieldLabel: css.css({
-    fontSize: theme.typography.bodySmall.fontSize,
-    fontWeight: theme.typography.fontWeightMedium,
-    color: theme.colors.text.primary
-  }),
-  fieldRequired: css.css({
-    color: theme.colors.error.text,
-    marginLeft: 2
-  }),
-  fieldInfoIcon: css.css({
-    color: theme.colors.text.disabled,
-    cursor: "help",
-    flexShrink: 0
-  }),
-  fieldInputCol: css.css({
-    display: "flex",
-    flexDirection: "column",
-    gap: theme.spacing(0.25),
-    minWidth: 0
-  }),
-  fieldError: css.css({
-    fontSize: "11px",
-    color: theme.colors.error.text
-  })
-});
-
-function SchemaField({ field, control, errors, disabled, dsUid, watchedValues, fieldById }) {
-  const styles = ui.useStyles2(getWizardStyles);
-  const activeOverride = resolveActiveOverride(field, watchedValues, fieldById);
-  const fk = formKey(field);
-  if (field.key === "pdcInjected" && field.target === "jsonData") {
+  if (field.valueType === "array" && ((_s = field.item) == null ? void 0 : _s.valueType) === "string") {
     return /* @__PURE__ */ React__default.default.createElement(
-      reactHookForm.Controller,
+      StringArrayInput,
       {
-        name: fk,
-        control,
-        render: ({ field: formField }) => /* @__PURE__ */ React__default.default.createElement(
-          PdcFieldNote,
-          {
-            enabled: !!formField.value,
-            description: field.description,
-            configUrl: `/connections/datasources/edit/${dsUid}`
-          }
-        )
+        value: Array.isArray(value) ? value : [],
+        onChange: formField.onChange,
+        placeholder,
+        disabled,
+        itemLabel: label.toLowerCase().replace(/s$/, "")
       }
     );
   }
-  const required = isFieldRequired(field, watchedValues, fieldById);
-  const validationRules = buildValidationRules(field, required);
-  return /* @__PURE__ */ React__default.default.createElement(
-    reactHookForm.Controller,
-    {
-      name: fk,
-      control,
-      rules: validationRules,
-      render: ({ field: formField }) => {
-        var _a, _b, _c, _d, _e;
-        const errorMessage = (_a = errors[fk]) == null ? void 0 : _a.message;
-        const label = (_b = field.label) != null ? _b : field.key;
-        const description = (_c = activeOverride == null ? void 0 : activeOverride.description) != null ? _c : field.description;
-        const effectiveField = activeOverride ? {
-          ...field,
-          ui: {
-            ...field.ui,
-            placeholder: (_e = activeOverride.placeholder) != null ? _e : (_d = field.ui) == null ? void 0 : _d.placeholder
-          }
-        } : field;
-        const isReadOnly = !!(activeOverride == null ? void 0 : activeOverride.readOnly);
-        const isBool = field.valueType === "boolean";
-        return /* @__PURE__ */ React__default.default.createElement("div", { className: isBool ? styles.fieldRowCenter : styles.fieldRow }, /* @__PURE__ */ React__default.default.createElement("div", { className: isBool ? styles.fieldLabelRowCompact : styles.fieldLabelRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldLabel }, label, required && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldRequired }, "*")), description && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: description }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs", className: styles.fieldInfoIcon }))), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldInputCol }, renderFieldInput(effectiveField, formField, disabled || isReadOnly), errorMessage && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldError }, errorMessage)));
-      }
-    }
-  );
-}
-
-function AuthorizationHeaderField({
-  headersFieldKey,
-  control,
-  disabled,
-  watchedValues
-}) {
-  const styles = ui.useStyles2(getWizardStyles);
-  const items = React.useMemo(
-    () => Array.isArray(watchedValues[headersFieldKey]) ? watchedValues[headersFieldKey] : [],
-    [watchedValues, headersFieldKey]
-  );
-  const authEntries = React.useMemo(() => {
-    const entries = [];
-    for (let i = 0; i < items.length; i++) {
-      if (items[i].name.toLowerCase() === "authorization") {
-        entries.push({ item: items[i], originalIdx: i });
+  if (field.valueType === "array" && ((_t = field.item) == null ? void 0 : _t.valueType) === "object" && ((_u = field.item.fields) == null ? void 0 : _u.length)) {
+    return /* @__PURE__ */ React__default.default.createElement(
+      ObjectArrayEditor,
+      {
+        field,
+        value,
+        onChange: formField.onChange,
+        disabled,
+        errorMessage
       }
-    }
-    return entries;
-  }, [items]);
-  if (authEntries.length === 0) {
-    return null;
+    );
   }
-  const authItems = authEntries.map((e) => e.item);
-  return /* @__PURE__ */ React__default.default.createElement(
-    reactHookForm.Controller,
-    {
-      name: headersFieldKey,
-      control,
-      render: ({ field: formField }) => {
-        const handleChange = (updatedAuthItems) => {
-          const updated = [...items];
-          for (let i = 0; i < authEntries.length; i++) {
-            if (i < updatedAuthItems.length) {
-              updated[authEntries[i].originalIdx] = updatedAuthItems[i];
-            }
-          }
-          formField.onChange(updated);
-        };
-        return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldRow }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldLabelRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldLabel }, "Custom HTTP Headers"), /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: "Authorization HTTP header(s) sent with every request." }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs", className: styles.fieldInfoIcon }))), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldInputCol }, /* @__PURE__ */ React__default.default.createElement(IndexedPairEditor, { value: authItems, onChange: handleChange, disabled, hideControls: true })));
-      }
-    }
-  );
+  if (field.valueType === "object" || field.valueType === "map" || field.valueType === "array" && (((_v = field.item) == null ? void 0 : _v.valueType) === "object" || ((_w = field.item) == null ? void 0 : _w.valueType) === "map")) {
+    const count = Array.isArray(value) ? value.length : 0;
+    return /* @__PURE__ */ React__default.default.createElement(ComplexFieldNote, { count, label });
+  }
+  return /* @__PURE__ */ React__default.default.createElement(ui.Input, { ...formField, value: String(value != null ? value : ""), placeholder, disabled });
 }
 
 const getTabStyles = (theme) => ({
@@ -9627,7 +9661,7 @@ const getTabStyles = (theme) => ({
     width: 12,
     flexShrink: 0,
     alignSelf: "flex-start",
-    paddingTop: 4
+    paddingTop: theme.spacing(0.5)
   }),
   navDot: css.css({
     width: 10,
@@ -9673,7 +9707,7 @@ const getTabStyles = (theme) => ({
   }),
   navLabel: css.css({
     fontSize: theme.typography.body.fontSize,
-    color: "rgba(204, 204, 220, 0.65)",
+    color: theme.colors.text.secondary,
     lineHeight: 1.4
   }),
   navLabelActive: css.css({
@@ -9755,8 +9789,8 @@ const getTabStyles = (theme) => ({
     textAlign: "left"
   }),
   sectionBadge: css.css({
-    fontSize: "11px",
-    fontWeight: "normal",
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.fontWeightRegular,
     color: theme.colors.text.disabled,
     border: `1px solid ${theme.colors.border.weak}`,
     borderRadius: theme.shape.radius.pill,
@@ -9815,6 +9849,226 @@ const getTabStyles = (theme) => ({
     marginBottom: theme.spacing(1)
   })
 });
+const getWizardStyles = (theme) => ({
+  container: css.css({
+    position: "relative",
+    display: "flex",
+    flexDirection: "column",
+    gap: theme.spacing(1),
+    padding: theme.spacing(1.5),
+    backgroundColor: theme.colors.background.secondary,
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`,
+    overflow: "hidden"
+  }),
+  overlay: css.css({
+    position: "absolute",
+    inset: 0,
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing(1),
+    background: theme.colors.background.secondary,
+    borderRadius: theme.shape.radius.default,
+    zIndex: 1,
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.primary,
+    opacity: 0.95
+  }),
+  readOnlyBanner: css.css({
+    display: "inline-flex",
+    alignItems: "center",
+    gap: theme.spacing(0.5),
+    padding: `${theme.spacing(0.25)} ${theme.spacing(0.75)}`,
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.text.secondary,
+    backgroundColor: theme.colors.background.secondary,
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`
+  }),
+  navBar: css.css({
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between"
+  }),
+  navTitle: css.css({
+    display: "inline-flex",
+    alignItems: "center",
+    gap: theme.spacing(0.5),
+    fontSize: theme.typography.body.fontSize,
+    fontWeight: theme.typography.fontWeightBold,
+    color: theme.colors.text.primary
+  }),
+  stepCount: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.fontWeightRegular,
+    color: theme.colors.text.secondary
+  }),
+  navActions: css.css({
+    display: "flex",
+    alignItems: "center",
+    gap: theme.spacing(0.25)
+  }),
+  form: css.css({
+    display: "flex",
+    flexDirection: "column",
+    gap: theme.spacing(0.75)
+  }),
+  buttons: css.css({
+    display: "flex",
+    gap: theme.spacing(1),
+    paddingTop: theme.spacing(0.25)
+  }),
+  fieldRow: css.css({
+    display: "grid",
+    gridTemplateColumns: "minmax(80px, 1fr) minmax(0, 2fr)",
+    gap: theme.spacing(0.75),
+    alignItems: "start"
+  }),
+  fieldRowCenter: css.css({
+    display: "grid",
+    gridTemplateColumns: "minmax(80px, 1fr) minmax(0, 2fr)",
+    gap: theme.spacing(0.75),
+    alignItems: "center",
+    padding: `${theme.spacing(0.5)} 0`
+  }),
+  fieldLabelRow: css.css({
+    display: "flex",
+    alignItems: "center",
+    gap: theme.spacing(0.5),
+    paddingTop: theme.spacing(0.5)
+  }),
+  fieldLabelRowCompact: css.css({
+    display: "flex",
+    alignItems: "center",
+    gap: theme.spacing(0.5)
+  }),
+  fieldLabel: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    fontWeight: theme.typography.fontWeightMedium,
+    color: theme.colors.text.primary
+  }),
+  fieldRequired: css.css({
+    color: theme.colors.error.text,
+    marginLeft: 2
+  }),
+  fieldInfoIcon: css.css({
+    color: theme.colors.text.disabled,
+    cursor: "help",
+    flexShrink: 0
+  }),
+  fieldInputCol: css.css({
+    display: "flex",
+    flexDirection: "column",
+    gap: theme.spacing(0.25),
+    minWidth: 0
+  }),
+  fieldError: css.css({
+    fontSize: theme.typography.bodySmall.fontSize,
+    color: theme.colors.error.text
+  })
+});
+
+function SchemaField({
+  field,
+  control,
+  errors,
+  disabled,
+  dsUid,
+  watchedValues,
+  fieldById,
+  celContext,
+  setValue
+}) {
+  const styles = ui.useStyles2(getWizardStyles);
+  const activeOverride = useDatasourceSchema.resolveActiveOverride(field, watchedValues, fieldById);
+  const fk = useDatasourceSchema.formKey(field);
+  if (field.key === "pdcInjected" && field.target === "jsonData") {
+    return /* @__PURE__ */ React__default.default.createElement(
+      reactHookForm.Controller,
+      {
+        name: fk,
+        control,
+        render: ({ field: formField }) => /* @__PURE__ */ React__default.default.createElement(
+          PdcFieldNote,
+          {
+            enabled: !!formField.value,
+            description: field.description,
+            configUrl: `/connections/datasources/edit/${dsUid}`
+          }
+        )
+      }
+    );
+  }
+  const required = isFieldRequired(field, watchedValues, fieldById, celContext);
+  const validationRules = buildValidationRules(field, required);
+  return /* @__PURE__ */ React__default.default.createElement(
+    reactHookForm.Controller,
+    {
+      name: fk,
+      control,
+      rules: validationRules,
+      render: ({ field: formField }) => {
+        var _a, _b, _c, _d, _e;
+        const errorMessage = (_a = errors[fk]) == null ? void 0 : _a.message;
+        const label = (_b = field.label) != null ? _b : field.key;
+        const description = (_c = activeOverride == null ? void 0 : activeOverride.description) != null ? _c : field.description;
+        const effectiveField = activeOverride ? {
+          ...field,
+          description,
+          ui: {
+            ...field.ui,
+            placeholder: (_e = activeOverride.placeholder) != null ? _e : (_d = field.ui) == null ? void 0 : _d.placeholder
+          }
+        } : field;
+        const isReadOnly = !!(activeOverride == null ? void 0 : activeOverride.readOnly);
+        const isBool = field.valueType === "boolean";
+        return /* @__PURE__ */ React__default.default.createElement("div", { className: isBool ? styles.fieldRowCenter : styles.fieldRow }, /* @__PURE__ */ React__default.default.createElement("div", { className: isBool ? styles.fieldLabelRowCompact : styles.fieldLabelRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldLabel }, label, required && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldRequired }, "*")), description && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: description }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs", className: styles.fieldInfoIcon }))), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldInputCol }, renderFieldInput(effectiveField, formField, disabled || isReadOnly, errorMessage, setValue), errorMessage && !parseItemErrors(errorMessage) && /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldError }, errorMessage)));
+      }
+    }
+  );
+}
+
+const AuthorizationHeaderField = (props) => {
+  const { headersFieldKey, control, disabled, watchedValues } = props;
+  const styles = ui.useStyles2(getWizardStyles);
+  const items = React.useMemo(
+    () => Array.isArray(watchedValues[headersFieldKey]) ? watchedValues[headersFieldKey] : [],
+    [watchedValues, headersFieldKey]
+  );
+  const authEntries = React.useMemo(() => {
+    const entries = [];
+    for (let i = 0; i < items.length; i++) {
+      if (items[i].name.toLowerCase() === "authorization") {
+        entries.push({ item: items[i], originalIdx: i });
+      }
+    }
+    return entries;
+  }, [items]);
+  if (authEntries.length === 0) {
+    return null;
+  }
+  const authItems = authEntries.map((e) => e.item);
+  return /* @__PURE__ */ React__default.default.createElement(
+    reactHookForm.Controller,
+    {
+      name: headersFieldKey,
+      control,
+      render: ({ field: formField }) => {
+        const handleChange = (updatedAuthItems) => {
+          const updated = [...items];
+          for (let i = 0; i < authEntries.length; i++) {
+            if (i < updatedAuthItems.length) {
+              updated[authEntries[i].originalIdx] = updatedAuthItems[i];
+            }
+          }
+          formField.onChange(updated);
+        };
+        return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldRow }, /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldLabelRow }, /* @__PURE__ */ React__default.default.createElement("span", { className: styles.fieldLabel }, "Custom HTTP Headers"), /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: "Authorization HTTP header(s) sent with every request." }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "xs", className: styles.fieldInfoIcon }))), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.fieldInputCol }, /* @__PURE__ */ React__default.default.createElement(IndexedPairEditor, { value: authItems, onChange: handleChange, disabled, hideControls: true })));
+      }
+    }
+  );
+};
 
 function SidebarNav({ groups, activeIndex, sectionStates, onSelect }) {
   const styles = ui.useStyles2(getTabStyles);
@@ -9874,15 +10128,18 @@ function TabLayout({ form, schema, dsUid, dsName, onRetest, healthError, renderA
     handleSubmit,
     errors,
     watchedValues,
+    celContext,
     initializing,
     fetchError,
     submitting,
     submitError,
     readOnly,
     isFieldVisible,
+    isFieldDisabled,
     isGroupValid,
     groupHasData,
-    onSubmit
+    onSubmit,
+    setValue
   } = form;
   const displayGroups = React.useMemo(() => resolvedGroups.filter((g) => g.group.id !== "_required"), [resolvedGroups]);
   const [expandedSections, setExpandedSections] = React.useState(() => {
@@ -10006,19 +10263,21 @@ function TabLayout({ form, schema, dsUid, dsName, onRetest, healthError, renderA
         /* @__PURE__ */ React__default.default.createElement("div", { className: styles.sectionBody }, g.group.description && /* @__PURE__ */ React__default.default.createElement("div", { className: styles.sectionDescription }, g.group.description), visibleFields.map((field) => /* @__PURE__ */ React__default.default.createElement(
           SchemaField,
           {
-            key: formKey(field),
+            key: useDatasourceSchema.formKey(field),
             field,
             control,
             errors,
-            disabled: allDisabled,
+            disabled: allDisabled || isFieldDisabled(field),
             dsUid,
             watchedValues,
-            fieldById
+            fieldById,
+            celContext,
+            setValue
           }
         )), showHeaders && /* @__PURE__ */ React__default.default.createElement(
           AuthorizationHeaderField,
           {
-            headersFieldKey: formKey(httpHeadersField),
+            headersFieldKey: useDatasourceSchema.formKey(httpHeadersField),
             control,
             disabled: allDisabled,
             watchedValues
@@ -10037,8 +10296,8 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
   const [detectedReadOnly, setDetectedReadOnly] = React.useState(false);
   const readOnly = detectedReadOnly;
   const resolvedGroups = React.useMemo(() => {
-    const groups = resolveGroups(schema);
-    const requiredGroup = resolveRequiredFieldsGroup(schema);
+    const groups = useDatasourceSchema.resolveGroups(schema);
+    const requiredGroup = useDatasourceSchema.resolveRequiredFieldsGroup(schema);
     if (!requiredGroup) {
       return groups;
     }
@@ -10084,10 +10343,10 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
         when: eff.when,
         targets: Object.entries(eff.set).map(([targetId, val]) => {
           const targetField = fieldById.get(targetId);
-          return { key: targetField ? formKey(targetField) : targetId, value: val };
+          return { key: targetField ? useDatasourceSchema.formKey(targetField) : targetId, value: val };
         })
       }));
-      result.push({ sourceKey: formKey(field), effects: mapped });
+      result.push({ sourceKey: useDatasourceSchema.formKey(field), effects: mapped });
     }
     return result;
   }, [schema.fields, fieldById]);
@@ -10108,11 +10367,11 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
       const defaults = {};
       for (const field of allStorageFields) {
         if (field.defaultValue !== void 0) {
-          defaults[formKey(field)] = field.defaultValue;
+          defaults[useDatasourceSchema.formKey(field)] = field.defaultValue;
         }
       }
       const merged = { ...defaults, ...result.values };
-      const virtualValues = computeVirtualFieldValues(schema, merged);
+      const virtualValues = useDatasourceSchema.computeVirtualFieldValues(schema, merged);
       reset({ ...merged, ...virtualValues });
       setInitializing(false);
     });
@@ -10127,7 +10386,7 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
       return;
     }
     for (const { sourceKey, effects } of fieldsWithEffects) {
-      const currentVal = watchedValues[sourceKey];
+      const currentVal = useDatasourceSchema.getWatchedValue(watchedValues, sourceKey);
       const prevVal = prevEffectValuesRef.current[sourceKey];
       if (currentVal === prevVal) {
         continue;
@@ -10150,19 +10409,20 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
         continue;
       }
       const ovs = field.overrides.filter((ov) => ov.defaultValue !== void 0).map((ov) => {
-        const parsed = parseDependsOn(ov.when);
+        const parsed = useDatasourceSchema.parseDependsOn(ov.when);
         if (!parsed) {
           return null;
         }
         const depField = fieldById.get(parsed.field);
         return {
-          depKey: depField ? formKey(depField) : parsed.field,
+          depKey: depField ? useDatasourceSchema.formKey(depField) : parsed.field,
           depValue: parsed.value,
+          negate: parsed.negate,
           defaultValue: ov.defaultValue
         };
       }).filter(Boolean);
       if (ovs.length > 0) {
-        result.push({ targetKey: formKey(field), fieldDefault: field.defaultValue, overrides: ovs });
+        result.push({ targetKey: useDatasourceSchema.formKey(field), fieldDefault: field.defaultValue, overrides: ovs });
       }
     }
     return result;
@@ -10175,42 +10435,70 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
     }
     for (const { targetKey, fieldDefault, overrides } of fieldsWithOverrideDefaults) {
       for (const ov of overrides) {
-        const currentDepVal = String((_a = watchedValues[ov.depKey]) != null ? _a : "");
+        const currentDepVal = String((_a = useDatasourceSchema.getWatchedValue(watchedValues, ov.depKey)) != null ? _a : "");
         const trackKey = `${targetKey}::${ov.depKey}`;
         const prevDepVal = prevOverrideDepRef.current[trackKey];
         if (currentDepVal === prevDepVal) {
           continue;
         }
         prevOverrideDepRef.current[trackKey] = currentDepVal;
-        if (currentDepVal === ov.depValue) {
+        const active = useDatasourceSchema.evaluateDependsOn({ value: ov.depValue, negate: ov.negate }, currentDepVal);
+        const wasActive = prevDepVal !== void 0 && useDatasourceSchema.evaluateDependsOn({ value: ov.depValue, negate: ov.negate }, prevDepVal);
+        if (active) {
           setValue(targetKey, ov.defaultValue);
-        } else if (prevDepVal === ov.depValue && fieldDefault !== void 0) {
+        } else if (wasActive && fieldDefault !== void 0) {
           setValue(targetKey, fieldDefault);
         }
       }
     }
   }, [watchedValues, fieldsWithOverrideDefaults, initializing, setValue]);
+  const celContext = React.useMemo(() => {
+    const ctx = {};
+    for (const f of fieldById.values()) {
+      const fk = useDatasourceSchema.formKey(f);
+      const val = useDatasourceSchema.getWatchedValue(watchedValues, fk);
+      if (val !== void 0) {
+        const parts = f.id.split(".");
+        let current = ctx;
+        for (let i = 0; i < parts.length - 1; i++) {
+          if (!(parts[i] in current) || typeof current[parts[i]] !== "object" || current[parts[i]] === null) {
+            current[parts[i]] = {};
+          }
+          current = current[parts[i]];
+        }
+        current[parts[parts.length - 1]] = val;
+      }
+    }
+    return ctx;
+  }, [watchedValues, fieldById]);
   const isFieldVisible = React.useCallback(
     (field) => {
-      var _a, _b;
-      if (field.kind === "virtual" && !field.ui) {
-        return false;
-      }
-      if ((_a = field.tags) == null ? void 0 : _a.some((t) => t.startsWith("managed-by:"))) {
-        return false;
-      }
-      if (!field.dependsOn) {
-        return true;
-      }
-      const parsed = parseDependsOn(field.dependsOn);
-      if (!parsed) {
-        return true;
+      function check(f, visited) {
+        var _a;
+        if (f.kind === "virtual" && !f.ui) {
+          return false;
+        }
+        if ((_a = f.tags) == null ? void 0 : _a.some((t) => t.startsWith("managed-by:"))) {
+          return false;
+        }
+        if (!f.dependsOn) {
+          return true;
+        }
+        const refs = useDatasourceSchema.extractFieldRefs(f.dependsOn);
+        for (const ref of refs) {
+          const depField = fieldById.get(ref);
+          if (depField && !visited.has(depField.id)) {
+            visited.add(f.id);
+            if (!check(depField, visited)) {
+              return false;
+            }
+          }
+        }
+        return useDatasourceSchema.evaluateCelExpression(f.dependsOn, celContext);
       }
-      const depField = fieldById.get(parsed.field);
-      const depKey = depField ? formKey(depField) : parsed.field;
-      return String((_b = watchedValues[depKey]) != null ? _b : "") === parsed.value;
+      return check(field, /* @__PURE__ */ new Set());
     },
-    [watchedValues, fieldById]
+    [celContext, fieldById]
   );
   const onSubmit = React.useCallback(
     async (data) => {
@@ -10224,11 +10512,11 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
         const defaults = {};
         for (const field of allStorageFields) {
           if (field.defaultValue !== void 0) {
-            defaults[formKey(field)] = field.defaultValue;
+            defaults[useDatasourceSchema.formKey(field)] = field.defaultValue;
           }
         }
         const merged = { ...defaults, ...refreshed.values };
-        const virtualValues = computeVirtualFieldValues(schema, merged);
+        const virtualValues = useDatasourceSchema.computeVirtualFieldValues(schema, merged);
         reset({ ...merged, ...virtualValues });
         onSuccess("UPDATED", "Configuration saved.");
       } catch (err) {
@@ -10247,11 +10535,11 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
         if (!isFieldVisible(field)) {
           continue;
         }
-        if (errors[formKey(field)]) {
+        if (errors[useDatasourceSchema.formKey(field)]) {
           return false;
         }
-        if (isFieldRequired(field, watchedValues, fieldById)) {
-          const val = watchedValues[formKey(field)];
+        if (isFieldRequired(field, watchedValues, fieldById, celContext)) {
+          const val = useDatasourceSchema.getWatchedValue(watchedValues, useDatasourceSchema.formKey(field));
           if (val === SECURE_FIELD_CONFIGURED) {
             continue;
           }
@@ -10262,12 +10550,21 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
       }
       return true;
     },
-    [errors, watchedValues, fieldById, isFieldVisible]
+    [errors, watchedValues, fieldById, celContext, isFieldVisible]
+  );
+  const isFieldDisabled = React.useCallback(
+    (field) => {
+      if (!field.disabledWhen) {
+        return false;
+      }
+      return useDatasourceSchema.evaluateCelExpression(field.disabledWhen, celContext);
+    },
+    [celContext]
   );
   const groupHasData = React.useCallback(
     (group) => {
       for (const field of group.fields) {
-        const val = watchedValues[formKey(field)];
+        const val = useDatasourceSchema.getWatchedValue(watchedValues, useDatasourceSchema.formKey(field));
         if (val === void 0 || val === null || val === "" || val === false) {
           continue;
         }
@@ -10291,6 +10588,7 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
     trigger,
     errors,
     watchedValues,
+    celContext,
     // State
     initializing,
     fetchError,
@@ -10299,9 +10597,11 @@ function useDatasourceConfigForm({ schema, dsUid, onSuccess, onSaving }) {
     readOnly,
     // Callbacks
     isFieldVisible,
+    isFieldDisabled,
     isGroupValid,
     groupHasData,
-    onSubmit
+    onSubmit,
+    setValue
   };
 }
 
@@ -10348,13 +10648,16 @@ function WizardLayout({ form, schema, dsUid, dsName, onRetest, healthError, rend
     trigger,
     errors,
     watchedValues,
+    celContext,
     initializing,
     fetchError,
     submitting,
     submitError,
     readOnly,
     isFieldVisible,
-    onSubmit
+    isFieldDisabled,
+    onSubmit,
+    setValue
   } = form;
   const arrowSteps = React.useMemo(() => {
     const requiredGroup = resolvedGroups.find((g) => g.group.id === "_required");
@@ -10397,11 +10700,11 @@ function WizardLayout({ form, schema, dsUid, dsName, onRetest, healthError, rend
       return true;
     }
     for (const field of visibleFieldsForStep) {
-      if (errors[formKey(field)]) {
+      if (errors[useDatasourceSchema.formKey(field)]) {
         return false;
       }
-      if (isFieldRequired(field, watchedValues, fieldById)) {
-        const val = watchedValues[formKey(field)];
+      if (isFieldRequired(field, watchedValues, fieldById, celContext)) {
+        const val = useDatasourceSchema.getWatchedValue(watchedValues, useDatasourceSchema.formKey(field));
         if (val === SECURE_FIELD_CONFIGURED) {
           continue;
         }
@@ -10411,13 +10714,13 @@ function WizardLayout({ form, schema, dsUid, dsName, onRetest, healthError, rend
       }
     }
     return true;
-  }, [currentResolved, errors, visibleFieldsForStep, watchedValues, fieldById]);
+  }, [currentResolved, errors, visibleFieldsForStep, watchedValues, fieldById, celContext]);
   const goNext = React.useCallback(async () => {
     if (!currentResolved) {
       return;
     }
     if (!readOnly) {
-      const visibleKeys = visibleFieldsForStep.map((f) => formKey(f));
+      const visibleKeys = visibleFieldsForStep.map((f) => useDatasourceSchema.formKey(f));
       const valid = await trigger(visibleKeys);
       if (!valid) {
         return;
@@ -10501,19 +10804,21 @@ function WizardLayout({ form, schema, dsUid, dsName, onRetest, healthError, rend
   )))), currentResolved && /* @__PURE__ */ React__default.default.createElement("form", { onSubmit: handleSubmit(onSubmit), className: styles.form }, visibleFieldsForStep.map((field) => /* @__PURE__ */ React__default.default.createElement(
     SchemaField,
     {
-      key: formKey(field),
+      key: useDatasourceSchema.formKey(field),
       field,
       control,
       errors,
-      disabled: allDisabled,
+      disabled: allDisabled || isFieldDisabled(field),
       dsUid,
       watchedValues,
-      fieldById
+      fieldById,
+      celContext,
+      setValue
     }
   )), (currentResolved.group.id === "_required" || currentResolved.group.id === "auth") && httpHeadersField && /* @__PURE__ */ React__default.default.createElement(
     AuthorizationHeaderField,
     {
-      headersFieldKey: formKey(httpHeadersField),
+      headersFieldKey: useDatasourceSchema.formKey(httpHeadersField),
       control,
       disabled: allDisabled,
       watchedValues
@@ -10521,6 +10826,155 @@ function WizardLayout({ form, schema, dsUid, dsName, onRetest, healthError, rend
   ), submitError && /* @__PURE__ */ React__default.default.createElement(ui.Alert, { severity: "error", title: "Error" }, submitError), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.buttons }, readOnly ? /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "primary", size: "sm", icon: "sync", onClick: onRetest, type: "button" }, "Test") : /* @__PURE__ */ React__default.default.createElement(ui.Button, { variant: "primary", size: "sm", disabled: submitting || !currentGroupValid, type: "submit" }, submitting ? "Saving..." : "Save & Test"), healthError && (renderActions == null ? void 0 : renderActions({ dsUid, dsName, dsType: schema.pluginType, healthError })))));
 }
 
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, key + "" , value);
+class DatasourceErrorBoundary extends React.Component {
+  constructor() {
+    super(...arguments);
+    __publicField$2(this, "state", { error: null });
+  }
+  static getDerivedStateFromError(error) {
+    return { error };
+  }
+  componentDidCatch(error, info) {
+    console.error("[DatasourceConfigWizard] Caught error:", error, info.componentStack);
+  }
+  render() {
+    if (this.state.error) {
+      return /* @__PURE__ */ React__default.default.createElement(ui.Alert, { severity: "warning", title: "Configuration wizard unavailable" }, "Could not load the configuration wizard", this.props.dsName ? ` for ${this.props.dsName}` : "", ". Use the Settings link to configure this datasource manually.");
+    }
+    return this.props.children;
+  }
+}
+
+const MAX_CONCURRENCY = 5;
+function useHealthChecks() {
+  const [healthMap, setHealthMap] = React.useState({});
+  const queueRef = React.useRef([]);
+  const activeRef = React.useRef(0);
+  const mountedRef = React.useRef(true);
+  const everQueuedRef = React.useRef(/* @__PURE__ */ new Set());
+  const checkOne = React.useCallback(async (uid) => {
+    if (!mountedRef.current) {
+      return;
+    }
+    setHealthMap((prev) => ({ ...prev, [uid]: { state: "checking" } }));
+    try {
+      const result = await runtime.getBackendSrv().get(
+        `/api/datasources/uid/${uid}/health`,
+        void 0,
+        void 0,
+        { showErrorAlert: false }
+      );
+      if (!mountedRef.current) {
+        return;
+      }
+      setHealthMap((prev) => {
+        var _a;
+        return {
+          ...prev,
+          [uid]: { state: "done", status: (_a = result.status) != null ? _a : "OK", message: result.message }
+        };
+      });
+    } catch (error) {
+      if (!mountedRef.current) {
+        return;
+      }
+      let status = "ERROR";
+      let message = "";
+      if (error && typeof error === "object" && "data" in error) {
+        const data = error.data;
+        if (data == null ? void 0 : data.status) {
+          status = data.status;
+        }
+        if (data == null ? void 0 : data.message) {
+          message = data.message;
+        }
+      }
+      if (!message) {
+        message = error instanceof Error ? error.message : String(error);
+      }
+      setHealthMap((prev) => ({
+        ...prev,
+        [uid]: { state: "done", status, message }
+      }));
+    }
+  }, []);
+  const processQueue = React.useCallback(() => {
+    while (activeRef.current < MAX_CONCURRENCY && queueRef.current.length > 0) {
+      const uid = queueRef.current.shift();
+      activeRef.current++;
+      checkOne(uid).finally(() => {
+        activeRef.current--;
+        processQueue();
+      });
+    }
+  }, [checkOne]);
+  const checkUids = React.useCallback(
+    (uids) => {
+      const toCheck = [];
+      for (const uid of uids) {
+        if (everQueuedRef.current.has(uid)) {
+          continue;
+        }
+        everQueuedRef.current.add(uid);
+        toCheck.push(uid);
+      }
+      if (toCheck.length === 0) {
+        return;
+      }
+      setHealthMap((prev) => {
+        const next = { ...prev };
+        for (const uid of toCheck) {
+          next[uid] = { state: "pending" };
+        }
+        return next;
+      });
+      queueRef.current.push(...toCheck);
+      processQueue();
+    },
+    [processQueue]
+  );
+  const retry = React.useCallback(
+    (uid) => {
+      everQueuedRef.current.delete(uid);
+      everQueuedRef.current.add(uid);
+      setHealthMap((prev) => ({ ...prev, [uid]: { state: "pending" } }));
+      queueRef.current.push(uid);
+      processQueue();
+    },
+    [processQueue]
+  );
+  return { healthMap, checkUids, retry };
+}
+
+let pluginNameCache = null;
+function buildPluginNameCache() {
+  var _a;
+  if (pluginNameCache) {
+    return pluginNameCache;
+  }
+  const map = /* @__PURE__ */ new Map();
+  try {
+    const list = runtime.getDataSourceSrv().getList();
+    for (const ds of list) {
+      if (((_a = ds.meta) == null ? void 0 : _a.name) && ds.type && !map.has(ds.type)) {
+        map.set(ds.type, ds.meta.name);
+      }
+    }
+  } catch (ex) {
+    console.error(ex);
+  }
+  pluginNameCache = map;
+  return map;
+}
+function resolvePluginName(pluginType) {
+  var _a;
+  const cache = buildPluginNameCache();
+  return (_a = cache.get(pluginType)) != null ? _a : pluginType;
+}
+
 var __defProp$1 = Object.defineProperty;
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -11974,411 +12428,34 @@ const convertUnits = (queryStats) => {
   return text + suffix;
 };
 
-function generateLLMHint(schema) {
-  var _a, _b, _c, _d;
-  const hints = [];
-  for (const field of schema.fields) {
-    if (((_a = field.ui) == null ? void 0 : _a.component) !== "select" || field.target !== "jsonData" || field.kind === "virtual") {
-      continue;
-    }
-    const options = (_c = (_b = field.ui) == null ? void 0 : _b.options) != null ? _c : [];
-    const values = options.map((opt) => {
-      const isDefault = field.defaultValue != null && String(opt.value) === String(field.defaultValue);
-      return isDefault ? `"${opt.value}" (default)` : `"${opt.value}"`;
-    }).join(", ");
-    if (values) {
-      hints.push(`- ${(_d = field.label) != null ? _d : field.key}: jsonData.${field.key} \u2014 values: ${values}`);
-    }
-  }
-  return hints.join("\n");
-}
-function generateTroubleshootingFields(schema) {
-  var _a, _b, _c;
-  const result = [];
-  for (const field of schema.fields) {
-    if (field.kind === "virtual" || field.isItemField) {
-      continue;
-    }
-    const entry = {
-      label: (_a = field.label) != null ? _a : field.key,
-      key: field.target === "root" ? field.key : `${field.target}.${field.key}`,
-      target: (_b = field.target) != null ? _b : "jsonData",
-      type: field.valueType,
-      required: !!field.required
-    };
-    if (field.description) {
-      entry.description = field.description;
-    }
-    if (field.defaultValue != null) {
-      entry.defaultValue = field.defaultValue;
-    }
-    if (((_c = field.ui) == null ? void 0 : _c.options) && field.ui.options.length > 0) {
-      entry.options = field.ui.options.map((o) => String(o.value));
-    }
-    if (field.section) {
-      entry.section = field.section;
-    }
-    if (field.dependsOn) {
-      entry.dependsOn = field.dependsOn;
-    }
-    result.push(entry);
-  }
-  return result;
-}
-
-function yamlIndent(depth) {
-  return "  ".repeat(depth);
-}
-function yamlString(value) {
-  if (value === null || value === void 0) {
-    return '""';
-  }
-  const s = String(value);
-  if (s === "") {
-    return '""';
-  }
-  return yaml__default.default.dump(s, { lineWidth: -1 }).trimEnd();
-}
-function yamlValue(value, depth) {
-  if (value === null || value === void 0) {
-    return '""';
-  }
-  if (typeof value === "boolean") {
-    return value ? "true" : "false";
-  }
-  if (typeof value === "number") {
-    return String(value);
-  }
-  if (typeof value === "string") {
-    return yamlString(value);
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) {
-      return "[]";
-    }
-    const lines = value.map((item) => {
-      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
-        const entries = Object.entries(item);
-        if (entries.length === 0) {
-          return `${yamlIndent(depth)}- {}`;
-        }
-        const [firstKey, firstVal] = entries[0];
-        const firstLine = `${yamlIndent(depth)}- ${yamlString(firstKey)}: ${yamlValue(firstVal, depth + 2)}`;
-        const rest = entries.slice(1).map(([k, v]) => `${yamlIndent(depth + 1)}${yamlString(k)}: ${yamlValue(v, depth + 2)}`);
-        return [firstLine, ...rest].join("\n");
-      }
-      return `${yamlIndent(depth)}- ${yamlValue(item, depth + 1)}`;
-    });
-    return "\n" + lines.join("\n");
-  }
-  if (typeof value === "object") {
-    const entries = Object.entries(value);
-    if (entries.length === 0) {
-      return "{}";
-    }
-    const lines = entries.map(([k, v]) => `${yamlIndent(depth)}${yamlString(k)}: ${yamlValue(v, depth + 1)}`);
-    return "\n" + lines.join("\n");
-  }
-  return yamlString(value);
-}
-function isCertField(field) {
-  var _a;
-  const k = field.key.toLowerCase();
-  return field.target === "secureJsonData" && (k.includes("cert") || k.includes("key") || ((_a = field.ui) == null ? void 0 : _a.component) === "textarea");
-}
-function isExcludedFromProvisioning(field) {
-  var _a, _b;
-  if (field.kind === "virtual") {
-    return true;
-  }
-  if (field.isItemField) {
-    return true;
-  }
-  if (((_a = field.tags) == null ? void 0 : _a.some((t) => t.startsWith("managed-by:"))) && field.target !== "root") {
-    return true;
-  }
-  if (((_b = field.storage) == null ? void 0 : _b.type) === "indexedPair") {
-    return true;
-  }
-  return false;
-}
-function secretPlaceholder(field) {
-  if (isCertField(field)) {
-    return "|\n      xxxxxx";
-  }
-  return "xxxxxx";
-}
-function templateValue(field) {
-  var _a;
-  if (field.defaultValue !== void 0) {
-    return field.defaultValue;
-  }
-  if (((_a = field.ui) == null ? void 0 : _a.options) && field.ui.options.length > 0) {
-    return field.ui.options[0].value;
-  }
-  switch (field.valueType) {
-    case "string":
-      return "";
-    case "number":
-      return 0;
-    case "boolean":
-      return false;
-    case "array":
-      return [];
-    case "object":
-    case "map":
-      return {};
-    default:
-      return "";
-  }
-}
-function fieldComment(field, indent) {
-  var _a, _b, _c;
-  const parts = [];
-  const label = (_a = field.label) != null ? _a : field.key;
-  let line = label;
-  if (field.required) {
-    line += " (REQUIRED)";
-  }
-  if (field.description) {
-    line += ` \u2014 ${field.description}`;
-  }
-  parts.push(`${indent}# ${line}`);
-  const options = (_b = field.ui) == null ? void 0 : _b.options;
-  if (options && options.length > 0) {
-    const vals = options.map((o) => String(o.value)).join(", ");
-    parts.push(`${indent}# Allowed values: ${vals}`);
-  }
-  const allowedValuesRule = (_c = field.validations) == null ? void 0 : _c.find(
-    (v) => v.type === "allowedValues"
-  );
-  if (allowedValuesRule && !options) {
-    const vals = allowedValuesRule.values.map((v) => String(v)).join(", ");
-    parts.push(`${indent}# Allowed values: ${vals}`);
-  }
-  if (field.dependsOn) {
-    parts.push(`${indent}# Only when: ${field.dependsOn}`);
-  }
-  return parts.join("\n");
-}
-function toProvisioningYaml(schema, values, options) {
-  var _a, _b, _c, _d, _e, _f;
-  const isTemplate = !values;
-  const showComments = (_a = options == null ? void 0 : options.comments) != null ? _a : isTemplate;
-  const indent2 = "    ";
-  const indent3 = "      ";
-  const groups = resolveGroups(schema);
-  const rootFields = [];
-  const jsonDataFieldsByGroup = [];
-  const secureJsonDataFieldsByGroup = [];
-  const virtualFieldsWithOptions = [];
-  for (const { group, fields } of groups) {
-    const jd = [];
-    const sd = [];
-    for (const field of fields) {
-      if (field.kind === "virtual" && ((_b = field.ui) == null ? void 0 : _b.options) && field.ui.options.length > 0) {
-        virtualFieldsWithOptions.push(field);
-        continue;
-      }
-      if (isExcludedFromProvisioning(field)) {
-        continue;
-      }
-      switch (field.target) {
-        case "root":
-          rootFields.push(field);
-          break;
-        case "jsonData":
-          jd.push(field);
-          break;
-        case "secureJsonData":
-          sd.push(field);
-          break;
-      }
-    }
-    if (jd.length > 0) {
-      jsonDataFieldsByGroup.push({ group, fields: jd });
-    }
-    if (sd.length > 0) {
-      secureJsonDataFieldsByGroup.push({ group, fields: sd });
-    }
-  }
-  const allSecureJsonDataFields = secureJsonDataFieldsByGroup.flatMap((g) => g.fields);
-  const groupedFieldIds = new Set(groups.flatMap(({ group }) => group.fieldRefs));
-  for (const field of schema.fields) {
-    if (field.target === "root" && !groupedFieldIds.has(field.id) && !isExcludedFromProvisioning(field)) {
-      rootFields.push(field);
-    }
-  }
-  const lines = [];
-  lines.push("apiVersion: 1");
-  lines.push("");
-  lines.push("datasources:");
-  lines.push(`${indent2.slice(2)}- name: ${yamlString((_d = (_c = options == null ? void 0 : options.name) != null ? _c : values == null ? void 0 : values.name) != null ? _d : `my-${schema.pluginType}`)}`);
-  lines.push(`${indent2}type: ${schema.pluginType}`);
-  if (!isTemplate && (values == null ? void 0 : values.uid)) {
-    lines.push(`${indent2}uid: ${yamlString(values.uid)}`);
-  }
-  const ALREADY_EMITTED_ROOT = /* @__PURE__ */ new Set(["name", "type", "uid"]);
-  for (const field of rootFields) {
-    if (ALREADY_EMITTED_ROOT.has(field.key)) {
-      continue;
-    }
-    const val = values ? values[field.key] : templateValue(field);
-    if (val === void 0 || val === null) {
-      continue;
-    }
-    if (!isTemplate && val === false) {
-      continue;
-    }
-    if (showComments) {
-      lines.push(fieldComment(field, indent2));
-    }
-    lines.push(`${indent2}${field.key}: ${yamlValue(val, 3)}`);
-  }
-  if (showComments) {
-    for (const vf of virtualFieldsWithOptions) {
-      const label = (_e = vf.label) != null ? _e : vf.key;
-      const opts = vf.ui.options.map((o) => `${String(o.value)} (${o.label})`).join(", ");
-      lines.push(`${indent2}# ${label}: ${opts}`);
-      if (vf.description) {
-        lines.push(`${indent2}#   ${vf.description}`);
-      }
-    }
-  }
-  const emittedJsonDataKeys = /* @__PURE__ */ new Set();
-  const emittedSecureJsonDataKeys = /* @__PURE__ */ new Set();
-  const jsonDataValues = values == null ? void 0 : values.jsonData;
-  const hasJsonDataFromSchema = jsonDataFieldsByGroup.length > 0;
-  const hasJsonDataFromValues = !isTemplate && jsonDataValues && Object.keys(jsonDataValues).length > 0;
-  if (hasJsonDataFromSchema || hasJsonDataFromValues) {
-    lines.push(`${indent2}jsonData:`);
-    for (const { group, fields: groupFields } of jsonDataFieldsByGroup) {
-      if (showComments && jsonDataFieldsByGroup.length > 1) {
-        lines.push(`${indent3}# --- ${group.title} ---`);
-      }
-      for (const field of groupFields) {
-        const val = values ? getNestedValue(values, "jsonData", field) : templateValue(field);
-        if (val === void 0 || val === null) {
-          continue;
-        }
-        if (!isTemplate && field.defaultValue !== void 0 && val === field.defaultValue) {
-          continue;
-        }
-        emittedJsonDataKeys.add(field.key);
-        if (showComments) {
-          lines.push(fieldComment(field, indent3));
-        }
-        const rendered = yamlValue(val, 4);
-        if (rendered.startsWith("\n")) {
-          lines.push(`${indent3}${field.key}:${rendered}`);
-        } else {
-          lines.push(`${indent3}${field.key}: ${rendered}`);
-        }
-      }
-    }
-    if (!isTemplate && jsonDataValues) {
-      for (const [key, val] of Object.entries(jsonDataValues)) {
-        if (emittedJsonDataKeys.has(key)) {
-          continue;
-        }
-        if (val === void 0 || val === null) {
-          continue;
-        }
-        const rendered = yamlValue(val, 4);
-        if (rendered.startsWith("\n")) {
-          lines.push(`${indent3}${key}:${rendered}`);
-        } else {
-          lines.push(`${indent3}${key}: ${rendered}`);
-        }
-      }
-    }
-  }
-  const secureJsonFields = (_f = values == null ? void 0 : values.secureJsonFields) != null ? _f : {};
-  const inferredSecureKeys = !isTemplate ? inferSecureJsonDataKeys(jsonDataValues) : [];
-  const activeSecureFields = isTemplate ? allSecureJsonDataFields : allSecureJsonDataFields.filter((f) => secureJsonFields[f.key] === true);
-  if (activeSecureFields.length > 0 || inferredSecureKeys.length > 0) {
-    lines.push(`${indent2}secureJsonData:`);
-    for (const field of activeSecureFields) {
-      emittedSecureJsonDataKeys.add(field.key);
-      if (showComments) {
-        lines.push(fieldComment(field, indent3));
-      }
-      lines.push(`${indent3}${field.key}: ${secretPlaceholder(field)}`);
-    }
-    for (const key of inferredSecureKeys) {
-      if (emittedSecureJsonDataKeys.has(key)) {
-        continue;
-      }
-      lines.push(`${indent3}${key}: xxxxxx`);
-    }
-  }
-  return lines.join("\n");
-}
-function inferSecureJsonDataKeys(jsonData) {
-  if (!jsonData) {
-    return [];
-  }
-  const keys = [];
-  for (const key of Object.keys(jsonData)) {
-    const match = key.match(/^httpHeaderName(\d+)$/);
-    if (match) {
-      keys.push(`httpHeaderValue${match[1]}`);
-    }
-  }
-  return keys;
-}
-function getNestedValue(values, target, field) {
-  const nested = values[target];
-  if (nested && typeof nested === "object") {
-    return nested[field.key];
-  }
-  return void 0;
-}
-function datasourceToProvisioningYaml(ds, schema) {
-  if (schema) {
-    return toProvisioningYaml(schema, ds, { comments: false });
-  }
-  const lines = [];
-  lines.push("apiVersion: 1");
-  lines.push("");
-  lines.push("datasources:");
-  lines.push(`  - name: ${yamlString(ds.name)}`);
-  if (ds.uid) {
-    lines.push(`    uid: ${yamlString(ds.uid)}`);
-  }
-  lines.push(`    type: ${yamlString(ds.type)}`);
-  if (ds.url) {
-    lines.push(`    url: ${yamlString(ds.url)}`);
-  }
-  if (ds.database) {
-    lines.push(`    database: ${yamlString(ds.database)}`);
-  }
-  if (ds.isDefault) {
-    lines.push("    isDefault: true");
-  }
-  if (ds.basicAuth) {
-    lines.push("    basicAuth: true");
-    if (ds.basicAuthUser) {
-      lines.push(`    basicAuthUser: ${yamlString(ds.basicAuthUser)}`);
-    }
-  }
-  const jsonData = ds.jsonData;
-  if (jsonData && Object.keys(jsonData).length > 0) {
-    lines.push("    jsonData:");
-    for (const [key, val] of Object.entries(jsonData)) {
-      const rendered = yamlValue(val, 4);
-      if (rendered.startsWith("\n")) {
-        lines.push(`      ${key}:${rendered}`);
-      } else {
-        lines.push(`      ${key}: ${rendered}`);
-      }
-    }
-  }
-  lines.push("    # secureJsonData: (secrets are not exported \u2014 add manually)");
-  lines.push("    #   mySecret: xxxxxx");
-  return lines.join("\n");
-}
-
+exports.ROOT_CONFIG_FIELDS = useDatasourceSchema.ROOT_CONFIG_FIELDS;
+exports.buildCelContext = useDatasourceSchema.buildCelContext;
+exports.buildCloneDatasourcePayload = useDatasourceSchema.buildCloneDatasourcePayload;
+exports.buildCreateDatasourcePayload = useDatasourceSchema.buildCreateDatasourcePayload;
+exports.buildUpdateDatasourcePayload = useDatasourceSchema.buildUpdateDatasourcePayload;
+exports.clearExpressionCache = useDatasourceSchema.clearExpressionCache;
+exports.computeVirtualFieldValues = useDatasourceSchema.computeVirtualFieldValues;
+exports.configToYaml = useDatasourceSchema.configToYaml;
+exports.datasourceToProvisioningYaml = useDatasourceSchema.datasourceToProvisioningYaml;
+exports.evaluateCelDirect = useDatasourceSchema.evaluateCelDirect;
+exports.evaluateCelExpression = useDatasourceSchema.evaluateCelExpression;
+exports.evaluateComputedRead = useDatasourceSchema.evaluateComputedRead;
+exports.evaluateDependsOn = useDatasourceSchema.evaluateDependsOn;
+exports.extractFieldRefs = useDatasourceSchema.extractFieldRefs;
+exports.fetchConfigSchema = useDatasourceSchema.fetchConfigSchema;
+exports.formKey = useDatasourceSchema.formKey;
+exports.formatYamlDiff = useDatasourceSchema.formatYamlDiff;
+exports.generateLLMHint = useDatasourceSchema.generateLLMHint;
+exports.generateTroubleshootingFields = useDatasourceSchema.generateTroubleshootingFields;
+exports.getConfigSchema = useDatasourceSchema.getConfigSchema;
+exports.getWatchedValue = useDatasourceSchema.getWatchedValue;
+exports.isValidCelExpression = useDatasourceSchema.isValidCelExpression;
+exports.parseDependsOn = useDatasourceSchema.parseDependsOn;
+exports.resolveActiveOverride = useDatasourceSchema.resolveActiveOverride;
+exports.resolveGroups = useDatasourceSchema.resolveGroups;
+exports.resolveRequiredFieldsGroup = useDatasourceSchema.resolveRequiredFieldsGroup;
+exports.toProvisioningYaml = useDatasourceSchema.toProvisioningYaml;
+exports.useDatasourceSchema = useDatasourceSchema.useDatasourceSchema;
 exports.AccessoryButton = AccessoryButton;
 exports.AdvancedHttpSettings = AdvancedHttpSettings;
 exports.Auth = Auth;
@@ -12399,6 +12476,7 @@ exports.DataSourceDescription = DataSourceDescription;
 exports.DataSourcePicker = DataSourcePicker;
 exports.DatasetSelector = DatasetSelector;
 exports.DatasourceConfigWizard = DatasourceConfigWizard;
+exports.DatasourceErrorBoundary = DatasourceErrorBoundary;
 exports.DatePicker = DatePicker;
 exports.DatePickerWithInput = DatePickerWithInput;
 exports.DebounceInput = DebounceInput;
@@ -12434,7 +12512,6 @@ exports.QueryModellerBase = QueryModellerBase;
 exports.QueryOptionGroup = QueryOptionGroup;
 exports.RawQuery = RawQuery;
 exports.RunQueryButton = RunQueryButton;
-exports.SECURE_FIELD_CONFIGURED = SECURE_FIELD_CONFIGURED;
 exports.SQLEditor = SQLEditor;
 exports.SQLEditorMode = SQLEditorMode;
 exports.SQLEditorTestUtils = SQLEditorTestUtils;
@@ -12448,26 +12525,12 @@ exports.SuggestionKind = SuggestionKind;
 exports.TLSSettings = TLSSettings;
 exports.TableSelector = TableSelector;
 exports.TokenType = TokenType;
-exports.buildDatasourceConfigPayload = buildDatasourceConfigPayload;
-exports.computeVirtualFieldValues = computeVirtualFieldValues;
 exports.convertLegacyAuthProps = convertLegacyAuthProps;
-exports.datasourceToProvisioningYaml = datasourceToProvisioningYaml;
-exports.evaluateComputedRead = evaluateComputedRead;
-exports.expandIndexedPair = expandIndexedPair;
-exports.fetchExistingValues = fetchExistingValues;
-exports.flattenIndexedPair = flattenIndexedPair;
-exports.formKey = formKey;
 exports.formatDate = formatDate;
-exports.generateLLMHint = generateLLMHint;
-exports.generateTroubleshootingFields = generateTroubleshootingFields;
 exports.getStandardSQLCompletionProvider = getStandardSQLCompletionProvider;
 exports.grafanaStandardSQLLanguage = language;
 exports.grafanaStandardSQLLanguageConf = conf;
-exports.parseDependsOn = parseDependsOn;
-exports.resolveActiveOverride = resolveActiveOverride;
-exports.resolveGroups = resolveGroups;
-exports.resolveRequiredFieldsGroup = resolveRequiredFieldsGroup;
-exports.submitDatasourceConfig = submitDatasourceConfig;
+exports.resolvePluginName = resolvePluginName;
 exports.toOption = toOption;
-exports.toProvisioningYaml = toProvisioningYaml;
+exports.useHealthChecks = useHealthChecks;
 //# sourceMappingURL=index.cjs.map