Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

dont change bucket when going back and forth

Bill Yangf3961b36ae11
diff --git a/client/src/app/[site]/components/MainSection/Chart.tsx b/client/src/app/[site]/components/MainSection/Chart.tsx
index 7385bb8fc..5b19f1c65 100644
--- a/client/src/app/[site]/components/MainSection/Chart.tsx
+++ b/client/src/app/[site]/components/MainSection/Chart.tsx
@@ -24,8 +24,13 @@ const getMax = (time: Time, bucket: TimeBucket) => {
}
return undefined;
} else if (time.mode === "week") {
- const weekDate = DateTime.fromISO(time.week).endOf("week");
- return now < weekDate ? weekDate.toJSDate() : undefined;
+ if (bucket === "hour") {
+ const endDate = DateTime.fromISO(time.week).endOf("week").minus({
+ minutes: 59,
+ });
+ return now < endDate ? endDate.toJSDate() : undefined;
+ }
+ return undefined;
} else if (time.mode === "month") {
const monthDate = DateTime.fromISO(time.month).endOf("month");
return now < monthDate ? monthDate.toJSDate() : undefined;
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index c42b0f1e6..beecea4c2 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -42,7 +42,7 @@ type Store = {
setSite: (site: string) => void;
time: Time;
previousTime: Time;
- setTime: (time: Time) => void;
+ setTime: (time: Time, changeBucket?: boolean) => void;
bucket: TimeBucket;
setBucket: (bucket: TimeBucket) => void;
};
@@ -71,7 +71,7 @@ export const useStore = create<Store>((set) => ({
mode: "day",
day: DateTime.now().minus({ days: 1 }).toISODate(),
},
- setTime: (time) => {
+ setTime: (time, changeBucket = true) => {
let bucketToUse: TimeBucket = "hour";
let previousTime: Time;
@@ -127,7 +127,11 @@ export const useStore = create<Store>((set) => ({
previousTime = time; // fallback case
}
- set({ time, previousTime, bucket: bucketToUse });
+ if (changeBucket) {
+ set({ time, previousTime, bucket: bucketToUse });
+ } else {
+ set({ time, previousTime });
+ }
},
bucket: "hour",
setBucket: (bucket) => set({ bucket }),
@@ -147,28 +151,40 @@ export const goBack = () => {
const daysBetweenStartAndEnd = endDate.diff(startDate, "days").days;
- setTime({
- mode: "range",
- startDate:
- startDate.minus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
- endDate: startDate.toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "range",
+ startDate:
+ startDate.minus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
+ endDate: startDate.toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "week") {
- setTime({
- mode: "week",
- week: DateTime.fromISO(time.week).minus({ weeks: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "week",
+ week: DateTime.fromISO(time.week).minus({ weeks: 1 }).toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "month") {
- setTime({
- mode: "month",
- month:
- DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "month",
+ month:
+ DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "year") {
- setTime({
- mode: "year",
- year: DateTime.fromISO(time.year).minus({ years: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "year",
+ year: DateTime.fromISO(time.year).minus({ years: 1 }).toISODate() ?? "",
+ },
+ false
+ );
}
};
@@ -193,27 +209,40 @@ export const goForward = () => {
return;
}
- setTime({
- mode: "range",
- startDate:
- startDate.plus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
- // Cap the end date at today
- endDate: proposedEndDate.toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "range",
+ startDate:
+ startDate.plus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
+ // Cap the end date at today
+ endDate: proposedEndDate.toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "week") {
- setTime({
- mode: "week",
- week: DateTime.fromISO(time.week).plus({ weeks: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "week",
+ week: DateTime.fromISO(time.week).plus({ weeks: 1 }).toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "month") {
- setTime({
- mode: "month",
- month: DateTime.fromISO(time.month).plus({ months: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "month",
+ month:
+ DateTime.fromISO(time.month).plus({ months: 1 }).toISODate() ?? "",
+ },
+ false
+ );
} else if (time.mode === "year") {
- setTime({
- mode: "year",
- year: DateTime.fromISO(time.year).plus({ years: 1 }).toISODate() ?? "",
- });
+ setTime(
+ {
+ mode: "year",
+ year: DateTime.fromISO(time.year).plus({ years: 1 }).toISODate() ?? "",
+ },
+ false
+ );
}
};