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

mariasergeenko · web-flow · commit bb32e523d0b0 · 2024-05-16T09:31:53.000+02:00
#RI-5719 - fix oauth callback
diff --git a/redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.tsx b/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))
   }
 
diff --git a/redisinsight/ui/src/components/oauth/oauth-sso-handler-dialog/OAuthSsoHandlerDialog.tsx b/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))
   }
 
diff --git a/redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.spec.tsx b/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()
diff --git a/redisinsight/ui/src/components/oauth/oauth-sso/oauth-create-db/OAuthCreateDb.tsx b/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))
diff --git a/redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/welcome-ai-assistant/WelcomeAiAssistant.tsx b/redisinsight/ui/src/components/side-panels/panels/ai-assistant/components/welcome-ai-assistant/WelcomeAiAssistant.tsx
@@ -6,13 +6,16 @@ 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 styles from './styles.module.scss'
 
 const WelcomeAiAssistant = () => {
   const dispatch = useDispatch()
 
   const handleSsoClick = (accountOption: string) => {
     dispatch(setSSOFlow(OAuthSocialAction.SignIn))
+    dispatch(setSocialDialogState(OAuthSocialSource.AiChat))
+
     sendEventTelemetry({
       event: TelemetryEvent.CLOUD_SIGN_IN_SOCIAL_ACCOUNT_SELECTED,
       eventData: {
diff --git a/redisinsight/ui/src/electron/components/ConfigOAuth/ConfigOAuth.tsx b/redisinsight/ui/src/electron/components/ConfigOAuth/ConfigOAuth.tsx
@@ -26,6 +26,7 @@ const ConfigOAuth = () => {
 
   const ssoFlowRef = useRef(ssoFlow)
   const isRecommendedSettingsRef = useRef(isRecommendedSettings)
+  const isFlowStarted = useRef(false)
 
   const history = useHistory()
   const dispatch = useDispatch()
@@ -36,6 +37,7 @@ const ConfigOAuth = () => {
 
   useEffect(() => {
     ssoFlowRef.current = ssoFlow
+    isFlowStarted.current = !!ssoFlow
   }, [ssoFlow])
 
   useEffect(() => {
@@ -89,6 +91,8 @@ const ConfigOAuth = () => {
   }
 
   const cloudOauthCallback = (_e: any, { status, message = '', error }: CloudAuthResponse) => {
+    if (!isFlowStarted.current) return
+
     if (status === CloudAuthStatus.Succeed) {
       dispatch(setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }))
       localStorageService.remove(BrowserStorageItem.OAuthJobId)
diff --git a/redisinsight/ui/src/pages/home/components/capability-promotion/CapabilityPromotion.spec.tsx b/redisinsight/ui/src/pages/home/components/capability-promotion/CapabilityPromotion.spec.tsx
@@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash'
 import reactRouterDom from 'react-router-dom'
 import { cleanup, fireEvent, mockedStore, render, screen } from 'uiSrc/utils/test-utils'
 
-import { changeSelectedTab, changeSidePanel } from 'uiSrc/slices/panels/sidePanels'
+import { changeSelectedTab, changeSidePanel, toggleSidePanel } from 'uiSrc/slices/panels/sidePanels'
 import { InsightsPanelTabs, SidePanels } from 'uiSrc/slices/interfaces/insights'
 import { sendEventTelemetry, TELEMETRY_EMPTY_VALUE, TelemetryEvent } from 'uiSrc/telemetry'
 import { MOCK_EXPLORE_GUIDES } from 'uiSrc/constants/mocks/mock-explore-guides'
@@ -97,7 +97,7 @@ describe('CapabilityPromotion', () => {
 
     const expectedActions = [
       changeSelectedTab(InsightsPanelTabs.Explore),
-      changeSidePanel(SidePanels.Insights)
+      toggleSidePanel(SidePanels.Insights)
     ]
 
     expect(store.getActions()).toEqual(expectedActions)
diff --git a/redisinsight/ui/src/pages/home/components/capability-promotion/CapabilityPromotion.tsx b/redisinsight/ui/src/pages/home/components/capability-promotion/CapabilityPromotion.tsx
@@ -7,9 +7,8 @@ import { filter } from 'lodash'
 
 import {
   changeSelectedTab,
-  changeSidePanel,
   openTutorialByPath,
-  sidePanelsSelector,
+  sidePanelsSelector, toggleSidePanel,
 } from 'uiSrc/slices/panels/sidePanels'
 import { sendEventTelemetry, TELEMETRY_EMPTY_VALUE, TelemetryEvent } from 'uiSrc/telemetry'
 import { guideLinksSelector } from 'uiSrc/slices/content/guide-links'
@@ -54,13 +53,17 @@ const CapabilityPromotion = (props: Props) => {
     const tutorialPath = findTutorialPath({ id: id ?? '' })
     dispatch(openTutorialByPath(tutorialPath ?? '', history))
 
+    if (isInsightsOpen) {
+      return
+    }
+
     sendTelemetry(id)
   }
 
   const onClickExplore = () => {
     sendTelemetry()
     dispatch(changeSelectedTab(InsightsPanelTabs.Explore))
-    dispatch(changeSidePanel(SidePanels.Insights))
+    dispatch(toggleSidePanel(SidePanels.Insights))
   }
 
   if (!data?.length) {
diff --git a/redisinsight/ui/src/slices/interfaces/cloud.ts b/redisinsight/ui/src/slices/interfaces/cloud.ts
@@ -109,5 +109,7 @@ export enum CloudSsoUtmCampaign {
   Tutorial = 'tutorial',
   TriggersAndFunctions = 'redisinsight_triggers_and_functions',
   AutoDiscovery = 'auto_discovery',
+  Copilot = 'ai_chat',
+  UserProfile = 'account',
   Unknown = 'other',
 }
diff --git a/redisinsight/ui/src/utils/oauth/cloudSsoUtm.tsx b/redisinsight/ui/src/utils/oauth/cloudSsoUtm.tsx
@@ -25,7 +25,12 @@ export const getCloudSsoUtmCampaign = (source?: string | null): CloudSsoUtmCampa
     case OAuthSocialSource.Tutorials:
       return CloudSsoUtmCampaign.Tutorial
     case OAuthSocialSource.Autodiscovery:
+    case OAuthSocialSource.DiscoveryForm:
       return CloudSsoUtmCampaign.AutoDiscovery
+    case OAuthSocialSource.AiChat:
+      return CloudSsoUtmCampaign.Copilot
+    case OAuthSocialSource.UserProfile:
+      return CloudSsoUtmCampaign.UserProfile
     default:
       return CloudSsoUtmCampaign.Unknown
   }

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {`
`46`	`46`	`}`
`47`	`47`	`e?.preventDefault()`
`48`	`48`
`49`		`- dispatch(setSSOFlow(action))`
`50`		`-`
`51`	`49`	`if (action === OAuthSocialAction.Import && data) {`
`52`	`50`	`// if user logged in - do not show dialog, just redirect to subscriptions page`
`53`	`51`	`dispatch(fetchSubscriptionsRedisCloud(null, true, () => {`
`@@ -69,6 +67,7 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {`
`69`	`67`	`})`
`70`	`68`	`}`
`71`	`69`
	`70`	`+ dispatch(setSSOFlow(action))`
`72`	`71`	`dispatch(setSocialDialogState(source))`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -109,5 +109,7 @@ export enum CloudSsoUtmCampaign {`
`109`	`109`	`Tutorial = 'tutorial',`
`110`	`110`	`TriggersAndFunctions = 'redisinsight_triggers_and_functions',`
`111`	`111`	`AutoDiscovery = 'auto_discovery',`
	`112`	`+ Copilot = 'ai_chat',`
	`113`	`+ UserProfile = 'account',`
`112`	`114`	`Unknown = 'other',`
`113`	`115`	`}`