Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/deploy-button-animation

Author: arunjaindev

src/Common/Helper.tsx

@@ -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/Pages/GlobalConfigurations/Authorization/index.ts

@@ -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/Pages/GlobalConfigurations/Authorization/types.ts

@@ -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/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx

@@ -1,4 +1,4 @@
-import { Fragment, useEffect, useRef, useState } from 'react'
+import { Fragment, useEffect, useState } from 'react'
 import Tippy from '@tippyjs/react'
 
 import { ReactComponent as ICSortArrowDown } from '@Icons/ic-sort-arrow-down.svg'
@@ -38,10 +38,6 @@ export const DeploymentConfigDiffMain = ({
     // STATES
     const [expandedView, setExpandedView] = useState<Record<string | number, boolean>>({})
 
-    // REFS
-    /** Ref to track if the element should scroll into view after expanding */
-    const scrollIntoViewAfterExpand = useRef(false)
-
     const handleAccordionClick = (id: string) => () => {
         setExpandedView({
             ...expandedView,
@@ -52,11 +48,12 @@ export const DeploymentConfigDiffMain = ({
     const onTransitionEnd =
         (id: string): DeploymentConfigDiffAccordionProps['onTransitionEnd'] =>
         (e) => {
-            if (scrollIntoViewAfterExpand.current && scrollIntoViewId === id && e.target === e.currentTarget) {
-                const element = document.querySelector(`#${scrollIntoViewId}`)
-                element?.scrollIntoView({ block: 'start' })
-                // Reset ref after scrolling into view
-                scrollIntoViewAfterExpand.current = false
+            if (scrollIntoViewId === id && e.target === e.currentTarget) {
+                // Using setTimeout to ensure React state updates and DOM rendering are complete before scrolling to element.
+                setTimeout(() => {
+                    const element = document.querySelector(`#${scrollIntoViewId}`)
+                    element?.scrollIntoView({ block: 'start' })
+                })
             }
         }
 
@@ -76,7 +73,6 @@ export const DeploymentConfigDiffMain = ({
 
     useEffect(() => {
         if (scrollIntoViewId) {
-            scrollIntoViewAfterExpand.current = true
             setExpandedView((prev) => ({ ...prev, [scrollIntoViewId]: true }))
         }
     }, [scrollIntoViewId])