diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/MicroplanSearchConfig.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/MicroplanSearchConfig.js index 54da4509ad..a5c097fb5e 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/MicroplanSearchConfig.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/MicroplanSearchConfig.js @@ -12,7 +12,7 @@ const defaultSearchValues = { showTab: true, // setting true will enable tab screen TabSearchconfig: [ // all tab config should be added in json array { - label: "MY_MICROPLANS", + label: "MY_MICROPLANS_HEADER", type: "search", apiDetails: { serviceName: "/plan-service/config/_search", diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js index 2bf949b770..a4003c3792 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js @@ -122,6 +122,7 @@ export const UICustomizations = {

{t(value)}

); + } else { return (
@@ -256,7 +257,7 @@ export const UICustomizations = { variation="secondary" icon={"ArrowForward"} type="button" - isDisabled={!hasRequiredRole} + isDisabled={!hasRequiredRole && row.status!="RESOURCE_ESTIMATIONS_APPROVED"} className="dm-workbench-download-template-btn dm-hover" onClick={(e) => onActionSelect("START", row)} /> diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlans.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlans.js index 955ca4e93f..d228beeb70 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlans.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlans.js @@ -39,6 +39,7 @@ const SearchSavedPlans = async (body) => { }); const finalResponse = { PlanConfiguration: mergePlanAndCampaign(responsePlan?.PlanConfiguration, "campaignDetails", responseCampaign?.CampaignDetails), + TotalCount:responsePlan?.TotalCount || 0 }; return finalResponse; } catch (error) { diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js index e1975f19ac..fb82da687c 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js @@ -70,9 +70,11 @@ const SearchSavedPlansWithCampaign = async (body) => { }); const finalResponse = { PlanConfiguration: mergePlanAndCampaign(responsePlan?.PlanConfiguration, "campaignDetails", responseCampaign?.CampaignDetails), + totalCount:responsePlan?.TotalCount || 0 }; return finalResponse; } catch (error) { + if (error?.response?.data?.Errors) { throw new Error(error.response.data.Errors[0].message); }