#RI-3033 - Display all published messages

Author: egor-zalenski

redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx

@@ -18,8 +18,9 @@ import {
   processUnsupportedCommand,
   processUnrepeatableNumber,
   processMonitorCommand,
+  processPSubscribeCommand,
 } from 'uiSrc/slices/cli/cli-output'
-import { CommandMonitor } from 'uiSrc/constants'
+import { CommandMonitor, CommandPSubscribe } from 'uiSrc/constants'
 import { getCommandRepeat, isRepeatCountCorrect } from 'uiSrc/utils'
 import { ConnectionType } from 'uiSrc/slices/interfaces'
 import { ClusterNodeRole } from 'uiSrc/slices/interfaces/cli'
@@ -78,12 +79,20 @@ const CliBodyWrapper = () => {
       return
     }
 
-    // Flow if monitor command was executed
+    // Flow if MONITOR command was executed
     if (checkUnsupportedCommand([CommandMonitor.toLowerCase()], commandLine)) {
       dispatch(processMonitorCommand(commandLine, resetCommand))
       return
     }
 
+    // Flow if PSUBSCRIBE command was executed
+    if (checkUnsupportedCommand([CommandPSubscribe.toLowerCase()], commandLine)) {
+      dispatch(processPSubscribeCommand(commandLine, () => {
+        resetCommand()
+      }))
+      return
+    }
+
     if (unsupportedCommand) {
       dispatch(processUnsupportedCommand(commandLine, unsupportedCommand, resetCommand))
       return

redisinsight/ui/src/components/database-overview/DatabaseOverviewWrapper.tsx

@@ -10,7 +10,7 @@ import { ThemeContext } from 'uiSrc/contexts/themeContext'
 
 import { getOverviewMetrics } from './components/OverviewMetrics'
 
-const TIMEOUT_TO_GET_INFO = process.env.NODE_ENV !== 'development' ? 5000 : 100000
+const TIMEOUT_TO_GET_INFO = process.env.NODE_ENV !== 'development' ? 5000 : 10000000
 
 interface IProps { windowDimensions: number }
 

redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.tsx

@@ -4,7 +4,7 @@ import { EuiTextColor } from '@elastic/eui'
 import { CellMeasurer, List, CellMeasurerCache, ListRowProps } from 'react-virtualized'
 
 import { getFormatTime } from 'uiSrc/utils'
-import { DEFAULT_TEXT } from 'uiSrc/components/notifications'
+import { DEFAULT_ERROR_TEXT } from 'uiSrc/components/notifications'
 
 import styles from 'uiSrc/components/monitor/Monitor/styles.module.scss'
 import 'react-virtualized/styles.css'
@@ -80,7 +80,7 @@ const MonitorOutputList = (props: Props) => {
               </>
             )}
             {isError && (
-              <EuiTextColor color="danger">{message ?? DEFAULT_TEXT}</EuiTextColor>
+              <EuiTextColor color="danger">{message ?? DEFAULT_ERROR_TEXT}</EuiTextColor>
             )}
           </div>
         )}

redisinsight/ui/src/components/notifications/Notifications.tsx

@@ -22,7 +22,7 @@ import errorMessages from './error-messages'
 
 import styles from './styles.module.scss'
 
-export const DEFAULT_TEXT = 'Something went wrong.'
+export const DEFAULT_ERROR_TEXT = 'Something went wrong.'
 
 const Notifications = () => {
   const messagesData = useSelector(messagesSelector)
@@ -82,7 +82,7 @@ const Notifications = () => {
     })
 
   const getErrorsToasts = (errors: IError[]) =>
