Normalized white space in filenames

.github/workflows/pr.yaml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '8.1' ]
+        php-versions: [ '8.3' ]
         dependency-version: [ prefer-lowest, prefer-stable ]
     steps:
       - uses: actions/checkout@master
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '8.1' ]
+        php-versions: [ '8.3' ]
         dependency-version: [ prefer-lowest, prefer-stable ]
     steps:
       - uses: actions/checkout@master
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '8.1' ]
+        php-versions: [ '8.3' ]
         dependency-version: [ prefer-lowest, prefer-stable ]
     steps:
       - uses: actions/checkout@master

CHANGELOG.md

@@ -8,6 +8,11 @@ about writing changes to this log.
 
 ## [Unreleased]
 
+## [1.4.0] 18.12.2024
+
+* Normalized white space in filename.
+* Added command for archiving submission.
+
 ## [1.3.1] 09.12.2024
 
 * Added webform ID to audit logging messages.
@@ -51,7 +56,8 @@ about writing changes to this log.
 
 ## [1.0.0] 29.03.2023
 
-[Unreleased]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.3.1...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.4.0...HEAD
+[1.4.0]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/OS2Forms/os2forms_get_organized/compare/1.1.5...1.2.0

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "itk-dev/getorganized-api-client-php": "^1.2",
+        "itk-dev/getorganized-api-client-php": "^1.2.2",
         "drupal/webform": "^6.2",
         "drupal/advancedqueue": "^1.2",
         "symfony/options-resolver": "^5.4 || ^6.0",

drush.services.yml

@@ -0,0 +1,7 @@
+services:
+  drush_command_example.commands:
+    class: \Drupal\os2forms_get_organized\Commands\ArchiveCommands
+    tags:
+      - { name: drush.command }
+    arguments:
+      - '@Drupal\os2forms_get_organized\Helper\ArchiveHelper'

src/Commands/ArchiveCommands.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\os2forms_get_organized\Commands;
+
+use Drupal\os2forms_get_organized\Helper\ArchiveHelper;
+use Drupal\webform\Entity\WebformSubmission;
+use Drush\Commands\DrushCommands;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * OS2Forms archive command.
+ */
+class ArchiveCommands extends DrushCommands {
+
+  public function __construct(
+    private readonly ArchiveHelper $archiveHelper,
+  ) {
+    parent::__construct();
+  }
+
+  /**
+   * A Drush command for archiving submission in GetOrganized.
+   *
+   * @param string $submissionId
+   *   The submission id.
+   * @param string $handlerId
+   *   The handler id.
+   *
+   * @command os2forms:get-organized:archive
+   */
+  public function archive(string $submissionId, string $handlerId): void {
+
+    $io = new SymfonyStyle($this->input(), $this->output());
+
+    /** @var \Drupal\webform\WebformSubmissionInterface|null $submission */
+    $submission = WebformSubmission::load($submissionId);
+
+    if (!$submission) {
+      $io->error(sprintf('Webform submission with id %s could not be found.', $submissionId));
+
+      return;
+    }
+
+    try {
+      $handler = $submission->getWebform()->getHandler($handlerId);
+    }
+    catch (\Exception $e) {
+      $io->error($e->getMessage());
+
+      return;
+    }
+
+    $handlerConfig = $handler->getConfiguration();
+
+    $this->archiveHelper->archive($submissionId, $handlerConfig['settings']);
+
+    $io->success(sprintf('Successfully archived webform submission with id %s ', $submissionId));
+  }
+
+}

src/Helper/ArchiveHelper.php

@@ -489,7 +489,10 @@ private function computeGetOrganizedFilename(string $filename, WebformSubmission
     $position = strrpos($filename, '.' . $fileExtension);
 
     // Inject the webform label and submission number at found position.
-    return substr_replace($filename, '-' . $webformLabel . '-' . $submissionNumber, $position, 0);
+    $filename = substr_replace($filename, '-' . $webformLabel . '-' . $submissionNumber, $position, 0);
+
+    // Normalize white space.
+    return preg_replace('/[[:space:]]/', ' ', trim($filename));
   }
 
   /**