From cd915a535cc869c37456f35ca10832533f411fdc Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Thu, 12 Oct 2023 16:52:50 +0200
Subject: [PATCH] fix(ui): sessions date range selection from urlstring

---
 frontend/app/types/app/period.js    | 4 ++--
 frontend/app/types/filter/filter.js | 3 +++
 frontend/app/utils/search.ts        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/app/types/app/period.js b/frontend/app/types/app/period.js
index c75a979eb..14e949d2e 100644
--- a/frontend/app/types/app/period.js
+++ b/frontend/app/types/app/period.js
@@ -80,8 +80,8 @@ export default Record(
             const offset = period.timezoneOffset || 0
             if (!period.rangeName || period.rangeName === CUSTOM_RANGE) {
                 const range = moment.range(
-                    moment(period.start || 0),
-                    moment(period.end || 0)
+                    moment(period.start || 0, "x"),
+                    moment(period.end || 0, "x")
                 );
                 return {
                     ...period,
diff --git a/frontend/app/types/filter/filter.js b/frontend/app/types/filter/filter.js
index 3ae206d45..b6ca05b12 100644
--- a/frontend/app/types/filter/filter.js
+++ b/frontend/app/types/filter/filter.js
@@ -88,6 +88,9 @@ export default Record({
       const range = getDateRangeFromValue(rValue);
       startDate = range.start.unix() * 1000;
       endDate = range.end.unix() * 1000;
+    } else if (filter.startDate && filter.endDate) {
+      startDate = filter.startDate;
+      endDate = filter.endDate;
     }
     return {
       ...filter,
diff --git a/frontend/app/utils/search.ts b/frontend/app/utils/search.ts
index d4ec3e5b9..0f1355689 100644
--- a/frontend/app/utils/search.ts
+++ b/frontend/app/utils/search.ts
@@ -52,7 +52,7 @@ export const getFiltersFromQuery = (search: string, filter: any) => {
   const period: any = getPeriodFromEntries(entires);
   const filters = getFiltersFromEntries(entires);
 
-  return Filter({ filters, rangeValue: period.rangeName });
+  return Filter({ filters, rangeValue: period.rangeName, startDate: period.start, endDate: period.end });
 };
 
 const getFiltersFromEntries = (entires: any) => {