Skip to content

Commit 4743370

Browse files
authored
fix: display non-empty window period and update only when adaptive zoom is on (#6221)
* fix: display non-empty window period and update only when adaptive zoom is on * test: move adaptive zoom test to Cloud only
1 parent 76d4fed commit 4743370

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed
File renamed without changes.

src/shared/components/cells/Cell.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,14 @@ class CellComponent extends Component<Props, State> {
139139
</span>
140140
)
141141
}
142-
return (
143-
<span className="cell--window-period">
144-
window period: {this.props.windowPeriodFromQueryBuilder}
145-
</span>
146-
)
142+
if (this.props.windowPeriodFromQueryBuilder.length) {
143+
return (
144+
<span className="cell--window-period">
145+
window period: {this.props.windowPeriodFromQueryBuilder}
146+
</span>
147+
)
148+
}
149+
return null
147150
}
148151
default:
149152
return null

src/visualization/utils/useVisDomainSettings.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,12 @@ export const useZoomRequeryXDomainSettings = (args: ZoomRequeryArgs) => {
225225
)
226226

227227
useEffect(() => {
228-
if (queries.length && activeQueryIndex >= 0) {
228+
if (
229+
isFlagEnabled('zoomRequery') &&
230+
adaptiveZoomHide === false &&
231+
queries.length &&
232+
activeQueryIndex >= 0
233+
) {
229234
const updatedWindowPeriod = normalizeWindowPeriodForZoomRequery(
230235
getWindowPeriodFromVariables(queries[activeQueryIndex], variables),
231236
timeRange,
@@ -406,7 +411,12 @@ export const useZoomRequeryYDomainSettings = (args: ZoomRequeryArgs) => {
406411
)
407412

408413
useEffect(() => {
409-
if (queries.length && activeQueryIndex >= 0) {
414+
if (
415+
isFlagEnabled('zoomRequery') &&
416+
adaptiveZoomHide === false &&
417+
queries.length &&
418+
activeQueryIndex >= 0
419+
) {
410420
const updatedWindowPeriod = normalizeWindowPeriodForZoomRequery(
411421
getWindowPeriodFromVariables(queries[activeQueryIndex], variables),
412422
timeRange,

0 commit comments

Comments
 (0)