Removed async from differenceInDays since it's redundant

percona · Sep 25, 2024 · 2a4b943 · 2a4b943
1 parent 873bf02
commit 2a4b943
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/...shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.styles.ts b/...shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.styles.ts
@@ -27,7 +27,7 @@ export const getStyles = ({ v1: { spacing, colors } }: GrafanaTheme2) => ({
   notesTitle: css`
     font-weight: 500;
     font-size: 16px;
-    margin-top: 27px
+    margin-top: 27px;
   `,
   updateButtons: css`
     margin-top: 35px;

diff --git a/.../shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.test.tsx b/.../shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.test.tsx
diff --git a/...rcona/shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.tsx b/...rcona/shared/components/PerconaBootstrapper/PerconaUpdateVersion/PerconaUpdateVersion.tsx
@@ -25,12 +25,11 @@ const PerconaUpdateVersion: FC = () => {
 
   useEffect(() => {
     const showModal = async () => {
-      console.log('checkUpdatesChangelogs');
       await dispatch(checkUpdatesChangeLogs());
       setShowUpdate(true);
     };
 
-    const differenceInDays = async () => {
+    const differenceInDays = () => {
       if (lastChecked) {
         const lastCheckDate = new Date(lastChecked);
         const currentDate = new Date();
@@ -45,19 +44,18 @@ const PerconaUpdateVersion: FC = () => {
       if (!snoozeCurrentVersion) {
         dispatch(getSnoozeCurrentVersion());
       }
-      differenceInDays().then((days) => {
-        if (
-          (installed?.version !== latest?.version /*days > 6 &&*/ &&
-            snoozeCurrentVersion?.snoozedPmmVersion !== latest?.version) ||
-          !lastChecked
-        ) {
-          showModal();
-        }
-      });
+      const days = differenceInDays();
+      if (
+        (installed?.version !== latest?.version &&
+          days > 6 &&
+          snoozeCurrentVersion?.snoozedPmmVersion !== latest?.version) ||
+        !lastChecked
+      ) {
+        showModal();
+      }
     }
   }, [dispatch, updateAvailable, installed, latest, snoozeCurrentVersion, lastChecked]);
 
-  // Snooze API
   const snoozeUpdate = async () => {
     if (latest && latest.version) {
       const payload = {
@@ -108,7 +106,7 @@ const PerconaUpdateVersion: FC = () => {
           {changeLogs?.updates.map((update: UpdatesChangelogs) => (
             <li key={update.toString()}>
               <a href={update.releaseNotesUrl}>
-                {update.version}, {dateTimeFormat(update.timestamp,  { format: 'MMM DD, YYYY' })}
+                {update.version}, {dateTimeFormat(update.timestamp, { format: 'MMM DD, YYYY' })}
               </a>
             </li>
           ))}

diff --git a/public/app/percona/shared/core/reducers/updates/updates.ts b/public/app/percona/shared/core/reducers/updates/updates.ts
@@ -32,6 +32,7 @@ export const updatesSlice = createSlice({
       updateAvailable: true, // to remove
       latest: { version: '3.0.1' }, // to remove
       isLoading: false,
+      lastChecked: '',
     }));
 
     builder.addCase(checkUpdatesAction.rejected, (state) => ({