Merge pull request #30 from lepidus/main

Feature/fix plugin issues

Author: thiagolepidus

README.md

@@ -31,6 +31,11 @@ This is required to use the API credentials provided, that are stored encrypted
 
 ## Usage
 
+### Guidelines
+
+- Only basic HTML tags are preserved (`<strong>`, `<mark>`, `<em>`, `<i>`, `<u>`, `<sup>`, `<sub>`, `<ul>`, `<ol>` and `<li>`); all others will be removed
+- ISBN must be properly formatted (e.g., 978-3-16-148410-0)
+
 ### Configuration
 
 To configure the plugin:

ThothPlugin.inc.php

@@ -23,7 +23,7 @@
 
 import('plugins.generic.thoth.classes.api.ThothEndpoint');
 import('plugins.generic.thoth.classes.components.forms.config.PublishFormConfig');
-import('plugins.generic.thoth.classes.filters.ThothSectionFilter');
+import('plugins.generic.thoth.classes.templateFilters.ThothSectionTemplateFilter');
 import('plugins.generic.thoth.classes.listeners.PublicationEditListener');
 import('plugins.generic.thoth.classes.listeners.PublicationPublishListener');
 import('plugins.generic.thoth.classes.notification.ThothNotification');
@@ -132,7 +132,7 @@ public function addTemplateFilters($hookName, $args)
         $templateMgr = $args[0];
         $template = $args[1];
 
-        $thothSectionFilter = new ThothSectionFilter();
+        $thothSectionFilter = new ThothSectionTemplateFilter();
         $thothSectionFilter->registerFilter($templateMgr, $template, $this);
     }
 
@@ -142,7 +142,7 @@ public function addScripts($hookName, $args)
         $template = $args[1];
         $request = Application::get()->getRequest();
 
-        $thothSectionFilter = new ThothSectionFilter();
+        $thothSectionFilter = new ThothSectionTemplateFilter();
         $thothSectionFilter->addJavaScriptData($request, $templateMgr, $template);
         $thothSectionFilter->addJavaScript($request, $templateMgr, $this);
         $thothSectionFilter->addStyleSheet($request, $templateMgr, $this);
@@ -189,15 +189,17 @@ public function addMenu($hookName, $args)
         }
 
         if (in_array(ROLE_ID_MANAGER, $userRoles)) {
-            $menu = array_slice($menu, 0, 3, true) +
+            $offset = array_search("settings", array_keys($menu));
+
+            $menu = array_slice($menu, 0, $offset, true) +
             [
                 'thoth' => [
                     'name' => __('plugins.generic.thoth.navigation.thoth'),
                     'url' => $router->url($request, null, 'thoth'),
                     'isCurrent' => $router->getRequestedPage($request) === 'thoth',
                 ]
             ] +
-            array_slice($menu, 2, null, true);
+            array_slice($menu, ($offset - 1), null, true);
         }
 
         $templateMgr->setState(['menu' => $menu]);

classes/container/providers/ThothRepositoryProvider.inc.php

@@ -54,7 +54,7 @@ public function register($container)
 
             $testEnvironment = $pluginSettingsDao->getSetting($contextId, 'ThothPlugin', 'testEnvironment');
             $email = $pluginSettingsDao->getSetting($contextId, 'ThothPlugin', 'email');
