Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into bugfix/RI-3631_key_list_loading

Author: AmirAllayarovSofteq

jest.config.js

@@ -5,8 +5,9 @@ module.exports = {
   testURL: 'http://localhost/',
   runner: 'groups',
   moduleNameMapper: {
-    '\\.(jpg|jpeg|png|ico|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
+    '\\.(jpg|jpeg|png|ico|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/redisinsight/__mocks__/fileMock.js',
+    '\\.svg': '<rootDir>/redisinsight/__mocks__/svg.js',
     '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
     'uiSrc/(.*)': '<rootDir>/redisinsight/ui/src/$1',
     'monaco-editor': '<rootDir>/redisinsight/__mocks__/monacoMock.js',

redisinsight/__mocks__/svg.js

@@ -0,0 +1,2 @@
+export default 'SvgrURL'
+export const ReactComponent = 'div'

redisinsight/api/src/app.module.ts

@@ -4,7 +4,6 @@ import {
 } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ServeStaticModule } from '@nestjs/serve-static';
-import { EventEmitterModule } from '@nestjs/event-emitter';
 import { RouterModule } from 'nest-router';
 import { join } from 'path';
 import config from 'src/utils/config';
@@ -54,7 +53,6 @@ const PATH_CONFIG = config.get('dir_path');
     BulkActionsModule,
     ClusterMonitorModule,
     DatabaseAnalysisModule,
-    EventEmitterModule.forRoot(),
     ...(SERVER_CONFIG.staticContent
       ? [
         ServeStaticModule.forRoot({

redisinsight/api/src/modules/core/core.module.ts

@@ -8,6 +8,7 @@ import { KeytarEncryptionStrategy } from 'src/modules/core/encryption/strategies
 import { AgreementsEntity } from 'src/modules/core/models/agreements.entity';
 import { ServerEntity } from 'src/modules/core/models/server.entity';
 import { SettingsEntity } from 'src/modules/core/models/settings.entity';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 import settingsOnPremiseFactory from './providers/settings-on-premise';
 import serverOnPremiseFactory from './providers/server-on-premise';
 import { CaCertBusinessService } from './services/certificates/ca-cert-business/ca-cert-business.service';
@@ -31,6 +32,7 @@ export class CoreModule {
     return {
       module: CoreModule,
       imports: [
+        EventEmitterModule.forRoot(),
         TypeOrmModule.forFeature([
           ServerEntity,
           SettingsEntity,

redisinsight/api/src/modules/statics-management/statics-management.module.ts

@@ -34,6 +34,27 @@ const CONTENT_CONFIG = config.get('content');
         fallthrough: false,
       },
     }),
+    ServeStaticModule.forRoot({
+      serveRoot: SERVER_CONFIG.defaultPluginsUri,
+      rootPath: join(PATH_CONFIG.defaultPlugins),
+      serveStaticOptions: {
+        fallthrough: false,
+      },
+    }),
+    ServeStaticModule.forRoot({
+      serveRoot: SERVER_CONFIG.customPluginsUri,
+      rootPath: join(PATH_CONFIG.customPlugins),
+      serveStaticOptions: {
+        fallthrough: false,
+      },
+    }),
+    ServeStaticModule.forRoot({
+      serveRoot: SERVER_CONFIG.pluginsAssetsUri,
+      rootPath: join(PATH_CONFIG.pluginsAssets),
+      serveStaticOptions: {
+        fallthrough: false,
+      },
+    }),
   ],
   providers: [
     {

redisinsight/ui/src/components/query-card/QueryCard.tsx

@@ -9,7 +9,8 @@ import { RunQueryMode, ResultsMode, ResultsSummary } from 'uiSrc/slices/interfac
 import {
   getWBQueryType,
   getVisualizationsByCommand,
-  Maybe
+  Maybe,
+  isGroupMode
 } from 'uiSrc/utils'
 import { appPluginsSelector } from 'uiSrc/slices/app/plugins'
 import { CommandExecutionResult, IPluginVisualization } from 'uiSrc/slices/interfaces'
@@ -32,7 +33,7 @@ export interface Props {
   mode?: RunQueryMode
   activeResultsMode?: ResultsMode
   resultsMode?: ResultsMode
-  emptyCommand: boolean
+  emptyCommand?: boolean
   summary?: ResultsSummary
   createdAt?: Date
   loading?: boolean
@@ -179,7 +180,7 @@ const QueryCard = (props: Props) => {
               ? <QueryCardCommonResult loading={loading} result={commonError} />
               : (
                 <>
-                  {resultsMode === ResultsMode.GroupMode && (
+                  {isGroupMode(resultsMode) && (
                     <QueryCardCliResultWrapper
                       loading={loading}
                       query={command}

redisinsight/ui/src/components/query-card/QueryCardCliDefaultResult/styles.module.scss

@@ -8,6 +8,7 @@
   display: flex;
   flex-grow: 1;
   height: 100%;
+  overflow: hidden !important;
 }
 
 .listContent {

redisinsight/ui/src/components/query-card/QueryCardCliResultWrapper/QueryCardCliResultWrapper.tsx

@@ -5,8 +5,9 @@ import { isArray } from 'lodash'
 
 import { CommandExecutionResult } from 'uiSrc/slices/interfaces'
 import { ResultsMode } from 'uiSrc/slices/interfaces/workbench'
-import { formatToText, Maybe } from 'uiSrc/utils'
+import { cliParseTextResponse, formatToText, isGroupMode, Maybe } from 'uiSrc/utils'
 
+import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli'
 import QueryCardCliDefaultResult from '../QueryCardCliDefaultResult'
 import QueryCardCliGroupResult from '../QueryCardCliGroupResult'
 import styles from './styles.module.scss'
@@ -27,19 +28,23 @@ const QueryCardCliResultWrapper = (props: Props) => {
   return (
     <div className={cx('queryResultsContainer', styles.container)}>
       {!loading && (
-        <div data-testid="query-cli-result" style={{ height: '100%' }}>
+        <div data-testid="query-cli-result" className={cx(styles.content)}>
           {isNotStored && (
             <EuiText className={styles.alert} data-testid="query-cli-warning">
               <EuiIcon type="alert" className={styles.alertIcon} />
               The result is too big to be saved. It will be deleted after the application is closed.
             </EuiText>
           )}
-          {resultsMode === ResultsMode.GroupMode && isArray(result[0]?.response)
+          {isGroupMode(resultsMode) && isArray(result[0]?.response)
             ? <QueryCardCliGroupResult result={result} isFullScreen={isFullScreen} />
             : (
               <QueryCardCliDefaultResult
                 isFullScreen={isFullScreen}
-                items={formatToText(result[0].response || '(nil)', query).split('\n')}
+                items={
+                  result[0].status === CommandExecutionStatus.Success
+                    ? formatToText(result[0].response || '(nil)', query).split('\n')
+                    : [cliParseTextResponse(result[0].response || '(nil)', '', result[0].status)]
+                }
               />
             )}
         </div>

redisinsight/ui/src/components/query-card/QueryCardCliResultWrapper/styles.module.scss

@@ -25,6 +25,12 @@
   }
 }
 
+.content {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
 .loading {
   height: 17px;
   max-width: 600px;

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -16,7 +16,13 @@ import { useParams } from 'react-router-dom'
 import { findIndex } from 'lodash'
 
 import { Theme } from 'uiSrc/constants'
-import { getCommandNameFromQuery, getVisualizationsByCommand, truncateText, urlForAsset } from 'uiSrc/utils'
+import {
+  getCommandNameFromQuery,
+  getVisualizationsByCommand,
+  isGroupMode,
+  truncateText,
+  urlForAsset
+} from 'uiSrc/utils'
 import { ThemeContext } from 'uiSrc/contexts/themeContext'
 import { appPluginsSelector } from 'uiSrc/slices/app/plugins'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
@@ -45,7 +51,7 @@ export interface Props {
   queryType: WBQueryType
   selectedValue: string
   loading?: boolean
-  emptyCommand: boolean
+  emptyCommand?: boolean
   toggleOpen: () => void
   toggleFullScreen: () => void
   setSelectedValue: (type: WBQueryType, value: string) => void
@@ -68,7 +74,7 @@ const QueryCardHeader = (props: Props) => {
     summary,
     activeMode,
     selectedValue,
-    emptyCommand,
+    emptyCommand = false,
     setSelectedValue,
     onQueryDelete,
     onQueryReRun,
@@ -92,7 +98,7 @@ const QueryCardHeader = (props: Props) => {
         databaseId: instanceId,
         command: getCommandNameFromQuery(query, COMMANDS_SPEC),
         rawMode: activeMode === RunQueryMode.Raw,
-        group: activeResultsMode === ResultsMode.GroupMode,
+        group: isGroupMode(activeResultsMode),
         ...additionalData
       }
     })