Merge pull request #4261 from RedisInsight/feature/RI-6457/get-proper-rdi-version

RI-6457: Display proper RDI version

Author: mariasergeenko

redisinsight/api/src/modules/rdi/rdi.service.spec.ts

@@ -145,6 +145,13 @@ describe('RdiService', () => {
   });
 
   describe('create', () => {
+    const validGetPipelineStatus = () => Promise.resolve({
+      components: {
+        processor:{
+          version: "test-version"
+        }
+      }});
+
     it('should create an Rdi instance', async () => {
       const dto: CreateRdiDto = {
         name: 'name',
@@ -154,7 +161,9 @@ describe('RdiService', () => {
       };
       const sessionMetadata = { userId: '123', sessionId: '789' };
       repository.create.mockResolvedValue(mockRdi);
-      rdiClientFactory.createClient.mockResolvedValue(undefined);
+      rdiClientFactory.createClient.mockReturnValue({
+        getPipelineStatus: validGetPipelineStatus
+      });
 
       const result = await service.create(sessionMetadata, dto);
 
@@ -177,6 +186,52 @@ describe('RdiService', () => {
 
       await expect(service.create(sessionMetadata, dto)).rejects.toThrowError(wrapRdiPipelineError(error));
     });
+
+    it('should get the RDI version', async () => {
+      const dto: CreateRdiDto = {
+        name: 'name',
+        url: 'http://localhost:4000',
+        password: 'pass',
+        username: 'user',
+      };
+      const sessionMetadata = { userId: '123', sessionId: '789' };
+
+      repository.create.mockResolvedValue(mockRdi);
+      rdiClientFactory.createClient.mockReturnValue({
+        getPipelineStatus: validGetPipelineStatus
+      });
+
+      await service.create(sessionMetadata, dto);
+
+      expect(repository.create).toHaveBeenCalledWith(expect.objectContaining({
+        version: 'test-version'
+      }))
+    });
+
+    it('should get the default RDI version when other information is missing', async () => {
+      const dto: CreateRdiDto = {
+        name: 'name',
+        url: 'http://localhost:4000',
+        password: 'pass',
+        username: 'user',
+      };
+      const sessionMetadata = { userId: '123', sessionId: '789' };
+
+      repository.create.mockResolvedValue(mockRdi);
+      rdiClientFactory.createClient.mockResolvedValue({
+        getPipelineStatus: () => Promise.resolve(({
+          components: {
+            // missing processor.version
+          }
+        }))
+      });
+
+      await service.create(sessionMetadata, dto);
+
+      expect(repository.create).toHaveBeenCalledWith(expect.objectContaining({
+        version: '-'
+      }))
+    });
   });
 
   describe('delete', () => {

redisinsight/api/src/modules/rdi/rdi.service.ts

@@ -16,7 +16,9 @@ import { RdiPipelineNotFoundException, wrapRdiPipelineError } from 'src/modules/
 import { isUndefined, omitBy } from 'lodash';
 import { deepMerge } from 'src/common/utils';
 import { RdiAnalytics } from './rdi.analytics';
-import { CloudAuthService } from '../cloud/auth/cloud-auth.service';
+import { RdiClient } from './client/rdi.client';
+
+const DEFAULT_RDI_VERSION = '-';
 
 @Injectable()
 export class RdiService {
@@ -38,6 +40,12 @@ export class RdiService {
     return Object.keys(omitBy(dto, isUndefined)).some((field) => this.connectionFields.includes(field));
   }
 
+  private static async getRdiVersion(client: RdiClient): Promise<string> {
+    const pipelineStatus = await client.getPipelineStatus();
+    const version = pipelineStatus?.components?.processor?.version || DEFAULT_RDI_VERSION;
+    return version;
+  }
+
   async list(): Promise<Rdi[]> {
     return await this.repository.list();
   }
@@ -72,16 +80,15 @@ export class RdiService {
   async create(sessionMetadata: SessionMetadata, dto: CreateRdiDto): Promise<Rdi> {
     const model = classToClass(Rdi, dto);
     model.lastConnection = new Date();
-    // TODO add request to get version
-    model.version = '1.2';
 
     const rdiClientMetadata = {
       sessionMetadata,
       id: uuidv4(),
     };
 
     try {
-      await this.rdiClientFactory.createClient(rdiClientMetadata, model);
+      const client = await this.rdiClientFactory.createClient(rdiClientMetadata, model);
+      model.version = await RdiService.getRdiVersion(client);
     } catch (error) {
       this.logger.error('Failed to create rdi instance', sessionMetadata);
 

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.tsx

@@ -116,7 +116,7 @@ const Config = () => {
           />
         </div>
         <EuiText className="rdi__text" color="subdued">
-          {'Configure target instance '}
+          {'Provide '}
           <EuiLink
             external={false}
             data-testid="rdi-pipeline-config-link"
@@ -131,7 +131,7 @@ const Config = () => {
           >
             connection details
           </EuiLink>
-          {' and applier settings.'}
+          {' for source and target databases and other collector configurations, such as tables and columns to track.'}
         </EuiText>
         {pipelineLoading ? (
           <div className={cx('rdi__editorWrapper', 'rdi__loading')} data-testid="rdi-config-loading">

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/Job.tsx

@@ -191,7 +191,7 @@ const Job = (props: Props) => {
           </div>
         </div>
         <EuiText className="rdi__text" color="subdued">
-          {'Describe the '}
+          {'Create a job per source table to filter, transform, and '}
           <EuiLink
             external={false}
             data-testid="rdi-pipeline-transformation-link"
@@ -204,9 +204,9 @@ const Job = (props: Props) => {
               }
             )}
           >
-            transformation logic
+            map data
           </EuiLink>
-          {' to perform on data from a single source'}
+          {' to Redis.'}
         </EuiText>
         {loading ? (
           <div className={cx('rdi__editorWrapper', 'rdi__loading')} data-testid="rdi-job-loading">

redisinsight/ui/src/pages/rdi/statistics/status/Status.tsx

@@ -25,8 +25,6 @@ interface Props {
 const Status = ({ data }: Props) => (
   <Panel paddingSize="l">
     <EuiFlexGroup>
-      <StatusItem label="RDI Version" value={data.rdiVersion} />
-      <VerticalDivider />
       <StatusItem label="Address" value={data.address} />
       <VerticalDivider />
       <StatusItem label="Run status" value={data.runStatus} />