Skip to content
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

[Bug Fix] All Instance Removed on Removing Single Instance #894

Merged
merged 2 commits into from
Apr 5, 2024
Merged

[Bug Fix] All Instance Removed on Removing Single Instance #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc1f0f
Refactor QuickPickProvider and WebExtensionContext to use _connection…
ritikramuka Apr 4, 2024
50d2a0b
Merge branch 'main' into users/ramukaritik/BugFixForCoPresence
ritikramuka Apr 4, 2024
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
12 changes: 7 additions & 5 deletions src/web/client/WebExtensionContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { FileDataMap } from "./context/fileDataMap";
import { IAttributePath, IEntityInfo } from "./common/interfaces";
import { ConcurrencyHandler } from "./dal/concurrencyHandler";
import { getMailToPath, getTeamChatURL, isMultifileEnabled } from "./utilities/commonUtil";
import { UserDataMap } from "./context/userDataMap";
import { IConnectionData, UserDataMap } from "./context/userDataMap";
import { EntityForeignKeyDataMap } from "./context/entityForeignKeyDataMap";
import { QuickPickProvider } from "./webViews/QuickPickProvider";
import { UserCollaborationProvider } from "./webViews/userCollaborationProvider";
Expand Down Expand Up @@ -776,18 +776,20 @@ class WebExtensionContext implements IWebExtensionContext {
containerId: string,
userName: string,
userId: string,
entityId: string[]
entityId: string[],
connectionData: IConnectionData[],
) {
this.connectedUsers.setUserData(
containerId,
userName,
userId,
entityId
entityId,
connectionData
);
}

public async removeConnectedUserInContext(userId: string) {
this.connectedUsers.removeUser(userId);
public async removeConnectedUserInContext(userId: string, removeConnectionData: IConnectionData) {
this.connectedUsers.removeUser(userId, removeConnectionData);
}

public async getMail(userId: string): Promise<string> {
Expand Down
8 changes: 8 additions & 0 deletions src/web/client/common/worker/webworker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ async function loadContainer(config, swpId, entityInfo) {
.get(user.userId).connections;

const userEntityIdArray = [];
const userConnectionData = [];

const connectionIdInContainer = await map
.get("selection")
Expand All @@ -129,6 +130,7 @@ async function loadContainer(config, swpId, entityInfo) {
userEntityIdArray.push(
connectionIdInContainer.get(connection.id)
);
userConnectionData.push({ connectionId: connection.id, entityId: connectionIdInContainer.get(connection.id) });
});

// aadObjectId is the unique identifier for a user
Expand All @@ -138,6 +140,7 @@ async function loadContainer(config, swpId, entityInfo) {
userName: user.userName,
containerId: swpId,
entityId: userEntityIdArray,
connectionData: userConnectionData,
});

self.postMessage({
Expand All @@ -152,6 +155,8 @@ async function loadContainer(config, swpId, entityInfo) {
self.postMessage({
type: "member-removed",
userId: member.additionalDetails.AadObjectId,
entityInfo: entityInfo,
removeConnectionData: { connectionId: clientId, entityId: entityInfo.rootWebPageId },
});
self.postMessage({
type: "telemetry-info",
Expand All @@ -176,6 +181,7 @@ async function loadContainer(config, swpId, entityInfo) {
.get(user.userId).connections;

const userEntityIdArray = [];
const userConnectionData = [];

const connectionIdInContainer = await map
.get("selection")
Expand All @@ -185,6 +191,7 @@ async function loadContainer(config, swpId, entityInfo) {
userEntityIdArray.push(
connectionIdInContainer.get(connection.id)
);
userConnectionData.push({ connectionId: connection.id, entityId: connectionIdInContainer.get(connection.id) });
});

// aadObjectId is the unique identifier for a user
Expand All @@ -194,6 +201,7 @@ async function loadContainer(config, swpId, entityInfo) {
userName: user.userName,
containerId: swpId,
entityId: userEntityIdArray,
connectionData: userConnectionData,
});

self.postMessage({
Expand Down
43 changes: 38 additions & 5 deletions src/web/client/context/userDataMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ export interface IUserData {
userId: string;
}

export interface IConnectionData {
connectionId: string;
entityId: string;
}

export class UserData implements IUserData {
_containerId: string;
_userName: string;
_userId: string;
_entityId: string[];
_connectionData: IConnectionData[];

// Getters
public get containerId(): string {
Expand All @@ -28,17 +34,27 @@ export class UserData implements IUserData {
public get entityId(): string[] {
return this._entityId;
}
public get connectionData(): IConnectionData[] {
return this._connectionData;
}

// Setters
public setConnectionData(connectionData: IConnectionData[]): void {
this._connectionData = connectionData;
}

constructor(
containerId: string,
userName: string,
userId: string,
entityId: string[]
entityId: string[],
connectionData: IConnectionData[]
) {
this._containerId = containerId;
this._userName = userName;
this._userId = userId;
this._entityId = entityId;
this._connectionData = connectionData;
}
}

Expand All @@ -53,19 +69,36 @@ export class UserDataMap {
containerId: string,
userName: string,
userId: string,
entityId: string[]
entityId: string[],
connectionData: IConnectionData[]
) {
const userData = new UserData(
containerId,
userName,
userId,
entityId
entityId,
connectionData
);

this.usersMap.set(userId, userData);
}

public removeUser(userId: string) {
this.usersMap.delete(userId);
public removeUser(userId: string, removeConnectionData: IConnectionData) {
const connectionData = this.usersMap.get(userId)?.connectionData ?? [];

// Remove the connection data from the user's connection data
const newConnectionData = connectionData.filter(connection => {
return !(connection.connectionId === removeConnectionData.connectionId && connection.entityId[0] === removeConnectionData.entityId);
});

const userData = this.usersMap.get(userId) as UserData;
userData.setConnectionData(newConnectionData);

// If the user has no more connection data, remove the user from the map
if (newConnectionData.length === 0) {
this.usersMap.delete(userId);
} else {
this.usersMap.set(userId, userData);
}
}
}
6 changes: 4 additions & 2 deletions src/web/client/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ export function createWebWorkerInstance(

if (data.type === Constants.workerEventMessages.REMOVE_CONNECTED_USER) {
WebExtensionContext.removeConnectedUserInContext(
data.userId
data.userId,
data.removeConnectionData
);
WebExtensionContext.userCollaborationProvider.refresh();
WebExtensionContext.quickPickProvider.refresh();
Expand All @@ -395,7 +396,8 @@ export function createWebWorkerInstance(
data.containerId,
data.userName,
data.userId,
data.entityId
data.entityId,
data.connectionData
);
WebExtensionContext.userCollaborationProvider.refresh();
WebExtensionContext.quickPickProvider.refresh();
Expand Down
6 changes: 3 additions & 3 deletions src/web/client/webViews/QuickPickProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ export class QuickPickProvider {
Array.from(
connectedUsersMap.entries()
).map(([, value]) => {
if (value._entityId.length) {
value._entityId.forEach(async (entityId) => {
const contentPageId = WebExtensionContext.entityForeignKeyDataMap.getEntityForeignKeyMap.get(`${entityId}`);
if (value._connectionData.length) {
value._connectionData.forEach(async (connection) => {
const contentPageId = WebExtensionContext.entityForeignKeyDataMap.getEntityForeignKeyMap.get(`${connection.entityId[0]}`);

if (
contentPageId &&
Expand Down
Loading