Merge pull request #2327 from devtron-labs/feat/bulk-trigger-deployment

feat: bulk trigger deployment in DA workflow

Author: Elessar1802

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.4.5",
+        "@devtron-labs/devtron-fe-common-lib": "1.4.8",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx

@@ -30,6 +30,7 @@ import {
     SelectPicker,
     ButtonVariantType,
     ButtonStyleType,
+    ResourceListPayloadType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { K8S_EMPTY_GROUP } from '@Components/ResourceBrowser/Constants'
 import {
@@ -44,7 +45,7 @@ import {
     getResourceGroupList,
     namespaceListByClusterId,
 } from '../../../../../../components/ResourceBrowser/ResourceBrowser.service'
-import { K8SObjectType, ResourceListPayloadType } from '../../../../../../components/ResourceBrowser/Types'
+import { K8SObjectType } from '../../../../../../components/ResourceBrowser/Types'
 import { formatOptionLabel } from '../../../../../../components/v2/common/ReactSelect.utils'
 import { ReactComponent as Clone } from '../../../../../../assets/icons/ic-copy.svg'
 import { ReactComponent as Delete } from '../../../../../../assets/icons/ic-delete-interactive.svg'

src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusListDrawer.tsx

@@ -22,10 +22,10 @@ import {
     InfoColourBar,
     Progressing,
     usePrompt,
+    DEFAULT_ROUTE_PROMPT_MESSAGE
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Prompt } from 'react-router-dom'
 import { HibernateStatusRow } from './HibernateStatusRow'
-import { DEFAULT_ROUTE_PROMPT_MESSAGE } from '../../../../config'
 import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
 import { ReactComponent as Error } from '../../../../assets/icons/ic-warning.svg'
 import { ReactComponent as MechanicalOperation } from '../../../../assets/img/ic-mechanical-operation.svg'

src/components/ApplicationGroup/Details/EnvironmentOverview/RestartWorkloadModal.tsx

@@ -27,6 +27,7 @@ import {
     stopPropagation,
     usePrompt,
     useSearchString,
+    DEFAULT_ROUTE_PROMPT_MESSAGE,
     ApiQueuingWithBatch,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Prompt, useHistory, useLocation } from 'react-router-dom'
@@ -51,7 +52,6 @@ import { RestartStatusListDrawer } from './RestartStatusListDrawer'
 import { importComponentFromFELibrary } from '../../../common'
 import { AllExpandableDropdown } from './AllExpandableDropdown'
 import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
-import { DEFAULT_ROUTE_PROMPT_MESSAGE } from '../../../../config'
 
 const BulkDeployResistanceTippy = importComponentFromFELibrary('BulkDeployResistanceTippy')
 

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

@@ -49,12 +49,13 @@ import {
     getStageTitle,
     TriggerBlockType,
     RuntimePluginVariables,
+    DEFAULT_ROUTE_PROMPT_MESSAGE,
+    triggerCDNode,
 } from '@devtron-labs/devtron-fe-common-lib'
 import Tippy from '@tippyjs/react'
 import {
     BUILD_STATUS,
     DEFAULT_GIT_BRANCH_VALUE,
-    DEFAULT_ROUTE_PROMPT_MESSAGE,
     NO_COMMIT_SELECTED,
     URLS,
     ViewType,
@@ -73,7 +74,6 @@ import {
     getCIMaterialList,
     getGitMaterialByCommitHash,
     refreshGitMaterial,
-    triggerCDNode,
     triggerCINode,
     triggerBranchChange,
 } from '../../../app/service'
@@ -1492,12 +1492,15 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
             if (ciArtifact) {
                 _CDTriggerPromiseFunctionList.push(() =>
                     triggerCDNode({
-                        pipelineId: node.id,
-                        ciArtifactId: ciArtifact.id,
-                        appId: currentAppId,
+                        pipelineId: Number(node.id),
+                        ciArtifactId: Number(ciArtifact.id),
+                        appId: Number(currentAppId),
                         stageType: bulkTriggerType,
-                        runtimeParams: runtimeParams[currentAppId] || [],
-                        isRollbackTrigger: false,
+                        ...(
+                            getRuntimeParamsPayload
+                                ? { runtimeParamsPayload: getRuntimeParamsPayload(runtimeParams[currentAppId] ?? [])}
+                                : {}
+                        ),
                     }),
                 )
             } else {

src/components/ApplicationGroup/Details/TriggerView/TriggerModalTableRow.tsx

@@ -14,27 +14,19 @@
  * limitations under the License.
  */
 
-import { useState } from 'react'
-import { Progressing, useDownload } from '@devtron-labs/devtron-fe-common-lib'
+import { useDownload } from '@devtron-labs/devtron-fe-common-lib'
 import { ResponseRowType, TriggerModalRowType } from '../../AppGroup.types'
 import { ReactComponent as Error } from '../../../../assets/icons/ic-error-exclamation.svg'
 import { ReactComponent as Success } from '../../../../assets/icons/appstatus/healthy.svg'
-import { ReactComponent as Download } from '../../../../assets/icons/ic-arrow-line-down.svg'
 import { ReactComponent as UnAuthorized } from '../../../../assets/icons/ic-locked.svg'
 import { ReactComponent as ICInfoFilled } from '../../../../assets/icons/ic-info-filled.svg'
 import { BulkResponseStatus } from '../../Constants'
 import { importComponentFromFELibrary } from '../../../common'
 
-const getDownloadManifestUrl = importComponentFromFELibrary('getDownloadManifestUrl', null, 'function')
+const DownloadManifestForVirtualEnvironmentButton = importComponentFromFELibrary('DownloadManifestForVirtualEnvironmentButton', null, 'function')
 
 export const TriggerModalRow = ({ rowData, index, isVirtualEnv, envName }: TriggerModalRowType) => {
-    const { isDownloading, handleDownload } = useDownload()
-    const [isDownloaded, setIsDownloaded] = useState(false)
-    const params = {
-        appId: rowData.appId,
-        envId: rowData.envId,
-        appName: `${rowData.appName}-${envName}`,
-    }
+    const { handleDownload } = useDownload()
 
     const renderStatusIcon = (rowData: ResponseRowType): JSX.Element => {
         if (rowData.status === BulkResponseStatus.SKIP) {
@@ -49,21 +41,9 @@ export const TriggerModalRow = ({ rowData, index, isVirtualEnv, envName }: Trigg
         return <Error className="mr-8 icon-dim-18" />
     }
 
-    const downloadPackage = (e) => {
-        e.stopPropagation()
-        if (!getDownloadManifestUrl) {
-            return
-        }
-        const downloadUrl = getDownloadManifestUrl(params)
-        const downloadError = handleDownload({ downloadUrl, fileName: params.appName, showSuccessfulToast: false })
-        if (!downloadError) {
-            setIsDownloaded(true)
-        }
-    }
-
     return (
         <div
-            className={`response-row  pt-8 pb-8 ${isVirtualEnv ? 'is-virtual' : ''}`}
+            className={`response-row  py-8 ${isVirtualEnv ? 'is-virtual' : ''}`}
             key={`response-${rowData.appId}`}
         >
             <div className="fs-13 fw-4 cn-9">{rowData.appName}</div>
@@ -73,23 +53,13 @@ export const TriggerModalRow = ({ rowData, index, isVirtualEnv, envName }: Trigg
             </div>
             <div className="fs-13 fw-4 cn-9">{rowData.message}</div>
             {isVirtualEnv && rowData.status === BulkResponseStatus.PASS && (
-                <div
-                    className="flex right cursor"
-                    data-testid={`bulk-cd-manifest-download-button-${index}`}
-                    onClick={downloadPackage}
-                >
-                    {isDownloading ? (
-                        <span className="flex">
-                            <Progressing />
-                            <span className="fs-13 flex fw-4 ml-6 cn-7">Downloading</span>
-                        </span>
-                    ) : (
-                        <span className={`flex ${isDownloaded ? 'cn-5 scn-5' : 'cb-5'} `}>
-                            <Download className="icon-dim-16" />
-                            <span className="ml-6 fw-6 fs-13">Download</span>
-                        </span>
-                    )}
-                </div>
+                <DownloadManifestForVirtualEnvironmentButton
+                    appId={rowData.appId}
+                    envId={rowData.envId}
+                    appName={`${rowData.appName}-${envName}`}
+                    handleDownload={handleDownload}
+                    showSuccessfulToast={false}
+                />
             )}
         </div>
     )

src/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx

@@ -15,11 +15,10 @@
  */
 
 import { useState } from 'react'
-import { showError, DeleteDialog, InfoColourBar, ToastVariantType, ToastManager } from '@devtron-labs/devtron-fe-common-lib'
+import { showError, DeleteDialog, InfoColourBar, ToastVariantType, ToastManager, deleteNodeCapacity } from '@devtron-labs/devtron-fe-common-lib'
 import { useParams } from 'react-router-dom'
 import { ReactComponent as Help } from '../../../assets/icons/ic-help.svg'
 import { NodeActionModalPropType } from '../types'
-import { deleteNodeCapacity } from '../clusterNodes.service'
 import { DELETE_NODE_MODAL_MESSAGING } from '../constants'
 
 export default function DeleteNodeModal({ name, version, kind, closePopup }: NodeActionModalPropType) {

src/components/ClusterNodes/clusterNodes.service.tsx

@@ -14,21 +14,12 @@
  * limitations under the License.
  */
 
-import {
-    get,
-    post,
-    put,
-    ResponseType,
-    trash,
-    APIOptions,
-    ROUTES as COMMON_ROUTES,
-} from '@devtron-labs/devtron-fe-common-lib'
+import { get, post, put, ResponseType, APIOptions, ROUTES as COMMON_ROUTES } from '@devtron-labs/devtron-fe-common-lib'
 import { Routes } from '../../config'
 import {
     ClusterCapacityResponse,
     ClusterListResponse,
     NodeCordonRequest,
-    NodeActionRequest,
     NodeDetailResponse,
     NodeDrainRequest,
     UpdateNodeRequestBody,
@@ -64,22 +55,19 @@ export const updateClusterShortDescription = (
 ): Promise<ResponseType> => put(`${Routes.CLUSTER_DESCRIPTION}`, requestPayload)
 
 export const getNodeCapacity = (clusterId: string, nodeName: string): Promise<NodeDetailResponse> =>
-    get(`${Routes.NODE_CAPACITY}?clusterId=${clusterId}&name=${nodeName}`)
+    get(`${COMMON_ROUTES.NODE_CAPACITY}?clusterId=${clusterId}&name=${nodeName}`)
 
 export const cordonNodeCapacity = (requestPayload: NodeCordonRequest): Promise<ResponseType> =>
-    put(`${Routes.NODE_CAPACITY}/cordon`, requestPayload)
+    put(`${COMMON_ROUTES.NODE_CAPACITY}/cordon`, requestPayload)
 
 export const drainNodeCapacity = (requestPayload: NodeDrainRequest): Promise<ResponseType> =>
-    put(`${Routes.NODE_CAPACITY}/drain`, requestPayload)
-
-export const deleteNodeCapacity = (requestPayload: NodeActionRequest, signal?: AbortSignal): Promise<ResponseType> =>
-    trash(Routes.NODE_CAPACITY, requestPayload, signal ? { signal } : {})
+    put(`${COMMON_ROUTES.NODE_CAPACITY}/drain`, requestPayload)
 
 export const updateNodeManifest = (
     clusterId: string,
     nodeName: string,
     nodeData: UpdateNodeRequestBody,
-): Promise<ResponseType> => put(`${Routes.NODE_CAPACITY}?clusterId=${clusterId}&name=${nodeName}`, nodeData)
+): Promise<ResponseType> => put(`${COMMON_ROUTES.NODE_CAPACITY}?clusterId=${clusterId}&name=${nodeName}`, nodeData)
 
 export const clusterTerminalStart = (data: TerminalDataType, option: APIOptions): Promise<ResponseType> =>
     post(`${Routes.CLUSTER_TERMINAL}/${Routes.START}`, data, option)

src/components/ClusterNodes/types.ts

@@ -21,6 +21,7 @@ import {
     ClusterCapacityType,
     ClusterDetail,
     NodeTaintType,
+    NodeActionRequest,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { UpdateTabUrlParamsType } from '@Components/common/DynamicTabs/Types'
 import { LabelTag, OptionType } from '../app/types'
@@ -172,12 +173,6 @@ export interface TaintErrorObj {
     }[]
 }
 
-export interface NodeActionRequest {
-    clusterId?: number
-    name: string
-    version: string
-    kind: string
-}
 export interface NodeActionModalPropType extends NodeActionRequest {
     closePopup: (refreshData?: boolean) => void
 }

src/components/ResourceBrowser/ResourceBrowser.service.tsx

@@ -17,27 +17,18 @@
 import {
     ApiResourceType,
     get,
-    post,
     ResponseType,
-    convertJSONPointerToJSONPath,
     getK8sResourceList,
     getIsRequestAborted,
     showError,
     getUrlWithSearchParams,
     getK8sResourceListPayload,
     stringComparatorBySortOrder,
 } from '@devtron-labs/devtron-fe-common-lib'
-import {
-    getManifestResource,
-    updateManifestResourceHelmApps,
-} from '@Components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.api'
-import { applyOperation, escapePathComponent } from 'fast-json-patch'
-import { JSONPath } from 'jsonpath-plus'
-import { SelectedResourceType } from '@Components/v2/appDetails/appDetails.type'
 import { RefObject } from 'react'
 import { Routes } from '../../config'
 import { ClusterListResponse } from '../../services/service.types'
-import { ResourceListPayloadType, ResourceType, GetResourceDataType, NodeRowDetail, URLParams } from './Types'
+import { GetResourceDataType, NodeRowDetail, URLParams } from './Types'
 import { SIDEBAR_KEYS } from './Constants'
 import { parseNodeList } from './Utils'
 
@@ -64,82 +55,6 @@ export const getResourceGroupList = (clusterId: string, signal?: AbortSignal): P
         signal,
     })
 
-export const deleteResource = (
-    resourceListPayload: ResourceListPayloadType,
-    signal?: AbortSignal,
-): Promise<ResponseType<ResourceType[]>> => post(Routes.DELETE_RESOURCE, resourceListPayload, signal ? { signal } : {})
-
-export const restartWorkload = async (resource: SelectedResourceType, signal: AbortSignal) => {
-    const {
-        result: {
-            manifestResponse: { manifest },
-        },
-    } = await getManifestResource(null, '', '', true, resource, signal)
-
-    if (!manifest) {
-        return
-    }
-
-    const metadataPath = '/spec/template/metadata'
-    const annotationsPath = `${metadataPath}/annotations`
-    const restartLabel = 'devtron/restart'
-
-    const jsonpathProps = {
-        json: manifest,
-        wrap: false,
-        resultType: 'value',
-    } as const
-
-    const dateString = new Date().toISOString()
-
-    if (!JSONPath({ path: convertJSONPointerToJSONPath(metadataPath), ...jsonpathProps })) {
-        applyOperation(
-            manifest,
-            {
-                op: 'add',
-                path: metadataPath,
-                value: {
-                    annotations: {
-                        [restartLabel]: dateString,
-                    },
-                },
-            },
-            false,
-            true,
-        )
-    } else if (
-        !JSONPath({
-            path: convertJSONPointerToJSONPath(annotationsPath),
-            ...jsonpathProps,
-        })
-    ) {
-        applyOperation(
-            manifest,
-            {
-                op: 'add',
-                path: annotationsPath,
-                value: { [restartLabel]: dateString },
-            },
-            false,
-            true,
-        )
-    } else {
-        applyOperation(
-            manifest,
-            {
-                op: 'add',
-                // NOTE: we only need to escape / in restartLabel when making a path out of it
-                path: `${annotationsPath}/${escapePathComponent(restartLabel)}t`,
-                value: dateString,
-            },
-            false,
-            true,
-        )
-    }
-
-    await updateManifestResourceHelmApps(null, '', '', JSON.stringify(manifest), true, resource, signal)
-}
-
 export const getNodeList = (
     clusterId: string,
     abortControllerRef: RefObject<AbortController>,