Merge branch 'staging' into ISSUE_4639

Author: The-Daniel

backend/src/v5/utils/quota.js

@@ -35,7 +35,7 @@ Quota.getQuotaInfo = async (teamspace) => {
 		// paypal subs have a different schema - and no oen should have an active paypal sub. Skip.
 		if (key !== 'paypal') {
 			userHasHadPaidPlan = true;
-			const { expiryDate, data, collaborators: subCollaborators } = subs[key];
+			const { expiryDate, data, collaborators: subCollaborators = 0 } = subs[key];
 
 			if (!expiryDate || expiryDate > Date.now()) {
 				freeTier = false;

backend/tests/v5/unit/utils/quota.test.js

@@ -33,6 +33,7 @@ const testGetQuotaInfo = () => {
 	const tsWithMultipleLicense2 = 'multiLicense2';
 	const tsWithSomeUsage = 'withUsage';
 	const tsWithFreeQuota = 'freeQuota';
+	const tsWithNoCollabs = 'tsWithNoCollabs';
 
 	const validExpiryDate = Date.now() + 100000;
 	const subsByTeamspace = {
@@ -86,6 +87,13 @@ const testGetQuotaInfo = () => {
 		},
 
 		[tsWithFreeQuota]: {},
+
+		[tsWithNoCollabs]: {
+			enterprise: {
+				data: 1,
+				expiryDate: validExpiryDate,
+			},
+		},
 	};
 
 	DBHandler.findOne.mockImplementation((ts, col, { _id }) => {
@@ -100,6 +108,7 @@ const testGetQuotaInfo = () => {
 		['Teamspace with sufficient quota (multiple license)', tsWithMultipleLicense, 1024 * 1024 * 5, 9, validExpiryDate - 10, false],
 		['Teamspace with sufficient quota (multiple license v2)', tsWithMultipleLicense2, 1024 * 1024 * 3, 'unlimited', validExpiryDate, false],
 		['Teamspace with sufficient quota (with existing usage)', tsWithSomeUsage, 1024 * 1024 * 2, 3, validExpiryDate, false],
+		['Teamspace with no collaborators (with existing usage)', tsWithNoCollabs, 1024 * 1024 * 2, config.subscriptions.basic.collaborators, validExpiryDate, false],
 	])('Return quota info', (desc, teamspace, size, collaborators, expiryDate, freeTier, error) => {
 		test(`${desc} should ${error ? `fail with ${error.code}` : 'should return quota info'}`, async () => {
 			const quotaInfoProm = Quota.getQuotaInfo(teamspace);

frontend/src/v5/services/realtime/ticket.events.ts

@@ -22,6 +22,7 @@ import { getMeshIDsByQuery } from '@/v4/services/api';
 import { meshObjectsToV5GroupNode } from '@/v5/helpers/viewpoint.helpers';
 import { subscribeToRoomEvent } from './realtime.service';
 import { TicketsActionsDispatchers } from '../actionsDispatchers';
+import { fetchTicketGroup } from '../api/tickets';
 
 // Container ticket
 export const enableRealtimeContainerUpdateTicket = (teamspace: string, project: string, containerId: string) => (
@@ -52,6 +53,10 @@ export const enableRealtimeContainerUpdateTicketGroup = (teamspace: string, proj
 				const { data } = await getMeshIDsByQuery(teamspace, containerId, group.rules, revision);
 				// eslint-disable-next-line no-param-reassign
 				group.objects = meshObjectsToV5GroupNode(data);
+			// eslint-disable-next-line no-underscore-dangle
+			} else if (group.objects.some((o) => !o._ids)) {
+				const { objects } = await fetchTicketGroup(teamspace, project, containerId, group.ticket, group._id, false);
+				group.objects = objects;
 			}
 			TicketsActionsDispatchers.updateTicketGroupSuccess(group);
 		},
@@ -87,6 +92,10 @@ export const enableRealtimeFederationUpdateTicketGroup = (teamspace: string, pro
 				const { data } = await getMeshIDsByQuery(teamspace, federationId, group.rules, revision);
 				// eslint-disable-next-line no-param-reassign
 				group.objects = meshObjectsToV5GroupNode(data);
+			// eslint-disable-next-line no-underscore-dangle
+			} else if (group.objects.some((o) => !o._ids)) {
+				const { objects } = await fetchTicketGroup(teamspace, project, federationId, group.ticket, group._id, true);
+				group.objects = objects;
 			}
 			TicketsActionsDispatchers.updateTicketGroupSuccess(group);
 		},

frontend/src/v5/store/tickets/tickets.types.ts

@@ -135,6 +135,7 @@ export interface IGroupRule {
 export type Group = {
 	_id?: string,
 	name: string,
+	ticket?: string,
 	description?: string,
 	objects?: { container: string, _ids: string[] }[],
 	rules?: IGroupRule[],