Merge pull request #3415 from RedisInsight/fe/bugfix/RI-5781

#RI-5781 - change format of seconds for rate limit

Author: rsergeenko

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.spec.tsx

@@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash'
 import { useSelector } from 'react-redux'
 import { AxiosError } from 'axios'
 import { cleanup, clearStoreActions, mockedStore, render } from 'uiSrc/utils/test-utils'
-import { oauthCloudJobSelector, setJob } from 'uiSrc/slices/oauth/cloud'
+import { oauthCloudJobSelector, setJob, setSocialDialogState } from 'uiSrc/slices/oauth/cloud'
 import { CloudJobStatus, CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { addErrorNotification, addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { RootState } from 'uiSrc/slices/store'
@@ -132,6 +132,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addErrorNotification({ response: { data: error } } as AxiosError),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -163,6 +164,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -194,6 +196,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.tsx

@@ -5,7 +5,14 @@ import { get } from 'lodash'
 
 import { CloudJobStatus, CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { fetchInstancesAction } from 'uiSrc/slices/instances/instances'
-import { createFreeDbJob, createFreeDbSuccess, oauthCloudJobSelector, oauthCloudSelector, setJob } from 'uiSrc/slices/oauth/cloud'
+import {
+  createFreeDbJob,
+  createFreeDbSuccess,
+  oauthCloudJobSelector,
+  oauthCloudSelector,
+  setJob,
+  setSocialDialogState
+} from 'uiSrc/slices/oauth/cloud'
 import { CloudImportDatabaseResources } from 'uiSrc/slices/interfaces/cloud'
 import { addErrorNotification, addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { parseCloudOAuthError } from 'uiSrc/utils'
@@ -72,6 +79,7 @@ const OAuthJobs = () => {
         }
 
         dispatch(setSSOFlow())
+        dispatch(setSocialDialogState(null))
         dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
         break
 

redisinsight/ui/src/components/shortcuts-flyout/styles.module.scss

@@ -16,7 +16,7 @@
 
   &:global(.inMemoryTableDefault) {
     :global {
-      .euiTableCellContent span {
+      .euiTableCellContent .euiTableCellContent__text {
         padding-top: 0 !important;
         white-space: normal !important;
       }
@@ -29,6 +29,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    padding-top: 0 !important;
 
     :global(.euiText) {
       font-weight: 500;

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/shared/error-message/ErrorMessage.spec.tsx

@@ -29,7 +29,7 @@ describe('ErrorMessage', () => {
     }
     render(<ErrorMessage onRestart={jest.fn} error={error} />)
 
-    expect(screen.getByTestId('ai-chat-error-message')).toHaveTextContent(AI_CHAT_ERRORS.rateLimit(100))
+    expect(screen.getByTestId('ai-chat-error-message')).toHaveTextContent('Exceeded rate limit. Try again in 1 minute.')
 
     expect(screen.queryByTestId('ai-chat-error-restart-session-btn')).not.toBeInTheDocument()
     expect(screen.queryByTestId('ai-chat-error-report-link')).not.toBeInTheDocument()

redisinsight/ui/src/constants/apiErrors.ts

@@ -1,3 +1,5 @@
+import { secondsToMinutes } from 'uiSrc/utils/transformers/formatDate'
+
 enum ApiErrors {
   SentinelParamsRequired = 'SENTINEL_PARAMS_REQUIRED',
   KeytarUnavailable = 'KeytarUnavailable',
@@ -17,7 +19,14 @@ export const AI_CHAT_ERRORS = {
   default: () => 'An error occurred. Try again or restart the session.',
   unexpected: () => 'An unexpected error occurred. Try again later.',
   timeout: () => 'Timeout occurred. Try again later.',
-  rateLimit: (limit = 5000) => `Exceeded rate limit. Try again in ${limit} seconds.`,
+  rateLimit: (limit?: number) => {
+    let error = 'Exceeded rate limit.'
+    if (limit) {
+      error += ` Try again in ${secondsToMinutes(limit)}.`
+    }
+
+    return error
+  },
   tokenLimit: () => 'Conversation is too long. Restart the session.'
 }
 

redisinsight/ui/src/utils/tests/transformers/formatDate.spec.ts

@@ -0,0 +1,19 @@
+import { secondsToMinutes } from 'uiSrc/utils'
+
+const secondsToMinutesTests: any[] = [
+  [0, '0 seconds'],
+  [1, '1 second'],
+  [25, '25 seconds'],
+  [60, '1 minute'],
+  [65, '1 minute'],
+  [120, '2 minutes'],
+  [1300, '21 minutes'],
+]
+
+describe('secondsToMinutes', () => {
+  it.each(secondsToMinutesTests)('should be output: %s, for value: $s',
+    (input, output) => {
+      const result = secondsToMinutes(input)
+      expect(result).toBe(output)
+    })
+})

redisinsight/ui/src/utils/transformers/formatDate.ts

@@ -20,3 +20,11 @@ export const truncateMilliseconds = (milliseconds: number): string => {
 
   return truncateNumberToFirstUnit(milliseconds / 1000)
 }
+
+export const secondsToMinutes = (time: number) => {
+  if (time < 60) {
+    return `${time} second${time === 1 ? '' : 's'}`
+  }
+  const minutes = Math.floor(time / 60)
+  return `${minutes} minute${minutes === 1 ? '' : 's'}`
+}