From ca73ba312e0d22cf795eb713c89311bc081a5303 Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Thu, 20 Jul 2023 15:52:33 +0200 Subject: [PATCH 1/6] release 2.30.0 candidate --- electron-builder.json | 2 +- redisinsight/api/config/default.ts | 2 +- redisinsight/api/config/swagger.ts | 2 +- redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts | 2 +- redisinsight/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/electron-builder.json b/electron-builder.json index c72a699725..e267ab26fa 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -29,7 +29,7 @@ "type": "distribution", "hardenedRuntime": true, "darkModeSupport": true, - "bundleVersion": "50", + "bundleVersion": "60", "icon": "resources/icon.icns", "artifactName": "${productName}-${os}-${arch}.${ext}", "entitlements": "resources/entitlements.mac.plist", diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts index 6c3af8d7b1..6b0cc6990b 100644 --- a/redisinsight/api/config/default.ts +++ b/redisinsight/api/config/default.ts @@ -58,7 +58,7 @@ export default { tlsKey: process.env.SERVER_TLS_KEY, staticContent: !!process.env.SERVER_STATIC_CONTENT || false, buildType: process.env.BUILD_TYPE || 'ELECTRON', - appVersion: process.env.APP_VERSION || '2.28.1', + appVersion: process.env.APP_VERSION || '2.30.0', requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000, excludeRoutes: [], excludeAuthRoutes: [], diff --git a/redisinsight/api/config/swagger.ts b/redisinsight/api/config/swagger.ts index 0cf2aa7836..c1a63c58bc 100644 --- a/redisinsight/api/config/swagger.ts +++ b/redisinsight/api/config/swagger.ts @@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit = { info: { title: 'RedisInsight Backend API', description: 'RedisInsight Backend API', - version: '2.28.1', + version: '2.30.0', }, tags: [], }; diff --git a/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts b/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts index 4c24204095..82adf48856 100644 --- 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: 'RedisInsight-v2', - applicationVersion: `${app.getVersion() || '2.28.1'}${ + applicationVersion: `${app.getVersion() || '2.30.0'}${ !config.isProduction ? `-dev-${process.getCreationTime()}` : '' }`, copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`, diff --git a/redisinsight/package.json b/redisinsight/package.json index 8d9e6d9ff0..90ae4bcc1e 100644 --- a/redisinsight/package.json +++ b/redisinsight/package.json @@ -2,7 +2,7 @@ "name": "redisinsight", "productName": "RedisInsight", "private": true, - "version": "2.28.1", + "version": "2.30.0", "description": "RedisInsight", "main": "./dist/main/main.js", "author": { From b791f99b494ea55deff41a938f34ca01c369a0dc Mon Sep 17 00:00:00 2001 From: Amir Allayarov Date: Mon, 24 Jul 2023 14:24:25 +0800 Subject: [PATCH 2/6] #RI-4778 - fix loading functions and libraries list --- .../pages/Functions/FunctionsPage.spec.tsx | 10 ++++++++ .../pages/Functions/FunctionsPage.tsx | 24 ++++++++++--------- .../pages/Libraries/LibrariesPage.spec.tsx | 10 ++++++++ .../pages/Libraries/LibrariesPage.tsx | 24 ++++++++++--------- 4 files changed, 46 insertions(+), 22 deletions(-) diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx index 873e3b70b0..e86a7950c1 100644 --- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx +++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.spec.tsx @@ -161,4 +161,14 @@ describe('FunctionsPage', () => { expect(pushMock) .toBeCalledWith(Pages.triggeredFunctionsLibraries('instanceId')) }) + + it('should not render functions list', () => { + (triggeredFunctionsFunctionsSelector as jest.Mock).mockReturnValueOnce({ + data: null, + loading: false + }) + const { queryByTestId } = render() + + expect(queryByTestId('total-functions')).not.toBeInTheDocument() + }) }) diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx index 54bbd7c002..cd6a39f5ce 100644 --- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx +++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx @@ -3,7 +3,7 @@ import { EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiResiza import { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router-dom' import cx from 'classnames' -import { find, pick } from 'lodash' +import { find, isNull, pick } from 'lodash' import { fetchTriggeredFunctionsFunctionsList, setSelectedFunctionToShow, @@ -164,16 +164,18 @@ const FunctionsPage = () => { )} - + {!isNull(functions) && ( + + )} { expect(screen.queryByTestId('lib-details-lib1')).not.toBeInTheDocument() }) + + it('should not render libraries list', () => { + (triggeredFunctionsLibrariesSelector as jest.Mock).mockReturnValueOnce({ + data: null, + loading: false + }) + const { queryByTestId } = render() + + expect(queryByTestId('total-libraries')).not.toBeInTheDocument() + }) }) diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx index 5a53914b91..a5260f218b 100644 --- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx +++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Libraries/LibrariesPage.tsx @@ -240,17 +240,19 @@ const LibrariesPage = () => { )} - + {!isNull(libraries) && ( + + )} Date: Mon, 24 Jul 2023 20:03:37 +0800 Subject: [PATCH 3/6] #RI-4778 - fix loading and image --- .../ui/src/assets/img/triggers_and_functions_dark.svg | 2 +- .../ui/src/assets/img/triggers_and_functions_light.svg | 2 +- .../triggeredFunctions/pages/Functions/FunctionsPage.tsx | 6 +++++- .../triggeredFunctions/pages/Libraries/LibrariesPage.tsx | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg b/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg index 198f36f814..01419faea7 100644 --- a/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg +++ b/redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg @@ -1,4 +1,4 @@ - + diff --git a/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg b/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg index 5ae9fe1e06..7a26127835 100644 --- a/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg +++ b/redisinsight/ui/src/assets/img/triggers_and_functions_light.svg @@ -1,4 +1,4 @@ - + diff --git a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx index cd6a39f5ce..682b72908a 100644 --- a/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx +++ b/redisinsight/ui/src/pages/triggeredFunctions/pages/Functions/FunctionsPage.tsx @@ -114,6 +114,10 @@ const FunctionsPage = () => { ? NoFunctionsMessage : () + if (!instanceId) { + return null + } + return ( { )} - {!isNull(functions) && ( + {(!isModuleLoaded || !isNull(functions)) && ( { )} - {!isNull(libraries) && ( + {(!isModuleLoaded || !isNull(libraries)) && ( Date: Mon, 24 Jul 2023 21:55:18 +0200 Subject: [PATCH 4/6] update bundle version --- electron-builder.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron-builder.json b/electron-builder.json index e267ab26fa..dc87c24635 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -29,7 +29,7 @@ "type": "distribution", "hardenedRuntime": true, "darkModeSupport": true, - "bundleVersion": "60", + "bundleVersion": "70", "icon": "resources/icon.icns", "artifactName": "${productName}-${os}-${arch}.${ext}", "entitlements": "resources/entitlements.mac.plist", From edf41629d70b58572f2427ffa91b81b666cda6b4 Mon Sep 17 00:00:00 2001 From: Amir Allayarov Date: Tue, 25 Jul 2023 19:19:24 +0800 Subject: [PATCH 5/6] #RI-4780 - update links --- .../components/MoreInfoPopover/MoreInfoPopover.tsx | 2 +- .../messages/filter-not-available/FilterNotAvailable.tsx | 2 +- .../components/onboarding-features/OnboardingFeatures.tsx | 2 +- redisinsight/ui/src/constants/links.ts | 2 +- redisinsight/ui/src/constants/workbenchResults.ts | 8 ++++---- .../recommendations-view/Recommendations.spec.tsx | 2 +- .../InstanceForm/form-components/Messages.tsx | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx index cb23e1c82b..86336360f0 100644 --- a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx +++ b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx @@ -12,7 +12,7 @@ import { IMetric } from '../OverviewMetrics' import './styles.scss' import styles from './styles.module.scss' -const ModulesInfoText = 'More information about Redis modules can be found here.\nCreate a free Redis database with modules support on Redis Cloud.\n' +const ModulesInfoText = 'More information about Redis modules can be found here.\nCreate a free Redis database with modules support on Redis Cloud.\n' interface IProps { metrics: Array, diff --git a/redisinsight/ui/src/components/messages/filter-not-available/FilterNotAvailable.tsx b/redisinsight/ui/src/components/messages/filter-not-available/FilterNotAvailable.tsx index 0e2e8a1b12..f7d10e92a3 100644 --- a/redisinsight/ui/src/components/messages/filter-not-available/FilterNotAvailable.tsx +++ b/redisinsight/ui/src/components/messages/filter-not-available/FilterNotAvailable.tsx @@ -6,7 +6,7 @@ import RedisDbBlueIcon from 'uiSrc/assets/img/icons/redis_db_blue.svg' import styles from './styles.module.scss' const GET_STARTED_LINK = 'https://redis.com/try-free/?utm_source=redisinsight&utm_medium=main&utm_campaign=browser_filter' -const LEARN_MORE_LINK = 'https://redis.io/docs/stack/about/?utm_source=redisinsight&utm_medium=main&utm_campaign=browser_filter' +const LEARN_MORE_LINK = 'https://redis.io/docs/about/about-stack/?utm_source=redisinsight&utm_medium=main&utm_campaign=browser_filter' const FilterNotAvailable = () => (
diff --git a/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx b/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx index d0d29a9478..7f8c364cad 100644 --- a/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx +++ b/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx @@ -212,7 +212,7 @@ const ONBOARDING_FEATURES = { Take advantage of syntax highlighting, intelligent auto-complete, and working with commands in editor mode. - Workbench visualizes complex Redis Stack data + Workbench visualizes complex Redis Stack data models such as documents, graphs, and time series. Or you can build your own visualization. diff --git a/redisinsight/ui/src/constants/links.ts b/redisinsight/ui/src/constants/links.ts index 01530e4648..8520927391 100644 --- a/redisinsight/ui/src/constants/links.ts +++ b/redisinsight/ui/src/constants/links.ts @@ -5,5 +5,5 @@ export const EXTERNAL_LINKS = { userSurvey: 'https://www.surveymonkey.com/r/redisinsight', recommendationFeedback: 'https://github.com/RedisInsight/RedisInsight/issues/new/choose', guidesRepo: 'https://github.com/RedisInsight/Tutorials', - redisStack: 'https://redis.io/docs/stack/', + redisStack: 'https://redis.io/docs/about/about-stack/', } diff --git a/redisinsight/ui/src/constants/workbenchResults.ts b/redisinsight/ui/src/constants/workbenchResults.ts index fca59a87f9..199523d21c 100644 --- a/redisinsight/ui/src/constants/workbenchResults.ts +++ b/redisinsight/ui/src/constants/workbenchResults.ts @@ -12,7 +12,7 @@ export const MODULE_NOT_LOADED_CONTENT: { [key in RedisDefaultModules]?: any } = 'Perform cross-time-series range and aggregation queries', 'Define compaction rules for economical retention of historical data' ], - link: 'https://redis.io/docs/stack/timeseries/' + link: 'https://redis.io/docs/data-types/timeseries/' }, [RedisDefaultModules.Search]: { text: ['RediSearch adds the capability to:'], @@ -22,7 +22,7 @@ export const MODULE_NOT_LOADED_CONTENT: { [key in RedisDefaultModules]?: any } = 'Full-text search' ], additionalText: ['These features enable multi-field queries, aggregation, exact phrase matching, numeric filtering, ', 'geo filtering and vector similarity semantic search on top of text queries.'], - link: 'https://redis.io/docs/stack/search/' + link: 'https://redis.io/docs/interact/search-and-query/' }, [RedisDefaultModules.ReJSON]: { text: ['RedisJSON adds the capability to:'], @@ -32,7 +32,7 @@ export const MODULE_NOT_LOADED_CONTENT: { [key in RedisDefaultModules]?: any } = 'Retrieve JSON documents' ], additionalText: ['RedisJSON also works seamlessly with RediSearch to let you index and query JSON documents.'], - link: 'https://redis.io/docs/stack/json/' + link: 'https://redis.io/docs/data-types/json/' }, [RedisDefaultModules.Bloom]: { text: ['RedisBloom adds a set of probabilistic data structures to Redis, including:'], @@ -44,7 +44,7 @@ export const MODULE_NOT_LOADED_CONTENT: { [key in RedisDefaultModules]?: any } = 'T-digest' ], additionalText: ['With this capability you can query streaming data without needing to store all the elements of the stream.'], - link: 'https://redis.io/docs/stack/bloom/' + link: 'https://redis.io/docs/data-types/probabilistic/bloom-filter/' }, [RedisDefaultModules.RedisGears]: { text: ['Triggers and functions add the capability to execute server-side functions that are triggered by events or data operations to:'], diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.spec.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.spec.tsx index bdfd5ecc21..99ba6e3532 100644 --- a/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.spec.tsx +++ b/redisinsight/ui/src/pages/databaseAnalysis/components/recommendations-view/Recommendations.spec.tsx @@ -430,7 +430,7 @@ describe('Recommendations', () => { render() expect(screen.queryByTestId('bigSets-redis-stack-link')).toBeInTheDocument() - expect(screen.queryByTestId('bigSets-redis-stack-link')).toHaveAttribute('href', 'https://redis.io/docs/stack/') + expect(screen.queryByTestId('bigSets-redis-stack-link')).toHaveAttribute('href', 'https://redis.io/docs/about/about-stack/') }) it('should render go tutorial button', () => { diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/Messages.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/Messages.tsx index 93a82e9156..cce51f1b2a 100644 --- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/Messages.tsx +++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/form-components/Messages.tsx @@ -33,7 +33,7 @@ const MessageSentinel = () => ( .   Date: Tue, 25 Jul 2023 14:14:06 +0200 Subject: [PATCH 6/6] fix --- redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts b/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts index 019c6dab08..4dd7c5988c 100644 --- a/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts +++ b/redisinsight/ui/src/electron/utils/ipcDeleteStoreValues.ts @@ -1,5 +1,5 @@ import { ElectronStorageItem, IpcEvent } from 'uiSrc/electron/constants' export const ipcDeleteDownloadedVersion = async () => { - await window.electron.ipcRenderer.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloadedVersion) + await window.app.ipc.invoke(IpcEvent.deleteStoreValue, ElectronStorageItem.updateDownloadedVersion) }