Skip to content

Commit 20d8ad3

Browse files
authored
Merge branch 'master' into geido/fix/calculated-cols-virtual-datasets
2 parents 8934f20 + a67ca05 commit 20d8ad3

13 files changed

Lines changed: 1150 additions & 303 deletions

File tree

.github/workflows/claude.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
fetch-depth: 1
7777

7878
- name: Run Claude PR Action
79-
uses: anthropics/claude-code-action@094bd24d575e7b30ac1576024817bf1a97c81262 # beta
79+
uses: anthropics/claude-code-action@88c168b39e7e64da0286d812b6e9fbebb6708185 # beta
8080
with:
8181
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
8282
timeout_minutes: "60"

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
"@superset-ui/core": "^0.20.4",
7070
"@swc/core": "^1.15.21",
7171
"antd": "^6.3.5",
72-
"baseline-browser-mapping": "^2.10.11",
73-
"caniuse-lite": "^1.0.30001781",
72+
"baseline-browser-mapping": "^2.10.13",
73+
"caniuse-lite": "^1.0.30001782",
7474
"docusaurus-plugin-openapi-docs": "^4.6.0",
7575
"docusaurus-theme-openapi-docs": "^4.6.0",
7676
"js-yaml": "^4.1.1",

docs/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5819,10 +5819,10 @@ base64-js@^1.3.1, base64-js@^1.5.1:
58195819
resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
58205820
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
58215821

5822-
baseline-browser-mapping@^2.10.11, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
5823-
version "2.10.11"
5824-
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.11.tgz#957bea71ccc2e9854287c2575a037d36b3a94b73"
5825-
integrity sha512-DAKrHphkJyiGuau/cFieRYhcTFeK/lBuD++C7cZ6KZHbMhBrisoi+EvhQ5RZrIfV5qwsW8kgQ07JIC+MDJRAhg==
5822+
baseline-browser-mapping@^2.10.13, baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
5823+
version "2.10.13"
5824+
resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.13.tgz#5a154cc4589193015a274e3d18319b0d76b9224e"
5825+
integrity sha512-BL2sTuHOdy0YT1lYieUxTw/QMtPBC3pmlJC6xk8BBYVv6vcw3SGdKemQ+Xsx9ik2F/lYDO9tqsFQH1r9PFuHKw==
58265826

58275827
batch@0.6.1:
58285828
version "0.6.1"
@@ -6067,10 +6067,10 @@ caniuse-api@^3.0.0:
60676067
lodash.memoize "^4.1.2"
60686068
lodash.uniq "^4.5.0"
60696069

6070-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001781:
6071-
version "1.0.30001781"
6072-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001781.tgz#344b47c03eb8168b79c3c158b872bcfbdd02a400"
6073-
integrity sha512-RdwNCyMsNBftLjW6w01z8bKEvT6e/5tpPVEgtn22TiLGlstHOVecsX2KHFkD5e/vRnIE4EGzpuIODb3mtswtkw==
6070+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001782:
6071+
version "1.0.30001782"
6072+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001782.tgz#f2b8617f998bc134701c54ce9748af44f646e062"
6073+
integrity sha512-dZcaJLJeDMh4rELYFw1tvSn1bhZWYFOt468FcbHHxx/Z/dFidd1I6ciyFdi3iwfQCyOjqo9upF6lGQYtMiJWxw==
60746074

60756075
ccount@^2.0.0:
60766076
version "2.0.1"

superset-frontend/package-lock.json

Lines changed: 55 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

superset-frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"dom-to-pdf": "^0.3.2",
168168
"echarts": "^5.6.0",
169169
"fast-glob": "^3.3.2",
170-
"fs-extra": "^11.3.3",
170+
"fs-extra": "^11.3.4",
171171
"fuse.js": "^7.1.0",
172172
"geolib": "^3.3.4",
173173
"geostyler": "^18.3.1",
@@ -301,7 +301,7 @@
301301
"@typescript-eslint/eslint-plugin": "^7.18.0",
302302
"@typescript-eslint/parser": "^7.18.0",
303303
"babel-jest": "^30.0.2",
304-
"babel-loader": "^10.0.0",
304+
"babel-loader": "^10.1.0",
305305
"babel-plugin-dynamic-import-node": "^2.3.3",
306306
"babel-plugin-jsx-remove-data-test-id": "^3.0.0",
307307
"babel-plugin-lodash": "^3.3.4",
@@ -369,7 +369,7 @@
369369
"vm-browserify": "^1.1.2",
370370
"wait-on": "^9.0.4",
371371
"webpack": "^5.105.4",
372-
"webpack-bundle-analyzer": "^5.2.0",
372+
"webpack-bundle-analyzer": "^5.3.0",
373373
"webpack-cli": "^6.0.1",
374374
"webpack-dev-server": "^5.2.3",
375375
"webpack-manifest-plugin": "^5.0.1",

superset-frontend/packages/generator-superset/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"cross-env": "^10.1.0",
38-
"fs-extra": "^11.3.3",
38+
"fs-extra": "^11.3.4",
3939
"jest": "^30.3.0",
4040
"yeoman-test": "^11.3.1"
4141
},

superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,9 +578,31 @@ export default function transformProps(
578578
: String;
579579
const xAxisFormatter =
580580
xAxisDataType === GenericDataType.Temporal
581-
? getXAxisFormatter(xAxisTimeFormat)
581+
? getXAxisFormatter(xAxisTimeFormat, timeGrainSqla)
582582
: String;
583583

584+
const showMaxLabel = xAxisType === AxisType.Time && xAxisLabelRotation === 0;
585+
const deduplicatedFormatter = showMaxLabel
586+
? (() => {
587+
let lastLabel: string | undefined;
588+
const wrapper = (value: number | string) => {
589+
const label =
590+
typeof xAxisFormatter === 'function'
591+
? (xAxisFormatter as Function)(value)
592+
: String(value);
593+
if (label === lastLabel) {
594+
return '';
595+
}
596+
lastLabel = label;
597+
return label;
598+
};
599+
if (typeof xAxisFormatter === 'function' && 'id' in xAxisFormatter) {
600+
(wrapper as any).id = (xAxisFormatter as any).id;
601+
}
602+
return wrapper;
603+
})()
604+
: xAxisFormatter;
605+
584606
const addYAxisTitleOffset =
585607
!!(yAxisTitle || yAxisTitleSecondary) &&
586608
convertInteger(yAxisTitleMargin) !== 0;
@@ -658,9 +680,14 @@ export default function transformProps(
658680
nameGap: convertInteger(xAxisTitleMargin),
659681
nameLocation: 'middle',
660682
axisLabel: {
661-
formatter: xAxisFormatter,
683+
hideOverlap: !(xAxisType === AxisType.Time && xAxisLabelRotation !== 0),
684+
formatter: deduplicatedFormatter,
662685
rotate: xAxisLabelRotation,
663686
interval: xAxisLabelInterval,
687+
...(showMaxLabel && {
688+
showMaxLabel: true,
689+
alignMaxLabel: 'right',
690+
}),
664691
},
665692
minorTick: { show: minorTicks },
666693
minInterval:

0 commit comments

Comments
 (0)