UI - Operator

ui/src/core/components/Icon/styled.tsx

@@ -42,10 +42,6 @@ const Icon = styled.i<WrapperProps>`
       cursor: pointer;
       transition: 0.2s;
       padding: 0;
-
-      :hover {
-        transform: scale(1.1);
-      }
     `};
 
   > div > div {

ui/src/core/components/Modal/Wizard/constants.ts

@@ -58,8 +58,8 @@ export const WizardItems = [
   {
     icon: 'empty-circles',
     name: 'cdConfig',
-    menu: 'CD configuration',
-    title: 'CD configuration',
+    menu: 'Deployment configuration',
+    title: 'Deployment configuration',
     backgroundColor: 'cdConfig',
     size: '220px',
     subtitle:

ui/src/core/providers/base/hooks.ts

@@ -56,6 +56,7 @@ export interface FetchProps {
   save?: Function;
   update?: Function;
   remove?: Function;
+  status?: FetchStatuses;
 }
 
 const renewTokenByCb = (fn: () => Promise<Response>, isLoginRequest: boolean) =>

ui/src/modules/Settings/Credentials/__tests__/FormCDConfiguration.spec.tsx → ui/src/core/providers/deploymentConfiguration.ts

@@ -14,17 +14,14 @@
  * limitations under the License.
  */
 
-import { render, screen } from 'unit-test/testUtils';
-import FormCDConfiguration from '../Sections/CDConfiguration/Form';
+import { DeploymentConfiguration } from 'modules/Settings/Credentials/Sections/DeploymentConfiguration/interfaces';
+import { deleteRequest, postRequest } from './base';
 
-const mockOnFinish = jest.fn();
+const endpoint = '/moove/v2/configurations/deployment';
+export const configPath = '/deploymentConfigurationId';
 
-test('render CD Configuration form', async () => {
-  render(
-    <FormCDConfiguration onFinish={mockOnFinish}/>
-  );
+export const create = (deploymentConfiguration: DeploymentConfiguration) =>
+  postRequest(`${endpoint}`, deploymentConfiguration);
 
-  const input = await screen.findByTestId('input-text-name');
-
-  expect(input).toBeInTheDocument();
-});
+export const removeDeploymentConfiguration = (id: string) =>
+  deleteRequest(`${endpoint}/${id}`);

ui/src/core/providers/workspace.ts

@@ -72,8 +72,8 @@ export const updateName = (value: string) =>
 export const addConfig = (path: string, value: string) =>
   patchRequest(`${endpoint}/${getWorkspaceId()}`, 'replace', path, value);
 
-export const delConfig = (path: string) =>
-  patchRequest(`${endpoint}/${getWorkspaceId()}`, 'remove', path);
+export const delConfig = (path: string, value: string) =>
+  patchRequest(`${endpoint}/${getWorkspaceId()}`, 'remove', path, value);
 
 export const testGitConnection = (data: GitConnectionTest) =>
   baseRequest(`${mooveEndpoint}/configurations/git/connection-status`, data, {

ui/src/core/utils/workspace.ts

@@ -14,18 +14,37 @@
  * limitations under the License.
  */
 
-import { Workspace } from 'modules/Users/interfaces/User';
+import { Workspace } from 'modules/Workspaces/interfaces/Workspace';
 
-const WORKSPACE_KEY = 'workspace';
+const WORKSPACE = 'workspace';
 
-export const getWorkspaceId = () => localStorage.getItem(WORKSPACE_KEY);
+export const getWorkspaceId = () => {
+  const workspace = JSON.parse(localStorage.getItem(WORKSPACE)) as Workspace;
+  return workspace?.id;
+};
+
+export const clearWorkspace = () => {
+  localStorage.removeItem(WORKSPACE);
+}
+
+export const getWorkspace = (): Workspace => {
+  const ws = {
+    id: ''
+  } as Workspace;
 
-export const clearWorkspace = () => localStorage.removeItem(WORKSPACE_KEY);
+  try {
+    const workspace : Workspace = JSON.parse(localStorage.getItem(WORKSPACE));
+    return workspace || ws;
+
+  } catch (e) {
+    return ws;
+  }
+}
 
 export const saveWorkspace = (workspace: Workspace) => {
   clearWorkspace();
 
   if (workspace) {
-    localStorage.setItem(WORKSPACE_KEY, workspace?.id);
+    localStorage.setItem(WORKSPACE, JSON.stringify(workspace));
   }
 };

ui/src/modules/Main/Sidebar/index.tsx

@@ -27,9 +27,9 @@ import Text from 'core/components/Text';
 import { getProfileByKey } from 'core/utils/profile';
 import { setUserAbilities } from 'core/utils/abilities';
 import {
-  saveWorkspace,
   getWorkspaceId,
-  clearWorkspace
+  clearWorkspace,
+  saveWorkspace
 } from 'core/utils/workspace';
 import { Workspace } from 'modules/Users/interfaces/User';
 import { ExpandClick } from './Types';

ui/src/modules/Modules/Comparation/Form/__tests__/helpers.spec.tsx

@@ -14,164 +14,149 @@
  * limitations under the License.
  */
 
+import { waitFor } from 'unit-test/testUtils';
 import { Helm } from "modules/Modules/interfaces/Helm";
-import { githubProvider, gitlabProvider } from "modules/Settings/Credentials/Sections/CDConfiguration/constants";
-import { validFields, createGitApi, destructHelmUrl, getHelmFieldsValidations } from "../helpers"
+import {
+  validFields, createGitApi,
+  createGithubApi, destructHelmUrl,
+  validateSlash
+} from "../helpers"
+
+const githubProvider = 'GITHUB';
+const gitlabProvider = 'GITLAB';
 
 const invalidEmptyStringObject: Record<string, any> = {
   key1: "",
 };
 
-const invalidNullObject: Record<string, any> = {
-  key1: undefined
-};
-
 const validObject: Record<string, any> = {
   key1: "fake-value",
 };
 
-test("empty strings validFields", () => {
+test("should empty strings validFields", () => {
   const objectIsValid = validFields(invalidEmptyStringObject)
 
   expect(objectIsValid).toBeFalsy()
 });
 
-test("undefined validFields", () => {
+test("should undefined validFields", () => {
   const objectIsValid = validFields(invalidEmptyStringObject)
 
   expect(objectIsValid).toBeFalsy()
 });
 
-test("valid string validFields", () => {
+test("should valid string validFields", () => {
   const objectIsValid = validFields(validObject)
 
   expect(objectIsValid).toBeTruthy()
 });
 
-test("createGitApi return github with all data", () => {
-  const helmData: Helm = {
-    helmBranch: "main",
-    helmOrganization: "zupit",
-    helmPath: "examplepath",
-    helmRepository: "examplerepo"
-  }
+test("should validateSlash starts with '/'", () => {
+  const fieldName = 'field';
+  const validated = validateSlash('/github.com', fieldName);
 
-  const githubApi = createGitApi(helmData, githubProvider)
-  expect(githubApi).toBe("https://api.github.com/repos/zupit/examplerepo/contents/examplepath?ref=main")
-})
+  expect(validated).toBe(`the ${fieldName} field should not start with "/"`);
+});
 
-test("createGitHubApi return github without path", () => {
-  const helmData: Helm = {
-    helmBranch: "main",
-    helmOrganization: "zupit",
-    helmRepository: "examplerepo"
-  }
+test("should validateSlash ends with '/'", () => {
+  const fieldName = 'field';
+  const validated = validateSlash('https://github.com/', fieldName);
 
-  const githubApi = createGitApi(helmData, githubProvider)
-  expect(githubApi).toBe("https://api.github.com/repos/zupit/examplerepo/contents?ref=main")
-})
+  expect(validated).toBe(`the ${fieldName} field should not ends with "/"`);
+});
 
-test("createGitApi return github without branch", () => {
+test("should createGitApi [gitlab] without branch", () => {
   const helmData: Helm = {
     helmOrganization: "zupit",
-    helmRepository: "examplerepo"
+    helmProjectId: "123456",
+    helmUrl: "https://gitlab.com"
   }
 
-  const githubApi = createGitApi(helmData, githubProvider)
-  expect(githubApi).toBe("https://api.github.com/repos/zupit/examplerepo/contents?ref=main")
+  const gitlabApi = createGitApi(helmData, gitlabProvider)
+  expect(gitlabApi).toBe("https://gitlab.com/api/v4/projects/123456/repository?ref=main")
 })
 
-test("createGitApi return gitlab with all data", () => {
+test("should createGitApi [github] without branch", () => {
   const helmData: Helm = {
-    helmBranch: "main",
     helmOrganization: "zupit",
-    helmPath: "examplepath",
     helmRepository: "examplerepo",
-    helmGitlabUrl: "https://examplegitlab.com"
+    helmUrl: "https://api.github.com"
   }
 
-  const gitlabApi = createGitApi(helmData, gitlabProvider)
-  expect(gitlabApi).toBe("https://examplegitlab.com/api/v4/projects/zupit%2Fexamplerepo/repository/files/examplepath?ref=main")
+  const gitlabApi = createGitApi(helmData, githubProvider);
+  expect(gitlabApi).toBe("https://api.github.com/repos/zupit/examplerepo/contents?ref=main");
 })
 
-test("createGitLabApi return github without path", () => {
+test("createGithubApi default", () => {
   const helmData: Helm = {
-    helmBranch: "main",
-    helmOrganization: "zupit",
-    helmRepository: "examplerepo",
-    helmGitlabUrl: "https://examplegitlab.com"
-
+    helmUrl: 'https://api.github.com',
+    helmOrganization: 'zupit',
+    helmRepository: 'examplerepo',
+    helmPath: '',
+    helmBranch: 'main',
   }
 
-  const gitlabApi = createGitApi(helmData, gitlabProvider)
-  expect(gitlabApi).toBe("https://examplegitlab.com/api/v4/projects/zupit%2Fexamplerepo/repository/files?ref=main")
+  const githubUrl = createGithubApi(helmData);
+  expect(githubUrl).toBe("https://api.github.com/repos/zupit/examplerepo/contents?ref=main");
 })
 
-test("createGitApi return github without branch", () => {
+test("createGithubApi without branch", () => {
   const helmData: Helm = {
-    helmOrganization: "zupit",
-    helmRepository: "examplerepo",
-    helmGitlabUrl: "https://examplegitlab.com"
+    helmUrl: 'https://api.github.com',
+    helmOrganization: 'zupit',
+    helmRepository: 'examplerepo',
+    helmPath: '',
+    helmBranch: '',
   }
 
-  const gitlabApi = createGitApi(helmData, gitlabProvider)
-  expect(gitlabApi).toBe("https://examplegitlab.com/api/v4/projects/zupit%2Fexamplerepo/repository/files?ref=main")
+  const githubUrl = createGithubApi(helmData);
+  expect(githubUrl).toBe("https://api.github.com/repos/zupit/examplerepo/contents?ref=main");
 })
 
 test("destructHelmUrl github with full url", () => {
   const setValue = jest.fn()
   const fullUrl = "https://api.github.com/repos/zupit/examplerepo/contents/examplepath?ref=main"
 
   destructHelmUrl(fullUrl, githubProvider, setValue)
-  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit")
-  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo")
-  expect(setValue).toHaveBeenCalledWith("helmPath", "examplepath")
-  expect(setValue).toHaveBeenCalledWith("helmBranch", "main")
+  expect(setValue).toHaveBeenCalledWith("helmUrl", "https://api.github.com", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo", {"shouldValidate": true});
+  waitFor(() => expect(setValue).toHaveBeenCalledWith("helmPath", "examplepath", {"shouldValidate": true}));
+  waitFor(() => expect(setValue).toHaveBeenCalledWith("helmBranch", "main", {"shouldValidate": true}));
+  expect(setValue).toBeCalledTimes(5);
 })
 
 test("destructHelmUrl github without path", () => {
   const setValue = jest.fn()
   const fullUrl = "https://api.github.com/repos/zupit/examplerepo/contents?ref=main"
 
   destructHelmUrl(fullUrl, githubProvider, setValue)
-  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit")
-  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo")
-  expect(setValue).toHaveBeenCalledWith("helmBranch", "main")
+  expect(setValue).toHaveBeenCalledWith("helmUrl", "https://api.github.com", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmBranch", "main", {"shouldValidate": true});
+  expect(setValue).toBeCalledTimes(5);
 })
 
-
 test("destructHelmUrl gitlab with full url", () => {
   const setValue = jest.fn()
-  const fullUrl = "https://examplegitlab.com/api/v4/projects/zupit%2Fexamplerepo/repository/files/examplepath?ref=main"
+  const fullUrl = "https://gitlab.com/api/v4/projects/123456/repository?path=examplepath&ref=main"
 
   destructHelmUrl(fullUrl, gitlabProvider, setValue)
-  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit")
-  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo")
-  expect(setValue).toHaveBeenCalledWith("helmPath", "examplepath")
-  expect(setValue).toHaveBeenCalledWith("helmBranch", "main")
-  expect(setValue).toHaveBeenCalledWith("helmGitlabUrl", "https://examplegitlab.com")
-  expect(setValue).toBeCalledTimes(5)
+  expect(setValue).toHaveBeenCalledWith("helmUrl", "https://gitlab.com", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmProjectId", "123456", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmPath", "examplepath", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmBranch", "main", {"shouldValidate": true});
+  expect(setValue).toBeCalledTimes(4);
 })
 
-test("destructHelmUrl github without path", () => {
+test("destructHelmUrl gitlab without path", () => {
   const setValue = jest.fn()
-  const fullUrl = "https://examplegitlab.com/api/v4/projects/zupit%2Fexamplerepo/repository/files?ref=main"
+  const fullUrl = "https://gitlab.com/api/v4/projects/123456/repository?ref=main"
 
   destructHelmUrl(fullUrl, gitlabProvider, setValue)
-  expect(setValue).toHaveBeenCalledWith("helmOrganization", "zupit")
-  expect(setValue).toHaveBeenCalledWith("helmRepository", "examplerepo")
-  expect(setValue).toHaveBeenCalledWith("helmBranch", "main")
-  expect(setValue).toBeCalledTimes(4)
-});
-
-test('should retun validation with required true', () => {
-  const result = getHelmFieldsValidations('some name');
-
-  expect(result.required).toHaveProperty('value', true);
-  expect(result.required).toHaveProperty('message', 'This field is required');
-});
-
-test('should retun validation with required false', () => {
-  const result = getHelmFieldsValidations('some name', false);
-  expect(result.required).toBe(null);
-});
+  expect(setValue).toHaveBeenCalledWith("helmUrl", "https://gitlab.com", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmProjectId", "123456", {"shouldValidate": true});
+  expect(setValue).toHaveBeenCalledWith("helmBranch", "main", {"shouldValidate": true});
+  expect(setValue).toBeCalledTimes(4);
+})