Skip to content

[SELC-7642] feat: replace ManageProductUsers action with new actions. #554

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

Merged
merged 1 commit into from
Sep 18, 2025
Merged

[SELC-7642] feat: replace ManageProductUsers action with new actions. #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"@mui/material": "^5.14.1",
"@mui/x-data-grid": "^5.0.1",
"@mui/x-data-grid-generator": "^5.0.1",
"@pagopa/mui-italia": "^1.7.1",
"@pagopa/selfcare-common-frontend": "^1.34.69",
"@pagopa/mui-italia": "^1.7.2",
"@pagopa/selfcare-common-frontend": "^1.34.71",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@types/react-router-dom": "^5.1.8",
Expand Down Expand Up @@ -95,7 +95,8 @@
"z-schema": "^4.2.4",
"body-parser": "^1.20.3",
"node-fetch": "^2.7.0",
"@types/react": "18.3.16"
"@types/react": "18.3.16",
"form-data": "^4.0.4"
},
"jest": {
"restoreMocks": true,
Expand All @@ -107,4 +108,4 @@
"src/api/generated"
]
}
}
}
42 changes: 21 additions & 21 deletions src/microcomponents/mock_dashboard/data/party.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -146,7 +146,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -186,7 +186,7 @@ export const mockedParties: Array<Party> = [
},
userProductActions: [
Actions.ListProductUsers,
Actions.ManageProductUsers,
Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers,
Actions.AccessProductBackoffice,
Actions.ViewDelegations,
Actions.ListActiveProducts,
Expand All @@ -205,7 +205,7 @@ export const mockedParties: Array<Party> = [
},
userProductActions: [
Actions.ListProductUsers,
Actions.ManageProductUsers,
Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers,
Actions.AccessProductBackoffice,
Actions.ViewDelegations,
Actions.ListActiveProducts,
Expand All @@ -222,7 +222,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'CH435V',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
// Use case with prod-interop and prod-interop-coll
{
Expand All @@ -235,7 +235,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'NBG455B',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-interop-coll',
Expand All @@ -247,7 +247,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'NBG455B',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -309,7 +309,7 @@ export const mockedParties: Array<Party> = [
userProductActions: [
Actions.ListProductUsers,
Actions.AccessProductBackoffice,
Actions.ManageProductUsers,
Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers,
Actions.ViewDelegations,
Actions.ListActiveProducts,
Actions.AccessProductBackoffice,
Expand All @@ -328,7 +328,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -363,7 +363,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -375,7 +375,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -409,7 +409,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -421,7 +421,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -459,7 +459,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -471,7 +471,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -507,7 +507,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -519,7 +519,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -555,7 +555,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -567,7 +567,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down Expand Up @@ -603,7 +603,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'cccc',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
{
productId: 'prod-pn',
Expand All @@ -615,7 +615,7 @@ export const mockedParties: Array<Party> = [
recipientCode: 'dddd',
publicServices: true,
},
userProductActions: [Actions.ListProductUsers, Actions.ManageProductUsers],
userProductActions: [Actions.ListProductUsers, Actions.CreateProductUsers, Actions.UpdateProductUsers, Actions.DeleteProductUsers],
},
],
status: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/pages/addUserFlow/addUser/components/AddUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export default function AddUserForm({
party.products.some(
(pp) =>
p.id === pp.productId &&
hasPermission(pp.productId || '', Actions.ManageProductUsers) &&
hasPermission(pp.productId || '', Actions.CreateProductUsers) &&
pp.productOnBoardingStatus === 'ACTIVE'
)
);
Expand Down Expand Up @@ -612,7 +612,7 @@ export default function AddUserForm({
party.products.some(
(pp) =>
p.id === pp.productId &&
hasPermission(pp.productId, Actions.ManageProductUsers)
hasPermission(pp.productId, Actions.CreateProductUsers)
)
)
.map((p) => (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardUserDetail/components/UserProductGroups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function UserProductGroups({ user, party, product, userProduct }:
(pp) =>
pp.productId === product.id &&
pp.productOnBoardingStatus === 'ACTIVE' &&
hasPermission(pp.productId, Actions.ManageProductUsers)
hasPermission(pp.productId, Actions.CreateProductUsers)
);

return userGroups?.length > 0 || (onboardedAdminProduct && userGroupsComplement.length > 0) ? (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardUserDetail/userDetailPage/UserDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function UserDetailPage({
const addError = useErrorDispatcher();
const addNotify = useUserNotify();
const { getAllProductsWithPermission } = usePermissions();
const canEditUser = getAllProductsWithPermission(Actions.ManageProductUsers).length > 0;
const canEditUser = getAllProductsWithPermission(Actions.UpdateProductUsers).length > 0;
const titleRef = useRef<HTMLDivElement>(null);

useFocus(titleRef, partyUser);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardUserDetail/userDetailPage/components/UserProductDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function UserProductDetail({
(pp) =>
pp.productId === product.id &&
pp.productOnBoardingStatus === ProductOnBoardingStatusEnum.ACTIVE &&
hasPermission(pp.productId, Actions.ManageProductUsers) === false
hasPermission(pp.productId, Actions.UpdateProductUsers) === false
);

return (
Expand Down
4 changes: 2 additions & 2 deletions src/pages/dashboardUserDetail/userDetailPage/components/UserProductSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function UserProductSection({

{!partyUser.isCurrentUser &&
party.products
.filter((p) => hasPermission(p.productId || '', Actions.ManageProductUsers))
.filter((p) => hasPermission(p.productId || '', Actions.CreateProductUsers))
.find((p) => !partyUser.products.find((pu) => pu.id === p.productId)) && (
<Grid item xs={12} sm={3}>
<Stack
Expand Down Expand Up @@ -120,7 +120,7 @@ export default function UserProductSection({
canEdit={
!!party.products.find(
(p) =>
hasPermission(p.productId || '', Actions.ManageProductUsers) &&
hasPermission(p.productId || '', Actions.UpdateProductUsers) &&
p.productOnBoardingStatus === 'ACTIVE' &&
userProduct.id === p.productId
)
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboardUsers/UsersPage/UsersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function UsersPage({ party, activeProducts, productsMap, productsRolesMap }: Rea
const isMobile = useIsMobile('md');

const canSeeUsers = getAllProductsWithPermission(Actions.ListActiveProducts).length > 0;
const canAddUser = getAllProductsWithPermission(Actions.ManageProductUsers).length > 0;
const canAddUser = getAllProductsWithPermission(Actions.CreateProductUsers).length > 0;

const addUserUrl = resolvePathVariables(
DASHBOARD_USERS_ROUTES.PARTY_USERS.subRoutes.ADD_PARTY_USER.path,
Expand Down
Loading
Loading