@devtron-labs/devtron-fe-common-lib 1.1.6-beta-4 → 1.1.6-beta-6

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

@@ -1,5 +1,5 @@
 import { RuntimeParamsAPIResponseType, RuntimeParamsListItemType } from '../Shared/types';
-import { TeamList, ResponseType, DeploymentNodeType, CDMaterialServiceEnum, CDMaterialServiceQueryParams, CDMaterialResponseType, CDMaterialFilterQuery, EnvironmentListHelmResponse } from './Types';
+import { TeamList, ResponseType, DeploymentNodeType, CDMaterialServiceEnum, CDMaterialServiceQueryParams, CDMaterialResponseType, CDMaterialFilterQuery, EnvironmentListHelmResponse, UserApprovalMetadataType } from './Types';
 import { ApiResourceType } from '../Pages';
 export declare const getTeamListMin: () => Promise<TeamList>;
 interface UserRole extends ResponseType {
@@ -15,6 +15,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) => RuntimeParamsListItemType[];
 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/CustomTagSelector/Types.d.ts

@@ -4,16 +4,6 @@ export interface SuggestedTagOptionType extends OptionType {
     description: string;
     propagate: boolean;
 }
-export declare enum DeploymentPolicy {
-    ALLOW = "allow",
-    BLOCK = "block",
-    BLOCK_PROD = "block-prod",
-    BLOCK_NON_PROD = "block-non-prod"
-}
-export interface VariableValueConstraintTypes {
-    choices?: string[];
-    blockCustomValue?: boolean;
-}
 export interface TagType {
     id?: number;
     key: string;
@@ -25,8 +15,6 @@ export interface TagType {
     isInvalidValue?: boolean;
     isSuggested?: boolean;
     isPropagateDisabled?: boolean;
-    deploymentPolicy?: DeploymentPolicy;
-    valueConstraint?: VariableValueConstraintTypes;
 }
 export interface TagErrorType {
     isValid: boolean;

package/dist/Common/Helper.d.ts

@@ -9,7 +9,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, RuntimeParamsListItemType, 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;
@@ -274,21 +273,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;
@@ -301,13 +285,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;
@@ -317,12 +294,44 @@ 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 = "CM",
+    configSecret = "CS",
+    deploymentTemplate = "DEPLOYMENT_TEMPLATE"
+}
+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,
@@ -379,7 +388,6 @@ export interface CDMaterialListModalServiceUtilProps {
     artifactId?: number;
     artifactStatus?: string;
     disableDefaultSelection?: boolean;
-    userApprovalConfig?: UserApprovalConfigType;
 }
 export interface CDMaterialType {
     index: number;
@@ -515,8 +523,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;
@@ -573,14 +580,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;
@@ -659,7 +669,6 @@ export interface AppEnvironment {
     appStatus?: string;
     deploymentAppDeleteRequest?: boolean;
     isVirtualEnvironment?: boolean;
-    isProtected?: boolean;
     pipelineId?: number;
     latestCdWorkflowRunnerId?: number;
     commits?: string[];
@@ -710,7 +719,6 @@ export interface CdPipeline {
     parentPipelineType?: string;
     deploymentAppDeleteRequest?: boolean;
     deploymentAppCreated?: boolean;
-    userApprovalConfig?: UserApprovalConfigType;
     isVirtualEnvironment?: boolean;
     deploymentAppType: DeploymentAppTypes;
     helmPackageName?: string;
@@ -719,6 +727,7 @@ export interface CdPipeline {
     isProdEnv?: boolean;
     isGitOpsRepoNotConfigured?: boolean;
     isDeploymentBlocked?: boolean;
+    approvalConfigData: ApprovalConfigDataType;
 }
 export interface ExternalCiConfig {
     id: number;
@@ -820,12 +829,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/SelectPicker/type.d.ts

@@ -24,10 +24,6 @@ export interface SelectPickerOptionType<OptionValue = string | number> extends O
     tooltipProps?: Omit<TooltipProps, 'alwaysShowTippyOnHover' | 'showOnTruncate' | 'shortcutKeyCombo'> | (Omit<TooltipProps, 'alwaysShowTippyOnHover' | 'showOnTruncate' | 'content'> & Required<Pick<TooltipProps, 'shortcutKeyCombo'>>);
 }
 type SelectProps<OptionValue, IsMulti extends boolean> = ReactSelectProps<SelectPickerOptionType<OptionValue>, IsMulti, GroupBase<SelectPickerOptionType<OptionValue>>>;
-export declare enum SelectPickerVariantType {
-    DEFAULT = "default",
-    BORDER_LESS = "border-less"
-}
 declare module 'react-select/base' {
     interface Props<Option, IsMulti extends boolean, Group extends GroupBase<Option>> {
         /**
@@ -59,9 +55,12 @@ declare module 'react-select/base' {
          * @default 'true'
          */
         showSelectedOptionIcon?: boolean;
-        variant?: SelectPickerVariantType;
     }
 }
+export declare enum SelectPickerVariantType {
+    DEFAULT = "default",
+    BORDER_LESS = "border-less"
+}
 export type SelectPickerProps<OptionValue = number | string, IsMulti extends boolean = false> = Pick<SelectProps<OptionValue, IsMulti>, 'name' | 'classNamePrefix' | 'options' | 'value' | 'onChange' | 'isSearchable' | 'isClearable' | 'hideSelectedOptions' | 'controlShouldRenderValue' | 'closeMenuOnSelect' | 'isDisabled' | 'isLoading' | 'required' | 'isOptionDisabled' | 'placeholder' | 'menuPosition' | 'getOptionLabel' | 'getOptionValue' | 'isOptionSelected' | 'menuIsOpen' | 'onMenuOpen' | 'onMenuClose' | 'autoFocus' | 'onBlur' | 'onKeyDown' | 'formatOptionLabel' | 'onInputChange' | 'inputValue'> & Partial<Pick<SelectProps<OptionValue, IsMulti>, 'renderMenuListFooter' | 'shouldRenderCustomOptions' | 'renderCustomOptions' | 'icon' | 'showSelectedOptionIcon'>> & Required<Pick<SelectProps<OptionValue, IsMulti>, 'inputId'>> & Partial<Pick<CreatableProps<SelectPickerOptionType<OptionValue>, IsMulti, GroupBase<SelectPickerOptionType<OptionValue>>>, 'onCreateOption'>> & {
     /**
      * Error message for the select

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

@@ -43,5 +43,3 @@ export * from './Button';
 export * from './InvalidYAMLTippy';
 export * from './ConfirmationModal';
 export * from './DiffViewer';
-export * from './MultipleResizableTextArea';
-export * from './DynamicDataTable';

package/dist/Shared/Helpers.d.ts

@@ -1,7 +1,7 @@
 import { ReactElement } from 'react';
 import { Pair } from 'yaml';
 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 {
@@ -40,12 +40,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,4 +1,4 @@
-import { ReleaseTag } from '../../Common';
+import { ReleaseTag, UserApprovalMetadataType } from '../../Common';
 interface WebhookDataType {
     id: number;
     eventActionType: string;
@@ -132,6 +132,7 @@ export interface DraftMetadataDTO {
     commentsCount: number;
     dataEncrypted: boolean;
     isAppAdmin: boolean;
+    userApprovalMetadata: UserApprovalMetadataType;
 }
 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,7 +1,8 @@
 import { Dayjs } from 'dayjs';
-import { OptionType, CommonNodeAttr, ResponseType, UserApprovalConfigType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams } from '../Common';
+import { ApprovalConfigDataType } from '../Common/Types';
+import { OptionType, CommonNodeAttr, ResponseType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams } from '../Common';
 import { KeyValueListType } from './Components';
-import { EnvironmentTypeEnum, PatchOperationType } from './constants';
+import { BASE_CONFIGURATION_ENV_ID, EnvironmentTypeEnum, PatchOperationType } from './constants';
 export declare enum EnvType {
     CHART = "helm_charts",
     APPLICATION = "apps"
@@ -246,7 +247,7 @@ export interface WorkflowType {
     showTippy?: boolean;
     appId?: number;
     isSelected?: boolean;
-    approvalConfiguredIdsMap?: Record<number, UserApprovalConfigType>;
+    approvalConfiguredIdsMap?: Record<number, ApprovalConfigDataType>;
     imageReleaseTags: string[];
     appReleaseTags?: string[];
     tagsEditable?: boolean;
@@ -403,7 +404,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;
@@ -735,6 +737,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;