Merge pull request #4152 from RedisInsight/latest

vlad-dargel · web-flow · commit a001f0ca512d · 2024-11-28T17:33:12.000+01:00
Latest to main
diff --git a/.circleci/build/release-docker.sh b/.circleci/build/release-docker.sh
@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.60.0)
+-v - Semver (2.62.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "
diff --git a/.github/build/release-docker.sh b/.github/build/release-docker.sh
@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.60.0)
+-v - Semver (2.62.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "
diff --git a/.github/workflows/virustotal.yml b/.github/workflows/virustotal.yml
@@ -80,7 +80,7 @@ jobs:
         uploadZipFile="./${{ matrix.artifact }}.zip"
 
         # Compress artifactes
-        zip -r "${uploadZipFile}" "./release"
+        zip -r "${uploadZipFile}" "./release" ${{ startsWith(matrix.artifact, 'macos-') && '-x "*/redisstack/*" "*.tar.gz" "*.zip"' || '' }}
 
         # Generate url to download zip file
         uploadUrl=$(curl -sq -XGET https://www.virustotal.com/api/v3/files/upload_url -H "x-apikey: $VIRUSTOTAL_API_KEY" | jq -r '.data')
diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts
@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.60.0',
+    appVersion: process.env.RI_APP_VERSION || '2.62.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
diff --git a/redisinsight/api/config/swagger.ts b/redisinsight/api/config/swagger.ts
@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.60.0',
+    version: '2.62.0',
   },
   tags: [],
 };
diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.60.0",
+  "version": "2.62.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {
diff --git a/redisinsight/api/src/main.ts b/redisinsight/api/src/main.ts
@@ -29,7 +29,10 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
     await migrateHomeFolder() && await removeOldFolders();
   }
 
