course: part of #4495 -- students should get immediately added to shared project

Author: williamstein

src/packages/frontend/course/shared-project/actions.ts

@@ -11,6 +11,7 @@ import { redux } from "@cocalc/frontend/app-framework";
 import { Datastore, EnvVars } from "@cocalc/frontend/projects/actions";
 import { CourseActions } from "../actions";
 import { CourseStore } from "../store";
+import { delay } from "awaiting";
 
 export class SharedProjectActions {
   private actions: CourseActions;
@@ -234,6 +235,9 @@ export class SharedProjectActions {
       this.actions.set_activity({ id });
     }
     this.set_project_id(project_id);
+    // wait for any changes to syncdb to update store, before
+    // calling configure (which relies on the store being updated).
+    await delay(10);
     await this.configure();
   };
 

src/packages/frontend/course/shared-project/delete-shared-project.tsx

@@ -6,7 +6,7 @@
 import { Popconfirm, Button, Card } from "antd";
 import { Icon } from "@cocalc/frontend/components";
 
-export function DeleteSharedProjectPanel({ actions, settings }) {
+export function DeleteSharedProjectPanel({ actions, settings, close }) {
   if (!settings.get("shared_project_id")) {
     return <Card title={"No Shared Project"}></Card>;
   }
@@ -17,7 +17,10 @@ export function DeleteSharedProjectPanel({ actions, settings }) {
           title="Are you sure you want to delete the shared project?"
           okText="Yes"
           cancelText="No"
-          onConfirm={() => actions.shared_project.delete()}
+          onConfirm={() => {
+            actions.shared_project.delete();
+            close?.();
+          }}
         >
           <Button danger>
             <Icon name="trash" /> Delete Shared Project...

src/packages/frontend/course/shared-project/shared-project-panel.tsx

@@ -16,12 +16,14 @@ interface SharedProjectPanelProps {
   settings: CourseSettingsRecord;
   redux: AppRedux;
   name: string;
+  close?: Function;
 }
 
 export function SharedProjectPanel({
   settings,
   redux,
   name,
+  close,
 }: SharedProjectPanelProps) {
   const actions = useActions<CourseActions>({ name });
 
@@ -67,7 +69,11 @@ export function SharedProjectPanel({
           </Button>
         </div>
         <hr />
-        <DeleteSharedProjectPanel settings={settings} actions={actions} />
+        <DeleteSharedProjectPanel
+          settings={settings}
+          actions={actions}
+          close={close}
+        />
       </div>
     );
   }
@@ -76,6 +82,7 @@ export function SharedProjectPanel({
     redux.getActions("projects").open_project({
       project_id: settings.get("shared_project_id"),
     });
+    close?.();
   }
 
   function render_no_shared_project() {
@@ -113,7 +120,10 @@ export function SharedProjectPanel({
           }
           onConfirm={() => {
             const actions = redux.getActions(name) as CourseActions;
-            if (actions != null) actions.shared_project.create();
+            if (actions != null) {
+              actions.shared_project.create();
+              close?.();
+            }
           }}
           okText="Create Shared Project"
           cancelText={<CancelText />}