Merge pull request #1484 from Vitaliy-1/i8887_views_counts

pkp/pkp-lib#8887 Implement dashboard views

classes/decision/types/traits/InInternalReviewRound.php

@@ -21,9 +21,7 @@
 use PKP\components\fileAttachers\ReviewFiles;
 use PKP\components\fileAttachers\Upload;
 use PKP\context\Context;
-use PKP\db\DAORegistry;
 use PKP\decision\types\traits\WithReviewAssignments;
-use PKP\submission\reviewAssignment\ReviewAssignmentDAO;
 use PKP\submission\reviewRound\ReviewRound;
 use PKP\submissionFile\SubmissionFile;
 
@@ -79,9 +77,10 @@ protected function getFileAttachers(Submission $submission, Context $context, ?R
         ];
 
         if ($reviewRound) {
-            /** @var ReviewAssignmentDAO $reviewAssignmentDAO */
-            $reviewAssignmentDAO = DAORegistry::getDAO('ReviewAssignmentDAO');
-            $reviewAssignments = $reviewAssignmentDAO->getByReviewRoundId($reviewRound->getId());
+            $reviewAssignments = Repo::reviewAssignment()->getCollector()
+                ->filterByReviewRoundIds([$reviewRound->getId()])
+                ->getMany()
+                ->toArray();
             $reviewerFiles = [];
             if (!empty($reviewAssignments)) {
                 $reviewerFiles = Repo::submissionFile()->getCollector()

classes/facades/Repo.php

@@ -23,6 +23,7 @@
 use APP\submission\Repository as SubmissionRepository;
 use APP\submissionFile\Repository as SubmissionFileRepository;
 use APP\user\Repository as UserRepository;
+use PKP\submission\reviewAssignment\Repository as ReviewAssignmentRepository;
 
 class Repo extends \PKP\facades\Repo
 {
@@ -70,4 +71,9 @@ public static function mailable(): MailRepository
     {
         return app(MailRepository::class);
     }
+
+    public static function reviewAssignment(): ReviewAssignmentRepository
+    {
+        return app(ReviewAssignmentRepository::class);
+    }
 }

classes/submission/Collector.php

@@ -174,4 +174,9 @@ public function getQueryBuilder(): Builder
 
         return $q;
     }
+
+    protected function getReviewStages(): array
+    {
+        return [WORKFLOW_STAGE_ID_EXTERNAL_REVIEW, WORKFLOW_STAGE_ID_INTERNAL_REVIEW];
+    }
 }

classes/submission/Repository.php

@@ -21,9 +21,15 @@
 use APP\press\PressDAO;
 use APP\publicationFormat\PublicationFormat;
 use APP\publicationFormat\PublicationFormatDAO;
+use Illuminate\Support\Collection;
+use PKP\context\Context;
 use PKP\db\DAORegistry;
 use PKP\doi\exceptions\DoiException;
+use PKP\security\Role;
+use PKP\submission\DashboardView;
+use PKP\submission\PKPSubmission;
 use PKP\submissionFile\SubmissionFile;
+use PKP\user\User;
 
 class Repository extends \PKP\submission\Repository
 {
@@ -131,4 +137,23 @@ public function createDois(Submission $submission): array
 
         return $doiCreationFailures;
     }
+
+    protected function mapDashboardViews($types, Context $context, User $user, bool $canAccessUnassignedSubmission): Collection
+    {
+        $views = parent::mapDashboardViews($types, $context, $user, $canAccessUnassignedSubmission);
+
+        $collector = Repo::submission()->getCollector()
+            ->filterByContextIds([$context->getId()])
+            ->filterByStageIds([WORKFLOW_STAGE_ID_INTERNAL_REVIEW])
+            ->filterByStatus([PKPSubmission::STATUS_QUEUED]);
+
+        return $views->put(DashboardView::TYPE_REVIEW_INTERNAL, new DashboardView(
+            DashboardView::TYPE_REVIEW_INTERNAL,
+            __('submission.dashboard.view.reviewInternal'),
+            [Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR, Role::ROLE_ID_ASSISTANT],
+            $canAccessUnassignedSubmission ? $collector : $collector->assignedTo([$user->getId()]),
+            $canAccessUnassignedSubmission ? null : 'assigned',
+            ['stageIds' => [WORKFLOW_STAGE_ID_INTERNAL_REVIEW], 'status' => [PKPSubmission::STATUS_QUEUED]]
+        ));
+    }
 }

locale/en/submission.po

@@ -622,3 +622,6 @@ msgstr ""
 "Please provide all of the chapters of this submission. If you are submitting "
 "an edited volume, please make sure that each chapter indicates the "
 "contributors for that chapter."
+
+msgid "submission.dashboard.view.reviewInternal"
+msgstr "All in internal review"