msyavuz commented on code in PR #43453:
URL: https://github.com/apache/superset/pull/43453#discussion_r3880250901
##########
superset-frontend/package.json:
##########
@@ -162,6 +162,7 @@
"chrono-node": "^2.10.1",
"classnames": "^2.2.5",
"content-disposition": "^2.0.1",
+ "d3-format": "^3.1.2",
Review Comment:
`package-lock.json` wasn't regenerated for this dep, which is what's failing
frontend-build, pre-commit and the docker/e2e jobs. Since `@superset-ui/core`
already depends on d3-format, would re-exporting `formatSpecifier` from there
avoid the root dep entirely?
##########
superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditorMetricFormatWarning.test.tsx:
##########
@@ -0,0 +1,168 @@
+/**
+ * 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 fetchMock from 'fetch-mock';
+import { screen, userEvent } from 'spec/helpers/testing-library';
+import { Constants } from '@superset-ui/core/components';
+import { isCountExpression, isPercentD3Format } from '../DatasourceEditor';
+import {
+ createProps,
+ DATASOURCE_ENDPOINT,
+ setupDatasourceEditorMocks,
+ cleanupAsyncOperations,
+ fastRender,
+ dismissDatasourceWarning,
+} from './DatasourceEditor.test.utils';
+
+beforeEach(() => {
+ fetchMock.get(DATASOURCE_ENDPOINT, [], { name: DATASOURCE_ENDPOINT });
+ setupDatasourceEditorMocks();
+});
+
+afterEach(async () => {
+ await cleanupAsyncOperations();
+ fetchMock.clearHistory().removeRoutes();
+});
+
+const WARNING_TEXT = /D3 format is a percentage/i;
+
+// Negative assertions must wait past TextControl's debounce, or they pass
+// before the value even commits.
+const waitPastDebounce = () =>
+ new Promise(resolve => {
+ setTimeout(resolve, Constants.FAST_DEBOUNCE + 50);
+ });
+
+test('isCountExpression matches a COUNT(...) call, including nested calls', ()
=> {
+ expect(isCountExpression('COUNT(*)')).toBe(true);
+ expect(isCountExpression('count( * )')).toBe(true);
+ expect(isCountExpression('COUNT (*)')).toBe(true);
+ expect(isCountExpression('COUNT(DISTINCT name)')).toBe(true);
+ expect(isCountExpression('COUNT(DISTINCT COALESCE(a, b))')).toBe(true);
+ expect(isCountExpression('COUNT(*) / COUNT(*)')).toBe(false);
+ expect(isCountExpression('COUNT(*) * 100')).toBe(false);
+ expect(isCountExpression('SUM(num)')).toBe(false);
+ expect(isCountExpression(undefined)).toBe(false);
+});
+
+test('isPercentD3Format accepts only a valid D3 percent/p spec', () => {
+ expect(isPercentD3Format('.0%')).toBe(true);
+ expect(isPercentD3Format(',.2%')).toBe(true);
+ expect(isPercentD3Format('.1p')).toBe(true);
+ expect(isPercentD3Format('foo%')).toBe(false);
+ expect(isPercentD3Format('.0%garbage%')).toBe(false);
+ expect(isPercentD3Format(',.0f')).toBe(false);
+ expect(isPercentD3Format(undefined)).toBe(false);
+});
+
+// A '%' format is valid syntax, so it never hits the "Invalid format"
fallback.
+test('warns when a percent D3 format is set on a COUNT metric', async () => {
+ const testProps = createProps();
+ fastRender(testProps);
+ await dismissDatasourceWarning();
+
+ await userEvent.click(await screen.findByTestId('collection-tab-Metrics'));
+ const expandToggles = await screen.findAllByLabelText(/expand row/i);
+ // Rows sort by metric id descending, so `COUNT(*)` (id 7) is first.
+ await userEvent.click(expandToggles[0]);
+
+ expect(screen.queryByText(WARNING_TEXT)).not.toBeInTheDocument();
+
+ await userEvent.type(await screen.findByPlaceholderText('%y/%m/%d'), '.0%');
+
+ expect(await screen.findByText(WARNING_TEXT)).toBeInTheDocument();
+});
+
+test('does not warn for a non-percent format on a COUNT metric', async () => {
+ const testProps = createProps();
+ fastRender(testProps);
+ await dismissDatasourceWarning();
+
+ await userEvent.click(await screen.findByTestId('collection-tab-Metrics'));
+ const expandToggles = await screen.findAllByLabelText(/expand row/i);
+ await userEvent.click(expandToggles[0]);
+
+ await userEvent.type(await screen.findByPlaceholderText('%y/%m/%d'), ',.0f');
+
+ await waitPastDebounce();
+ expect(screen.queryByText(WARNING_TEXT)).not.toBeInTheDocument();
+});
+
+test('does not warn for a percent format on a non-COUNT metric', async () => {
+ const testProps = createProps();
+ fastRender(testProps);
+ await dismissDatasourceWarning();
+
+ await userEvent.click(await screen.findByTestId('collection-tab-Metrics'));
+ const expandToggles = await screen.findAllByLabelText(/expand row/i);
+ // Rows sort by metric id descending, so id 1 (`SUM(...)`) sorts last.
+ await userEvent.click(expandToggles[6]);
Review Comment:
This pins the SUM row by position, so a fixture or sort-order change would
expand a different row and the negative assertion would still pass — select by
metric name instead.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
