Merge pull request #686 from RedisInsight/feature/bugfix

#RI-2963, #RI-2959

Author: rsergeenko

redisinsight/ui/src/assets/img/sidebar/slowlog.svg

@@ -109,12 +109,12 @@ export default {
       ),
     }
   },
-  INSTALLED_NEW_UPDATE: (updateDownloadedVersion: string) => ({
+  INSTALLED_NEW_UPDATE: (updateDownloadedVersion: string, onClickLink?: () => void) => ({
     title: 'Application updated',
     message: (
       <>
         <span>{`Your application has been updated to ${updateDownloadedVersion}. Find more information in `}</span>
-        <a href={EXTERNAL_LINKS.releaseNotes} className="link-underline" target="_blank" rel="noreferrer">Release Notes.</a>
+        <a href={EXTERNAL_LINKS.releaseNotes} onClick={() => onClickLink?.()} className="link-underline" target="_blank" rel="noreferrer">Release Notes.</a>
       </>
     ),
     group: 'upgrade'

redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg

@@ -22,7 +22,9 @@ export const ipcCheckUpdates = async (serverInfo: GetServerInfoResponse, dispatc
 
   if (isUpdateDownloaded && !isUpdateAvailable) {
     if (serverInfo.appVersion === updateDownloadedVersion) {
-      dispatch(addMessageNotification(successMessages.INSTALLED_NEW_UPDATE(updateDownloadedVersion)))
+      dispatch(addMessageNotification(
+        successMessages.INSTALLED_NEW_UPDATE(updateDownloadedVersion, () => dispatch(setReleaseNotesViewed(true)))
+      ))
     }
 
     await ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloaded)

redisinsight/ui/src/components/notifications/success-messages.tsx

@@ -33,13 +33,14 @@ import { EmptySlowLog, SlowLogTable, Actions } from './components'
 
 import styles from './styles.module.scss'
 
+const HIDE_TIMESTAMP_FROM_WIDTH = 850
 const DEFAULT_COUNT_VALUE = '50'
 const countOptions: EuiSuperSelectOption<string>[] = [
   { value: '10', inputDisplay: '10' },
   { value: '25', inputDisplay: '25' },
   { value: '50', inputDisplay: '50' },
   { value: '100', inputDisplay: '100' },
-  { value: '-1', inputDisplay: 'Max' },
+  { value: '-1', inputDisplay: 'Max available' },
 ]
 
 const SlowLogPage = () => {
@@ -124,7 +125,7 @@ const SlowLogPage = () => {
                   <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
                     <EuiFlexItem grow={false}>
                       <EuiText color="subdued">
-                        {connectionType === ConnectionType.Cluster ? 'Display per node:' : 'Display:'}
+                        {connectionType === ConnectionType.Cluster ? 'Display per node:' : 'Display up to:'}
                       </EuiText>
                     </EuiFlexItem>
                     <EuiFlexItem grow={false}>
@@ -137,12 +138,14 @@ const SlowLogPage = () => {
                         data-testid="count-select"
                       />
                     </EuiFlexItem>
-                    <EuiFlexItem grow={false} style={{ marginLeft: 12 }}>
-                      <EuiText size="xs" color="subdued" data-testid="entries-from-timestamp">
-                        ({data.length} entries
-                        {lastTimestamp && (<>&nbsp;from {format(lastTimestamp * 1000, DATE_FORMAT)}</>)})
-                      </EuiText>
-                    </EuiFlexItem>
+                    {width > HIDE_TIMESTAMP_FROM_WIDTH && (
+                      <EuiFlexItem grow={false} style={{ marginLeft: 12 }}>
+                        <EuiText size="xs" color="subdued" data-testid="entries-from-timestamp">
+                          ({data.length} entries
+                          {lastTimestamp && (<>&nbsp;from {format(lastTimestamp * 1000, DATE_FORMAT)}</>)})
+                        </EuiText>
+                      </EuiFlexItem>
+                    )}
                   </EuiFlexGroup>
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>

redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts

@@ -17,7 +17,7 @@
   }
 
   .countSelect {
-    width: 78px;
+    width: 86px;
     height: 30px;
     padding-left: 12px;
     padding-right: 32px;