Merge branch 'develop'

* develop:
  Rename main.yml to deploy-release-to-test.yml
  Recreating workflow
  deleting workflow
  changing github action filename
  fixing syntax
  adding mote type to release trigger
  adde release types
  updating script name
  changing rebuild script name
  Adding release publish deploy action
  OS-3 - removing package fixed version
  Adding GIN theme admin toolbar support
  Updated webforms_analysis to Drupal 9
  Updated invalid lock file after merge
  Added module removed from os2forms/os2forms package OS2Forms/os2forms#22 This module still might be used on some installations.
  Updated os2forms to latest release
  Added patch for webform_scheduled_email plugin. See https://www.drupal.org/project/webform/issues/3259195
  Fixed bug with long request_URI in os2web_logging module

# Conflicts:
#	composer.lock

Author: stankut

.github/workflows/deploy-release-to-test.yml

@@ -0,0 +1,20 @@
+name: Deploy release to test.os2forms.dk
+on:
+  release:
+    types: [published]
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote ssh commands using password
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.KEY }}
+        port: ${{ secrets.PORT }}
+        script: |
+          whoami
+          sh /var/www/test.os2forms.dk/private/os2forms_init/rebuild_installation.sh

composer.json

@@ -89,8 +89,10 @@
         "drupal/bootstrap": "^3.21",
         "drupal/config_entity_revisions": "1.7.0",
         "drupal/console": "^1.0.2",
-        "drupal/core-composer-scaffold": "~9.2.13",
-        "drupal/core-recommended": "~9.2.13",
+        "drupal/core-composer-scaffold": "^9.4",
+        "drupal/core-project-message": "^9.4",
+        "drupal/core-recommended": "^9.4",
+        "drupal/core-vendor-hardening": "^9.4",
         "drupal/fontyourface": "^3.2",
         "drupal/header_and_footer_scripts": "^3.0",
         "drupal/ldap": "^4.2",
@@ -104,18 +106,18 @@
         "drupal/straw": "^1.3",
         "drupal/telephone_validation": "^2.2",
         "drupal/upgrade_status": "^3.12",
-        "drupal/webform_analysis": "1.x-dev#9e34c2617958ab4b5e0632b49ca6c75d4e1d4c00",
+        "drupal/webform_analysis": "^1.0@beta",
         "drupal/webform_composite": "^1.0@RC",
         "drupal/webform_migrate": "^1.2",
         "drupal/webform_node_element": "^1.1",
+        "drupal/webform_permissions_by_term": "^1.2",
         "drupal/webform_scheduled_tasks": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
         "drush/drush": "^10",
         "os2core/os2core": "^2.0",
         "os2forms/os2forms": "~3.1",
         "os2forms/os2forms_egbolig": "dev-master",
-        "os2forms/os2forms_forloeb": "^1.9",
-        "os2forms/os2forms_forloeb_profile": "1.6.0-rc",
+        "os2forms/os2forms_forloeb_profile": "^1.9.0",
         "os2web/os2web_logging": "dev-master",
         "vlucas/phpdotenv": "^5.1",
         "webflo/drupal-finder": "^1.2",
@@ -141,7 +143,9 @@
             "cweagans/composer-patches": true,
             "zaporylie/composer-drupal-optimizations": true,
             "drupal/console-extend-plugin": true,
