This is an automated email from the ASF dual-hosted git repository. kasiazjc pushed a commit to branch fix-sentence-case-buttons in repository https://gitbox.apache.org/repos/asf/superset.git
commit ce4e191b19a25c8f3b03b39880320712d364214a Author: kasiazjc <[email protected]> AuthorDate: Tue May 26 12:12:55 2026 +0000 fix: convert ALL CAPS button labels to sentence case --- scripts/oxlint.sh | 2 +- superset-frontend/package-lock.json | 172 +++++++++++---------- superset-frontend/package.json | 2 +- .../src/SqlLab/components/ResultSet/index.tsx | 2 +- .../src/SqlLab/components/SqlEditor/index.tsx | 2 +- .../src/components/Chart/chartAction.ts | 5 +- .../Datasource/DatasourceModal/index.tsx | 2 +- .../components/gridComponents/Tabs/Tabs.tsx | 2 +- .../AnnotationLayerControl/AnnotationLayer.tsx | 2 +- .../controls/DateFilterControl/DateFilterLabel.tsx | 4 +- .../tests/DateFilterLabel.test.tsx | 6 +- .../controls/MapViewControl/MapViewControl.tsx | 4 +- 12 files changed, 105 insertions(+), 100 deletions(-) diff --git a/scripts/oxlint.sh b/scripts/oxlint.sh index 95f48afabb6..a2298607b89 100755 --- a/scripts/oxlint.sh +++ b/scripts/oxlint.sh @@ -55,7 +55,7 @@ if [ ${#js_ts_files[@]} -gt 0 ]; then echo "$output" >&2 exit 1 } - [ -n "$output" ] && echo "$output" + [ -z "$output" ] || echo "$output" else echo "No JavaScript/TypeScript files to lint" fi diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 0902547f989..22fd832762a 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -269,7 +269,7 @@ "lightningcss": "^1.32.0", "mini-css-extract-plugin": "^2.10.2", "open-cli": "^9.0.0", - "oxlint": "^1.66.0", + "oxlint": "^1.67.0", "po2json": "^0.4.5", "prettier": "3.8.3", "prettier-plugin-packagejson": "^3.0.2", @@ -8646,9 +8646,9 @@ "license": "MIT" }, "node_modules/@oxlint/binding-android-arm-eabi": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.66.0.tgz";, - "integrity": "sha512-f7kq8N51T4phpzqfBpA2qaVTI/KrkCmNwaj3t/97I/WLTDI+UhlP5GL9eER+zVxBhtlx5rKXWByJU1/zDAvyaw==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm-eabi/-/binding-android-arm-eabi-1.67.0.tgz";, + "integrity": "sha512-VrSi571rDv1N8HaEDM+DEX8nmT0y9jJo8tzzW13vsOWTx59xQczCIJx68n2zWOXRT5YKZsOZXp4qkHN/10x4mw==", "cpu": [ "arm" ], @@ -8663,9 +8663,9 @@ } }, "node_modules/@oxlint/binding-android-arm64": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm64/-/binding-android-arm64-1.66.0.tgz";, - "integrity": "sha512-xu6QO71tdDS9mjmLZ3AqhtaVHBvdmsOKkYnReNNDgh+XiwnsipeQOIxbiYOOO0iAXycJ+GK0wdMSZP/2j/AmSg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-android-arm64/-/binding-android-arm64-1.67.0.tgz";, + "integrity": "sha512-l6+NdYxMoRohix5r5bbigW16LPicceCwGcQ6LKKuE1kUdjgFfQolJjrJsQYPFetIs78Gxj/G/f5TEGoTCwj9nQ==", "cpu": [ "arm64" ], @@ -8680,9 +8680,9 @@ } }, "node_modules/@oxlint/binding-darwin-arm64": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-arm64/-/binding-darwin-arm64-1.66.0.tgz";, - "integrity": "sha512-HZ24VimSOC7mxuEA99e0H2FS0C1yO3+iW13jPRAk+e2njsUs3QeAXsafCDyaIrV/MirdOVez+etQNQsJE43zNQ==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-arm64/-/binding-darwin-arm64-1.67.0.tgz";, + "integrity": "sha512-jOzXxS1AxFxhImLIRbtGIMrEwaXcgMw3gR57WB1cRk8ai+vpr6726kxXqVvlNsrXtJ/FrmOm8RxlC0m8SW24Qg==", "cpu": [ "arm64" ], @@ -8697,9 +8697,9 @@ } }, "node_modules/@oxlint/binding-darwin-x64": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.66.0.tgz";, - "integrity": "sha512-awhj8ZvJrrRSnXj7V++rpZvTmnl99L6mi0B7gg7Cp7BN6cKpzuI481bHNLvXGA9GB1/oEgA3ponuyoAc6Md12A==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.67.0.tgz";, + "integrity": "sha512-3DFAVY94OqjIZHXIPz37yGRSWwOFTAqChQ64/M69GYLawzP0KiwdhDNfqdKKYT0bTR/DNxmMnQsj3ns+8+X/Lg==", "cpu": [ "x64" ], @@ -8714,9 +8714,9 @@ } }, "node_modules/@oxlint/binding-freebsd-x64": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-freebsd-x64/-/binding-freebsd-x64-1.66.0.tgz";, - "integrity": "sha512-KQF0oVV21/FjIqkRuL8Q1vh8ECsE5+ocdH5tcqTQ4ZnYuDVoYibQUNfqBjQaUsP6UIIda5Y75Wpm5p4RgQWiWw==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-freebsd-x64/-/binding-freebsd-x64-1.67.0.tgz";, + "integrity": "sha512-e4dDKZuLu8TR9DEBssWSDahlPgZBwojTTHZUvnjBRJfJJbpxYCjfjKfi0Z1+CSLMiJBwI2yCDtRM1XJQaARjmg==", "cpu": [ "x64" ], @@ -8731,9 +8731,9 @@ } }, "node_modules/@oxlint/binding-linux-arm-gnueabihf": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.66.0.tgz";, - "integrity": "sha512-9u1rgwZSEXWb30vbFZzQ78HVXBo0WCKNwJ3a2InRUTNMRng+PUDIoSFmA+m4HdUfBaIqftShq8J8qHc+eE/Vig==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.67.0.tgz";, + "integrity": "sha512-BKytFdcQzbITV3xlnzDUDTEDtbUMCCiC4EaNTDZ4FyT8gdNvBC4gfiLucXp/sQl0XU3p7syTlorUWVVVBZab2g==", "cpu": [ "arm" ], @@ -8748,9 +8748,9 @@ } }, "node_modules/@oxlint/binding-linux-arm-musleabihf": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-1.66.0.tgz";, - "integrity": "sha512-Ynot2HR1bHxUaNWoC280MVTDfZuaWuP3XfSMRDhyuZrVjhzoaBCVFlw8h8qeZjWKVUBhPWFIxB7AQTlK8Z2WWg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-1.67.0.tgz";, + "integrity": "sha512-XYAv0esBDX7BpTzRDjVX2Vdj+zndd8ll2dFQiaeQ6zTZr7A8GRDTN7fH3FP3jU+O0vCDx85oH/EtG7BzPgAXuw==", "cpu": [ "arm" ], @@ -8765,9 +8765,9 @@ } }, "node_modules/@oxlint/binding-linux-arm64-gnu": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.66.0.tgz";, - "integrity": "sha512-xCbgzciGgo+A4aQZEknsNrNiIwY7sU5SfRuMmRjPIvZAgdF34cIHiKvwOsS5XRLjlTVSFwitmq6YclTtHTfU+g==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.67.0.tgz";, + "integrity": "sha512-zizRMjA0i6u/2B0evgda04iycu+MoNuf1pBy6Eh+1CjC5wMEG7qN5zdDKTCvFc0KSYSDM9QTG3gjZHirgtQuKg==", "cpu": [ "arm64" ], @@ -8782,9 +8782,9 @@ } }, "node_modules/@oxlint/binding-linux-arm64-musl": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.66.0.tgz";, - "integrity": "sha512-hmo+ZB/lHkR1HdDmnziNpzSLmulnUSu10VEqX2Yex7OwvoBAbjJQLvy4gIBRV3AAwWnCvAxKp5Nv1GE6LU1QMg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.67.0.tgz";, + "integrity": "sha512-zB/Tf6sUjmmvvbva9Gj3JTJ8rJ9t4I8/U0o6vSRtd0DRIsIuyegBwJAzhSUFQHdMijIRJkW0exs/yBhpw2S20w==", "cpu": [ "arm64" ], @@ -8799,9 +8799,9 @@ } }, "node_modules/@oxlint/binding-linux-ppc64-gnu": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.66.0.tgz";, - "integrity": "sha512-2Invd4Uyy81mVooQC5FBtfxSNrvcX1OxbMlVQ6M2erRrNI2awFYF26YNW2yFxdVFZ4ffNOWKghtMjhnUPsXsVA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.67.0.tgz";, + "integrity": "sha512-kgU40Gt74CK0TCsF51KZymkIwN9U0BajKsMijB52zPqOeZU9NAHkA/NSQkZDHEaCakx42DxhXkODiAqf2b4Gug==", "cpu": [ "ppc64" ], @@ -8816,9 +8816,9 @@ } }, "node_modules/@oxlint/binding-linux-riscv64-gnu": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-1.66.0.tgz";, - "integrity": "sha512-s0iXPDQVdgayE3RGa/N2DZF7tjgg0TwEtD1sGoDxqPDGrIXgo45H0yHknT0f9A0yteASsweYZtDyTuVlM4aSag==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-1.67.0.tgz";, + "integrity": "sha512-tOYhkk/iaG9aD3FvGpBFd1Lrw0x0RaVoJBxjUkfNzS50rC5NS5BteNCwgr8A2zCdADrIIoze6D7u6U5Ic++/iQ==", "cpu": [ "riscv64" ], @@ -8833,9 +8833,9 @@ } }, "node_modules/@oxlint/binding-linux-riscv64-musl": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-1.66.0.tgz";, - "integrity": "sha512-OekL4XFiu7RPK0JIZi8VeHgtIXPREf42t8Cy/rKEsC+P3gcqDgNAAGiyuUOpdbG4wwbfue1q4CHcCO7spSve6w==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-1.67.0.tgz";, + "integrity": "sha512-sEtywrPb+0b+tHYl1SDCrw903fiC4eyKoNqzP3v+f2JT3Xcv4NEYG+P8rj+eEnX7IWhqV/xj8/JmcmVj21CXaA==", "cpu": [ "riscv64" ], @@ -8850,9 +8850,9 @@ } }, "node_modules/@oxlint/binding-linux-s390x-gnu": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.66.0.tgz";, - "integrity": "sha512-Ga1D0kj1SFslm34ThA/BdkUlyAYEnTsXyRC4pF0C5agZSwtGdHYWMTQWemUfBGp4RCG4QWXgdO+HmmmKqOtlBg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.67.0.tgz";, + "integrity": "sha512-BvR8Moa0zCLxroOx4vZaZN9nUfwAUpSTwjZdxZyKy4bv3PrzrXrxKR/ZQ0L9wNSvlPhnMJeZfa3q5w6ZCTuN6Q==", "cpu": [ "s390x" ], @@ -8867,9 +8867,9 @@ } }, "node_modules/@oxlint/binding-linux-x64-gnu": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.66.0.tgz";, - "integrity": "sha512-p5jfP1wUZe/IC3qpQO84n9DRnf9g3lKRtLBlQq23ykyrDglHcVx7sWmVTlPuU6SBw8mNnPzyOn022G3XZHnlww==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.67.0.tgz";, + "integrity": "sha512-mm2cxM6fksOpq6l0uFws8BUGKAR4dNa/cZCn37Npq7PFbhD5HDJqWfnoIvTaeRKMy5XdS2tO0MA0qbHDrnXAAA==", "cpu": [ "x64" ], @@ -8884,9 +8884,9 @@ } }, "node_modules/@oxlint/binding-linux-x64-musl": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-musl/-/binding-linux-x64-musl-1.66.0.tgz";, - "integrity": "sha512-vUB/sYlYZorDL1ZD+o9mRv7zbsykrrFRtmgS6R8musZqLtrPRQn1gc1eGpuX+sfdccz42STl/AqldY6XRb2upQ==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-linux-x64-musl/-/binding-linux-x64-musl-1.67.0.tgz";, + "integrity": "sha512-WmbMuLapKyDlobMkXAaAL0Y+Uczh4LETfIfQsUpbId4Ip8Ai82/jqeYTOoUCkuuhBFapgqP253+d83tLKOksJg==", "cpu": [ "x64" ], @@ -8901,9 +8901,9 @@ } }, "node_modules/@oxlint/binding-openharmony-arm64": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-openharmony-arm64/-/binding-openharmony-arm64-1.66.0.tgz";, - "integrity": "sha512-yde+6p/F59xRkGR9H1HfngWRif1QRJjynZK349l+UI0H6w9hL3G8/AVaTHFyTtLVQ56qtNbX2/5Dc77n1ovnOg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-openharmony-arm64/-/binding-openharmony-arm64-1.67.0.tgz";, + "integrity": "sha512-9g/PqxYJelzzTAOR5Y+RiRqdeydhEuXv2KxNeFcAKQ7UsvnWSY1OP4MsuPMbTO2Pf70tz7mFhl1j13H3fyh+8g==", "cpu": [ "arm64" ], @@ -8918,9 +8918,9 @@ } }, "node_modules/@oxlint/binding-win32-arm64-msvc": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.66.0.tgz";, - "integrity": "sha512-O9GLucgoTdmOrbBX+EjzNe7o/Ze5TFOvXcib6bzUOtBOmj6cV+zw18NgB+cGKAkDw1Pdqs8vGkfHbbsLuDtXWg==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.67.0.tgz";, + "integrity": "sha512-2VhwE6Gatb0vJGnN0TBuQMbKCOiZlSQ/zJvVWYLK4a9d4iDiJOen/yVQkGpmsJ90MuH66fzi0kEKI0jRQMDxGA==", "cpu": [ "arm64" ], @@ -8935,9 +8935,9 @@ } }, "node_modules/@oxlint/binding-win32-ia32-msvc": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.66.0.tgz";, - "integrity": "sha512-m3Pjwc2MfTcom4E4gOv7DyuGyt7OfGNCbmqDHd+N7EzXmP+ppHuudm2NjcA3AjV5TSeGxaguVF4SbTKHe1USYA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-1.67.0.tgz";, + "integrity": "sha512-EQ3VExXfeM1InbE5+JjufhZZTWy+kHUwgt3yZR7gQ47Je/mE0WspQPan0OJznh493L5anM210YNJtH1PXjTSFg==", "cpu": [ "ia32" ], @@ -8952,9 +8952,9 @@ } }, "node_modules/@oxlint/binding-win32-x64-msvc": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.66.0.tgz";, - "integrity": "sha512-/DbBvw8UFBhja6PqudUjV4UtfsJr0Oa7jUjWVKB0g86lj/VwnPrkngn0sFql3c9RDA0O16dh7ozsXb6GjNAzBQ==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@oxlint/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.67.0.tgz";, + "integrity": "sha512-bw24y+/1MHS4QDkons3YyHkPT9uCMoLHHgQhb+mb8NOjTYwub1CZ+K9Ngr8aO5DMrDrkqHwTzlTwFP2vS8Y/ZQ==", "cpu": [ "x64" ], @@ -37461,9 +37461,9 @@ } }, "node_modules/oxlint": { - "version": "1.66.0", - "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.66.0.tgz";, - "integrity": "sha512-N4LLxYLd94KEBqXDMDM5f+2PUpItTjDLreXe2Gn5KhjhCK4Qp2YUXaBi8Yu325ryOgKwt22m45fpD7nPOn69Yw==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.67.0.tgz";, + "integrity": "sha512-blwwaHPdoH8piQ5/z0KHeoHFR7FZgl12WluKJfu4qFLPkZl6mK04PkLE45Fw1NxfBRSlh40Gu7MkxHUw++ociQ==", "dev": true, "license": "MIT", "bin": { @@ -37476,32 +37476,36 @@ "url": "https://github.com/sponsors/Boshen"; }, "optionalDependencies": { - "@oxlint/binding-android-arm-eabi": "1.66.0", - "@oxlint/binding-android-arm64": "1.66.0", - "@oxlint/binding-darwin-arm64": "1.66.0", - "@oxlint/binding-darwin-x64": "1.66.0", - "@oxlint/binding-freebsd-x64": "1.66.0", - "@oxlint/binding-linux-arm-gnueabihf": "1.66.0", - "@oxlint/binding-linux-arm-musleabihf": "1.66.0", - "@oxlint/binding-linux-arm64-gnu": "1.66.0", - "@oxlint/binding-linux-arm64-musl": "1.66.0", - "@oxlint/binding-linux-ppc64-gnu": "1.66.0", - "@oxlint/binding-linux-riscv64-gnu": "1.66.0", - "@oxlint/binding-linux-riscv64-musl": "1.66.0", - "@oxlint/binding-linux-s390x-gnu": "1.66.0", - "@oxlint/binding-linux-x64-gnu": "1.66.0", - "@oxlint/binding-linux-x64-musl": "1.66.0", - "@oxlint/binding-openharmony-arm64": "1.66.0", - "@oxlint/binding-win32-arm64-msvc": "1.66.0", - "@oxlint/binding-win32-ia32-msvc": "1.66.0", - "@oxlint/binding-win32-x64-msvc": "1.66.0" - }, - "peerDependencies": { - "oxlint-tsgolint": ">=0.22.1" + "@oxlint/binding-android-arm-eabi": "1.67.0", + "@oxlint/binding-android-arm64": "1.67.0", + "@oxlint/binding-darwin-arm64": "1.67.0", + "@oxlint/binding-darwin-x64": "1.67.0", + "@oxlint/binding-freebsd-x64": "1.67.0", + "@oxlint/binding-linux-arm-gnueabihf": "1.67.0", + "@oxlint/binding-linux-arm-musleabihf": "1.67.0", + "@oxlint/binding-linux-arm64-gnu": "1.67.0", + "@oxlint/binding-linux-arm64-musl": "1.67.0", + "@oxlint/binding-linux-ppc64-gnu": "1.67.0", + "@oxlint/binding-linux-riscv64-gnu": "1.67.0", + "@oxlint/binding-linux-riscv64-musl": "1.67.0", + "@oxlint/binding-linux-s390x-gnu": "1.67.0", + "@oxlint/binding-linux-x64-gnu": "1.67.0", + "@oxlint/binding-linux-x64-musl": "1.67.0", + "@oxlint/binding-openharmony-arm64": "1.67.0", + "@oxlint/binding-win32-arm64-msvc": "1.67.0", + "@oxlint/binding-win32-ia32-msvc": "1.67.0", + "@oxlint/binding-win32-x64-msvc": "1.67.0" + }, + "peerDependencies": { + "oxlint-tsgolint": ">=0.22.1", + "vite-plus": "*" }, "peerDependenciesMeta": { "oxlint-tsgolint": { "optional": true + }, + "vite-plus": { + "optional": true } } }, @@ -50085,7 +50089,7 @@ "@math.gl/web-mercator": "^4.1.0", "mapbox-gl": "^3.24.0", "maplibre-gl": "^5.24.0", - "react-map-gl": "^8.1.1", + "react-map-gl": "^8.1.0", "supercluster": "^8.0.1" }, "peerDependencies": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 523dc33859c..ddd2f4446f4 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -352,7 +352,7 @@ "lightningcss": "^1.32.0", "mini-css-extract-plugin": "^2.10.2", "open-cli": "^9.0.0", - "oxlint": "^1.66.0", + "oxlint": "^1.67.0", "po2json": "^0.4.5", "prettier": "3.8.3", "prettier-plugin-packagejson": "^3.0.2", diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx index 5637e3c940a..18b3cd0398f 100644 --- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx +++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx @@ -380,7 +380,7 @@ const ResultSet = ({ onConfirm: () => { window.location.href = getExportCsvUrl(query.id); }, - confirmText: t('OK'), + confirmText: t('Ok'), cancelText: t('Close'), }); } diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx index 271f87538c7..e07e6ba9111 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx +++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx @@ -891,7 +891,7 @@ const SqlEditor: FC<Props> = ({ callback(currentSQL.current); }; const renderCopyQueryButton = () => ( - <Button type="primary">{t('COPY QUERY')}</Button> + <Button type="primary">{t('Copy query')}</Button> ); const renderDatasetWarning = () => ( diff --git a/superset-frontend/src/components/Chart/chartAction.ts b/superset-frontend/src/components/Chart/chartAction.ts index c44c3ccd341..65b94f231b0 100644 --- a/superset-frontend/src/components/Chart/chartAction.ts +++ b/superset-frontend/src/components/Chart/chartAction.ts @@ -817,8 +817,9 @@ export function exploreJSON( ), ); (queriesResponse as QueryData[]).forEach(response => { - if (response.warning) { - dispatch(addWarningToast(response.warning, { noDuplicate: true })); + const { warning } = response as { warning?: string | null }; + if (warning) { + dispatch(addWarningToast(warning, { noDuplicate: true })); } }); return dispatch( diff --git a/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx b/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx index 4049268c3e5..ddc82c5d5b3 100644 --- a/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx +++ b/superset-frontend/src/components/Datasource/DatasourceModal/index.tsx @@ -395,7 +395,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({ show={confirmModalOpen} onHide={handleConfirmModalClose} onHandledPrimaryAction={handleConfirmSave} - primaryButtonName={t('OK')} + primaryButtonName={t('Ok')} primaryButtonLoading={isSaving} > {getSaveDialog()} diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.tsx index 26c9b79d603..2175342c8b2 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.tsx +++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs/Tabs.tsx @@ -582,7 +582,7 @@ const Tabs = (props: TabsProps): ReactElement => { show={!!tabToDelete} onHide={handleCancelTabDelete} onHandledPrimaryAction={handleConfirmTabDelete} - primaryButtonName={t('DELETE')} + primaryButtonName={t('Delete')} primaryButtonStyle="danger" title={t('Delete dashboard tab?')} centered diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx index 76de0d526d2..ca2e2dde3ae 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx @@ -1147,7 +1147,7 @@ class AnnotationLayer extends PureComponent< disabled={!isValid} onClick={this.submitAnnotation} > - {t('OK')} + {t('Ok')} </Button> </div> </div> diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx index 8ce7afb3032..1cffec98a94 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx @@ -328,7 +328,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) { onClick={onHide} data-test={DateFilterTestKey.CancelButton} > - {t('CANCEL')} + {t('Cancel')} </Button> <Button buttonStyle="primary" @@ -338,7 +338,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) { onClick={onSave} data-test={DateFilterTestKey.ApplyButton} > - {t('APPLY')} + {t('Apply')} </Button> </div> </ContentStyleWrapper> diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx index 1a88d1da843..d68d7bd060b 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx @@ -81,7 +81,7 @@ test('Open and close popover', () => { userEvent.click(screen.getByText(NO_TIME_RANGE)); expect(defaultProps.onOpenPopover).toHaveBeenCalled(); expect(screen.getByText('Edit time range')).toBeInTheDocument(); - userEvent.click(screen.getByText('CANCEL')); + userEvent.click(screen.getByText('Cancel')); expect(defaultProps.onClosePopover).toHaveBeenCalled(); expect(screen.queryByText('Edit time range')).not.toBeInTheDocument(); @@ -89,7 +89,7 @@ test('Open and close popover', () => { userEvent.click(screen.getByText(NO_TIME_RANGE)); expect(defaultProps.onOpenPopover).toHaveBeenCalled(); expect(screen.getByText('Edit time range')).toBeInTheDocument(); - userEvent.click(screen.getByText('APPLY')); + userEvent.click(screen.getByText('Apply')); expect(defaultProps.onClosePopover).toHaveBeenCalled(); expect(screen.queryByText('Edit time range')).not.toBeInTheDocument(); }); @@ -124,7 +124,7 @@ test('DateFilter should properly handle isOverflowingFilterBar prop changes', () const popover = document.querySelector('.time-range-popover'); expect(popover?.parentElement).toBe(document.body); - userEvent.click(screen.getByText('CANCEL')); + userEvent.click(screen.getByText('Cancel')); // When overflowing, popover should attach to parent node rerender(setup({ ...defaultProps, isOverflowingFilterBar: true })); diff --git a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx index 13c079bc70f..49262414403 100644 --- a/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx +++ b/superset-frontend/src/explore/components/controls/MapViewControl/MapViewControl.tsx @@ -119,8 +119,8 @@ export const MapViewControl: FC<MapViewConfigsControlProps> = ({ }; const popoverTitle = t('Extent'); - const modeNameFitData = t('FIT DATA'); - const modeNameCustom = t('CUSTOM'); + const modeNameFitData = t('Fit data'); + const modeNameCustom = t('Custom'); const extentButtonText = t('Use current extent'); const controlHeaderProps = {
