SAK-44225 Keep the selected submission in the grader

Author: st-manu

webcomponents/tool/src/main/frontend/packages/sakai-grader/src/SakaiGrader.js

@@ -673,14 +673,24 @@ export class SakaiGrader extends graderRenderingMixin(gradableDataMixin(SakaiEle
     }
 
     if (filtered.length > 0) {
-      const firstSubmissionId = filtered[0].id;
-      this._hydrateCluster(firstSubmissionId).then(submission => {
+      const currentSubmission = filtered.find(s => s.id === this._submission.id);
 
-        if (submission) {
-          this._submissions = [ ...filtered ];
-          this._submission = submission;
-        }
-      });
+      if (currentSubmission) {
+        this._hydrateCluster(this._submission.id).then(submission => {
+          if (submission) {
+            this._submissions = [ ...filtered ];
+            this._submission = submission;
+          }
+        });
+      } else {
+        const firstSubmissionId = filtered[0].id;
+        this._hydrateCluster(firstSubmissionId).then(submission => {
+          if (submission) {
+            this._submissions = [ ...filtered ];
+            this._submission = submission;
+          }
+        });
+      }
     } else {
       this._submission = new Submission();
     }