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

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

@@ -94,6 +94,7 @@ export declare const ROUTES: {
     USER_LIST_MIN: string;
     CONFIG_DATA: string;
     K8S_RESOURCE_LIST: string;
+    CONFIG_COMPARE_SECRET: string;
 };
 export declare enum KEY_VALUE {
     KEY = "key",

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): 1 | -1 | 0;
+export declare function sortCallback(key: string, a: any, b: any, isCaseSensitive?: boolean): 0 | 1 | -1;
 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,5 +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';
@@ -65,7 +65,7 @@ export interface CheckboxProps {
     id?: string;
     dataTestId?: string;
 }
-export interface TippyCustomizedProps extends Pick<TippyProps, 'appendTo'> {
+export interface TippyCustomizedProps {
     theme: TippyTheme;
     visible?: boolean;
     heading?: ReactNode | string;
@@ -73,7 +73,7 @@ export interface TippyCustomizedProps extends Pick<TippyProps, 'appendTo'> {
     noHeadingBorder?: boolean;
     infoTextHeading?: string;
     hideHeading?: boolean;
-    placement?: TippyProps['placement'];
+    placement?: Placement;
     className?: string;
     Icon?: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
     iconPath?: string;
@@ -273,6 +273,21 @@ 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;
@@ -285,6 +300,13 @@ 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;
@@ -294,44 +316,12 @@ 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: ApprovalRuntimeStateType;
+    approvalRuntimeState: number;
+    approvedUsersData: ApprovalUserDataType[];
     requestedUserData: ApprovalUserDataType;
-    hasCurrentUserApproved: boolean;
-    canCurrentUserApprove: boolean;
-    approvalConfigData: ApprovalConfigDataType;
+    approvalConfig?: UserApprovalConfigType;
 }
 export declare enum FilterStates {
     ALLOWED = 0,
@@ -388,6 +378,7 @@ export interface CDMaterialListModalServiceUtilProps {
     artifactId?: number;
     artifactStatus?: string;
     disableDefaultSelection?: boolean;
+    userApprovalConfig?: UserApprovalConfigType;
 }
 export interface CDMaterialType {
     index: number;
@@ -523,7 +514,8 @@ export interface CommonNodeAttr extends Pick<MandatoryPluginBaseStateType, 'isTr
     primaryBranchAfterRegex?: string;
     storageConfigured?: boolean;
     deploymentAppDeleteRequest?: boolean;
-    approvalConfigData: ApprovalConfigDataType;
+    approvalUsers?: string[];
+    userApprovalConfig?: UserApprovalConfigType;
     requestedUserId?: number;
     showPluginWarning: boolean;
     helmPackageName?: string;
@@ -580,17 +572,14 @@ 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;
-    deploymentApprovalInfo: DeploymentApprovalInfoType;
+    /**
+     * Only available incase of approvals do'nt use in cd materials or any other flow since approvalUsers are not present there
+     */
+    imageApprovalPolicyDetails: ImageApprovalPolicyType;
 }
 export interface CDMaterialsMetaInfo {
     tagsEditable: boolean;
@@ -669,6 +658,7 @@ export interface AppEnvironment {
     appStatus?: string;
     deploymentAppDeleteRequest?: boolean;
     isVirtualEnvironment?: boolean;
+    isProtected?: boolean;
     pipelineId?: number;
     latestCdWorkflowRunnerId?: number;
     commits?: string[];
@@ -719,6 +709,7 @@ export interface CdPipeline {
     parentPipelineType?: string;
     deploymentAppDeleteRequest?: boolean;
     deploymentAppCreated?: boolean;
+    userApprovalConfig?: UserApprovalConfigType;
     isVirtualEnvironment?: boolean;
     deploymentAppType: DeploymentAppTypes;
     helmPackageName?: string;
@@ -727,7 +718,6 @@ export interface CdPipeline {
     isProdEnv?: boolean;
     isGitOpsRepoNotConfigured?: boolean;
     isDeploymentBlocked?: boolean;
-    approvalConfigData: ApprovalConfigDataType;
 }
 export interface ExternalCiConfig {
     id: number;
@@ -829,11 +819,12 @@ export interface Point {
 export interface EdgeNodeType {
     height: number;
     width: number;
+    userApprovalConfig?: UserApprovalConfigType;
     type?: any;
     id?: number | string;
 }
 export interface EdgeEndNodeType extends EdgeNodeType {
-    approvalConfigData: ApprovalConfigDataType;
+    userApprovalConfig?: UserApprovalConfigType;
 }
 /**
  * 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 } from '../../../../../Common/Types';
+import { DeploymentAppTypes, UserApprovalConfigType } from '../../../../../Common/Types';
 import { DeploymentStrategy } from '../../../../../Shared/Components';
 import { EnvListMinDTO } from '../../../../../Shared/types';
 interface ConfigSecretType {
@@ -53,6 +53,7 @@ export interface CDFormType {
         secrets: ConfigSecretType[];
     };
     requiredApprovals: string;
+    userApprovalConfig?: UserApprovalConfigType;
     isClusterCdActive: boolean;
     deploymentAppCreated: boolean;
     clusterId: string;

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, ApprovalConfigDataType, UserApprovalInfo } from '../Common';
+import { MaterialInfo, SortingOrder, UserApprovalConfigType } from '../Common';
 import { GitTriggers, IntersectionChangeHandler, IntersectionOptions, PreventOutsideFocusProps, WebhookEventNameType } from './types';
 import { AggregatedNodes, DeploymentStatusDetailsBreakdownDataType, DeploymentStatusDetailsType, PodMetadatum } from './Components';
 interface HighlightSearchTextProps {
@@ -40,13 +40,12 @@ 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 sanitizeUserApprovalList: (approverList: UserApprovalInfo["approverList"]) => UserApprovalInfo["approverList"];
-export declare const sanitizeApprovalConfigData: (approvalConfigData: ApprovalConfigDataType | null) => ApprovalConfigDataType;
+export declare const sanitizeUserApprovalConfig: (userApprovalConfig: UserApprovalConfigType) => UserApprovalConfigType;
 /**
  * Manual approval is considered configured only if the type is not notConfigured
  */
 export declare const getIsManualApprovalConfigured: (userApprovalConfig?: Pick<UserApprovalConfigType, "type">) => boolean;
-export declare const getIsApprovalPolicyConfigured: (approvalConfigData: ApprovalConfigDataType) => boolean;
+export declare const getIsManualApprovalSpecific: (userApprovalConfig?: Pick<UserApprovalConfigType, "type">) => 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.service.d.ts

@@ -9,3 +9,4 @@ export declare const getAppEnvDeploymentConfig: ({ params, signal, }: {
     params: AppEnvDeploymentConfigPayloadType;
     signal?: AbortSignal;
 }) => Promise<ResponseType<AppEnvDeploymentConfigDTO>>;
+export declare const getCompareSecretsData: (params: AppEnvDeploymentConfigPayloadType[]) => Promise<AppEnvDeploymentConfigDTO[]>;

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

@@ -1,4 +1,4 @@
-import { ReleaseTag, UserApprovalMetadataType } from '../../Common';
+import { ReleaseTag } from '../../Common';
 interface WebhookDataType {
     id: number;
     eventActionType: string;
@@ -132,7 +132,6 @@ export interface DraftMetadataDTO {
     commentsCount: number;
     dataEncrypted: boolean;
     isAppAdmin: boolean;
-    userApprovalMetadata: UserApprovalMetadataType;
 }
 export declare enum CMSecretExternalType {
     Internal = "",
@@ -214,7 +213,7 @@ export type AppEnvDeploymentConfigPayloadType = {
     appName: string;
     envName: string;
     configType: AppEnvDeploymentConfigType;
-    identifierId?: number;
+    wfrId?: number;
     pipelineId?: number;
     resourceType?: ConfigResourceType;
     resourceId?: number;

package/dist/Shared/constants.d.ts

@@ -417,11 +417,4 @@ 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,8 +1,7 @@
 import { Dayjs } from 'dayjs';
-import { ApprovalConfigDataType } from '../Common/Types';
-import { OptionType, CommonNodeAttr, ResponseType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams } from '../Common';
+import { OptionType, CommonNodeAttr, ResponseType, UserApprovalConfigType, VulnerabilityType, DeploymentAppTypes, ServerErrors, SortingParams } from '../Common';
 import { KeyValueListType } from './Components';
-import { BASE_CONFIGURATION_ENV_ID, EnvironmentTypeEnum, PatchOperationType } from './constants';
+import { EnvironmentTypeEnum, PatchOperationType } from './constants';
 export declare enum EnvType {
     CHART = "helm_charts",
     APPLICATION = "apps"
@@ -247,7 +246,7 @@ export interface WorkflowType {
     showTippy?: boolean;
     appId?: number;
     isSelected?: boolean;
-    approvalConfiguredIdsMap?: Record<number, ApprovalConfigDataType>;
+    approvalConfiguredIdsMap?: Record<number, UserApprovalConfigType>;
     imageReleaseTags: string[];
     appReleaseTags?: string[];
     tagsEditable?: boolean;
@@ -404,8 +403,7 @@ export interface SeverityCount {
 export declare enum PolicyKindType {
     lockConfiguration = "lock-configuration",
     imagePromotion = "image-promotion",
-    plugins = "plugin",
-    approval = "approval"
+    plugins = "plugin"
 }
 export interface LastExecutionResultType {
     lastExecution: string;
@@ -737,16 +735,6 @@ 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;

package/dist/{cssMode-D11O2E1k.js → cssMode-BmSNnJw3.js}

@@ -1,7 +1,7 @@
 var Fe = Object.defineProperty;
 var Le = (e, n, i) => n in e ? Fe(e, n, { enumerable: !0, configurable: !0, writable: !0, value: i }) : e[n] = i;
 var k = (e, n, i) => Le(e, typeof n != "symbol" ? n + "" : n, i);
-import { m as je } from "./index-z1VqANAp.js";
+import { m as je } from "./index-BFIbGckM.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

package/dist/{freemarker2-C51qAKbA.js → freemarker2-BpS2QKgO.js}

@@ -1,4 +1,4 @@
-import { m as f } from "./index-z1VqANAp.js";
+import { m as f } from "./index-BFIbGckM.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

package/dist/{handlebars-CsLZABhp.js → handlebars-B13ESBMZ.js}

@@ -1,4 +1,4 @@
-import { m as l } from "./index-z1VqANAp.js";
+import { m as l } from "./index-BFIbGckM.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

package/dist/{html-Ia2rtvLv.js → html-BvRCaRIv.js}

@@ -1,4 +1,4 @@
-import { m as s } from "./index-z1VqANAp.js";
+import { m as s } from "./index-BFIbGckM.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)

package/dist/{htmlMode-D6P0aWy3.js → htmlMode-BsyRYwNE.js}

@@ -1,7 +1,7 @@
 var Be = Object.defineProperty;
 var $e = (e, n, i) => n in e ? Be(e, n, { enumerable: !0, configurable: !0, writable: !0, value: i }) : e[n] = i;
 var k = (e, n, i) => $e(e, typeof n != "symbol" ? n + "" : n, i);
-import { m as qe } from "./index-z1VqANAp.js";
+import { m as qe } from "./index-BFIbGckM.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Version: 0.44.0(3e047efd345ff102c8c61b5398fb30845aaac166)