refactor: Create generic editResource function (#94)

Jira: EPMDPEDP-12902 Related: #94 Change-Id: I08ef5b6bf21bccf0c0b61c2b6cb6479806087be6
epam · Nov 7, 2023 · f336859 · f336859
1 parent f165f7f
commit f336859
Show file tree

Hide file tree

Showing 25 changed files with 35 additions and 273 deletions.
diff --git a/src/k8s/EDPCDPipeline/utils/editCDPipelineInstance/index.test.ts b/src/k8s/EDPCDPipeline/utils/editCDPipelineInstance/index.test.ts
diff --git a/src/k8s/EDPCDPipeline/utils/editCDPipelineInstance/index.ts b/src/k8s/EDPCDPipeline/utils/editCDPipelineInstance/index.ts
diff --git a/src/k8s/EDPCDPipelineStage/utils/editCDPipelineStageInstance/index.test.ts b/src/k8s/EDPCDPipelineStage/utils/editCDPipelineStageInstance/index.test.ts
diff --git a/src/k8s/EDPCDPipelineStage/utils/editCDPipelineStageInstance/index.ts b/src/k8s/EDPCDPipelineStage/utils/editCDPipelineStageInstance/index.ts
diff --git a/src/k8s/EDPCodebase/utils/editCodebaseInstance/index.test.ts b/src/k8s/EDPCodebase/utils/editCodebaseInstance/index.test.ts
diff --git a/src/k8s/EDPCodebase/utils/editCodebaseInstance/index.ts b/src/k8s/EDPCodebase/utils/editCodebaseInstance/index.ts
diff --git a/src/k8s/EDPCodebaseBranch/utils/editCodebaseBranchInstance/index.test.ts b/src/k8s/EDPCodebaseBranch/utils/editCodebaseBranchInstance/index.test.ts
diff --git a/src/k8s/EDPCodebaseBranch/utils/editCodebaseBranchInstance/index.ts b/src/k8s/EDPCodebaseBranch/utils/editCodebaseBranchInstance/index.ts
diff --git a/src/k8s/EDPComponent/utils/editEDPComponentInstance/index.test.ts b/src/k8s/EDPComponent/utils/editEDPComponentInstance/index.test.ts
diff --git a/src/k8s/EDPComponent/utils/editEDPComponentInstance/index.ts b/src/k8s/EDPComponent/utils/editEDPComponentInstance/index.ts
diff --git a/src/k8s/EDPGitServer/utils/editGitServerInstance/index.test.ts b/src/k8s/EDPGitServer/utils/editGitServerInstance/index.test.ts
diff --git a/src/k8s/EDPGitServer/utils/editGitServerInstance/index.ts b/src/k8s/EDPGitServer/utils/editGitServerInstance/index.ts
diff --git a/src/k8s/Secret/utils/editGitServerSecretInstance/index.ts b/src/k8s/Secret/utils/editGitServerSecretInstance/index.ts
diff --git a/src/k8s/ServiceAccount/utils/editServiceAccount/index.test.ts b/src/k8s/ServiceAccount/utils/editServiceAccount/index.test.ts
diff --git a/src/k8s/ServiceAccount/utils/editServiceAccount/index.ts b/src/k8s/ServiceAccount/utils/editServiceAccount/index.ts
diff --git a/...ConfigMap/utils/editEDPConfigConfigMap.ts → src/k8s/common/editResource/index.ts b/...ConfigMap/utils/editEDPConfigConfigMap.ts → src/k8s/common/editResource/index.ts
@@ -1,17 +1,17 @@
 import { set } from 'lodash';
 import { FormNameObject } from '../../../types/forms';
-import { ConfigMapKubeObjectInterface } from '../types';
+import { EDPKubeObjectInterface } from '../../../types/k8s';
 
-export const editEDPConfigConfigMap = (
+export const editResource = <T extends EDPKubeObjectInterface>(
     names: {
         [key: string]: FormNameObject;
     },
-    currentConfigMap: ConfigMapKubeObjectInterface,
+    currentResource: T,
     formValues: {
         [key: string]: any;
     }
-): ConfigMapKubeObjectInterface => {
-    const base = { ...currentConfigMap };
+): T => {
+    const base = { ...currentResource };
 
     for (const [propKey, propValue] of Object.entries(formValues)) {
         if (names[propKey]?.notUsedInFormData) {

diff --git a/src/widgets/CreateCodebaseBranch/components/FormActions/index.tsx b/src/widgets/CreateCodebaseBranch/components/FormActions/index.tsx
@@ -1,9 +1,9 @@
 import { Button } from '@material-ui/core';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { editResource } from '../../../../k8s/common/editResource';
 import { useCreateCodebaseBranch } from '../../../../k8s/EDPCodebaseBranch/hooks/useCreateCodebaseBranch';
 import { createCodebaseBranchInstance } from '../../../../k8s/EDPCodebaseBranch/utils/createCodebaseBranchInstance';
-import { editCodebaseBranchInstance } from '../../../../k8s/EDPCodebaseBranch/utils/editCodebaseBranchInstance';
 import { useSpecificDialogContext } from '../../../../providers/Dialog/hooks';
 import { createVersioningString } from '../../../../utils/createVersioningString';
 import { getUsedValues } from '../../../../utils/forms/getUsedValues';
@@ -70,7 +70,7 @@ export const FormActions = () => {
             );
 
             if (!!values.release) {
-                const newDefaultBranch = editCodebaseBranchInstance(
+                const newDefaultBranch = editResource(
                     {
                         version: {
                             name: 'version',

diff --git a/src/widgets/CreateEditCDPipeline/components/Edit/components/FormActions/index.tsx b/src/widgets/CreateEditCDPipeline/components/Edit/components/FormActions/index.tsx
@@ -1,8 +1,8 @@
 import { Button } from '@material-ui/core';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { editResource } from '../../../../../../k8s/common/editResource';
 import { useEditCDPipeline } from '../../../../../../k8s/EDPCDPipeline/hooks/useEditCDPipeline';
-import { editCDPipelineInstance } from '../../../../../../k8s/EDPCDPipeline/utils/editCDPipelineInstance';
 import { useSpecificDialogContext } from '../../../../../../providers/Dialog/hooks';
 import { getUsedValues } from '../../../../../../utils/forms/getUsedValues';
 import { CREATE_EDIT_CD_PIPELINE_DIALOG_NAME } from '../../../../constants';
@@ -49,7 +49,7 @@ export const FormActions = () => {
     const onSubmit = React.useCallback(
         async (values: CreateEditCDPipelineFormValues) => {
             const usedValues = getUsedValues(values, CDPIPELINE_FORM_NAMES);
-            const newCDPipelineData = editCDPipelineInstance(
+            const newCDPipelineData = editResource(
                 CDPIPELINE_FORM_NAMES,
                 CDPipelineData,
                 usedValues

diff --git a/src/widgets/CreateEditCodebase/components/Edit/components/FormActions/index.tsx b/src/widgets/CreateEditCodebase/components/Edit/components/FormActions/index.tsx
@@ -1,8 +1,8 @@
 import { Button } from '@material-ui/core';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { editResource } from '../../../../../../k8s/common/editResource';
 import { useCodebaseCRUD } from '../../../../../../k8s/EDPCodebase/hooks/useCodebaseCRUD';
-import { editCodebaseInstance } from '../../../../../../k8s/EDPCodebase/utils/editCodebaseInstance';
 import { useSpecificDialogContext } from '../../../../../../providers/Dialog/hooks';
 import { getUsedValues } from '../../../../../../utils/forms/getUsedValues';
 import { CREATE_EDIT_CODEBASE_DIALOG_NAME } from '../../../../constants';
@@ -51,11 +51,7 @@ export const FormActions = () => {
                       jiraIssueMetadataPayload: null,
                   };
 
-            const updatedCodebaseData = editCodebaseInstance(
-                CODEBASE_FORM_NAMES,
-                codebaseData,
-                formValues
-            );
+            const updatedCodebaseData = editResource(CODEBASE_FORM_NAMES, codebaseData, formValues);
 
             await editCodebase({
                 codebaseData: updatedCodebaseData,

diff --git a/src/widgets/CreateEditStage/components/Edit/components/FormActions/index.tsx b/src/widgets/CreateEditStage/components/Edit/components/FormActions/index.tsx
@@ -1,8 +1,8 @@
 import { Button } from '@material-ui/core';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
+import { editResource } from '../../../../../../k8s/common/editResource';
 import { useEditCDPipelineStage } from '../../../../../../k8s/EDPCDPipelineStage/hooks/useEditCDPipelineStage';
-import { editCDPipelineStageInstance } from '../../../../../../k8s/EDPCDPipelineStage/utils/editCDPipelineStageInstance';
 import { useSpecificDialogContext } from '../../../../../../providers/Dialog/hooks';
 import { getUsedValues } from '../../../../../../utils/forms/getUsedValues';
 import { CREATE_EDIT_STAGE_DIALOG_NAME } from '../../../../constants';
@@ -46,11 +46,7 @@ export const FormActions = () => {
     const onSubmit = React.useCallback(
         async (values: CreateEditStageFormValues) => {
             const usedValues = getUsedValues(values, STAGE_FORM_NAMES);
-            const newCDPipelineStageData = editCDPipelineStageInstance(
-                STAGE_FORM_NAMES,
-                stage,
-                usedValues
-            );
+            const newCDPipelineStageData = editResource(STAGE_FORM_NAMES, stage, usedValues);
 
             await editCDPipelineStage({ CDPipelineStageData: newCDPipelineStageData });
         },

diff --git a/src/widgets/ManageEDPComponent/components/FormActions/index.tsx b/src/widgets/ManageEDPComponent/components/FormActions/index.tsx
@@ -2,10 +2,10 @@ import { Button, Grid } from '@material-ui/core';
 import React from 'react';
 import { useFormContext as useReactHookFormContext } from 'react-hook-form';
 import { Render } from '../../../../components/Render';
+import { editResource } from '../../../../k8s/common/editResource';
 import { useCreateEDPComponent } from '../../../../k8s/EDPComponent/hooks/useCreateEDPComponent';
 import { EDPComponentKubeObjectInterface } from '../../../../k8s/EDPComponent/types';
 import { createEDPComponentInstance } from '../../../../k8s/EDPComponent/utils/createEDPComponentInstance';
-import { editEDPComponentInstance } from '../../../../k8s/EDPComponent/utils/editEDPComponentInstance';
 import { useFormContext } from '../../../../providers/Form/hooks';
 import { FORM_MODES } from '../../../../types/forms';
 import { EDP_COMPONENT_FORM_NAMES } from '../../names';
@@ -49,7 +49,7 @@ export const FormActions = () => {
                 values
             );
 
-            const EDPComponentEditedInstance = editEDPComponentInstance(
+            const EDPComponentEditedInstance = editResource(
                 EDP_COMPONENT_FORM_NAMES,
                 currentElement as EDPComponentKubeObjectInterface,
                 values