Merge branch 'main' into build/rstack

# Conflicts:
#	electron-builder.json

Author: Artem

.circleci/config.yml

@@ -455,6 +455,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            sudo apt-get update -y && sudo apt-get install -y rpm
             yarn --cwd redisinsight/api/ install
             yarn install
             yarn build:statics
@@ -497,6 +498,7 @@ jobs:
           paths:
             - release/RedisInsight*.deb
             - release/RedisInsight*.AppImage
+            - release/RedisInsight*.rpm
             - release/*-linux.yml
             - release/redisstack
   macosx:
@@ -675,6 +677,19 @@ jobs:
             echo "APP VERSION $applicationVersion"
             ghr -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}
 
+  release-aws-test:
+    executor: linux-executor
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: publish
+          command: |
+            rm release/._* ||:
+            applicationVersion=$(jq -r '.version' redisinsight/package.json)
+            aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive --exclude "*.json"
+
   release-aws-private:
     executor: linux-executor
     steps:
@@ -891,6 +906,13 @@ workflows:
             - Build app - MacOS (dev)
             - Build app - Windows (dev)
 
+      - release-aws-test:
+          name: Release AWS test
+          requires:
+            - Build app - Linux (dev)
+            - Build app - MacOS (dev)
+            - Build app - Windows (dev)
+
       # build and release electron app (stage)
       - setup-sign-certificates:
           name: Setup sign certificates (stage)
@@ -917,6 +939,14 @@ workflows:
           name: Build app - Windows (stage)
           requires: *stageElectronBuildRequires
           <<: *stageFilter
+
+      - release-aws-test:
+          name: Release AWS test
+          requires:
+            - Build app - Linux (stage)
+            - Build app - MacOS (stage)
+            - Build app - Windows (stage)
+
       # Needs approval from QA team that build was tested before merging to latest
       - qa-approve:
           name: Approved by QA team

electron-builder.json

@@ -1,5 +1,5 @@
 {
-  "productName": "RedisInsight-preview",
+  "productName": "RedisInsight-V2",
   "appId": "org.RedisLabs.RedisInsight-V2",
   "copyright": "Copyright © 2021 Redis Ltd.",
   "files": [
@@ -12,7 +12,7 @@
     "package.json"
   ],
   "afterSign": "electron-builder-notarize",
-  "artifactName": "${productName}.${ext}",
+  "artifactName": "${productName}-${os}-${arch}.${ext}",
   "compression": "normal",
   "mac": {
     "target": [
@@ -32,7 +32,6 @@
     "gatekeeperAssess": false
   },
   "dmg": {
-    "artifactName": "${productName}-${os}-${arch}.${ext}",
     "contents": [
       {
         "x": 130,
@@ -54,21 +53,21 @@
     "icon": "./resources/icons",
     "target": [
       {
-        "target": "zip",
+        "target": "AppImage",
         "arch": ["x64"]
       },
       {
         "target": "deb",
         "arch": ["x64"]
       },
       {
-        "target": "AppImage",
+        "target": "rpm",
         "arch": ["x64"]
       }
     ],
     "synopsis": "Redis GUI by Redis Ltd.",
     "category": "Development",
-    "artifactName": "${productName}-${os}.${ext}",
+    "artifactName": "${productName}-${os}-${arch}.${ext}",
     "desktop": {
       "Name": "RedisInsight",
       "Type": "Application",

redisinsight/about-panel.ts

@@ -6,7 +6,7 @@ const ICON_PATH = app.isPackaged
   : path.join(__dirname, '../resources', 'icon.png');
 
 export default {
-  applicationName: 'RedisInsight-preview',
+  applicationName: 'RedisInsight',
   applicationVersion: app.getVersion() || '2.0',
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,

redisinsight/api/package.json

@@ -11,7 +11,8 @@
   "scripts": {
     "build:defaults:commands": "ts-node ./scripts/default-commands.ts",
     "build:defaults:enablement-area": "ts-node ./scripts/default-enablement-area.ts",
-    "build:defaults": "yarn build:defaults:enablement-area && yarn build:defaults:commands",
+    "build:defaults:content": "ts-node ./scripts/default-content.ts",
+    "build:defaults": "yarn build:defaults:enablement-area && yarn build:defaults:commands yarn build:defaults:content",
     "prebuild": "rimraf dist",
     "build": "nest build",
     "build:prod": "rimraf dist && nest build -p ./tsconfig.build.prod.json && cross-env NODE_ENV=production",

redisinsight/api/scripts/default-content.ts

@@ -0,0 +1,54 @@
+import axios from 'axios';
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import { join } from 'path';
+import { get } from '../src/utils/config';
+import * as AdmZip from 'adm-zip';
+
+const PATH_CONFIG = get('dir_path');
+const CONTENT_CONFIG = get('content');
+
+async function init() {
+  try {
+    await fs.remove(PATH_CONFIG.defaultContent);
+
+    await fs.ensureDir(PATH_CONFIG.defaultContent);
+
+    const { data } = await axios.get(
+      new URL(path.join(
+        CONTENT_CONFIG.updateUrl,
+        CONTENT_CONFIG.zip,
+      )).toString(),
+      {
+        responseType: 'arraybuffer',
+      },
+    );
+
+    // extract archive to default folder
+    const zip = new AdmZip(data);
+    zip.extractAllTo(PATH_CONFIG.defaultContent, true);
+
+    const { data: buildInfo } = await axios.get(
+      new URL(path.join(
+        CONTENT_CONFIG.updateUrl,
+        CONTENT_CONFIG.buildInfo,
+      )).toString(),
+      {
+        responseType: 'arraybuffer',
+      },
+    );
+
+    // save build info to default folder
+    await fs.writeFile(
+      join(PATH_CONFIG.defaultContent, CONTENT_CONFIG.buildInfo),
+      buildInfo,
+    );
+
+    process.exit(0);
+  } catch (e) {
+    console.error('Something went wrong trying to get default commands jsons', e);
+    process.exit(1);
+  }
+}
+
+init();

redisinsight/main.dev.ts

@@ -126,7 +126,7 @@ const bootstrap = async () => {
   }
 
   app.setName('RedisInsight');
-  app.setAppUserModelId('RedisInsight-preview');
+  app.setAppUserModelId('RedisInsight');
   if (process.platform !== 'darwin') {
     app.setAboutPanelOptions(AboutPanelOptions);
   }

redisinsight/package.json

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.0.4-preview",
+  "version": "2.0.5",
   "description": "RedisInsight",
   "main": "./main.prod.js",
   "author": {

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -32,19 +32,19 @@ import QueryCardTooltip from '../QueryCardTooltip'
 import styles from './styles.module.scss'
 
 export interface Props {
-  query: string;
-  isOpen: boolean;
-  isFullScreen: boolean;
-  createdAt?: Date;
-  summaryText?: string;
-  queryType: WBQueryType;
-  selectedValue: string;
-  loading?: boolean;
-  toggleOpen: () => void;
-  toggleFullScreen: () => void;
-  setSelectedValue: (type: WBQueryType, value: string) => void;
-  onQueryDelete: () => void;
-  onQueryReRun: () => void;
+  query: string
+  isOpen: boolean
+  isFullScreen: boolean
+  createdAt?: Date
+  summaryText?: string
+  queryType: WBQueryType
+  selectedValue: string
+  loading?: boolean
+  toggleOpen: () => void
+  toggleFullScreen: () => void
+  setSelectedValue: (type: WBQueryType, value: string) => void
+  onQueryDelete: () => void
+  onQueryReRun: () => void
 }
 
 const QueryCardHeader = (props: Props) => {

redisinsight/ui/src/pages/instance/InstancePage.tsx

@@ -5,8 +5,8 @@ import { useParams } from 'react-router-dom'
 import cx from 'classnames'
 
 import {
-  fetchInstanceAction,
-  getDatabaseConfigInfoAction,
+  fetchInstanceAction, fetchInstancesAction,
+  getDatabaseConfigInfoAction, instancesSelector,
 } from 'uiSrc/slices/instances'
 import {
   appContextSelector,
@@ -53,13 +53,16 @@ const InstancePage = ({ routes = [] }: Props) => {
   const dispatch = useDispatch()
   const { instanceId: connectionInstanceId } = useParams<{ instanceId: string }>()
   const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector)
+  const { data: modulesData } = useSelector(instancesSelector)
   const { isShowMonitor } = useSelector(monitorSelector)
   const { contextInstanceId } = useSelector(appContextSelector)
 
   const isShowBottomGroup = isShowCli || isShowHelper || isShowMonitor
 
   useEffect(() => {
-    dispatch(fetchInstanceAction(connectionInstanceId))
+    dispatch(fetchInstanceAction(connectionInstanceId, () => {
+      !modulesData.length && dispatch(fetchInstancesAction())
+    }))
     dispatch(getDatabaseConfigInfoAction(connectionInstanceId))
 
     if (contextInstanceId !== connectionInstanceId) {

redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx

@@ -3,18 +3,18 @@ import cx from 'classnames'
 import { EuiIcon, EuiText } from '@elastic/eui'
 
 import { Theme } from 'uiSrc/constants'
+import { Nullable } from 'uiSrc/utils'
 import QueryCard from 'uiSrc/components/query-card'
-import { WBQueryType } from 'uiSrc/pages/workbench/constants'
 import { CommandExecutionUI } from 'uiSrc/slices/interfaces'
 import { ThemeContext } from 'uiSrc/contexts/themeContext'
 import MultiPlayIconDark from 'uiSrc/assets/img/multi_play_icon_dark.svg'
 import MultiPlayIconLight from 'uiSrc/assets/img/multi_play_icon_light.svg'
 import styles from './styles.module.scss'
 
 export interface Props {
-  items: CommandExecutionUI[];
-  scrollDivRef: React.Ref<HTMLDivElement>;
-  onQueryReRun: (query: string, commandId?: string, type?: WBQueryType) => void;
+  items: CommandExecutionUI[]
+  scrollDivRef: React.Ref<HTMLDivElement>
+  onQueryReRun: (query: string, commandId?: Nullable<string>, clearEditor?: boolean) => void
   onQueryDelete: (commandId: string) => void
   onQueryOpen: (commandId: string) => void
 }
@@ -48,7 +48,7 @@ const WBResults = ({ items = [], onQueryReRun, onQueryDelete, onQueryOpen, scrol
           command={command}
           createdAt={createdAt}
           onQueryOpen={() => onQueryOpen(id)}
-          onQueryReRun={() => onQueryReRun(command)}
+          onQueryReRun={() => onQueryReRun(command, null, false)}
           onQueryDelete={() => onQueryDelete(id)}
         />
       ))}