Cleaned up

Author: rimi-itk

scripts/base

@@ -87,7 +87,7 @@ setup() {
 
   composer --no-plugins config extra.drupal-lenient.allow-all --json true
   # composer --no-plugins config extra.drupal-lenient.allowed-list --json '[                "drupal/coc_forms_auto_export",                "drupal/webform_node_element"            ]'
-  composer require mglaman/composer-drupal-lenient --with-all-dependencies
+  composer require mglaman/composer-drupal-lenient:^1.0 --with-all-dependencies
 
   # --------------------------------------------------------------------------------------------------------------------
   # We need to install dev requirements from our module, so we use

src/Helper/FordelingskomponentHelper.php

@@ -350,10 +350,8 @@ public function renderXml(
   /**
    * Build files for a distribution object.
    *
-   * @return \Drupal\file\Entity\FileGroups
+   * @return array<string, array<int, array{sftp_filename: string, file: \Drupal\file\FileInterface}>>
    *   The file groups.
-   *
-   * @phpstan-import-type FileGroups from DistributionFormular
    */
   public function buildFileGroups(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission): array {
     $groups = [];

src/Plugin/WebformHandler/WebformHandlerSF2900.php

@@ -441,7 +441,7 @@ public function getSummary() {
 
     $items = [];
 
-    if (TRUE || $settings->distributionContext->kleEmne) {
+    if ($settings->distributionContext->kleEmne) {
       $items[] = Link::createFromRoute(
         $this->t('Show routing info'),
         'os2forms_fordelingskomponent.routing_info', [

templates/base.html.twig

@@ -57,7 +57,7 @@
         {% endif %}
     </div>
     <div class="edit-handler">
-        <a href="{{ path('entity.webform.handler.edit_form', {webform: webform.id, webform_handler: handler.handlerId}) }}">{{ 'Edit handler %handler'|trans({'%handler': handler.label}) }}</a>
+        <a href="{{ path('entity.webform.handler.edit_form', {webform: webform.id, webform_handler: handler.handlerId, destination: path('<current>')}) }}">{{ 'Edit handler %handler'|trans({'%handler': handler.label}) }}</a>
     </div>
     <div class="return">
         <a href="{{ path('entity.webform.handlers', {webform: webform.id, webform_handler: handler.handlerId}) }}">{{ 'Back to webform handlers'|trans({'%handler': handler.label}) }}</a>