Merge pull request #4 from virtualidentityag/feat/CARITAS-243-rm-team…

…-consultation feat(CARITAS-243): teamsessions-removal
virtualidentityag · Sep 11, 2024 · 8c2a811 · 8c2a811
2 parents 09b86f3 + 95eb102
commit 8c2a811
Show file tree

Hide file tree

Showing 43 changed files with 46 additions and 639 deletions.
diff --git a/cypress/fixtures/registration/agency.json b/cypress/fixtures/registration/agency.json
@@ -4,7 +4,6 @@
 	"postcode": "postcode",
 	"city": "city",
 	"description": "description",
-	"teamAgency": true,
 	"offline": false,
 	"consultingType": 1,
 	"topicIds": null

diff --git a/cypress/fixtures/registration/consultingType.json b/cypress/fixtures/registration/consultingType.json
@@ -50,13 +50,6 @@
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.agencies.json b/cypress/fixtures/service.agencies.json
@@ -5,7 +5,6 @@
 		"postcode": "postcode",
 		"city": "city",
 		"description": "description",
-		"teamAgency": true,
 		"offline": false,
 		"consultingType": 1,
 		"url": "url",

diff --git a/cypress/fixtures/service.consultingtypes.addiction.json b/cypress/fixtures/service.consultingtypes.addiction.json
@@ -50,13 +50,6 @@
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.emigration.json b/cypress/fixtures/service.consultingtypes.emigration.json
@@ -47,13 +47,6 @@
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": false,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.pregnancy.json b/cypress/fixtures/service.consultingtypes.pregnancy.json
@@ -51,13 +51,6 @@
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.u25.json b/cypress/fixtures/service.consultingtypes.u25.json
@@ -54,13 +54,6 @@
 			"peer": ["consultant", "u25-consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"requiredComponents": {
 		"age": {

diff --git a/cypress/fixtures/service.users.data.json b/cypress/fixtures/service.users.data.json
@@ -13,7 +13,6 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 0
 			}
@@ -26,7 +25,6 @@
 		"consultingTypes": null,
 		"formalLanguage": true,
 		"absent": false,
-		"inTeamAgency": true,
 		"languages": [],
 		"emailToggles": [
 			{
@@ -53,16 +51,14 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 2
 			}
 		],
 		"grantedAuthorities": ["AUTHORIZATION_CONSULTANT_DEFAULT"],
 		"consultingTypes": null,
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": true
+		"absent": false
 	},
 	{
 		"userId": "asker",
@@ -84,15 +80,13 @@
 					"postcode": "12345",
 					"city": "city",
 					"description": null,
-					"teamAgency": true,
 					"offline": false,
 					"consultingType": 1
 				}
 			},
 			"17": { "sessionData": null, "isRegistered": false, "agency": null }
 		},
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": false
+		"absent": false
 	}
 ]
diff --git a/cypress/fixtures/service.users.sessions.room.json b/cypress/fixtures/service.users.sessions.room.json
@@ -12,7 +12,6 @@
 		"lastMessage": null,
 		"messageDate": 0,
 		"messagesRead": false,
-		"isTeamSession": false,
 		"registrationType": "REGISTERED",
 		"createDate": "2022-06-15T08:09:18Z",
 		"attachment": null,

diff --git a/cypress/support/sessions.ts b/cypress/support/sessions.ts
@@ -2,7 +2,6 @@ import { v4 as uuid } from 'uuid';
 import { SESSION_LIST_TYPES } from '../../src/components/session/sessionHelpers';
 import {
 	ListItemInterface,
-	SessionItemInterface,
 	SessionUserDataInterface
 } from '../../src/globalState/interfaces';
 
