Skip to content

Fix country dashboard sharing: restrict access to project users/groups #581

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

Open
Ramon-Jimenez wants to merge 9 commits into
base: development
Choose a base branch
from
Open

Fix country dashboard sharing: restrict access to project users/groups #581

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
5f81770
fix country dashboard sharing: restrict access to project users/groups
Ramon-Jimenez Apr 16, 2026
6aeab9b
add script to update country dashboards permissions
eperedo Apr 19, 2026
e1d13ab
improve logs and add a persist flag
eperedo Apr 19, 2026
b62eeab
get reference to all country dashboards even if there is no projects …
eperedo Apr 21, 2026
bedd5d4
remove app migration
eperedo Apr 22, 2026
27f012b
Merge branch 'fix/country-dashboard-sharing' of github.com:EyeSeeTea/…
eperedo Apr 22, 2026
337d2c3
remove country migration
eperedo Apr 22, 2026
1e06a92
validate if org. unit match a country dashboard by name and attribute…
eperedo Apr 22, 2026
035bd58
get dashboard id from attribute in org. units
eperedo Apr 22, 2026
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
11 changes: 8 additions & 3 deletions src/models/CountryDashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
Condition,
DashboardSourceMetadata,
} from "./ProjectsListDashboard";
import { D2Sharing, getD2Access } from "./Sharing";
import { D2Sharing, getD2EntitiesAccess, fullMetadataAccess } from "./Sharing";

type D2VisualizationPayload = PartialPersistedModel<D2Visualization>;

Expand Down Expand Up @@ -241,9 +241,14 @@ export default class CountryDashboard {
return d2Table ? { ...d2Table, ...chart.extra } : null;
}

