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

Prod back merge #4523

Merged
merged 9 commits into from
Dec 12, 2024
Merged

Prod back merge #4523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5c0132b
skip unstable
pavlo-mk Dec 3, 2024
9175069
Merge pull request #4502 from unicef/skip-unstable-e2e
johniak Dec 3, 2024
be85651
Merge pull request #4512 from unicef/staging
johniak Dec 9, 2024
9d77170
2226242_Payment_verification_page_not_accessible (#4514)
MarekBiczysko Dec 10, 2024
03bf48e
add correct permission for cycles page
Dec 11, 2024
3b1e1cd
fe fix
pavlo-mk Dec 11, 2024
1f9dc4e
just new line
pavlo-mk Dec 11, 2024
f466892
Merge pull request #4520 from unicef/fix-perm-cycles
johniak Dec 12, 2024
ac4bc8f
back merge
pavlo-mk Dec 12, 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
10 changes: 2 additions & 8 deletions ...ntainers/pages/paymentmodule/ProgramCycle/PaymentPlanDetails/PaymentPlanDetailsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const PaymentPlanDetailsHeader = ({
const { t } = useTranslation();
const { businessArea, programId } = useBaseUrl();
const programCycleId = paymentPlan.programCycle?.id;
const { data: programCycleData, isLoading: isLoadingProgramCycle } = useQuery(
const { data: programCycleData } = useQuery(
{
queryKey: [
'programCyclesDetails',
Expand All @@ -54,12 +54,6 @@ export const PaymentPlanDetailsHeader = ({
},
);

if (isLoadingProgramCycle) {
return null;
}

if (!programCycleData) return null;

const breadCrumbsItems: BreadCrumbsItem[] = [];

if (programCycleId) {
Expand All @@ -68,7 +62,7 @@ export const PaymentPlanDetailsHeader = ({
to: '../../..',
});
breadCrumbsItems.push({
title: `${programCycleData.title}`,
title: `${programCycleData?.title || ''}`,
to: '../..',
});
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/containers/pages/paymentmodule/ProgramCycle/ProgramCyclePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const ProgramCyclePage = (): ReactElement => {

if (permissions === null) return null;
if (!selectedProgram) return null;
if (!hasPermissions(PERMISSIONS.PM_VIEW_LIST, permissions))
if (!hasPermissions(PERMISSIONS.PM_PROGRAMME_CYCLE_VIEW_LIST, permissions))
return <PermissionDenied />;

return (
Expand Down
Loading