From ae760c6737c78e88c4774c2784e4f8bedc8b7ee8 Mon Sep 17 00:00:00 2001 From: "Roman.Sergeenko" Date: Mon, 23 May 2022 16:57:20 +0400 Subject: [PATCH 1/2] #RI-2963 - change icon, texts #RI-2959 - set release notes viewed after click on link from notification --- .../ui/src/assets/img/sidebar/slowlog.svg | 6 +++--- .../src/assets/img/sidebar/slowlog_active.svg | 6 +++--- .../notifications/success-messages.tsx | 4 ++-- .../ui/src/electron/utils/ipcCheckUpdates.ts | 4 +++- .../ui/src/pages/slowLog/SlowLogPage.tsx | 19 +++++++++++-------- .../ui/src/pages/slowLog/styles.module.scss | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/redisinsight/ui/src/assets/img/sidebar/slowlog.svg b/redisinsight/ui/src/assets/img/sidebar/slowlog.svg index 9574257551..ab9f60018b 100644 --- a/redisinsight/ui/src/assets/img/sidebar/slowlog.svg +++ b/redisinsight/ui/src/assets/img/sidebar/slowlog.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg b/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg index b0638dc452..78d83eabd0 100644 --- a/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg +++ b/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/redisinsight/ui/src/components/notifications/success-messages.tsx b/redisinsight/ui/src/components/notifications/success-messages.tsx index 7a22f1ec89..e081845b29 100644 --- a/redisinsight/ui/src/components/notifications/success-messages.tsx +++ b/redisinsight/ui/src/components/notifications/success-messages.tsx @@ -109,12 +109,12 @@ export default { ), } }, - INSTALLED_NEW_UPDATE: (updateDownloadedVersion: string) => ({ + INSTALLED_NEW_UPDATE: (updateDownloadedVersion: string, onClickLink?: () => void) => ({ title: 'Application updated', message: ( <> {`Your application has been updated to ${updateDownloadedVersion}. Find more information in `} - Release Notes. + onClickLink?.()} className="link-underline" target="_blank" rel="noreferrer">Release Notes. ), group: 'upgrade' diff --git a/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts b/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts index c45057e50d..ac16438d81 100644 --- a/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts +++ b/redisinsight/ui/src/electron/utils/ipcCheckUpdates.ts @@ -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) diff --git a/redisinsight/ui/src/pages/slowLog/SlowLogPage.tsx b/redisinsight/ui/src/pages/slowLog/SlowLogPage.tsx index 9ae0de3f5e..dd8e2d167d 100644 --- a/redisinsight/ui/src/pages/slowLog/SlowLogPage.tsx +++ b/redisinsight/ui/src/pages/slowLog/SlowLogPage.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[] = [ { 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 = () => { - {connectionType === ConnectionType.Cluster ? 'Display per node:' : 'Display:'} + {connectionType === ConnectionType.Cluster ? 'Display per node:' : 'Display up to:'} @@ -137,12 +138,14 @@ const SlowLogPage = () => { data-testid="count-select" /> - - - ({data.length} entries - {lastTimestamp && (<> from {format(lastTimestamp * 1000, DATE_FORMAT)})}) - - + {width > HIDE_TIMESTAMP_FROM_WIDTH && ( + + + ({data.length} entries + {lastTimestamp && (<> from {format(lastTimestamp * 1000, DATE_FORMAT)})}) + + + )} diff --git a/redisinsight/ui/src/pages/slowLog/styles.module.scss b/redisinsight/ui/src/pages/slowLog/styles.module.scss index 70aa8e64ec..4d60d71054 100644 --- a/redisinsight/ui/src/pages/slowLog/styles.module.scss +++ b/redisinsight/ui/src/pages/slowLog/styles.module.scss @@ -17,7 +17,7 @@ } .countSelect { - width: 78px; + width: 86px; height: 30px; padding-left: 12px; padding-right: 32px; From 8654a6927adb30999685740a216d1b8b4a0570c0 Mon Sep 17 00:00:00 2001 From: "Roman.Sergeenko" Date: Mon, 23 May 2022 17:53:42 +0400 Subject: [PATCH 2/2] #RI-2963 - update icons --- redisinsight/ui/src/assets/img/sidebar/slowlog.svg | 4 ++-- redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/redisinsight/ui/src/assets/img/sidebar/slowlog.svg b/redisinsight/ui/src/assets/img/sidebar/slowlog.svg index ab9f60018b..e960c07846 100644 --- a/redisinsight/ui/src/assets/img/sidebar/slowlog.svg +++ b/redisinsight/ui/src/assets/img/sidebar/slowlog.svg @@ -1,4 +1,4 @@ - + - + diff --git a/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg b/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg index 78d83eabd0..5d71c92a51 100644 --- a/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg +++ b/redisinsight/ui/src/assets/img/sidebar/slowlog_active.svg @@ -1,4 +1,4 @@ - + - +