Updated forms and flows

Author: rimi-itk

web/modules/custom/os2forms_selvbetjening/modules/os2forms_selvbetjening_examples/config/install/maestro.maestro_template.example_flow.yml

@@ -9,23 +9,7 @@ dependencies:
       - os2forms_selvbetjening_examples
 third_party_settings:
   os2forms_permissions_by_term:
-    maestro_template_permissions_by_term_settings:
-      21: '21'
-      30: 0
-      32: 0
-      29: 0
-      39: 0
-      28: 0
-      22: 0
-      26: 0
-      36: 0
-      23: 0
-      24: 0
-      37: 0
-      31: 0
-      25: 0
-      33: 0
-      38: 0
+    maestro_template_permissions_by_term_settings: []
 id: example_flow
 label: 'example flow'
 app_group: 0
@@ -98,7 +82,7 @@ tasks:
       unique_id: example_flow_step_2
       webform_machine_name: example_flow_step_2
       modal: notmodal
-      skip_webform_handlers: 0
+      skip_webform_handlers: 1
       webform_nodes_attached_to: none
       use_nodes_attached: 0
       webform_nodes_attached_variable: none

web/modules/custom/os2forms_selvbetjening/modules/os2forms_selvbetjening_examples/config/install/maestro.maestro_template.example_flow_page.yml

@@ -9,23 +9,7 @@ dependencies:
       - os2forms_selvbetjening_examples
 third_party_settings:
   os2forms_permissions_by_term:
-    maestro_template_permissions_by_term_settings:
-      21: '21'
-      30: 0
-      32: 0
-      29: 0
-      39: 0
-      28: 0
-      22: 0
-      26: 0
-      36: 0
-      23: 0
-      24: 0
-      37: 0
-      31: 0
-      25: 0
-      33: 0
-      38: 0
+    maestro_template_permissions_by_term_settings: []
 id: example_flow_page
 label: 'example flow page'
 app_group: 0
@@ -98,8 +82,8 @@ tasks:
       unique_id: example_flow_step_2
       webform_machine_name: example_flow_step_2
       modal: notmodal
-      skip_webform_handlers: 0
-      webform_nodes_attached_to: none
+      skip_webform_handlers: 1
+      webform_nodes_attached_to: node/0
       use_nodes_attached: 1
       webform_nodes_attached_variable: none
       redirect_to: taskconsole

web/modules/custom/os2forms_selvbetjening/modules/os2forms_selvbetjening_examples/config/install/webform.webform.example_flow_step_1.yml

@@ -13,25 +13,9 @@ dependencies:
       - os2forms_selvbetjening_examples
 third_party_settings:
   webform_revisions:
-    contentEntity_id: '237'
+    contentEntity_id: null
   os2forms_permissions_by_term:
-    settings:
-      21: '21'
-      30: 0
-      32: 0
-      29: 0
-      39: 0
-      28: 0
-      22: 0
-      26: 0
-      36: 0
-      23: 0
-      24: 0
-      37: 0
-      31: 0
-      25: 0
-      33: 0
-      38: 0
+    settings: []
   os2forms:
     os2forms_nemid:
       webform_type: ''

web/modules/custom/os2forms_selvbetjening/modules/os2forms_selvbetjening_examples/config/install/webform.webform.example_flow_step_2.yml

@@ -10,25 +10,9 @@ dependencies:
       - os2forms_selvbetjening_examples
 third_party_settings:
   webform_revisions:
-    contentEntity_id: '238'
+    contentEntity_id: null
   os2forms_permissions_by_term:
-    settings:
-      21: '21'
-      30: 0
-      32: 0
-      29: 0
-      39: 0
-      28: 0
-      22: 0
-      26: 0
-      36: 0
-      23: 0
-      24: 0
-      37: 0
-      31: 0
-      25: 0
-      33: 0
-      38: 0
+    settings: []
 weight: 0
 open: null
 close: null

web/modules/custom/os2forms_selvbetjening/modules/os2forms_selvbetjening_examples/src/Helper.php

@@ -6,6 +6,7 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeStorageInterface;
+use Drupal\taxonomy\TermStorageInterface;
 
 /**
  * A helper class.
@@ -27,6 +28,13 @@ class Helper {
    */
   private NodeStorageInterface $nodeStorage;
 
+  /**
+   * The term storage.
+   *
+   * @var \Drupal\taxonomy\TermStorageInterface|\Drupal\Core\Entity\EntityStorageInterface
+   */
+  private TermStorageInterface $termStorage;
+
   /**
    * The config factory.
    *
@@ -39,6 +47,7 @@ class Helper {
    */
   public function __construct(EntityTypeManagerInterface $entityTypeManager, ConfigFactoryInterface $configFactory) {
     $this->nodeStorage = $entityTypeManager->getStorage('node');
+    $this->termStorage = $entityTypeManager->getStorage('taxonomy_term');
     $this->configFactory = $configFactory;
   }
 
@@ -50,6 +59,7 @@ public function install() {
     // creating nodes.
     $this->deleteFormNodes();
     $this->createFormNodes();
+    $this->updateAffiliations();
   }
 
   /**
@@ -62,7 +72,7 @@ public function uninstall() {
   /**
    * Create form nodes.
    */
-  private function createFormNodes() {
+  private function createFormNodes(): void {
     foreach ($this->nodeFormIds as $formId) {
       $node = Node::create([
         'type' => 'webform',
@@ -76,17 +86,48 @@ private function createFormNodes() {
       $node->save();
 
       if ('example_flow_step_2' === $formId) {
-        $config = $this->configFactory->getEditable('maestro.maestro_template.example_flow_page');
-        $config->set('tasks.example_flow_step_2.data.webform_nodes_attached_to', 'node/' . $node->id());
-        $config->save();
+        $this->configFactory->getEditable('maestro.maestro_template.example_flow_page')
+          ->set('tasks.example_flow_step_2.data.webform_nodes_attached_to', 'node/' . $node->id())
+          ->save();
       }
     }
   }
 
+  /**
+   * Set affiliation on all flows.
+   */
+  private function updateAffiliations(): void {
+    $terms = $this->termStorage->loadTree('user_affiliation');
+    $affiliations = [];
+    foreach ($terms as $term) {
+      $affiliations[$term->tid] = (string) $term->tid;
+    }
+
+    $formIds = [
+      'example_flow_step_1',
+      'example_flow_step_2',
+    ];
+    foreach ($formIds as $formId) {
+      $this->configFactory->getEditable('webform.webform.' . $formId)
+        ->set('third_party_settings.os2forms_permissions_by_term.settings', $affiliations)
+        ->save();
+    }
+
+    $flowIds = [
+      'example_flow',
+      'example_flow_page',
+    ];
+    foreach ($flowIds as $flowId) {
+      $this->configFactory->getEditable('maestro.maestro_template.' . $flowId)
+        ->set('third_party_settings.os2forms_permissions_by_term.maestro_template_permissions_by_term_settings', $affiliations)
+        ->save();
+    }
+  }
+
   /**
    * Delete form nodes.
    */
-  private function deleteFormNodes() {
+  private function deleteFormNodes(): void {
     $nodeIds = $this->nodeStorage
       ->getQuery()
       ->condition('webform', $this->nodeFormIds)