Merge pull request #1198 from zwidekalanga/zwidekalanga/ux-changes-ex…

…piry-logic fix: code styling issues for expiry logic
openedx · Apr 18, 2024 · 83b8906 · 83b8906
2 parents 99d093d + ce3ecf3
commit 83b8906
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 50 deletions.
diff --git a/src/components/Admin/__snapshots__/Admin.test.jsx.snap b/src/components/Admin/__snapshots__/Admin.test.jsx.snap
@@ -20,9 +20,6 @@ exports[`<Admin /> renders correctly calls fetchDashboardAnalytics prop 1`] = `
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -193,9 +190,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders # cou
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -1065,9 +1059,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders # of
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -1937,9 +1928,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders # of
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -2809,9 +2797,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders colla
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -3681,9 +3666,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders full
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -4553,9 +4535,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders inact
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -5425,9 +5404,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders inact
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -6297,9 +6273,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders learn
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -7169,9 +7142,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders regis
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -8041,9 +8011,6 @@ exports[`<Admin /> renders correctly with dashboard analytics data renders top a
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -8913,9 +8880,6 @@ exports[`<Admin /> renders correctly with dashboard insights data renders dashbo
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -9834,9 +9798,6 @@ exports[`<Admin /> renders correctly with error state 1`] = `
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -9991,9 +9952,6 @@ exports[`<Admin /> renders correctly with loading state 1`] = `
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >
@@ -10209,9 +10167,6 @@ exports[`<Admin /> renders correctly with no dashboard insights data 1`] = `
       />
     </div>
   </div>
-  <div
-    className="mt-4"
-  />
   <div
     className="container-fluid"
   >

diff --git a/src/components/Admin/index.jsx b/src/components/Admin/index.jsx
@@ -309,12 +309,10 @@ class Admin extends React.Component {
           <>
             <Helmet title="Learner Progress Report" />
             <Hero title="Learner Progress Report" />
-            <div className="mt-4">
-              <BudgetExpiryAlertAndModal />
-            </div>
             <div className="container-fluid">
               <div className="row mt-4">
                 <div className="col">
+                  <BudgetExpiryAlertAndModal />
                   <h2>Overview</h2>
                 </div>
               </div>

diff --git a/src/components/BudgetExpiryAlertAndModal/data/utils.js b/src/components/BudgetExpiryAlertAndModal/data/utils.js
@@ -13,7 +13,7 @@ export const getExpirationMetadata = (endDateStr) => {
   const thresholdKeys = Object.keys(ExpiryThresholds).sort((a, b) => a - b);
   const thresholdKey = thresholdKeys.find((key) => durationDiff.asDays() <= key);
 
-  if (thresholdKey === undefined) {
+  if (!thresholdKey) {
     return {
       thresholdKey: null,
       threshold: null,
@@ -34,7 +34,7 @@ export const getExpirationMetadata = (endDateStr) => {
 export const isPlanApproachingExpiry = (endDateStr) => {
   const { thresholdKey, threshold } = getExpirationMetadata(endDateStr);
 
-  if (thresholdKey === null) {
+  if (!thresholdKey) {
     return false;
   }