-
-
+
+
+
+
+ `;
// TODO: Surveys use very similar javascript dialog implementation.
// This and the survey implementation could possibly be merged with some
@@ -54,7 +74,7 @@
const closeButton = document.getElementById('helfi-dialog__close-button');
const dialog = document.getElementById('helfi-dialog__container');
const dialogFocusTrap = window.focusTrap.createFocusTrap('#helfi-dialog__container', {
- initialFocus: () => '#helfi-dialog__title'
+ initialFocus: () => '#helfi-dialog__title',
});
// Activate the focus trap so that the user needs to react to the dialog.
@@ -68,18 +88,30 @@
// Add click event listener to back button
backButton.addEventListener('click', () => {
dialogFocusTrap.deactivate();
+ // If we have a callback, execute it.
+ if (backButtonCallback) {
+ backButtonCallback();
+ }
Drupal.dialogFunctions.removeDialog(dialog);
});
// Add click event listener to close button
closeButton.addEventListener('click', () => {
dialogFocusTrap.deactivate();
+ // If we have a callback, execute it.
+ if (closeButtonCallback) {
+ closeButtonCallback();
+ }
Drupal.dialogFunctions.removeDialog(dialog);
});
// Add event listener to ESC button to remove the dialog
document.body.addEventListener('keydown', function (event) {
if (event.key === 'Escape') {
+ // If we have a escapeButtonCallback, execute it also when pressing escape.
+ if (escapeButtonCallback) {
+ escapeButtonCallback();
+ }
Drupal.dialogFunctions.removeDialog(dialog);
}
});
@@ -90,8 +122,7 @@
document.body.style.paddingRight = `${
window.innerWidth - document.documentElement.clientWidth
}px`;
- }
- else {
+ } else {
document.body.style.removeProperty('padding-right');
}
},
@@ -105,6 +136,6 @@
dialog.remove();
Drupal.dialogFunctions.toggleNoScroll(false);
Drupal.dialogFunctions.setBodyPaddingRight(false);
- }
- }
+ },
+ };
})(Drupal);
diff --git a/public/modules/custom/grants_handler/js/webform.form.unsaved.js b/public/modules/custom/grants_handler/js/webform.form.unsaved.js
index 99e66c6b8..4f96d10cd 100644
--- a/public/modules/custom/grants_handler/js/webform.form.unsaved.js
+++ b/public/modules/custom/grants_handler/js/webform.form.unsaved.js
@@ -108,7 +108,7 @@
});
});
}
- }
+ },
};
$('a').on('click', function (event) {
@@ -116,18 +116,18 @@
if (unsaved && !containingElement.contains(event.target) && !event.target.getAttribute('href').startsWith('#')) {
event.preventDefault();
- return Drupal.dialogFunctions.createDialog(
- Drupal.t('You have unsaved changes. Are you sure you want to leave?', {}, { context: 'grants_handler' }),
- Drupal.t('Leave the application', {}, { context: 'grants_handler' }),
- Drupal.t('Back to application', {}, { context: 'grants_handler' }),
- Drupal.t('Close', {}, { context: 'grants_handler' }),
- () => {
+ return Drupal.dialogFunctions.createDialog({
+ dialogContent: Drupal.t('You have unsaved changes. Are you sure you want to leave?', {}, { context: 'grants_handler' }),
+ actionButtonText: Drupal.t('Leave the application', {}, { context: 'grants_handler' }),
+ backButtonText: Drupal.t('Back to application', {}, { context: 'grants_handler' }),
+ closeButtonText: Drupal.t('Close', {}, { context: 'grants_handler' }),
+ actionButtonCallback: () => {
unsaved = false;
const dialog = document.getElementById('helfi-dialog__container');
Drupal.dialogFunctions.removeDialog(dialog);
window.top.location.href = event.currentTarget.href;
- }
- );
+ },
+ });
}
});
@@ -147,18 +147,18 @@
if (unsaved && (e.which === 116 || (e.which === 82 && (e.ctrlKey || e.metaKey)))) {
e.preventDefault(); // Prevent F5 and Ctrl+R / Cmd+R refresh
- return Drupal.dialogFunctions.createDialog(
- Drupal.t('You have unsaved changes. Are you sure you want to refresh?', {}, { context: 'grants_handler' }),
- Drupal.t('Refresh the page', {}, { context: 'grants_handler' }),
- Drupal.t('Back to application', {}, { context: 'grants_handler' }),
- Drupal.t('Close', {}, { context: 'grants_handler' }),
- () => {
+ return Drupal.dialogFunctions.createDialog({
+ dialogContent: Drupal.t('You have unsaved changes. Are you sure you want to refresh?', {}, { context: 'grants_handler' }),
+ actionButtonText: Drupal.t('Refresh the page', {}, { context: 'grants_handler' }),
+ backButtonText: Drupal.t('Back to application', {}, { context: 'grants_handler' }),
+ closeButtonText: Drupal.t('Close', {}, { context: 'grants_handler' }),
+ actionButtonCallback: () => {
unsaved = false;
const dialog = document.getElementById('helfi-dialog__container');
Drupal.dialogFunctions.removeDialog(dialog);
location.reload();
- }
- );
+ },
+ });
}
});
diff --git a/public/modules/custom/grants_handler/src/ApplicationHelpers.php b/public/modules/custom/grants_handler/src/ApplicationHelpers.php
index 973188460..5e67ec59f 100644
--- a/public/modules/custom/grants_handler/src/ApplicationHelpers.php
+++ b/public/modules/custom/grants_handler/src/ApplicationHelpers.php
@@ -412,6 +412,7 @@ public static function updateFieldOptions(array &$form, array $newOptions, array
$currentField = &$currentField['#element'][$fieldName];
}
else {
+ // If we don't have current field array, we can't update the options.
if (!is_iterable($currentField)) {
return;
}
diff --git a/public/modules/custom/grants_handler/src/Controller/ApplicationController.php b/public/modules/custom/grants_handler/src/Controller/ApplicationController.php
index 272cb2d1f..ffd9e645e 100644
--- a/public/modules/custom/grants_handler/src/Controller/ApplicationController.php
+++ b/public/modules/custom/grants_handler/src/Controller/ApplicationController.php
@@ -114,7 +114,8 @@ public function access(AccountInterface $account, string $webform, string $webfo
* @return \Drupal\Core\Access\AccessResultInterface
* The access result.
*
- * @throws \GuzzleHttp\Exception\GuzzleException
+ * @throws \Drupal\grants_mandate\CompanySelectException
+ * @throws \Drupal\grants_profile\GrantsProfileException
*/
public function accessByApplicationNumber(AccountInterface $account, string $submission_id): AccessResultInterface {
try {
diff --git a/public/modules/custom/grants_handler/src/Controller/CopyApplicationAjaxController.php b/public/modules/custom/grants_handler/src/Controller/CopyApplicationAjaxController.php
new file mode 100644
index 000000000..0830d3549
--- /dev/null
+++ b/public/modules/custom/grants_handler/src/Controller/CopyApplicationAjaxController.php
@@ -0,0 +1,199 @@
+get('grants_handler.application_getter_service'),
+ $container->get('grants_handler.application_init_service'),
+ $container->get('grants_events.events_service'),
+ $container->get('grants_handler.application_status_service'),
+ );
+ }
+
+ /**
+ * Builds the response.
+ *
+ * @param string $submission_id
+ * The submission ID.
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ * The redirect response.
+ */
+ public function __invoke(string $submission_id): RedirectResponse {
+ $oldApplicationUrl = $this->getOldApplicationUrl($submission_id);
+
+ try {
+ $webform_submission = $this->getWebformSubmission($submission_id);
+ $webform = $webform_submission->getWebForm();
+ $this->makeSureCopyingIsEnabled($webform);
+
+ $newSubmission = $this->initNewApplication($webform->id(), $webform_submission->getData());
+ $this->logEvent($newSubmission, $webform_submission->getData());
+
+ return $this->getNewApplicationRedirect($webform, $newSubmission);
+ }
+ catch (\Throwable $e) {
+ $this->messenger()->addError('Application copying failed.');
+ $this->getLogger('grants_handler')
+ ->error('Application copying failed: @message', ['@message' => $e->getMessage()]);
+ return new RedirectResponse($oldApplicationUrl->toString());
+ }
+ }
+
+ /**
+ * Gets the URL of the old application.
+ *
+ * @param string $submission_id
+ * The submission ID.
+ *
+ * @return \Drupal\Core\Url
+ * The URL of the old application.
+ */
+ private function getOldApplicationUrl(string $submission_id): Url {
+ return Url::fromRoute('grants_handler.view_application', ['submission_id' => $submission_id]);
+ }
+
+ /**
+ * Gets the webform submission object.
+ *
+ * @param string $submission_id
+ * The submission ID.
+ *
+ * @return \Drupal\webform\Entity\WebformSubmission
+ * The webform submission object.
+ *
+ * @throws \RuntimeException
+ * If the webform submission cannot be retrieved.
+ */
+ private function getWebformSubmission(string $submission_id): WebformSubmission {
+ try {
+ return $this->applicationGetterService->submissionObjectFromApplicationNumber($submission_id);
+ }
+ catch (EntityStorageException | CompanySelectException $e) {
+ throw new \RuntimeException('Failed to get webform submission.');
+ }
+ }
+
+ /**
+ * Validates the application.
+ *
+ * @param \Drupal\webform\WebformInterface $webform
+ * The webform object.
+ *
+ * @throws \RuntimeException
+ * If the application cannot be copied.
+ */
+ private function makeSureCopyingIsEnabled(WebformInterface $webform): void {
+ $thirdPartySettings = $webform->getThirdPartySettings('grants_metadata');
+ $isApplicationArchived = $thirdPartySettings["status"] === 'archived' ?? TRUE;
+ $isApplicationOpen = $this->applicationStatusService->isApplicationOpen($webform);
+
+ if ($thirdPartySettings["disableCopying"] === 1 || $isApplicationArchived || !$isApplicationOpen) {
+ throw new \RuntimeException('Application copying disabled.');
+ }
+ }
+
+ /**
+ * Initializes a new application with copied data.
+ *
+ * @param string $webform_id
+ * The webform ID.
+ * @param array $data
+ * The data to initialize the new application with.
+ *
+ * @return \Drupal\webform\Entity\WebformSubmission
+ * The new webform submission object.
+ *
+ * @throws \RuntimeException
+ * If the new application cannot be initialized.
+ */
+ private function initNewApplication(string $webform_id, array $data): WebformSubmission {
+ try {
+ return $this->applicationInitService->initApplication($webform_id, $data);
+ }
+ catch (\Throwable $e) {
+ throw new \RuntimeException('Failed to initialize new application.');
+ }
+ }
+
+ /**
+ * Logs the event of copying the application.
+ *
+ * @param \Drupal\webform\Entity\WebformSubmission $newSubmission
+ * The new webform submission object.
+ * @param array $oldData
+ * The data of the old application.
+ *
+ * @throws \Drupal\grants_events\EventException
+ */
+ private function logEvent(WebformSubmission $newSubmission, array $oldData): void {
+ $newData = $newSubmission->getData();
+ $this->messenger()
+ ->addStatus($this->t('Grant application copied, new id:
@number', ['@number' => $newData['application_number']], ['context' => 'grants_handler']));
+ $this->eventsService->logEvent($newData['application_number'], 'HANDLER_APP_COPIED', $this->t('Application copied from application id: @id', ['@id' => $oldData['application_number']], ['context' => 'grants_handler'])
+ ->render(), $newData['application_number']);
+ }
+
+ /**
+ * Gets the redirect response for the new application.
+ *
+ * @param \Drupal\webform\WebformInterface $webform
+ * The webform object.
+ * @param \Drupal\webform\Entity\WebformSubmission $newSubmission
+ * The new webform submission object.
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ * The redirect response.
+ */
+ private function getNewApplicationRedirect(WebformInterface $webform, WebformSubmission $newSubmission): RedirectResponse {
+ $newApplicationUrl = Url::fromRoute('grants_handler.edit_application', [
+ 'webform' => $webform->id(),
+ 'webform_submission' => $newSubmission->id(),
+ ]);
+ return new RedirectResponse($newApplicationUrl->toString());
+ }
+
+}
diff --git a/public/modules/custom/grants_handler/src/Form/CopyApplicationForm.php b/public/modules/custom/grants_handler/src/Form/CopyApplicationForm.php
deleted file mode 100644
index a40dcec15..000000000
--- a/public/modules/custom/grants_handler/src/Form/CopyApplicationForm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-setDebug(NULL);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container): MessageForm|static {
- return new static(
- $container->get('grants_handler.application_init_service'),
- $container->get('grants_handler.application_getter_service')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId(): string {
- return 'grants_handler_copy_application';
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, string $submission_id = ''): array {
- $tOpts = ['context' => 'grants_handler'];
-
- try {
- $webform_submission = $this->applicationGetterService->submissionObjectFromApplicationNumber($submission_id);
-
- if ($webform_submission != NULL) {
- $form_state->setStorage(['submission' => $webform_submission]);
- }
- }
- catch (\Exception | GuzzleException $e) {
- $this->logger(self::LOGGER_CHANNEL)->error('Failed to load submission: @error', ['@error' => $e->getMessage()]);
- }
- $form['copyFrom'] = [
- '#type' => 'markup',
- '#markup' => 'Tähän vois sitte laittaa hakemuksen perussettejä, tai vaikka koko hakemus näytille.',
- ];
-
- $form['actions'] = [
- '#type' => 'actions',
- ];
- $form['actions']['submit'] = [
- '#type' => 'submit',
- '#value' => $this->t('Copy application', [], $tOpts),
- ];
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {}
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state): void {
- $storage = $form_state->getStorage();
- /** @var \Drupal\webform\Entity\WebformSubmission $webform_submission */
- $webform_submission = $storage['submission'];
- $webform = $webform_submission->getWebForm();
-
- // Init new application with copied data.
- try {
- $newSubmission = $this->applicationInitService->initApplication($webform->id(), $webform_submission->getData());
- }
- catch (EntityStorageException |
- GrantsProfileException |
- AtvDocumentNotFoundException |
- AtvFailedToConnectException |
- ProfileDataException |
- TokenExpiredException |
- GuzzleException $e) {
- $newSubmission = FALSE;
- }
-
- if ($newSubmission) {
-
- $newData = $newSubmission->getData();
-
- $this->messenger()
- ->addStatus(
- $this->t(
- 'Grant application copied(
@number)',
- [
- '@number' => $newData['application_number'],
- ]
- )
- );
-
- $form_state->setRedirect(
- 'grants_handler.completion',
- ['submission_id' => $newData['application_number']],
- [
- 'attributes' => [
- 'data-drupal-selector' => 'application-saved-successfully-link',
- ],
- ]
- );
- }
- else {
- $this->messenger()->addError('Grant application copy failed.');
- }
- }
-
-}
diff --git a/public/modules/custom/grants_handler/src/Form/CopyApplicationModalForm.php b/public/modules/custom/grants_handler/src/Form/CopyApplicationModalForm.php
deleted file mode 100644
index 7e2c463eb..000000000
--- a/public/modules/custom/grants_handler/src/Form/CopyApplicationModalForm.php
+++ /dev/null
@@ -1,300 +0,0 @@
-setDebug(NULL);
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container): CopyApplicationModalForm|static {
-
- // Create a new form object and inject its services.
- $form = new static(
- $container->get('renderer'),
- $container->get('grants_events.events_service'),
- $container->get('grants_handler.application_status_service'),
- $container->get('grants_handler.application_init_service'),
- $container->get('grants_handler.application_getter_service')
- );
- $form->setRequestStack($container->get('request_stack'));
- $form->setStringTranslation($container->get('string_translation'));
- $form->setMessenger($container->get('messenger'));
-
- return $form;
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId(): string {
- return 'grants_profile_copy_application_modal_form';
- }
-
- /**
- * Helper method so we can have consistent dialog options.
- *
- * @return string[]
- * An array of jQuery UI elements to pass on to our dialog form.
- */
- public static function getDataDialogOptions(): array {
- return [
- 'width' => '33%',
- 'closeText' => t('Close'),
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, string $submission_id = '', string $nojs = ''): array {
- $tOpts = ['context' => 'grants_handler'];
-
- // Add the core AJAX library.
- $form['#attached']['library'][] = 'core/drupal.ajax';
- $form['#theme'] = 'application_copy_modal_form';
-
- try {
- $webform_submission = $this->applicationGetterService->submissionObjectFromApplicationNumber($submission_id);
-
- if ($webform_submission != NULL) {
- // Set webform submission template.
- $build = [
- '#theme' => 'submission_for_modal_form',
- '#submission' => $webform_submission,
- '#submission_id' => $submission_id,
- ];
-
- $form_state->setStorage(['submission' => $webform_submission]);
- $form['modal_markup'] = [
- '#markup' => $this->renderer->render($build),
- ];
- }
-
- }
- catch (\Exception | GuzzleException $e) {
- $this->logger('copy_application_modal_form')->error('Error: %error', [
- '%error' => $e->getMessage(),
- ]);
- }
-
- // Add a link to show this form in a modal dialog if we're not already in
- // one.
- if ($nojs == 'nojs') {
- $form['use_ajax_container'] = [
- '#type' => 'details',
- '#open' => TRUE,
- ];
- $form['use_ajax_container']['use_ajax'] = [
- '#type' => 'link',
- '#title' => $this->t('See this form as a modal.', [], $tOpts),
- '#url' => Url::fromRoute('grants_handler.copy_application_modal', ['nojs' => 'ajax']),
- '#attributes' => [
- 'class' => ['use-ajax'],
- 'data-dialog-type' => 'modal',
- 'data-dialog-options' => json_encode(static::getDataDialogOptions()),
- // Add this id so that we can test this form.
- 'id' => 'copy-application-modal-form-link',
- ],
- ];
- }
-
- // This element is responsible for displaying form errors in the AJAX
- // dialog.
- if ($nojs == 'ajax') {
- $form['status_messages'] = [
- '#type' => 'status_messages',
- '#weight' => -999,
- ];
- }
-
- // Add a submit button that handles the submission of the form.
- $form['actions']['submit'] = [
- '#type' => 'submit',
- '#value' => $this->t('Use application as base', [], $tOpts),
- '#ajax' => [
- 'callback' => '::ajaxSubmitForm',
- 'event' => 'click',
- ],
- '#attributes' => [
- 'id' => 'copy-application-modal-form-submit',
- ],
- ];
-
- // Set the form to not use AJAX if we're on a nojs path. When this form is
- // within the modal dialog, Drupal will make sure we're using an AJAX path
- // instead of a nojs one.
- if ($nojs == 'nojs') {
- unset($form['actions']['submit']['#ajax']);
- }
-
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateForm(array &$form, FormStateInterface $form_state): void {
- $storage = $form_state->getStorage();
- /** @var \Drupal\webform\Entity\WebformSubmission $webform_submission */
- $webform_submission = $storage['submission'];
- $webform = $webform_submission->getWebForm();
-
- $isApplicationOpen = $this->applicationStatusService->isApplicationOpen($webform);
- $thirdPartySettings = $webform->getThirdPartySettings('grants_metadata');
-
- // If copying is disabled in 3rd party settings, do not allow forward.
- if ($thirdPartySettings["disableCopying"] == 1 ||
- $thirdPartySettings["status"] === 'archived' ||
- !$isApplicationOpen
- ) {
- $form_state->setErrorByName('modal_markup', 'Copying is disabled for this form.');
- }
-
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state): void {
- $storage = $form_state->getStorage();
- /** @var \Drupal\webform\Entity\WebformSubmission $webform_submission */
- $webform_submission = $storage['submission'];
- $oldData = $webform_submission->getData();
- $webform = $webform_submission->getWebForm();
-
- // Init new application with copied data.
- try {
- $newSubmission = $this->applicationInitService->initApplication($webform->id(), $webform_submission->getData());
- $newData = $newSubmission->getData();
- }
- catch (\Exception $e) {
- $newSubmission = FALSE;
- $newData = [];
- }
-
- if ($newSubmission) {
- $this->messenger()
- ->addStatus(
- $this->t(
- 'Grant application copied, new id:
@number',
- [
- '@number' => $newData['application_number'],
- ],
- ['context' => 'grants_handler']
- )
- );
-
- $storage['newSubmission'] = $newSubmission;
- $form_state->setStorage($storage);
-
- $this->eventsService->logEvent(
- $newData['application_number'],
- 'HANDLER_APP_COPIED',
- $this->t('Application copied from application id: @id', ['@id' => $oldData['application_number']], ['context' => 'grants_handler']),
- $newData['application_number']
- );
-
- $form_state->setRedirect(
- 'grants_handler.edit_application',
- [
- 'webform_submission' => $newSubmission->id(),
- 'webform' => $webform->id(),
- ]
- );
- }
- else {
- $this->messenger()->addError('Grant application copy failed');
- }
- }
-
- /**
- * Implements the submit handler for the modal dialog AJAX call.
- *
- * @param array $form
- * Render array representing from.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * Current form state.
- *
- * @return \Drupal\Core\Ajax\AjaxResponse
- * Array of AJAX commands to execute on submit of the modal form.
- */
- public function ajaxSubmitForm(array &$form, FormStateInterface $form_state) {
- $tOpts = ['context' => 'grants_handler'];
-
- // We begin building a new ajax reponse.
- $response = new AjaxResponse();
-
- // If the user submitted the form and there are errors, show them the
- // input dialog again with error messages. Since the title element is
- // required, the empty string wont't validate and there will be an error.
- if ($form_state->getErrors()) {
- // If there are errors, we can show the form again with the errors in
- // the status_messages section.
- $form['status_messages'] = [
- '#type' => 'status_messages',
- '#weight' => -10,
- ];
- $response->addCommand(new OpenModalDialogCommand($this->t('Errors', [], $tOpts), $form, static::getDataDialogOptions()));
- }
- else {
- // No errors, we load things from form state.
- $storage = $form_state->getStorage();
- /** @var \Drupal\webform\Entity\WebformSubmission $webform_submission */
- $webform_submission = $storage['newSubmission'];
- $webform = $webform_submission->getWebForm();
-
- // Create url redirect for this new submission.
- $url = Url::fromRoute('grants_handler.edit_application',
- [
- 'webform_submission' => $webform_submission->id(),
- 'webform' => $webform->id(),
- ]);
- $response->addCommand(new CloseModalDialogCommand());
- $command = new RedirectCommand($url->toString());
- $response->addCommand($command);
- }
-
- // Finally return our response.
- return $response;
- }
-
-}
diff --git a/public/modules/custom/grants_profile/js/profile_dialog.js b/public/modules/custom/grants_profile/js/profile_dialog.js
index 1ea699707..67aeeef57 100644
--- a/public/modules/custom/grants_profile/js/profile_dialog.js
+++ b/public/modules/custom/grants_profile/js/profile_dialog.js
@@ -29,28 +29,28 @@
let containingElement = document.querySelector('form');
if ((unset_name) && !containingElement.contains(event.target)) {
event.preventDefault();
- return Drupal.dialogFunctions.createDialog(
- Drupal.t('You need to have a name for your unregistered community or group. Please add a name and save or cancel them.', {}, { context: 'grants_profile' }),
- '',
- Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
- Drupal.t('Close', {}, { context: 'grants_profile' }),
- );
+ return Drupal.dialogFunctions.createDialog({
+ dialogContent: Drupal.t('You need to have a name for your unregistered community or group. Please add a name and save or cancel them.', {}, { context: 'grants_profile' }),
+ actionButtonText: '',
+ backButtonText: Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
+ closeButtonText: Drupal.t('Close', {}, { context: 'grants_profile' }),
+ });
} else if ((current_name !== initial_name) && !containingElement.contains(event.target)) {
event.preventDefault();
- return Drupal.dialogFunctions.createDialog(
- Drupal.t('You have unsaved changes in your profile. Please save or cancel them.', {}, { context: 'grants_profile' }),
- '',
- Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
- Drupal.t('Close', {}, { context: 'grants_profile' }),
- );
+ return Drupal.dialogFunctions.createDialog({
+ dialogContent: Drupal.t('You have unsaved changes in your profile. Please save or cancel them.', {}, { context: 'grants_profile' }),
+ actionButtonText: '',
+ backButtonText: Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
+ closeButtonText: Drupal.t('Close', {}, { context: 'grants_profile' }),
+ });
} else if (($('[data-drupal-selector="edit-isnewprofile"]').val() === 'initialSave') && !containingElement.contains(event.target)) {
event.preventDefault();
- return Drupal.dialogFunctions.createDialog(
- Drupal.t('You have not saved your profile. Please save your profile before leaving the form.', {}, { context: 'grants_profile' }),
- '',
- Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
- Drupal.t('Close', {}, { context: 'grants_profile' }),
- );
+ return Drupal.dialogFunctions.createDialog({
+ dialogContent: Drupal.t('You have not saved your profile. Please save your profile before leaving the form.', {}, { context: 'grants_profile' }),
+ actionButtonText: '',
+ backButtonText: Drupal.t('Back to profile', {}, { context: 'grants_profile' }),
+ closeButtonText: Drupal.t('Close', {}, { context: 'grants_profile' }),
+ });
}
is_element_click = false;
diff --git a/public/themes/custom/hdbt_subtheme/dist/js/matomo.min.js b/public/themes/custom/hdbt_subtheme/dist/js/matomo.min.js
index 52425e03f..97c4ae16e 100644
--- a/public/themes/custom/hdbt_subtheme/dist/js/matomo.min.js
+++ b/public/themes/custom/hdbt_subtheme/dist/js/matomo.min.js
@@ -1 +1 @@
-!function(e,Drupal){function c(){if(void 0!==Drupal.eu_cookie_compliance&&Drupal.eu_cookie_compliance.hasAgreed("statistics")){const e=window._paq=window._paq||[];e.push(["trackPageView"]),e.push(["enableLinkTracking"]),function(){const c="//webanalytics.digiaiiris.com/js/";e.push(["setTrackerUrl",`${c}tracker.php`]),e.push(["setSiteId","1219"]);const i=document,n=i.createElement("script"),t=i.getElementsByTagName("script")[0];n.async=!0,n.src=`${c}piwik.min.js`,t.parentNode.insertBefore(n,t)}()}}e(document).on("eu_cookie_compliance.changeStatus",c()),e(document).ready(c)}(jQuery,Drupal);
\ No newline at end of file
+!function(e,Drupal){const t=()=>{if(Drupal.cookieConsent.getConsentStatus(["statistics"])){const e=window._paq=window._paq||[];e.push(["trackPageView"]),e.push(["enableLinkTracking"]),function(){const t="//webanalytics.digiaiiris.com/js/";e.push(["setTrackerUrl",`${t}tracker.php`]),e.push(["setSiteId","1219"]);const n=document,i=n.createElement("script"),s=n.getElementsByTagName("script")[0];i.async=!0,i.src=`${t}piwik.min.js`,s.parentNode.insertBefore(i,s)}()}};Drupal.cookieConsent.initialized()?t():Drupal.cookieConsent.loadFunction(t)}(jQuery,Drupal);
\ No newline at end of file
diff --git a/public/themes/custom/hdbt_subtheme/src/js/matomo.js b/public/themes/custom/hdbt_subtheme/src/js/matomo.js
index 7a68ba381..6e730bc24 100644
--- a/public/themes/custom/hdbt_subtheme/src/js/matomo.js
+++ b/public/themes/custom/hdbt_subtheme/src/js/matomo.js
@@ -1,12 +1,9 @@
// eslint-disable-next-line func-names
(function ($, Drupal) {
- function loadMatomoAnalytics() {
- if (typeof Drupal.eu_cookie_compliance === "undefined") {
- return;
- }
+ const loadMatomoAnalytics = () => {
// Load Matomo only if statistics cookies are allowed.
- if (Drupal.eu_cookie_compliance.hasAgreed("statistics")) {
+ if (Drupal.cookieConsent.getConsentStatus(['statistics'])) {
// Matomo Tag Manager
// eslint-disable-next-line no-multi-assign
const _paq = (window._paq = window._paq || []);
@@ -25,11 +22,12 @@
s.parentNode.insertBefore(g, s);
})();
}
- }
+ };
// Load when cookie settings are changed.
- $(document).on("eu_cookie_compliance.changeStatus", loadMatomoAnalytics());
-
- // Load on page load.
- $(document).ready(loadMatomoAnalytics);
+ if (Drupal.cookieConsent.initialized()) {
+ loadMatomoAnalytics();
+ } else {
+ Drupal.cookieConsent.loadFunction(loadMatomoAnalytics);
+ }
})(jQuery, Drupal);
diff --git a/public/themes/custom/hdbt_subtheme/templates/webform/application-copy-dialog-content.html.twig b/public/themes/custom/hdbt_subtheme/templates/webform/application-copy-dialog-content.html.twig
new file mode 100644
index 000000000..11fdb8af1
--- /dev/null
+++ b/public/themes/custom/hdbt_subtheme/templates/webform/application-copy-dialog-content.html.twig
@@ -0,0 +1,2 @@
+
Kopioitava hakemus: {{ webformTitle }}
+
Hakemustunnus: {{ applicationNumber }}
diff --git a/public/themes/custom/hdbt_subtheme/templates/webform/webform-submission-information.html.twig b/public/themes/custom/hdbt_subtheme/templates/webform/webform-submission-information.html.twig
index 58cc39d90..daa38f316 100644
--- a/public/themes/custom/hdbt_subtheme/templates/webform/webform-submission-information.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/webform/webform-submission-information.html.twig
@@ -33,43 +33,51 @@
{{ 'Application info'|t }}
{{ 'Summary about your application and processing details.'|t }}