Skip to content

Commit 4ec1fa3

Browse files
committed
fix(logs): prevent DatePicker onOpenChange from reverting time range after Apply
1 parent b6cd0fe commit 4ec1fa3

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/logs-toolbar.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ export const LogsToolbar = memo(function LogsToolbar({
224224

225225
const [datePickerOpen, setDatePickerOpen] = useState(false)
226226
const [previousTimeRange, setPreviousTimeRange] = useState(timeRange)
227+
const dateRangeAppliedRef = useRef(false)
227228
const { data: folders = {} } = useFolderMap(workspaceId)
228229

229230
const { data: allWorkflowList = [] } = useWorkflows(workspaceId)
@@ -398,6 +399,7 @@ export const LogsToolbar = memo(function LogsToolbar({
398399
*/
399400
const handleDateRangeApply = useCallback(
400401
(start: string, end: string) => {
402+
dateRangeAppliedRef.current = true
401403
setDateRange(start, end)
402404
setDatePickerOpen(false)
403405
captureEvent(posthogRef.current, 'logs_filter_applied', {
@@ -803,7 +805,13 @@ export const LogsToolbar = memo(function LogsToolbar({
803805
showTrigger={false}
804806
open={datePickerOpen}
805807
onOpenChange={(isOpen) => {
806-
if (!isOpen) handleDatePickerCancel()
808+
if (!isOpen) {
809+
if (dateRangeAppliedRef.current) {
810+
dateRangeAppliedRef.current = false
811+
} else {
812+
handleDatePickerCancel()
813+
}
814+
}
807815
}}
808816
startDate={startDate}
809817
endDate={endDate}

apps/sim/app/workspace/[workspaceId]/logs/logs.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,7 @@ function LogsFilterPanel({ searchQuery, onSearchQueryChange }: LogsFilterPanelPr
12591259

12601260
const [datePickerOpen, setDatePickerOpen] = useState(false)
12611261
const [previousTimeRange, setPreviousTimeRange] = useState(timeRange)
1262+
const dateRangeAppliedRef = useRef(false)
12621263
const { data: folders = {} } = useFolderMap(workspaceId)
12631264
const { data: allWorkflowList = [] } = useWorkflows(workspaceId)
12641265

@@ -1357,6 +1358,7 @@ function LogsFilterPanel({ searchQuery, onSearchQueryChange }: LogsFilterPanelPr
13571358
}
13581359

13591360
const handleDateRangeApply = (start: string, end: string) => {
1361+
dateRangeAppliedRef.current = true
13601362
setDateRange(start, end)
13611363
setDatePickerOpen(false)
13621364
}
@@ -1501,7 +1503,13 @@ function LogsFilterPanel({ searchQuery, onSearchQueryChange }: LogsFilterPanelPr
15011503
showTrigger={false}
15021504
open={datePickerOpen}
15031505
onOpenChange={(isOpen) => {
1504-
if (!isOpen) handleDatePickerCancel()
1506+
if (!isOpen) {
1507+
if (dateRangeAppliedRef.current) {
1508+
dateRangeAppliedRef.current = false
1509+
} else {
1510+
handleDatePickerCancel()
1511+
}
1512+
}
15051513
}}
15061514
startDate={startDate}
15071515
endDate={endDate}

0 commit comments

Comments
 (0)