pkp#7495 Additional redirects logic for new dashboard&workflow

jardakotesovec · Oct 2, 2024 · 80accde · 80accde
1 parent 166de4d
commit 80accde
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/classes/submission/Repository.php b/classes/submission/Repository.php
@@ -41,6 +41,7 @@
 use PKP\submissionFile\SubmissionFile;
 use PKP\user\User;
 use PKP\validation\ValidatorFactory;
+use PKP\config\Config;
 
 abstract class Repository
 {
@@ -745,6 +746,20 @@ public function getUrlApi(Context $context, ?int $submissionId = null): string
      */
     public function getUrlAuthorWorkflow(Context $context, int $submissionId): string
     {
+        if(Config::getVar('features', 'enable_new_submission_listing')) {
+            return Application::get()->getDispatcher()->url(
+                Application::get()->getRequest(),
+                Application::ROUTE_PAGE,
+                $context->getData('urlPath'),
+                'dashboard',
+                'mySubmissions',
+                null,
+                ['workflowSubmissionId' => $submissionId]
+            );
+
+        }
+
+
         return Application::get()->getDispatcher()->url(
             Application::get()->getRequest(),
             Application::ROUTE_PAGE,

diff --git a/pages/dashboard/DashboardHandler.php b/pages/dashboard/DashboardHandler.php
@@ -27,6 +27,7 @@
 use PKP\security\Role;
 use PKP\submission\GenreDAO;
 use PKP\submission\PKPSubmission;
+use PKP\config\Config;
 
 define('SUBMISSIONS_LIST_ACTIVE', 'active');
 define('SUBMISSIONS_LIST_ARCHIVE', 'archive');
@@ -75,6 +76,12 @@ public function index($args, $request)
             $request->redirect(null, 'user');
         }
 
+
+        if(Config::getVar('features', 'enable_new_submission_listing')) {
+            $pkpPageRouter = $request->getRouter();  /** @var \PKP\core\PKPPageRouter $pkpPageRouter */
+            $pkpPageRouter->redirectHome($request);
+        }
+
         $templateMgr = TemplateManager::getManager($request);
         $this->setupTemplate($request);
 

diff --git a/pages/workflow/PKPWorkflowHandler.php b/pages/workflow/PKPWorkflowHandler.php
@@ -55,6 +55,7 @@
 use PKP\submission\reviewRound\ReviewRoundDAO;
 use PKP\user\User;
 use PKP\workflow\WorkflowStageDAO;
+use PKP\config\Config;
 
 abstract class PKPWorkflowHandler extends Handler
 {
@@ -132,7 +133,11 @@ public function access($args, $request)
         assert(isset($workingStageId));
 
         $router = $request->getRouter();
+        if(Config::getVar('features', 'enable_new_submission_listing')) {
+            return $request->redirectUrl($router->url($request, null, 'dashboard', 'editorial', null, ['workflowSubmissionId' => $submission->getId()]));
+        }
         $request->redirectUrl($router->url($request, null, 'workflow', 'index', [$submission->getId(), $workingStageId]));
+
     }
 
     /**