@devtron-labs/devtron-fe-common-lib 1.2.17-beta-2 → 1.2.17-beta-4

package/dist/{@common-rjsf-BUi5Gl7v.js → @common-rjsf-CnPcLQLn.js}

@@ -2,7 +2,7 @@ import { j as n, J as A } from "./@vendor-BG3OpQCq.js";
 import E, { forwardRef as $ } from "react";
 import L, { getDefaultRegistry as k } from "@rjsf/core";
 import D from "@rjsf/validator-ajv8";
-import { T as y, c as H, a as J, d as w } from "./@code-editor-DokNNq3L.js";
+import { T as y, c as H, a as J, d as w } from "./@code-editor-CYQLzc_i.js";
 import M, { components as O } from "react-select";
 import { getUiOptions as B, getTemplate as I, getSubmitButtonOptions as U, ADDITIONAL_PROPERTY_FLAG as P, errorId as W, englishStringTranslator as V, TranslatableString as q, titleId as K, canExpand as Y, deepEquals as z } from "@rjsf/utils";
 import { ReactComponent as G } from "./assets/ic-chevron-down.fc70d7a7.svg";

package/dist/Common/CIPipeline.Types.d.ts

@@ -209,10 +209,6 @@ export interface DockerConfigOverrideType {
     dockerRepository: string;
     ciBuildConfig: CIBuildConfigType;
 }
