Link dot plot to chatbox

chili-epfl · May 24, 2024 · 2999401 · 2999401
1 parent 43b21cd
commit 2999401
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 19 deletions.
diff --git a/packages/collaboration-extension/src/collaboration.ts b/packages/collaboration-extension/src/collaboration.ts
@@ -180,9 +180,7 @@ export const rtcPanelPlugin: JupyterFrontEndPlugin<void> = {
     collaboratorsPanel.title.label = trans.__('Online Collaborators');
     userPanel.addWidget(collaboratorsPanel);
 
-    const activityDisplay = new ActivityDisplay(tracker, user, roles);
-    activityDisplay.title.label = trans.__('User activity');
-    userPanel.addWidget(activityDisplay);
+
 
     const chatPanel = new SidePanel({
       alignment: 'justify'
@@ -193,12 +191,18 @@ export const rtcPanelPlugin: JupyterFrontEndPlugin<void> = {
     chatPanel.addClass('jp-RTCPanel');
     app.shell.add(chatPanel, 'left', { rank: 301 });
 
-    const chatbox = new Chatbox(user, awarenessProvider, roles);
+    const chatbox = new Chatbox(user, awarenessProvider);
+    chatbox.id = 'jp-chatbox';
     chatbox.title.label = trans.__('Chat with collaborators');
     chatPanel.addWidget(chatbox);
 
+    const activityDisplay = new ActivityDisplay(tracker, user, roles, app, chatPanel);
+    activityDisplay.title.label = trans.__('User activity');
+    userPanel.addWidget(activityDisplay);
+
     setTimeout(() => {
       const pollTab = new PollList(user, awarenessProvider, roles);
+      pollTab.id = 'jp-polls';
       pollTab.title.label = trans.__('Polls');
       chatPanel.addWidget(pollTab);
     }, 1000);

diff --git a/packages/collaboration/src/activitydisplay.tsx b/packages/collaboration/src/activitydisplay.tsx
@@ -1,18 +1,22 @@
 import { ReactWidget } from '@jupyterlab/apputils';
 import { INotebookTracker } from '@jupyterlab/notebook';
 import { User } from '@jupyterlab/services';
+import { JupyterFrontEnd } from '@jupyterlab/application';
 
 import * as React from 'react';
 
 import { ActivityBarGraph } from './activitybargraph';
 import { ActivityDotPlot } from './activitydotplot';
 import { Role, Roles } from './roles';
+import { SidePanel } from '@jupyterlab/ui-components';
 
 export interface ActivityDisplayComponentProps {
 
     tracker: INotebookTracker;
     currentUser: User.IManager;
-    userRoles: Roles
+    userRoles: Roles;
+    app: JupyterFrontEnd;
+    chatPanel: SidePanel;
 
 }
 
@@ -27,31 +31,41 @@ export class ActivityDisplay extends ReactWidget {
     private _tracker: INotebookTracker
     private _currentUser: User.IManager;
     private _roles: Roles;
+    private _app: JupyterFrontEnd;
+    private _chatPanel: SidePanel;
 
-    constructor(tracker: INotebookTracker, currentUser: User.IManager, roles: Roles) {
+    constructor(tracker: INotebookTracker, currentUser: User.IManager, roles: Roles, app: JupyterFrontEnd, chatPanel: SidePanel) {
 
         super();
 
         this._tracker = tracker;
         this._currentUser = currentUser;
         this._roles = roles;
+        this._app = app;
+        this._chatPanel = chatPanel;
 
     }
 
     render() {
-        return <ActivityDisplayComponent tracker={this._tracker} currentUser={this._currentUser} userRoles={this._roles}/>
+        return <ActivityDisplayComponent 
+                    tracker={this._tracker} 
+                    currentUser={this._currentUser} 
+                    userRoles={this._roles} 
+                    app={this._app}
+                    chatPanel={this._chatPanel}
+                />
     }
 
 }
 
-const ActivityDisplayComponent: React.FC<ActivityDisplayComponentProps> = ({tracker, currentUser, userRoles}) => {
+const ActivityDisplayComponent: React.FC<ActivityDisplayComponentProps> = ({tracker, currentUser, userRoles, app, chatPanel}) => {
 
     const [showBarGraph, setShowBarGraph] = React.useState(true);
 
     const switchGraph = () => {setShowBarGraph(prev => !prev)};
 
     const barGraph = ActivityBarGraph({tracker});
-    const dotPlot = ActivityDotPlot({tracker});
+    const dotPlot = ActivityDotPlot({tracker, app, chatPanel});
 
     return <div>
         {userRoles.get(currentUser.identity!.username) === Role.Owner && (

diff --git a/packages/collaboration/src/activitydotplot.tsx b/packages/collaboration/src/activitydotplot.tsx
@@ -1,12 +1,22 @@
 import { Notebook, NotebookPanel } from '@jupyterlab/notebook';
+import { JupyterFrontEnd } from '@jupyterlab/application';
 
 import * as React from 'react';
 import Plot from 'react-plotly.js';
 
 import { GraphProps } from './activitydisplay';
 import { SimpleUser } from './cellTracker';
+import { SidePanel } from '@jupyterlab/ui-components';
+import { Chatbox } from './chatbox';
 
-export const ActivityDotPlot: React.FC<GraphProps> = ({tracker}) => {
+interface DotPlotProps extends GraphProps {
+
+    app: JupyterFrontEnd;
+    chatPanel: SidePanel
+
+}
+
+export const ActivityDotPlot: React.FC<DotPlotProps> = ({tracker, app, chatPanel}) => {
 
     const [state, setState] = React.useState<SimpleUser[][]>([]);
 
@@ -102,6 +112,25 @@ export const ActivityDotPlot: React.FC<GraphProps> = ({tracker}) => {
         }
     };
 
-    return <Plot className='jp-graph' data={data} layout={layout}/>
+    const handleDotClick = (data: any) => {
+
+        app.shell.activateById('jp-chat-panel');
+
+        const chatbox = chatPanel.widgets.find(widget => widget.id === 'jp-chatbox') as Chatbox | null;
+
+        if (chatbox) {
+
+            chatbox.show();
+            chatbox.focusOnWritingField();
+
+        }
+
+        const polls = chatPanel.widgets.find(widget => widget.id === 'jp-polls');
+
+        if (polls) polls.hide();
+
+    }
+
+    return <Plot className='jp-graph' data={data} layout={layout} onClick={handleDotClick}/>
 
 }
diff --git a/packages/collaboration/src/chatbox.tsx b/packages/collaboration/src/chatbox.tsx
@@ -6,26 +6,35 @@ import { User } from '@jupyterlab/services';
 import { WebSocketAwarenessProvider, IChatMessage } from '@jupyter/docprovider';
 
 import * as msgEnc from './messageEncoding';
-import { Roles } from './roles';
 
 export class Chatbox extends ReactWidget {
 
     private _currentUser: User.IManager;
     private _awarenessProvider: WebSocketAwarenessProvider;
-    private _roles: Roles;
 
-    constructor(currentUser: User.IManager, awarenessProvider: WebSocketAwarenessProvider, roles: Roles) {
+    constructor(currentUser: User.IManager, awarenessProvider: WebSocketAwarenessProvider) {
       super();
 
       this._currentUser = currentUser;
       this._awarenessProvider = awarenessProvider;
-      this._roles = roles;
 
       this.addClass('jp-Chat-Panel')
     }
 
+    focusOnWritingField() {
+
+      const writingField = this.node?.querySelector('.jp-Chat-WritableField') as HTMLTextAreaElement | null;
+
+      if (writingField) {
+
+        writingField.focus();
+
+      }
+
+    }
+
     render(): JSX.Element {
-        return <ChatBoxComponent currentUser={this._currentUser} awarenessProvider={this._awarenessProvider} userRoles={this._roles}/>;
+        return <ChatBoxComponent currentUser={this._currentUser} awarenessProvider={this._awarenessProvider}/>;
     }
 
 }
@@ -34,7 +43,6 @@ interface ChatBoxComponentProps {
 
   currentUser: User.IManager;
   awarenessProvider: WebSocketAwarenessProvider;
-  userRoles: Roles
 
 }
 
@@ -48,11 +56,10 @@ interface ChatBoxComponentState {
 
 }
 
-const ChatBoxComponent: React.FC<ChatBoxComponentProps> = ({currentUser, awarenessProvider, userRoles}) => {
+const ChatBoxComponent: React.FC<ChatBoxComponentProps> = ({currentUser, awarenessProvider}) => {
 
     const user = currentUser;
     const aProvider = awarenessProvider;
-//    const roles = userRoles;
 
     // Getter and setter for the chat state
     const [state, setState] = React.useState<ChatBoxComponentState>({message: '', messages: []});