From 498add540be07bf1d31bb21f86302415817d3c85 Mon Sep 17 00:00:00 2001
From: Hieu Lam - TMA <135117837+lthanhhieu@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:46:46 +0700
Subject: [PATCH] fix-7016: Link redirect of current day results in user
 forward to wrong filtered page (#9145)

* fix-7016: Link redirect of current day results in user forward to wrong filtered page

* fix-7016: Link redirect of current day results in user forward to wrong filtered page
---
 app/routes/public/cfs/edit-speaker.js | 4 ++--
 app/routes/public/sessions.js         | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/routes/public/cfs/edit-speaker.js b/app/routes/public/cfs/edit-speaker.js
index ebad0618777..c65891ef71a 100644
--- a/app/routes/public/cfs/edit-speaker.js
+++ b/app/routes/public/cfs/edit-speaker.js
@@ -9,7 +9,7 @@ export default class EditSpeakerRoute extends Route {
 
   async model(params) {
     const eventDetails = this.modelFor('public');
-    const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' })
+    const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' });
     return {
       event : eventDetails,
       forms : await eventDetails.query('customForms', {
@@ -24,4 +24,4 @@ export default class EditSpeakerRoute extends Route {
       speaker
     };
   }
-}
\ No newline at end of file
+}
diff --git a/app/routes/public/sessions.js b/app/routes/public/sessions.js
index 9077cd5a63b..61a62bafd6e 100644
--- a/app/routes/public/sessions.js
+++ b/app/routes/public/sessions.js
@@ -2,8 +2,6 @@ import classic from 'ember-classic-decorator';
 import Route from '@ember/routing/route';
 import moment from 'moment-timezone';
 
-let isDateFilterActive = Boolean(new URLSearchParams(location.search).get('date'));
-
 @classic
 export default class SessionsRoute extends Route {
   queryParams = {
@@ -46,9 +44,10 @@ export default class SessionsRoute extends Route {
   async beforeModel() {
     const event = this.modelFor('public');
     const dates = await this.loader.load('/events/' + event.id + '/sessions/dates');
-    if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD')) && !isDateFilterActive) {
-      isDateFilterActive = true;
-      this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } });
+    if (new URLSearchParams(location.search).size === 0) {
+      if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD'))) {
+        this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } });
+      }
     }
   }