Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pagination added to microplan search and my microplan #1706

Open
wants to merge 7 commits into
base: console
Choose a base branch
from
Open

Pagination added to microplan search and my microplan #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a885b67
Changes
abishekTa-egov Oct 30, 2024
3914fcf
pagination added
abishekTa-egov Oct 30, 2024
951cd5f
undoing changes
abishekTa-egov Oct 30, 2024
4063ccd
Merge branch 'console' into Abi1-29-10
abishekTa-egov Oct 30, 2024
f8723b7
Update UICustomizations.js
abishekTa-egov Oct 30, 2024
f7a9c34
Update searchSavedPlansWithCampaign.js
abishekTa-egov Oct 30, 2024
3db37f6
Update searchSavedPlans.js
abishekTa-egov Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ui/web/micro-ui-internals/packages/modules/microplan/src/configs/MicroplanSearchConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export const UICustomizations = {
<p>{t(value)}</p>
</div>
);

abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
} else {
return (
<div>
Expand Down Expand Up @@ -256,7 +257,7 @@ export const UICustomizations = {
variation="secondary"
icon={"ArrowForward"}
type="button"
isDisabled={!hasRequiredRole}
isDisabled={!hasRequiredRole && row.status!="RESOURCE_ESTIMATIONS_APPROVED"}
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
className="dm-workbench-download-template-btn dm-hover"
onClick={(e) => onActionSelect("START", row)}
/>
Expand Down
1 change: 1 addition & 0 deletions .../web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchSavedPlans.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions ...i-internals/packages/modules/microplan/src/hooks/services/searchSavedPlansWithCampaign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down