Changed cell metadata to user arrays

Author: Liototo

packages/collaboration-extension/src/collaboration.ts

@@ -240,11 +240,13 @@ export const cellTracker: JupyterFrontEndPlugin<void> = {
     tracker: INotebookTracker
   ): void => {
 
+    const { user } = app.serviceManager;
+
     let previousPanel: NotebookPanel | null = null;
 
     tracker.currentChanged.connect(() => {
       if (tracker.currentWidget) {
-        tracker.currentWidget.revealed.then(() => trackActivity(tracker.currentWidget!));
+        tracker.currentWidget.revealed.then(() => trackActivity(tracker.currentWidget!, user));
 
         stopTracking(previousPanel);
 

packages/collaboration/src/activitydisplay.tsx

@@ -51,7 +51,9 @@ const ActivityDisplayComponent: React.FC<ActivityDisplayComponentProps> = ({trac
         const updateCounts = (notebook: Notebook) => {
 
             const counts = notebook.widgets.map(cell => {
-                return cell.model.getMetadata('active_users') || 0;
+                let activeUsers = cell.model.getMetadata('active_users');
+                if (!activeUsers || !Array.isArray(activeUsers)) return 0;
+                return activeUsers.length;
             });
 
             setState(counts);

packages/collaboration/src/cellTracker.ts

@@ -1,13 +1,25 @@
 import { NotebookPanel, Notebook } from '@jupyterlab/notebook';
 import { Cell } from '@jupyterlab/cells';
+import { User } from '@jupyterlab/services';
+
 
 let prevCell: Cell | null = null;
 let disconnected = false;
 let notebook: Notebook;
 let undefinedStuff = 0;
+let currentUser: SimpleUser;
+
+interface SimpleUser {
+
+    id: string,
+    name: string
+
+}
+
 
+export function trackActivity(nb: NotebookPanel, user: User.IManager) {
 
-export function trackActivity(nb: NotebookPanel) {
+    currentUser = { id: user.identity!.username, name: user.identity!.name }
 
     notebook = nb.content;
 
@@ -71,21 +83,17 @@ function addActivity(cell: Cell) {
         return;
     }
 
-    let activeUsers = cell.model.getMetadata('active_users');
-    if (Number.isNaN(activeUsers)) activeUsers = 0;
-    activeUsers++;
-    cell.model.setMetadata('active_users', activeUsers);
-        
+    let activeUsersArray = cell.model.getMetadata('active_users') || [];
+    activeUsersArray.push(currentUser);
+    cell.model.setMetadata('active_users', activeUsersArray);       
 }
 
 // Decrement a cell's active users count
 function removeActivity(cell: Cell) {
 
     if (cell.model === null) return;
 
-    let activeUsers = cell.model.getMetadata('active_users');
-    activeUsers--;
-    if (activeUsers < 0) activeUsers = 0;
-    cell.model.setMetadata('active_users', activeUsers);
-
+    let activeUsersArray = cell.model.getMetadata('active_users') || [];
+    activeUsersArray = activeUsersArray.filter((user: SimpleUser) => user.id !== currentUser.id)
+    cell.model.setMetadata('active_users', activeUsersArray);
 }

packages/collaboration/src/roles.ts

@@ -43,8 +43,6 @@ export class Roles {
 
         this._aProvider.messageStream.connect(this._onMessageReceived, this);
 
-        console.log(`Connected at ${this._connectedAt}`);
-
         this._map.set(currentUser.identity!.username, Role.Owner);
 
         // Once connection is set, receive everyone's roles to populate the user's role map