Merge branch 'feature/RI-5402-ai-assistant' into be/feature/RI-5724-enhanse-sm-session

Author: vlad-dargel

.circleci/config.yml

@@ -1020,6 +1020,13 @@ jobs:
             -r $DOCKER_REPO \
             -v $appVersion
 
+            docker login -u $DOCKER_V1_USER -p $DOCKER_V1_PASS
+
+            ./.circleci/build/release-docker.sh \
+            -d redisinsight \
+            -r $DOCKER_V1_REPO \
+            -v $appVersion
+
   publish-prod-aws:
     executor: linux-executor
     steps:

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/oauth/oauth-jobs/OAuthJobs.tsx

@@ -13,6 +13,7 @@ import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notific
 import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
 import { BrowserStorageItem, CustomErrorCodes } from 'uiSrc/constants'
 import { localStorageService } from 'uiSrc/services'
+import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 
 const OAuthJobs = () => {
   const {
@@ -70,6 +71,7 @@ const OAuthJobs = () => {
             break
         }
 
+        dispatch(setSSOFlow())
         dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
         break
 
@@ -110,13 +112,15 @@ const OAuthJobs = () => {
     sendEventTelemetry({
       event: TelemetryEvent.CLOUD_IMPORT_EXISTING_DATABASE_FORM_CLOSED,
     })
+    dispatch(setSSOFlow())
     dispatch(removeInfiniteNotification(InfiniteMessagesIds.databaseExists))
   }
 
   const closeCreateFreeDatabase = () => {
     sendEventTelemetry({
       event: TelemetryEvent.CLOUD_CREATE_DATABASE_IN_SUBSCRIPTION_FORM_CLOSED,
     })
+    dispatch(setSSOFlow())
     dispatch(removeInfiniteNotification(InfiniteMessagesIds.subscriptionExists))
   }
 

redisinsight/ui/src/components/oauth/oauth-sso-dialog/styles.module.scss

@@ -1,5 +1,5 @@
 .modal {
-  background: var(--euiColorLightestShade) !important;
+  background: var(--euiColorEmptyShade) !important;
   min-width: 420px !important;
   min-height: auto !important;
   padding: 0;

redisinsight/ui/src/components/oauth/oauth-sso-handler-dialog/OAuthSsoHandlerDialog.tsx

@@ -46,8 +46,6 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {
     }
     e?.preventDefault()
 
-    dispatch(setSSOFlow(action))
-
     if (action === OAuthSocialAction.Import && data) {
       // if user logged in - do not show dialog, just redirect to subscriptions page
       dispatch(fetchSubscriptionsRedisCloud(null, true, () => {
@@ -69,6 +67,7 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {
       })
     }
 
+    dispatch(setSSOFlow(action))
     dispatch(setSocialDialogState(source))
   }
 

redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.spec.tsx

@@ -107,8 +107,6 @@ describe('OAuthCreateDb', () => {
 
     const expectedActions = [
       setSSOFlow(OAuthSocialAction.Create),
-      setSocialDialogState(null),
-      setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }),
       showOAuthProgress(true),
       addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)),
       addFreeDb()
@@ -128,8 +126,6 @@ describe('OAuthCreateDb', () => {
 
     const expectedActions = [
       setSSOFlow(OAuthSocialAction.Create),
-      setSocialDialogState(null),
-      setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }),
       showOAuthProgress(true),
       addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)),
       getPlans()

redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.tsx

@@ -5,20 +5,17 @@ import {
   createFreeDbJob,
   fetchPlans,
   oauthCloudUserSelector,
-  setJob,
-  setSocialDialogState,
   showOAuthProgress
 } from 'uiSrc/slices/oauth/cloud'
 
 import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
-import { BrowserStorageItem, FeatureFlags } from 'uiSrc/constants'
+import { FeatureFlags } from 'uiSrc/constants'
 import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
 import { setIsRecommendedSettingsSSO, setSSOFlow } from 'uiSrc/slices/instances/cloud'
-import { localStorageService } from 'uiSrc/services'
 import { Nullable } from 'uiSrc/utils'
 import { OAuthAdvantages, OAuthAgreement, OAuthRecommendedSettings, OAuthSocialButtons } from '../../shared'
 import styles from './styles.module.scss'
@@ -61,9 +58,6 @@ const OAuthCreateDb = (props: Props) => {
 
   const handleClickCreate = () => {
     dispatch(setSSOFlow(OAuthSocialAction.Create))
-    dispatch(setSocialDialogState(null))
-    dispatch(setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }))
-    localStorageService.remove(BrowserStorageItem.OAuthJobId)
     dispatch(showOAuthProgress(true))
     dispatch(addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)))
 
@@ -73,9 +67,6 @@ const OAuthCreateDb = (props: Props) => {
         resources: {
           isRecommendedSettings: isRecommended
         },
-        onSuccessAction: () => {
-          dispatch(addInfiniteNotification(INFINITE_MESSAGES.PENDING_CREATE_DB(CloudJobStep.Credentials)))
-        },
         onFailAction: () => {
           dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
           dispatch(setSSOFlow(undefined))

redisinsight/ui/src/components/oauth/shared/oauth-advantages/styles.module.scss

@@ -16,8 +16,8 @@
 }
 
 .logo {
-  height: 40px;
-  width: 40px;
+  height: auto;
+  width: 120px;
   margin-bottom: 12px;
 }
 

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}