rdi fixes

Author: ArtemHoruzhenko

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

@@ -110,10 +110,11 @@ export class ApiRdiClient extends RdiClient {
     }
   }
 
-  async dryRunJob(data: RdiDryRunJobDto): Promise<RdiDryRunJobResponseDto> {
+  async dryRunJob(dto: RdiDryRunJobDto): Promise<RdiDryRunJobResponseDto> {
     try {
-      const response = await this.client.post(RdiUrl.DryRunJob, data);
-      return response.data;
+      const { data } = await this.client.post(RdiUrl.DryRunJob, dto);
+
+      return data;
     } catch (e) {
       throw wrapRdiPipelineError(e);
     }
@@ -134,20 +135,21 @@ export class ApiRdiClient extends RdiClient {
 
   async getPipelineStatus(): Promise<any> {
     try {
-      const response = await this.client.get(RdiUrl.GetPipelineStatus);
+      const { data } = await this.client.get(RdiUrl.GetPipelineStatus);
 
-      return response.data;
+      return data;
     } catch (e) {
       throw wrapRdiPipelineError(e);
     }
   }
 
   async getStatistics(sections?: string): Promise<RdiStatisticsResult> {
     try {
-      const response = await this.client.get(RdiUrl.GetStatistics, { params: { sections } });
+      const { data } = await this.client.get(RdiUrl.GetStatistics, { params: { sections } });
+
       return {
         status: RdiStatisticsStatus.Success,
-        data: plainToClass(RdiStatisticsData, convertKeysToCamelCase(response.data)),
+        data: plainToClass(RdiStatisticsData, convertKeysToCamelCase(data)),
       };
     } catch (e) {
       return { status: RdiStatisticsStatus.Fail, error: e.message };

redisinsight/api/src/modules/rdi/models/rdi.client.metadata.ts

@@ -1,4 +1,4 @@
-import { Session, SessionMetadata } from 'src/common/models/session';
+import { SessionMetadata } from 'src/common/models/session';
 import { Type } from 'class-transformer';
 import {
   IsNotEmpty,
@@ -7,7 +7,7 @@ import {
 
 export class RdiClientMetadata {
   @IsNotEmpty()
-  @Type(() => Session)
+  @Type(() => SessionMetadata)
   sessionMetadata: SessionMetadata;
 
   @IsNotEmpty()

redisinsight/ui/src/pages/rdi/statistics/StatisticsPage.tsx

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash'
+import { get } from 'lodash'
 import React, { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useParams } from 'react-router-dom'
@@ -12,7 +12,7 @@ import RdiInstancePageTemplate from 'uiSrc/templates/rdi-instance-page-template'
 import { formatLongName, Nullable, setTitle } from 'uiSrc/utils'
 import { setLastPageContext } from 'uiSrc/slices/app/context'
 import { PageNames } from 'uiSrc/constants'
-import { IPipelineStatus } from 'uiSrc/slices/interfaces'
+import { IPipelineStatus, PipelineStatus } from 'uiSrc/slices/interfaces'
 import Clients from './clients'
 import DataStreams from './data-streams'
 import Empty from './empty'
@@ -22,13 +22,9 @@ import TargetConnections from './target-connections'
 
 import styles from './styles.module.scss'
 
-const isPipelineDeployed = (data: Nullable<IPipelineStatus>) => {
-  if (!data) {
-    return false
-  }
-
-  return !isEmpty(data.pipelines)
-}
+const isPipelineDeployed = (
+  data: Nullable<IPipelineStatus>
+) => get(data, ['pipelines', 'default', 'status']) === PipelineStatus.Ready
 
 const StatisticsPage = () => {
   const { rdiInstanceId } = useParams<{ rdiInstanceId: string }>()

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

@@ -138,7 +138,7 @@ export enum PipelineStatus {
 export interface IPipelineStatus {
   components: Record<string, unknown>
   pipelines: {
-    defaults?: {
+    default?: {
       status: PipelineStatus
       state: unknown
       tasks: unknown