Versioning and history

src/commons/application/ApplicationTypes.ts

@@ -407,7 +407,13 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   debuggerContext: {} as DebuggerContext,
   lastDebuggerResult: undefined,
   files: {},
-  updateUserRoleCallback: () => {}
+  updateUserRoleCallback: () => {},
+  versionHistory: {
+    versions: [],
+    isLoading: false,
+    isHistoryPanelOpen: false
+  },
+  saveStatus: 'idle'
 });
 
 const defaultFileName = 'program.js';

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -53,6 +53,9 @@
 import { ControlBarResetButton } from '../controlBar/ControlBarResetButton';
 import { ControlBarRunButton } from '../controlBar/ControlBarRunButton';
 import { ControlButtonSaveButton } from '../controlBar/ControlBarSaveButton';
+import { ControlBarSaveStatusIndicator } from '../controlBar/ControlBarSaveStatusIndicator';
+import { ControlBarVersionHistoryButton } from '../controlBar/ControlBarVersionHistoryButton';
+import { VersionHistoryPanel } from '../controlBar/VersionHistoryPanel';
 import ControlButton from '../ControlButton';
 import {
   convertEditorTabStateToProps,
@@ -127,7 +130,9 @@
     output,
     replValue,
     currentAssessment: storedAssessmentId,
-    currentQuestion: storedQuestionId
+    currentQuestion: storedQuestionId,
+    versionHistory,
+    saveStatus
   } = useTypedSelector(store => store.workspaces[workspaceLocation]);
 
   const dispatch = useDispatch();
@@ -148,7 +153,11 @@
     handleCheckLastModifiedAt,
     handleUpdateHasUnsavedChanges,
     handleEnableTokenCounter,
-    handleDisableTokenCounter
+    handleDisableTokenCounter,
+    handleFetchVersionHistory,
+    handleToggleHistoryPanel,
+    handleRestoreVersion,
+    handleNameVersion
   } = useMemo(() => {
     return {
       handleTeamOverviewFetch: (assessmentId: number) =>
@@ -185,7 +194,15 @@
       handleEnableTokenCounter: () =>
         dispatch(WorkspaceActions.enableTokenCounter(workspaceLocation)),
       handleDisableTokenCounter: () =>
-        dispatch(WorkspaceActions.disableTokenCounter(workspaceLocation))
+        dispatch(WorkspaceActions.disableTokenCounter(workspaceLocation)),
+      handleFetchVersionHistory: () =>
+        dispatch(WorkspaceActions.fetchVersionHistory(workspaceLocation)),
+      handleToggleHistoryPanel: () =>
+        dispatch(WorkspaceActions.toggleHistoryPanel(workspaceLocation)),
+      handleRestoreVersion: (versionId: string) =>
+        dispatch(WorkspaceActions.restoreVersion(workspaceLocation, versionId)),
+      handleNameVersion: (versionId: string, name: string) =>
+        dispatch(WorkspaceActions.nameVersion(workspaceLocation, versionId, name))
     };
   }, [dispatch]);
 
@@ -198,7 +215,7 @@
       dispatch(WorkspaceActions.updateEditorValue(workspaceLocation, 0, code));
       dispatch(LeaderboardActions.clearCode());
     }
   }, [dispatch]);
 
   useEffect(() => {
     if (assessmentOverview && assessmentOverview.maxTeamSize > 1) {
@@ -410,6 +427,7 @@
     );
     handleClearContext(question.library, true);
     handleUpdateHasUnsavedChanges(false);
+    handleFetchVersionHistory();
 
     const chapter = question.library.chapter;
     const questionType = question.type;
@@ -778,25 +796,34 @@
       />
     );
 
-    // Define the function to check if the Save button should be disabled
-    const shouldDisableSaveButton = (): boolean | undefined => {
-      const isIndividualAssessment: boolean = assessmentOverview?.maxTeamSize === 1;
-      if (isIndividualAssessment) {
-        return false;
-      }
-      return !teamFormationOverview;
-    };
+    const isTeamAssessment: boolean = assessmentOverview?.maxTeamSize !== 1;
 
     const saveButton =
-      props.canSave && question.type === QuestionTypes.programming ? (
+      isTeamAssessment && question.type === QuestionTypes.programming ? (
         <ControlButtonSaveButton
+          key="save"
           hasUnsavedChanges={hasUnsavedChanges}
-          isDisabled={shouldDisableSaveButton()}
           onClickSave={onClickSave}
-          key="save"
+          isDisabled={!props.canSave}
         />
       ) : null;
 
+    const versionHistoryButton =
+      question.type !== QuestionTypes.mcq ? (
+        <ControlBarVersionHistoryButton
+          onClick={() => {
+            handleFetchVersionHistory();
+            handleToggleHistoryPanel();
+          }}
+          key="version_history"
+        />
+      ) : null;
+
+    const saveStatusIndicator =
+      question.type !== QuestionTypes.mcq && !isTeamAssessment ? (
+        <ControlBarSaveStatusIndicator saveStatus={saveStatus} key="save_status" />
+      ) : null;
+
     const chapterSelect = (
       <ControlBarChapterSelect
         handleChapterSelect={() => {}}
@@ -811,8 +838,15 @@
     return {
       editorButtons:
         !isMobileBreakpoint || isVscode
-          ? [runButton, saveButton, resetButton, chapterSelect]
-          : [saveButton, resetButton],
+          ? [
+              runButton,
+              saveButton,
+              resetButton,
+              versionHistoryButton,
+              saveStatusIndicator,
+              chapterSelect
+            ]
+          : [resetButton],
       flowButtons: [previousButton, questionView, nextButton]
     };
   };
@@ -943,7 +977,7 @@
     >
       <DialogBody>
         <Markdown content="Are you sure you want to reset the template?" />
-        <Markdown content="*Note this will not affect the saved copy of your program, unless you save over it.*" />
+        <Markdown content="*Note this will not affect your version history.*" />
       </DialogBody>
       <DialogFooter
         actions={
@@ -1050,6 +1084,14 @@
       {submissionOverlay}
       {overlay}
       {resetTemplateOverlay}
+      <VersionHistoryPanel
+        versions={versionHistory.versions}
+        isOpen={versionHistory.isHistoryPanelOpen}
+        isLoading={versionHistory.isLoading}
+        onClose={handleToggleHistoryPanel}
+        onRestore={handleRestoreVersion}
+        onRename={handleNameVersion}
+      />
       {isVscode || !isMobileBreakpoint ? (
         <Workspace {...workspaceProps} />
       ) : (