Merge pull request #3587 from RedisInsight/feature/RI-5902-rdi-integration

Feature/ri 5902 rdi integration

Author: vlad-dargel

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/api/src/modules/rdi/utils/pipeline.util.ts

@@ -1,5 +1,5 @@
 import {
-  isArray, unset, set, forEach,
+  isArray, unset, set, forEach, isObjectLike, isEmpty,
 } from 'lodash';
 import { plainToClass } from 'class-transformer';
 import { RdiPipeline } from 'src/modules/rdi/models';
@@ -21,10 +21,21 @@ export const convertApiDataToRdiJobs = (jobs?: [Record<string, any>]): Record<st
   return jobsMap;
 };
 
-export const convertApiDataToRdiPipeline = (data: { config?: Record<string, any> } = {}): RdiPipeline => {
+export const convertApiDataToRdiPipeline = (data: Record<string, any> = {}): RdiPipeline => {
+  const entries = data;
+
+  // ignore empty root-level entries for pipeline
+  forEach(data, (entry, key) => {
+    if (entry && isObjectLike(entry) && isEmpty(entry)) {
+      entries[key] = undefined;
+    }
+  });
+
   const pipeline = {
-    ...data,
-    jobs: convertApiDataToRdiJobs(data.config.jobs),
+    config: {
+      ...entries,
+    },
+    jobs: convertApiDataToRdiJobs(data.jobs),
   };
 
   // do not show jobs in the config area
@@ -46,12 +57,11 @@ export const convertRdiJobsToApiPayload = (jobs: Record<string, any>): Record<st
   return payload;
 };
 
-export const convertRdiPipelineToApiPayload = (pipeline: RdiPipeline): { config?: Record<string, any> } => {
+export const convertRdiPipelineToApiPayload = (pipeline: RdiPipeline): Record<string, any> => {
   const payload = {
-    ...pipeline,
-    jobs: undefined,
+    ...pipeline.config,
   };
 
-  set(payload, 'config.jobs', convertRdiJobsToApiPayload(pipeline.jobs));
+  set(payload, 'jobs', convertRdiJobsToApiPayload(pipeline.jobs));
   return payload;
 };

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

tests/e2e/package.json

@@ -25,7 +25,8 @@
   "author": "",
   "dependencies": {
     "axios": "^1.6.0",
-    "cli-argument-parser": "0.4.5"
+    "cli-argument-parser": "0.4.5",
+    "js-yaml": "^4.1.0"
   },
   "resolutions": {
     "@types/lodash": "4.14.192",

tests/e2e/pageObjects/components/monaco-editor.ts

@@ -20,6 +20,7 @@ export class MonacoEditor {
      * @param clean if  field should be cleaned
      */
     async sendTextToMonaco(input: Selector, command: string, clean = true): Promise<void> {
+
         await t.click(input);
         if(clean) {
             await t
@@ -30,6 +31,28 @@ export class MonacoEditor {
         await t.typeText(input, command);
     }
 
+    /**
+     * Send lines in monacoEditor without additional space that typeText can add
+     * @param input The input locator
+     * @param lines lines
+     * @param depth level of depth of the object
+     */
+    async insertTextByLines(input: Selector, lines: string[], depth: number): Promise<void> {
+        for(let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+
+            for(let j = 0; j < depth; j++) {
+                await t.pressKey('shift+tab');
+            }
+
+            if (line) {
+                await t.typeText(input, line, { paste: true });
+            }
+            await t.pressKey('esc');
+            await t.pressKey('enter');
+        }
+    }
+
     /**
      * Get text from monacoEditor
      */

tests/e2e/pageObjects/components/rdi/pipeline-management-panel.ts

@@ -11,9 +11,11 @@ export class PipelineManagementPanel {
 
     jobNameInput = Selector('[data-testid=inline-item-editor]');
     jobItem = Selector('[data-testid*=rdi-nav-job-actions]');
-    confirmBtn  = Selector('[data-testid=confirm-btn]');
+    confirmBtn  = Selector('[data-testid=delete-confirm-btn]');
     jobsPipelineTitle = Selector('[class*=rdi__title]');
 
+    configHighlightingIcon = Selector('[data-testid=updated-file-config-highlight]');
+
     /**
      * Add Job by name
      * @param name job name
@@ -28,7 +30,7 @@ export class PipelineManagementPanel {
      * @param name job name
      */
     async openJobByName(name: string): Promise<void> {
-        const jobBtnSelector = Selector(`[data-testid=rdi-nav-job-${name}]`);
+        const jobBtnSelector = await this.getJobByName(name);
         await t.click(jobBtnSelector);
     }
 
@@ -52,4 +54,12 @@ export class PipelineManagementPanel {
             .typeText(this.jobNameInput, newName, { replace: true })
             .click(this.EditorButton.applyBtn);
     }
+
+    /**
+     * Get Job by name
+     * @param name job name
+     */
+    async getJobByName(name: string): Promise<Selector> {
+        return Selector(`[data-testid=rdi-nav-job-${name}]`);
+    }
 }

tests/e2e/pageObjects/components/rdi/rdi-header.ts

@@ -11,10 +11,11 @@ export class RdiHeader {
     deployConfirmBtn = Selector('[data-testid=deploy-confirm-btn]');
 
     uploadPipelineButton = Selector('[data-testid=upload-pipeline-btn]');
+    uploadConfirmPipelineButton = Selector('[data-testid=upload-confirm-btn]');
     uploadFromFileButton = Selector('[data-testid=upload-file-btn]');
     downloadPipelineButton = Selector('[data-testid=download-pipeline-btn]');
     importInput = Selector('[data-testid=import-file-modal-filepicker]');
-    confirmUploadingPipelineBatton = Selector('[data-testid=upload-confirm-btn]');
+    confirmUploadingPipelineBatton = Selector('[data-testid=submit-btn]');
 
     cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
 

tests/e2e/pageObjects/components/rdi/test-connection-panel.ts

@@ -4,11 +4,8 @@ import { TextConnectionSection } from '../../../helpers/constants';
 export class TestConnectionPanel {
     endpointRowString = '[data-testid^=table-endpoint]';
 
-    sidePanel = Selector('[data-testid=test-connection-panel]');
-    successfulSection = Selector('[data-testid^=success-connections]');
-    failedSection = Selector('[data-testid^=failed-connections-]');
-    endpointRow = Selector(this.endpointRowString);
-    closeSection = Selector('[data-testid=close-test-connections-btn]');
+    targetName = Selector('[data-testid=table-target-target]');
+    resultText = Selector('[data-testid=table-result-target]');
 
     /**
      * Open/Close  section
@@ -23,35 +20,4 @@ export class TestConnectionPanel {
             await t.click(sectionSelector.find('button'));
         }
     }
-
-    /**
-     * get number of connection
-     * @param section Name of section
-     * @param state State of section
-     */
-    async getNumberOfSection(section: TextConnectionSection): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        return sectionSelector.find('span[data-testid="number-of-connections"]').textContent;
-    }
-
-    /**
-     * get row count in the section
-     * @param section Name of section
-     */
-    async getNumberOfSectionRow(section: TextConnectionSection): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        const rows =  await sectionSelector.find('[data-testid^=table-endpoint]').count;
-        return rows.toString();
-    }
-
-    /**
-     * get row endpoint text by index
-     * @param section Name of section
-     * @param index index of the row to get text
-     */
-    async getSectionRowTextByIndex(section: TextConnectionSection, index: number): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        return await (sectionSelector.find(this.endpointRowString).nth(index)).textContent;
-    }
-
 }