Merge branch 'main' of github.com:devtron-labs/dashboard into feat/inactive-user

Author: eshankvaish

src/components/cdPipeline/BuildCD.tsx

@@ -150,6 +150,7 @@ export default function BuildCD({
                 ? GeneratedHelmPush.DO_NOT_PUSH
                 : GeneratedHelmPush.PUSH
             _form.allowedDeploymentTypes = selection.allowedDeploymentTypes
+            _form.isDigestEnforcedForEnv = _form.environments.find((env) => env.id == selection.id)?.isDigestEnforcedForEnv
             setFormDataErrorObj(_formDataErrorObj)
             setFormData(_form)
         } else {

src/components/cdPipeline/NewCDPipeline.tsx

@@ -263,6 +263,7 @@ export default function NewCDPipeline({
                         description: env.description,
                         isVirtualEnvironment: env.isVirtualEnvironment,
                         allowedDeploymentTypes: env.allowedDeploymentTypes || [],
+                        isDigestEnforcedForEnv: env.isDigestEnforcedForEnv,
                     }
                 })
                 sortObjectArrayAlphabetically(list, 'name')
@@ -447,7 +448,7 @@ export default function NewCDPipeline({
         form.enableCustomTag = pipelineConfigFromRes.enableCustomTag
         form.customTagStage = pipelineConfigFromRes.customTagStage
         form.isDigestEnforcedForEnv = pipelineConfigFromRes.isDigestEnforcedForEnv
-        form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForEnv || pipelineConfigFromRes.isDigestEnforcedForPipeline
+        form.isDigestEnforcedForPipeline = pipelineConfigFromRes.isDigestEnforcedForPipeline
 
         if (pipelineConfigFromRes?.preDeployStage) {
             if(pipelineConfigFromRes.preDeployStage.steps?.length > 0){

src/components/cdPipeline/PullImageDigestToggle.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import Tippy from '@tippyjs/react'
 import { ReactComponent as DockerWithImage } from '../../assets/icons/ic-docker-with-image.svg'
 import { PullImageDigestToggleType } from './types'
-import { DIGEST_DISABLE_TOGGLE_MESSAGE } from '../../config'
+import { DIGEST_DISABLE_TOGGLE_MESSAGE_FOR_PIPELINE, DIGEST_DISABLE_TOGGLE_MESSAGE_GLOBAL_ONLY } from '../../config'
 
 function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleType): JSX.Element {
     const handleImageDigestToggle = (): void => {
@@ -12,19 +12,29 @@ function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleT
         setFormData(_formData)
     }
 
+    const getContentText = () => {
+        let text = ''
+        if (formData.isDigestEnforcedForPipeline && formData.isDigestEnforcedForEnv) {
+            text = DIGEST_DISABLE_TOGGLE_MESSAGE_FOR_PIPELINE
+        } else if (formData.isDigestEnforcedForEnv) {
+            text = DIGEST_DISABLE_TOGGLE_MESSAGE_GLOBAL_ONLY
+        }
+        return text
+    }
+
     const renderDogestToggle = () => {
         return (
             <ConditionalWrap
                 condition={formData.isDigestEnforcedForEnv}
                 wrap={(children) => (
-                    <Tippy className="default-tt w-200" content={DIGEST_DISABLE_TOGGLE_MESSAGE}>
+                    <Tippy className="default-tt w-200" content={getContentText()}>
                         <div>{children}</div>
                     </Tippy>
                 )}
             >
                 <div className={`w-32 h-20 ${formData.isDigestEnforcedForEnv ? 'dc__opacity-0_4' : ''}`}>
                     <Toggle
-                        selected={formData.isDigestEnforcedForPipeline}
+                        selected={formData.isDigestEnforcedForPipeline || formData.isDigestEnforcedForEnv}
                         onSelect={handleImageDigestToggle}
                         dataTestId="create-build-pipeline-image-pull-digest-toggle"
                         disabled={formData.isDigestEnforcedForEnv}

src/components/cdPipeline/cdPipeline.types.ts

@@ -58,6 +58,7 @@ export interface Environment {
     isClusterCdActive: boolean
     isVirtualEnvironment?: boolean
     allowedDeploymentTypes?: DeploymentAppTypes[]
+    isDigestEnforcedForEnv?: boolean
 }
 export interface CommonError {
     isValid: boolean
@@ -135,6 +136,7 @@ export interface PipelineConfig {
     userApprovalConfig?: {
         requiredCount: number
     }
+    isDigestEnforcedForEnv?: boolean
 }
 
 export interface BasicCDPipelineModalProps {

src/components/deploymentConfig/DeploymentTemplateView/DeploymentTemplateGUIView.tsx

@@ -238,7 +238,11 @@ export default function DeploymentTemplateGUIView({ fetchingValues, value, readO
                                             <CustomInput
                                                 data-testid="httprequests-routes-path-textbox"
                                                 name={BASIC_FIELDS.PATH}
-                                                data-index={index}
+                                                inputProps={
+                                                    {
+                                                        'data-index': index,
+                                                    } as React.InputHTMLAttributes<HTMLInputElement>
+                                                }
                                                 value={path}
                                                 rootClassName="w-100 br-4 en-2 bw-1 pl-10 pr-10 pt-5 pb-5"
                                                 onChange={handleInputChange}

src/components/globalConfigurations/GlobalConfiguration.tsx

@@ -631,7 +631,7 @@ function Body({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
             )}
             {PullImageDigest && (
                 <Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
-                    <PullImageDigest />
+                    <PullImageDigest isSuperAdmin={isSuperAdmin}/>
                 </Route>
             )}
             {TagListContainer && (

src/config/constants.ts

@@ -811,8 +811,8 @@ export const CVE_ID_NOT_FOUND = 'CVE ID not found'
 export const CONFIGURE_LINK_NO_NAME = 'Please provide name for the tool you want to link'
 export const NO_HOST_URL = 'Please enter host url'
 export const WEBHOOK_NO_API_TOKEN_ERROR = 'API Token is required to execute webhook'
-export const DIGEST_DISABLE_TOGGLE_MESSAGE= "Pull image digest policy is enforced in Global Configurations. Go to Global Configurations to change."
-
+export const DIGEST_DISABLE_TOGGLE_MESSAGE_GLOBAL_ONLY= "Enforced from Global Configurations. Go to Global Configurations to change."
+export const DIGEST_DISABLE_TOGGLE_MESSAGE_FOR_PIPELINE= "Enforced from Global Configurations. To change, first disable it in Global Configurations, then come back here."
 export const DEFAULT_SECRET_PLACEHOLDER = '••••••••'
 
 export const API_STATUS_CODES = {

src/css/base.scss

@@ -2861,6 +2861,10 @@ textarea,
     width: 250px;
 }
 
+.w-250-imp {
+    width: 250px !important;
+}
+
 .w-280 {
     width: 280px;
 }