#RI-5750 - update dru run dto

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/rdi/dto/rdi.dry-run.job.dto.ts

@@ -1,25 +1,21 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Expose } from 'class-transformer';
-import { IsNotEmpty, IsString, Validate } from 'class-validator';
-import { SerializedJsonValidator } from 'src/validators';
+import { IsNotEmpty } from 'class-validator';
 
 export class RdiDryRunJobDto {
   @ApiProperty({
     description: 'Input data',
-    type: String,
+    type: Object,
   })
   @Expose()
   @IsNotEmpty()
-  @IsString()
-  @Validate(SerializedJsonValidator)
-  input: string;
+  input_data: object;
 
   @ApiProperty({
     description: 'Job file',
-    type: String,
+    type: Object,
   })
   @Expose()
   @IsNotEmpty()
-  @IsString()
-  job: string;
+  job: object;
 }

redisinsight/api/src/modules/rdi/rdi-pipeline.controller.ts

@@ -1,11 +1,10 @@
 import {
   Body,
   ClassSerializerInterceptor, Controller, Get, Post, UseInterceptors, UsePipes, ValidationPipe,
-  Req, Param,
+  Param,
 } from '@nestjs/common';
 import { Rdi, RdiPipeline, RdiClientMetadata } from 'src/modules/rdi/models';
 import { ApiTags } from '@nestjs/swagger';
-import { Request } from 'express';
 import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator';
 import { RdiPipelineService } from 'src/modules/rdi/rdi-pipeline.service';
 import { RequestRdiClientMetadata } from 'src/modules/rdi/decorators';

redisinsight/ui/src/pages/rdi/pipeline-management/components/jobs-panel/Panel.tsx

@@ -13,6 +13,7 @@ import {
 } from '@elastic/eui'
 import { useDispatch, useSelector } from 'react-redux'
 import { useParams } from 'react-router-dom'
+import yaml from 'js-yaml'
 
 import { PipelineJobsTabs } from 'uiSrc/slices/interfaces/rdi'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
@@ -107,10 +108,12 @@ const DryRunJobPanel = (props: Props) => {
         id: rdiInstanceId,
       },
     })
-    dispatch(rdiDryRunJob(rdiInstanceId, input, job))
+    dispatch(rdiDryRunJob(rdiInstanceId, JSON.parse(input), yaml.load(job)))
   }
 
-  const isSelectAvailable = selectedTab === PipelineJobsTabs.Output && !!results?.output && (results?.output?.length > 1)
+  const isSelectAvailable = selectedTab === PipelineJobsTabs.Output
+    && !!results?.output
+    && (results?.output?.length > 1)
 
   const Tabs = useCallback(() => (
     <EuiTabs className={styles.tabs}>

redisinsight/ui/src/slices/rdi/dryRun.ts

@@ -50,8 +50,8 @@ export default rdiPipelineSlice.reducer
 // Asynchronous thunk action
 export function rdiDryRunJob(
   rdiInstanceId: string,
-  input: string,
-  job: string,
+  input_data: object,
+  job: unknown,
   onSuccessAction?: (data: IDryRunJobResults) => void,
   onFailAction?: () => void,
 ) {
@@ -61,7 +61,7 @@ export function rdiDryRunJob(
       const { data, status } = await apiService.post<IDryRunJobResults>(
         `rdi/${rdiInstanceId}/pipeline/dry-run-job`,
         {
-          input,
+          input_data,
           job,
         }
       )

redisinsight/ui/src/slices/tests/rdi/dryRun.spec.tsx

@@ -126,7 +126,7 @@ describe('rdi dry run slice', () => {
 
         // Act
         await store.dispatch<any>(
-          rdiDryRunJob('123', "{ name: 'Johny' }", 'job string')
+          rdiDryRunJob('123', { name: 'Johny' }, {})
         )
 
         // Assert
@@ -151,7 +151,7 @@ describe('rdi dry run slice', () => {
 
         // Act
         await store.dispatch<any>(
-          rdiDryRunJob('123', "{ name: 'Johny' }", 'job string')
+          rdiDryRunJob('123', { name: 'Johny' }, {})
         )
 
         // Assert