Skip to content
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

fix(frontend): broken observability windowing logic and format #2234

Merged
merged 1 commit into from
Nov 10, 2024
Merged

fix(frontend): broken observability windowing logic and format #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions agenta-web/src/components/Filters/Sort.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const useStyles = createUseStyles((theme: JSSTheme) => ({
export type SortResult = {
type: "custom" | "standard"
sorted: string
customRange?: {startTime: string; endTime: string}
customRange?: {startTime?: string; endTime?: string}
}
type SortTypes =
| "30 mins"
Expand Down Expand Up @@ -87,7 +87,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
customRange?: CustomTimeRange
}) => {
let sortedTime
let customRangeTime
let customRangeTime: {startTime?: string; endTime?: string} = {}

if (sortData && sortData !== "custom" && sortData !== "all time") {
const now = dayjs().utc()
Expand All @@ -98,11 +98,11 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
.subtract(parseInt(amount), unit as dayjs.ManipulateType)
.toISOString()
.split(".")[0]
} else if (customRange?.startTime && sortData == "custom") {
customRangeTime = {
startTime: customRange.startTime.toISOString().split(".")[0],
endTime: customRange.endTime?.toISOString().split(".")[0] as string,
}
} else if (sortData === "custom" && (customRange?.startTime || customRange?.endTime)) {
if (customRange.startTime)
customRangeTime.startTime = customRange.startTime.toISOString().split(".")[0]
if (customRange.endTime)
customRangeTime.endTime = customRange.endTime.toISOString().split(".")[0]
} else if (sortData === "all time") {
sortedTime = "1970-01-01T00:00:00"
}
Expand All @@ -115,7 +115,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
}

const handleApplyCustomRange = () => {
if (customTime.startTime && customTime.endTime) {
if (customTime.startTime || customTime.endTime) {
apply({sortData: "custom", customRange: customTime})
setDropdownVisible(false)
}
Expand All @@ -130,7 +130,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
setCustomOptionSelected(false)
}, 500)

if (customTime.startTime) {
if (customTime.startTime || customTime.endTime) {
setCustomTime({startTime: null, endTime: null})
}
}
Expand All @@ -156,7 +156,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
overlayClassName={`${classes.popover} ${customOptionSelected ? "!w-[536px]" : "!w-[256px]"} h-[345px]`}
arrow={false}
afterOpenChange={() => {
if (sort == "custom" && customTime.startTime == null) {
if (sort == "custom" && !customTime.startTime && !customTime.endTime) {
setSort(defaultSortValue)
setCustomOptionSelected(false)
}
Expand Down Expand Up @@ -213,6 +213,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
<DatePicker
showTime
value={customTime.startTime}
format="HH:mm:ss DD MMM YYYY"
onChange={(date) =>
setCustomTime({
...customTime,
Expand All @@ -228,6 +229,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
<DatePicker
showTime
value={customTime.endTime}
format="HH:mm:ss DD MMM YYYY"
onChange={(date) =>
setCustomTime({
...customTime,
Expand All @@ -252,7 +254,7 @@ const Sort: React.FC<Props> = ({onSortApply, defaultSortValue}) => {
<Button
type="primary"
onClick={handleApplyCustomRange}
disabled={!customTime.startTime || !customTime.endTime}
disabled={!customTime.startTime && !customTime.endTime}
>
Apply
</Button>
Expand Down
11 changes: 8 additions & 3 deletions agenta-web/src/contexts/observability.context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,14 @@ const ObservabilityContextProvider: React.FC<PropsWithChildren> = ({children}) =
if (sort) {
if (sort.type === "standard") {
params.oldest = sort.sorted
} else if (sort.type === "custom" && sort.customRange?.startTime) {
params.oldest = sort.customRange.startTime
params.newest = sort.customRange.endTime
} else if (
sort.type === "custom" &&
(sort.customRange?.startTime || sort.customRange?.endTime)
) {
const {startTime, endTime} = sort.customRange

if (startTime) params.oldest = startTime
if (endTime) params.newest = endTime
}
}

Expand Down