-    errors.map(({ id = '', message = DEFAULT_TEXT, instanceId = '', name }) => {
+    errors.map(({ id = '', message = DEFAULT_ERROR_TEXT, instanceId = '', name }) => {
       if (ApiEncryptionErrors.includes(name)) {
         return errorMessages.ENCRYPTION(id, () => removeToast({ id }), instanceId)
       }

redisinsight/ui/src/components/query-card/QueryCardCommonResult/components/CommonErrorResponse/CommonErrorResponse.tsx

@@ -1,14 +1,16 @@
 import React from 'react'
 import { useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 import {
   checkUnsupportedCommand,
   checkUnsupportedModuleCommand,
   cliParseTextResponse,
+  CliPrefix,
   getCommandRepeat,
   isRepeatCountCorrect
 } from 'uiSrc/utils'
 import { cliTexts, SelectCommand } from 'uiSrc/constants/cliOutput'
-import { CommandMonitor } from 'uiSrc/constants'
+import { CommandMonitor, CommandPSubscribe, Pages } from 'uiSrc/constants'
 import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli'
 import { RedisDefaultModules } from 'uiSrc/slices/interfaces'
 import { RSNotLoadedContent } from 'uiSrc/pages/workbench/constants'
@@ -18,17 +20,29 @@ import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import ModuleNotLoaded from 'uiSrc/pages/workbench/components/module-not-loaded'
 
 const CommonErrorResponse = (command = '', result?: any) => {
+  const { instanceId = '' } = useParams<{ instanceId: string }>()
   const { unsupportedCommands: cliUnsupportedCommands, blockingCommands } = useSelector(cliSettingsSelector)
   const { modules } = useSelector(connectedInstanceSelector)
   const unsupportedCommands = [SelectCommand.toLowerCase(), ...cliUnsupportedCommands, ...blockingCommands]
   const [commandLine, countRepeat] = getCommandRepeat(command)
 
-  // Flow if monitor command was executed
+  // Flow if MONITOR command was executed
   if (checkUnsupportedCommand([CommandMonitor.toLowerCase()], commandLine)) {
     return cliParseTextResponse(
       cliTexts.MONITOR_COMMAND,
       commandLine,
       CommandExecutionStatus.Fail,
+      CliPrefix.QueryCard,
+    )
+  }
+  // Flow if PSUBSCRIBE command was executed
+  if (checkUnsupportedCommand([CommandPSubscribe.toLowerCase()], commandLine)) {
+    return cliParseTextResponse(
+      cliTexts.PSUBSCRIBE_COMMAND(Pages.pubSub(instanceId)),
+      commandLine,
+      CommandExecutionStatus.Fail,
+      CliPrefix.QueryCard,
+      true,
     )
   }
 
@@ -39,6 +53,7 @@ const CommonErrorResponse = (command = '', result?: any) => {
       cliTexts.UNABLE_TO_DECRYPT,
       '',
       CommandExecutionStatus.Fail,
+      CliPrefix.QueryCard,
     )
   }
 
@@ -47,6 +62,7 @@ const CommonErrorResponse = (command = '', result?: any) => {
       cliTexts.REPEAT_COUNT_INVALID,
       commandLine,
       CommandExecutionStatus.Fail,
+      CliPrefix.QueryCard,
     )
   }
 

redisinsight/ui/src/constants/cliOutput.tsx

@@ -37,6 +37,8 @@ export const cliTexts = {
   REPEAT_COUNT_INVALID: 'Invalid repeat command option value',
   CONNECTION_CLOSED: 'Client connection previously closed. Run the command after the connection is re-created.',
   MONITOR_COMMAND: 'Use the "Profiler" tool to see all the requests processed by the server.',
+  PSUBSCRIBE_COMMAND: (href: string = '') =>
+    'Use Pub/Sub to see the messages published to all channels in your database.',
   UNABLE_TO_DECRYPT: 'Unable to decrypt. Check the system keychain or re-run the command.',
   CLI_ERROR_MESSAGE: (message: string) => (
     [

redisinsight/ui/src/constants/commands.ts

@@ -82,6 +82,7 @@ export enum CommandPrefix {
 }
 
 export const CommandMonitor = 'MONITOR'
+export const CommandPSubscribe = 'PSUBSCRIBE'
 
 export enum CommandRediSearch {
   Search = 'FT.SEARCH',

redisinsight/ui/src/constants/workbenchResults.ts

@@ -1 +1 @@
-export const bulkReplyCommands = ['LOLWUT', 'INFO', 'CLIENT', 'CLUSTER', 'MEMORY', 'MONITOR']
+export const bulkReplyCommands = ['LOLWUT', 'INFO', 'CLIENT', 'CLUSTER', 'MEMORY', 'MONITOR', 'PSUBSCRIBE']

redisinsight/ui/src/pages/pubSub/PubSubPage.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import InstanceHeader from 'uiSrc/components/instance-header'
 import { SubscriptionType } from 'uiSrc/constants/pubSub'
 
-import { MessagesList, SubscriptionPanel } from './components'
+import { MessagesListWrapper, SubscriptionPanel } from './components'
 
 import styles from './styles.module.scss'
 
@@ -23,7 +23,7 @@ const PubSubPage = () => {
             <SubscriptionPanel />
           </div>
           <div className={styles.tableWrapper}>
-            <MessagesList />
+            <MessagesListWrapper />
           </div>
         </div>
         <div className={styles.footerPanel}>