course -- fix #4495: remove student from course projects in all cases when you delete them

Author: williamstein

src/packages/frontend/course/student-projects/actions.ts

@@ -20,6 +20,7 @@ import { CourseActions } from "../actions";
 import { CourseStore } from "../store";
 import { UpgradeGoal } from "../types";
 import { Result, run_in_all_projects } from "./run-in-all-projects";
+import type { StudentRecord } from "../store";
 
 // for tasks that are "easy" to run in parallel, e.g. starting projects
 export const MAX_PARALLEL_TASKS = 30;
@@ -894,4 +895,31 @@ export class StudentProjectsActions {
       await webapp_client.project_client.set_quotas(x);
     }
   };
+
+  removeFromAllStudentProjects = async (student: StudentRecord) => {
+    /*
+    - Remove student from their project
+    - Remove student from shared project
+    - TODO: Cancel any outstanding invite, in case they haven't even created their account yet.
+      This isn't even implemented yet as an api endpoint... but will cause confusion.
+    */
+    const shared_id = this.get_store()?.get_shared_project_id();
+    const account_id = student.get("account_id");
+    const project_id = student.get("project_id");
+    if (account_id) {
+      if (project_id) {
+        // remove them from their project
+        await redux
+          .getActions("projects")
+          .remove_collaborator(project_id, account_id);
+      }
+
+      if (shared_id) {
+        // remove them from shared project
+        await redux
+          .getActions("projects")
+          .remove_collaborator(shared_id, account_id);
+      }
+    }
+  };
 }

src/packages/frontend/course/students/actions.ts

@@ -15,7 +15,7 @@ import { defaults, required, uuid } from "@cocalc/util/misc";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { CourseActions } from "../actions";
 import { CourseStore, StudentRecord } from "../store";
-import { SyncDBRecordStudent } from "../types";
+import type { SyncDBRecordStudent } from "../types";
 import { Map as iMap } from "immutable";
 
 const STUDENT_STATUS_UPDATE_MS = 60 * 1000;
@@ -99,11 +99,16 @@ export class StudentsActions {
   ): Promise<void> {
     const store = this.get_store();
     const student = store.get_student(student_id);
-    if (student == null) return;
+    if (student == null) {
+      return;
+    }
     this.doDeleteStudent(student, noTrash);
-    // since they may get removed from shared project, etc.
-    await delay(1); // so store is updated, since it is used by configure
-    await this.course_actions.student_projects.configure_all_projects();
+    // We always remove any deleted student from all student projects and the
+    // shared project when they are deleted, since this best aligns with
+    // user expectations.  We do this, even if "allow collaborators" is enabled.
+    await this.course_actions.student_projects.removeFromAllStudentProjects(
+      student,
+    );
   }
 
   undelete_student = async (student_id: string): Promise<void> => {