diff --git a/superset-frontend/cypress-base/cypress/integration/explore/advanced.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/advanced.test.ts index b0504bd67b..c0ffbada25 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/advanced.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/advanced.test.ts @@ -87,7 +87,7 @@ describe('Annotations', () => { .within(() => { cy.get('input').type('y=1400000'); }); - cy.get('button').contains('OK').click(); + cy.get('button').contains('OK').click({ force: true }); }); cy.get('button[data-test="run-query-button"]').click(); diff --git a/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx b/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx index a6650d4f08..34f885cc6c 100644 --- a/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx +++ b/superset-frontend/src/explore/components/AdhocFilterEditPopover.jsx @@ -20,6 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Tab, Tabs } from 'react-bootstrap'; import Button from 'src/components/Button'; +import { t } from '@superset-ui/core'; import columnType from '../propTypes/columnType'; import adhocMetricType from '../propTypes/adhocMetricType'; @@ -178,6 +179,9 @@ export default class AdhocFilterEditPopover extends React.Component {
+ - - Where filters by columns. + WHERE {t('filters by columns')}
- Having filters by metrics. + HAVING {t('filters by metrics')}