Merge branch 'main' into feature/browser-vector-type-viz

Author: vlad-dargel

redisinsight/api/config/features-config.json

@@ -49,7 +49,7 @@
     },
     "cloudSsoRecommendedSettings": {
       "flag": true,
-      "perc": [[0, 50]],
+      "perc": [[0, 100]],
       "filters": [
         {
           "name": "config.server.buildType",

redisinsight/api/src/modules/browser/stream/services/stream.service.ts

@@ -29,6 +29,7 @@ import { ClientMetadata } from 'src/common/models';
 import { DatabaseClientFactory } from 'src/modules/database/providers/database.client.factory';
 import { RedisClient } from 'src/modules/redis/client';
 import { checkIfKeyExists, checkIfKeyNotExists } from 'src/modules/browser/utils';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 
 @Injectable()
 export class StreamService {
@@ -55,10 +56,10 @@ export class StreamService {
 
       await checkIfKeyNotExists(keyName, client);
 
-      const info = await client.sendCommand([
+      const info = convertArrayReplyToObject(await client.sendCommand([
         BrowserToolStreamCommands.XInfoStream,
         keyName,
-      ]);
+      ]) as string[]);
 
       let entries = [];
       if (sortOrder && sortOrder === SortOrder.Asc) {
@@ -71,10 +72,10 @@ export class StreamService {
 
       return plainToClass(GetStreamEntriesResponse, {
         keyName,
-        total: info[1],
-        lastGeneratedId: info[7].toString(),
-        firstEntry: StreamService.formatArrayToDto(info[11]),
-        lastEntry: StreamService.formatArrayToDto(info[13]),
+        total: info['length'],
+        lastGeneratedId: info['last-generated-id'].toString(),
+        firstEntry: StreamService.formatArrayToDto(info['first-entry']),
+        lastEntry: StreamService.formatArrayToDto(info['last-entry']),
         entries,
       });
     } catch (error) {

redisinsight/api/src/modules/redis/utils/reply.util.ts

@@ -26,7 +26,7 @@ export const convertArrayReplyToObject = (input: string[]): { [key: string]: any
   2,
 ).reduce((prev: any, current: string[]) => {
   const [key, value] = current;
-  return { ...prev, [key.toLowerCase()]: value };
+  return { ...prev, [key.toString().toLowerCase()]: value };
 }, {});
 
 /**

redisinsight/desktop/src/lib/window/browserWindow.ts

@@ -1,11 +1,12 @@
 import contextMenu from 'electron-context-menu'
-import { BrowserWindow } from 'electron'
+import { BrowserWindow, Rectangle } from 'electron'
 import { v4 as uuidv4 } from 'uuid'
 
 import { IParsedDeepLink } from 'desktopSrc/lib/app/deep-link.handlers'
 import { configMain as config } from 'desktopSrc/config'
-import { updateTray } from 'desktopSrc/lib'
-import { resolveHtmlPath } from 'desktopSrc/utils'
+import { electronStore, updateTray } from 'desktopSrc/lib'
+import { resolveHtmlPath, getFittedBounds } from 'desktopSrc/utils'
+import { ElectronStorageItem } from 'uiSrc/electron/constants'
 import { initWindowHandlers } from './window.handlers'
 
 export const windows = new Map<string, BrowserWindow>()
@@ -14,6 +15,7 @@ export const focusWindow = (win: BrowserWindow) => {
   if (win.isMinimized()) win.restore()
   win.focus()
 }
+export const NEW_WINDOW_OFFSET = 24
 
 export enum WindowType {
   Splash = 'splash',
@@ -37,17 +39,26 @@ export const createWindow = async ({
 }: ICreateWindow) => {
   let x
   let y
+  let { width, height } = options
+
   const currentWindow = BrowserWindow.getFocusedWindow()
+  const isNewMainWindow = currentWindow && currentWindow?.getTitle() !== config.splashWindow.title
 
-  if (currentWindow && currentWindow?.getTitle() !== config.splashWindow.title) {
+  if (isNewMainWindow) {
     const [currentWindowX, currentWindowY] = currentWindow.getPosition()
-    x = currentWindowX + 24
-    y = currentWindowY + 24
+    const [currentWindowWidth, currentWindowHeight] = currentWindow?.getSize()
+    x = currentWindowX + NEW_WINDOW_OFFSET
+    y = currentWindowY + NEW_WINDOW_OFFSET
+    width = currentWindowWidth
+    height = currentWindowHeight
   }
+
   const newWindow: BrowserWindow | null = new BrowserWindow({
     ...options,
     x,
     y,
+    width,
+    height,
     webPreferences: {
       ...options.webPreferences,
       preload: options.preloadPath
@@ -59,6 +70,14 @@ export const createWindow = async ({
     return newWindow
   }
 
+  const savedBounds = electronStore?.get(ElectronStorageItem.bounds)
+  if (!isNewMainWindow && savedBounds) {
+    const bounds = getFittedBounds(savedBounds as Rectangle)
+    if (bounds) {
+      newWindow.setBounds(bounds)
+    }
+  }
+
   newWindow.loadURL(resolveHtmlPath(htmlFileName, options?.parsedDeepLink))
 
   initWindowHandlers(newWindow, prevWindow, windows, id)

redisinsight/desktop/src/lib/window/window.handlers.ts

@@ -55,6 +55,8 @@ export const initWindowHandlers = (
   })
 
   newWindow.on('close', (event) => {
+    electronStore?.set(ElectronStorageItem.bounds, newWindow.getNormalBounds())
+
     if (!getIsQuiting() && getDisplayAppInTrayValue() && windows.size === 1) {
       event.preventDefault()
       newWindow?.hide()

redisinsight/desktop/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from './resolveHtmlPath'
 export * from './wrapErrorSensitiveData'
 export * from './getAssetPath'
 export * from './showOrCreateWindow'
+export * from './window-size'

redisinsight/desktop/src/utils/window-size.ts

@@ -0,0 +1,31 @@
+import { Rectangle, screen } from 'electron'
+
+export const getFittedBounds = (bounds: Rectangle): Rectangle | null => {
+  try {
+    const options: any = {}
+    const area = screen.getDisplayMatching(bounds).workArea
+
+    if (
+      bounds.x >= area.x
+      && bounds.y >= area.y
+      && bounds.x + bounds.width <= area.x + area.width
+      && bounds.y + bounds.height <= area.y + area.height
+    ) {
+      options.x = bounds.x
+      options.y = bounds.y
+    } else return null
+
+    // If the saved size is still valid, use it.
+    if (bounds.width <= area.width) {
+      options.width = bounds.width
+    } else return null
+
+    if (bounds.height <= area.height) {
+      options.height = bounds.height
+    } else return null
+
+    return options as Rectangle
+  } catch {
+    return null
+  }
+}

redisinsight/ui/src/constants/texts.tsx

@@ -9,6 +9,13 @@ export const NoResultsFoundText = (
     No results found.
   </EuiText>
 )
+
+export const LoadingText = (
+  <EuiText size="m" data-testid="loading-keys" style={{ lineHeight: 1.4 }}>
+    loading...
+  </EuiText>
+)
+
 export const NoSelectedIndexText = (
   <EuiText size="m" data-testid="no-result-select-index">
     Select an index and enter a query to search per values of keys.

redisinsight/ui/src/electron/constants/storageElectron.ts

@@ -7,6 +7,7 @@ enum ElectronStorageItem {
   updatePreviousVersion = 'updatePreviousVersion',
   zoomFactor = 'zoomFactor',
   themeSource = 'themeSource',
+  bounds = 'bounds'
 }
 
 export default ElectronStorageItem

redisinsight/ui/src/pages/browser/components/browser-left-panel/BrowserLeftPanel.tsx

@@ -67,7 +67,8 @@ const BrowserLeftPanel = (props: Props) => {
 
   const isDataLoaded = searchMode === SearchMode.Pattern ? isDataPatternLoaded : isDataRedisearchLoaded
   const keysState = searchMode === SearchMode.Pattern ? patternKeysState : redisearchKeysState
-  const loading = searchMode === SearchMode.Pattern ? patternLoading : redisearchLoading || redisearchListLoading
+  const loading = searchMode === SearchMode.Pattern ? patternLoading : redisearchLoading
+  const headerLoading = searchMode === SearchMode.Pattern ? patternLoading : redisearchListLoading
   const isSearched = searchMode === SearchMode.Pattern ? patternIsSearched : redisearchIsSearched
   const scrollTopPosition = searchMode === SearchMode.Pattern ? scrollPatternTopPosition : scrollRedisearchTopPosition
   const commonFilterType = searchMode === SearchMode.Pattern ? filter : keysState.keys?.[0]?.type
@@ -123,7 +124,7 @@ const BrowserLeftPanel = (props: Props) => {
     <div className={styles.container}>
       <KeysHeader
         keysState={keysState}
-        loading={loading}
+        loading={headerLoading}
         isSearched={isSearched}
         loadKeys={loadKeys}
         handleScanMoreClick={handleScanMoreClick}