-  const { port, host } = serverConfig;
+  if (apiPort) {
+    serverConfig.port = apiPort;
+  }
+
   const logger = WinstonModule.createLogger(LOGGER_CONFIG);
 
   const options: NestApplicationOptions = {
@@ -75,7 +78,9 @@ export default async function bootstrap(apiPort?: number): Promise<IApp> {
 
   const logFileProvider = app.get(LogFileProvider);
 
-  await app.listen(apiPort || port, host);
+  const { port, host } = serverConfig;
+
+  await app.listen(port, host);
   logger.log({
     message: `Server is running on http(s)://${host}:${port}`,
     context: 'bootstrap',
diff --git a/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts b/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts
@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 
 export const AboutPanelOptions = {
   applicationName: 'Redis Insight',
-  applicationVersion: `${app.getVersion() || '2.60.0'}${
+  applicationVersion: `${app.getVersion() || '2.62.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
diff --git a/redisinsight/package.json b/redisinsight/package.json
@@ -3,7 +3,7 @@
   "appName": "Redis Insight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.60.0",
+  "version": "2.62.0",
   "description": "Redis Insight",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/redisinsight/ui/package.json b/redisinsight/ui/package.json
@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "appName": "Redis Insight",
   "productName": "RedisInsight",
-  "version": "2.60.0",
+  "version": "2.62.0",
   "description": "Redis Insight",
   "author": {
     "name": "Redis Ltd.",
diff --git a/redisinsight/ui/src/components/oauth/oauth-user-profile/OAuthUserProfile.spec.tsx b/redisinsight/ui/src/components/oauth/oauth-user-profile/OAuthUserProfile.spec.tsx
@@ -7,7 +7,7 @@ import { act, cleanup, mockedStore, render, screen,
   mockedStoreFn,
 } from 'uiSrc/utils/test-utils'
 
-import { getUserInfo, logoutUser, oauthCloudUserSelector } from 'uiSrc/slices/oauth/cloud'
+import { getUserInfo, logoutUser, oauthCloudUserSelector, setInitialLoadingState } from 'uiSrc/slices/oauth/cloud'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { loadSubscriptionsRedisCloud, setSSOFlow } from 'uiSrc/slices/instances/cloud'
 import { OAuthSocialAction, OAuthSocialSource } from 'uiSrc/slices/interfaces'
@@ -24,6 +24,7 @@ jest.mock('uiSrc/slices/oauth/cloud', () => ({
     loading: false,
     data: null,
     error: '',
+    initialLoading: false
   }),
 }))
 
@@ -53,6 +54,12 @@ describe('OAuthUserProfile', () => {
   })
 
   it('should render loading spinner initially', () => {
+    (oauthCloudUserSelector as jest.Mock).mockReturnValueOnce({
+      loading: false,
+      data: null,
+      error: '',
+      initialLoading: true
+    })
     render(<OAuthUserProfile {...mockedProps} />)
 
     expect(screen.getByTestId('oath-user-profile-spinner')).toBeInTheDocument()
@@ -132,7 +139,11 @@ describe('OAuthUserProfile', () => {
       }
     })
 
-    expect(store.getActions()).toEqual([setSSOFlow(OAuthSocialAction.Import), loadSubscriptionsRedisCloud()]);
+    expect(store.getActions()).toEqual([
+      setInitialLoadingState(false),
+      setSSOFlow(OAuthSocialAction.Import),
+      loadSubscriptionsRedisCloud()
+    ]);
 
     (sendEventTelemetry as jest.Mock).mockRestore()
   })
@@ -154,7 +165,7 @@ describe('OAuthUserProfile', () => {
 
     fireEvent.click(screen.getByTestId('profile-account-2'))
 
-    expect(store.getActions()).toEqual([getUserInfo()]);
+    expect(store.getActions()).toEqual([setInitialLoadingState(false), getUserInfo()]);
 
     (sendEventTelemetry as jest.Mock).mockRestore()
   })
@@ -195,6 +206,6 @@ describe('OAuthUserProfile', () => {
 
     fireEvent.click(screen.getByTestId('profile-logout'))
 
-    expect(store.getActions()).toEqual([logoutUser(), setSSOFlow()])
+    expect(store.getActions()).toEqual([setInitialLoadingState(false), logoutUser(), setSSOFlow()])
   })
 })
diff --git a/redisinsight/ui/src/components/oauth/oauth-user-profile/OAuthUserProfile.tsx b/redisinsight/ui/src/components/oauth/oauth-user-profile/OAuthUserProfile.tsx
@@ -5,7 +5,12 @@ import { EuiIcon, EuiLink, EuiLoadingSpinner, EuiPopover, EuiText } from '@elast
 import cx from 'classnames'
 import { useHistory } from 'react-router-dom'
 import OAuthSignInButton from 'uiSrc/components/oauth/oauth-sign-in-button'
-import { activateAccount, logoutUserAction, oauthCloudUserSelector } from 'uiSrc/slices/oauth/cloud'
+import {
+  activateAccount,
+  logoutUserAction,
+  oauthCloudUserSelector,
+  setInitialLoadingState
+} from 'uiSrc/slices/oauth/cloud'
 import CloudIcon from 'uiSrc/assets/img/oauth/cloud.svg?react'
 
 import { getUtmExternalLink } from 'uiSrc/utils/links'
@@ -27,26 +32,25 @@ export interface Props {
 const OAuthUserProfile = (props: Props) => {
   const { source } = props
   const [selectingAccountId, setSelectingAccountId] = useState<number>()
-  const { loading, error, data } = useSelector(oauthCloudUserSelector)
+  const { error, data, initialLoading } = useSelector(oauthCloudUserSelector)
   const { server } = useSelector(appInfoSelector)
 
   const [isProfileOpen, setIsProfileOpen] = useState(false)
   const [isImportLoading, setIsImportLoading] = useState(false)
-  const [profileLoading, setProfileLoading] = useState(true)
 
   const dispatch = useDispatch()
   const history = useHistory()
 
   useEffect(() => {
-    if (!loading && (error || data)) {
-      setProfileLoading(false)
+    if (data || error) {
+      dispatch(setInitialLoadingState(false))
     }
-  }, [data, loading, error])
+  }, [data, error])
 
   if (!data) {
     if (server?.packageType === PackageType.Mas) return null
 
-    if (profileLoading) {
+    if (initialLoading) {
       return (
         <div className={styles.loadingContainer}>
           <EuiLoadingSpinner
diff --git a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.tsx b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/LiveTimeRecommendations.tsx
@@ -12,7 +12,7 @@ import {
 } from '@elastic/eui'
 import { remove } from 'lodash'
 
-import { Pages } from 'uiSrc/constants'
+import { DEFAULT_DELIMITER, Pages } from 'uiSrc/constants'
 import { ANALYZE_CLUSTER_TOOLTIP_MESSAGE, ANALYZE_TOOLTIP_MESSAGE } from 'uiSrc/constants/recommendations'
 import {
   recommendationsSelector,
@@ -26,6 +26,7 @@ import { IRecommendation } from 'uiSrc/slices/interfaces/recommendations'
 import { appContextDbConfig, setRecommendationsShowHidden } from 'uiSrc/slices/app/context'
 import { ConnectionType } from 'uiSrc/slices/interfaces'
 import { createNewAnalysis } from 'uiSrc/slices/analytics/dbAnalysis'
+import { comboBoxToArray } from 'uiSrc/utils'
 
 import InfoIcon from 'uiSrc/assets/img/icons/help_illus.svg'
 
@@ -45,7 +46,7 @@ const LiveTimeRecommendations = () => {
   } = useSelector(recommendationsSelector)
   const {
     showHiddenRecommendations: isShowHidden,
-    treeViewDelimiter: delimiter = '',
+    treeViewDelimiter = [DEFAULT_DELIMITER],
   } = useSelector(appContextDbConfig)
 
   const { instanceId } = useParams<{ instanceId: string }>()
@@ -68,7 +69,7 @@ const LiveTimeRecommendations = () => {
   }, [])
 
   const handleClickDbAnalysisLink = () => {
-    dispatch(createNewAnalysis(instanceId, delimiter))
+    dispatch(createNewAnalysis(instanceId, comboBoxToArray(treeViewDelimiter)))
     history.push(Pages.databaseAnalysis(instanceId))
     sendEventTelemetry({
       event: TelemetryEvent.INSIGHTS_TIPS_DATABASE_ANALYSIS_CLICKED,
diff --git a/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.tsx b/redisinsight/ui/src/components/side-panels/panels/live-time-recommendations/components/welcome-screen/WelcomeScreen.tsx
@@ -4,14 +4,15 @@ import { useHistory, useParams } from 'react-router-dom'
 import cx from 'classnames'
 import { EuiText, EuiButton } from '@elastic/eui'
 
-import { Pages } from 'uiSrc/constants'
+import { DEFAULT_DELIMITER, Pages } from 'uiSrc/constants'
 import { recommendationsSelector } from 'uiSrc/slices/recommendations/recommendations'
 import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import WelcomeIcon from 'uiSrc/assets/img/icons/welcome.svg?react'
 import { appContextDbConfig } from 'uiSrc/slices/app/context'
 import { createNewAnalysis } from 'uiSrc/slices/analytics/dbAnalysis'
 import { ConnectionType } from 'uiSrc/slices/interfaces'
+import { comboBoxToArray } from 'uiSrc/utils'
 import { ANALYZE_CLUSTER_TOOLTIP_MESSAGE, ANALYZE_TOOLTIP_MESSAGE } from 'uiSrc/constants/recommendations'
 import PopoverRunAnalyze from '../popover-run-analyze'
 
@@ -20,7 +21,7 @@ import styles from './styles.module.scss'
 const NoRecommendationsScreen = () => {
   const { provider, connectionType } = useSelector(connectedInstanceSelector)
   const { data: { recommendations } } = useSelector(recommendationsSelector)
-  const { treeViewDelimiter: delimiter = '' } = useSelector(appContextDbConfig)
+  const { treeViewDelimiter = [DEFAULT_DELIMITER] } = useSelector(appContextDbConfig)
 
   const [isShowInfo, setIsShowInfo] = useState(false)
 
@@ -29,7 +30,7 @@ const NoRecommendationsScreen = () => {
   const history = useHistory()
 
   const handleClickDbAnalysisLink = () => {
-    dispatch(createNewAnalysis(instanceId, delimiter))
+    dispatch(createNewAnalysis(instanceId, comboBoxToArray(treeViewDelimiter)))
     history.push(Pages.databaseAnalysis(instanceId))
     sendEventTelemetry({
       event: TelemetryEvent.INSIGHTS_TIPS_DATABASE_ANALYSIS_CLICKED,
diff --git a/redisinsight/ui/src/contexts/themeContext.tsx b/redisinsight/ui/src/contexts/themeContext.tsx
@@ -39,14 +39,16 @@ export class ThemeProvider extends React.Component<Props> {
 
   getSystemTheme = () => (window.matchMedia?.(THEME_MATCH_MEDIA_DARK)?.matches ? Theme.Dark : Theme.Light)
 
-  changeTheme = (themeValue: any) => {
+  changeTheme = async (themeValue: any) => {
     let actualTheme = themeValue
+
+    // since change theme is async need to wait to have a proper prefers-color-scheme
+    await ipcThemeChange(themeValue)
+
     if (themeValue === Theme.System) {
       actualTheme = this.getSystemTheme()
     }
 
-    ipcThemeChange(themeValue)
-
     this.setState({ theme: actualTheme, usingSystemTheme: themeValue === Theme.System }, () => {
       themeService.applyTheme(themeValue)
     })
diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/RedisCloudDatabasesPage.tsx
@@ -48,6 +48,7 @@ const RedisCloudDatabasesPage = () => {
   } = useSelector(cloudSelector)
   const { data: userOAuthProfile } = useSelector(oauthCloudUserSelector)
   const currentAccountIdRef = useRef(userOAuthProfile?.id)
+  const ssoFlowRef = useRef(ssoFlow)
 
   setTitle('Redis Cloud Databases')
 
@@ -60,7 +61,7 @@ const RedisCloudDatabasesPage = () => {
   }, [])
 
   useEffect(() => {
-    if (ssoFlow !== OAuthSocialAction.Import) return
+    if (ssoFlowRef.current !== OAuthSocialAction.Import) return
 
     if (!userOAuthProfile) {
       dispatch(resetDataRedisCloud())
@@ -73,7 +74,7 @@ const RedisCloudDatabasesPage = () => {
         history.push(Pages.redisCloudSubscriptions)
       }))
     }
-  }, [ssoFlow, userOAuthProfile])
+  }, [userOAuthProfile])
 
   useEffect(() => {
     if (instancesAdded.length) {
diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/RedisCloudSubscriptionsPage.tsx
@@ -48,6 +48,7 @@ const RedisCloudSubscriptionsPage = () => {
   } = useSelector(cloudSelector)
   const { data: userOAuthProfile } = useSelector(oauthCloudUserSelector)
   const currentAccountIdRef = useRef(userOAuthProfile?.id)
+  const ssoFlowRef = useRef(ssoFlow)
 
   setTitle('Redis Cloud Subscriptions')
 
@@ -58,7 +59,7 @@ const RedisCloudSubscriptionsPage = () => {
   }, [])
 
   useEffect(() => {
-    if (ssoFlow !== OAuthSocialAction.Import) return
+    if (ssoFlowRef.current !== OAuthSocialAction.Import) return
 
     if (!userOAuthProfile) {
       history.push(Pages.home)
@@ -69,7 +70,7 @@ const RedisCloudSubscriptionsPage = () => {
       dispatch(fetchSubscriptionsRedisCloud(null, true))
       currentAccountIdRef.current = userOAuthProfile?.id
     }
-  }, [ssoFlow, userOAuthProfile])
+  }, [userOAuthProfile])
 
   useEffect(() => {
     if (instancesLoaded) {
diff --git a/redisinsight/ui/src/pages/database-analysis/components/header/Header.tsx b/redisinsight/ui/src/pages/database-analysis/components/header/Header.tsx
@@ -20,10 +20,11 @@ import { appContextDbConfig } from 'uiSrc/slices/app/context'
 import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
 import { ConnectionType } from 'uiSrc/slices/interfaces'
 import AnalyticsTabs from 'uiSrc/components/analytics-tabs'
-import { Nullable, getDbIndex } from 'uiSrc/utils'
+import { Nullable, comboBoxToArray, getDbIndex } from 'uiSrc/utils'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { ANALYZE_CLUSTER_TOOLTIP_MESSAGE, ANALYZE_TOOLTIP_MESSAGE } from 'uiSrc/constants/recommendations'
 import { FormatedDate } from 'uiSrc/components'
+import { DEFAULT_DELIMITER } from 'uiSrc/constants'
 import { ShortDatabaseAnalysis } from 'apiSrc/modules/database-analysis/models'
 import { AnalysisProgress } from 'apiSrc/modules/database-analysis/models/analysis-progress'
 
@@ -50,7 +51,7 @@ const Header = (props: Props) => {
   const { instanceId } = useParams<{ instanceId: string }>()
   const dispatch = useDispatch()
 
-  const { treeViewDelimiter: delimiter = '' } = useSelector(appContextDbConfig)
+  const { treeViewDelimiter = [DEFAULT_DELIMITER] } = useSelector(appContextDbConfig)
 
   const analysisOptions: EuiSuperSelectOption<any>[] = items.map((item) => {
     const { createdAt, id, db } = item
@@ -76,7 +77,7 @@ const Header = (props: Props) => {
         provider,
       }
     })
-    dispatch(createNewAnalysis(instanceId, delimiter))
+    dispatch(createNewAnalysis(instanceId, comboBoxToArray(treeViewDelimiter)))
   }
 
   return (
diff --git a/redisinsight/ui/src/pages/database-analysis/components/top-keys/Table.tsx b/redisinsight/ui/src/pages/database-analysis/components/top-keys/Table.tsx
@@ -65,7 +65,7 @@ const Table = (props: Props) => {
 
   const handleRedirect = (name: string) => {
     dispatch(changeSearchMode(SearchMode.Pattern))
-    dispatch(setBrowserTreeDelimiter(delimiter))
+    dispatch(setBrowserTreeDelimiter([{ label: delimiter }]))
     dispatch(setFilter(null))
     dispatch(setSearchMatch(name, SearchMode.Pattern))
     dispatch(resetKeysData(SearchMode.Pattern))
diff --git a/redisinsight/ui/src/pages/database-analysis/components/top-namespace/Table.tsx b/redisinsight/ui/src/pages/database-analysis/components/top-namespace/Table.tsx
@@ -63,7 +63,7 @@ const NameSpacesTable = (props: Props) => {
 
   const handleRedirect = (nsp: string, filter: string) => {
     dispatch(changeSearchMode(SearchMode.Pattern))
-    dispatch(setBrowserTreeDelimiter(delimiter))
+    dispatch(setBrowserTreeDelimiter([{ label: delimiter }]))
     dispatch(setFilter(filter))
     dispatch(setSearchMatch(`${nsp}${delimiter}*`, SearchMode.Pattern))
     dispatch(resetKeysData(SearchMode.Pattern))
diff --git a/redisinsight/ui/src/services/theme.ts b/redisinsight/ui/src/services/theme.ts
diff --git a/redisinsight/ui/src/slices/analytics/dbAnalysis.ts b/redisinsight/ui/src/slices/analytics/dbAnalysis.ts
diff --git a/redisinsight/ui/src/slices/interfaces/cloud.ts b/redisinsight/ui/src/slices/interfaces/cloud.ts
diff --git a/redisinsight/ui/src/slices/oauth/cloud.ts b/redisinsight/ui/src/slices/oauth/cloud.ts
diff --git a/redisinsight/ui/src/slices/tests/analytics/dbAnalysis.spec.ts b/redisinsight/ui/src/slices/tests/analytics/dbAnalysis.spec.ts
diff --git a/redisinsight/ui/src/slices/tests/app/context.spec.ts b/redisinsight/ui/src/slices/tests/app/context.spec.ts
diff --git a/redisinsight/ui/src/slices/tests/oauth/cloud.spec.ts b/redisinsight/ui/src/slices/tests/oauth/cloud.spec.ts
diff --git a/tests/e2e/pageObjects/components/browser/tree-view.ts b/tests/e2e/pageObjects/components/browser/tree-view.ts
diff --git a/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts b/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -e`
`3`	`3`
`4`	`4`	`HELP="Args:`
`5`		`--v - Semver (2.60.0)`
	`5`	`+-v - Semver (2.62.0)`
`6`	`6`	`-d - Build image repository (Ex: -d redisinsight)`
`7`	`7`	`-r - Target repository (Ex: -r redis/redisinsight)`
`8`	`8`	`"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redisinsight-api",`
`3`		`- "version": "2.60.0",`
	`3`	`+ "version": "2.62.0",`
`4`	`4`	`"description": "Redis Insight API",`
`5`	`5`	`"private": true,`
`6`	`6`	`"author": {`