Merge pull request #479 from City-of-Helsinki/UHF-9150-import-more-on…

…tology-words

UHF-9150: Import more TPR ontologywords and display those on comprehensive school TPR unit page

conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml

@@ -9,6 +9,7 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
@@ -163,6 +164,16 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_ontologyword_details:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 30

conf/cmi/core.entity_view_display.tpr_ontology_word_details.tpr_ontology_word_details.default.yml

@@ -11,10 +11,10 @@ mode: default
 content:
   detail_items:
     type: tpr_ontology_word_detail_item
-    label: inline
+    label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 1
     region: content
   name:
     type: string
@@ -24,30 +24,16 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
-  ontologyword_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
   school_details:
     type: tpr_school_details
     label: above
     settings: {  }
     third_party_settings: {  }
     weight: 3
     region: content
-  unit_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
 hidden:
   langcode: true
   name_override: true
+  ontologyword_id: true
   search_api_excerpt: true
+  unit_id: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml

@@ -6,9 +6,11 @@ dependencies:
     - core.entity_view_mode.tpr_unit.comprehensive_school_card
     - field.field.tpr_unit.tpr_unit.field_categories
     - field.field.tpr_unit.tpr_unit.field_content
+    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
@@ -97,6 +99,7 @@ hidden:
   field_hs_front_page: true
   field_lower_content: true
   field_metatags: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml

@@ -9,13 +9,15 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
   module:
     - address
     - entity_reference_revisions
     - helfi_address_search
+    - helfi_kasko_content
     - helfi_tpr
     - imagecache_external
     - link
@@ -133,6 +135,13 @@ content:
     third_party_settings: {  }
     weight: 17
     region: content
+  field_ontologyword_details:
+    type: tpr_ontologyword_details_formatter
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 28
+    region: content
   highlights:
     type: tpr_connection
     label: hidden

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml

@@ -6,9 +6,11 @@ dependencies:
     - core.entity_view_mode.tpr_unit.high_school_card
     - field.field.tpr_unit.tpr_unit.field_categories
     - field.field.tpr_unit.tpr_unit.field_content
+    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
@@ -217,6 +219,7 @@ hidden:
   created: true
   field_categories: true
   field_districts: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
@@ -63,6 +64,7 @@ hidden:
   field_hs_front_page: true
   field_lower_content: true
   field_metatags: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
@@ -83,6 +84,7 @@ hidden:
   field_hs_front_page: true
   field_lower_content: true
   field_metatags: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
@@ -84,6 +85,7 @@ hidden:
   field_hs_front_page: true
   field_lower_content: true
   field_metatags: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml

@@ -17,9 +17,11 @@ dependencies:
       - core.entity_view_mode.tpr_unit.vocational_school_card
       - field.field.tpr_unit.tpr_unit.field_categories
       - field.field.tpr_unit.tpr_unit.field_content
+      - field.field.tpr_unit.tpr_unit.field_districts
       - field.field.tpr_unit.tpr_unit.field_hs_front_page
       - field.field.tpr_unit.tpr_unit.field_lower_content
       - field.field.tpr_unit.tpr_unit.field_metatags
+      - field.field.tpr_unit.tpr_unit.field_ontologyword_details
       - field.field.tpr_unit.tpr_unit.field_study_field
       - field.field.tpr_unit.tpr_unit.field_unit_type
       - responsive_image.styles.image__3_2
@@ -212,6 +214,7 @@ hidden:
   field_categories: true
   field_districts: true
   field_hs_front_page: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml

@@ -10,6 +10,7 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_hs_front_page
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
+    - field.field.tpr_unit.tpr_unit.field_ontologyword_details
     - field.field.tpr_unit.tpr_unit.field_study_field
     - field.field.tpr_unit.tpr_unit.field_unit_type
     - responsive_image.styles.image__3_2
@@ -99,6 +100,7 @@ hidden:
   field_hs_front_page: true
   field_lower_content: true
   field_metatags: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true

conf/cmi/core.extension.yml

@@ -88,7 +88,6 @@ module:
   helfi_platform_config_base: 0
   helfi_proxy: 0
   helfi_react_search: 0
-  helfi_school_addons: 0
   helfi_toc: 0
   helfi_tpr: 0
   helfi_tpr_config: 0

conf/cmi/field.field.tpr_unit.tpr_unit.field_ontologyword_details.yml

@@ -0,0 +1,27 @@
+uuid: bc61eadf-6aa1-4a88-9675-ae4063ed527b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.tpr_unit.field_ontologyword_details
+  module:
+    - helfi_tpr
+id: tpr_unit.tpr_unit.field_ontologyword_details
+field_name: field_ontologyword_details
+entity_type: tpr_unit
+bundle: tpr_unit
+label: 'Ontologyword details'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:tpr_ontology_word_details'
+  handler_settings:
+    target_bundles: null
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+field_type: entity_reference

conf/cmi/field.storage.tpr_unit.field_ontologyword_details.yml

@@ -0,0 +1,19 @@
+uuid: 9b23d149-a34b-4310-a4cc-1a35688a867a
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+id: tpr_unit.field_ontologyword_details
+field_name: field_ontologyword_details
+entity_type: tpr_unit
+type: entity_reference
+settings:
+  target_type: tpr_ontology_word_details
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

conf/cmi/helfi_tpr.limit_ontology_words.yml

@@ -1,16 +1,77 @@
 ids:
+  - 1
+  - 2
+  - 3
+  - 15
+  - 16
+  - 17
+  - 18
+  - 19
+  - 20
+  - 21
+  - 22
+  - 23
+  - 24
+  - 25
+  - 26
+  - 27
+  - 28
+  - 29
+  - 30
+  - 31
+  - 32
+  - 33
+  - 34
+  - 35
+  - 36
+  - 37
+  - 38
+  - 86
+  - 101
+  - 102
+  - 103
+  - 104
+  - 105
+  - 106
+  - 107
+  - 108
+  - 109
+  - 110
+  - 111
+  - 112
+  - 113
+  - 114
+  - 115
+  - 116
+  - 117
+  - 118
+  - 119
+  - 120
+  - 121
+  - 122
+  - 123
   - 157
+  - 200
+  - 288
+  - 293
+  - 294
+  - 295
+  - 297
   - 472
+  - 489
   - 493
   - 590
   - 650
   - 816
+  - 831
   - 872
   - 873
   - 892
-  - 86
-  - 200
-  - 288
-  - 294
-  - 489
-  - 831
+  - 904
+  - 905
+  - 906
+  - 907
+  - 908
+  - 909
+  - 910
+  - 911

conf/cmi/user.role.admin.yml

@@ -32,7 +32,7 @@ dependencies:
     - group
     - group_content_menu
     - helfi_api_base
-    - helfi_school_addons
+    - helfi_kasko_content
     - helfi_tpr
     - locale
     - media

conf/cmi/user.role.editor.yml

@@ -27,7 +27,7 @@ dependencies:
     - filter
     - group
     - helfi_api_base
-    - helfi_school_addons
+    - helfi_kasko_content
     - helfi_tpr
     - locale
     - media

conf/cmi/views.view.high_school_search.yml

@@ -5,7 +5,7 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_unit.high_school_card
   module:
-    - helfi_school_addons
+    - helfi_kasko_content
     - helfi_tpr
     - user
 _core: