Sessions Overhaul

package.json

@@ -33,6 +33,7 @@
     "@blueprintjs/datetime2": "^2.3.3",
     "@blueprintjs/icons": "^5.9.0",
     "@blueprintjs/select": "^5.1.3",
+    "@convergencelabs/ace-collab-ext": "^0.6.0",
     "@mantine/hooks": "^7.11.2",
     "@octokit/rest": "^20.0.0",
     "@reduxjs/toolkit": "^1.9.7",
@@ -43,7 +44,7 @@
     "@szhsin/react-menu": "^4.0.0",
     "@tanstack/react-table": "^8.9.3",
     "@tremor/react": "^1.8.2",
-    "ace-builds": "^1.36.3",
+    "ace-builds": "^1.42.1",
     "acorn": "^8.9.0",
     "ag-grid-community": "^32.3.1",
     "ag-grid-react": "^32.3.1",
@@ -58,6 +59,7 @@
     "hastscript": "^9.0.0",
     "i18next": "^25.0.0",
     "i18next-browser-languagedetector": "^8.0.0",
+    "immer": "^10.1.1",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
     "js-slang": "^1.0.84",
@@ -126,7 +128,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
-    "@testing-library/user-event": "^14.4.3",
+    "@testing-library/user-event": "^14.6.0",
     "@types/estree": "^1.0.5",
     "@types/gapi": "^0.0.47",
     "@types/gapi.auth2": "^0.0.61",

src/commons/application/ApplicationTypes.ts

@@ -418,7 +418,8 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   enableDebugging: true,
   debuggerContext: {} as DebuggerContext,
   lastDebuggerResult: undefined,
-  files: {}
+  files: {},
+  updateUserRoleCallback: () => {}
 });
 
 const defaultFileName = 'program.js';

src/commons/collabEditing/CollabEditingActions.ts

@@ -1,3 +1,5 @@
+import type { CollabEditingAccess } from '@sourceacademy/sharedb-ace/types';
+
 import { createActions } from '../redux/utils';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 
@@ -8,7 +10,7 @@
   }),
   setSessionDetails: (
     workspaceLocation: WorkspaceLocation,
-    sessionDetails: { docId: string; readOnly: boolean } | null
+    sessionDetails: { docId?: string; readOnly?: boolean; owner?: boolean } | null
   ) => ({ workspaceLocation, sessionDetails }),
   /**
    * Sets ShareDB connection status.
@@ -19,11 +21,23 @@
   setSharedbConnected: (workspaceLocation: WorkspaceLocation, connected: boolean) => ({
     workspaceLocation,
     connected
+  }),
+  setUpdateUserRoleCallback: (
+    workspaceLocation: WorkspaceLocation,
+    updateUserRoleCallback: (id: string, newRole: CollabEditingAccess) => void
+  ) => ({
+    workspaceLocation,
+    updateUserRoleCallback
   })
 });
 
 // For compatibility with existing code (reducer)
-export const { setEditorSessionId, setSessionDetails, setSharedbConnected } = CollabEditingActions;
+export const {
+  setEditorSessionId,
+  setSessionDetails,
+  setSharedbConnected,
+  setUpdateUserRoleCallback
+} = CollabEditingActions;
 
 // For compatibility with existing code (actions helper)
 export default CollabEditingActions;

src/commons/collabEditing/CollabEditingHelper.ts

@@ -13,9 +13,17 @@ export function getSessionUrl(sessionId: string, ws?: boolean): string {
   return url.toString();
 }
 
+export function getPlaygroundSessionUrl(sessionId: string): string {
+  let url = window.location.href;
+  if (window.location.href.endsWith('/playground')) {
+    url += `/${sessionId}`;
+  }
+  return url;
+}
+
 export async function getDocInfoFromSessionId(
   sessionId: string
-): Promise<{ docId: string; readOnly: boolean } | null> {
+): Promise<{ docId: string; defaultReadOnly: boolean } | null> {
   const resp = await fetch(getSessionUrl(sessionId));
 
   if (resp && resp.ok) {
@@ -27,7 +35,7 @@ export async function getDocInfoFromSessionId(
 
 export async function createNewSession(
   contents: string
-): Promise<{ docId: string; sessionEditingId: string; sessionViewingId: string }> {
+): Promise<{ docId: string; sessionId: string }> {
   const resp = await fetch(Constants.sharedbBackendUrl, {
     method: 'POST',
     body: JSON.stringify({ contents }),
@@ -42,3 +50,19 @@ export async function createNewSession(
 
   return resp.json();
 }
+
+export async function changeDefaultEditable(sessionId: string, defaultReadOnly: boolean) {
+  const resp = await fetch(getSessionUrl(sessionId), {
+    method: 'PATCH',
+    body: JSON.stringify({ defaultReadOnly }),
+    headers: { 'Content-Type': 'application/json' }
+  });
+
+  if (!resp || !resp.ok) {
+    throw new Error(
+      resp ? `Could not update session: ${await resp.text()}` : 'Unknown error updating session'
+    );
+  }
+
+  return resp.json();
+}