The feature to block the publiscation, in case of invalid codecheck status now works #32

Author: dxL1nus

CodecheckPlugin.php

@@ -16,13 +16,17 @@
 use PKP\components\forms\FieldOptions;
 use APP\facades\Repo;
 use APP\plugins\generic\codecheck\api\v1\CodecheckApiHandler;
+use APP\plugins\generic\codecheck\api\v1\CurlApiClient;
 use PKP\core\JSONMessage;
 use APP\plugins\generic\codecheck\classes\Constants;
 use APP\plugins\generic\codecheck\classes\Workflow\CodecheckStatusHandler;
 use APP\plugins\generic\codecheck\controllers\page\CodecheckPageHandler;
 use APP\plugins\generic\codecheck\classes\CodecheckRoles\CodecheckRoleArray;
 use APP\plugins\generic\codecheck\classes\CodecheckRoles\CodecheckRoleManager;
+use APP\plugins\generic\codecheck\classes\Submission\CodecheckMetadataDAO;
+use APP\plugins\generic\codecheck\classes\Workflow\CodecheckMetadataHandler;
 use PKP\core\Request;
+use \Github\Client;
 
 class CodecheckPlugin extends GenericPlugin
 {
@@ -89,15 +93,21 @@ public function validateCodecheckStatus(string $hookName, array $args): bool
         $publication = $args[1]; // sometimes passed by reference depending on version
         $request = Application::get()->getRequest();
         $context = $request->getContext();
+        $codecheckMetadataHandler = new CodecheckMetadataHandler($request, new Client(), new CurlApiClient());
+        $codecheckStatus = CodecheckStatusHandler::getCurrentStatusData($codecheckMetadataHandler->getSubmissionId());
 
-        error_log("[CODECHECK Plugin] Validating CODECHECK before publication!");
+        CodecheckLogger::debug("Validating CODECHECK before publication!");
 
-        $codecheckStatus = 'plugins.generic.codecheck.status.completed.partialReproduction';
         $codecheckStatusKeysSelected = $this->getSetting($context->getId(), Constants::CODECHECK_STATUS_KEYS_SELECTED);
 
-        if (!in_array($codecheckStatus, $codecheckStatusKeysSelected)) {
+        if (empty($codecheckStatus)) {
+            $errors[] = __('plugins.generic.codecheck.status.validation.failed.noStatusSet');
+            return false;
+        }
+
+        if (!in_array($codecheckStatus->status, $codecheckStatusKeysSelected)) {
             $errors[] = __('plugins.generic.codecheck.status.validation.failed', [
-                'codecheckStatus' => __($codecheckStatus)
+                'codecheckStatus' => __($codecheckStatus->status)
             ]);
             return false;
         }

classes/Settings/SettingsForm.php

@@ -261,7 +261,7 @@ public function execute(...$functionArgs): mixed
             $context->getId(),
             Constants::GITHUB_CUSTOM_LABELS,
             array_values(array_filter(
-                (array) $this->getData(Constants::GITHUB_CUSTOM_LABELS),
+                (array) $this->getData(Constants::CODECHECK_GITHUB_CUSTOM_LABELS),
                 fn ($label) => !empty($label)
             ))
         );

locale/en/locale.po

@@ -359,6 +359,9 @@ msgstr "Complete"
 msgid "plugins.generic.codecheck.status.validation.failed"
 msgstr "The mandatory CODECHECK for this submission has a status ({$codecheckStatus}), which is not allowed for publication by the journal. Please get in touch with the codechecker(s) to resolve all errors, before this submission can be published!"
 
+msgid "plugins.generic.codecheck.status.validation.failed.noStatusSet"
+msgstr "The mandatory CODECHECK for this submission has no status (so it was not yet started), which is not allowed for publication by the journal. Please get in touch with the codechecker(s) to resolve all errors, before this submission can be published!"
+
 msgid "plugins.generic.codecheck.status.pending"
 msgstr "Pending"
 

public/build/build.iife.js

@@ -207,7 +207,7 @@
 
         <div class="field-group">
           <div class="field-header">
-            <label class="field-label">{{ t('plugins.generic.codecheck.codecheckers.title') }} <span class="required">*</span></label>
+            <label class="field-label">{{ t('plugins.generic.codecheck.codecheckers.title') }}</label>
             <button type="button" class="pkpButton btn-add" @click="showCodecheckerModal">{{ t('plugins.generic.codecheck.codecheckers.add') }}</button>
           </div>