jixuan1989 commented on code in PR #109:
URL: https://github.com/apache/iotdb-extras/pull/109#discussion_r3292440400
##########
connectors/grafana-plugin/src/datasource.ts:
##########
@@ -37,9 +37,19 @@ export class DataSource extends
DataSourceWithBackend<IoTDBQuery, IoTDBOptions>
);
}
if (query.prefixPath) {
- query.prefixPath.map(
- (_, index) => (query.prefixPath[index] =
getTemplateSrv().replace(query.prefixPath[index], scopedVars))
- );
+ const expanded: string[] = [];
+ for (const path of query.prefixPath) {
+ if (getTemplateSrv().containsTemplate(path)) {
+ const replaced = getTemplateSrv().replace(path, scopedVars,
'pipe');
+ const values = replaced.split('|');
+ for (const val of values) {
+ expanded.push(val);
Review Comment:
This was addressed in the force-push (commit `811dba6`). The new
implementation no longer uses `split('|')` — it extracts the variable name via
regex, resolves values from `scopedVars` or `getVariables()`, and manually
concatenates `prefix + val + suffix` for each value.
##########
connectors/grafana-plugin/src/datasource.test.ts:
##########
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { DataSource } from './datasource';
+import { IoTDBQuery } from './types';
+import { ScopedVars } from '@grafana/data';
+
+const mockReplace = jest.fn();
+const mockContainsTemplate = jest.fn();
+
+jest.mock('@grafana/runtime', () => ({
+ DataSourceWithBackend: class {},
+ getTemplateSrv: () => ({
+ replace: mockReplace,
+ containsTemplate: mockContainsTemplate,
+ }),
+}));
+
+describe('DataSource', () => {
+ let ds: DataSource;
+
+ beforeEach(() => {
+ ds = new DataSource({ jsonData: { url: 'http://localhost:6667', username:
'root' } } as any);
+ mockReplace.mockReset();
+ mockContainsTemplate.mockReset();
+ });
+
+ describe('applyTemplateVariables - prefixPath expansion', () => {
+ const baseQuery: Partial<IoTDBQuery> = {
+ sqlType: 'SQL: Full Customized',
+ expression: [],
+ prefixPath: [],
+ condition: '',
+ control: '',
+ };
+ const scopedVars: ScopedVars = {};
+
+ it('should pass through literal paths without variables', () => {
+ mockContainsTemplate.mockReturnValue(false);
+ const query = { ...baseQuery, prefixPath: ['root.app.device1',
'root.app.device2'] } as IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1',
'root.app.device2']);
+ expect(mockReplace).not.toHaveBeenCalled();
+ });
+
+ it('should handle single-value variable without expansion', () => {
+ mockContainsTemplate.mockReturnValue(true);
+ mockReplace.mockReturnValue('root.app.device1');
+ const query = { ...baseQuery, prefixPath: ['root.app.${device}'] } as
IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1']);
+ expect(mockReplace).toHaveBeenCalledWith('root.app.${device}',
scopedVars, 'pipe');
+ });
+
+ it('should expand multi-value variable into multiple paths', () => {
+ mockContainsTemplate.mockReturnValue(true);
+
mockReplace.mockReturnValue('root.app.device1|root.app.device2|root.app.device3');
+ const query = { ...baseQuery, prefixPath: ['root.app.${device}'] } as
IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1',
'root.app.device2', 'root.app.device3']);
+ });
Review Comment:
Fixed in the force-push. Tests now mock `getVariables()` to return the
variable's value array directly, rather than relying on `replace()` pipe
output. This accurately reflects how the new implementation resolves values.
##########
connectors/grafana-plugin/src/datasource.test.ts:
##########
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { DataSource } from './datasource';
+import { IoTDBQuery } from './types';
+import { ScopedVars } from '@grafana/data';
+
+const mockReplace = jest.fn();
+const mockContainsTemplate = jest.fn();
+
+jest.mock('@grafana/runtime', () => ({
+ DataSourceWithBackend: class {},
+ getTemplateSrv: () => ({
+ replace: mockReplace,
+ containsTemplate: mockContainsTemplate,
+ }),
+}));
+
+describe('DataSource', () => {
+ let ds: DataSource;
+
+ beforeEach(() => {
+ ds = new DataSource({ jsonData: { url: 'http://localhost:6667', username:
'root' } } as any);
+ mockReplace.mockReset();
+ mockContainsTemplate.mockReset();
+ });
+
+ describe('applyTemplateVariables - prefixPath expansion', () => {
+ const baseQuery: Partial<IoTDBQuery> = {
+ sqlType: 'SQL: Full Customized',
+ expression: [],
+ prefixPath: [],
+ condition: '',
+ control: '',
+ };
+ const scopedVars: ScopedVars = {};
+
+ it('should pass through literal paths without variables', () => {
+ mockContainsTemplate.mockReturnValue(false);
+ const query = { ...baseQuery, prefixPath: ['root.app.device1',
'root.app.device2'] } as IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1',
'root.app.device2']);
+ expect(mockReplace).not.toHaveBeenCalled();
+ });
+
+ it('should handle single-value variable without expansion', () => {
+ mockContainsTemplate.mockReturnValue(true);
+ mockReplace.mockReturnValue('root.app.device1');
+ const query = { ...baseQuery, prefixPath: ['root.app.${device}'] } as
IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1']);
+ expect(mockReplace).toHaveBeenCalledWith('root.app.${device}',
scopedVars, 'pipe');
+ });
+
+ it('should expand multi-value variable into multiple paths', () => {
+ mockContainsTemplate.mockReturnValue(true);
+
mockReplace.mockReturnValue('root.app.device1|root.app.device2|root.app.device3');
+ const query = { ...baseQuery, prefixPath: ['root.app.${device}'] } as
IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.app.device1',
'root.app.device2', 'root.app.device3']);
+ });
+
+ it('should handle mixed literal and template paths', () => {
+ mockContainsTemplate.mockImplementation((path: string) =>
path.includes('${'));
+ mockReplace.mockReturnValue('root.app.device1|root.app.device2');
+ const query = {
+ ...baseQuery,
+ prefixPath: ['root.static.path', 'root.app.${device}'],
+ } as IoTDBQuery;
+
+ const result = ds.applyTemplateVariables(query, scopedVars);
+
+ expect(result.prefixPath).toEqual(['root.static.path',
'root.app.device1', 'root.app.device2']);
+ });
Review Comment:
Same as above — fixed in the force-push. Tests now use `mockGetVariables()`
to provide variable values directly, matching the actual implementation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
