Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into feature/RI-4075_livetime_recommendations

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.manifest.provider.spec.ts

@@ -7,6 +7,7 @@ import {
   mockCustomTutorial,
   mockCustomTutorialManifest, mockCustomTutorialManifestJson,
 } from 'src/__mocks__';
+import * as Utils from 'src/utils/path';
 
 jest.mock('fs-extra');
 const mFs = fs as jest.Mocked<typeof fs>;
@@ -61,6 +62,8 @@ describe('CustomTutorialManifestProvider', () => {
       expect(result).toEqual([]);
     });
     it('should return empty array for empty folder', async () => {
+      const spy = jest.spyOn(Utils as any, 'winPathToNormalPath');
+
       // root level entries
       const mockRootLevelEntries = [
         'intro.md',
@@ -160,6 +163,7 @@ describe('CustomTutorialManifestProvider', () => {
           type: 'group',
         },
       ]);
+      expect(spy).toBeCalledTimes(5); // Should call util to fix win path
     });
   });
 

redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.manifest.provider.ts

@@ -9,6 +9,7 @@ import {
   RootCustomTutorialManifest,
 } from 'src/modules/custom-tutorial/models/custom-tutorial.manifest';
 import { plainToClass } from 'class-transformer';
+import { winPathToNormalPath } from 'src/utils';
 
 const MANIFEST_FILE = 'manifest.json';
 const SYS_MANIFEST_FILE = '_manifest.json';
@@ -75,7 +76,7 @@ export class CustomTutorialManifestProvider {
           label: name,
           type: CustomTutorialManifestType.InternalLink,
           args: {
-            path: join(relativePath, entry),
+            path: winPathToNormalPath(join(relativePath, entry)),
           },
         });
       }

redisinsight/api/src/utils/index.ts

@@ -9,3 +9,4 @@ export * from './redis-connection-helper';
 export * from './class-transformer';
 export * from './file-helper';
 export * from './recommendation-helper';
+export * from './path';

redisinsight/api/src/utils/path.spec.ts

@@ -0,0 +1,20 @@
+import { winPathToNormalPath } from 'src/utils';
+
+const winPathToNormalPathTests: Record<string, any>[] = [
+  { input: '\\dir/file.js', output: '/dir/file.js' },
+  { input: '/dir/file.js', output: '/dir/file.js' },
+  { input: 'file.js', output: 'file.js' },
+  { input: '\\file.js', output: '/file.js' },
+  { input: '\\dir\\file.js', output: '/dir/file.js' },
+  { input: 'dir/file.js', output: 'dir/file.js' },
+];
+
+describe('winPathToNormalPath', () => {
+  winPathToNormalPathTests.forEach((test) => {
+    it(`should be output: ${test.output} for input: ${JSON.stringify(test.input)}`, () => {
+      const result = winPathToNormalPath(test.input);
+
+      expect(result).toEqual(test.output);
+    });
+  });
+});

redisinsight/api/src/utils/path.ts

@@ -0,0 +1 @@
+export const winPathToNormalPath = (path: string) => path.replace(/\\/g, '/');

redisinsight/ui/src/components/navigation-menu/components/help-menu/HelpMenu.tsx

@@ -43,9 +43,6 @@ const HelpMenu = () => {
   }
 
   const onClickReleaseNotes = async () => {
-    dispatch(addMessageNotification(
-      successMessages.INSTALLED_NEW_UPDATE('2.2.1', () => dispatch(setReleaseNotesViewed(true)))
-    ))
     sendEventTelemetry({
       event: TelemetryEvent.RELEASE_NOTES_LINK_CLICKED,
       eventData: {

redisinsight/ui/src/constants/mocks/mock-guides.ts

@@ -30,6 +30,14 @@ export const MOCK_GUIDES_ITEMS: IEnablementAreaItem[] = [
         args: {
           path: 'quick-guides/working-with-hash.html',
         },
+      },
+      {
+        type: EnablementAreaComponent.InternalLink,
+        id: 'working-with-hash-2',
+        label: 'Working with HASH',
+        args: {
+          path: '\\quick-guides\\working-with-hash.html',
+        },
       }
     ]
   },

redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActions.spec.tsx

@@ -158,7 +158,7 @@ describe('BulkActions', () => {
           action: BulkActionsType.Delete,
           filter: {
             match: '*',
-            filterType: 'hash'
+            type: 'hash'
           }
         }
       })

redisinsight/ui/src/pages/browser/components/bulk-actions/BulkActionsTabs/BulkActionsTabs.spec.tsx

@@ -62,7 +62,7 @@ describe('BulkActionsTabs', () => {
         action: BulkActionsType.Delete,
         filter: {
           match: 'PATTERN',
-          filter: 'set'
+          type: 'set'
         }
       }
     });

redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/utils/getFileInfo.ts

@@ -96,7 +96,7 @@ export const getMarkdownPathByManifest = (
   if (!manifestPath || !manifest) return pathPrefix
   const path = removeManifestPrefix(manifestPath)
   const pathToMarkDown = path.replaceAll('/', '.children.')
-  const markDownPath = get(manifest, pathToMarkDown)?.args?.path
+  const markDownPath = get(manifest, pathToMarkDown)?.args?.path?.replaceAll('\\', '/')
 
   if (!markDownPath) return ''
 
@@ -115,7 +115,7 @@ export const getMarkdownPathByManifest = (
     return undefined
   })
 
-  return pathPrefix + folderPath + (markDownPath.match(/^(\/|\\)/) ? markDownPath : '/'.concat(markDownPath))
+  return pathPrefix + folderPath + (markDownPath.match(/^(\/)/) ? markDownPath : '/'.concat(markDownPath))
 }
 
 export const removeManifestPrefix = (path?: string): string => path