Merge branch 'develop' into feat/codemirror-enhancements-v2

RohitRaj011 · web-flow · commit ab4e41732be8 · 2025-03-10T11:24:30.000+05:30
diff --git a/.eslintignore b/.eslintignore
@@ -30,7 +30,6 @@ src/Common/Drawer/Drawer.tsx
 src/Common/Grid/Grid.tsx
 src/Common/Helper.tsx
 src/Common/Hooks/UseClickOutside/UseClickOutside.tsx
-src/Common/Hooks/UseSuperAdmin/UseSuperAdmin.tsx
 src/Common/Hooks/UseWindowSize/UseWindowSize.tsx
 src/Common/ImageTags.tsx
 src/Common/InfoColorBar/InfoColourbar.tsx
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.8.5",
+    "version": "1.8.7",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Assets/IconV2/ic-crown.svg b/src/Assets/IconV2/ic-crown.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.052 14.108a29.982 29.982 0 0 1 5.897 0M4.364 18.466a.675.675 0 0 0 .125.252.706.706 0 0 0 .22.186.768.768 0 0 0 .574.07 26.805 26.805 0 0 1 13.43-.001.786.786 0 0 0 .575-.07.725.725 0 0 0 .22-.186.674.674 0 0 0 .124-.252l2.348-9.377a.653.653 0 0 0-.018-.38.693.693 0 0 0-.229-.312.78.78 0 0 0-.77-.1l-4.66 1.947a.781.781 0 0 1-.534.024.729.729 0 0 1-.41-.321l-2.714-4.59a.714.714 0 0 0-.27-.26.774.774 0 0 0-.748 0 .714.714 0 0 0-.271.26l-2.714 4.59a.728.728 0 0 1-.41.32.781.781 0 0 1-.534-.023L3.037 8.296a.78.78 0 0 0-.77.1.693.693 0 0 0-.229.312.653.653 0 0 0-.018.38l2.344 9.378Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-user-key.svg b/src/Assets/IconV2/ic-user-key.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 19C3.90267 17.6928 5.10103 16.6259 6.49389 15.8894C7.62708 15.2902 8.86219 14.924 10.1285 14.8082C10.4187 14.7817 10.7105 14.7683 11.0031 14.7683C7.8111 14.7683 5.22343 12.1339 5.22343 8.88415C5.22343 5.63443 7.8111 3 11.0031 3C13.8635 3 16.2385 5.11534 16.7012 7.89323" stroke="#3B444C" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" vector-effect="non-scaling-stroke" />
+<path d="M19.0962 14.1677L19.2118 14.0519M15.0603 16.2001C14.7517 15.4305 14.7184 14.578 14.9658 13.7866C15.2133 12.9953 15.7264 12.3136 16.4184 11.8569C17.1105 11.4002 17.939 11.1965 18.7639 11.2801C19.5888 11.3637 20.3595 11.7296 20.9458 12.3159C21.5321 12.9022 21.898 13.6729 21.9816 14.4979C22.0653 15.3228 21.8615 16.1513 21.4048 16.8433C20.9481 17.5353 20.2664 18.0484 19.4751 18.2959C18.6837 18.5434 17.8312 18.51 17.0616 18.2015L14.0013 21.2617H12V19.2604L15.0603 16.2001Z" stroke="#3B444C" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/AddCDButton/AddCDButton.tsx b/src/Common/AddCDButton/AddCDButton.tsx
@@ -22,7 +22,7 @@ const TooltipContent = ({ tooltipContent }: TooltipContentProps) => {
     if (tooltipContent) {
         return (
             <div className="dc__white-space-pre-wrap">
-                <p className="m-0 cn-0 fs-12 fw-6 lh-18">Click to add</p>
+                <p className="m-0 fs-12 fw-6 lh-18">Click to add</p>
 
                 {tooltipContent}
             </div>
diff --git a/src/Common/CodeEditor/types.ts b/src/Common/CodeEditor/types.ts
@@ -101,7 +101,7 @@ export interface CodeEditorHeaderComposition {
     Clipboard?: React.FC<any>
 }
 
-export type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setDefaultCode' | 'setHeight'
+type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setDefaultCode' | 'setHeight'
 
 export interface Action {
     type: ActionTypes
diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts
@@ -49,6 +49,7 @@ import {
     CDMaterialType,
     GlobalVariableDTO,
     GlobalVariableOptionType,
+    UserRole,
 } from './Types'
 import { ApiResourceType, STAGE_MAP } from '../Pages'
 import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types'
@@ -70,13 +71,6 @@ export const getTeamListMin = (): Promise<TeamList> => {
     })
 }
 
-interface UserRole extends ResponseType {
-    result?: {
-        roles: string[]
-        superAdmin: boolean
-    }
-}
-
 export const SourceTypeMap = {
     BranchFixed: 'SOURCE_TYPE_BRANCH_FIXED',
     WEBHOOK: 'WEBHOOK',
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
@@ -140,6 +140,7 @@ export const ROUTES = {
     CD_TRIGGER_POST: 'app/cd-pipeline/trigger',
     DELETE_RESOURCE: 'k8s/resource/delete',
     NODE_CAPACITY: 'k8s/capacity/node',
+    ENVIRONMENT_DATA: 'global/environment-variables',
 }
 
 export enum KEY_VALUE {
diff --git a/src/Common/Hooks/UseGetUserRoles/UseGetUserRoles.tsx b/src/Common/Hooks/UseGetUserRoles/UseGetUserRoles.tsx
@@ -14,27 +14,39 @@
  * limitations under the License.
  */
 
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { getUserRole } from '../../Common.service'
-import { useSuperAdminType } from './types'
+import { UseGetUserRolesType } from './types'
 import { showError } from '../../Helper'
 
 /**
  * @description It will return isSuperAdmin and would be set to false by default, might need few optimizations like dep, etc
- * @returns {useSuperAdminType} isSuperAdmin
+ * @returns {UseGetUserRolesType} isSuperAdmin, canManageAllAccess
  */
-export const useSuperAdmin = (): useSuperAdminType => {
-    const [isSuperAdmin, setSuperAdmin] = useState<boolean>(false)
+const useGetUserRoles = (): UseGetUserRolesType => {
+    const [result, setResult] = useState<UseGetUserRolesType>({
+        isSuperAdmin: false,
+        canManageAllAccess: false,
+        hasManagerPermissions: false,
+    })
 
     useEffect(() => {
         getUserRole()
-            .then((response) => {
-                setSuperAdmin(response.result.superAdmin ?? false)
+            .then(({ result: apiResult }) => {
+                const hasManagerPermissions = apiResult.roles.some((role) => role.startsWith('role:manager'))
+
+                setResult({
+                    isSuperAdmin: apiResult.superAdmin ?? false,
+                    canManageAllAccess: apiResult.canManageAllAccess ?? false,
+                    hasManagerPermissions,
+                })
             })
             .catch((error) => {
                 showError(error)
             })
     }, [])
 
-    return { isSuperAdmin }
+    return result
 }
+
+export default useGetUserRoles
diff --git a/src/Common/Hooks/UseGetUserRoles/index.tsx b/src/Common/Hooks/UseGetUserRoles/index.tsx
@@ -0,0 +1 @@
+export { default as useGetUserRoles } from './UseGetUserRoles'
diff --git a/src/Common/Hooks/UseGetUserRoles/types.ts b/src/Common/Hooks/UseGetUserRoles/types.ts
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
-export interface useSuperAdminType {
+export interface UseGetUserRolesType {
     isSuperAdmin: boolean
+    /**
+     * User can give access to all other users
+     */
+    canManageAllAccess?: boolean
+    hasManagerPermissions: boolean
 }
diff --git a/src/Common/Hooks/index.ts b/src/Common/Hooks/index.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export { useSuperAdmin } from './UseSuperAdmin/UseSuperAdmin'
+export { useGetUserRoles } from './UseGetUserRoles'
 export { useClickOutside } from './UseClickOutside/UseClickOutside'
 export { useWindowSize } from './UseWindowSize/UseWindowSize'
 export * from './useUrlFilters'
diff --git a/src/Common/InfoColorBar/InfoColourbar.tsx b/src/Common/InfoColorBar/InfoColourbar.tsx
@@ -17,6 +17,7 @@
 import { Link } from 'react-router-dom'
 import { InfoColourBarType } from '../Types'
 import { Tooltip } from '@Common/Tooltip'
+import { Button } from '@Shared/Components'
 import './infoColourBar.scss'
 
 /**
@@ -85,15 +86,23 @@ const InfoColourBar = ({
 
     const renderMessageWrapper = () => {
         if (textConfig) {
-            const { heading, description } = textConfig
+            const { heading, description, actionButtonConfig } = textConfig
 
             return (
-                <div className="flexbox-col">
-                    {heading && <h6 className="m-0 cn-9 fs-13 fw-6 lh-20 dc__truncate">{heading}</h6>}
+                <div className="flexbox flex-grow-1 dc__content-space dc__align-start">
+                    <div className="flexbox-col">
+                        {heading && <h6 className="m-0 cn-9 fs-13 fw-6 lh-20 dc__truncate">{heading}</h6>}
 
-                    <Tooltip content={description}>
-                        <p className="dc__truncate--clamp-3 m-0 cn-9 fs-13 fw-4 lh-20">{description}</p>
-                    </Tooltip>
+                        <Tooltip content={description}>
+                            <p className="dc__truncate--clamp-3 m-0 cn-9 fs-13 fw-4 lh-20">{description}</p>
+                        </Tooltip>
+                    </div>
+
+                    {actionButtonConfig && (
+                        <Button
+                            {...actionButtonConfig}
+                        />
+                    )}
                 </div>
             )
         }
@@ -112,7 +121,7 @@ const InfoColourBar = ({
                 className={`${classname} info_text flex dc__content-space pt-8 pb-8 pl-12 pr-12 br-4 top fs-13 fw-4`}
                 style={styles}
             >
-                <div className={`flex top ${typeof renderActionButton === 'function' ? 'mr-5' : ''}`}>
+                <div className={`flex top ${typeof renderActionButton === 'function' ? 'mr-5' : ''} ${!!textConfig ? 'flex-grow-1' : ''}`}>
                     {!hideIcon && (
                         <div className={`icon-dim-${iconSize ?? '20'} mr-10`}>
                             <Icon className={`icon-dim-${iconSize ?? '20'} ${iconClass || ''} mr-8`} />
diff --git a/src/Common/Toggle/Toggle.tsx b/src/Common/Toggle/Toggle.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { useCallback } from 'react'
+import React, { SyntheticEvent, useCallback } from 'react'
 import { throttle, useEffectAfterMount } from '../Helper'
 import './Toggle.scss'
 
@@ -28,6 +28,7 @@ const Toggle = ({
     Icon = null,
     iconClass = '',
     throttleOnChange = false,
+    shouldToggleValueOnLabelClick = false,
     ...props
 }) => {
     const [active, setActive] = React.useState(selected)
@@ -44,26 +45,37 @@ const Toggle = ({
         setActive(selected)
     }, [selected])
 
-    function handleClick(e) {
+    function handleClick() {
         if (!disabled) {
             setActive((active) => !active)
         }
     }
 
     const throttledHandleClick = useCallback(throttle(handleClick, 500), [disabled])
 
+    const handleChange = () => {
+        if (throttleOnChange) {
+            throttledHandleClick()
+            return
+        }
+        handleClick()
+    }
+
+    const handleLabelClick = (e: SyntheticEvent) => {
+        if (shouldToggleValueOnLabelClick) {
+            e.preventDefault()
+            handleChange()
+        }
+    }
+
     return (
         <label
             {...props}
             className={`${rootClassName} toggle__switch ${disabled ? 'disabled' : ''}`}
             style={{ ['--color' as any]: color }}
+            {...(shouldToggleValueOnLabelClick ? {onClick: handleLabelClick} : {})}
         >
-            <input
-                type="checkbox"
-                checked={!!active}
-                onChange={throttleOnChange ? throttledHandleClick : handleClick}
-                className="toggle__input"
-            />
+            <input type="checkbox" checked={!!active} onChange={handleChange} className="toggle__input" />
             <span className={`toggle__slider ${Icon ? 'with-icon br-4 dc__border' : 'round'}`} data-testid={dataTestId}>
                 {Icon && <Icon className={`icon-dim-20 br-4 p-2 ${iconClass}`} />}
             </span>
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
@@ -25,6 +25,7 @@ import {
     Severity,
     PolicyBlockInfo,
     TargetPlatformItemDTO,
+    ButtonProps,
     ComponentLayoutType,
 } from '../Shared'
 import {
@@ -218,6 +219,7 @@ interface InfoColourBarTextConfigType {
      * If given would be shown below the heading (if given)
      */
     description: string
+    actionButtonConfig?: ButtonProps
 }
 
 type InfoColourBarMessageProp = {
@@ -1074,3 +1076,24 @@ export type GlobalVariableOptionType = Omit<GlobalVariableDTO, 'name'> & {
     value: string
     variableType: Extract<RefVariableType, RefVariableType.GLOBAL>
 }
+
+export interface UserRole extends ResponseType {
+    result?: {
+        roles: string[]
+        superAdmin: boolean
+        /**
+         * Defines if a user is access manager and can manage all access
+         */
+        canManageAllAccess?: boolean
+    }
+}
+
+export enum ActionTypes {
+    MANAGER = 'manager',
+    ADMIN = 'admin',
+    TRIGGER = 'trigger',
+    VIEW = 'view',
+    UPDATE = 'update',
+    EDIT = 'edit',
+    APPROVER = 'approver',
+}
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/DeploymentTemplate/types.ts b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/DeploymentTemplate/types.ts
@@ -129,6 +129,11 @@ export interface SelectedChartDetailsType {
     selectedChart: DeploymentChartVersionType
 }
 
+export enum PipelineMigratedFromType {
+    HELM_RELEASE = 'helmRelease',
+    ARGO_APPLICATION = 'argoApplication',
+}
+
 interface EnvironmentConfigType {
     id: number
     status: number
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx b/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
@@ -57,7 +57,7 @@ export interface CustomTagType {
 
 export enum ReleaseMode {
     NEW_DEPLOYMENT = 'create',
-    MIGRATE_HELM = 'link',
+    MIGRATE_EXTERNAL_APPS = 'link',
 }
 
 export interface CDFormType {
diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx
@@ -32,7 +32,7 @@ import {
     ClipboardButton,
     extractImage,
     DOCUMENTATION,
-    useSuperAdmin,
+    useGetUserRoles,
 } from '../../../Common'
 import { ArtifactType, CIListItemType } from './types'
 import { TERMINAL_STATUS_MAP } from './constants'
@@ -148,7 +148,7 @@ const Artifacts = ({
     renderCIListHeader,
     targetPlatforms,
 }: ArtifactType) => {
-    const { isSuperAdmin } = useSuperAdmin()
+    const { isSuperAdmin } = useGetUserRoles()
     const { handleDownload } = useDownload()
 
     const { triggerId, buildId } = useParams<{
diff --git a/src/Shared/Components/CICDHistory/History.components.tsx b/src/Shared/Components/CICDHistory/History.components.tsx
@@ -22,7 +22,7 @@ import {
     GenericEmptyState,
     Tooltip,
     extractImage,
-    useSuperAdmin,
+    useGetUserRoles,
     useRegisterShortcut,
 } from '../../../Common'
 import { EMPTY_STATE_STATUS } from '../../constants'
@@ -136,7 +136,7 @@ export const GitChanges = ({
     renderCIListHeader,
     targetPlatforms,
 }: GitChangesType) => {
-    const { isSuperAdmin } = useSuperAdmin()
+    const { isSuperAdmin } = useGetUserRoles()
 
     if (!ciMaterials?.length || !Object.keys(gitTriggers ?? {}).length) {
         return (
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
@@ -642,6 +642,15 @@ export interface StatusFilterButtonType {
     maxInlineFiltersCount?: number
 }
 
+export enum NodeStatusDTO {
+    Healthy = 'Healthy',
+    Progressing = 'Progressing',
+    Unknown = 'Unknown',
+    Suspended = 'Suspended',
+    Degraded = 'Degraded',
+    Missing = 'Missing',
+}
+
 export enum NodeStatus {
     Degraded = 'degraded',
     Healthy = 'healthy',
diff --git a/src/Shared/Components/ConfirmationModal/ForceDeleteConfirmationModal.tsx b/src/Shared/Components/ConfirmationModal/ForceDeleteConfirmationModal.tsx
@@ -25,8 +25,8 @@ export const ForceDeleteConfirmationModal = ({
 }: ForceDeleteConfirmationProps) => {
     const renderSubtitle = () => (
         <>
-            <p className="mt-12 mb-12 p-8 dc__break-word bg__tertiary">Error: {subtitle}</p>
-            <p>Do you want to force delete?</p>
+            <p className="p-8 dc__break-word bg__tertiary mxh-200 dc__overflow-auto br-4 m-0">Error: {subtitle}</p>
+            <p className="m-0">Do you want to force delete?</p>
         </>
     )
     return (
diff --git a/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx b/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx
diff --git a/src/Shared/Components/GenericSectionErrorState/types.ts b/src/Shared/Components/GenericSectionErrorState/types.ts
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
diff --git a/src/Shared/Components/ReactSelect/utils.tsx b/src/Shared/Components/ReactSelect/utils.tsx
diff --git a/src/Shared/Providers/types.ts b/src/Shared/Providers/types.ts
diff --git a/src/Shared/Services/common.service.ts b/src/Shared/Services/common.service.ts
diff --git a/src/Shared/Services/types.ts b/src/Shared/Services/types.ts
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
diff --git a/src/index.ts b/src/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "1.8.5",`
	`3`	`+ "version": "1.8.7",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ export interface CodeEditorHeaderComposition {`
`101`	`101`	`Clipboard?: React.FC<any>`
`102`	`102`	`}`
`103`	`103`
`104`		`-export type ActionTypes = 'changeLanguage' \| 'setDiff' \| 'setTheme' \| 'setCode' \| 'setDefaultCode' \| 'setHeight'`
	`104`	`+type ActionTypes = 'changeLanguage' \| 'setDiff' \| 'setTheme' \| 'setCode' \| 'setDefaultCode' \| 'setHeight'`
`105`	`105`
`106`	`106`	`export interface Action {`
`107`	`107`	`type: ActionTypes`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ export const ROUTES = {`
`140`	`140`	`CD_TRIGGER_POST: 'app/cd-pipeline/trigger',`
`141`	`141`	`DELETE_RESOURCE: 'k8s/resource/delete',`
`142`	`142`	`NODE_CAPACITY: 'k8s/capacity/node',`
	`143`	`+ ENVIRONMENT_DATA: 'global/environment-variables',`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`export enum KEY_VALUE {`