-            $password = $pluginSettingsDao->getSetting($contextId, 'ThothPlugin', 'password');
+            $password = $pluginSettingsDao->getSetting($contextId, 'ThothPlugin', 'password') ?? '';
 
             return [
                 'testEnvironment' => $testEnvironment,

classes/factories/ThothBookFactory.inc.php

@@ -16,6 +16,9 @@
 
 use APP\facades\Repo;
 use APP\submission\Submission;
+use PKP\core\Core;
+use PKP\doi\Doi;
+use PKP\submission\PKPSubmission;
 use ThothApi\GraphQL\Models\Work as ThothWork;
 
 import('plugins.generic.thoth.classes.formatters.HtmlStripper');
@@ -31,18 +34,26 @@ public function createFromPublication($publication)
 
         return new ThothWork([
             'workType' => $thothWorkType ?? $this->getWorkTypeBySubmissionWorkType($submission->getData('workType')),
-            'workStatus' => empty($publication->getData('datePublished'))
-                ? ThothWork::WORK_STATUS_FORTHCOMING
-                : ThothWork::WORK_STATUS_ACTIVE,
+            'workStatus' => $this->getWorkStatusByDatePublished($publication->getData('datePublished')),
             'fullTitle' => $publication->getLocalizedFullTitle(),
             'title' => $publication->getLocalizedTitle(),
             'subtitle' => $publication->getLocalizedData('subtitle'),
             'longAbstract' => HtmlStripper::stripTags($publication->getLocalizedData('abstract')),
             'edition' => $publication->getData('version'),
-            'doi' => $publication->getData('doiObject')?->getResolvingUrl(),
+            'doi' => $this->getDoi($publication),
             'publicationDate' => $publication->getData('datePublished'),
-            'license' => $publication->getData('licenseUrl'),
-            'copyrightHolder' => $publication->getLocalizedData('copyrightHolder'),
+            'license' => $publication->getData('licenseUrl')
+                ?? $submission->_getContextLicenseFieldValue(
+                    null,
+                    PKPSubmission::PERMISSIONS_FIELD_LICENSE_URL,
+                    $publication
+                ),
+            'copyrightHolder' => $publication->getLocalizedData('copyrightHolder')
+                ?? $submission->_getContextLicenseFieldValue(
+                    $submission->getData('locale'),
+                    PKPSubmission::PERMISSIONS_FIELD_COPYRIGHT_HOLDER,
+                    $publication
+                ),
             'coverUrl' => $publication->getLocalizedCoverImageUrl($submission->getData('contextId')),
             'landingPage' => $request->getDispatcher()->url(
                 $request,
@@ -55,7 +66,7 @@ public function createFromPublication($publication)
         ]);
     }
 
-    private function getWorkTypeBySubmissionWorkType($submissionWorkType)
+    public function getWorkTypeBySubmissionWorkType($submissionWorkType)
     {
         $workTypeMapping = [
             Submission::WORK_TYPE_EDITED_VOLUME => ThothWork::WORK_TYPE_EDITED_BOOK,
@@ -64,4 +75,43 @@ private function getWorkTypeBySubmissionWorkType($submissionWorkType)
 
         return $workTypeMapping[$submissionWorkType];
     }
+
+    public function getWorkStatusByDatePublished($datePublished)
+    {
+        if ($datePublished && $datePublished <= Core::getCurrentDate()) {
+            return ThothWork::WORK_STATUS_ACTIVE;
+        }
+
+        return ThothWork::WORK_STATUS_FORTHCOMING;
+    }
+
+    public function getDoi($publication)
+    {
+        $doiObject = $publication->getData('doiObject');
+
+        if ($doiObject === null) {
+            $publicationFormats = DAORegistry::getDAO('PublicationFormatDAO')
+                ->getByPublicationId($publication->getId());
+            foreach ($publicationFormats as $publicationFormat) {
+                $identificationCodes = $publicationFormat->getIdentificationCodes()->toArray();
+                foreach ($identificationCodes as $identificationCode) {
+                    if ($identificationCode->getCode() == '06') {
+                        $doi = $identificationCode->getValue();
+                        if (str_contains($doi, 'doi.org')) {
+                            $doi = str_replace('https://doi.org/', '', $doi);
+                        }
+                        $doiObject = new Doi();
+                        $doiObject->setDoi($doi);
+                        break 2;
+                    }
+                }
+            }
+        }
+
+        if ($doiObject === null) {
+            return $doiObject;
+        }
+
+        return $doiObject->getResolvingUrl();
+    }
 }

classes/factories/ThothChapterFactory.inc.php

@@ -15,6 +15,7 @@
  */
 
 use APP\facades\Repo;
+use PKP\core\Core;
 use ThothApi\GraphQL\Models\Work as ThothWork;
 
 import('plugins.generic.thoth.classes.formatters.HtmlStripper');
@@ -30,9 +31,7 @@ public function createFromChapter($chapter)
 
         return new ThothWork([
             'workType' => ThothWork::WORK_TYPE_BOOK_CHAPTER,
-            'workStatus' => (empty($chapter->getDatePublished()) && empty($publication->getData('datePublished')))
-                ? ThothWork::WORK_STATUS_FORTHCOMING
-                : ThothWork::WORK_STATUS_ACTIVE,
+            'workStatus' => $this->getWorkStatusByDatePublished($chapter, $publication),
             'fullTitle' => $chapter->getLocalizedFullTitle(),
             'title' => $chapter->getLocalizedTitle(),
             'subtitle' => $chapter->getLocalizedData('subtitle'),
@@ -50,4 +49,15 @@ public function createFromChapter($chapter)
             )
         ]);
     }
+
+    public function getWorkStatusByDatePublished($chapter, $publication)
+    {
+        $dataPublished = $chapter->getDatePublished() ?? $publication->getData('datePublished');
+
+        if ($dataPublished && $dataPublished <= Core::getCurrentDate()) {
+            return ThothWork::WORK_STATUS_ACTIVE;
+        }
+
+        return ThothWork::WORK_STATUS_FORTHCOMING;
+    }
 }

classes/formatters/HtmlStripper.inc.php

