@devtron-labs/devtron-fe-common-lib 1.21.0-pre-4 → 1.21.1

package/dist/Shared/Components/ActionMenu/useActionMenu.hook.d.ts

@@ -21,8 +21,8 @@ export declare const useActionMenu: <T extends string | number>({ id, position,
         className?: string;
         defaultValue?: string | number | readonly string[];
         id?: string;
-        role?: import('react').AriaRole;
         color?: string;
+        role?: import('react').AriaRole;
         about?: string;
         is?: string;
         security?: string;
@@ -64,7 +64,7 @@ export declare const useActionMenu: <T extends string | number>({ id, position,
         itemRef?: string;
         results?: number;
         unselectable?: "on" | "off";
-        inputMode?: "search" | "text" | "none" | "url" | "decimal" | "tel" | "email" | "numeric";
+        inputMode?: "search" | "text" | "none" | "url" | "tel" | "email" | "numeric" | "decimal";
         "aria-activedescendant"?: string;
         "aria-atomic"?: boolean | "true" | "false";
         "aria-autocomplete"?: "none" | "list" | "inline" | "both";

package/dist/Shared/Components/Backdrop/Backdrop.d.ts

@@ -1,3 +1,3 @@
 import { BackdropProps } from './types';
-declare const Backdrop: ({ children, onEscape, onClick, hasClearBackground, onBackdropMount, deactivateFocusOnEscape, initialFocus, returnFocusOnDeactivate, }: BackdropProps) => import('react').ReactPortal;
+declare const Backdrop: ({ children, onEscape, onClick, hasClearBackground, onBackdropMount, deactivateFocusOnEscape, initialFocus, }: BackdropProps) => import('react').ReactPortal;
 export default Backdrop;

package/dist/Shared/Components/Backdrop/types.d.ts

@@ -1,6 +1,6 @@
 import { MouseEvent, ReactNode } from 'react';
 import { DTFocusTrapType } from '../DTFocusTrap';
-export interface BackdropProps extends Pick<DTFocusTrapType, 'deactivateFocusOnEscape' | 'initialFocus' | 'onEscape' | 'returnFocusOnDeactivate'> {
+export interface BackdropProps extends Pick<DTFocusTrapType, 'deactivateFocusOnEscape' | 'initialFocus' | 'onEscape'> {
     /**
      * The content to be rendered within the backdrop component.
      */

package/dist/Shared/Components/Badge/utils.d.ts

@@ -1,8 +1,7 @@
-import { IconBaseColorType, IconBaseSizeType } from '../../types';
+import { IconBaseColorType } from '../../types';
 import { BadgeProps } from './types';
 export declare const getClassNameAccToVariant: (variant: BadgeProps["variant"]) => {
     styles: string;
     iconColor: IconBaseColorType;
 };
 export declare const getClassNameAccToSize: (size: BadgeProps["size"]) => "fs-11 lh-16 px-4 py-1" | "fs-12 lh-16 px-6 py-2" | "fs-13 lh-20 px-6 py-2";
-export declare const COMPONENT_SIZE_TO_ICON_SIZE_MAP: Record<BadgeProps['size'], IconBaseSizeType>;

package/dist/Shared/Components/Button/Button.component.d.ts

@@ -100,7 +100,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLButtonElement>;
     component?: ButtonComponentType.button;
     buttonProps?: Omit<import('react').ButtonHTMLAttributes<HTMLButtonElement>, "children" | "styles" | "className" | "disabled" | "onClick">;
@@ -135,7 +135,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLButtonElement>;
     component?: ButtonComponentType.button;
     buttonProps?: Omit<import('react').ButtonHTMLAttributes<HTMLButtonElement>, "children" | "styles" | "className" | "disabled" | "onClick">;
@@ -164,7 +164,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLButtonElement>;
     component?: ButtonComponentType.button;
     buttonProps?: Omit<import('react').ButtonHTMLAttributes<HTMLButtonElement>, "children" | "styles" | "className" | "disabled" | "onClick">;
@@ -193,7 +193,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.link;
     linkProps: Omit<import('react-router-dom').LinkProps, "children" | "styles" | "className" | "onClick">;
@@ -228,7 +228,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.link;
     linkProps: Omit<import('react-router-dom').LinkProps, "children" | "styles" | "className" | "onClick">;
@@ -263,7 +263,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.link;
     linkProps: Omit<import('react-router-dom').LinkProps, "children" | "styles" | "className" | "onClick">;
@@ -292,7 +292,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.link;
     linkProps: Omit<import('react-router-dom').LinkProps, "children" | "styles" | "className" | "onClick">;
@@ -321,7 +321,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.anchor;
     linkProps?: never;
@@ -356,7 +356,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.anchor;
     linkProps?: never;
@@ -391,7 +391,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.anchor;
     linkProps?: never;
@@ -420,7 +420,7 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: import('react').ReactElement;
     endIcon?: import('react').ReactElement;
     fontWeight?: "bold" | "normal";
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy"> | Pick<{
     ref?: import('react').Ref<HTMLAnchorElement>;
     component: ButtonComponentType.anchor;
     linkProps?: never;
@@ -449,5 +449,5 @@ declare const Button: import('react').ForwardRefExoticComponent<(Pick<{
     startIcon?: never;
     endIcon?: never;
     fontWeight?: never;
-}, "style" | "text" | "id" | "disabled" | "size" | "tooltipProps" | "dataTestId" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy">) & import('react').RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
+}, "style" | "text" | "id" | "size" | "tooltipProps" | "dataTestId" | "disabled" | "startIcon" | "endIcon" | "variant" | "ariaLabel" | "icon" | "buttonProps" | "isLoading" | "onClick" | "fullWidth" | "fontWeight" | "component" | "linkProps" | "anchorProps" | "isOpacityHoverChild" | "triggerAutoClickTimestamp" | "showTooltip" | "showAriaLabelInTippy">) & import('react').RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
 export default Button;

package/dist/Shared/Components/CICDHistory/ConflictedResourcesTable.d.ts

@@ -0,0 +1,3 @@
+import { ConflictedResourcesTableProps } from './types';
+declare const ConflictedResourcesTable: ({ resourceConflictDetails }: ConflictedResourcesTableProps) => JSX.Element;
+export default ConflictedResourcesTable;

package/dist/Shared/Components/CICDHistory/ResourceConflictDeployDialog.d.ts

@@ -0,0 +1,3 @@
+import { ResourceConflictDeployDialogProps } from './types';
+declare const ResourceConflictDeployDialog: ({ appName, environmentName, handleClose }: ResourceConflictDeployDialogProps) => JSX.Element;
+export default ResourceConflictDeployDialog;

package/dist/Shared/Components/CICDHistory/ResourceConflictDetailsModal.d.ts

@@ -0,0 +1,3 @@
+import { ResourceConflictDetailsModalProps } from './types';
+declare const ResourceConflictDetailsModal: ({ appName, environmentName, handleClose }: ResourceConflictDetailsModalProps) => JSX.Element;
+export default ResourceConflictDetailsModal;

package/dist/Shared/Components/CICDHistory/TriggerDetails.d.ts

@@ -1,3 +1,3 @@
 import { TriggerDetailsType } from './types';
-declare const TriggerDetails: import('react').MemoExoticComponent<({ status, startedOn, finishedOn, triggeredBy, triggeredByEmail, ciMaterials, gitTriggers, message, podStatus, type, stage, artifact, environmentName, isJobView, workerPodName, triggerMetadata, renderDeploymentHistoryTriggerMetaText, renderTargetConfigInfo, workflowExecutionStages, namespace, }: TriggerDetailsType) => JSX.Element>;
+declare const TriggerDetails: import('react').MemoExoticComponent<({ status, startedOn, finishedOn, triggeredBy, triggeredByEmail, ciMaterials, gitTriggers, message, podStatus, type, stage, artifact, environmentName, isJobView, workerPodName, triggerMetadata, renderDeploymentHistoryTriggerMetaText, renderTargetConfigInfo, workflowExecutionStages, namespace, isLatest, appName, }: TriggerDetailsType) => JSX.Element>;
 export default TriggerDetails;

package/dist/Shared/Components/CICDHistory/WorkerStatus.d.ts

@@ -1,3 +1,3 @@
 import { WorkerStatusType } from './types';
-declare const WorkerStatus: import('react').MemoExoticComponent<({ message, podStatus, stage, workerPodName, finishedOn, clusterId, namespace, workerMessageContainerClassName, titleClassName, viewWorkerPodClassName, hideShowMoreMessageButton, }: WorkerStatusType) => JSX.Element | null>;
+declare const WorkerStatus: import('react').MemoExoticComponent<({ message, podStatus, stage, workerPodName, finishedOn, clusterId, namespace, workerMessageContainerClassName, titleClassName, viewWorkerPodClassName, hideShowMoreMessageButton, children, }: WorkerStatusType) => JSX.Element | null>;
 export default WorkerStatus;

package/dist/Shared/Components/CICDHistory/constants.d.ts

@@ -1,4 +1,5 @@
-import { WorkflowStageStatusType } from './types';
+import { FiltersTypeEnum, TableProps } from '../Table';
+import { ResourceConflictItemType, WorkflowStageStatusType } from './types';
 export declare const HISTORY_LABEL: {
     APPLICATION: string;
     ENVIRONMENT: string;
@@ -85,3 +86,5 @@ export declare const PROGRESSING_STATUS: {
 };
 export declare const FAILED_WORKFLOW_STAGE_STATUS_MAP: Record<Extract<WorkflowStageStatusType, WorkflowStageStatusType.ABORTED | WorkflowStageStatusType.FAILED | WorkflowStageStatusType.TIMEOUT>, true>;
 export declare const APP_HEALTH_DROP_DOWN_LIST: string[];
+export declare const RESOURCE_CONFLICT_DEPLOY_ERROR = "cannot be imported into the current release: invalid ownership metadata;";
+export declare const CONFLICTED_RESOURCES_COLUMNS: TableProps<ResourceConflictItemType, FiltersTypeEnum.STATE>['columns'];

package/dist/Shared/Components/CICDHistory/service.d.ts

@@ -1,5 +1,5 @@
 import { ResponseType } from '../../../Common';
-import { DeploymentHistoryDetail, DeploymentHistoryResult, DeploymentStatusDetailsResponse, ModuleConfigResponse, TriggerDetailsResponseType, TriggerHistoryParamsType } from './types';
+import { DeploymentHistoryDetail, DeploymentHistoryResult, DeploymentStatusDetailsResponse, GetResourceConflictDetailsParamsType, ModuleConfigResponse, ResourceConflictItemType, ResourceConflictRedeployParamsType, TriggerDetailsResponseType, TriggerHistoryParamsType } from './types';
 export declare function getTriggerDetails({ appId, envId, pipelineId, triggerId, fetchIdData, }: {
     appId: any;
     envId: any;
@@ -21,3 +21,5 @@ export declare function getManualSync(params: {
 export declare const prepareHistoryData: (rawData: any, historyComponent: string, skipDecode?: boolean) => DeploymentHistoryDetail;
 export declare const getTriggerHistory: ({ appId, envId, pagination, releaseId, showCurrentReleaseDeployments, }: TriggerHistoryParamsType) => Promise<Pick<DeploymentHistoryResult, "result">>;
 export declare const getModuleConfigured: (moduleName: string) => Promise<ModuleConfigResponse>;
+export declare const resourceConflictRedeploy: ({ pipelineId, triggerId, appId, }: ResourceConflictRedeployParamsType) => Promise<void>;
+export declare const getResourceConflictDetails: ({ appId, pipelineId, triggerId, signal, }: GetResourceConflictDetailsParamsType) => Promise<ResourceConflictItemType[]>;

package/dist/Shared/Components/CICDHistory/types.d.ts

@@ -1,8 +1,9 @@
 import { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react';
 import { SupportedKeyboardKeysType } from '../../../Common/Hooks/UseRegisterShortcut/types';
+import { GVKType } from '../../../Pages/ResourceBrowser';
 import { DeploymentAppTypes, FilterConditionsListType, ImageComment, OptionType, PaginationProps, PromotionApprovalMetadataType, ReleaseTag, ResponseType, TooltipProps, UserApprovalMetadataType, useScrollable } from '../../../Common';
 import { DeploymentStageType } from '../../constants';
-import { AggregationKeys, AppDetails, DeploymentStatusDetailsBreakdownDataType, DeploymentStatusDetailsType, DeploymentStatusTimelineType, DeploymentStrategyType, GitTriggers, Node, NodeType, ResourceKindType, ResourceVersionType, TargetPlatformsDTO } from '../../types';
+import { AggregationKeys, AppDetails, BaseURLParams, DeploymentStatusDetailsBreakdownDataType, DeploymentStatusDetailsType, DeploymentStatusTimelineType, DeploymentStrategyType, GitTriggers, Node, NodeType, ResourceKindType, ResourceVersionType, TargetPlatformsDTO } from '../../types';
 import { TargetPlatformBadgeListProps } from '../TargetPlatforms';
 export declare enum HistoryComponentType {
     CI = "CI",
@@ -257,6 +258,29 @@ export interface TriggerDetailsType extends Pick<StartDetailsType, 'renderTarget
     workerPodName?: string;
     triggerMetadata?: string;
     renderDeploymentHistoryTriggerMetaText: (triggerMetaData: string, onlyRenderIcon?: boolean) => JSX.Element;
+    /**
+     * Only present in case of CD trigger details as of now
+     */
+    isLatest?: boolean;
+    /**
+     * Only present in case of CD trigger details as of now
+     */
+    appName?: string;
+}
+export declare enum ResourceConflictModalType {
+    DEPLOY_DIALOG = "DEPLOY_DIALOG",
+    RESOURCE_DETAIL_MODAL = "RESOURCE_DETAIL_MODAL"
+}
+interface ResourceConflictDialogBaseProps extends Required<Pick<TriggerDetailsType, 'appName' | 'environmentName'>> {
+    handleClose: () => void;
+}
+export interface ResourceConflictDeployDialogProps extends ResourceConflictDialogBaseProps {
+}
+export interface ResourceConflictDetailsModalProps extends ResourceConflictDialogBaseProps {
+}
+export interface TriggerOutputURLParamsType extends Pick<BaseURLParams, 'appId' | 'envId'> {
+    triggerId: string;
+    pipelineId: string;
 }
 export type ProgressingStatusType = {
     stage: DeploymentStageType;
@@ -283,6 +307,7 @@ export interface WorkerStatusType extends Pick<ExecutionInfoType['workerDetails'
      * @default false
      */
     hideShowMoreMessageButton?: boolean;
+    children?: ReactNode;
 }
 export type FinishedType = {
     artifact: string;
@@ -703,4 +728,43 @@ export interface CIPipelineSourceConfigInterface {
     primaryBranchAfterRegex?: string;
     rootClassName?: string;
 }
+export interface ResourceConflictItemType {
+    name: string;
+    namespace: string;
+    gvk: GVKType;
+    gvkTitle: string;
+    clusterId: number;
+    /**
+     * Generated at ui
+     */
+    id: string;
+}
+export interface ConflictedResourcesTableProps {
+    resourceConflictDetails: ResourceConflictItemType[];
+}
+export interface ResourceConflictDeployDialogURLParamsType extends Pick<TriggerOutputURLParamsType, 'appId' | 'envId' | 'pipelineId' | 'triggerId'> {
+}
+export interface ResourceConflictRedeployParamsType extends Pick<ResourceConflictDeployDialogURLParamsType, 'pipelineId' | 'triggerId' | 'appId'> {
+}
+export interface ResourceConflictRedeployPayloadType {
+    pipelineId: number;
+    appId: number;
+    wfrIdForDeploymentWithSpecificTrigger: number;
+    helmRedeploymentRequest: true;
+}
+export interface GetResourceConflictDetailsParamsType extends Pick<ResourceConflictDeployDialogURLParamsType, 'pipelineId' | 'triggerId' | 'appId'> {
+    signal: AbortSignal;
+}
+export interface ResourceConflictListItemDTO {
+    clusterId: number;
+    conflictingResources: {
+        name: string;
+        namespace: string;
+        groupVersionKind: {
+            Group: string;
+            Version: string;
+            Kind: NodeType;
+        };
+    }[];
+}
 export {};

package/dist/Shared/Components/CICDHistory/utils.d.ts

@@ -40,3 +40,4 @@ export declare const getTriggerStatusIcon: (status: string) => string;
 export declare const renderDeploymentTimelineIcon: (iconState: DeploymentStatusBreakdownItemType["icon"]) => JSX.Element;
 export declare const getDeploymentTimelineBGColorFromIcon: (icon: DeploymentStatusBreakdownItemType["icon"]) => string;
 export declare const getTriggerOutputTabs: (triggerDetails: History, deploymentAppType: DeploymentAppTypes) => TabGroupProps["tabs"];
+export declare const getSortedTriggerHistory: (triggerHistory: Map<number, History>) => [number, History][];

package/dist/Shared/Components/DTFocusTrap/DTFocusTrap.d.ts

@@ -4,5 +4,5 @@ export declare const useFocusTrapControl: () => {
     disableFocusTrap: typeof noop;
     resumeFocusTrap: typeof noop;
 };
-declare const DTFocusTrap: ({ onEscape, deactivateFocusOnEscape, children, initialFocus, returnFocusOnDeactivate, }: DTFocusTrapType) => JSX.Element;
+declare const DTFocusTrap: ({ onEscape, deactivateFocusOnEscape, children, initialFocus, }: DTFocusTrapType) => JSX.Element;
 export default DTFocusTrap;

package/dist/Shared/Components/DTFocusTrap/types.d.ts

@@ -1,5 +1,4 @@
 import { ReactNode } from 'react';
-import { Props as FocusTrapProps } from 'focus-trap-react';
 type FocusTargetValue = HTMLElement | SVGElement | string;
 type FocusTargetValueOrFalse = FocusTargetValue | false;
 /**
@@ -8,7 +7,7 @@ type FocusTargetValueOrFalse = FocusTargetValue | false;
  * an opt-out, or a function that returns a DOM node or `false`.
  */
 type FocusTargetOrFalse = FocusTargetValueOrFalse | (() => FocusTargetValueOrFalse);
-export interface DTFocusTrapType extends Pick<FocusTrapProps['focusTrapOptions'], 'returnFocusOnDeactivate'> {
+export interface DTFocusTrapType {
     /**
      * Callback function that gets triggered when the Escape key is pressed. \
      * Should be wrapped in useCallback to prevent unnecessary re-renders.

package/dist/Shared/Components/DocLink/constants.d.ts

@@ -93,9 +93,6 @@ export declare const DOCUMENTATION: {
     readonly SOFTWARE_DISTRIBUTION_HUB: "usage/software-distribution-hub";
     readonly RELEASE_TRACKS: "usage/software-distribution-hub/release-hub#creating-release-tracks-and-versions";
     readonly RELEASES: "usage/software-distribution-hub/release-hub#creating-release-tracks-and-versions";
-    readonly RELEASE_HUB: "usage/software-distribution-hub/release-hub";
     readonly TENANTS: "usage/software-distribution-hub/tenants#adding-installation";
     readonly TENANTS_INSTALLATION: "usage/software-distribution-hub/tenants";
-    readonly AUTOSCALER_DETECTION: "user-guide/infra-management/infrastructure-overview#troubleshooting-autoscaler-detection";
-    readonly COST_CALCULATION: "user-guide/finops/overview-cost-visibility#how-is-the-cost-calculated";
 };

package/dist/Shared/Components/FeatureDescription/types.d.ts

@@ -31,7 +31,7 @@ type FeatureDescriptionModalWithTabsConfig = {
     imageStyles?: never;
 };
 export type FeatureDescriptionModalProps = {
-    title: React.ReactNode;
+    title: string;
     closeModalText?: string;
     closeModal?: () => void;
 } & ((BaseFeatureDescriptionModalProps & {

package/dist/Shared/Components/FramerComponents/index.d.ts

@@ -1,2 +1,2 @@
-import { animate, AnimatePresence, motion, useAnimation, useAnimationControls, useMotionTemplate, useMotionValue } from 'framer-motion';
-export { animate, AnimatePresence, motion, useAnimation, useAnimationControls, useMotionTemplate, useMotionValue };
+import { animate, AnimatePresence, motion, useAnimationControls, useMotionTemplate, useMotionValue } from 'framer-motion';
+export { animate, AnimatePresence, motion, useAnimationControls, useMotionTemplate, useMotionValue };

package/dist/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.d.ts

@@ -1,4 +1,3 @@
-import { ButtonComponentType } from '../Button';
 import { GenericSectionErrorStateProps } from './types';
-declare const GenericSectionErrorState: <T extends ButtonComponentType = ButtonComponentType.button>({ reload, buttonProps, customIcon, withBorder, title, subTitle, description, buttonText, rootClassName, useInfoIcon, progressingProps, }: GenericSectionErrorStateProps<T>) => JSX.Element;
+declare const GenericSectionErrorState: ({ reload, withBorder, title, subTitle, description, buttonText, rootClassName, useInfoIcon, progressingProps, }: GenericSectionErrorStateProps) => JSX.Element;
 export default GenericSectionErrorState;

package/dist/Shared/Components/GenericSectionErrorState/types.d.ts

@@ -1,7 +1,10 @@
 import { ReactNode } from 'react';
-import { ButtonComponentType, ButtonProps } from '../Button';
 import { IconsProps } from '../Icon';
-export type GenericSectionErrorStateProps<ButtonType extends ButtonComponentType = ButtonComponentType.button> = {
+export type GenericSectionErrorStateProps = {
+    /**
+     * Handler for reloading the section
+     */
+    reload?: () => void;
     /**
      * If true, border is added to the section
      *
@@ -34,7 +37,6 @@ export type GenericSectionErrorStateProps<ButtonType extends ButtonComponentType
      */
     progressingProps: Omit<IconsProps, 'name'>;
     useInfoIcon?: false;
-    customIcon?: never;
 } | {
     progressingProps?: never;
     /**
@@ -43,25 +45,7 @@ export type GenericSectionErrorStateProps<ButtonType extends ButtonComponentType
      * @default false
      */
     useInfoIcon: true;
-    customIcon?: never;
-} | {
-    progressingProps?: never;
-    useInfoIcon?: never;
-    customIcon?: never;
 } | {
-    customIcon: JSX.Element;
     progressingProps?: never;
     useInfoIcon?: never;
-}) & ({
-    /**
-     * Handler for reloading the section
-     */
-    reload: () => void;
-    buttonProps?: never;
-} | {
-    reload?: never;
-    buttonProps: ButtonProps<ButtonType>;
-} | {
-    reload?: never;
-    buttonProps?: never;
 });

package/dist/Shared/Components/Header/HeaderWithCreateButton/HeaderWithCreateButon.d.ts

@@ -1,3 +1,3 @@
 import { HeaderWithCreateButtonProps } from './types';
-export declare const HeaderWithCreateButton: ({ viewType }: HeaderWithCreateButtonProps) => JSX.Element;
+export declare const HeaderWithCreateButton: ({ headerName, additionalHeaderInfo }: HeaderWithCreateButtonProps) => JSX.Element;
 export default HeaderWithCreateButton;

package/dist/Shared/Components/Header/HeaderWithCreateButton/types.d.ts

@@ -1,6 +1,8 @@
 import { ActionMenuProps } from '../../ActionMenu';
+import { PageHeaderType } from '../types';
 export interface HeaderWithCreateButtonProps {
-    viewType?: 'jobs' | 'apps' | 'infra-apps';
+    headerName: string;
+    additionalHeaderInfo: PageHeaderType['additionalHeaderInfo'];
 }
 export declare enum CreateActionMenuItems {
     CUSTOM_APP = "create-custom-app",

package/dist/Shared/Components/Header/PageHeader.d.ts

@@ -1,3 +1,3 @@
 import { PageHeaderType } from './types';
-declare const PageHeader: ({ headerName, headerImage, additionalHeaderInfo, showTabs, renderHeaderTabs, isBreadcrumbs, breadCrumbs, renderActionButtons, onClose, tippyProps, closeIcon, }: PageHeaderType) => JSX.Element;
+declare const PageHeader: ({ headerName, headerImage, additionalHeaderInfo, showTabs, renderHeaderTabs, isBreadcrumbs, breadCrumbs, renderActionButtons, onClose, tippyProps, }: PageHeaderType) => JSX.Element;
 export default PageHeader;

package/dist/Shared/Components/Header/types.d.ts

@@ -17,10 +17,8 @@ export interface PageHeaderType {
         TippyIcon?: React.FunctionComponent<any>;
         tippyMessage?: string;
         onClickTippyButton?: () => void;
-        tippyHeader?: string;
     };
     onClose?: () => void;
-    closeIcon?: JSX.Element;
 }
 export interface ServerInfo {
     currentVersion: string;