Merge pull request #414 from zenml-io/UAT

Author: Cahllagerfeld

.env

@@ -1,3 +1,3 @@
-REACT_APP_BASE_API_URL="https://appserver.zenml.io/api/v1"
+REACT_APP_BASE_API_URL=https://appserver.zenml.io/api/v1
 REACT_APP_HUB_API_URL="https://hubapi.zenml.io"
 REACT_APP_VERSION=$npm_package_version

global.d.ts

@@ -35,6 +35,7 @@ interface TAction {
 interface TServerInfo {
   id: string;
   version: string;
+  debug: boolean;
   deploymentType: string;
   databaseType: string;
   secretsStoreType: string;

package.json

@@ -113,11 +113,11 @@
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.20.5",
     "eslint-plugin-redux-saga": "^1.1.3",
+    "husky": "^8.0.0",
     "postcss": "^8.4.16",
     "prettier": "^2.0.5",
     "react-hooks-testing-library": "^0.6.0",
-    "react-test-renderer": "^16.13.1",
-    "husky": "^8.0.0"
+    "react-test-renderer": "^16.13.1"
   },
   "engines": {
     "npm": ">=6.14.17",

src/App.tsx

@@ -4,6 +4,7 @@ import { Provider } from 'react-redux';
 import { RouteConfig } from './routes';
 
 import configureStore from './redux/setup/storeSetup';
+import './utils/axios';
 import Toaster from './ui/layouts/common/Toaster';
 
 import 'bootstrap/dist/css/bootstrap-grid.min.css';

src/api/connectors/getConnectorByIdApi.spec.ts

@@ -0,0 +1,26 @@
+import getconnectorByIdApi from './getConnectorByIdApi';
+
+import { endpoints } from '../endpoints';
+import { apiUrl } from '../apiUrl';
+import { httpMethods } from '../constants';
+
+const mockFetchApiWithAuthRequest = jest.fn().mockImplementation(() => Promise);
+
+jest.mock('../fetchApi', () => ({
+  fetchApiWithAuthRequest: (params: any): any =>
+    mockFetchApiWithAuthRequest(params),
+}));
+
+const authenticationToken = 'token';
+const pipelineId = 'runId';
+
+describe('getconnectorByIdApi', () => {
+  it('calls fetch api with correct params', () => {
+    // getconnectorByIdApi({ authenticationToken, pipelineId });
+    expect(mockFetchApiWithAuthRequest).toHaveBeenCalledWith({
+      method: httpMethods.get,
+      url: apiUrl(endpoints.connectors.get(pipelineId)),
+      authenticationToken,
+    });
+  });
+});

src/api/connectors/getConnectorByIdApi.ts

@@ -0,0 +1,19 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getconnectorByIdApi = ({
+  authenticationToken,
+  connectorId,
+}: {
+  authenticationToken: string;
+  connectorId: TId;
+}): Promise<TOrganization> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.Connectors.get(connectorId)),
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getconnectorByIdApi;

src/api/connectors/getConnectorComponentsApi.ts

@@ -0,0 +1,45 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getConnectorComponentsApi = ({
+  connector_id,
+  workspace,
+  sort_by,
+  logical_operator,
+  page,
+  size,
+  name,
+  filtersParam,
+  // id,
+  authenticationToken,
+}: {
+  connector_id?: string;
+  workspace: string;
+  sort_by: string;
+  logical_operator: string;
+  page: number;
+  size: number;
+  name?: string;
+  filtersParam?: object;
+  // id?: any;
+  authenticationToken: string;
+}): Promise<any> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.Connectors.connectorComponents),
+    params: {
+      connector_id,
+      sort_by,
+      logical_operator,
+      page,
+      size,
+      name,
+      ...filtersParam,
+      // id,
+    },
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getConnectorComponentsApi;

src/api/connectors/getConnectorsTypesApi.ts

@@ -0,0 +1,45 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getConnectorsTypesApi = ({
+  component_id,
+  workspace,
+  sort_by,
+  logical_operator,
+  page,
+  size,
+  connector_type,
+  filtersParam,
+  // id,
+  authenticationToken,
+}: {
+  component_id?: any;
+  workspace: string;
+  sort_by: string;
+  logical_operator: string;
+  page: number;
+  size: number;
+  connector_type?: string;
+  filtersParam?: object;
+  // id?: any;
+  authenticationToken: string;
+}): Promise<any> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.Connectors.connectorsTypes),
+    params: {
+      component_id,
+      sort_by,
+      logical_operator,
+      page,
+      size,
+      connector_type,
+      ...filtersParam,
+      // id,
+    },
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getConnectorsTypesApi;

src/api/connectors/getMyConnectorsApi.spec.ts

@@ -0,0 +1,25 @@
+import getMyconnectorsApi from './getMyConnectorsApi';
+
+import { endpoints } from '../endpoints';
+import { apiUrl } from '../apiUrl';
+import { httpMethods } from '../constants';
+
+const mockFetchApiWithAuthRequest = jest.fn().mockImplementation(() => Promise);
+
+jest.mock('../fetchApi', () => ({
+  fetchApiWithAuthRequest: (params: any): any =>
+    mockFetchApiWithAuthRequest(params),
+}));
+
+const authenticationToken = 'token';
+
+describe('getMyconnectorsApi', () => {
+  it('calls fetch api with correct params', () => {
+    // getMyconnectorsApi({ authenticationToken });
+    expect(mockFetchApiWithAuthRequest).toHaveBeenCalledWith({
+      method: httpMethods.get,
+      url: apiUrl(endpoints.connectors.my),
+      authenticationToken,
+    });
+  });
+});

src/api/connectors/getMyConnectorsApi.ts

@@ -0,0 +1,45 @@
+import { fetchApiWithAuthRequest } from '../fetchApi';
+import { endpoints } from '../endpoints';
+import { httpMethods } from '../constants';
+import { apiUrl } from '../apiUrl';
+
+const getMyConnectorsApi = ({
+  component_id,
+  workspace,
+  sort_by,
+  logical_operator,
+  page,
+  size,
+  name,
+  filtersParam,
+  // id,
+  authenticationToken,
+}: {
+  component_id?: any;
+  workspace: string;
+  sort_by: string;
+  logical_operator: string;
+  page: number;
+  size: number;
+  name?: string;
+  filtersParam?: object;
+  // id?: any;
+  authenticationToken: string;
+}): Promise<TStack> =>
+  fetchApiWithAuthRequest({
+    url: apiUrl(endpoints.Connectors.my(workspace)),
+    params: {
+      component_id,
+      sort_by,
+      logical_operator,
+      page,
+      size,
+      name,
+      ...filtersParam,
+      // id,
+    },
+    method: httpMethods.get,
+    authenticationToken,
+  });
+
+export default getMyConnectorsApi;