getSharing(): Partial<D2Sharing> {
getSharing(): D2Sharing {
const { userAccesses, userGroupAccesses } = this.country.projectsListDashboard.sharing;

return {
publicAccess: getD2Access({ meta: { read: true, write: true } }),
publicAccess: "--------",
externalAccess: false,
userAccesses: getD2EntitiesAccess(userAccesses, fullMetadataAccess),
userGroupAccesses: getD2EntitiesAccess(userGroupAccesses, fullMetadataAccess),
};
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/models/ProjectsList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import _ from "lodash";
import { TableSorting } from "@eyeseetea/d2-ui-components";
import { D2Api, D2OrganisationUnitSchema, SelectedPick, Id, Pager, Ref } from "../types/d2-api";
import { Config } from "./Config";
import moment, { Moment } from "moment";
Expand Down Expand Up @@ -399,3 +398,8 @@ function getOrgUnitsFilter(filters: FiltersForList, currentUser: User) {
: userCountryIds;
return filterCountryIds ? { "parent.id": { in: filterCountryIds } } : {};
}

export type TableSorting<T> = {
field: keyof T;
order: "asc" | "desc";
};
110 changes: 105 additions & 5 deletions src/models/__tests__/data/project-db-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,27 @@
"y": 90
}
],
"publicAccess": "rw------"
"publicAccess": "--------",
"externalAccess": false,
"userAccesses": [
{
"id": "M5zQapPyTZI",
"displayName": "admin admin",
"access": "rw------"
}
],
"userGroupAccesses": [
{
"id": "ywuI2WspUUG",
"displayName": "System Admin",
"access": "rw------"
},
{
"id": "mKKNXzeIAJs",
"displayName": "Data Management Admin",
"access": "rw------"
}
]
},
{
"id": "OiCmorbkHNf",
Expand Down Expand Up @@ -3112,7 +3132,27 @@
]
}
],
"publicAccess": "rw------"
"publicAccess": "--------",
"externalAccess": false,
"userAccesses": [
{
"id": "M5zQapPyTZI",
"displayName": "admin admin",
"access": "rw------"
}
],
"userGroupAccesses": [
{
"id": "ywuI2WspUUG",
"displayName": "System Admin",
"access": "rw------"
},
{
"id": "mKKNXzeIAJs",
"displayName": "Data Management Admin",
"access": "rw------"
}
]
},
{
"id": "CS7csnUtibF",
Expand Down Expand Up @@ -3230,7 +3270,27 @@
]
}
],
"publicAccess": "rw------"
"publicAccess": "--------",
"externalAccess": false,
"userAccesses": [
{
"id": "M5zQapPyTZI",
"displayName": "admin admin",
"access": "rw------"
}
],
"userGroupAccesses": [
{
"id": "ywuI2WspUUG",
"displayName": "System Admin",
"access": "rw------"
},
{
"id": "mKKNXzeIAJs",
"displayName": "Data Management Admin",
"access": "rw------"
}
]
},
{
"id": "GqYJDh6asM8",
Expand Down Expand Up @@ -3378,7 +3438,27 @@
]
}
],
"publicAccess": "rw------"
"publicAccess": "--------",
"externalAccess": false,
"userAccesses": [
{
"id": "M5zQapPyTZI",
"displayName": "admin admin",
"access": "rw------"
}
],
"userGroupAccesses": [
{
"id": "ywuI2WspUUG",
"displayName": "System Admin",
"access": "rw------"
},
{
"id": "mKKNXzeIAJs",
"displayName": "Data Management Admin",
"access": "rw------"
}
]
},
{
"id": "me6p7L8VHXl",
Expand Down Expand Up @@ -3490,7 +3570,27 @@
]
}
],
"publicAccess": "rw------"
"publicAccess": "--------",
"externalAccess": false,
"userAccesses": [
{
"id": "M5zQapPyTZI",
"displayName": "admin admin",
"access": "rw------"
}
],
"userGroupAccesses": [
{
"id": "ywuI2WspUUG",
"displayName": "System Admin",
"access": "rw------"
},
{
"id": "mKKNXzeIAJs",
"displayName": "Data Management Admin",
"access": "rw------"
}
]
},
{
"id": "uqMTlezGj0I",
Expand Down
3 changes: 1 addition & 2 deletions src/pages/projects-list/ProjectsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import _ from "lodash";
import { TableSorting } from "@eyeseetea/d2-ui-components";
import React, { useCallback } from "react";
import styled from "styled-components";
import ActionButton from "../../components/action-button/ActionButton";
Expand All @@ -15,7 +14,7 @@ import { ObjectsList, ObjectsListProps } from "../../components/objects-list/Obj
import { useAppContext } from "../../contexts/api-context";
import i18n from "../../locales";
import Project from "../../models/Project";
import { FiltersForList, ProjectForList } from "../../models/ProjectsList";
import { FiltersForList, ProjectForList, TableSorting } from "../../models/ProjectsList";
import { useGoTo } from "../../router";
import { Id } from "../../types/d2-api";
import { ActionName, getComponentConfig, UrlState } from "./ProjectsListConfig";
Expand Down
16 changes: 1 addition & 15 deletions src/pages/unique-periods/UniquePeriodsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,14 @@ import {
import i18n from "../../locales";
import { Maybe } from "../../types/utils";
import { getErrors } from "../../domain/entities/generic/Errors";
import { months } from "../../utils/date";

export type UniquePeriodsFormProps = {
existingPeriod?: UniqueBeneficiariesPeriodsAttrs;
onClose: () => void;
onSubmit: (uniquePeriods: UniqueBeneficiariesPeriod) => void;
};

export const months = [
{ value: "1", text: i18n.t("January") },
{ value: "2", text: i18n.t("February") },
{ value: "3", text: i18n.t("March") },
{ value: "4", text: i18n.t("April") },
{ value: "5", text: i18n.t("May") },
{ value: "6", text: i18n.t("June") },
{ value: "7", text: i18n.t("July") },
{ value: "8", text: i18n.t("August") },
{ value: "9", text: i18n.t("September") },
{ value: "10", text: i18n.t("October") },
{ value: "11", text: i18n.t("November") },
{ value: "12", text: i18n.t("December") },
];

function getValueByAttribute(
value: string,
attribute: keyof UniqueBeneficiariesPeriod
Expand Down
Loading
Loading