@@ -47,7 +46,6 @@ export const generateConsultantSession = ({
 			lastMessage: 'lastMessage',
 			messageDate: 1606900238,
 			messagesRead: messagesRead === undefined ? true : messagesRead,
-			isTeamSession: true,
 			attachment: null,
 			registrationType: 'REGISTERED',
 			e2eLastMessage: {
@@ -86,11 +84,9 @@ export const generateMultipleConsultantSessions = (amount: number): void => {
 };
 
 export const generateAskerSession = ({
-	messagesRead,
-	isTeamSession
+	messagesRead
 }: {
 	messagesRead?: boolean;
-	isTeamSession?: boolean;
 } = {}): ListItemInterface => {
 	const sessionId = Math.random();
 	const rcGroupId = uuid();
@@ -112,7 +108,6 @@ export const generateAskerSession = ({
 			lastMessage: null,
 			messageDate: null,
 			messagesRead: messagesRead === undefined ? true : messagesRead,
-			isTeamSession: isTeamSession === undefined ? true : isTeamSession,
 			attachment: null,
 			registrationType: 'REGISTERED',
 			e2eLastMessage: {
@@ -133,7 +128,6 @@ export const generateAskerSession = ({
 			postcode: '12345',
 			city: 'city',
 			description: null,
-			teamAgency: true,
 			offline: false,
 			consultingType: 1
 		},

diff --git a/src/api/apiGetConsultantSessionList.ts b/src/api/apiGetConsultantSessionList.ts
@@ -25,15 +25,8 @@ export const apiGetConsultantSessionList = async ({
 	count = SESSION_COUNT,
 	signal
 }: ApiGetConsultantSessionListInterface): Promise<ListItemsResponseInterface> => {
-	const isTeamSession: boolean = type === SESSION_LIST_TYPES.TEAMSESSION;
 	let url: string;
-	if (isTeamSession) {
-		url = `${
-			sessionListTab === SESSION_LIST_TAB_ARCHIVE
-				? `${endpoints.teamSessionsBase}${SESSION_LIST_TAB_ARCHIVE}?`
-				: `${endpoints.consultantTeamSessions}`
-		}`;
-	} else if (type === SESSION_LIST_TYPES.MY_SESSION) {
+	if (type === SESSION_LIST_TYPES.MY_SESSION) {
 		url = `${
 			sessionListTab === SESSION_LIST_TAB_ARCHIVE
 				? `${endpoints.myMessagesBase}${SESSION_LIST_TAB_ARCHIVE}?`

diff --git a/src/components/agencyRadioSelect/AgencyRadioSelect.tsx b/src/components/agencyRadioSelect/AgencyRadioSelect.tsx
@@ -56,7 +56,6 @@ export const AgencyRadioSelect = ({
 						prefix: 'agency'
 					}}
 					info={agency}
-					showTeamAgencyInfo={agency.teamAgency}
 					isProfileView={showTooltipAbove}
 				/>
 			</div>

diff --git a/src/components/app/NavigationBar.tsx b/src/components/app/NavigationBar.tsx
@@ -54,11 +54,9 @@ export const NavigationBar = ({
 		AUTHORITIES.CONSULTANT_DEFAULT,
 		userData
 	);
-	const {
-		sessions: unreadSessions,
-		group: unreadGroup,
-		teamsessions: unreadTeamSessions
-	} = useContext(RocketChatUnreadContext);
+	const { sessions: unreadSessions, group: unreadGroup } = useContext(
+		RocketChatUnreadContext
+	);
 	const { tenant } = useContext(TenantContext);
 
 	const ref_menu = useRef<any>([]);
@@ -103,29 +101,20 @@ export const NavigationBar = ({
 			return;
 		}
 
-		if (
-			unreadSessions.length +
-				unreadGroup.length +
-				unreadTeamSessions.length >
-			0
-		) {
+		if (unreadSessions.length + unreadGroup.length > 0) {
 			setAnimateNavIcon(true);
 		}
 
 		animateNavIconTimeoutRef.current = setTimeout(() => {
 			setAnimateNavIcon(false);
 			animateNavIconTimeoutRef.current = null;
 		}, 1000);
-	}, [unreadSessions, unreadGroup, unreadTeamSessions]);
-
-	const notificationConsultant = isConsultant ? 0 : unreadTeamSessions.length;
+	}, [unreadSessions, unreadGroup]);
 
 	const pathsToShowUnreadMessageNotification = {
 		'/sessions/consultant/sessionView':
 			unreadSessions.length + unreadGroup.length,
-		'/sessions/user/view':
-			unreadSessions.length + unreadGroup.length + notificationConsultant,
-		'/sessions/consultant/teamSessionView': unreadTeamSessions.length,
+		'/sessions/user/view': unreadSessions.length + unreadGroup.length,
 		'/profile': isFirstVisit && !browserNotificationsSettings().visited
 	};