E2e/feature/ri 5743 rename capabilities

redisinsight/api/src/__mocks__/rdi.ts

@@ -311,13 +311,13 @@ export const mockRdiConfigSchema = {
           default: 1000,
         },
         target_data_type: {
-          title: 'Target data type: hash/json - RedisJSON module must be in use in the target DB',
+          title: 'Target data type: hash/json - JSON module must be in use in the target DB',
           type: 'string',
           pattern: '^\\${.*}$|hash|json',
           default: 'hash',
         },
         json_update_strategy: {
-          title: 'Target update strategy: replace/merge - RedisJSON module must be in use in the target DB',
+          title: 'Target update strategy: replace/merge - JSON module must be in use in the target DB',
           type: 'string',
           pattern: '^\\${.*}$|replace|merge',
           default: 'replace',

redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.service.spec.ts

@@ -181,7 +181,7 @@ describe('JsonService', () => {
         } catch (err) {
           expect(err).toBeInstanceOf(BadRequestException);
           expect(err.message).toEqual(
-            ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
+            ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
           );
         }
       });
@@ -923,7 +923,7 @@ describe('JsonService', () => {
       } catch (err) {
         expect(err).toBeInstanceOf(BadRequestException);
         expect(err.message).toEqual(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
+          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
         );
       }
     });
@@ -1004,7 +1004,7 @@ describe('JsonService', () => {
       } catch (err) {
         expect(err).toBeInstanceOf(BadRequestException);
         expect(err.message).toEqual(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
+          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
         );
       }
     });
@@ -1097,7 +1097,7 @@ describe('JsonService', () => {
       } catch (err) {
         expect(err).toBeInstanceOf(BadRequestException);
         expect(err.message).toEqual(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
+          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
         );
       }
     });
@@ -1170,7 +1170,7 @@ describe('JsonService', () => {
       } catch (err) {
         expect(err).toBeInstanceOf(BadRequestException);
         expect(err.message).toEqual(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
+          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
         );
       }
     });

redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.service.ts

@@ -253,9 +253,12 @@ export class RejsonRlService {
       }
 
       if (error.message.includes(RedisErrorCodes.UnknownCommand)) {
-        throw new BadRequestException(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
-        );
+        throw new BadRequestException({
+          message: ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
+          additionalInfo: {
+            jsonModuleMissing: true
+          }
+        });
       }
 
       throw catchAclError(error);
@@ -307,9 +310,12 @@ export class RejsonRlService {
       }
 
       if (error.message.includes(RedisErrorCodes.UnknownCommand)) {
-        throw new BadRequestException(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
-        );
+        throw new BadRequestException({
+          message: ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
+          additionalInfo: {
+            jsonModuleMissing: true
+          }
+        });
       }
 
       // todo: refactor error handling across the project
@@ -361,9 +367,12 @@ export class RejsonRlService {
       }
 
       if (error.message.includes(RedisErrorCodes.UnknownCommand)) {
-        throw new BadRequestException(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
-        );
+        throw new BadRequestException({
+          message: ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
+          additionalInfo: {
+            jsonModuleMissing: true
+          }
+        });
       }
 
       throw catchAclError(error);
@@ -402,9 +411,12 @@ export class RejsonRlService {
       }
 
       if (error.message.includes(RedisErrorCodes.UnknownCommand)) {
-        throw new BadRequestException(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
-        );
+        throw new BadRequestException({
+          message: ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
+          additionalInfo: {
+            jsonModuleMissing: true
+          }
+        });
       }
 
       throw catchAclError(error);
@@ -443,9 +455,12 @@ export class RejsonRlService {
       }
 
       if (error.message.includes(RedisErrorCodes.UnknownCommand)) {
-        throw new BadRequestException(
-          ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('RedisJSON'),
-        );
+        throw new BadRequestException({
+          message: ERROR_MESSAGES.REDIS_MODULE_IS_REQUIRED('JSON'),
+          additionalInfo: {
+            jsonModuleMissing: true
+          }
+        });
       }
 
       throw catchAclError(error);

redisinsight/api/src/modules/database/providers/database-overview.provider.ts

@@ -219,7 +219,7 @@ export class DatabaseOverviewProvider {
         return [undefined, undefined];
       }
 
