fix(portal): adjust helper methods location

mycloudnexus · Nov 13, 2024 · 62f900c · 62f900c
1 parent f4527c9
commit 62f900c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/kraken-app/kraken-app-portal/src/__test__/pages/Homepage/index.test.tsx b/kraken-app/kraken-app-portal/src/__test__/pages/Homepage/index.test.tsx
@@ -13,7 +13,7 @@ test("Hompage test", () => {
           id: "32b4832f-fb2f-4c99-b89a-c5c995b18dfc",
           productId: "mef.sonata",
           createdAt: "2024-05-30T13:02:03.224486Z",
-          name: "production",
+          name: "stage",
         },
       ],
     },

diff --git a/kraken-app/kraken-app-portal/src/pages/HomePage/components/ActivityDiagrams/index.tsx b/kraken-app/kraken-app-portal/src/pages/HomePage/components/ActivityDiagrams/index.tsx
@@ -1,6 +1,7 @@
 import { Text } from "@/components/Text";
 import {
   getCurrentTimeWithZone,
+  recentXDays,
   TIME_ZONE_FORMAT,
 } from "@/utils/constants/format";
 import { IEnv } from "@/utils/types/env.type";
@@ -82,11 +83,7 @@ const DiagramWrapper = ({ envs }: Props) => {
   }, [envs]);
 
   const setRecentDate = (e: RadioChangeEvent) => {
-    const requestEndTime = currentTime;
-    const requestStartTime =
-      e.target.value === "7"
-        ? dayjs().subtract(7, "days").format(TIME_ZONE_FORMAT)
-        : dayjs().subtract(7, "months").format(TIME_ZONE_FORMAT);
+    const { requestStartTime, requestEndTime } = recentXDays(e);
     setParams({ ...params, requestStartTime, requestEndTime });
   };
 

diff --git a/kraken-app/kraken-app-portal/src/utils/constants/format.ts b/kraken-app/kraken-app-portal/src/utils/constants/format.ts
@@ -1,3 +1,4 @@
+import { RadioChangeEvent } from 'antd';
 import dayjs from "dayjs";
 import timezone from "dayjs/plugin/timezone";
 import utc from "dayjs/plugin/utc";
@@ -16,3 +17,12 @@ export const getCurrentTimeWithZone = () => {
 export const formatDiagramDate = (value: any): string => {
   return dayjs(value).format("D-M");
 };
+
+export const recentXDays = (e: RadioChangeEvent) => {
+  const requestEndTime = getCurrentTimeWithZone();
+  const requestStartTime =
+    e.target.value === "7"
+      ? dayjs().subtract(7, "days").format(TIME_ZONE_FORMAT)
+      : dayjs().subtract(7, "months").format(TIME_ZONE_FORMAT);
+  return { requestStartTime, requestEndTime }
+};