Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/holmes-integration

Author: arunjaindev

.env

@@ -64,4 +64,4 @@ FEATURE_APPLICATION_TEMPLATES_ENABLE=true
 FEATURE_CODE_MIRROR_ENABLE=false
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
 GATEKEEPER_URL=https://license.devtron.ai/dashboard
-FEATURE_AI_INTEGRATION_ENABLE=true
+FEATURE_AI_INTEGRATION_ENABLE=false

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-3-beta-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/SelectMergeStrategy.tsx

@@ -25,6 +25,7 @@ import {
     SelectPicker,
     SelectPickerOptionType,
     SelectPickerVariantType,
+    Tooltip,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { importComponentFromFELibrary } from '@Components/common'
@@ -69,10 +70,15 @@ const SelectMergeStrategy = ({
 
         return (
             <>
-                {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-                <label className={`m-0 ${MERGE_STRATEGY_LABEL_CLASS}`} htmlFor="config-toolbar-select-strategy">
-                    Merge strategy
-                </label>
+                <Tooltip content="Merge strategy">
+                    {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+                    <label
+                        className={`m-0 dc__ellipsis-right ${MERGE_STRATEGY_LABEL_CLASS}`}
+                        htmlFor="config-toolbar-select-strategy"
+                    >
+                        Merge strategy
+                    </label>
+                </Tooltip>
 
                 <SelectPicker
                     inputId="config-toolbar-select-strategy"

src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx

@@ -1193,7 +1193,10 @@ export const ConfigMapSecretContainer = ({
                         areCommentsPresent={areCommentsPresent}
                         disableAllActions={isLoading || isSubmitting || !!parsingError}
                         isDraftPresent={isDraftAvailable}
-                        isPublishedConfigPresent={cmSecretStateLabel !== CM_SECRET_STATE.UNPUBLISHED}
+                        isPublishedConfigPresent={
+                            cmSecretStateLabel !== CM_SECRET_STATE.UNPUBLISHED &&
+                            cmSecretStateLabel !== CM_SECRET_STATE.INHERITED
+                        }
                         isApprovalPending={draftData?.draftState === DraftState.AwaitApproval}
                         isUnpublished={cmSecretStateLabel === CM_SECRET_STATE.UNPUBLISHED}
                         showDeleteOverrideDraftEmptyState={

src/components/ApplicationGroup/AppGroup.types.ts

@@ -93,6 +93,7 @@ export interface BulkCDDetailType
     ciPipelineId?: number
     hideImageTaggingHardDelete?: boolean
     resourceFilters?: FilterConditionsListType[]
+    isExceptionUser?: boolean
 }
 
 export interface ResponseRowType {

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

@@ -47,8 +47,9 @@ import {
     Button,
     ComponentSizeType,
     AnimatedDeployButton,
-    ButtonVariantType,
     Icon,
+    getIsApprovalPolicyConfigured,
+    ButtonVariantType,
     ButtonStyleType,
     useMainContext,
 } from '@devtron-labs/devtron-fe-common-lib'
@@ -61,13 +62,15 @@ import { ReactComponent as Tag } from '@Icons/ic-tag.svg'
 import emptyPreDeploy from '../../../../assets/img/empty-pre-deploy.webp'
 import notAuthorized from '../../../../assets/img/ic-not-authorized.svg'
 import CDMaterial from '../../../app/details/triggerView/cdMaterial'
+import { getIsMaterialApproved } from '@Components/app/details/triggerView/cdMaterials.utils'
 import { BulkSelectionEvents, MATERIAL_TYPE, RuntimeParamsErrorState } from '../../../app/details/triggerView/types'
 import { BulkCDDetailType, BulkCDTriggerType } from '../../AppGroup.types'
 import { BULK_CD_DEPLOYMENT_STATUS, BULK_CD_MATERIAL_STATUS, BULK_CD_MESSAGING, BUTTON_TITLE } from '../../Constants'
 import TriggerResponseModalBody, { TriggerResponseModalFooter } from './TriggerResponseModal'
 import { ReactComponent as MechanicalOperation } from '../../../../assets/img/ic-mechanical-operation.svg'
 import { importComponentFromFELibrary } from '../../../common'
 import { BULK_ERROR_MESSAGES } from './constants'
+import { getIsNonApprovedImageSelected, getIsImageApprovedByDeployerSelected } from './utils'
 
 const DeploymentWindowInfoBar = importComponentFromFELibrary('DeploymentWindowInfoBar')
 const BulkDeployResistanceTippy = importComponentFromFELibrary('BulkDeployResistanceTippy')
@@ -436,6 +439,25 @@ export default function BulkCDTrigger({
         )
     }
 
+    const renderDeploymentWithoutApprovalWarning = (app: BulkCDDetailType) => {
+        if (!app.isExceptionUser) {
+            return null
+        }
+
+        const selectedMaterial: CDMaterialType = app.material?.find((mat: CDMaterialType) => mat.isSelected)
+
+        if (!selectedMaterial || getIsMaterialApproved(selectedMaterial?.userApprovalMetadata)) {
+            return null
+        }
+
+        return (
+            <div className="flex left dc__gap-4 mb-4">
+                <Icon name="ic-warning" color={null} size={14} />
+                <p className="m-0 fs-12 lh-16 fw-4 cy-7">Non-approved image selected</p>
+            </div>
+        )
+    }
+
     const renderAppWarningAndErrors = (app: BulkCDDetailType) => {
         const commonNodeAttrType: CommonNodeAttr['type'] =
             app.stageType === DeploymentNodeType.PRECD ? 'PRECD' : 'POSTCD'
@@ -446,7 +468,7 @@ export default function BulkCDTrigger({
 
         if (unauthorizedAppList[app.appId]) {
             return (
-                <div className="flex left top dc__gap-4">
+                <div className="flex left dc__gap-4">
                     <UnAuthorized className="icon-dim-12 warning-icon-y7 mr-4 dc__no-shrink" />
                     <span className="cy-7 fw-4 fs-12 dc__truncate">{BULK_CD_MESSAGING.unauthorized.title}</span>
                 </div>
@@ -481,7 +503,7 @@ export default function BulkCDTrigger({
         if (!!warningMessage && !app.showPluginWarning) {
             return (
                 <div className="flex left top dc__gap-4">
-                    <Error className="icon-dim-12 dc__no-shrink mt-5 warning-icon-y7" />
+                    <Icon name="ic-warning" color={null} size={14} />
                     <span className="fw-4 fs-12 cy-7 dc__truncate">{warningMessage}</span>
                 </div>
             )
@@ -775,6 +797,7 @@ export default function BulkCDTrigger({
                             onClick={changeApp}
                         >
                             {app.name}
+                            {renderDeploymentWithoutApprovalWarning(app)}
                             {renderAppWarningAndErrors(app)}
                         </div>
                     ))}
@@ -856,7 +879,10 @@ export default function BulkCDTrigger({
 
     const renderFooterSection = (): JSX.Element => {
         const isDeployButtonDisabled: boolean = isDeployDisabled()
+        const canDeployWithoutApproval = getIsNonApprovedImageSelected(appList)
+        const canImageApproverDeploy = getIsImageApprovedByDeployerSelected(appList)
         const showSkipHibernatedCheckbox = !!SkipHibernatedCheckbox && canFetchHelmAppStatus
+
         return (
             <div
                 className={`dc__border-top flex ${showSkipHibernatedCheckbox ? 'dc__content-space' : 'right'} bg__primary px-20 py-16`}
@@ -873,7 +899,15 @@ export default function BulkCDTrigger({
                 )}
                 <div className="dc__position-rel tippy-over">
                     {!isDeployButtonDisabled && stage === DeploymentNodeType.CD && !isLoading ? (
-                        <AnimatedDeployButton onButtonClick={onClickStartDeploy} isVirtualEnvironment={false} />
+                        <AnimatedDeployButton
+                            onButtonClick={onClickStartDeploy}
+                            isVirtualEnvironment={false}
+                            exceptionUserConfig={{
+                                canDeploy: canDeployWithoutApproval,
+                                isImageApprover: canImageApproverDeploy,
+                            }}
+                            isBulkCDTrigger
+                        />
                     ) : (
                         <Button
                             dataTestId="deploy-button"

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

@@ -922,7 +922,9 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
             const nodes = workflow.nodes.map((node) => {
                 if (cdNodeId == node.id && node.type === nodeType) {
                     // TODO: Ig not using this, can remove it
-                    node.approvalConfigData = workflow.approvalConfiguredIdsMap[cdNodeId]
+                    if (node.type === WorkflowNodeType.CD) {
+                        node.approvalConfigData = workflow.approvalConfiguredIdsMap[cdNodeId]
+                    }
                     _selectedNode = node
                     _workflowId = workflow.id
                     _appID = workflow.appId
@@ -1403,6 +1405,8 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                 }
                 wf.appReleaseTags = _materialData?.appReleaseTagNames
                 wf.tagsEditable = _materialData?.tagsEditable
+                wf.canApproverDeploy = _materialData?.canApproverDeploy ?? false
+                wf.isExceptionUser = _materialData?.deploymentApprovalInfo?.approvalConfigData?.isExceptionUser ?? false
             }
 
             return wf
@@ -1796,6 +1800,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                                 ? `${stageText} is blocked`
                                 : '',
                         triggerBlockedInfo: _selectedNode.triggerBlockedInfo,
+                        isExceptionUser: wf.isExceptionUser,
                     })
                 } else {
                     let warningMessage = ''

src/components/ApplicationGroup/Details/TriggerView/utils.ts

@@ -14,7 +14,34 @@
  * limitations under the License.
  */
 
-import { BulkCIDetailType } from '../../AppGroup.types'
+import { getIsMaterialApproved } from '@Components/app/details/triggerView/cdMaterials.utils'
+
+import { BulkCDDetailType, BulkCIDetailType } from '../../AppGroup.types'
 
 export const getIsAppUnorthodox = (app: BulkCIDetailType): boolean =>
     app.isLinkedCI || app.isWebhookCI || app.isLinkedCD
+
+export const getIsNonApprovedImageSelected = (appList: BulkCDDetailType[]): boolean =>
+    appList.some((app) => {
+        if (!app.isExceptionUser) {
+            return false
+        }
+
+        return (app.material || []).some(
+            (material) => material.isSelected && !getIsMaterialApproved(material.userApprovalMetadata),
+        )
+    })
+
+export const getIsImageApprovedByDeployerSelected = (appList: BulkCDDetailType[]): boolean =>
+    appList.some((app) => {
+        if (!app.isExceptionUser) {
+            return false
+        }
+
+        return (app.material || []).some(
+            (material) =>
+                material.isSelected &&
+                !material.canApproverDeploy &&
+                material.userApprovalMetadata?.hasCurrentUserApproved,
+        )
+    })