Merge pull request #3621 from RedisInsight/feature/RI-5932-rdi-support

rework schemas fetching

Author: mariasergeenko

redisinsight/api/src/__mocks__/rdi.ts

@@ -1,6 +1,12 @@
 import axios, { AxiosError } from 'axios';
 import {
-  mockRdi, mockRdiClientMetadata, mockRdiDryRunJob, mockRdiPipeline, mockRdiStatisticsData,
+  mockRdi,
+  mockRdiClientMetadata,
+  mockRdiConfigSchema,
+  mockRdiDryRunJob, mockRdiJobsSchema,
+  mockRdiPipeline,
+  mockRdiSchema,
+  mockRdiStatisticsData,
 } from 'src/__mocks__';
 import errorMessages from 'src/constants/error-messages';
 import { sign } from 'jsonwebtoken';
@@ -17,18 +23,20 @@ describe('ApiRdiClient', () => {
   let client: ApiRdiClient;
 
   beforeEach(() => {
+    jest.clearAllMocks();
     client = new ApiRdiClient(mockRdiClientMetadata, mockRdi);
   });
 
   describe('getSchema', () => {
     it('should return schema', async () => {
-      const data = { schema: {} };
-      mockedAxios.get.mockResolvedValueOnce({ data });
+      mockedAxios.get.mockResolvedValueOnce({ data: mockRdiConfigSchema });
+      mockedAxios.get.mockResolvedValueOnce({ data: mockRdiJobsSchema });
 
       const result = await client.getSchema();
 
-      expect(result).toEqual(data);
-      expect(mockedAxios.get).toHaveBeenCalledWith(RdiUrl.GetSchema);
+      expect(result).toEqual(mockRdiSchema);
+      expect(mockedAxios.get).toHaveBeenCalledWith(RdiUrl.GetConfigSchema);
+      expect(mockedAxios.get).toHaveBeenCalledWith(RdiUrl.GetJobsSchema);
     });
 
     it('should throw error if request fails', async () => {
@@ -38,6 +46,8 @@ describe('ApiRdiClient', () => {
           status: 401,
         },
       };
+
+      mockedAxios.get.mockResolvedValueOnce({ data: mockRdiConfigSchema });
       mockedAxios.get.mockRejectedValueOnce(error);
 
       await expect(client.getSchema()).rejects.toThrow(errorMessages.UNAUTHORIZED);

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

@@ -52,8 +52,15 @@ export class ApiRdiClient extends RdiClient {
 
   async getSchema(): Promise<object> {
     try {
-      const response = await this.client.get(RdiUrl.GetSchema);
-      return response.data;
+      const [config, jobs] = await Promise.all([
+        this.client.get(RdiUrl.GetConfigSchema).then(({ data }) => data),
+        this.client.get(RdiUrl.GetJobsSchema).then(({ data }) => data),
+      ]);
+
+      return {
+        config,
+        jobs,
+      };
     } catch (e) {
       throw wrapRdiPipelineError(e);
     }

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

@@ -1,5 +1,6 @@
 export enum RdiUrl {
-  GetSchema = 'api/v1/schemas',
+  GetConfigSchema = 'api/v1/pipelines/config/schemas',
+  GetJobsSchema = 'api/v1/pipelines/jobs/schemas',
   GetPipeline = 'api/v1/pipelines',
   GetStrategies = 'api/v1/pipelines/strategies',
   GetConfigTemplate = 'api/v1/pipelines/config/templates',

redisinsight/api/src/modules/rdi/constants/index.ts

@@ -19,8 +19,10 @@ export const wrapRdiPipelineError = (error: AxiosError<any>, message?: string):
         return new RdiPipelineUnauthorizedException(message, errorOptions);
       case 422:
         return new RdiPipelineValidationException(message, errorOptions);
-      default:
+      case 404:
         return new RdiPipelineNotFoundException(message, errorOptions);
+      default:
+        return new RdiPipelineInternalServerErrorException(message);
     }
   }
 

redisinsight/api/src/modules/rdi/exceptions/rdi-pipiline.error.handler.ts

@@ -4,6 +4,7 @@ import { nock } from '../../../helpers/test';
 import {
   describe, expect, deps, getMainCheckFn,
 } from '../../deps';
+import { mockRdiConfigSchema, mockRdiJobsSchema, mockRdiSchema } from 'src/__mocks__';
 
 const {
   localDb, request, server, constants,
@@ -16,27 +17,23 @@ const mockedAccessToken = sign({ exp: Math.trunc(Date.now() / 1000) + 3600 }, 't
 
 const endpoint = (id: string) => request(server).get(`/${constants.API.RDI}/${id || testRdiId}/pipeline/schema`);
 
-const mockResponseSuccess = {
-  schema: { },
-};
-
 const mainCheckFn = getMainCheckFn(endpoint);
 
 describe('GET /rdi/:id/pipeline/schema', () => {
   [
     {
       name: 'Should be success if rdi with :id is in db',
-      // responseSchema,
       statusCode: 200,
       checkFn: ({ body }) => {
-        expect(body).to.eql(mockResponseSuccess);
+        expect(body).to.eql(mockRdiSchema);
       },
       before: async () => {
         await localDb.generateRdis({ id: testRdiId, url: testRdiUrl }, 1);
         nock(testRdiUrl).post(`/${RdiUrl.Login}`).query(true).reply(200, {
           access_token: mockedAccessToken,
         });
-        nock(testRdiUrl).get(`/${RdiUrl.GetSchema}`).query(true).reply(200, mockResponseSuccess);
+        nock(testRdiUrl).get(`/${RdiUrl.GetConfigSchema}`).query(true).reply(200, mockRdiConfigSchema);
+        nock(testRdiUrl).get(`/${RdiUrl.GetJobsSchema}`).query(true).reply(200, mockRdiJobsSchema);
       },
     },
     {
@@ -56,7 +53,6 @@ describe('GET /rdi/:id/pipeline/schema', () => {
     },
     {
       name: 'Should throw error if client getSchema will not succeed',
-      // responseSchema,
       statusCode: 401,
       checkFn: ({ body }) => {
         expect(body).to.eql({
@@ -71,7 +67,8 @@ describe('GET /rdi/:id/pipeline/schema', () => {
         nock(testRdiUrl).post(`/${RdiUrl.Login}`).query(true).reply(200, {
           access_token: mockedAccessToken,
         });
-        nock(testRdiUrl).get(`/${RdiUrl.GetSchema}`).query(true).reply(401, {
+        nock(testRdiUrl).get(`/${RdiUrl.GetConfigSchema}`).query(true).reply(200, mockRdiConfigSchema);
+        nock(testRdiUrl).get(`/${RdiUrl.GetJobsSchema}`).query(true).reply(401, {
           message: 'Request failed with status code 401',
         });
       },

redisinsight/api/test/api/rdi/pipeline/GET-rdi-id-pipeline-schema.test.ts

@@ -72,16 +72,6 @@ describe('ConnectionForm', () => {
     expect(screen.getByTestId('connection-form-url-input')).toBeDisabled()
   })
 
-  it('should show url tooltip when url input is not disabled', async () => {
-    render(<ConnectionForm {...mockedProps} />)
-
-    fireEvent.mouseOver(screen.getByTestId('connection-form-url-icon'))
-
-    const tooltip = await screen.findByTestId('connection-form-url-tooltip')
-
-    expect(tooltip).toBeInTheDocument()
-  })
-
   it('should show validation tooltip when submit button is disabled', async () => {
     render(<ConnectionForm {...mockedProps} />)
 

redisinsight/ui/src/pages/rdi/home/connection-form/ConnectionForm.spec.tsx

@@ -6,9 +6,7 @@ import {
   EuiFlexItem,
   EuiForm,
   EuiFormRow,
-  EuiIcon,
   EuiTitle,
-  EuiToolTip
 } from '@elastic/eui'
 import { Field, FieldInputProps, FieldMetaProps, Form, Formik, FormikErrors, FormikHelpers } from 'formik'
 import React, { useEffect, useState } from 'react'
@@ -43,33 +41,6 @@ const getInitialValues = (values: RdiInstance | null): ConnectionFormValues => (
   password: values ? null : ''
 })
 
-const UrlTooltip = () => (
-  <EuiToolTip
-    data-testid="connection-form-url-tooltip"
-    title={(
-      <div>
-        <p>
-          <b>Pasting a connection URL auto fills the instance details.</b>
-        </p>
-        <p style={{ margin: 0, paddingTop: '10px' }}>The following connection URLs are supported:</p>
-      </div>
-        )}
-    className={styles.urlTooltip}
-    anchorClassName="inputAppendIcon"
-    position="right"
-    content={(
-      <ul>
-        <li>
-          <span />
-          TBD
-        </li>
-      </ul>
-        )}
-  >
-    <EuiIcon data-testid="connection-form-url-icon" type="iInCircle" style={{ cursor: 'pointer' }} />
-  </EuiToolTip>
-)
-
 const ConnectionForm = (props: Props) => {
   const { onSubmit, onCancel, editInstance, isLoading } = props
 
@@ -140,7 +111,6 @@ const ConnectionForm = (props: Props) => {
                       fullWidth
                       placeholder="Enter URL"
                       disabled={!!editInstance}
-                      append={!editInstance ? <UrlTooltip /> : undefined}
                       {...field}
                     />
                   )}