Merge pull request #2645 from RedisInsight/latest

vlad-dargel · web-flow · commit f14173324160 · 2023-09-28T14:14:48.000+02:00
Latest to main
diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts
@@ -61,7 +61,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.32.0',
+    appVersion: process.env.APP_VERSION || '2.34.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
diff --git a/redisinsight/api/config/features-config.json b/redisinsight/api/config/features-config.json
@@ -1,5 +1,5 @@
 {
-  "version": 2.34,
+  "version": 2.3401,
   "features": {
     "insightsRecommendations": {
       "flag": true,
@@ -28,6 +28,11 @@
         }
       ],
       "data": {
+        "filterFreePlan": [{
+          "field": "name",
+          "expression": "^(No HA?.)|(Cache?.)",
+          "options": "i"
+        }],
         "selectPlan": {
           "components": {
             "triggersAndFunctions": [
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: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.32.0',
+    version: '2.34.0',
   },
   tags: [],
 };
diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.32.0",
+  "version": "2.34.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {
diff --git a/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.ts b/redisinsight/api/src/modules/cloud/auth/cloud-auth.analytics.ts
@@ -15,6 +15,10 @@ export class CloudAuthAnalytics extends TelemetryBaseService {
   }
 
   sendCloudSignInFailed(exception: HttpException, flow?: CloudSsoFeatureStrategy, action?: string) {
-    this.sendFailedEvent(TelemetryEvents.CloudSignInFailed, exception, { flow, action });
+    this.sendFailedEvent(TelemetryEvents.CloudSignInFailed, exception, {
+      flow,
+      action,
+      errorDescription: exception?.['options']?.['description'],
+    });
   }
 }
diff --git a/redisinsight/api/src/modules/cloud/auth/cloud-auth.service.ts b/redisinsight/api/src/modules/cloud/auth/cloud-auth.service.ts
@@ -33,10 +33,14 @@ export class CloudAuthService {
 
   static getAuthorizationServerRedirectError(query: { error_description: string }) {
     if (query?.error_description?.indexOf('properties are missing') > -1) {
-      return new CloudOauthMissedRequiredDataException(query.error_description);
+      return new CloudOauthMissedRequiredDataException(query.error_description, {
+        description: query.error_description,
+      });
     }
 
-    return new CloudOauthMisconfigurationException();
+    return new CloudOauthMisconfigurationException(undefined, {
+      description: query.error_description,
+    });
   }
 
   getAuthStrategy(strategy: CloudAuthIdpType): CloudAuthStrategy {
diff --git a/redisinsight/api/src/modules/cloud/auth/exceptions/cloud-oauth.unknown-authorization-request.exception.ts b/redisinsight/api/src/modules/cloud/auth/exceptions/cloud-oauth.unknown-authorization-request.exception.ts
@@ -7,7 +7,7 @@ export class CloudOauthUnknownAuthorizationRequestException extends HttpExceptio
     const response = {
       message,
       statusCode: HttpStatus.BAD_REQUEST,
-      error: 'CloudOauthGithubEmailPermission',
+      error: 'CloudOauthUnknownAuthorizationRequest',
       errorCode: CustomErrorCodes.CloudOauthUnknownAuthorizationRequest,
     };
 
diff --git a/redisinsight/api/src/modules/cloud/common/providers/cloud.capi.provider.spec.ts b/redisinsight/api/src/modules/cloud/common/providers/cloud.capi.provider.spec.ts
@@ -1,7 +1,10 @@
 import { ICloudCapiCredentials } from 'src/modules/cloud/common/models';
 import { CloudSubscriptionType } from 'src/modules/cloud/subscription/models';
+import config from 'src/utils/config';
 import { CloudCapiProvider } from './cloud.capi.provider';
 
+const serverConfig = config.get('server');
+
 const getPrefixTests = [
   {
     input: undefined,
@@ -17,22 +20,24 @@ const getPrefixTests = [
   },
 ];
 
+const userAgent = `RedisInsight/${serverConfig.version}`;
+
 const getHeadersTests = [
   {
     input: {},
-    expected: { 'x-api-key': undefined, 'x-api-secret-key': undefined, 'User-Agent': 'RedisInsight/2.32.0' },
+    expected: { 'x-api-key': undefined, 'x-api-secret-key': undefined, 'User-Agent': userAgent },
   },
   {
     input: { capiKey: 'key' },
-    expected: { 'x-api-key': 'key', 'x-api-secret-key': undefined, 'User-Agent': 'RedisInsight/2.32.0' },
+    expected: { 'x-api-key': 'key', 'x-api-secret-key': undefined, 'User-Agent': userAgent },
   },
   {
     input: { capiSecret: 'secret' },
-    expected: { 'x-api-key': undefined, 'x-api-secret-key': 'secret', 'User-Agent': 'RedisInsight/2.32.0' },
+    expected: { 'x-api-key': undefined, 'x-api-secret-key': 'secret', 'User-Agent': userAgent },
   },
   {
     input: { capiKey: 'key', capiSecret: 'secret' },
-    expected: { 'x-api-key': 'key', 'x-api-secret-key': 'secret', 'User-Agent': 'RedisInsight/2.32.0' },
+    expected: { 'x-api-key': 'key', 'x-api-secret-key': 'secret', 'User-Agent': userAgent },
   },
 ];
 
diff --git a/redisinsight/api/src/modules/cloud/subscription/cloud-subscription.api.service.spec.ts b/redisinsight/api/src/modules/cloud/subscription/cloud-subscription.api.service.spec.ts
@@ -5,24 +5,24 @@ import {
   mockCloudSubscriptionApiProvider,
   mockCloudSubscriptionCapiService,
   mockCloudSubscriptionRegions,
+  mockFeatureService,
   mockSessionMetadata,
   mockSubscriptionPlanResponse,
   MockType,
 } from 'src/__mocks__';
 import { CloudApiUnauthorizedException } from 'src/modules/cloud/common/exceptions';
 import { CloudCapiKeyService } from 'src/modules/cloud/capi-key/cloud-capi-key.service';
+import { FeatureService } from 'src/modules/feature/feature.service';
 import { CloudSubscriptionApiService } from './cloud-subscription.api.service';
-import { CloudUserApiService } from '../user/cloud-user.api.service';
 import { CloudSessionService } from '../session/cloud-session.service';
 import { CloudSubscriptionCapiService } from './cloud-subscription.capi.service';
 import { CloudSubscriptionApiProvider } from './providers/cloud-subscription.api.provider';
 
 describe('CloudSubscriptionApiService', () => {
   let service: CloudSubscriptionApiService;
   let api: MockType<CloudSubscriptionApiProvider>;
-  let sessionService: MockType<CloudSessionService>;
-  let cloudUserApiService: MockType<CloudUserApiService>;
-  let cloudSubscriptionCapiService: MockType<CloudSubscriptionCapiService>;
+  let capi: MockType<CloudSubscriptionCapiService>;
+  let featureService: MockType<FeatureService>;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -44,11 +44,17 @@ describe('CloudSubscriptionApiService', () => {
           provide: CloudCapiKeyService,
           useFactory: mockCloudCapiKeyService,
         },
+        {
+          provide: FeatureService,
+          useFactory: mockFeatureService,
+        },
       ],
     }).compile();
 
     service = module.get(CloudSubscriptionApiService);
     api = module.get(CloudSubscriptionApiProvider);
+    capi = module.get(CloudSubscriptionCapiService);
+    featureService = module.get(FeatureService);
   });
 
   describe('getSubscriptionPlans', () => {
@@ -61,6 +67,55 @@ describe('CloudSubscriptionApiService', () => {
         CloudApiUnauthorizedException,
       );
     });
+
+    describe('filter', () => {
+      beforeEach(() => {
+        featureService.getByName.mockResolvedValueOnce({
+          flag: true,
+          data: {
+            filterFreePlan: [{
+              field: 'name',
+              expression: '^(No HA?.)|(Cache?.)',
+              options: 'i',
+            }],
+          },
+        });
+      });
+
+      it('get empty list due to filter', async () => {
+        capi.getSubscriptionsPlans.mockResolvedValueOnce([
+          { name: 'some name', price: 0 },
+        ]);
+        expect(await service.getSubscriptionPlans(mockSessionMetadata)).toEqual([]);
+      });
+
+      it('filter only "no ha" and "cache" plans', async () => {
+        capi.getSubscriptionsPlans.mockResolvedValueOnce([
+          { name: 'some name', price: 0 },
+          { name: 'no thing', price: 0 },
+          { name: 'No HA', price: 0 },
+          { name: 'No HA 30MB price:0', price: 0 },
+          { name: 'No HA 30MB price:1', price: 1 },
+          { name: 'no ha 30MB', price: 0 },
+          { name: 'no ha', price: 0 },
+          { name: 'Cache', price: 0 },
+          { name: 'Cache 30MB', price: 0 },
+          { name: 'cache', price: 0 },
+          { name: 'cache 30MB', price: 0 },
+          { name: '', price: 0 },
+        ]);
+        expect(await service.getSubscriptionPlans(mockSessionMetadata)).toEqual([
+          { name: 'No HA', price: 0 },
+          { name: 'No HA 30MB price:0', price: 0 },
+          { name: 'no ha 30MB', price: 0 },
+          { name: 'no ha', price: 0 },
+          { name: 'Cache', price: 0 },
+          { name: 'Cache 30MB', price: 0 },
+          { name: 'cache', price: 0 },
+          { name: 'cache 30MB', price: 0 },
+        ]);
+      });
+    });
   });
 
   describe('getCloudRegions', () => {
diff --git a/redisinsight/api/src/modules/cloud/subscription/cloud-subscription.api.service.ts b/redisinsight/api/src/modules/cloud/subscription/cloud-subscription.api.service.ts
@@ -4,6 +4,8 @@ import { SessionMetadata } from 'src/common/models';
 import { wrapHttpError } from 'src/common/utils';
 import { CloudRequestUtm, ICloudApiCredentials } from 'src/modules/cloud/common/models';
 import { CloudCapiKeyService } from 'src/modules/cloud/capi-key/cloud-capi-key.service';
+import { FeatureService } from 'src/modules/feature/feature.service';
+import { KnownFeatures } from 'src/modules/feature/constants';
 import { CloudSubscriptionCapiService } from './cloud-subscription.capi.service';
 import { CloudSubscriptionRegion, CloudSubscriptionType } from './models';
 import { CloudSessionService } from '../session/cloud-session.service';
@@ -20,6 +22,7 @@ export class CloudSubscriptionApiService {
     private readonly sessionService: CloudSessionService,
     private readonly cloudCapiKeyService: CloudCapiKeyService,
     private readonly cloudSubscriptionCapiService: CloudSubscriptionCapiService,
+    private readonly featureService: FeatureService,
   ) {}
 
   /**
@@ -42,9 +45,22 @@ export class CloudSubscriptionApiService {
         ),
       ]);
 
+      const cloudSsoFeature = await this.featureService.getByName(KnownFeatures.CloudSso);
+
       const freePlans = filter(
         fixedPlans,
-        ({ price, name }) => price === 0 && name.startsWith('Cache'),
+        (plan) => {
+          if (plan.price !== 0) {
+            return false;
+          }
+
+          if (!cloudSsoFeature?.data?.filterFreePlan?.length) {
+            return true;
+          }
+
+          return !!((cloudSsoFeature?.data?.filterFreePlan).find((f) => f.expression
+            && (new RegExp(f.expression, f.options)).test(plan[f?.field])));
+        },
       );
 
       return freePlans.map((plan) => ({
diff --git a/redisinsight/desktop/app.ts b/redisinsight/desktop/app.ts
@@ -13,10 +13,12 @@ import {
   initAutoUpdaterHandlers,
   launchApiServer,
   initCloudHandlers,
+  electronStore,
 } from 'desktopSrc/lib'
 import { wrapErrorMessageSensitiveData } from 'desktopSrc/utils'
 import { configMain as config } from 'desktopSrc/config'
 import { deepLinkHandler, deepLinkWindowHandler } from 'desktopSrc/lib/app/deep-link.handlers'
+import { ElectronStorageItem } from 'uiSrc/electron/constants'
 
 if (!config.isProduction) {
   const sourceMapSupport = require('source-map-support')
@@ -33,6 +35,8 @@ const init = async () => {
   initTray()
   initCloudHandlers()
 
+  nativeTheme.themeSource = electronStore?.get(ElectronStorageItem.themeSource) || config.themeSource
+
   checkForUpdate(process.env.MANUAL_UPGRADES_LINK || process.env.UPGRADES_LINK)
 
   app.setName(config.name)
diff --git a/redisinsight/desktop/config.json b/redisinsight/desktop/config.json
@@ -3,6 +3,7 @@
   "defaultPort": 5530,
   "host": "localhost",
   "debug": false,
+  "themeSource": "dark",
   "appName": "RedisInsight",
   "schema": "redisinsight",
   "mainWindow": {
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: 'RedisInsight-v2',
-  applicationVersion: `${app.getVersion() || '2.32.0'}${
+  applicationVersion: `${app.getVersion() || '2.34.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
diff --git a/redisinsight/desktop/src/lib/app/ipc.handlers.ts b/redisinsight/desktop/src/lib/app/ipc.handlers.ts
@@ -1,6 +1,6 @@
 import { app, ipcMain, nativeTheme } from 'electron'
 import { electronStore } from 'desktopSrc/lib'
-import { IpcInvokeEvent } from 'uiSrc/electron/constants'
+import { ElectronStorageItem, IpcInvokeEvent } from 'uiSrc/electron/constants'
 
 export const initIPCHandlers = () => {
   ipcMain.handle(IpcInvokeEvent.getAppVersion, () => app?.getVersion())
@@ -10,6 +10,9 @@ export const initIPCHandlers = () => {
   ipcMain.handle(IpcInvokeEvent.deleteStoreValue, (_event, key) => electronStore?.delete(key))
 
   ipcMain.handle(IpcInvokeEvent.themeChange, (_event, theme: string) => {
-    nativeTheme.themeSource = theme.toLowerCase()
+    const themeSource = theme.toLowerCase() as typeof nativeTheme.themeSource
+
+    nativeTheme.themeSource = themeSource
+    electronStore?.set(ElectronStorageItem.themeSource, themeSource)
   })
 }
diff --git a/redisinsight/package.json b/redisinsight/package.json
@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.32.0",
+  "version": "2.34.0",
   "description": "RedisInsight",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx b/redisinsight/ui/src/components/notifications/components/infinite-messages/InfiniteMessages.tsx
@@ -104,6 +104,7 @@ export const INFINITE_MESSAGES = {
             <EuiButton
               size="s"
               color="secondary"
+              className="infiniteMessage__btn"
               onClick={() => onClose?.()}
               data-testid="cancel-import-db-sso-btn"
             >
@@ -144,6 +145,7 @@ export const INFINITE_MESSAGES = {
             <EuiButton
               size="s"
               color="secondary"
+              className="infiniteMessage__btn"
               onClick={() => onClose?.()}
               data-testid="cancel-create-subscription-sso-btn"
             >
diff --git a/redisinsight/ui/src/components/notifications/styles.module.scss b/redisinsight/ui/src/components/notifications/styles.module.scss
@@ -62,5 +62,9 @@
       margin-right: 8px;
       margin-top: 2px;
     }
+
+    .infiniteMessage__btn .euiButton__text {
+      color: var(--euiColorSecondaryText) !important;
+    }
   }
 }
diff --git a/redisinsight/ui/src/constants/featuresHighlighting.tsx b/redisinsight/ui/src/constants/featuresHighlighting.tsx
@@ -12,7 +12,5 @@ interface BuildHighlightingFeature {
 }
 
 export const BUILD_FEATURES: Record<string, BuildHighlightingFeature> = {
-  cloudButton: {
-    type: 'plain'
-  }
+
 } as const
diff --git a/redisinsight/ui/src/contexts/themeContext.tsx b/redisinsight/ui/src/contexts/themeContext.tsx
@@ -9,7 +9,7 @@ interface Props {
 const THEME_NAMES = THEMES.map(({ value }) => value)
 
 export const defaultState = {
-  theme: THEME_NAMES[0],
+  theme: THEME_NAMES[1], // dark theme by default
   usingSystemTheme: localStorageService.get(BrowserStorageItem.theme) === Theme.System,
   changeTheme: (themeValue: any) => {
     themeService.applyTheme(themeValue)
@@ -36,7 +36,7 @@ export class ThemeProvider extends React.Component<Props> {
     }
   }
 
-  getSystemTheme = () => window.matchMedia && window.matchMedia(THEME_MATCH_MEDIA_DARK).matches ? Theme.Dark : Theme.Light
+  getSystemTheme = () => (window.matchMedia && window.matchMedia(THEME_MATCH_MEDIA_DARK).matches ? Theme.Dark : Theme.Light)
 
   changeTheme = (themeValue: any) => {
     let actualTheme = themeValue
diff --git a/redisinsight/ui/src/electron/constants/storageElectron.ts b/redisinsight/ui/src/electron/constants/storageElectron.ts
@@ -6,6 +6,7 @@ enum ElectronStorageItem {
   isDisplayAppInTray = 'isDisplayAppInTray',
   updatePreviousVersion = 'updatePreviousVersion',
   zoomFactor = 'zoomFactor',
+  themeSource = 'themeSource',
 }
 
 export default ElectronStorageItem
diff --git a/redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.tsx b/redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.tsx
diff --git a/redisinsight/ui/src/pages/home/components/HomeHeader/styles.module.scss b/redisinsight/ui/src/pages/home/components/HomeHeader/styles.module.scss
diff --git a/redisinsight/ui/src/slices/instances/instances.ts b/redisinsight/ui/src/slices/instances/instances.ts
diff --git a/redisinsight/ui/src/telemetry/checkAnalytics.ts b/redisinsight/ui/src/telemetry/checkAnalytics.ts
diff --git a/redisinsight/ui/src/telemetry/telemetryUtils.ts b/redisinsight/ui/src/telemetry/telemetryUtils.ts
diff --git a/redisinsight/ui/src/utils/test-utils.tsx b/redisinsight/ui/src/utils/test-utils.tsx
diff --git a/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts b/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts
diff --git a/tests/e2e/tests/regression/insights/feature-flag.e2e.ts b/tests/e2e/tests/regression/insights/feature-flag.e2e.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redisinsight-api",`
`3`		`- "version": "2.32.0",`
	`3`	`+ "version": "2.34.0",`
`4`	`4`	`"description": "RedisInsight API",`
`5`	`5`	`"private": true,`
`6`	`6`	`"author": {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ export class CloudAuthAnalytics extends TelemetryBaseService {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`sendCloudSignInFailed(exception: HttpException, flow?: CloudSsoFeatureStrategy, action?: string) {`
`18`		`- this.sendFailedEvent(TelemetryEvents.CloudSignInFailed, exception, { flow, action });`
	`18`	`+ this.sendFailedEvent(TelemetryEvents.CloudSignInFailed, exception, {`
	`19`	`+ flow,`
	`20`	`+ action,`
	`21`	`+ errorDescription: exception?.['options']?.['description'],`
	`22`	`+ });`
`19`	`23`	`}`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,14 @@ export class CloudAuthService {`
`33`	`33`
`34`	`34`	`static getAuthorizationServerRedirectError(query: { error_description: string }) {`
`35`	`35`	`if (query?.error_description?.indexOf('properties are missing') > -1) {`
`36`		`- return new CloudOauthMissedRequiredDataException(query.error_description);`
	`36`	`+ return new CloudOauthMissedRequiredDataException(query.error_description, {`
	`37`	`+ description: query.error_description,`
	`38`	`+ });`
`37`	`39`	`}`
`38`	`40`
`39`		`- return new CloudOauthMisconfigurationException();`
	`41`	`+ return new CloudOauthMisconfigurationException(undefined, {`
	`42`	`+ description: query.error_description,`
	`43`	`+ });`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`getAuthStrategy(strategy: CloudAuthIdpType): CloudAuthStrategy {`