Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
84 changes: 74 additions & 10 deletions openApi/dashboard-api-docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2338,12 +2338,12 @@
} ]
}
},
"/v2/user-groups/{id}" : {
"/v2/user-groups/me/{id}" : {
"get" : {
"tags" : [ "user-groups" ],
"summary" : "getUserGroupById",
"description" : "Service to get a specific UserGroup entity",
"operationId" : "getUserGroupByIdUsingGET",
"summary" : "getMyUserGroupById",
"description" : "Service to get a specific UserGroup entity but only if you are member of it",
"operationId" : "getMyUserGroupByIdUsingGET",
"parameters" : [ {
"name" : "id",
"in" : "path",
Expand All @@ -2353,12 +2353,76 @@
"schema" : {
"type" : "string"
}
}, {
"name" : "institutionId",
"in" : "query",
"description" : "Users group's institutionId",
"required" : false,
"style" : "form",
} ],
"responses" : {
"200" : {
"description" : "OK",
"content" : {
"application/json" : {
"schema" : {
"$ref" : "#/components/schemas/UserGroupResource"
}
}
}
},
"400" : {
"description" : "Bad Request",
"content" : {
"application/problem+json" : {
"schema" : {
"$ref" : "#/components/schemas/Problem"
}
}
}
},
"401" : {
"description" : "Unauthorized",
"content" : {
"application/problem+json" : {
"schema" : {
"$ref" : "#/components/schemas/Problem"
}
}
}
},
"404" : {
"description" : "Not Found",
"content" : {
"application/problem+json" : {
"schema" : {
"$ref" : "#/components/schemas/Problem"
}
}
}
},
"500" : {
"description" : "Internal Server Error",
"content" : {
"application/problem+json" : {
"schema" : {
"$ref" : "#/components/schemas/Problem"
}
}
}
}
},
"security" : [ {
"bearerAuth" : [ "global" ]
} ]
}
},
"/v2/user-groups/{id}" : {
"get" : {
"tags" : [ "user-groups" ],
"summary" : "getUserGroupById",
"description" : "Service to get a specific UserGroup entity even if you are not member of it",
"operationId" : "getUserGroupByIdUsingGET",
"parameters" : [ {
"name" : "id",
"in" : "path",
"description" : "Users group's unique identifier",
"required" : true,
"style" : "simple",
"schema" : {
"type" : "string"
}
Expand Down
71 changes: 63 additions & 8 deletions openApi/generated-dashboard/dashboard-swagger20.json
Original file line number Diff line number Diff line change
Expand Up @@ -1952,6 +1952,68 @@
"summary": "createUserGroup"
}
},
"/v2/user-groups/me/{id}": {
"get": {
"produces": [
"application/json",
"application/problem+json"
],
"parameters": [
{
"description": "Users group's unique identifier",
"in": "path",
"name": "id",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/UserGroupResource"
}
},
"400": {
"description": "Bad Request",
"schema": {
"$ref": "#/definitions/Problem"
}
},
"401": {
"description": "Unauthorized",
"schema": {
"$ref": "#/definitions/Problem"
}
},
"404": {
"description": "Not Found",
"schema": {
"$ref": "#/definitions/Problem"
}
},
"500": {
"description": "Internal Server Error",
"schema": {
"$ref": "#/definitions/Problem"
}
}
},
"security": [
{
"bearerAuth": [
"global"
]
}
],
"tags": [
"user-groups"
],
"description": "Service to get a specific UserGroup entity but only if you are member of it",
"operationId": "getMyUserGroupByIdUsingGET",
"summary": "getMyUserGroupById"
}
},
"/v2/user-groups/{id}": {
"delete": {
"produces": [
Expand Down Expand Up @@ -2015,13 +2077,6 @@
"name": "id",
"required": true,
"type": "string"
},
{
"description": "Users group's institutionId",
"in": "query",
"name": "institutionId",
"required": false,
"type": "string"
}
],
"responses": {
Expand Down Expand Up @@ -2066,7 +2121,7 @@
"tags": [
"user-groups"
],
"description": "Service to get a specific UserGroup entity",
"description": "Service to get a specific UserGroup entity even if you are not member of it",
"operationId": "getUserGroupByIdUsingGET",
"summary": "getUserGroupById"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
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-rc.20250903085304",
"@pagopa/selfcare-common-frontend": "^1.34.68",
"@pagopa/mui-italia": "^1.7.1",
"@pagopa/selfcare-common-frontend": "^1.34.69",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@types/react-router-dom": "^5.1.8",
Expand Down
8 changes: 8 additions & 0 deletions src/api/DashboardApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { InstitutionUserDetailsResource } from './generated/b4f-dashboard/Instit
import { PageOfUserGroupPlainResource } from './generated/b4f-dashboard/PageOfUserGroupPlainResource';
import { ProductUserResource } from './generated/b4f-dashboard/ProductUserResource';
import { UserCountResource } from './generated/b4f-dashboard/UserCountResource';
import { UserGroupResource } from './generated/b4f-dashboard/UserGroupResource';
import { UserIdResource } from './generated/b4f-dashboard/UserIdResource';
import { UserResource } from './generated/b4f-dashboard/UserResource';

Expand Down Expand Up @@ -231,6 +232,13 @@ export const DashboardApi = {
return extractResponse(result, 200, onRedirectToLogin);
},

getMyUserGroupById: async (id: string): Promise<UserGroupResource | null> => {
const result = await apiClient.getMyUserGroupByIdUsingGET({
id,
});
return extractResponse(result, 200, onRedirectToLogin);
},

addMemberToUserGroup: async (id: string, userId: string): Promise<void> => {
const result = await apiClient.addMemberToUserGroupUsingPOST({
id,
Expand Down
5 changes: 5 additions & 0 deletions src/api/__mocks__/DashboardApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
StatusEnum,
UserGroupPlainResource,
} from '../generated/b4f-dashboard/UserGroupPlainResource';
import { UserGroupResource } from '../generated/b4f-dashboard/UserGroupResource';
import { UserIdResource } from '../generated/b4f-dashboard/UserIdResource';
import { UserResource } from '../generated/b4f-dashboard/UserResource';

Expand Down Expand Up @@ -258,7 +259,11 @@ export const DashboardApi = {
_pageRequest: PageRequest
): Promise<Array<UserGroupPlainResource>> => Promise.resolve(userGroupPlainResourceArray),

getMyUserGroupById: async (_id: string): Promise<UserGroupResource | null> =>
Promise.resolve(userGroupPlainResourceArray),

addMemberToUserGroup: async (_id: string, _userId: string): Promise<void> => Promise.resolve(),


checkUser: async (
_institutionId: string,
Expand Down
19 changes: 15 additions & 4 deletions src/services/__mocks__/groupsService.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { User } from '@pagopa/selfcare-common-frontend/lib/model/User';
import { PageResource } from '@pagopa/selfcare-common-frontend/lib/model/PageResource';
import { PageRequest } from '@pagopa/selfcare-common-frontend/lib/model/PageRequest';
import {
applySort,
extractPageRequest,
} from '@pagopa/selfcare-common-frontend/lib/hooks/useFakePagination';
import { PageRequest } from '@pagopa/selfcare-common-frontend/lib/model/PageRequest';
import { PageResource } from '@pagopa/selfcare-common-frontend/lib/model/PageResource';
import { User } from '@pagopa/selfcare-common-frontend/lib/model/User';
import { cloneDeep } from 'lodash';
import { Party } from '../../model/Party';
import { Product } from '../../model/Product';
import { PartyGroup, PartyGroupStatus } from '../../model/PartyGroup';
import { Product } from '../../model/Product';
import { UserGroupResource } from '../../api/generated/b4f-dashboard/UserGroupResource';

type PartyGroupMock = PartyGroup & {
membersIds: Array<string>;
Expand Down Expand Up @@ -290,5 +291,15 @@ export const fetchPartyGroups = (
);
};

export const mockGetMyUserGroupByIdService = (id: string): Promise<UserGroupResource | null> => {
const mockedGroup = mockedGroups.find((u) => u.id === id) ?? null;
if (mockedGroup !== null) {
const clone: PartyGroupMock = cloneDeep(mockedGroup);
return Promise.resolve(clone as unknown as UserGroupResource);
} else {
return Promise.resolve(null);
}
};

export const addMemberToUserGroup = (_id: string, userId: string): Promise<string> =>
new Promise((resolve) => resolve(userId));
11 changes: 11 additions & 0 deletions src/services/groupsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import { PageRequest } from '@pagopa/selfcare-common-frontend/lib/model/PageRequ
import { PageResource } from '@pagopa/selfcare-common-frontend/lib/model/PageResource';
import { User } from '@pagopa/selfcare-common-frontend/lib/model/User';
import { DashboardApi } from '../api/DashboardApiClient';
import { UserGroupResource } from '../api/generated/b4f-dashboard/UserGroupResource';
import { Party } from '../model/Party';
import { PartyGroup, usersGroupPlainResource2PartyGroup } from '../model/PartyGroup';
import { Product } from '../model/Product';
import {
addMemberToUserGroup as addMemberToUserGroupMocked,
fetchPartyGroups as fetchPartyGroupsMocked,
mockGetMyUserGroupByIdService,
} from './__mocks__/groupsService';

export const fetchPartyGroups = (
Expand All @@ -34,6 +36,15 @@ export const fetchPartyGroups = (
}
};

export const getMyUserGroupByIdService = (id: string): Promise<UserGroupResource | null> => {
/* istanbul ignore if */
if (process.env.REACT_APP_API_MOCK_PARTY_GROUPS === 'true') {
return mockGetMyUserGroupByIdService(id);
} else {
return DashboardApi.getMyUserGroupById(id);
}
};

export const addMemberToUserGroup = (id: string, userId: string): Promise<string> => {
/* istanbul ignore if */
if (process.env.REACT_APP_API_MOCK_PARTY_USERS === 'true') {
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2176,10 +2176,10 @@
resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz#337fb2bca0453d0726696e745f50064411f646d6"
integrity sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==

"@pagopa/mui-italia@^1.7.1-rc.20250902070302", "@pagopa/mui-italia@^1.7.1-rc.20250903085304":
version "1.7.1-rc.20250903085304"
resolved "https://registry.yarnpkg.com/@pagopa/mui-italia/-/mui-italia-1.7.1-rc.20250903085304.tgz#014a431f411f1f64801b73c3cb5239bfeb76e9c6"
integrity sha512-BRFnsIl/8/nSbp0M1jzjgEOxTNMZmxW4tI/czqm/xJ80s1ezVy8jk+v1IN6SeYEnyUqWkafJ3aWJqTdEf1SBMw==
"@pagopa/mui-italia@^1.7.1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@pagopa/mui-italia/-/mui-italia-1.7.1.tgz#14ee22ef33b8240a246285d1d803a629b9b50243"
integrity sha512-ILS9PqPX7/RwTLSWV6GtqeNyXt5LFXkAC/1GsMRtCOwW+OJ2Stc8cnS8DVWxCEm20tdjtr9j25LaKW/S46DKVg==
dependencies:
"@fontsource/dm-mono" "^4.5.10"
"@fontsource/titillium-web" "^4.5.9"
Expand All @@ -2202,18 +2202,18 @@
write-yaml-file "^4.1.3"
yargs "^15.0.1"

"@pagopa/selfcare-common-frontend@^1.34.68":
version "1.34.68"
resolved "https://registry.yarnpkg.com/@pagopa/selfcare-common-frontend/-/selfcare-common-frontend-1.34.68.tgz#6fb979321bb8f046b9572c61c15ecf6108c632e8"
integrity sha512-mG8IqD0TEjRg68UStN2q/Ge5xT5nmfXi4kunMZWB8YpL48Z9Ro1f+EeF2sMuaiwB9Ykk1ancoXdPMNi1oWfe6A==
"@pagopa/selfcare-common-frontend@^1.34.69":
version "1.34.69"
resolved "https://registry.yarnpkg.com/@pagopa/selfcare-common-frontend/-/selfcare-common-frontend-1.34.69.tgz#bf6594b82e7ace0dfedfe6f02a18225b8451000a"
integrity sha512-BowUZqB45hDeWx1ajEGMe2oVjjK+nlTNZ3iqf2CWnujMCTprcRySLYii1w7yhcVovg7bl3Goh6/Z7RgdelXokQ==
dependencies:
"@emotion/react" "^11.11.1"
"@emotion/styled" "^11.11.0"
"@mui/icons-material" "^5.14.1"
"@mui/lab" "^5.0.0-alpha.137"
"@mui/material" "^5.14.1"
"@mui/system" "^5.14.1"
"@pagopa/mui-italia" "^1.7.1-rc.20250902070302"
"@pagopa/mui-italia" "^1.7.1"
"@pagopa/ts-commons" "^13.1.2"
"@reduxjs/toolkit" "^1.6.2"
async "3.2.4"
Expand Down
Loading