feat: Update GitServer create, edit forms (#86)

Jira: EPMDPEDP-12859 Related: #86 Change-Id: I0e5d424c4e174f08cd40c09d9d0879fd29f0efb2
epam · Nov 3, 2023 · dcf5906 · dcf5906
1 parent 7cb7b01
commit dcf5906
Show file tree

Hide file tree

Showing 51 changed files with 5,234 additions and 372 deletions.
diff --git a/mocks/wrappers/default/index.tsx b/mocks/wrappers/default/index.tsx
@@ -2,16 +2,26 @@
  * @jest-environment jsdom
  */
 
+import { createTheme } from '@material-ui/core';
+import { ThemeProvider } from '@material-ui/styles';
 import { SnackbarProvider } from 'notistack';
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 export const TestWrapper: React.FC = ({ children }) => {
     const queryClient = new QueryClient();
+    const theme = createTheme({
+        // @ts-ignore
+        palette: {
+            primaryColor: '#000',
+        },
+    });
 
     return (
-        <QueryClientProvider client={queryClient}>
-            <SnackbarProvider>{children}</SnackbarProvider>
-        </QueryClientProvider>
+        <ThemeProvider theme={theme}>
+            <QueryClientProvider client={queryClient}>
+                <SnackbarProvider>{children}</SnackbarProvider>
+            </QueryClientProvider>
+        </ThemeProvider>
     );
 };
diff --git a/src/k8s/EDPCodebaseBranch/utils/createCodebaseBranchInstance/index.ts b/src/k8s/EDPCodebaseBranch/utils/createCodebaseBranchInstance/index.ts
@@ -16,7 +16,6 @@ export const createCodebaseBranchInstance = (
     codebaseName: string
 ): EDPCodebaseBranchKubeObjectInterface => {
     const { branchName, releaseBranchName, ...restProps } = formValues;
-    console.log(formValues);
     const _branchName = formValues.release ? releaseBranchName : branchName;
     const transformedBranchName = _branchName ? _branchName.replaceAll('/', '-') : '';
 

diff --git a/src/k8s/EDPGitServer/hooks/useGitServerCRUD.ts b/src/k8s/EDPGitServer/hooks/useGitServerCRUD.ts
@@ -13,6 +13,7 @@ interface CreateGitServerProps {
 
 interface EditGitServerProps {
     gitServerData: EDPGitServerKubeObjectInterface;
+    gitServerSecretData: EDPKubeObjectInterface;
 }
 
 export const useGitServerCRUD = ({
@@ -45,6 +46,11 @@ export const useGitServerCRUD = ({
         CRUD_TYPES.CREATE
     >('gitServerSecretCreateMutation', K8s.secret.default, CRUD_TYPES.CREATE);
 
+    const gitServerSecretEditMutation = useResourceCRUDMutation<
+        EDPKubeObjectInterface,
+        CRUD_TYPES.EDIT
+    >('gitServerSecretEditMutation', K8s.secret.default, CRUD_TYPES.EDIT);
+
     const createGitServer = React.useCallback(
         async ({ gitServerData, gitServerSecretData }: CreateGitServerProps) => {
             gitServerSecretCreateMutation.mutate(gitServerSecretData, {
@@ -60,8 +66,6 @@ export const useGitServerCRUD = ({
                     invokeOnSuccessCallback();
                 },
                 onError: () => {
-                    gitServerSecretDeleteMutation.mutate(gitServerSecretData);
-
                     invokeOnErrorCallback();
                 },
             });
@@ -76,7 +80,7 @@ export const useGitServerCRUD = ({
     );
 
     const editGitServer = React.useCallback(
-        async ({ gitServerData }: EditGitServerProps) => {
+        async ({ gitServerData, gitServerSecretData }: EditGitServerProps) => {
             gitServerEditMutation.mutate(gitServerData, {
                 onSuccess: () => {
                     invokeOnSuccessCallback();
@@ -85,8 +89,22 @@ export const useGitServerCRUD = ({
                     invokeOnErrorCallback();
                 },
             });
+
+            gitServerSecretEditMutation.mutate(gitServerSecretData, {
+                onSuccess: () => {
+                    invokeOnSuccessCallback();
+                },
+                onError: () => {
+                    invokeOnErrorCallback();
+                },
+            });
         },
-        [gitServerEditMutation, invokeOnErrorCallback, invokeOnSuccessCallback]
+        [
+            gitServerEditMutation,
+            gitServerSecretEditMutation,
+            invokeOnErrorCallback,
+            invokeOnSuccessCallback,
+        ]
     );
 
     const mutations = {

diff --git a/src/k8s/EDPGitServer/utils/createGitServerInstance/index.test.ts b/src/k8s/EDPGitServer/utils/createGitServerInstance/index.test.ts
@@ -24,16 +24,16 @@ describe('testing createGitServerInstance', () => {
             httpsPort: 443,
             gitUser: 'git',
             gitProvider: 'gerrit',
-            gitHost: 'github.com',
+            gitHost: 'gerrit.com',
         });
 
         expect(object).toEqual({
             apiVersion: 'v2.edp.epam.com/v1',
             kind: 'GitServer',
-            metadata: { name: 'github.com-8ygse' },
+            metadata: { name: 'gerrit.com-8ygse' },
             spec: {
-                gitHost: 'github.com',
-                nameSshKeySecret: 'github.com-8ygse-config',
+                gitHost: 'gerrit.com',
+                nameSshKeySecret: 'gerrit-ciuser-sshkey',
                 sshPort: 22,
                 httpsPort: 443,
                 gitUser: 'git',

diff --git a/src/k8s/EDPGitServer/utils/createGitServerInstance/index.ts b/src/k8s/EDPGitServer/utils/createGitServerInstance/index.ts
@@ -20,7 +20,7 @@ export const createGitServerInstance = (
     const gitServerName = `${gitHost}-${createRandomString()}`;
     const nameSshKeySecret =
         formValues.gitProvider === GIT_PROVIDERS.GERRIT
-            ? `${gitServerName}-config`
+            ? 'gerrit-ciuser-sshkey'
             : `ci-${formValues.gitProvider}`;
 
     const base: DeepPartial<EDPGitServerKubeObjectInterface> = {

diff --git a/src/k8s/Secret/index.ts b/src/k8s/Secret/index.ts
@@ -32,8 +32,11 @@ export class SecretKubeObject extends K8s.secret.default {
         errorHandler,
     }: StreamSecretsByTypeProps): () => void {
         const url = `/api/${version}/namespaces/${namespace}/${pluralForm}`;
-        return streamResults(url, dataHandler, errorHandler, {
-            labelSelector: `${SECRET_LABEL_SECRET_TYPE}=${type}`,
-        });
+        if (type) {
+            return streamResults(url, dataHandler, errorHandler, {
+                labelSelector: `${SECRET_LABEL_SECRET_TYPE}=${type}`,
+            });
+        }
+        return streamResults(url, dataHandler, errorHandler);
     }
 }
diff --git a/src/k8s/Secret/utils/createGitServerSecretInstance/index.test.ts b/src/k8s/Secret/utils/createGitServerSecretInstance/index.test.ts
@@ -1,24 +1,63 @@
-import { GIT_PROVIDERS } from '../../../../constants/gitProviders';
-import { createGitServerSecretInstance } from './index';
+import {
+    createGerritGitServerSecretInstance,
+    createGithubGitServerSecretInstance,
+    createGitlabGitServerSecretInstance,
+} from './index';
 
 describe('testing createGitServerSecretInstance', () => {
-    it('should create correct object', () => {
-        const object = createGitServerSecretInstance({
-            name: 'test-host-name.com-n84o8',
-            gitUser: 'git',
-            token: 'test access token',
+    it('should create correct gerrit git server secret', () => {
+        const object = createGerritGitServerSecretInstance({
             sshPrivateKey: 'test private ssh key',
-            gitProvider: GIT_PROVIDERS.GERRIT,
+            sshPublicKey: 'test public ssh key',
+            username: 'test-username',
         });
 
         expect(object).toEqual({
             apiVersion: 'v1',
             kind: 'Secret',
-            metadata: { name: 'test-host-name.com-n84o8-config' },
+            metadata: { name: 'gerrit-ciuser-sshkey' },
             data: {
-                username: 'Z2l0',
                 id_rsa: 'dGVzdCBwcml2YXRlIHNzaCBrZXkK',
-                token: 'dGVzdCBhY2Nlc3MgdG9rZW4=',
+                'id_rsa.pub': 'dGVzdCBwdWJsaWMgc3NoIGtleQ==',
+                username: 'dGVzdC11c2VybmFtZQ==',
+            },
+        });
+    });
+
+    it('should create correct github git server secret', () => {
+        const object = createGithubGitServerSecretInstance({
+            sshPrivateKey: 'test private ssh key',
+            token: 'test-token',
+            username: 'test-username',
+        });
+
+        expect(object).toEqual({
+            apiVersion: 'v1',
+            kind: 'Secret',
+            metadata: { name: 'ci-github' },
+            data: {
+                id_rsa: 'dGVzdCBwcml2YXRlIHNzaCBrZXkK',
+                token: 'dGVzdC10b2tlbg==',
+                username: 'dGVzdC11c2VybmFtZQ==',
+            },
+        });
+    });
+
+    it('should create correct gitlab git server secret', () => {
+        const object = createGitlabGitServerSecretInstance({
+            sshPrivateKey: 'test private ssh key',
+            secretString: 'test-secret-string',
+            token: 'test-token',
+        });
+
+        expect(object).toEqual({
+            apiVersion: 'v1',
+            kind: 'Secret',
+            metadata: { name: 'ci-github' },
+            data: {
+                id_rsa: 'dGVzdCBwcml2YXRlIHNzaCBrZXkK',
+                secretString: 'dGVzdC1zZWNyZXQtc3RyaW5n',
+                token: 'dGVzdC10b2tlbg==',
             },
         });
     });

diff --git a/src/k8s/Secret/utils/createGitServerSecretInstance/index.ts b/src/k8s/Secret/utils/createGitServerSecretInstance/index.ts
@@ -1,32 +1,70 @@
-import { GIT_PROVIDERS } from '../../../../constants/gitProviders';
-import { DeepPartial } from '../../../../types/global';
 import { EDPKubeObjectInterface } from '../../../../types/k8s';
 import { safeEncode } from '../../../../utils/decodeEncode';
 
-export const createGitServerSecretInstance = ({
-    name,
-    gitUser,
+export const createGerritGitServerSecretInstance = ({
+    sshPrivateKey,
+    sshPublicKey,
+    username,
+}: {
+    sshPrivateKey: string;
+    sshPublicKey: string;
+    username: string;
+}): EDPKubeObjectInterface => {
+    return {
+        apiVersion: 'v1',
+        kind: 'Secret',
+        metadata: {
+            name: 'gerrit-ciuser-sshkey',
+        },
+        data: {
+            id_rsa: safeEncode(sshPrivateKey.trim() + '\n'),
+            'id_rsa.pub': safeEncode(sshPublicKey),
+            username: safeEncode(username),
+        },
+    };
+};
+
+export const createGithubGitServerSecretInstance = ({
     sshPrivateKey,
     token,
-    gitProvider,
+    username,
 }: {
-    name: string;
-    gitUser: string;
     sshPrivateKey: string;
     token: string;
-    gitProvider: GIT_PROVIDERS;
-}): DeepPartial<EDPKubeObjectInterface> => {
-    const _name = gitProvider === GIT_PROVIDERS.GERRIT ? `${name}-config` : `ci-${gitProvider}`;
+    username: string;
+}): EDPKubeObjectInterface => {
+    return {
+        apiVersion: 'v1',
+        kind: 'Secret',
+        metadata: {
+            name: 'ci-github',
+        },
+        data: {
+            id_rsa: safeEncode(sshPrivateKey.trim() + '\n'),
+            token: safeEncode(token),
+            username: safeEncode(username),
+        },
+    };
+};
 
+export const createGitlabGitServerSecretInstance = ({
+    sshPrivateKey,
+    secretString,
+    token,
+}: {
+    sshPrivateKey: string;
+    secretString: string;
+    token: string;
+}): EDPKubeObjectInterface => {
     return {
         apiVersion: 'v1',
         kind: 'Secret',
         metadata: {
-            name: _name,
+            name: 'ci-github',
         },
         data: {
-            username: safeEncode(gitUser),
             id_rsa: safeEncode(sshPrivateKey.trim() + '\n'),
+            secretString: safeEncode(secretString),
             token: safeEncode(token),
         },
     };

diff --git a/src/k8s/Secret/utils/editGitServerSecretInstance/index.ts b/src/k8s/Secret/utils/editGitServerSecretInstance/index.ts
@@ -0,0 +1,26 @@
+import { set } from 'lodash';
+import { FormNameObject } from '../../../../types/forms';
+import { SecretKubeObjectInterface } from '../../types';
+
+export const editGitServerSecretInstance = (
+    names: {
+        [key: string]: FormNameObject;
+    },
+    kubeObjectData: SecretKubeObjectInterface,
+    formValues: {
+        [key: string]: any;
+    }
+): SecretKubeObjectInterface => {
+    const base = { ...kubeObjectData };
+
+    for (const [propKey, propValue] of Object.entries(formValues)) {
+        if (names[propKey].notUsedInFormData) {
+            continue;
+        }
+
+        const propPath = names[propKey].path;
+        set(base, propPath, propValue);
+    }
+
+    return base;
+};
diff --git a/src/pages/edp-configuration/components/ConfigurationBody/index.tsx b/src/pages/edp-configuration/components/ConfigurationBody/index.tsx
@@ -45,6 +45,7 @@ export const ConfigurationBody = ({
     );
 
     const isLoading = items === null;
+    const singleItem = items?.length === 1;
 
     return (
         <ConditionalWrapper
@@ -116,13 +117,22 @@ export const ConfigurationBody = ({
                                         return (
                                             <Grid item xs={12} key={key}>
                                                 <Accordion
-                                                    expanded={expandedPanel === key}
+                                                    expanded={
+                                                        singleItem ? true : expandedPanel === key
+                                                    }
                                                     onChange={handleChange(key)}
                                                 >
                                                     <AccordionSummary
                                                         expandIcon={
-                                                            <Icon icon={ICONS.ARROW_DOWN} />
+                                                            singleItem ? null : (
+                                                                <Icon icon={ICONS.ARROW_DOWN} />
+                                                            )
                                                         }
+                                                        style={{
+                                                            cursor: singleItem
+                                                                ? 'default'
+                                                                : 'pointer',
+                                                        }}
                                                     >
                                                         <Grid
                                                             container

diff --git a/src/pages/edp-configuration/pages/edp-gitserver-list/page.tsx b/src/pages/edp-configuration/pages/edp-gitserver-list/page.tsx
@@ -1,13 +1,16 @@
 import React from 'react';
 import { PageLogicWrapper } from '../../../../components/PageLogicWrapper';
 import { DialogContextProvider } from '../../../../providers/Dialog';
+import { DynamicDataContextProvider } from './providers/DynamicData/provider';
 import { PageView } from './view';
 
 export default function () {
     return (
         <PageLogicWrapper>
             <DialogContextProvider>
-                <PageView />
+                <DynamicDataContextProvider>
+                    <PageView />
+                </DynamicDataContextProvider>
             </DialogContextProvider>
         </PageLogicWrapper>
     );

diff --git a/src/pages/edp-configuration/pages/edp-gitserver-list/providers/DynamicData/context.ts b/src/pages/edp-configuration/pages/edp-gitserver-list/providers/DynamicData/context.ts
@@ -0,0 +1,10 @@
+import React from 'react';
+import { DynamicDataContextProviderValue } from './types';
+
+export const DynamicDataContext = React.createContext<DynamicDataContextProviderValue>({
+    data: {
+        gitServer: null,
+        gitServerSecret: null,
+    },
+    isLoading: false,
+});
diff --git a/src/pages/edp-configuration/pages/edp-gitserver-list/providers/DynamicData/hooks.ts b/src/pages/edp-configuration/pages/edp-gitserver-list/providers/DynamicData/hooks.ts
@@ -0,0 +1,4 @@
+import React from 'react';
+import { DynamicDataContext } from './context';
+
+export const useDynamicDataContext = () => React.useContext(DynamicDataContext);