@@ -16,7 +16,7 @@
 
 class HtmlStripper
 {
-    private const ALLOWED_TAGS = '<b><strong><em><i><u><ul><ol><li><p><h1><h2><h3><h4><h5><h6>';
+    private const ALLOWED_TAGS = '<strong><mark><em><i><u><sup><sub><ul><ol><li>';
 
     public static function stripTags($string)
     {

classes/services/ThothContributionService.inc.php

@@ -15,6 +15,7 @@
  */
 
 use APP\facades\Repo;
+use PKP\db\DAORegistry;
 
 import('plugins.generic.thoth.classes.facades.ThothService');
 import('plugins.generic.thoth.classes.facades.ThothRepository');
@@ -58,8 +59,27 @@ public function registerByPublication($publication)
     {
         $authors = Repo::author()->getCollector()
             ->filterByPublicationIds([$publication->getId()])
-            ->getMany();
+            ->getMany()
+            ->toArray();
         $primaryContactId = $publication->getData('primaryContactId');
+
+        $chapterDao = DAORegistry::getDAO('ChapterDAO');
+        $chapters = $chapterDao->getByPublicationId($publication->getId())->toArray();
+
+        $chapterAuthorIds = [];
+        foreach ($chapters as $chapter) {
+            $chapterAuthorIds = array_merge($chapterAuthorIds, (array) Repo::author()->getCollector()
+                ->filterByChapterId($chapter->getId())
+                ->filterByPublicationIds([$publication->getId()])
+                ->getIds()
+                ->toArray());
+        }
+        $chapterAuthorIds = array_unique($chapterAuthorIds);
+
+        $authors = array_filter($authors, function ($author) use ($chapterAuthorIds, $primaryContactId) {
+            return $author->getId() === $primaryContactId || !in_array($author->getId(), $chapterAuthorIds);
+        });
+
         $thothBookId = $publication->getData('thothBookId');
         foreach ($authors as $author) {
             $this->register($author, $thothBookId, $primaryContactId);

classes/services/ThothPublicationService.inc.php

@@ -52,12 +52,9 @@ public function registerByPublication($publication)
     {
         $thothBookId = $publication->getData('thothBookId');
         $publicationFormats = DAORegistry::getDAO('PublicationFormatDAO')
-            ->getApprovedByPublicationId($publication->getId())
-            ->toArray();
+            ->getByPublicationId($publication->getId());
         foreach ($publicationFormats as $publicationFormat) {
-            if ($publicationFormat->getIsAvailable()) {
-                $this->register($publicationFormat, $thothBookId);
-            }
+            $this->register($publicationFormat, $thothBookId);
         }
     }
 
@@ -78,9 +75,7 @@ public function registerByChapter($chapter)
         $publicationFormatDao = DAORegistry::getDAO('PublicationFormatDAO');
         foreach ($chapterSubmissionFiles as $chapterSubmissionFile) {
             $publicationFormat = $publicationFormatDao->getById($chapterSubmissionFile->getData('assocId'));
-            if ($publicationFormat->getIsAvailable()) {
-                $this->register($publicationFormat, $thothChapterId, $chapter->getId());
-            }
+            $this->register($publicationFormat, $thothChapterId, $chapter->getId());
         }
     }
 

classes/services/ThothSubjectService.inc.php

@@ -24,12 +24,12 @@ public function __construct($repository)
         $this->repository = $repository;
     }
 
-    public function register($citation, $sequence, $thothWorkId)
+    public function register($subject, $sequence, $thothWorkId)
     {
         $thothSubject = $this->repository->new([
             'workId' => $thothWorkId,
             'subjectType' => ThothSubject::SUBJECT_TYPE_KEYWORD,
-            'subjectCode' => 'Psychology',
+            'subjectCode' => $subject,
             'subjectOrdinal' => $sequence
         ]);
 

…asses/filters/ThothSectionFilter.inc.php …lters/ThothSectionTemplateFilter.inc.phpclasses/filters/ThothSectionFilter.inc.php renamed to classes/templateFilters/ThothSectionTemplateFilter.inc.php classes/filters/ThothSectionFilter.inc.php renamed to classes/templateFilters/ThothSectionTemplateFilter.inc.php

@@ -1,19 +1,19 @@
 <?php
 
 /**
- * @file plugins/generic/thoth/classes/filters/ThothSectionFilter.inc.php
+ * @file plugins/generic/thoth/classes/filters/ThothSectionTemplateFilter.inc.php
  *
  * Copyright (c) 2024-2025 Lepidus Tecnologia
  * Copyright (c) 2024-2025 Thoth
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
- * @class ThothSectionFilter
+ * @class ThothSectionTemplateFilter
  * @ingroup plugins_generic_thoth
  *
  * @brief Template filter to include Thoth section in workflow page
  */
 
-class ThothSectionFilter
+class ThothSectionTemplateFilter
 {
     private $plugin;