-            "drupal/core-composer-scaffold": true
+            "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": true,
+            "drupal/core-vendor-hardening": true
         }
     },
     "autoload": {
@@ -191,32 +195,23 @@
             "force-reset": true
         },
         "patches": {
-            "drupal/coc_forms_auto_export": {
-               "3240592 - Problem with phpseclib requirement in 2.x": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
-            },
             "drupal/webform": {
-               "Add support for Set to state": "./patches/add-set-to-state-3159806-2-modified-5.19.patch"
+                "Add support for Set to state": "./patches/add-set-to-state-3159806-2-modified-5.19.patch"
             },
             "drupal/webform_permissions_by_term": {
-               "3192241 - Too few arguments after Permissions by Term update to 2.28": "https://www.drupal.org/files/issues/2021-12-10/too-few-arguments-access-check_3192241-3.patch",
-               "3142184 - Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-06-28/webform_permissions_by_term.1.x-dev.rector.patch",
-               "Enabled D9 support": "patches/webform_permissions_by_term-d9.patch"
+                "3192241 - Too few arguments after Permissions by Term update to 2.28": "https://www.drupal.org/files/issues/2021-12-10/too-few-arguments-access-check_3192241-3.patch",
+                "3142184 - Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-06-28/webform_permissions_by_term.1.x-dev.rector.patch",
+                "Enabled D9 support": "patches/webform_permissions_by_term-d9.patch"
             },
             "drupal/webform_embed": {
-               "Enabled D9 support": "./patches/webform_embed-d9.patch",
-               "3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch"
+                "Enabled D9 support": "./patches/webform_embed-d9.patch",
+                "3170384 - Fixed D9 imcopatibility": "https://www.drupal.org/files/issues/2020-09-11/3170384-2.patch"
             },
             "drupal/webform_migrate": {
                 "Set to support. Checkbox condition fixes": "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
             },
             "drupal/queue_mail": {
                 "Admin interface to see queued mail": "https://www.drupal.org/files/issues/2020-06-30/3096917-ui-queue-mail-moderate-5.patch"
-            },
-            "drupal/smtp": {
-                "Duplicated Attachments using webforms": "https://www.drupal.org/files/issues/2020-06-18/smtp-2995290-17.patch"
-            },
-            "drupal/honeypot" : {
-                "3279917 - LogicException: The database connection is not serializable": "https://www.drupal.org/files/issues/2022-05-12/3279917-4-use_dependency_serialization_trait.patch"
             }
         }
     }

patches/3259195-partial-fix-from-2.patch

@@ -0,0 +1,13 @@
+diff --git a/modules/webform_scheduled_email/src/Plugin/WebformHandler/ScheduleEmailWebformHandler.php b/modules/webform_scheduled_email/src/Plugin/WebformHandler/ScheduleEmailWebformHandler.php
+index e8b96cc7a..063311834 100644
+--- a/modules/webform_scheduled_email/src/Plugin/WebformHandler/ScheduleEmailWebformHandler.php
++++ b/modules/webform_scheduled_email/src/Plugin/WebformHandler/ScheduleEmailWebformHandler.php
+@@ -385,7 +385,7 @@ class ScheduleEmailWebformHandler extends EmailWebformHandler {
+    * {@inheritdoc}
+    */
+   public function deleteHandler() {
+-    $this->scheduledEmailManager->unschedule($this->webform, $this->getHandlerId());
++    $this->scheduledEmailManager->delete($this->webform, $this->getHandlerId());
+   }
+
+   /**

web/themes/custom/custom_theme/dist/stylesheets/stylesheet.css

@@ -20,7 +20,9 @@
 // --------------------------------------------------
 // Styling
 // --------------------------------------------------
-
+html {
+  font-size: 16px;
+}
 body {
   font-weight: 400;
 }
@@ -42,7 +44,6 @@ img {
 }
 
 a {
-
   &:not(.btn) {
     text-decoration: underline;
 
@@ -52,6 +53,19 @@ a {
   }
 }
 
+.gin--vertical-toolbar {
+  ul.toolbar-menu a {
+    text-decoration: none;
+  }
+  .toolbar-tray-horizontal {
+    ul li.menu-item--expanded ul li.menu-item--expanded::before,
+    .toolbar-menu:not(:first-child) li.menu-item--expanded > a:focus::before {
+      transform: translateY(-50%);
+      top: 50%!important;
+    }
+  }
+}
+
 // --------------------------------------------------
 // Variants
 // --------------------------------------------------