Merge pull request #5599 from om-chauhan1/FixingBugStream2

Solved bug of next estimated update
WikiEducationFoundation · Feb 15, 2024 · b6e3a8a · b6e3a8a
2 parents 47bddd3 + 0cc98f9
commit b6e3a8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/assets/javascripts/components/overview/statistics_update_info.jsx b/app/assets/javascripts/components/overview/statistics_update_info.jsx
@@ -26,7 +26,6 @@ const StatisticsUpdateInfo = ({ course }) => {
       />
     );
   }
-
   const updateTimesMessage = isNextUpdateAfter ? `${lastUpdateMessage} ${nextUpdateMessage} ` : `${lastUpdateMessage} `;
 
   // Render update time information and if some updates were made a 'See More' link to open modal

diff --git a/app/assets/javascripts/utils/statistic_update_info_utils.js b/app/assets/javascripts/utils/statistic_update_info_utils.js
@@ -14,16 +14,21 @@ const lastSuccessfulUpdateMoment = (update_logs) => {
   return new Date(lastSuccessfulUpdateTime);
 };
 
+const isNextUpdateAfterUpdatesEnd = (nextUpdateExpectedTime, updatesEndMoment) => {
+  return isAfter(nextUpdateExpectedTime, new Date()) && isAfter(updatesEndMoment, new Date());
+};
+
 const getLastUpdateMessage = (course) => {
   let lastUpdateMessage = '';
   let nextUpdateMessage = '';
   let isNextUpdateAfter = false;
   const lastUpdateMoment = lastSuccessfulUpdateMoment(course.flags.update_logs);
+  const updatesEndMoment = toDate(course.update_until);
   if (lastUpdateMoment) {
     const averageDelay = course.updates.average_delay ?? 0;
     lastUpdateMessage = `${I18n.t('metrics.last_update')}: ${formatDistanceToNow(lastUpdateMoment, { addSuffix: true })}.`;
     const nextUpdateExpectedTime = addSeconds(lastUpdateMoment, averageDelay);
-    isNextUpdateAfter = isAfter(nextUpdateExpectedTime, new Date());
+    isNextUpdateAfter = isNextUpdateAfterUpdatesEnd(nextUpdateExpectedTime, updatesEndMoment);
     nextUpdateMessage = `${I18n.t('metrics.next_update')}: ${formatDistanceToNow(nextUpdateExpectedTime, { addSuffix: true })}.`;
   }
   return [lastUpdateMessage, nextUpdateMessage, isNextUpdateAfter];
@@ -59,9 +64,10 @@ const getFirstUpdateMessage = (course) => {
   let lastUpdateMessage = '';
   let nextUpdateMessage = '';
   let isNextUpdateAfter = false;
+  const updatesEndMoment = toDate(course.update_until);
   if (course.flags.first_update) {
     const nextUpdateExpectedTime = firstUpdateTime(course.flags.first_update);
-    isNextUpdateAfter = isAfter(nextUpdateExpectedTime, new Date());
+    isNextUpdateAfter = isNextUpdateAfterUpdatesEnd(nextUpdateExpectedTime, updatesEndMoment);
     nextUpdateMessage = `${I18n.t('metrics.first_update')}: ${formatDistanceToNow(nextUpdateExpectedTime, { addSuffix: true })}.`;
     lastUpdateMessage = `${I18n.t('metrics.enqueued_update')}`;
   } else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ const StatisticsUpdateInfo = ({ course }) => { @@
           />
         );
       }
       const updateTimesMessage = isNextUpdateAfter ? `${lastUpdateMessage} ${nextUpdateMessage} ` : `${lastUpdateMessage} `;
       // Render update time information and if some updates were made a 'See More' link to open modal
@@ Expand Down @@