All the attachments listed below must be submitted for the processing of the grant application. The grant application may be rejected if the attachments are not submitted. If any of the attachments is missing, let us know in the Further clarification on attachments section of the application.
For the processing of the grant application, the required attachments are the confirmed attachments approved and signed by the community at its meeting for the previous accounting period and for the operating year for which the grant is being applied for. The attachments concerning the previous accounting period are the financial statements, the annual report, the audit or performance audit report and the minutes of the annual meeting. The attachments for the year for which the grant is being applied for are the budget and action plan.
+Invoices and receipts for the cost of producing orienteering maps must be submitted only upon request.
If you wish, you can submit several attachments as a single file under Financial statements or Budget. In this case, under the other attachment headings, indicate “The attachment has been submitted as a single file or with another application.”
Alla bilagor som anges nedan måste lämnas in för behandling av ansökan om understöd. Ansökan om understöd kan avslås om bilagorna inte har lämnats in. Om någon av bilagorna saknas, meddela oss om det i punkten Ytterligare information om bilagor i ansökan.
För behandling av ansökan om understöd behövs styrkta bilagor från den föregående räkenskapsperioden som samfundet har godkänt och undertecknat vid sitt möte samt bilagor för det verksamhetsår för vilket understödet ansöks. Bilagorna från den föregående räkenskapsperioden är: bokslut, verksamhetsberättelse, revisionsberättelse och protokoll från årsstämman. Bilagorna för det år för vilket understödet ansöks är: budget och verksamhetsplan.
+Fakturorna och kvittona över kostnaderna för framställning av orienteringskartor ska lämnas endast separat på begäran.
Om du vill kan du lämna in flera bilagor i en fil i punkten Bokslut eller budget. Ange i detta fall vid andra bilagor att ”Bilagan har lämnats in som en fil eller i samband med en annan ansökan”.
Avustushakemuksen käsittelyä varten tulee toimittaa kaikki alla luetellut liitteet. Avustushakemus voidaan hylätä, jos liitteitä ei ole toimitettu. Mikäli joku liitteistä puuttuu kerro siitä hakemuksen Lisäselvitys liitteistä -kohdassa.
Avustushakemuksen käsittelyä varten tarvitaan vahvistettuja, yhteisön kokouksessaan hyväksymiä ja allekirjoittamia, liitteitä edelliseltä päättyneeltä tilikaudelta sekä liitteitä sille toimintavuodelle, jolle avustusta haetaan. Edellistä tilikautta koskevat liitteet ovat: tilinpäätös, toimintakertomus ja tilin- tai toiminnantarkastuskertomus sekä vuosikokouksen pöytäkirja. Liitteet vuodelle, jolle avustusta haetaan ovat: talousarvio ja toimintasuunnitelma.
+Suunnistuskarttojen valmistuskustannuksiin liittyvät laskut ja kuitit toimitetaan ainoastaan erikseen pyydettäessä.
Voit halutessasi toimittaa useampia liitteitä yhtenä tiedostona Tilinpäätös tai talousarvio -liitekohdassa. Merkitse tällöin muiden liiteotsikoiden kohdalla ”Liite on toimitettu yhtenä tiedostona tai toisen hakemuksen yhteydessä”.
Huomioithan, että et pysty avaamaan liitteitä sen jälkeen, kun olet liittänyt ne lomakkeelle. Näet liitteestä ainoastaan sen tiedostonimen.
-Vaikka et voi tarkastella liitteiden sisältä jälkikäteen, lomakkeelle liitetyt liitteet lähtevät lomakkeen muiden tietojen mukana avustushakemuksen käsittelijälle.
Vaikka et voi tarkastella liitteiden sisältöä jälkikäteen, lomakkeelle liitetyt liitteet lähtevät lomakkeen muiden tietojen mukana avustushakemuksen käsittelijälle.
extra_info: diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh deleted file mode 100644 index 1e4a42bd25..0000000000 --- a/docker/openshift/crons/base.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -echo "Starting cron: $(date)" - -# You can add any additional cron "daemons" here: -# -# exec "/crons/some-command.sh" & -# -# Example cron (docker/openshift/crons/some-command.sh): -# @code -# #!/bin/bash -# while true -# do -# drush some-command -# sleep 600 -# done -# @endcode - -# Uncomment this to enable TPR migration cron -exec "/crons/migrate-tpr.sh" & -# Uncomment this to enable Varnish purge cron -exec "/crons/purge-queue.sh" & -# Uncomment this to enable automatic translation updates. -exec "/crons/update-translations.sh" & -# Uncomment this to enable content scheduler -# exec "/crons/content-scheduler.sh" & -exec "/crons/pubsub.sh" & - -while true -do - echo "Running cron: $(date)\n" - drush cron - # Sleep for 10 minutes. - sleep 600 -done diff --git a/docker/openshift/crons/migrate-hearings.sh b/docker/openshift/crons/migrate-hearings.sh deleted file mode 100644 index 9cbea08544..0000000000 --- a/docker/openshift/crons/migrate-hearings.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -echo "Starting hearings migration: $(date)" - -while true -do - drush mim helfi_hearings --reset-threshold 43200 --interval 1800 - sleep 900 -done diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index c20c01a4ca..7589ed46fa 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -1,10 +1,15 @@ #!/bin/bash -#echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" +if [ -z "$DRUPAL_PUBSUB_VAULT" ]; then + echo "PubSub is not configured, exiting." + exit 0 +fi -#while true -#do +echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" + +while true +do # PubSub process exists with success return code after # certain number of messages and should then be restarted. -# drush helfi:azure:pubsub-listen || exit 1 -#done + drush helfi:azure:pubsub-listen || exit 1 +done diff --git a/e2e/package-lock.json b/e2e/package-lock.json index 73356a29a2..5c07515962 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "devDependencies": { "@faker-js/faker": "^8.3.1", - "@playwright/test": "^1.41.2", + "@playwright/test": "^1.48.0", "@types/lodash.clonedeep": "^4.5.9", "@types/node": "^20.11.7", "dotenv": "^16.4.1", @@ -34,18 +34,19 @@ } }, "node_modules/@playwright/test": { - "version": "1.41.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.2.tgz", - "integrity": "sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.0.tgz", + "integrity": "sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright": "1.41.2" + "playwright": "1.48.0" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@types/lodash": { @@ -90,6 +91,7 @@ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -105,33 +107,35 @@ "dev": true }, "node_modules/playwright": { - "version": "1.41.2", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.41.2.tgz", - "integrity": "sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz", + "integrity": "sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.41.2" + "playwright-core": "1.48.0" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { "fsevents": "2.3.2" } }, "node_modules/playwright-core": { - "version": "1.41.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.2.tgz", - "integrity": "sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.0.tgz", + "integrity": "sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/undici-types": { diff --git a/e2e/package.json b/e2e/package.json index 73004b3bb6..98ce4905cf 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -13,7 +13,7 @@ "license": "ISC", "devDependencies": { "@faker-js/faker": "^8.3.1", - "@playwright/test": "^1.41.2", + "@playwright/test": "^1.48.0", "@types/lodash.clonedeep": "^4.5.9", "@types/node": "^20.11.7", "dotenv": "^16.4.1", diff --git a/public/modules/custom/grants_admin_applications/src/Form/AtvFormBase.php b/public/modules/custom/grants_admin_applications/src/Form/AtvFormBase.php index 30a0f35e80..75d6cbdae4 100644 --- a/public/modules/custom/grants_admin_applications/src/Form/AtvFormBase.php +++ b/public/modules/custom/grants_admin_applications/src/Form/AtvFormBase.php @@ -10,9 +10,9 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Session\AccountProxyInterface; use Drupal\grants_attachments\AttachmentFixerService; +use Drupal\grants_events\EventsService; use Drupal\grants_handler\ApplicationGetterService; use Drupal\grants_handler\ApplicationHelpers; -use Drupal\grants_handler\EventsService; use Drupal\grants_handler\Helpers; use Drupal\grants_handler\MessageService; use Drupal\helfi_atv\AtvDocument; @@ -62,7 +62,7 @@ public static function create(ContainerInterface $container): self { $container->get('database'), $container->get('grants_handler.application_getter_service'), $container->get('http_client'), - $container->get('grants_handler.events_service'), + $container->get('grants_events.events_service'), $container->get('helfi_atv.atv_service'), $container->get('grants_handler.message_service'), $container->get('current_user'), @@ -200,7 +200,27 @@ public function sendApplicationToIntegrations(AtvDocument $atvDoc, string $appli ->error('Application resending failed: @error', ['@error' => $e->getMessage()]); $this->messenger() ->addError($this->t('Application resending failed: @error', ['@error' => $e->getMessage()])); + + \Sentry\captureException($e); } } + /** + * Handle exceptions. + * + * @param string $message + * Log message prefix. + * @param \Throwable $e + * The exception. + */ + protected function handleException(string $message, \Throwable $e): void { + $uuid = Uuid::uuid4()->toString(); + $this->messenger() + ->addError('Error has occurred and has been logged. ID: @uuid', ['@uuid' => $uuid]); + $this->logger(self::LOGGER_CHANNEL)->error( + "$message: @error, ID: @uuid", + ['@error' => $e->getMessage(), '@uuid' => $uuid] + ); + } + } diff --git a/public/modules/custom/grants_admin_applications/src/Form/ResendApplicationsForm.php b/public/modules/custom/grants_admin_applications/src/Form/ResendApplicationsForm.php index aaf6143b45..abe6d2b072 100644 --- a/public/modules/custom/grants_admin_applications/src/Form/ResendApplicationsForm.php +++ b/public/modules/custom/grants_admin_applications/src/Form/ResendApplicationsForm.php @@ -374,13 +374,7 @@ public function getStatus(array $form, FormStateInterface $formState): void { } } catch (\Exception $e) { - $uuid = Uuid::uuid4()->toString(); - $this->messenger() - ->addError('Error has occured and has been logged. ID: @uuid', ['@uuid' => $uuid]); - $this->logger(self::LOGGER_CHANNEL)->error( - 'Error: status check: @error, ID: @uuid', - ['@error' => $e->getMessage(), '@uuid' => $uuid] - ); + $this->handleException("Error: status check", $e); } } @@ -411,7 +405,7 @@ public function resendApplicationCallback(array $form, FormStateInterface $formS $formState->setRebuild(); } catch (GuzzleException | \Exception $e) { - $this->handleException($e); + $this->handleException("Error: Admin application forms - Resend error", $e); } } @@ -449,25 +443,6 @@ private function handleApplicationNotFound(string $applicationId, FormStateInter $formState->setRebuild(); } - /** - * Handle exceptions. - * - * @param \Exception $e - * The exception. - * - * @return void - * Void. - */ - private function handleException(\Exception $e): void { - $uuid = Uuid::uuid4()->toString(); - $this->messenger() - ->addError('Error has occurred and has been logged. ID: @uuid', ['@uuid' => $uuid]); - $this->logger(self::LOGGER_CHANNEL)->error( - 'Error: Admin application forms - Resend error: @error, ID: @uuid', - ['@error' => $e->getMessage(), '@uuid' => $uuid] - ); - } - /** * Ajax callback event. * diff --git a/public/modules/custom/grants_admin_applications/src/Form/SubmittedApplicationsForm.php b/public/modules/custom/grants_admin_applications/src/Form/SubmittedApplicationsForm.php index 9b61b295f9..44aa1ecd3e 100644 --- a/public/modules/custom/grants_admin_applications/src/Form/SubmittedApplicationsForm.php +++ b/public/modules/custom/grants_admin_applications/src/Form/SubmittedApplicationsForm.php @@ -9,7 +9,6 @@ use Drupal\grants_handler\Helpers; use Drupal\helfi_atv\AtvDocument; use GuzzleHttp\Exception\GuzzleException; -use Ramsey\Uuid\Uuid; use Symfony\Component\HttpFoundation\Request; /** @@ -194,12 +193,7 @@ public function resendApplicationCallback(array $form, FormStateInterface $formS $this->sendApplicationToIntegrations($atvDoc, $transactionId); } catch (GuzzleException | \Exception $e) { - $uuid = Uuid::uuid4()->toString(); - $this->messenger()->addError('Error has occured and has been logged. ID: @uuid', ['@uuid' => $uuid]); - $this->logger(self::LOGGER_CHANNEL)->error( - 'Error: Admin application forms - Resend error: @error, ID: @uuid', - ['@error' => $e->getMessage(), '@uuid' => $uuid] - ); + $this->handleException('Error: Admin application forms - Resend error', $e); } } @@ -289,12 +283,7 @@ function (array $doc) { $formState->setRebuild(); } catch (\Exception $e) { - $uuid = Uuid::uuid4()->toString(); - $this->messenger()->addError('Error has occured and has been logged. ID: @uuid', ['@uuid' => $uuid]); - $this->logger(self::LOGGER_CHANNEL)->error( - 'Error: status check: @error, ID: @uuid', - ['@error' => $e->getMessage(), '@uuid' => $uuid] - ); + $this->handleException('Error: status check', $e); } catch (GuzzleException $e) { } diff --git a/public/modules/custom/grants_attachments/grants_attachments.info.yml b/public/modules/custom/grants_attachments/grants_attachments.info.yml index abda7bddc3..399ac80f5f 100644 --- a/public/modules/custom/grants_attachments/grants_attachments.info.yml +++ b/public/modules/custom/grants_attachments/grants_attachments.info.yml @@ -6,7 +6,7 @@ core_version_requirement: ^9 || ^10 dependencies: - webform - grants_metadata - - grants_handler + - grants_events 'interface translation project': grants_attachments 'interface translation server pattern': modules/custom/grants_attachments/translations/%language.po diff --git a/public/modules/custom/grants_attachments/grants_attachments.services.yml b/public/modules/custom/grants_attachments/grants_attachments.services.yml index e4c6f27dc7..b86c338f44 100644 --- a/public/modules/custom/grants_attachments/grants_attachments.services.yml +++ b/public/modules/custom/grants_attachments/grants_attachments.services.yml @@ -26,11 +26,12 @@ services: '@helfi_atv.atv_service', '@grants_profile.service', '@grants_metadata.atv_schema', - '@grants_handler.events_service', '@helfi_audit_log.audit_log', '@entity_type.manager', '@grants_metadata.application_data_service' ] + calls: + - [ setEventsService, [ '@?grants_events.events_service' ] ] grants_attachments.attachment_fixer_service: class: Drupal\grants_attachments\AttachmentFixerService diff --git a/public/modules/custom/grants_attachments/src/AttachmentHandler.php b/public/modules/custom/grants_attachments/src/AttachmentHandler.php index 63f8319e17..5730e689e3 100644 --- a/public/modules/custom/grants_attachments/src/AttachmentHandler.php +++ b/public/modules/custom/grants_attachments/src/AttachmentHandler.php @@ -12,10 +12,10 @@ use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\TempStore\TempStoreException; use Drupal\grants_attachments\Plugin\WebformElement\GrantsAttachments; +use Drupal\grants_events\EventsService; use Drupal\grants_handler\ApplicationHelpers; use Drupal\grants_handler\DebuggableTrait; use Drupal\grants_handler\EventException; -use Drupal\grants_handler\EventsService; use Drupal\grants_handler\Helpers; use Drupal\grants_metadata\ApplicationDataService; use Drupal\grants_metadata\AtvSchema; @@ -67,6 +67,13 @@ class AttachmentHandler { */ protected EntityStorageInterface $fileStorage; + /** + * Events service. + * + * @var \Drupal\grants_events\EventsService + */ + protected EventsService $eventService; + /** * Constructs an AttachmentHandler object. * @@ -82,8 +89,6 @@ class AttachmentHandler { * Profile service. * @param \Drupal\grants_metadata\AtvSchema $atvSchema * ATV schema. - * @param \Drupal\grants_handler\EventsService $eventService - * Events service. * @param \Drupal\helfi_audit_log\AuditLogService $auditLogService * Audit log mandate errors. * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager @@ -101,7 +106,6 @@ public function __construct( protected AtvService $atvService, protected GrantsProfileService $grantsProfileService, protected AtvSchema $atvSchema, - protected EventsService $eventService, protected AuditLogService $auditLogService, EntityTypeManagerInterface $entityTypeManager, protected ApplicationDataService $applicationDataService, @@ -113,6 +117,16 @@ public function __construct( $this->setDebug(NULL); } + /** + * Set the getter service. + * + * @param \Drupal\grants_events\EventsService $eventsService + * Events service. + */ + public function setEventsService(EventsService $eventsService): void { + $this->eventService = $eventsService; + } + /** * Get file fields. * diff --git a/public/modules/custom/grants_attachments/src/Controller/GrantsAttachmentsController.php b/public/modules/custom/grants_attachments/src/Controller/GrantsAttachmentsController.php index c5a4ff4910..65d79e1993 100644 --- a/public/modules/custom/grants_attachments/src/Controller/GrantsAttachmentsController.php +++ b/public/modules/custom/grants_attachments/src/Controller/GrantsAttachmentsController.php @@ -7,10 +7,10 @@ use Drupal\Core\Messenger\MessengerTrait; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\grants_attachments\Plugin\WebformElement\GrantsAttachments; +use Drupal\grants_events\EventsService; use Drupal\grants_handler\ApplicationGetterService; use Drupal\grants_handler\ApplicationStatusService; use Drupal\grants_handler\ApplicationUploaderService; -use Drupal\grants_handler\EventsService; use Drupal\grants_metadata\ApplicationDataService; use Drupal\helfi_atv\AtvService; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -34,7 +34,7 @@ class GrantsAttachmentsController extends ControllerBase { * The helfi_atv service. * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack * Drupal requests. - * @param \Drupal\grants_handler\EventsService $eventsService + * @param \Drupal\grants_events\EventsService $eventsService * Use submission events productively. * @param \Drupal\grants_handler\ApplicationStatusService $applicationStatusService * Application status service. @@ -62,7 +62,7 @@ public static function create(ContainerInterface $container): static { return new static( $container->get('helfi_atv.atv_service'), $container->get('request_stack'), - $container->get('grants_handler.events_service'), + $container->get('grants_events.events_service'), $container->get('grants_handler.application_status_service'), $container->get('grants_metadata.application_data_service'), $container->get('grants_handler.application_getter_service'), diff --git a/public/modules/custom/grants_attachments/src/Plugin/WebformElement/GrantsAttachments.php b/public/modules/custom/grants_attachments/src/Plugin/WebformElement/GrantsAttachments.php index ea2359470f..0511df78b9 100644 --- a/public/modules/custom/grants_attachments/src/Plugin/WebformElement/GrantsAttachments.php +++ b/public/modules/custom/grants_attachments/src/Plugin/WebformElement/GrantsAttachments.php @@ -5,7 +5,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\grants_attachments\AttachmentHandler; use Drupal\grants_attachments\Element\GrantsAttachments as ElementGrantsAttachments; -use Drupal\grants_handler\EventsService; +use Drupal\grants_events\EventsService; use Drupal\webform\Plugin\WebformElement\WebformCompositeBase; use Drupal\webform\WebformSubmissionInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -79,7 +79,7 @@ final class GrantsAttachments extends WebformCompositeBase { /** * Events service. * - * @var \Drupal\grants_handler\EventsService + * @var \Drupal\grants_events\EventsService */ protected EventsService $eventsService; @@ -93,7 +93,7 @@ public static function create( $plugin_definition, ): GrantsAttachments { $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition); - $instance->eventsService = $container->get('grants_handler.events_service'); + $instance->eventsService = $container->get('grants_events.events_service'); return $instance; } diff --git a/public/modules/custom/grants_events/grants_events.info.yml b/public/modules/custom/grants_events/grants_events.info.yml new file mode 100644 index 0000000000..e88ed228ff --- /dev/null +++ b/public/modules/custom/grants_events/grants_events.info.yml @@ -0,0 +1,5 @@ +name: 'grants_events' +type: module +description: 'Handle application events' +package: helfi +core_version_requirement: ^10 || ^11 diff --git a/public/modules/custom/grants_events/grants_events.module b/public/modules/custom/grants_events/grants_events.module new file mode 100644 index 0000000000..f55bd612b0 --- /dev/null +++ b/public/modules/custom/grants_events/grants_events.module @@ -0,0 +1,6 @@ + 'AVUSTUS2_MSG_OK', + 'AVUSTUS2_ATT_OK' => 'AVUSTUS2_ATT_OK', + 'STATUS_UPDATE' => 'STATUS_UPDATE', + 'MESSAGE_AVUS2' => 'MESSAGE_AVUS2', + 'MESSAGE_APP' => 'MESSAGE_APP', + 'MESSAGE_READ' => 'MESSAGE_READ', + 'MESSAGE_RESEND' => 'MESSAGE_RESEND', + 'HANDLER_ATT_OK' => 'HANDLER_ATT_OK', + 'HANDLER_ATT_DELETE' => 'HANDLER_ATT_DELETE', + 'HANDLER_RESEND_APP' => 'HANDLER_RESEND_APP', + 'HANDLER_APP_COPIED' => 'HANDLER_APP_COPIED', + 'INTEGRATION_INFO_ATT_OK' => 'INTEGRATION_INFO_ATT_OK', + 'INTEGRATION_INFO_APP_OK' => 'INTEGRATION_INFO_APP_OK', + 'EVENT_INFO' => 'EVENT_INFO', + 'HANDLER_ATT_DELETED' => 'HANDLER_ATT_DELETED', + 'INTEGRATION_ERROR_AVUS2' => 'INTEGRATION_ERROR_AVUS2', + 'INTEGRATION_ERROR_ATV_ATT' => 'INTEGRATION_ERROR_ATV_ATT', + ]; + + /** + * Constructs a MessageService object. + * + * @param \GuzzleHttp\Client $http_client + * Client to post data. + * @param \Drupal\Core\Logger\LoggerChannelFactory $loggerFactory + * Log things. + */ + public function __construct( + Client $http_client, + LoggerChannelFactoryInterface $loggerFactory, + ) { + $this->httpClient = $http_client; + $this->logger = $loggerFactory->get('grants_handler_events_service'); + + $this->endpoint = getenv('AVUSTUS2_EVENT_ENDPOINT'); + $this->username = getenv('AVUSTUS2_USERNAME'); + $this->password = getenv('AVUSTUS2_PASSWORD'); + + $this->setDebug(NULL); + + } + + /** + * Get event types. + * + * @return array|string[] + * Event types. + */ + public function getEventTypes(): array { + return $this->eventTypes; + } + + /** + * Log event to document via event integration. + * + * @param string $applicationNumber + * Application to be logged. + * @param string $eventType + * Type of event, must be configured in this class as active one. + * @param string $eventDescription + * Free message to be added. + * @param string $eventTarget + * Target ID for event. + * @param array $eventData + * If we have already built-up event data, use this. + * + * @return array|null + * EventID if success, otherways NULL + * + * @throws \Drupal\grants_events\EventException + */ + public function logEvent( + string $applicationNumber, + string $eventType, + string $eventDescription, + string $eventTarget, + array $eventData = [], + ): ?array { + + if (empty($eventData)) { + $eventData = self::getEventData($eventType, $applicationNumber, $eventDescription, $eventTarget); + } + + $eventDataJson = Json::encode($eventData); + + if (TRUE === $this->debug) { + $this->logger->debug( + 'Event ID: %eventId, JSON: %json', + [ + '%eventId' => $eventData['eventID'], + '%json' => $eventDataJson, + ]); + } + + try { + + $res = $this->httpClient->post($this->endpoint, [ + 'auth' => [$this->username, $this->password, "Basic"], + 'body' => $eventDataJson, + ]); + + if ($res->getStatusCode() == 200) { + $this->logger->info('Event logged: %eventId, message sent.', ['%eventId' => $eventData['eventID']]); + return $eventData; + } + + } + catch (\Exception $e) { + throw new EventException($e->getMessage()); + } + catch (GuzzleException $e) { + throw new EventException($e->getMessage()); + } + + return NULL; + } + + /** + * Filter events by given key. + * + * @param array $events + * Events to be filtered. + * @param string $typeKey + * Event type wanted. + * + * @return array + * Filtered events. + */ + public function filterEvents(array $events, string $typeKey): array { + $messageEvents = array_filter($events, function ($event) use ($typeKey) { + if ($event['eventType'] == $this->eventTypes[$typeKey]) { + return TRUE; + } + return FALSE; + }); + + return [ + 'events' => $messageEvents, + 'event_targets' => array_column($messageEvents, 'eventTarget'), + 'event_ids' => array_column($messageEvents, 'eventID'), + ]; + } + + /** + * Build event object/array from given data. + * + * @param string $eventType + * Type of event, must be in self::$eventTypes. + * @param string $applicationNumber + * Application number for event. + * @param string $eventDescription + * Event description. + * @param string $eventTarget + * Eent target. + * + * @return array + * Event data in array. + * + * @throws \Drupal\grants_events\EventException + */ + public function getEventData(string $eventType, string $applicationNumber, string $eventDescription, string $eventTarget): array { + $eventData = []; + + if (!in_array($eventType, $this->eventTypes)) { + throw new EventException('Not valid event type: ' . $eventType); + } + else { + $eventData['eventType'] = $eventType; + } + + $eventData['eventID'] = Uuid::uuid4()->toString(); + $eventData['caseId'] = $applicationNumber; + $eventData['eventDescription'] = AtvSchema::sanitizeInput($eventDescription); + $eventData['eventTarget'] = $eventTarget; + + if (!isset($eventData['eventSource'])) { + $eventData['eventSource'] = getenv('EVENTS_SOURCE'); + } + + $dt = new \DateTime(); + $dt->setTimezone(new \DateTimeZone('Europe/Helsinki')); + + $eventData['timeCreated'] = $eventData['timeUpdated'] = $dt->format('Y-m-d\TH:i:s'); + return $eventData; + } + +} diff --git a/public/modules/custom/grants_handler/grants_handler.install b/public/modules/custom/grants_handler/grants_handler.install index edab455b4e..92f47b12dd 100644 --- a/public/modules/custom/grants_handler/grants_handler.install +++ b/public/modules/custom/grants_handler/grants_handler.install @@ -216,6 +216,8 @@ function grants_handler_schema(): array { * Name of field. * @param int $new_length * New length for field. + * + * @throws \Exception */ function _module_change_text_field_max_length($entity_type_id, $field_name, $new_length) { $name = 'field.storage.' . $entity_type_id . "." . $field_name; @@ -369,3 +371,18 @@ function grants_handler_update_9008(&$sandbox) { ->schema() ->createTable('grants_handler_locks', $schema['grants_handler_locks']); } + +/** + * Install grants_events module. + */ +function grants_handler_update_9009(&$sandbox): void { + // Enable the grants_attachments module. + \Drupal::service('module_installer')->install(['grants_events']); +} + +/** + * Manually trigger locale translation. + */ +function grants_handler_update_9010(&$sandbox): void { + _locale_parse_js_file('modules/custom/grants_handler/js/webform.form.unsaved.js'); +} diff --git a/public/modules/custom/grants_handler/grants_handler.libraries.yml b/public/modules/custom/grants_handler/grants_handler.libraries.yml index bde18246cc..9ba38aff5b 100644 --- a/public/modules/custom/grants_handler/grants_handler.libraries.yml +++ b/public/modules/custom/grants_handler/grants_handler.libraries.yml @@ -53,3 +53,11 @@ application-timeout-message: dependencies: - core/jquery - core/drupalSettings + +# Grants Dialog +grants-dialog: + version: 1.0.0 + js: + js/grants-dialog.js: { } + dependencies: + - core/drupal diff --git a/public/modules/custom/grants_handler/grants_handler.module b/public/modules/custom/grants_handler/grants_handler.module index 9ba74435cf..39f5111cd1 100644 --- a/public/modules/custom/grants_handler/grants_handler.module +++ b/public/modules/custom/grants_handler/grants_handler.module @@ -1289,8 +1289,8 @@ function grants_handler_preprocess_webform_submission_handler_details(&$variable $submission = $variables['submission']; $submissionData = $submission->getData(); - /** @var \Drupal\grants_handler\EventsService $eventService */ - $eventService = \Drupal::service('grants_handler.events_service'); + /** @var \Drupal\grants_events\EventsService $eventService */ + $eventService = \Drupal::service('grants_events.events_service'); $handlerEvents = array_filter($submissionData['events'], function ($event) use ($eventService) { if ($event['eventType'] == $eventService->getEventTypes()['EVENT_INFO']) { @@ -1314,7 +1314,7 @@ function grants_handler_preprocess_webform_submission_attachment_list(&$variable $submissionData = $submission->getData(); // Get submission events. - $eventService = \Drupal::service('grants_handler.events_service'); + $eventService = \Drupal::service('grants_events.events_service'); $attachmentEventsHandler = $eventService->filterEvents($submissionData['events'], 'HANDLER_ATT_OK'); $attachments = []; @@ -2100,3 +2100,11 @@ function grants_handler_options_list_alter(array &$options, array $context): voi } } } + +/** + * Implements hook_preprocess_HOOK(). + */ +function grants_handler_preprocess_webform(array &$variables) { + $variables['#attached']['library'][] = 'grants_handler/grants-dialog'; + $variables['#attached']['library'][] = 'hdbt/focus-trap'; +} diff --git a/public/modules/custom/grants_handler/grants_handler.services.yml b/public/modules/custom/grants_handler/grants_handler.services.yml index 7f6beb7e17..c054cdd8b7 100644 --- a/public/modules/custom/grants_handler/grants_handler.services.yml +++ b/public/modules/custom/grants_handler/grants_handler.services.yml @@ -11,11 +11,12 @@ services: '@helfi_helsinki_profiili.userdata', '@http_client', '@logger.factory', - '@grants_handler.events_service', '@helfi_atv.atv_service', '@current_user', '@grants_handler.application_status_service' ] + calls: + - [ setEventsService, [ '@?grants_events.events_service' ] ] grants_handler.navigation_helper: class: Drupal\grants_handler\GrantsHandlerNavigationHelper @@ -28,10 +29,6 @@ services: '@datetime.time' ] - grants_handler.events_service: - class: Drupal\grants_handler\EventsService - arguments: [ '@http_client', '@logger.factory' ] - grants_handler.form_lock_service: class: Drupal\grants_handler\FormLockService arguments: [ diff --git a/public/modules/custom/grants_handler/js/grants-dialog.js b/public/modules/custom/grants_handler/js/grants-dialog.js new file mode 100644 index 0000000000..925eead272 --- /dev/null +++ b/public/modules/custom/grants_handler/js/grants-dialog.js @@ -0,0 +1,110 @@ +(function (Drupal) { + Drupal.dialogFunctions = { + + /** + * Creates a dialog and appends it to the body. + * + * @param {string} dialogContent - The title displayed at the top of the + * dialog. + * @param {string} actionButtonText - The text for the "leave" button. + * @param {string} backButtonText - The text for the "back" button. + * @param {string} closeButtonText - The text for the "close" button that + * closes the dialog. + * @param {Function} actionButtonCallback - The function to execute when + * the "action" button is clicked. + */ + createDialog: (dialogContent, actionButtonText, backButtonText, closeButtonText, actionButtonCallback = null) => { + const dialogTitle = Drupal.t('Attention', {}, { context: 'grants_handler' }); + const actionButtonHTML = actionButtonText && ``; + const backButtonHTML = backButtonText && ``; + const closeButtonHTML = closeButtonText && ``; + + const dialogHTML = ` +