Skip to content

fix: add overrides to pin minimum versions #29723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eschutho wants to merge 2 commits into from
Closed

fix: add overrides to pin minimum versions #29723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0edcab
add overrides to pin minimum versions
eschutho Jul 26, 2024
f300eca
lint
eschutho Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/ci_check_npm_lock_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
REQUIRED_VERSION=2
REQUIRED_VERSION=3
LOCKFILE_VERSION=$(sed -n 's/[ \t]*"lockfileVersion"\: \([0-9]*\),/\1/p' "$1")

if [[ $LOCKFILE_VERSION != "$REQUIRED_VERSION" ]]; then
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ module.exports = {
'jsx-a11y/anchor-is-valid': 2,
'jsx-a11y/click-events-have-key-events': 0, // re-enable up for discussion
'jsx-a11y/mouse-events-have-key-events': 0, // re-enable up for discussion
'jsx-a11y/control-has-associated-label': 0,
'max-classes-per-file': 0,
'new-cap': 0,
'no-bitwise': 0,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/cypress-base/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@typescript-eslint/explicit-module-boundary-types": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/camelcase": 0,
"cypress/no-unnecessary-waiting": 0 // see issue https://github.com/cypress-io/eslint-plugin-cypress/issues/69
"cypress/unsafe-to-chain-command": 0
},
"settings": {
"import/resolver": {
Expand Down
53 changes: 0 additions & 53 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/_skip.key_value.test.ts
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,9 @@ describe('Drill to detail modal', () => {
// focus on table first to trigger browser scroll
cy.get("[data-test-viz-type='table']").contains('boy').rightclick();

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);

cy.get("[data-test-viz-type='table']")
.contains('boy')
.scrollIntoView()
Expand All @@ -267,6 +269,7 @@ describe('Drill to detail modal', () => {

// focus on table first to trigger browser scroll
cy.get("[data-test-viz-type='table']").contains('girl').rightclick();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
cy.get("[data-test-viz-type='table']")
.scrollIntoView()
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/editmode.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function openProperties() {
cy.getBySel('header-actions-menu')
.contains('Edit properties')
.click({ force: true });
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
});
}
Expand All @@ -62,6 +63,7 @@ function dragComponent(
cy.getBySel('dashboard-charts-filter-search-input').type(component);
cy.wait('@filtering');
}
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
drag(`[data-test="${target}"]`, component).to(
'[data-test="grid-content"] [data-test="dragdroppable-object"]',
Expand All @@ -84,6 +86,7 @@ function visitEdit(sampleDashboard = SAMPLE_DASHBOARD_1) {
cy.wait('@get');
editDashboard();
cy.wait('@filtering');
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
}

Expand Down
2 changes: 2 additions & 0 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/nativeFilters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ function openVerticalFilterBar() {

function setFilterBarOrientation(orientation: 'vertical' | 'horizontal') {
cy.getBySel('filterbar-orientation-icon').click();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(250);
cy.getBySel('dropdown-selectable-icon-submenu')
.contains('Orientation of filter bar')
Expand Down Expand Up @@ -498,6 +499,7 @@ describe('Native filters', () => {
.last()
.click();
//
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(1000);
cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
() => {
Expand Down
8 changes: 6 additions & 2 deletions superset-frontend/cypress-base/cypress/e2e/dashboard/tabs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ describe('Dashboard tabs', () => {
// send new query from same tab
cy.wait(treemapAlias).then(({ request }) => {
const requestBody = parsePostForm(request.body);
const requestParams = JSON.parse(requestBody.form_data as string);
const requestParams = JSON.parse(requestBody as unknown as string)
.form_data as Record<string, string | string[]>;
expect(requestParams.extra_filters[0]).deep.eq({
col: 'region',
op: 'IN',
Expand All @@ -121,7 +122,8 @@ describe('Dashboard tabs', () => {

cy.wait('@legacyChartData').then(({ request }) => {
const requestBody = parsePostForm(request.body);
const requestParams = JSON.parse(requestBody.form_data as string);
const requestParams = JSON.parse(requestBody as unknown as string)
.form_data as Record<string, string | string[]>;
expect(requestParams.extra_filters[0]).deep.eq({
col: 'region',
op: 'IN',
Expand Down Expand Up @@ -173,13 +175,15 @@ describe('Dashboard tabs', () => {

expandFilterOnLeftPanel();

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(1000);

cy.get('@top-level-tabs')
.first()
.click()
.should('have.class', 'ant-tabs-tab-active');

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(1000);

cy.get("[data-test-viz-type='treemap_v2'] .chart-container").then(
Expand Down
Loading