Update spelling and additional settings object

Author: alyssajoyner

README.md

@@ -32,7 +32,7 @@ To configure a readonly user, follow these steps:
 
 1. Create a `readonly` user profile following the [Creating Users and Roles in ClickHouse](https://clickhouse.com/docs/en/operations/access-rights) guide.
 2. Ensure the `readonly` user has enough permission to modify the `max_execution_time` setting required by the underlying [clickhouse-go client](https://github.com/ClickHouse/clickhouse-go/).
-3. If you're using a public Clickhouse instance, it's not recommended to set `readonly=2` in the `readonly` profile. Instead, leave `readonly=1` and set the constraint type of `max_execution_time` to [changeable_in_readonly](https://clickhouse.com/docs/en/operations/settings/constraints-on-settings) to allow modification of this setting.
+3. If you're using a public ClickHouse instance, it's not recommended to set `readonly=2` in the `readonly` profile. Instead, leave `readonly=1` and set the constraint type of `max_execution_time` to [changeable_in_readonly](https://clickhouse.com/docs/en/operations/settings/constraints-on-settings) to allow modification of this setting.
 
 ### ClickHouse protocol support
 
@@ -260,7 +260,7 @@ docs](https://grafana.com/docs/grafana/latest/variables/variable-types/add-ad-ho
 
 #### Using a query for Ad Hoc filters
 
-The second `clickhouse_adhoc_query` also allows any valid Clickhouse query. The
+The second `clickhouse_adhoc_query` also allows any valid ClickHouse query. The
 query results will be used to populate your ad-hoc filter's selectable filters.
 You may choose to hide this variable from view as it serves no further purpose.
 

package.json

@@ -88,5 +88,6 @@
     "semver": "7.7.3",
     "sql-formatter": "^15.6.10",
     "tslib": "2.8.1"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

src/module.ts

@@ -10,7 +10,7 @@ import { analyzeQueries, trackClickhouseDashboardLoaded } from 'tracking';
 import pluginJson from './plugin.json';
 import clickhouseVersion from '../package.json';
 
-// ConfigEditorV2 is the new design for the Clickhouse configuration page
+// ConfigEditorV2 is the new design for the ClickHouse configuration page
 const configEditor = config.featureToggles['newClickhouseConfigPageDesign' as keyof FeatureToggles]
   ? ConfigEditorV2
   : ConfigEditorV1;

src/selectors.ts

@@ -47,11 +47,11 @@ export const Components = {
       },
       DATABASE: {
         label: 'Database',
-        tooltip: 'Clickhouse database to query from',
+        tooltip: 'ClickHouse database to query from',
       },
       FROM: {
         label: 'Table',
-        tooltip: 'Clickhouse table to query from',
+        tooltip: 'ClickHouse table to query from',
       },
       SELECT: {
         label: 'Fields',

src/views/config-v2/AdditionalSettingsSection.tsx

@@ -1,6 +1,6 @@
 import { ConfigSubSection } from 'components/experimental/ConfigSection';
 import allLabels from './labelsV2';
-import React, { ChangeEvent, useMemo, useState } from 'react';
+import React, { ChangeEvent, useState } from 'react';
 import {
   DataSourcePluginOptionsEditorProps,
   onUpdateDatasourceJsonDataOption,
@@ -52,6 +52,69 @@ export const AdditionalSettingsSection = (props: Props) => {
   useConfigDefaults(options, onOptionsChange);
 
   const [customSettings, setCustomSettings] = useState(jsonData.customSettings || []);
+  const ADDITONAL_SETTINGS_DEFAULTS = {
+    defaultDatabase: jsonData.defaultDatabase,
+    defaultTable: jsonData.defaultTable,
+    connMaxLifetime: jsonData.connMaxLifetime,
+    dialTimeout: jsonData.dialTimeout,
+    maxIdleConns: jsonData.maxIdleConns,
+    maxOpenConns: jsonData.maxOpenConns,
+    queryTimeout: jsonData.queryTimeout,
+    validateSql: jsonData.validateSql,
+    logs: {
+      defaultDatabase: jsonData.logs?.defaultDatabase,
+      defaultTable: jsonData.logs?.defaultTable !== 'otel_logs' ? jsonData.logs?.defaultTable : undefined,
+      otelEnabled: jsonData.logs?.otelEnabled,
+      otelVersion: jsonData.logs?.otelVersion !== 'latest' ? jsonData.logs?.otelVersion : undefined,
+      timeColumn: jsonData.logs?.timeColumn,
+      levelColumn: jsonData.logs?.levelColumn,
+      messageColumn: jsonData.logs?.messageColumn,
+      selectContextColumns: jsonData.logs?.selectContextColumns,
+      contextColumns:
+        jsonData.logs?.contextColumns && jsonData.logs?.contextColumns.length > 0
+          ? jsonData.logs?.contextColumns
+          : undefined,
+    },
+    traces: {
+      defaultDatabase: jsonData.traces?.defaultDatabase,
+      defaultTable: jsonData.traces?.defaultTable !== 'otel_traces' ? jsonData.logs?.defaultTable : undefined,
+      otelEnabled: jsonData.traces?.otelEnabled,
+      otelVersion: jsonData.traces?.otelVersion !== 'latest' ? jsonData.logs?.otelVersion : undefined,
+      traceIdColumn: jsonData.traces?.traceIdColumn,
+      spanIdColumn: jsonData.traces?.spanIdColumn,
+      operationNameColumn: jsonData.traces?.operationNameColumn,
+      parentSpanIdColumn: jsonData.traces?.parentSpanIdColumn,
+      serviceNameColumn: jsonData.traces?.serviceNameColumn,
+      durationColumn: jsonData.traces?.durationColumn,
+      startTimeColumn: jsonData.traces?.startTimeColumn,
+      tagsColumn: jsonData.traces?.tagsColumn,
+      serviceTagsColumn: jsonData.traces?.serviceTagsColumn,
+      kindColumn: jsonData.traces?.kindColumn,
+      statusCodeColumn: jsonData.traces?.statusCodeColumn,
+      statusMessageColumn: jsonData.traces?.statusMessageColumn,
+      stateColumn: jsonData.traces?.stateColumn,
+      instrumentationLibraryNameColumn: jsonData.traces?.instrumentationLibraryNameColumn,
+      instrumentationLibraryVersionColumn: jsonData.traces?.instrumentationLibraryVersionColumn,
+      flattenNested: jsonData.traces?.flattenNested,
+      traceEventsColumnPrefix: jsonData.traces?.traceEventsColumnPrefix,
+      traceLinksColumnPrefix: jsonData.traces?.traceLinksColumnPrefix,
+    },
+    aliasTables: jsonData.aliasTables && jsonData.aliasTables.length > 0 ? jsonData.aliasTables : undefined,
+    enableRowLimit: jsonData.enableRowLimit,
+    enableSecureSocksProxy: jsonData.enableSecureSocksProxy,
+  };
+
+  const hasDefinedValue = (obj: any): boolean => {
+    if (obj == null) {
+      return false;
+    }
+    if (typeof obj !== 'object') {
+      return obj !== '' && obj !== undefined && obj !== null;
+    }
+    return Object.values(obj).some((v) => hasDefinedValue(v));
+  };
+
+  const shouldBeOpen = hasDefinedValue(ADDITONAL_SETTINGS_DEFAULTS);
 
   const onLogsConfigChange = (key: keyof CHLogsConfig, value: string | boolean | string[]) => {
     onOptionsChange({
@@ -110,72 +173,6 @@ export const AdditionalSettingsSection = (props: Props) => {
     });
   };
 
-  // if any of the settings in this section are set, open the section by default
-  const shouldBeOpen = useMemo(() => {
-    const anyDefaults = jsonData.defaultDatabase || jsonData.defaultTable;
-
-    const anyQuerySettings =
-      jsonData.connMaxLifetime ||
-      jsonData.dialTimeout ||
-      jsonData.maxIdleConns ||
-      jsonData.maxOpenConns ||
-      jsonData.queryTimeout ||
-      jsonData.validateSql;
-
-    const logs = jsonData.logs || {};
-    const anyLogs =
-      logs.defaultDatabase ||
-      logs.defaultTable !== 'otel_logs' ||
-      logs.otelEnabled ||
-      logs.otelVersion !== 'latest' ||
-      logs.timeColumn ||
-      logs.levelColumn ||
-      logs.messageColumn ||
-      logs.selectContextColumns ||
-      logs.contextColumns!.length > 0;
-
-    const traces = jsonData.traces || {};
-    const anyTraces =
-      traces.defaultDatabase ||
-      traces.defaultTable !== 'otel_traces' ||
-      traces.otelEnabled ||
-      traces.otelVersion !== 'latest' ||
-      traces.traceIdColumn ||
-      traces.spanIdColumn ||
-      traces.operationNameColumn ||
-      traces.parentSpanIdColumn ||
-      traces.serviceNameColumn ||
-      traces.durationColumn ||
-      traces.startTimeColumn ||
-      traces.tagsColumn ||
-      traces.serviceTagsColumn ||
-      traces.kindColumn ||
-      traces.statusCodeColumn ||
-      traces.statusMessageColumn ||
-      traces.stateColumn ||
-      traces.instrumentationLibraryNameColumn ||
-      traces.instrumentationLibraryVersionColumn ||
-      traces.flattenNested ||
-      traces.traceEventsColumnPrefix ||
-      traces.traceLinksColumnPrefix;
-
-    const anyAliasTables = Array.isArray(jsonData.aliasTables) && jsonData.aliasTables.length > 0;
-
-    const anyRowLimit = jsonData.enableRowLimit;
-    const anySecureSocks = jsonData.enableSecureSocksProxy;
-
-    return (
-      anyDefaults ||
-      anyQuerySettings ||
-      anyLogs ||
-      anyTraces ||
-      anyAliasTables ||
-      anyRowLimit ||
-      anySecureSocks ||
-      customSettings.length > 0
-    );
-  }, [jsonData, customSettings]);
-
   return (
     <Box
       borderStyle="solid"

src/views/config-v2/ServerAndEncryptionSection.tsx

@@ -80,7 +80,7 @@ export const ServerAndEncryptionSection = (props: Props) => {
         isOpen={!!CONFIG_SECTION_HEADERS[0].isOpen}
       >
         <Text variant="body" color="secondary">
-          Enter the server address of your Clickhouse instance. Then select your protocol, port and security options. If
+          Enter the server address of your ClickHouse instance. Then select your protocol, port and security options. If
           you need further guidance, visit the{' '}
           <TextLink
             href="https://grafana.com/grafana/plugins/grafana-clickhouse-datasource/"

src/views/config-v2/helpers.ts

@@ -19,13 +19,13 @@ export const createTestProps = (overrides: { options?: object; mocks?: object })
       protocol: Protocol.Native,
       username: '',
     },
-    name: 'Clickhouse',
+    name: 'ClickHouse',
     orgId: 1,
     readOnly: false,
     secureJsonFields: {},
     type: 'clickhouse',
     typeLogoUrl: '',
-    typeName: 'Clickhouse',
+    typeName: 'ClickHouse',
     uid: 'z',
     url: '',
     user: '',