Merge branch 'develop' into feat/build-infra-v2

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.3.2-beta-2",
+    "version": "1.3.6",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -259,6 +259,11 @@ export interface DockerConfigOverrideType {
     ciBuildConfig: CIBuildConfigType
 }
 
+export enum WORKFLOW_CACHE_CONFIG_ENUM {
+    INHERIT = 'INHERIT',
+    OVERRIDE = 'OVERRIDE',
+}
+
 export interface FormType {
     name: string
     args: { key: string; value: string }[]
@@ -291,6 +296,11 @@ export interface FormType {
     isDockerConfigOverridden?: boolean
     dockerConfigOverride?: DockerConfigOverrideType
     isOffendingMandatoryPlugin?: boolean
+    workflowCacheConfig?: {
+        type: WORKFLOW_CACHE_CONFIG_ENUM
+        value: boolean
+        globalValue: boolean
+    }
 }
 
 export interface ErrorObj {

src/Assets/Sounds/DeployAudio.mp3

@@ -32,6 +32,7 @@ import {
     ZERO_TIME_STRING,
     TOAST_ACCESS_DENIED,
     UNCHANGED_ARRAY_ELEMENT_SYMBOL,
+    DATE_TIME_FORMATS,
 } from './Constants'
 import { ServerErrors } from './ServerError'
 import { AsyncOptions, AsyncState, DeploymentNodeType, UseSearchString } from './Types'
@@ -233,6 +234,9 @@ export function handleUTCTime(ts: string, isRelativeTime = false) {
     return timestamp
 }
 
+export const getFormattedUTCTimeForExport = (timeToConvert: string, fallback = '-') =>
+    timeToConvert ? `${moment(timeToConvert).utc().format(DATE_TIME_FORMATS.TWELVE_HOURS_EXPORT_FORMAT)} (UTC)` : '-'
+
 export function useSearchString(): UseSearchString {
     const location = useLocation()
     const queryParams: URLSearchParams = useMemo(() => {

src/Common/CIPipeline.Types.ts

@@ -17,6 +17,7 @@
 import React, { ChangeEvent } from 'react'
 import { WidgetProps } from '@rjsf/utils'
 import Toggle from '../../Toggle/Toggle'
+import { isNullOrUndefined } from '@Shared/Helpers'
 
 export const Checkbox = ({
     id,
@@ -38,7 +39,7 @@ export const Checkbox = ({
         }
     }
 
-    const isSelected: boolean = typeof value === 'undefined' ? false : value
+    const isSelected: boolean = isNullOrUndefined(value) ? false : value
 
     return (
         <div>

src/Common/Helper.tsx

@@ -119,4 +119,20 @@ input:focus + .toggle__slider {
             background-color: var(--N0);
         }
     }
+
+    &--h20 {
+        .toggle__slider {
+            &.with-icon svg {
+                height: 18px;
+                width: 18px;
+                padding: 2px;
+            }
+        }
+    
+        input:checked + .toggle__slider {
+            &.with-icon svg {
+                left: -10px;
+            }
+        }
+    }
 }

src/Common/RJSF/widgets/Checkbox.tsx

@@ -16,6 +16,7 @@
 
 export * from './constants'
 export type { UserListFilterParams, UserRoleGroup, UserGroupDTO, UserGroupType } from './types'
+export { UserTypeToFetchType } from './types'
 export * from './shared'
 export * from './service'
 export { getUserAndApiTokenOption } from './utils'

src/Common/Toggle/Toggle.scss

@@ -17,11 +17,18 @@
 import { BaseFilterQueryParams } from '../../../Shared'
 import { UserListSortableKeys, UserStatus } from './constants'
 
+export enum UserTypeToFetchType {
+    includeDeleted = 'includeDeleted',
+    excludeDelete = 'excludeDelete',
+    onlyDeleted = 'onlyDeleted',
+}
+
 export type UserListFilterParams = BaseFilterQueryParams<UserListSortableKeys> & {
     /**
      * Selected statuses (if any)
      */
     status: UserStatus[]
+    typeToFetch?: UserTypeToFetchType
 }
 
 export interface UserMinType {

src/Pages/GlobalConfigurations/Authorization/index.ts

@@ -0,0 +1,80 @@
+import { motion } from 'framer-motion'
+import { ReactComponent as ICDeploy } from '@Icons/ic-nav-rocket.svg'
+import { ComponentSizeType } from '@Shared/constants'
+import { SyntheticEvent, useEffect, useRef, useState } from 'react'
+import DeployAudio from '@Sounds/DeployAudio.mp3'
+import { Button } from '../Button'
+import './animatedDeployButton.scss'
+import { AnimatedDeployButtonProps } from './types'
+
+const AnimatedDeployButton = ({ isVirtualEnvironment, onButtonClick }: AnimatedDeployButtonProps) => {
+    const audioRef = useRef<HTMLAudioElement>(null)
+    const timeoutRef = useRef<ReturnType<typeof setTimeout>>(null)
+    const isAudioEnabled: boolean = window._env_.FEATURE_ACTION_AUDIOS_ENABLE
+    const [clicked, setClicked] = useState<boolean>(false)
+    const svgMotionVariants = {
+        hover: {
+            rotate: 45,
+        },
+    }
+
+    const handleButtonClick = async (e: SyntheticEvent) => {
+        if (clicked) {
+            return
+        }
+        if (isAudioEnabled && audioRef.current) {
+            try {
+                await audioRef.current.play()
+            } catch {
+                // do nothing
+            }
+        }
+        setClicked(true)
+        timeoutRef.current = setTimeout(() => {
+            setClicked(false)
+            onButtonClick(e, false)
+        }, 700)
+    }
+
+    useEffect(
+        () => () => {
+            clearTimeout(timeoutRef.current)
+        },
+        [],
+    )
+
+    return (
+        <motion.div whileHover="hover" className={`${clicked ? 'hide-button-text' : ''}`}>
+            <Button
+                dataTestId="cd-trigger-deploy-button"
+                text={`Deploy${isVirtualEnvironment ? ' to isolated env' : ''}`}
+                startIcon={
+                    <motion.div
+                        variants={svgMotionVariants}
+                        animate={
+                            clicked
+                                ? {
+                                      x: 200,
+                                      rotate: 45,
+                                      transition: {
+                                          duration: 0.5,
+                                          delay: 0.1,
+                                      },
+                                  }
+                                : {}
+                        }
+                    >
+                        <ICDeploy className="icon-dim-16" />
+                    </motion.div>
+                }
+                size={ComponentSizeType.large}
+                onClick={handleButtonClick}
+            />
+            {/* Disabling es-lint as captions are not required */}
+            {/* eslint-disable-next-line jsx-a11y/media-has-caption */}
+            <audio hidden ref={audioRef} src={DeployAudio} />
+        </motion.div>
+    )
+}
+
+export default AnimatedDeployButton