Use timeout to reset scope with select field profile binding

TexasDigitalLibrary · Aug 29, 2024 · 567786a · 567786a
1 parent eb3114b
commit 567786a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/webapp/app/controllers/submission/submissionViewController.js b/src/main/webapp/app/controllers/submission/submissionViewController.js
@@ -1,4 +1,4 @@
-vireo.controller("SubmissionViewController", function ($controller, $q, $scope, $routeParams, CustomActionDefinitionRepo, EmbargoRepo, FieldPredicateRepo, FileUploadService, StudentSubmissionRepo, SubmissionStates) {
+vireo.controller("SubmissionViewController", function ($controller, $q, $routeParams, $scope, $timeout, CustomActionDefinitionRepo, EmbargoRepo, FieldPredicateRepo, FileUploadService, StudentSubmissionRepo, SubmissionStates) {
 
     angular.extend(this, $controller('AbstractController', {
         $scope: $scope
@@ -12,6 +12,9 @@ vireo.controller("SubmissionViewController", function ($controller, $q, $scope,
 
     $scope.actionLogDelay = 2000;
 
+    $scope.fieldProfile = undefined;
+    $scope.fieldPredicate = undefined;
+
     FieldPredicateRepo.ready().then(function() {
 
         var deleteFile = function (fieldValue) {
@@ -31,6 +34,11 @@ vireo.controller("SubmissionViewController", function ($controller, $q, $scope,
             StudentSubmissionRepo.fetchSubmissionById($routeParams.submissionId).then(function (submission) {
                 if (refreshScope) {
                     $scope.submission = submission;
+
+                    $scope.fieldProfile = undefined;
+                    $timeout(function () {
+                        $scope.onSelectDocumentType($scope.fieldPredicate);
+                    });
                 } else {
                     angular.extend($scope.submission, submission);
                 }
@@ -49,6 +57,13 @@ vireo.controller("SubmissionViewController", function ($controller, $q, $scope,
 
         $scope.archivingManuscript = false;
 
+        $scope.onSelectDocumentType = function (fieldPredicate) {
+            if (!!fieldPredicate && !!fieldPredicate.id) {
+                $scope.fieldPredicate = fieldPredicate;
+                $scope.fieldProfile = $scope.submission.getFieldProfileByPredicate(fieldPredicate);
+            }
+        };
+
         $scope.addMessage = function () {
             $scope.messaging = true;
             $scope.submission.addMessage($scope.message).then(function () {
@@ -99,7 +114,7 @@ vireo.controller("SubmissionViewController", function ($controller, $q, $scope,
             }
             $q.all(removePromises).then(function (removeFiles) {
                 if (removeFiles.every(Boolean)) {
-                    fetchSubmission();
+                    fetchSubmission(true);
                 } else {
                     console.error('Failed to remove additional files. Please refresh the page.');
                 }

diff --git a/src/main/webapp/app/views/submission/submissionView.html b/src/main/webapp/app/views/submission/submissionView.html
@@ -77,7 +77,7 @@ <h3>Upload/Remove Files</h3>
                 <select
                   class="form-control"
                   ng-model="fieldPredicate"
-                  ng-selected="fieldProfile = fieldPredicate.id ? submission.getFieldProfileByPredicate(fieldPredicate) : undefined"
+                  ng-change="onSelectDocumentType(fieldPredicate)"
                   ng-options="documentFieldPredicate as getFileType(documentFieldPredicate) for documentFieldPredicate in filteredFieldPredicates = (fieldPredicates | filter:uploadableFieldPredicates) track by documentFieldPredicate.value">
                   <option value="">-- select document type --</option>
                 </select>