Merge pull request #1606 from devtron-labs/image-digets-uat

fix: content added for global only & pipeline

Author: shivani170

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.58",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.58-beta-24",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
         "@rjsf/validator-ajv8": "^5.13.3",

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_FOR_PIPELINE, DIGEST_DISABLE_TOGGLE_MESSAGE_GLOBAL } 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 => {
@@ -14,10 +14,10 @@ function PullImageDigestToggle({ formData, setFormData }: PullImageDigestToggleT
 
     const getContentText = () => {
         let text = ''
-        if (formData.isDigestEnforcedForEnv) {
-            text = DIGEST_DISABLE_TOGGLE_MESSAGE_GLOBAL
-        } else if (formData.isDigestEnforcedForPipeline) {
+        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
     }

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/config/constants.ts

@@ -812,6 +812,6 @@ 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_GLOBAL= "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."
 

src/css/base.scss

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