Merge pull request #3387 from RedisInsight/fe/bugfix/RI-5402-ai-assistant

#RI-5739 - change behaviour to unblock chatbot input

Author: rsergeenko

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

@@ -10,6 +10,7 @@ import { RootState } from 'uiSrc/slices/store'
 import { loadInstances } from 'uiSrc/slices/instances/instances'
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
 import { CustomErrorCodes } from 'uiSrc/constants'
+import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 import OAuthJobs from './OAuthJobs'
 
 jest.mock('react-redux', () => ({
@@ -130,6 +131,7 @@ describe('OAuthJobs', () => {
 
     const expectedActions = [
       addErrorNotification({ response: { data: error } } as AxiosError),
+      setSSOFlow(),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -160,6 +162,7 @@ describe('OAuthJobs', () => {
 
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
+      setSSOFlow(),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -190,6 +193,7 @@ describe('OAuthJobs', () => {
 
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
+      setSSOFlow(),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/assistance-chat/AssistanceChat.tsx

@@ -201,7 +201,7 @@ const AssistanceChat = () => {
           onAgreementsDisplayed={handleAgreementsDisplay}
           agreements={!agreements ? ASSISTANCE_CHAT_AGREEMENTS : undefined}
           placeholder="Ask me about Redis"
-          isDisabled={!!inProgressMessage}
+          isDisabled={inProgressMessage?.content === ''}
           onSubmit={handleSubmit}
         />
       </div>

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/expert-chat/ExpertChat.tsx

@@ -226,7 +226,7 @@ const ExpertChat = () => {
         <ChatForm
           onAgreementsDisplayed={handleAgreementsDisplay}
           agreements={!isAgreementsAccepted ? EXPERT_CHAT_AGREEMENTS : undefined}
-          isDisabled={!instanceId || !!inProgressMessage}
+          isDisabled={!instanceId || inProgressMessage?.content === ''}
           validation={getValidationMessage()}
           placeholder="Ask me to query your data (e.g. How many road bikes?)"
           onSubmit={handleSubmit}

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/welcome-ai-assistant/WelcomeAiAssistant.spec.tsx

@@ -5,7 +5,7 @@ import { cleanup, fireEvent, mockedStore, render, screen, act } from 'uiSrc/util
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
-import { signIn } from 'uiSrc/slices/oauth/cloud'
+import { setOAuthCloudSource, signIn } from 'uiSrc/slices/oauth/cloud'
 import WelcomeAiAssistant from './WelcomeAiAssistant'
 
 jest.mock('uiSrc/telemetry', () => ({
@@ -49,7 +49,11 @@ describe('WelcomeAiAssistant', () => {
       fireEvent.click(screen.getByTestId('google-oauth'))
     })
 
-    expect(store.getActions()).toEqual([signIn(), setSSOFlow(OAuthSocialAction.SignIn)])
+    expect(store.getActions()).toEqual([
+      signIn(),
+      setSSOFlow(OAuthSocialAction.SignIn),
+      setOAuthCloudSource(OAuthSocialSource.AiChat)
+    ])
 
     expect(sendEventTelemetry).toBeCalledWith({
       event: TelemetryEvent.CLOUD_SIGN_IN_SOCIAL_ACCOUNT_SELECTED,

redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/welcome-ai-assistant/WelcomeAiAssistant.tsx

@@ -6,15 +6,15 @@ import { OAuthAgreement, OAuthSocialButtons } from 'uiSrc/components/oauth/share
 import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
-import { setSocialDialogState } from 'uiSrc/slices/oauth/cloud'
+import { setOAuthCloudSource } from 'uiSrc/slices/oauth/cloud'
 import styles from './styles.module.scss'
 
 const WelcomeAiAssistant = () => {
   const dispatch = useDispatch()
 
   const handleSsoClick = (accountOption: string) => {
     dispatch(setSSOFlow(OAuthSocialAction.SignIn))
-    dispatch(setSocialDialogState(OAuthSocialSource.AiChat))
+    dispatch(setOAuthCloudSource(OAuthSocialSource.AiChat))
 
     sendEventTelemetry({
       event: TelemetryEvent.CLOUD_SIGN_IN_SOCIAL_ACCOUNT_SELECTED,

redisinsight/ui/src/electron/components/ConfigOAuth/ConfigOAuth.spec.tsx

@@ -49,6 +49,10 @@ describe('ConfigOAuth', () => {
   })
 
   it('should call proper actions on success', () => {
+    (cloudSelector as jest.Mock).mockReturnValue({
+      ssoFlow: 'signIn'
+    })
+
     window.app?.cloudOauthCallback.mockImplementation((cb: any) => cb(undefined, { status: CloudAuthStatus.Succeed }))
     render(<ConfigOAuth />)
 
@@ -63,6 +67,10 @@ describe('ConfigOAuth', () => {
   })
 
   it('should call proper actions on failed', () => {
+    (cloudSelector as jest.Mock).mockReturnValue({
+      ssoFlow: 'signIn'
+    })
+
     window.app?.cloudOauthCallback.mockImplementation((cb: any) =>
       cb(
         undefined, {
@@ -88,7 +96,11 @@ describe('ConfigOAuth', () => {
     expect(store.getActions()).toEqual(expectedActions)
   })
 
-  it('should fetch plans by default', () => {
+  it('should fetch plans with create flow', () => {
+    (cloudSelector as jest.Mock).mockReturnValue({
+      ssoFlow: 'create'
+    })
+
     const fetchUserInfoMock = jest.fn().mockImplementation((onSuccessAction: () => void) => () => onSuccessAction());
     (fetchUserInfo as jest.Mock).mockImplementation(fetchUserInfoMock)
 
@@ -136,7 +148,8 @@ describe('ConfigOAuth', () => {
 
   it('should call create free job after success with recommended settings', () => {
     (cloudSelector as jest.Mock).mockReturnValue({
-      isRecommendedSettings: true
+      isRecommendedSettings: true,
+      ssoFlow: 'create'
     })
 
     const fetchUserInfoMock = jest.fn().mockImplementation((onSuccessAction: () => void) => () => onSuccessAction());

redisinsight/ui/src/electron/components/ConfigOAuth/ConfigOAuth.tsx

@@ -26,7 +26,7 @@ const ConfigOAuth = () => {
 
   const ssoFlowRef = useRef(ssoFlow)
   const isRecommendedSettingsRef = useRef(isRecommendedSettings)
-  const isFlowStarted = useRef(false)
+  const isFlowStarted = useRef(!!ssoFlow)
 
   const history = useHistory()
   const dispatch = useDispatch()