Develop to main

composer.json

@@ -36,6 +36,7 @@
         "dmore/chrome-mink-driver": "^2.8",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^9.3",
+        "drupal/migrate_tools": "^5.2",
         "mglaman/phpstan-drupal": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",

conf/cmi/core.entity_form_display.node.policymaker.default.yml

@@ -10,9 +10,8 @@ dependencies:
     - field.field.node.policymaker.field_custom_menu_links
     - field.field.node.policymaker.field_custom_organization_type
     - field.field.node.policymaker.field_decisions_description
-    - field.field.node.policymaker.field_dm_org_above
-    - field.field.node.policymaker.field_dm_org_below
     - field.field.node.policymaker.field_dm_org_name
+    - field.field.node.policymaker.field_dm_organization
     - field.field.node.policymaker.field_dm_sector
     - field.field.node.policymaker.field_documents_description
     - field.field.node.policymaker.field_first_name
@@ -52,6 +51,7 @@ third_party_settings:
         - field_ahjo_title
         - field_policymaker_id
         - field_ahjo_summary
+        - field_dm_organization
         - field_organization_type
         - field_organization_type_id
         - field_dm_org_name
@@ -61,8 +61,6 @@ third_party_settings:
         - field_policymaker_existing
         - field_is_decisionmaker
         - field_dm_sector
-        - field_dm_org_above
-        - field_dm_org_below
       label: 'Integration data'
       region: content
       parent_name: ''
@@ -221,33 +219,27 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_dm_org_above:
-    type: json_textarea
-    weight: 16
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_dm_org_below:
-    type: json_textarea
-    weight: 17
+  field_dm_org_name:
+    type: string_textfield
+    weight: 10
     region: content
     settings:
-      rows: 5
+      size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_dm_org_name:
-    type: string_textfield
-    weight: 9
+  field_dm_organization:
+    type: entity_reference_autocomplete
+    weight: 7
     region: content
     settings:
+      match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_dm_sector:
     type: json_textarea
-    weight: 15
+    weight: 16
     region: content
     settings:
       rows: 5
@@ -271,7 +263,7 @@ content:
     third_party_settings: {  }
   field_is_decisionmaker:
     type: boolean_checkbox
-    weight: 14
+    weight: 15
     region: content
     settings:
       display_label: true
@@ -300,15 +292,15 @@ content:
     third_party_settings: {  }
   field_organization_type:
     type: string_textfield
-    weight: 7
+    weight: 8
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_organization_type_id:
     type: string_textfield
-    weight: 8
+    weight: 9
     region: content
     settings:
       size: 60
@@ -323,20 +315,20 @@ content:
     third_party_settings: {  }
   field_policymaker_dissolved:
     type: datetime_default
-    weight: 12
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }
   field_policymaker_existing:
     type: boolean_checkbox
-    weight: 13
+    weight: 14
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_policymaker_formed:
     type: datetime_default
-    weight: 11
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -375,7 +367,7 @@ content:
     third_party_settings: {  }
   field_sector_name:
     type: string_textfield
-    weight: 10
+    weight: 11
     region: content
     settings:
       size: 60

conf/cmi/core.entity_view_display.node.policymaker.default.yml

@@ -10,9 +10,8 @@ dependencies:
     - field.field.node.policymaker.field_custom_menu_links
     - field.field.node.policymaker.field_custom_organization_type
     - field.field.node.policymaker.field_decisions_description
-    - field.field.node.policymaker.field_dm_org_above
-    - field.field.node.policymaker.field_dm_org_below
     - field.field.node.policymaker.field_dm_org_name
+    - field.field.node.policymaker.field_dm_organization
     - field.field.node.policymaker.field_dm_sector
     - field.field.node.policymaker.field_documents_description
     - field.field.node.policymaker.field_first_name
@@ -163,8 +162,7 @@ content:
 hidden:
   field_contacts: true
   field_custom_menu_links: true
-  field_dm_org_above: true
-  field_dm_org_below: true
+  field_dm_organization: true
   field_dm_sector: true
   field_first_name: true
   field_is_decisionmaker: true

conf/cmi/field.field.node.policymaker.field_dm_organization.yml

@@ -0,0 +1,29 @@
+uuid: f47dded2-2ca3-41ef-831d-bd448bd4c80c
+langcode: fi
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_dm_organization
+    - node.type.organization
+    - node.type.policymaker
+id: node.policymaker.field_dm_organization
+field_name: field_dm_organization
+entity_type: node
+bundle: policymaker
+label: Organisation
+description: 'Reference to organisation.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:node'
+  handler_settings:
+    target_bundles:
+      organization: organization
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference

conf/cmi/field.storage.node.field_dm_org_above.yml → conf/cmi/field.storage.node.field_dm_organization.yml

@@ -1,16 +1,16 @@
-uuid: 8caf5172-b997-45f4-8f2b-71baf42ccac0
+uuid: e44a9501-05f7-4c93-b3eb-d5b3a5e2ec26
 langcode: fi
 status: true
 dependencies:
   module:
-    - json_field
     - node
-id: node.field_dm_org_above
-field_name: field_dm_org_above
+id: node.field_dm_organization
+field_name: field_dm_organization
 entity_type: node
-type: json_native
-settings: {  }
-module: json_field
+type: entity_reference
+settings:
+  target_type: node
+module: core
 locked: false
 cardinality: 1
 translatable: true