-export declare enum WORKFLOW_CACHE_CONFIG_ENUM {
-    INHERIT = "INHERIT",
-    OVERRIDE = "OVERRIDE"
-}
 export interface FormType {
     name: string;
     args: {
@@ -251,11 +247,6 @@ export interface FormType {
     isDockerConfigOverridden?: boolean;
     dockerConfigOverride?: DockerConfigOverrideType;
     isOffendingMandatoryPlugin?: boolean;
-    workflowCacheConfig?: {
-        type: WORKFLOW_CACHE_CONFIG_ENUM;
-        value: boolean;
-        globalValue: boolean;
-    };
 }
 export interface ErrorObj {
     isValid: boolean;

package/dist/Common/Common.service.d.ts

@@ -1,6 +1,6 @@
 import { MutableRefObject } from 'react';
 import { RuntimeParamsAPIResponseType, RuntimePluginVariables } from '../Shared/types';
-import { TeamList, ResponseType, DeploymentNodeType, CDMaterialServiceEnum, CDMaterialServiceQueryParams, CDMaterialResponseType, CDMaterialFilterQuery, EnvironmentListHelmResponse, GlobalVariableOptionType } from './Types';
+import { TeamList, ResponseType, DeploymentNodeType, CDMaterialServiceEnum, CDMaterialServiceQueryParams, CDMaterialResponseType, CDMaterialFilterQuery, EnvironmentListHelmResponse, UserApprovalMetadataType, GlobalVariableOptionType } from './Types';
 import { ApiResourceType } from '../Pages';
 export declare const getTeamListMin: () => Promise<TeamList>;
 interface UserRole extends ResponseType {
@@ -16,6 +16,7 @@ export declare const SourceTypeMap: {
 };
 export declare function getUserRole(appName?: string): Promise<UserRole>;
 export declare function setImageTags(request: any, pipelineId: number, artifactId: number): Promise<ResponseType<any>>;
+export declare const sanitizeUserApprovalMetadata: (userApprovalMetadata: UserApprovalMetadataType) => UserApprovalMetadataType;
 export declare const parseRuntimeParams: (response: RuntimeParamsAPIResponseType) => RuntimePluginVariables[];
 export declare const processCDMaterialServiceResponse: (cdMaterialsResult: any, stage: DeploymentNodeType, offset: number, filter: CDMaterialFilterQuery, disableDefaultSelection?: boolean) => CDMaterialResponseType;
 export declare const genericCDMaterialsService: (serviceType: CDMaterialServiceEnum, cdMaterialID: number, stage: DeploymentNodeType, signal: AbortSignal, queryParams?: CDMaterialServiceQueryParams) => Promise<CDMaterialResponseType>;

package/dist/Common/Helper.d.ts

@@ -10,7 +10,7 @@ interface ConditionalWrapper<T> {
     children: T;
 }
 export declare const ConditionalWrap: React.FC<ConditionalWrapper<any>>;
-export declare function sortCallback(key: string, a: any, b: any, isCaseSensitive?: boolean): 0 | 1 | -1;
+export declare function sortCallback(key: string, a: any, b: any, isCaseSensitive?: boolean): 1 | -1 | 0;
 export declare const stopPropagation: (event: any) => void;
 export declare const preventDefault: (event: SyntheticEvent) => void;
 export declare function useThrottledEffect(callback: any, delay: any, deps?: any[]): void;

package/dist/Common/Types.d.ts

@@ -1,6 +1,5 @@
 import { default as React, ReactNode, CSSProperties, ReactElement, MutableRefObject } from 'react';
 import { TippyProps } from '@tippyjs/react';
-import { Placement } from 'tippy.js';
 import { UserGroupDTO } from '../Pages/GlobalConfigurations';
 import { ImageComment, ReleaseTag } from './ImageTags.Types';
 import { MandatoryPluginBaseStateType, RegistryType, RuntimePluginVariables, Severity } from '../Shared';
@@ -74,7 +73,7 @@ export interface TippyCustomizedProps extends Pick<TippyProps, 'appendTo'> {
     noHeadingBorder?: boolean;
     infoTextHeading?: string;
     hideHeading?: boolean;
-    placement?: Placement;
+    placement?: TippyProps['placement'];
     className?: string;
     Icon?: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
     iconPath?: string;
@@ -275,21 +274,6 @@ export declare enum ManualApprovalType {
     any = "ANY",
     notConfigured = "NOT_CONFIGURED"
 }
-export interface UserGroupApproverType {
-    email: string;
-    hasAccess: boolean;
-}
-export interface ImageApprovalPolicyUserGroupDataType {
-    dataStore: Record<string, UserGroupApproverType>;
-    requiredCount: number;
-    emails: string[];
-}
-export interface ImageApprovalPolicyType {
-    isPolicyConfigured: boolean;
-    specificUsersData: ImageApprovalPolicyUserGroupDataType;
-    userGroupData: Record<string, ImageApprovalPolicyUserGroupDataType>;
-    validGroups: string[];
-}
 export type ImageApprovalUsersInfoDTO = Record<string, Pick<UserGroupDTO, 'identifier' | 'name'>[]>;
 export interface UserApprovalConfigType {
     type: ManualApprovalType;
@@ -302,13 +286,6 @@ export interface UserApprovalConfigType {
         requiredCount: number;
     })[];
 }
-export type UserApprovalConfigPayloadType = ({
-    type: ManualApprovalType.any;
-} & Pick<UserApprovalConfigType, 'requiredCount'>) | ({
-    type: ManualApprovalType.specific;
-} & Pick<UserApprovalConfigType, 'userGroups' | 'specificUsers'>) | {
-    type: ManualApprovalType.notConfigured;
-};
 interface ApprovalUserDataType {
     dataId: number;
     userActionTime: string;
@@ -318,12 +295,45 @@ interface ApprovalUserDataType {
     userResponse: number;
     userGroups?: Pick<UserGroupDTO, 'identifier' | 'name'>[];
 }
+export interface UserApprovalInfo {
+    requiredCount: number;
+    currentCount: number;
+    approverList: {
+        hasApproved: boolean;
+        canApprove: boolean;
+        identifier: string;
+    }[];
+}
+export declare enum ApprovalConfigDataKindType {
+    configMap = "configuration/config-map",
+    configSecret = "configuration/config-secret",
+    deploymentTemplate = "configuration/deployment-template",
+    deploymentTrigger = "approval/deployment"
+}
+export interface ApprovalConfigDataType extends Pick<UserApprovalInfo, 'currentCount' | 'requiredCount'> {
+    kind: ApprovalConfigDataKindType | null;
+    anyUserApprovedInfo: UserApprovalInfo;
+    specificUsersApprovedInfo: UserApprovalInfo;
+    userGroupsApprovedInfo: Pick<UserApprovalInfo, 'currentCount' | 'requiredCount'> & {
+        userGroups: (UserApprovalInfo & {
+            groupIdentifier: UserGroupDTO['identifier'];
+            groupName: UserGroupDTO['name'];
+        })[];
+    };
+}
+export declare enum ApprovalRuntimeStateType {
+    init = 0,
+    requested = 1,
+    approved = 2,
+    consumed = 3
+}
 export interface UserApprovalMetadataType {
     approvalRequestId: number;
-    approvalRuntimeState: number;
-    approvedUsersData: ApprovalUserDataType[];
+    approvalRuntimeState: ApprovalRuntimeStateType;
     requestedUserData: ApprovalUserDataType;
-    approvalConfig?: UserApprovalConfigType;
+    hasCurrentUserApproved: boolean;
+    canCurrentUserApprove: boolean;
+    approvalConfigData: ApprovalConfigDataType;
 }
 export declare enum FilterStates {
     ALLOWED = 0,
@@ -380,7 +390,6 @@ export interface CDMaterialListModalServiceUtilProps {
     artifactId?: number;
     artifactStatus?: string;
     disableDefaultSelection?: boolean;
-    userApprovalConfig?: UserApprovalConfigType;
 }
 export interface CDMaterialType {
     index: number;
@@ -516,8 +525,7 @@ export interface CommonNodeAttr extends Pick<MandatoryPluginBaseStateType, 'isTr
     primaryBranchAfterRegex?: string;
     storageConfigured?: boolean;
     deploymentAppDeleteRequest?: boolean;
-    approvalUsers?: string[];
-    userApprovalConfig?: UserApprovalConfigType;
+    approvalConfigData: ApprovalConfigDataType;
     requestedUserId?: number;
     showPluginWarning: boolean;
     helmPackageName?: string;
@@ -574,14 +582,17 @@ export interface FilterConditionsListType {
     description: string;
     conditions: FilterConditionsInfo[];
 }
+export interface DeploymentApprovalInfoType {
+    eligibleApprovers: {
+        specificUsers: Pick<UserApprovalInfo, 'approverList'>;
+        anyUsers: Pick<UserApprovalInfo, 'approverList'>;
+        userGroups: (Pick<ApprovalConfigDataType['userGroupsApprovedInfo']['userGroups'][number], 'groupIdentifier' | 'groupName'> & Pick<UserApprovalInfo, 'approverList'>)[];
+    };
+    approvalConfigData: ApprovalConfigDataType;
+}
 export interface CDMaterialsApprovalInfo {
-    approvalUsers: string[];
-    userApprovalConfig: UserApprovalConfigType;
     canApproverDeploy: boolean;
-    /**
-     * Only available incase of approvals do'nt use in cd materials or any other flow since approvalUsers are not present there
-     */
-    imageApprovalPolicyDetails: ImageApprovalPolicyType;
+    deploymentApprovalInfo: DeploymentApprovalInfoType;
 }
 export interface CDMaterialsMetaInfo {
     tagsEditable: boolean;
@@ -660,7 +671,6 @@ export interface AppEnvironment {
     appStatus?: string;
     deploymentAppDeleteRequest?: boolean;
     isVirtualEnvironment?: boolean;
-    isProtected?: boolean;
     pipelineId?: number;
     latestCdWorkflowRunnerId?: number;
     commits?: string[];
@@ -711,7 +721,6 @@ export interface CdPipeline {
     parentPipelineType?: string;
     deploymentAppDeleteRequest?: boolean;
     deploymentAppCreated?: boolean;
-    userApprovalConfig?: UserApprovalConfigType;
     isVirtualEnvironment?: boolean;
     deploymentAppType: DeploymentAppTypes;
     helmPackageName?: string;
@@ -720,6 +729,7 @@ export interface CdPipeline {
     isProdEnv?: boolean;
     isGitOpsRepoNotConfigured?: boolean;
     isDeploymentBlocked?: boolean;
+    approvalConfigData: ApprovalConfigDataType;
 }
 export interface ExternalCiConfig {
     id: number;
@@ -821,12 +831,11 @@ export interface Point {
 export interface EdgeNodeType {
     height: number;
     width: number;
-    userApprovalConfig?: UserApprovalConfigType;
     type?: any;
     id?: number | string;
 }
 export interface EdgeEndNodeType extends EdgeNodeType {
-    userApprovalConfig?: UserApprovalConfigType;
+    approvalConfigData: ApprovalConfigDataType;
 }
 /**
  * Search params for sorting configuration

package/dist/Pages/Applications/DevtronApps/Details/CDPipeline/types.d.ts

@@ -1,5 +1,5 @@
 import { BuildStageType, FormType } from '../../../../../Common/CIPipeline.Types';
-import { DeploymentAppTypes, UserApprovalConfigType } from '../../../../../Common/Types';
+import { DeploymentAppTypes } from '../../../../../Common/Types';
 import { DeploymentStrategy } from '../../../../../Shared/Components';
 import { EnvListMinDTO } from '../../../../../Shared/types';
 interface ConfigSecretType {
@@ -53,7 +53,6 @@ export interface CDFormType {
         secrets: ConfigSecretType[];
     };
     requiredApprovals: string;
-    userApprovalConfig?: UserApprovalConfigType;
     isClusterCdActive: boolean;
     deploymentAppCreated: boolean;
     clusterId: string;

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

@@ -1,2 +1,2 @@
 import { FeatureDescriptionModalProps } from './types';
-export declare const FeatureDescriptionModal: ({ title, renderDescriptionContent, closeModalText, docLink, closeModal, imageVariant, SVGImage, imageStyles, }: FeatureDescriptionModalProps) => JSX.Element;
+export declare const FeatureDescriptionModal: ({ title, renderDescriptionContent, closeModalText, docLink, closeModal, imageVariant, SVGImage, imageStyles, tabsConfig, }: FeatureDescriptionModalProps) => JSX.Element;

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

@@ -1,3 +1,3 @@
 import { DescriptorProps } from './types';
-declare const FeatureTitleWithInfo: ({ additionalContainerClasses, breadCrumbs, children, iconClassName, title, renderDescriptionContent, closeModalText, docLink, SVGImage, showInfoIconTippy, docLinkText, dataTestId, additionalContent, showInfoIcon, }: DescriptorProps) => JSX.Element;
+declare const FeatureTitleWithInfo: ({ additionalContainerClasses, breadCrumbs, children, iconClassName, title, renderDescriptionContent, closeModalText, docLink, SVGImage, showInfoIconTippy, docLinkText, dataTestId, additionalContent, showInfoIcon, tabsConfig, }: DescriptorProps) => JSX.Element;
 export default FeatureTitleWithInfo;

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

@@ -1,17 +1,44 @@
 import { default as React, ReactNode } from 'react';
 import { ImageType } from '../../../Common';
 import { Breadcrumb } from '../../../Common/BreadCrumb/Types';
-export interface FeatureDescriptionModalProps {
-    title: string;
+interface BaseFeatureDescriptionModalProps {
     renderDescriptionContent?: () => ReactNode;
-    closeModalText?: string;
     docLink?: string;
-    closeModal?: () => void;
     imageVariant?: ImageType;
     SVGImage?: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
     imageStyles?: React.CSSProperties;
 }
-export interface DescriptorProps extends FeatureDescriptionModalProps {
+type FeatureDescriptionModalWithTabsConfig = {
+    /**
+     * If provided, tabs are shown and have higher precedence over normal modal
+     */
+    tabsConfig: ({
+        /**
+         * Unique id of the tab
+         */
+        id: string;
+        /**
+         * Title for the tab
+         */
+        title: string;
+    } & BaseFeatureDescriptionModalProps)[];
+} & {
+    renderDescriptionContent?: never;
+    docLink?: never;
+    imageVariant?: never;
+    SVGImage?: never;
+    imageStyles?: never;
+};
+export type FeatureDescriptionModalProps = {
+    title: string;
+    closeModalText?: string;
+    closeModal?: () => void;
+} & ((BaseFeatureDescriptionModalProps & {
+    tabsConfig?: never;
+}) | FeatureDescriptionModalWithTabsConfig);
+export type DescriptorProps = ((Omit<FeatureDescriptionModalProps, 'tabsConfig'> & {
+    tabsConfig?: never;
+}) | (Pick<FeatureDescriptionModalProps, 'title' | 'closeModalText' | 'closeModal'> & FeatureDescriptionModalWithTabsConfig)) & {
     breadCrumbs?: Breadcrumb[];
     additionalContainerClasses?: string;
     iconClassName?: string;
@@ -26,4 +53,5 @@ export interface DescriptorProps extends FeatureDescriptionModalProps {
      * @default false
      */
     showInfoIcon?: boolean;
-}
+};
+export {};

package/dist/Shared/Helpers.d.ts

@@ -2,7 +2,7 @@ import { ReactElement } from 'react';
 import { Pair } from 'yaml';
 import { StrictRJSFSchema } from '@rjsf/utils';
 import { MaterialHistoryType } from '@Shared/Services/app.types';
-import { MaterialInfo, SortingOrder, UserApprovalConfigType } from '../Common';
+import { MaterialInfo, SortingOrder, UserApprovalConfigType, ApprovalConfigDataType, UserApprovalInfo } from '../Common';
 import { GitTriggers, IntersectionChangeHandler, IntersectionOptions, PreventOutsideFocusProps, WebhookEventNameType } from './types';
 import { AggregatedNodes, DeploymentStatusDetailsBreakdownDataType, DeploymentStatusDetailsType, PodMetadatum } from './Components';
 interface HighlightSearchTextProps {
@@ -41,12 +41,13 @@ export declare const decode: (data: any, isEncoded?: boolean) => {};
 export declare const isTimeStringAvailable: (time: string) => boolean;
 export declare const getTimeDifference: (startTime: string, endTime: string) => string;
 export declare const getFileNameFromHeaders: (headers: Headers) => string;
-export declare const sanitizeUserApprovalConfig: (userApprovalConfig: UserApprovalConfigType) => UserApprovalConfigType;
+export declare const sanitizeUserApprovalList: (approverList: UserApprovalInfo["approverList"]) => UserApprovalInfo["approverList"];
+export declare const sanitizeApprovalConfigData: (approvalConfigData: ApprovalConfigDataType | null) => ApprovalConfigDataType;
 /**
  * Manual approval is considered configured only if the type is not notConfigured
  */
 export declare const getIsManualApprovalConfigured: (userApprovalConfig?: Pick<UserApprovalConfigType, "type">) => boolean;
-export declare const getIsManualApprovalSpecific: (userApprovalConfig?: Pick<UserApprovalConfigType, "type">) => boolean;
+export declare const getIsApprovalPolicyConfigured: (approvalConfigData: ApprovalConfigDataType) => boolean;
 /**
  * @description - Function to open a new tab with the given url
  * @param url - url to be opened in new tab

package/dist/Shared/Services/app.types.d.ts

@@ -1,5 +1,5 @@
 import { OverrideMergeStrategyType } from '../../Pages/Applications';
-import { ReleaseTag } from '../../Common';
+import { ReleaseTag, UserApprovalMetadataType } from '../../Common';
 interface WebhookDataType {
     id: number;
     eventActionType: string;
@@ -133,6 +133,13 @@ export interface DraftMetadataDTO {
     commentsCount: number;
     dataEncrypted: boolean;
     isAppAdmin: boolean;
+    userApprovalMetadata: UserApprovalMetadataType;
+    /**
+     * User id of the user who has requested the data
+     *
+     * This would be the id of the user whose token is sent in the cookie
+     */
+    requestedUserId: number;
 }
 export declare enum CMSecretExternalType {
     Internal = "",

package/dist/Shared/constants.d.ts

@@ -417,4 +417,11 @@ export declare const ALL_RESOURCE_KIND_FILTER = "all";
 export declare const OPEN_NEW_TICKET = "https://enterprise.devtron.ai/portal/en/newticket";
 export declare const VIEW_ALL_TICKETS = "https://enterprise.devtron.ai/portal/en/myarea";
 export declare const RAISE_ISSUE = "https://github.com/devtron-labs/devtron/issues/new/choose";
+export declare const TARGET_IDS: {
+    WORKFLOW_EDITOR_CONTAINER: string;
+};
+/**
+ * Env ID to get the data for base configuration
+ */
+export declare const BASE_CONFIGURATION_ENV_ID = -1;
 export declare const DEVTRON_BASE_MAIN_ID = "devtron-base-main-identifier";

package/dist/Shared/types.d.ts

@@ -1,6 +1,7 @@
 import { Dayjs } from 'dayjs';
-import { OptionType, CommonNodeAttr, ResponseType, UserApprovalConfigType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams, ValueConstraintType, VariableType, RefVariableType, PluginType } from '../Common';
-import { EnvironmentTypeEnum, PatchOperationType } from './constants';
+import { ApprovalConfigDataType } from '../Common/Types';
+import { OptionType, CommonNodeAttr, ResponseType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams, ValueConstraintType, VariableType, RefVariableType, PluginType } from '../Common';
+import { BASE_CONFIGURATION_ENV_ID, EnvironmentTypeEnum, PatchOperationType } from './constants';
 export declare enum EnvType {
     CHART = "helm_charts",
     APPLICATION = "apps"
@@ -185,7 +186,7 @@ export interface AppDetails {
     clusterName?: string;
     dockerRegistryId?: string;
     deploymentAppDeleteRequest?: boolean;
-    userApprovalConfig?: string;
+    isApprovalPolicyApplicable?: boolean;
     isVirtualEnvironment?: boolean;
     imageTag?: string;
     helmPackageName?: string;
@@ -245,7 +246,7 @@ export interface WorkflowType {
     showTippy?: boolean;
     appId?: number;
     isSelected?: boolean;
-    approvalConfiguredIdsMap?: Record<number, UserApprovalConfigType>;
+    approvalConfiguredIdsMap?: Record<number, ApprovalConfigDataType>;
     imageReleaseTags: string[];
     appReleaseTags?: string[];
     tagsEditable?: boolean;
@@ -418,7 +419,8 @@ export interface SeverityCount {
 export declare enum PolicyKindType {
     lockConfiguration = "lock-configuration",
     imagePromotion = "image-promotion",
-    plugins = "plugin"
+    plugins = "plugin",
+    approval = "approval"
 }
 export interface LastExecutionResultType {
     lastExecution: string;
@@ -748,6 +750,16 @@ export interface DynamicTabType extends CommonTabArgsType {
      */
     lastActiveTabId: string | null;
 }
+export interface ResourceApprovalPolicyConfigDTO {
+    appId: number;
+    envId: number;
+    approvalConfigurations: ApprovalConfigDataType[];
+}
+export interface ResourceApprovalPolicyConfigType extends Omit<ResourceApprovalPolicyConfigDTO, 'state' | 'approvalConfigurations'> {
+    isApprovalApplicable: boolean;
+    approvalConfigurationMap: Record<ApprovalConfigDataType['kind'], ApprovalConfigDataType>;
+}
+export type ResourceIdToResourceApprovalPolicyConfigMapType = Record<ResourceApprovalPolicyConfigType['envId'] | typeof BASE_CONFIGURATION_ENV_ID, Pick<ResourceApprovalPolicyConfigType, 'isApprovalApplicable' | 'approvalConfigurationMap'>>;
 export interface PreventOutsideFocusProps {
     identifier: string;
     preventFocus: boolean;