Fix date selector and empty data in the stats

cohstats · Oct 4, 2023 · faa7bb7 · faa7bb7
1 parent ba52417
commit faa7bb7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/components/screens/stats/game/inner-game-stats-page.tsx b/components/screens/stats/game/inner-game-stats-page.tsx
@@ -137,7 +137,7 @@ const InnerGameStatsPage = ({
     );
   }
 
-  if (data) {
+  if (data?.analysis["1v1"]) {
     const analysis = data.analysis as StatsDataObject;
 
     const matchCount = (() => {
@@ -234,6 +234,12 @@ const InnerGameStatsPage = ({
         </Text>
       </>
     );
+  } else {
+    content = (
+      <Center maw={400} h={250} mx="auto">
+        <h3>No data for the selected period</h3>
+      </Center>
+    );
   }
 
   return <div style={{ minHeight: 1600 }}>{content}</div>;

diff --git a/components/screens/stats/stats-container-selector.tsx b/components/screens/stats/stats-container-selector.tsx
@@ -79,7 +79,7 @@ const StatsContainerSelector = ({ statsType }: { statsType: "gameStats" | "mapSt
   useEffect(() => {
     if (!valueDatePicker?.[0] || !valueDatePicker?.[1]) return;
 
-    const fromTimeStamp = convertToDateString(valueDatePicker[0]);
+    const fromTimeStamp = convertToDateString(valueDatePicker[0], false);
     //  getDateTimestamp(valueDatePicker[0] || new Date() );
     const toTimeStamp = convertToDateString(valueDatePicker[1]); // getDateTimestamp(valueDatePicker[1] || new Date());
     push({ query: { ...query, from: fromTimeStamp, to: toTimeStamp } }, undefined, {

diff --git a/src/utils.ts b/src/utils.ts
@@ -42,12 +42,12 @@ export const getGMTTimeStamp = (date = new Date()) => {
   );
 };
 
-export const convertToDateString = (date = new Date()) => {
+export const convertToDateString = (date = new Date(), allowNow = true) => {
   const oldDate = dayjs(date);
   const today = dayjs(new Date());
 
   // They are the same, it's today
-  if (oldDate.diff(today, "day") === 0) {
+  if (oldDate.diff(today, "day") === 0 && allowNow) {
     return "now";
   } else {
     return dayjs(date).format("YYYY-MM-DD");