-      const totalKeysPerDb = {};
+      const totalKeysPerDb: Record<string, number> = {};
 
       masterNodes.forEach((node) => {
         map(

redisinsight/ui/src/components/messages/module-not-loaded-minimalized/constants.ts

@@ -9,7 +9,7 @@ export const MODULE_CAPABILITY_TEXT_NOT_AVAILABLE: { [key in RedisDefaultModules
     text: 'Create a free Redis Stack database with probabilistic data structures that extend the core capabilities of your Redis.'
   },
   [RedisDefaultModules.ReJSON]: {
-    title: 'JSON capability is not available',
+    title: 'JSON data structure is not available',
     text: 'Create a free Redis Stack database with JSON capability that extends the core capabilities of your Redis.'
   },
   [RedisDefaultModules.Search]: {

redisinsight/ui/src/components/messages/module-not-loaded/ModuleNotLoaded.tsx

@@ -31,7 +31,7 @@ const MAX_ELEMENT_WIDTH = 1440
 const renderTitle = (width: number, moduleName?: string) => (
   <EuiTitle size="m" className={styles.title} data-testid="welcome-page-title">
     <h4>
-      {`${moduleName} ${moduleName === MODULE_TEXT_VIEW.redisgears ? 'are' : 'is'} not available `}
+      {`${moduleName} ${[MODULE_TEXT_VIEW.redisgears, MODULE_TEXT_VIEW.bf].includes(moduleName) ? 'are' : 'is'} not available `}
       {width > MAX_ELEMENT_WIDTH && <br />}
       for this database
     </h4>

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

@@ -112,6 +112,13 @@ const Notifications = () => {
         )
       }
 
+      if (!!additionalInfo?.jsonModuleMissing) {
+        return errorMessages.REDIS_JSON(
+          id,
+          () => removeToast({ id })
+        )
+      }
+
       return errorMessages.DEFAULT(id, message, () => removeToast({ id }), title)
     })
 

redisinsight/ui/src/components/notifications/components/index.ts

@@ -1,10 +1,12 @@
 import DefaultErrorContent from './default-error-content'
 import EncryptionErrorContent from './encryption-error-content'
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from './infinite-messages'
+import JsonErrorContent from './json-error-content'
 
 export {
   EncryptionErrorContent,
   DefaultErrorContent,
   INFINITE_MESSAGES,
-  InfiniteMessagesIds
+  InfiniteMessagesIds,
+  JsonErrorContent
 }

redisinsight/ui/src/components/notifications/components/json-error-content/JsonErrorContent.spec.tsx

@@ -0,0 +1,50 @@
+import { cloneDeep } from 'lodash'
+import React from 'react'
+import { instance, mock } from 'ts-mockito'
+import { cleanup, mockedStore, render, screen } from 'uiSrc/utils/test-utils'
+import JsonErrorContent, { Props } from './JsonErrorContent'
+
+const mockedProps = mock<Props>()
+
+let store: typeof mockedStore
+beforeEach(() => {
+  cleanup()
+  store = cloneDeep(mockedStore)
+  store.clearActions()
+})
+
+jest.mock('uiSrc/services', () => ({
+  ...jest.requireActual('uiSrc/services'),
+  sessionStorageService: {
+    set: jest.fn(),
+    get: jest.fn(),
+  },
+}))
+
+describe('JsonErrorContent', () => {
+  it('should render', () => {
+    expect(render(<JsonErrorContent {...instance(mockedProps)} />)).toBeTruthy()
+  })
+
+  it('should display the JSON support message', () => {
+    render(<JsonErrorContent {...instance(mockedProps)} />)
+    expect(screen.getByText(/This database does not support the JSON data structure/)).toBeInTheDocument()
+  })
+
+  it('should call onClose when clicking Ok button', () => {
+    const onClose = jest.fn()
+    render(<JsonErrorContent onClose={onClose} />)
+
+    screen.getByText('Ok').click()
+    expect(onClose).toHaveBeenCalled()
+  })
+
+  it('should render links to documentation', () => {
+    render(<JsonErrorContent {...instance(mockedProps)} />)
+
+    const links = screen.getAllByRole('link')
+    expect(links).toHaveLength(2)
+    expect(links[0]).toHaveAttribute('href', 'https://redis.io/docs/stack/json/about/')
+    expect(links[1]).toHaveAttribute('href', 'https://redis.io/docs/stack/json/about/')
+  })
+})

redisinsight/ui/src/components/notifications/components/json-error-content/JsonErrorContent.tsx

@@ -0,0 +1,32 @@
+import { EuiButton, EuiSpacer, EuiTextColor } from '@elastic/eui'
+import React from 'react'
+
+export interface Props {
+  onClose?: () => void;
+}
+// TODO: use i18n file for texts
+const DefaultErrorContent = (
+  {
+    onClose = () => {},
+  }: Props
+) => (
+  <>
+    <EuiTextColor color="ghost">
+      This database does not support the JSON data structure. Learn more about JSON support <a href="https://redis.io/docs/stack/json/about/" target="_blank" rel="noreferrer">here</a>.
+      You can also create a <a href="https://redis.io/docs/stack/json/about/" target="_blank" rel="noreferrer">free Redis Cloud database</a> with built-in JSON support.
+    </EuiTextColor>
+    <EuiSpacer />
+    <EuiButton
+      fill
+      size="s"
+      color="warning"
+      onClick={onClose}
+      data-testid="toast-cancel-btn"
+      className="toast-danger-btn"
+    >
+      Ok
+    </EuiButton>
+  </>
+)
+
+export default DefaultErrorContent

redisinsight/ui/src/components/notifications/components/json-error-content/index.ts

@@ -0,0 +1,3 @@
+import JsonErrorContent from './JsonErrorContent'
+
+export default JsonErrorContent

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

@@ -2,13 +2,26 @@ import React from 'react'
 import { EuiTextColor } from '@elastic/eui'
 import { Toast } from '@elastic/eui/src/components/toast/global_toast_list'
 import RdiDeployErrorContent from './components/rdi-deploy-error-content'
-import { EncryptionErrorContent, DefaultErrorContent } from './components'
+import { EncryptionErrorContent, DefaultErrorContent, JsonErrorContent } from './components'
 import CloudCapiUnAuthorizedErrorContent from './components/cloud-capi-unauthorized'
 
 const TOAST_LIFE_TIME = 1000 * 60 * 60 * 12 // 12hr
 
 // TODO: use i18n file for texts
 export default {
+  REDIS_JSON: (id: string, onClose = () => {}): Toast => ({
+    id,
+    'data-test-subj': 'toast-error',
+    color: 'danger',
+    iconType: 'alert',
+    onClose,
+    title: (
+      <EuiTextColor color="ghost">
+        <b>Error</b>
+      </EuiTextColor>
+    ),
+    text: <JsonErrorContent onClose={onClose} />,
+  }),
   DEFAULT: (id: string, text: any, onClose = () => {}, title: string = 'Error'): Toast => ({
     id,
     'data-test-subj': 'toast-error',

redisinsight/ui/src/constants/help-texts.tsx

@@ -7,7 +7,7 @@ import styles from 'uiSrc/pages/browser/components/popover-delete/styles.module.
 export default {
   REJSON_SHOULD_BE_LOADED: (
     <>
-      RedisJSON module should be loaded to add this key. Find&nbsp;
+      JSON module should be loaded to add this key. Find&nbsp;
       <a
         href="https://redis.io/docs/latest/operate/oss_and_stack/stack-with-enterprise/json/?utm_source=redisinsight&utm_medium=app&utm_campaign=redisinsight_tutorials"
         className="link-underline"
@@ -17,12 +17,12 @@ export default {
         more information
       </a>
       &nbsp;
-      about RedisJSON or create your&nbsp;
+      about JSON or create your&nbsp;
       <a href={`${EXTERNAL_LINKS.tryFree}?utm_source=redis&utm_medium=app&utm_campaign=redisinsight_redisjson`} className="link-underline" target="_blank" rel="noreferrer">
         free Redis database
       </a>
       &nbsp;
-      with RedisJSON on Redis Cloud.
+      with JSON on Redis Cloud.
     </>
   ),
   REMOVE_LAST_ELEMENT: (fieldType: string) => (

redisinsight/ui/src/constants/mocks/mock-recommendations.ts

@@ -875,7 +875,7 @@ export const MOCK_RECOMMENDATIONS: IRecommendationsStatic = {
         type: 'link',
         value: {
           href: 'https://redis.io/docs/interact/search-and-query/',
-          name: 'RediSearch'
+          name: 'Redis Query Engine'
         }
       },
       {