when deleting activity from case redirect to case

This reverts commit 809dbfc837.

config/optional/block.block.addactivity.yml

@@ -0,0 +1,25 @@
+uuid: 50fe4dcf-2304-49df-94a5-62ccdc502480
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - route_condition
+  theme:
+    - bartik
+id: addactivity
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: add_activity
+settings:
+  id: add_activity
+  label: 'Add Activity'
+  label_display: visible
+  provider: opencase
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_case.canonical

config/optional/block.block.addcase.yml

@@ -0,0 +1,25 @@
+uuid: bb5d9db9-0e12-4245-9911-16ea92bc7213
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - route_condition
+  theme:
+    - bartik
+id: addcase
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: add_case
+settings:
+  id: add_case
+  label: 'Add Case'
+  label_display: visible
+  provider: opencase
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_actor.canonical

config/optional/block.block.bartik_breadcrumbs.yml

@@ -1,22 +0,0 @@
-uuid: 0420cf43-7f91-4c16-80aa-f76d56641c9f
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bartik
-_core:
-  default_config_hash: y0bXRvKYQQKkf_RVxA3aOPGpIfKKsDOzzrWYCgjxJ9Y
-id: bartik_breadcrumbs
-theme: bartik
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }

config/optional/block.block.exposedformactor_searchpage_1.yml

@@ -1,4 +1,4 @@
-uuid: d38425eb-15fe-4659-8595-57d566586633
+uuid: f229784f-13c0-4d97-8b3c-8a1a2bb31c00
 langcode: en
 status: true
 dependencies:
@@ -8,18 +8,16 @@ dependencies:
     - views
   theme:
     - bartik
-_core:
-  default_config_hash: '-mPyVl2gaejJOcEbMNyCrKWvN61T9BXYb0mLKJ0wPBI'
 id: exposedformactor_searchpage_1
 theme: bartik
 region: header
-weight: -9
+weight: 0
 provider: null
 plugin: 'views_exposed_filter_block:actor_search-page_1'
 settings:
   id: 'views_exposed_filter_block:actor_search-page_1'
   label: ''
-  label_display: '0'
+  label_display: visible
   provider: views
   views_label: ''
 visibility: {  }

config/optional/block.block.views_block__activities_block_1.yml

@@ -1,30 +0,0 @@
-uuid: 14120f1a-9009-4ed1-858a-875d748f93fe
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.activities
-  module:
-    - route_condition
-    - views
-  theme:
-    - bartik
-id: views_block__activities_block_1
-theme: bartik
-region: content
-weight: 0
-provider: null
-plugin: 'views_block:activities-block_1'
-settings:
-  id: 'views_block:activities-block_1'
-  label: ''
-  label_display: visible
-  provider: views
-  context_mapping: {  }
-  views_label: ''
-  items_per_page: none
-visibility:
-  route:
-    id: route
-    negate: false
-    routes: entity.oc_actor.canonical

config/optional/block.block.views_block__activities_block_2.yml

@@ -1,3 +1,4 @@
+uuid: 62e27553-4443-4047-8212-2af44dd4afa1
 langcode: en
 status: true
 dependencies:
@@ -8,23 +9,22 @@ dependencies:
     - views
   theme:
     - bartik
-id: views_block__activities_block_1
+id: views_block__activities_block_2
 theme: bartik
 region: content
 weight: 0
 provider: null
-plugin: 'views_block:activities-block_1'
+plugin: 'views_block:activities-block_2'
 settings:
-  id: 'views_block:activities-block_1'
+  id: 'views_block:activities-block_2'
   label: ''
-  provider: views
   label_display: visible
+  provider: views
+  context_mapping: {  }
   views_label: ''
   items_per_page: none
-  context_mapping: {  }
 visibility:
   route:
     id: route
-    routes: entity.oc_actor.canonical
     negate: false
-    context_mapping: {  }
+    routes: entity.oc_case.canonical

config/optional/block.block.views_block__cases_block_1.yml

@@ -1,29 +0,0 @@
-uuid: 22782d1b-4b5d-422e-9609-96e63ffd39da
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.cases
-  module:
-    - route_condition
-    - views
-  theme:
-    - bartik
-id: views_block__cases_block_1
-theme: bartik
-region: content
-weight: 0
-provider: null
-plugin: 'views_block:cases-block_1'
-settings:
-  id: 'views_block:cases-block_1'
-  label: ''
-  label_display: visible
-  provider: views
-  views_label: ''
-  items_per_page: none
-visibility:
-  route:
-    id: route
-    negate: false
-    routes: entity.oc_actor.canonical

config/optional/core.date_format.short.yml

@@ -7,4 +7,4 @@ _core:
 id: short
 label: 'Default short date'
 locked: false
-pattern: 'd/m/Y - H:i'
+pattern: 'd M Y'

config/optional/core.entity_form_display.oc_activity.application.default.yml

@@ -4,11 +4,19 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_activity_type.application
+  module:
+    - datetime
 id: oc_activity.application.default
 targetEntityType: oc_activity
 bundle: application
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   description:
     type: string_textarea
     weight: 4
@@ -19,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 2
+    weight: 1
     region: content
     settings:
       size: 60
@@ -27,7 +35,7 @@ content:
     third_party_settings: {  }
   oc_provider:
     type: entity_reference_autocomplete
-    weight: 1
+    weight: 2
     region: content
     settings:
       match_operator: CONTAINS
@@ -35,28 +43,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 0
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
   time_taken:
     type: number
     weight: 3
@@ -65,5 +51,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
+  oc_target: true
+  revision_log: true
   status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.case_note.default.yml

@@ -4,41 +4,54 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_activity_type.case_note
+  module:
+    - datetime
 id: oc_activity.case_note.default
 targetEntityType: oc_activity
 bundle: case_note
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
+  oc_provider:
-    type: hide_revision_field_log_widget
+    type: entity_reference_autocomplete
-    weight: 80
+    weight: 2
     region: content
     settings:
-      rows: 5
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
       placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
     third_party_settings: {  }
   time_taken:
     type: number
-    weight: -3
+    weight: 3
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
+  revision_log: true
   status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml

@@ -6,54 +6,61 @@ dependencies:
     - field.field.oc_activity.destitution_funds_provided.field_amount
     - field.field.oc_activity.destitution_funds_provided.field_funds_for
     - opencase_entities.oc_activity_type.destitution_funds_provided
+  module:
+    - datetime
 id: oc_activity.destitution_funds_provided.default
 targetEntityType: oc_activity
 bundle: destitution_funds_provided
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 5
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_amount:
     type: number
-    weight: 28
+    weight: 4
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_funds_for:
     type: options_select
-    weight: 27
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
+  oc_provider:
-    type: hide_revision_field_log_widget
+    type: entity_reference_autocomplete
-    weight: 80
+    weight: 2
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
     region: content
     settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
+  revision_log: true
   status: true
+  time_taken: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.email.default.yml

@@ -1,62 +1,57 @@
-uuid: 13b48008-63b7-4485-babe-9b72256f976a
+uuid: c9168804-754e-4c9c-872e-34d340c0db2a
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
+    - opencase_entities.oc_activity_type.email
-    - field.field.oc_activity.volunteer_training_session.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
   module:
     - datetime
-id: oc_activity.volunteer_training_session.default
+id: oc_activity.email.default
 targetEntityType: oc_activity
-bundle: volunteer_training_session
+bundle: email
 mode: default
 content:
-  field_date_attended:
+  activity_date_time:
     type: datetime_default
-    weight: 27
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_type_of_session:
+  description:
-    type: string_textfield
+    type: string_textarea
-    weight: 26
+    weight: 4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
     region: content
     settings:
       rows: 5
       placeholder: ''
-      show: true
+    third_party_settings: {  }
-      default: ''
+  name:
-      permission_based: false
+    type: string_textfield
-      allow_user_settings: true
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
     third_party_settings: {  }
   time_taken:
     type: number
-    weight: -3
+    weight: 3
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
+  revision_log: true
   status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.interview.default.yml

@@ -0,0 +1,57 @@
+uuid: 86825dc4-21cd-4670-80f5-fd3fc6c67e25
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.interview
+  module:
+    - datetime
+id: oc_activity.interview.default
+targetEntityType: oc_activity
+bundle: interview
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  time_taken:
+    type: number
+    weight: 3
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  oc_target: true
+  revision_log: true
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.lete.default.yml

@@ -0,0 +1,57 @@
+uuid: a86206a2-d677-4276-8450-39941361eee1
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.lete
+  module:
+    - datetime
+id: oc_activity.lete.default
+targetEntityType: oc_activity
+bundle: lete
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  time_taken:
+    type: number
+    weight: 3
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  oc_target: true
+  revision_log: true
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.phone_call.default.yml

@@ -6,7 +6,6 @@ dependencies:
     - opencase_entities.oc_activity_type.phone_call
   module:
     - datetime
-    - hide_revision_field
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
@@ -18,9 +17,17 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 4
+    weight: 1
     region: content
     settings:
       size: 60
@@ -36,28 +43,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 5
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
   time_taken:
     type: number
     weight: 3
@@ -66,5 +51,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  description: true
+  oc_target: true
+  revision_log: true
   status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.research.default.yml

@@ -0,0 +1,57 @@
+uuid: 0751919f-0018-47c0-b5fd-074d40ccc2df
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  time_taken:
+    type: number
+    weight: 3
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  oc_target: true
+  revision_log: true
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_activity.supervision.default.yml

@@ -0,0 +1,60 @@
+uuid: 43b06d48-94ac-4f74-9adc-f40bb63d4f4e
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true

config/optional/core.entity_form_display.oc_actor.client.default.yml

@@ -18,10 +18,12 @@ dependencies:
     - field.field.oc_actor.client.field_nationalities
     - field.field.oc_actor.client.field_referred_by
     - field.field.oc_actor.client.field_sex
+    - field.field.oc_actor.client.field_status
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
     - file
+    - hide_revision_field
 _core:
   default_config_hash: 90BCsdjSFMMiSp2Da3WhMM2sOUliF433LfErYxVCrgk
 id: oc_actor.client.default
@@ -140,6 +142,16 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_status:
+    type: entity_reference_autocomplete
+    weight: 81
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   first_name:
     type: string_textfield
     weight: 0

config/optional/core.entity_form_display.oc_actor.staff_member.default.yml

@@ -0,0 +1,79 @@
+uuid: 56d178c9-a69d-42a7-8235-6ecce238a904
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_actor_type.staff_member
+id: oc_actor.staff_member.default
+targetEntityType: oc_actor
+bundle: staff_member
+mode: default
+content:
+  email:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  first_name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  last_name:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  middle_names:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone2:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  post_code:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  postal_address:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_actor.volunteer.default.yml

@@ -10,8 +10,6 @@ dependencies:
     - field.field.oc_actor.volunteer.field_osic_level
     - field.field.oc_actor.volunteer.field_skills
     - opencase_entities.oc_actor_type.volunteer
-  module:
-    - hide_revision_field
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
 bundle: volunteer
@@ -19,15 +17,7 @@ mode: default
 content:
   email:
     type: string_textfield
-    weight: -5
+    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_ethnic_o:
-    type: string_textfield
-    weight: 81
     region: content
     settings:
       size: 60
@@ -35,7 +25,7 @@ content:
     third_party_settings: {  }
   field_general_noes:
     type: string_textarea
-    weight: 5
+    weight: 10
     region: content
     settings:
       rows: 5
@@ -43,25 +33,19 @@ content:
     third_party_settings: {  }
   field_languages_spoken:
     type: options_select
-    weight: 2
+    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_nationalities:
-    type: options_select
-    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
   field_osic_level:
     type: options_select
-    weight: 3
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
   field_skills:
     type: string_textarea
-    weight: 4
+    weight: 9
     region: content
     settings:
       rows: 5
@@ -69,7 +53,7 @@ content:
     third_party_settings: {  }
   first_name:
     type: string_textfield
-    weight: -100
+    weight: 0
     region: content
     settings:
       size: 60
@@ -77,15 +61,7 @@ content:
     third_party_settings: {  }
   last_name:
     type: string_textfield
-    weight: -98
+    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  middle_names:
-    type: string_textfield
-    weight: -99
     region: content
     settings:
       size: 60
@@ -101,7 +77,7 @@ content:
     third_party_settings: {  }
   phone:
     type: string_textfield
-    weight: -4
+    weight: 3
     region: content
     settings:
       size: 60
@@ -109,7 +85,7 @@ content:
     third_party_settings: {  }
   phone2:
     type: string_textfield
-    weight: -3
+    weight: 4
     region: content
     settings:
       size: 60
@@ -117,7 +93,7 @@ content:
     third_party_settings: {  }
   post_code:
     type: string_textfield
-    weight: -1
+    weight: 6
     region: content
     settings:
       size: 60
@@ -125,34 +101,17 @@ content:
     third_party_settings: {  }
   postal_address:
     type: string_textarea
-    weight: -2
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
     weight: 5
     region: content
     settings:
-      match_operator: CONTAINS
+      rows: 5
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  field_ethnic_o: true
+  field_nationalities: true
+  middle_names: true
+  revision_log: true
   status: true
+  user_id: true
   user_login: true

config/optional/core.entity_form_display.oc_case.accommodation.default.yml

@@ -4,53 +4,25 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.accommodation.field_case_finance
-    - field.field.oc_case.accommodation.field_fee_calculation
-    - field.field.oc_case.accommodation.field_fee_or_equivalent_cost
     - field.field.oc_case.accommodation.field_outcome
     - field.field.oc_case.accommodation.field_type_of_acco
     - opencase_cases.oc_case_type.accommodation
   module:
     - file
-    - hide_revision_field
 id: oc_case.accommodation.default
 targetEntityType: oc_case
 bundle: accommodation
 mode: default
 content:
-  field_case_finance:
-    type: options_select
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 5
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_outcome:
-    type: options_select
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_type_of_acco:
     type: options_select
-    weight: 3
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   files:
     type: file_generic
-    weight: 2
+    weight: 3
     region: content
     settings:
       progress_indicator: throbber
@@ -73,20 +45,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 8
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
 hidden:
+  field_case_finance: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  field_outcome: true
   notes: true
+  revision_log: true
   status: true
   total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.asylum_support.default.yml

@@ -4,13 +4,12 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.asylum_support.field_case_finance
-    - field.field.oc_case.asylum_support.field_fee_calculation
-    - field.field.oc_case.asylum_support.field_fee_or_equivalent_cost
     - field.field.oc_case.asylum_support.field_outcome
     - field.field.oc_case.asylum_support.field_type_of_as
     - opencase_cases.oc_case_type.asylum_support
   module:
     - file
+    - hide_revision_field
 id: oc_case.asylum_support.default
 targetEntityType: oc_case
 bundle: asylum_support
@@ -22,19 +21,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 29
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 28
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_outcome:
     type: options_select
     weight: 30
@@ -67,7 +53,11 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.employability.default.yml

@@ -4,14 +4,13 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.employability.field_case_finance
-    - field.field.oc_case.employability.field_fee_calculation
-    - field.field.oc_case.employability.field_fee_or_equivalent_cost
     - field.field.oc_case.employability.field_gave_list_of_agencies
     - field.field.oc_case.employability.field_outcome
     - field.field.oc_case.employability.field_type_of_employability_help
     - opencase_cases.oc_case_type.employability
   module:
     - file
+    - hide_revision_field
 id: oc_case.employability.default
 targetEntityType: oc_case
 bundle: employability
@@ -23,19 +22,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 29
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_gave_list_of_agencies:
     type: boolean_checkbox
     weight: 27
@@ -75,7 +61,11 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.enquiry.default.yml

@@ -47,7 +47,9 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.health.default.yml

@@ -4,13 +4,12 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.health.field_case_finance
-    - field.field.oc_case.health.field_fee_calculation
-    - field.field.oc_case.health.field_fee_or_equivalent_cost
     - field.field.oc_case.health.field_outcome
     - field.field.oc_case.health.field_type_health
     - opencase_cases.oc_case_type.health
   module:
     - file
+    - hide_revision_field
 id: oc_case.health.default
 targetEntityType: oc_case
 bundle: health
@@ -22,19 +21,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 29
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 28
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_outcome:
     type: options_select
     weight: 30
@@ -67,7 +53,11 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.immigration.default.yml

@@ -4,14 +4,13 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.immigration.field_case_finance
-    - field.field.oc_case.immigration.field_fee_calculation
-    - field.field.oc_case.immigration.field_fee_or_equivalent_cost
     - field.field.oc_case.immigration.field_level
     - field.field.oc_case.immigration.field_outcome
     - field.field.oc_case.immigration.field_type_of_applicat
     - opencase_cases.oc_case_type.immigration
   module:
     - file
+    - hide_revision_field
 id: oc_case.immigration.default
 targetEntityType: oc_case
 bundle: immigration
@@ -23,19 +22,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 29
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_level:
     type: options_select
     weight: 26
@@ -74,7 +60,11 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml

@@ -38,7 +38,9 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case.volunteer_engagement.default.yml

@@ -0,0 +1,41 @@
+uuid: 7010aa94-15ca-4b06-a7b2-0fdac3ed3ea7
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_type.volunteer_engagement
+  module:
+    - file
+id: oc_case.volunteer_engagement.default
+targetEntityType: oc_case
+bundle: volunteer_engagement
+mode: default
+content:
+  files:
+    type: file_generic
+    weight: 1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  notes:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  oc_target: true
+  revision_log: true
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml

@@ -4,13 +4,12 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.welfare_rights.field_case_finance
-    - field.field.oc_case.welfare_rights.field_fee_calculation
-    - field.field.oc_case.welfare_rights.field_fee_or_equivalent_cost
     - field.field.oc_case.welfare_rights.field_outcome
     - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
     - opencase_cases.oc_case_type.welfare_rights
   module:
     - file
+    - hide_revision_field
 id: oc_case.welfare_rights.default
 targetEntityType: oc_case
 bundle: welfare_rights
@@ -22,19 +21,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_fee_calculation:
-    type: options_select
-    weight: 29
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_fee_or_equivalent_cost:
-    type: number
-    weight: 28
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
   field_outcome:
     type: options_select
     weight: 30
@@ -67,7 +53,11 @@ content:
       allow_user_settings: true
     third_party_settings: {  }
 hidden:
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
   oc_target: true
   status: true
+  total_fee: true
   user_id: true

config/optional/core.entity_form_display.oc_case_fee.fee.default.yml

@@ -11,24 +11,28 @@ mode: default
 content:
   amount:
     type: number
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  oc_case:
-    type: entity_reference_autocomplete
     weight: 0
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  oc_fee_category:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   name: true
-  oc_fee_category: true
+  oc_case: true
   revision_log: true
   status: true
   user_id: true

config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml

@@ -9,58 +9,21 @@ targetEntityType: oc_case_provision
 bundle: caseworker
 mode: default
 content:
-  oc_case:
-    type: entity_reference_autocomplete
-    weight: 0
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   oc_case_provider_role:
-    type: entity_reference_autocomplete
+    type: options_select
-    weight: 2
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  oc_provider:
-    type: entity_reference_autocomplete
     weight: 1
     region: content
-    settings:
+    settings: {  }
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-  revision_log:
+  oc_provider:
-    type: hide_revision_field_log_widget
+    type: options_select
-    weight: 80
+    weight: 0
     region: content
-    settings:
+    settings: {  }
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
 hidden:
   name: true
+  oc_case: true
+  revision_log: true
   status: true
+  user_id: true

config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml

@@ -0,0 +1,57 @@
+uuid: 9282eb8d-96fa-4c3a-a0ea-abbdc763efa0
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_equal_opps.oc_equal_opps.default
+targetEntityType: oc_equal_opps
+bundle: oc_equal_opps
+mode: default
+content:
+  access_needs:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  age:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  gender:
+    type: options_select
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  oc_actor:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  race_ethnicity:
+    type: options_select
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  sexuality:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  name: true

config/optional/core.entity_form_display.oc_event.piss_up.default.yml

@@ -1,34 +0,0 @@
-uuid: af8b76e1-d9c9-4e4b-8a00-0831b7822170
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_event.piss_up.field_test
-    - opencase_entities.oc_event_type.piss_up
-  module:
-    - datetime
-id: oc_event.piss_up.default
-targetEntityType: oc_event
-bundle: piss_up
-mode: default
-content:
-  field_test:
-    type: entity_reference_autocomplete
-    weight: 51
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  status: true

config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml

@@ -0,0 +1,48 @@
+uuid: b512b25f-0fab-4582-88ee-ce7184c6b6c6
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_event_type.volunteer_training_session
+  module:
+    - datetime
+id: oc_event.volunteer_training_session.default
+targetEntityType: oc_event
+bundle: volunteer_training_session
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  attendees:
+    type: entity_reference_autocomplete
+    weight: 3
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  status: true
+  user_id: true

config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml

@@ -0,0 +1,65 @@
+uuid: ac6da2f0-4de2-4e8d-baf6-f7229b42616f
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_organisation_type.partner_organisation
+  module:
+    - file
+id: oc_organisation.partner_organisation.default
+targetEntityType: oc_organisation
+bundle: partner_organisation
+mode: default
+content:
+  contact_name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  email:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  notes:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  website:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  billing_contact_name: true
+  billing_email: true
+  billing_phone: true
+  billing_post_code: true
+  billing_postal_address: true
+  contact_role: true
+  phone: true
+  post_code: true
+  postal_address: true
+  revision_log: true
+  status: true

config/optional/core.entity_form_display.user.user.default.yml

@@ -17,24 +17,41 @@ bundle: user
 mode: default
 content:
   account:
-    weight: -10
-    region: content
-  contact:
-    weight: 5
-    region: content
-  language:
     weight: 0
     region: content
-  timezone:
+    settings: {  }
-    weight: 6
+    third_party_settings: {  }
+  contact:
+    weight: 4
     region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_linked_opencase_actor:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  language:
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  timezone:
+    weight: 5
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   user_picture:
     type: image_image
-    weight: -1
+    weight: 2
     region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-hidden:
+hidden: {  }
-  field_linked_opencase_actor: true

config/optional/core.entity_view_display.node.article.default.yml

@@ -44,6 +44,8 @@ content:
     settings:
       image_link: ''
       image_style: large
+      image_loading:
+        attribute: lazy
     third_party_settings: {  }
     weight: -1
     region: content

config/optional/core.entity_view_display.node.article.search_result.yml

@@ -35,6 +35,8 @@ content:
     settings:
       image_link: content
       image_style: thumbnail
+      image_loading:
+        attribute: lazy
     third_party_settings: {  }
     weight: 0
     region: content

config/optional/core.entity_view_display.node.article.teaser.yml

@@ -35,6 +35,8 @@ content:
     settings:
       image_link: content
       image_style: medium
+      image_loading:
+        attribute: lazy
     third_party_settings: {  }
     weight: -1
     region: content
@@ -51,6 +53,5 @@ content:
     region: content
 hidden:
   comment: true
-  field_image: true
   field_tags: true
   search_api_excerpt: true

config/optional/core.entity_view_display.oc_activity.application.default.yml

@@ -5,19 +5,35 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.application
   module:
-    - user
+    - datetime
 id: oc_activity.application.default
 targetEntityType: oc_activity
 bundle: application
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 2
     region: content
   oc_provider:
     type: entity_reference_label
@@ -27,14 +43,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  oc_target:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
   time_taken:
     type: number_decimal
     label: above
@@ -44,16 +52,10 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 2
+    weight: 3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
     region: content
 hidden:
-  activity_date_time: true
+  oc_target: true
-  description: true
   search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.case_note.default.yml

@@ -5,19 +5,43 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.case_note
   module:
-    - user
+    - datetime
 id: oc_activity.case_note.default
 targetEntityType: oc_activity
 bundle: case_note
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
     region: content
   time_taken:
     type: number_decimal
@@ -28,18 +52,10 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: -3
+    weight: 3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
     region: content
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
   search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml

@@ -7,13 +7,29 @@ dependencies:
     - field.field.oc_activity.destitution_funds_provided.field_funds_for
     - opencase_entities.oc_activity_type.destitution_funds_provided
   module:
+    - datetime
     - options
-    - user
 id: oc_activity.destitution_funds_provided.default
 targetEntityType: oc_activity
 bundle: destitution_funds_provided
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
   field_amount:
     type: number_decimal
     label: above
@@ -23,14 +39,14 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 2
+    weight: 4
     region: content
   field_funds_for:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 3
     region: content
   name:
     type: string
@@ -38,7 +54,15 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
     region: content
   time_taken:
     type: number_decimal
@@ -49,18 +73,10 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: -3
+    weight: 5
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
     region: content
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
   search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.email.default.yml

@@ -0,0 +1,58 @@
+uuid: bcd68faf-74c4-457e-9fc3-6e2fb7a25c97
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.email
+  module:
+    - datetime
+id: oc_activity.email.default
+targetEntityType: oc_activity
+bundle: email
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.interview.default.yml

@@ -1,43 +1,47 @@
-uuid: f33b1e75-dcc3-4471-9637-0bda9d795804
+uuid: a696fdb4-5317-4bfa-ac92-c15b09c3a7d2
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
+    - opencase_entities.oc_activity_type.interview
-    - field.field.oc_activity.volunteer_training_session.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
   module:
     - datetime
-    - user
+id: oc_activity.interview.default
-id: oc_activity.volunteer_training_session.default
 targetEntityType: oc_activity
-bundle: volunteer_training_session
+bundle: interview
 mode: default
 content:
-  field_date_attended:
+  activity_date_time:
     type: datetime_default
     label: above
     settings:
       timezone_override: ''
       format_type: medium
     third_party_settings: {  }
-    weight: 1
-    region: content
-  field_type_of_session:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
     weight: 0
     region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
     region: content
   time_taken:
     type: number_decimal
@@ -48,18 +52,10 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: -3
+    weight: 3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
     region: content
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
   oc_target: true
   search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.lete.default.yml

@@ -0,0 +1,61 @@
+uuid: 46f32ceb-da51-40ce-adba-1f3e4bd206ec
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.lete
+  module:
+    - datetime
+id: oc_activity.lete.default
+targetEntityType: oc_activity
+bundle: lete
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  time_taken:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.phone_call.default.yml

@@ -6,7 +6,6 @@ dependencies:
     - opencase_entities.oc_activity_type.phone_call
   module:
     - datetime
-    - user
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
@@ -21,13 +20,20 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 4
+    weight: 3
     region: content
   oc_provider:
     type: entity_reference_label
@@ -45,24 +51,8 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
 hidden:
-  description: true
   search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.research.default.yml

@@ -0,0 +1,61 @@
+uuid: 5277f0e8-d0c5-4faf-8978-f0c6d7cc0f5b
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  time_taken:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  oc_target: true
+  search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_activity.supervision.default.yml

@@ -0,0 +1,58 @@
+uuid: bc3147a1-d263-4fb3-8059-4fe0dc180df9
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true

config/optional/core.entity_view_display.oc_actor.client.default.yml

@@ -17,31 +17,37 @@ dependencies:
     - field.field.oc_actor.client.field_marital_
     - field.field.oc_actor.client.field_nationalities
     - field.field.oc_actor.client.field_referred_by
+    - field.field.oc_actor.client.field_sex
+    - field.field.oc_actor.client.field_status
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
     - file
     - options
-    - user
 id: oc_actor.client.default
 targetEntityType: oc_actor
 bundle: client
 mode: default
 content:
+  cases:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 19
+    region: content
   email:
     type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -5
+    weight: 0
     region: content
   field_asylum_status:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 8
     region: content
   field_client_field_1:
     type: string
@@ -57,7 +63,7 @@ content:
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    weight: 12
+    weight: 17
     region: content
   field_date_of_birth:
     type: datetime_default
@@ -66,7 +72,7 @@ content:
       timezone_override: ''
       format_type: short
     third_party_settings: {  }
-    weight: 0
+    weight: 5
     region: content
   field_dependants:
     type: string
@@ -74,7 +80,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 9
+    weight: 14
     region: content
   field_disability:
     type: string
@@ -82,7 +88,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 7
+    weight: 12
     region: content
   field_ethnic_o:
     type: string
@@ -90,56 +96,56 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 4
+    weight: 9
     region: content
   field_gender_identified_with:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 6
     region: content
   field_general_noes:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 13
+    weight: 18
     region: content
   field_how_heard:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 10
+    weight: 15
     region: content
   field_income:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 8
+    weight: 13
     region: content
   field_languages_spoken:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 6
+    weight: 11
     region: content
   field_marital_:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 2
+    weight: 7
     region: content
   field_nationalities:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 10
     region: content
   field_referred_by:
     type: string
@@ -147,7 +153,15 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 11
+    weight: 16
+    region: content
+  field_status:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 20
     region: content
   name:
     type: string
@@ -163,7 +177,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -4
+    weight: 1
     region: content
   phone2:
     type: string
@@ -171,7 +185,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
     region: content
   post_code:
     type: string
@@ -179,14 +193,14 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -1
+    weight: 4
     region: content
   postal_address:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: -2
+    weight: 3
     region: content
 hidden:
   field_sex: true
@@ -194,3 +208,6 @@ hidden:
   last_name: true
   middle_names: true
   search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true

config/optional/core.entity_view_display.oc_actor.staff_member.default.yml

@@ -0,0 +1,58 @@
+uuid: 67d86fb5-981d-4e62-866b-16921b71fa17
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_actor_type.staff_member
+id: oc_actor.staff_member.default
+targetEntityType: oc_actor
+bundle: staff_member
+mode: default
+content:
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  phone:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  phone2:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  post_code:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  postal_address:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+hidden:
+  first_name: true
+  last_name: true
+  middle_names: true
+  search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true

config/optional/core.entity_view_display.oc_actor.volunteer.default.yml

@@ -23,43 +23,28 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -5
+    weight: 0
-    region: content
-  field_ethnic_o:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 6
     region: content
   field_general_noes:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 8
     region: content
   field_languages_spoken:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 2
+    weight: 5
-    region: content
-  field_nationalities:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
     region: content
   field_osic_level:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 6
     region: content
   field_sdfdsfds:
     type: text_default
@@ -73,7 +58,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 4
+    weight: 7
     region: content
   name:
     type: string
@@ -89,7 +74,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -4
+    weight: 1
     region: content
   phone2:
     type: string
@@ -97,7 +82,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
     region: content
   post_code:
     type: string
@@ -105,17 +90,22 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -1
+    weight: 4
     region: content
   postal_address:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: -2
+    weight: 3
     region: content
 hidden:
+  field_ethnic_o: true
+  field_nationalities: true
   first_name: true
   last_name: true
   middle_names: true
   search_api_excerpt: true
+  status: true
+  total_cases: true
+  user_id: true

config/optional/core.entity_view_display.oc_case.accommodation.default.yml

@@ -4,40 +4,33 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.accommodation.field_case_finance
-    - field.field.oc_case.accommodation.field_fee_calculation
-    - field.field.oc_case.accommodation.field_fee_or_equivalent_cost
     - field.field.oc_case.accommodation.field_outcome
     - field.field.oc_case.accommodation.field_type_of_acco
     - opencase_cases.oc_case_type.accommodation
   module:
     - file
     - options
-    - user
 id: oc_case.accommodation.default
 targetEntityType: oc_case
 bundle: accommodation
 mode: default
 content:
-  field_case_finance:
+  caseworkers:
-    type: list_default
-    label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 2
+    weight: 1
     region: content
-  field_outcome:
+  fees:
-    type: list_default
-    label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 4
+    weight: 3
     region: content
   field_type_of_acco:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   files:
     type: file_default
@@ -45,7 +38,7 @@ content:
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    weight: 6
+    weight: 5
     region: content
   oc_target:
     type: entity_reference_label
@@ -64,21 +57,17 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 3
+    weight: 4
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
     region: content
 hidden:
   changed: true
   created: true
+  field_case_finance: true
   field_fee_calculation: true
   field_fee_or_equivalent_cost: true
+  field_outcome: true
   name: true
   notes: true
   search_api_excerpt: true
   status: true
+  user_id: true

config/optional/core.entity_view_display.oc_case.asylum_support.default.yml

@@ -4,8 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.asylum_support.field_case_finance
-    - field.field.oc_case.asylum_support.field_fee_calculation
-    - field.field.oc_case.asylum_support.field_fee_or_equivalent_cost
     - field.field.oc_case.asylum_support.field_outcome
     - field.field.oc_case.asylum_support.field_type_of_as
     - opencase_cases.oc_case_type.asylum_support
@@ -25,24 +23,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_fee_calculation:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_fee_or_equivalent_cost:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
   field_outcome:
     type: list_default
     label: above
@@ -75,6 +55,11 @@ content:
 hidden:
   changed: true
   created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   total_fee: true

config/optional/core.entity_view_display.oc_case.employability.default.yml

@@ -4,8 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.employability.field_case_finance
-    - field.field.oc_case.employability.field_fee_calculation
-    - field.field.oc_case.employability.field_fee_or_equivalent_cost
     - field.field.oc_case.employability.field_gave_list_of_agencies
     - field.field.oc_case.employability.field_outcome
     - field.field.oc_case.employability.field_type_of_employability_help
@@ -26,24 +24,6 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  field_fee_calculation:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_fee_or_equivalent_cost:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
   field_gave_list_of_agencies:
     type: boolean
     label: above
@@ -86,6 +66,11 @@ content:
 hidden:
   changed: true
   created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   total_fee: true

config/optional/core.entity_view_display.oc_case.health.default.yml

@@ -4,8 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.health.field_case_finance
-    - field.field.oc_case.health.field_fee_calculation
-    - field.field.oc_case.health.field_fee_or_equivalent_cost
     - field.field.oc_case.health.field_outcome
     - field.field.oc_case.health.field_type_health
     - opencase_cases.oc_case_type.health
@@ -25,24 +23,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_fee_calculation:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_fee_or_equivalent_cost:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
   field_outcome:
     type: list_default
     label: above
@@ -75,6 +55,11 @@ content:
 hidden:
   changed: true
   created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   total_fee: true

config/optional/core.entity_view_display.oc_case.immigration.default.yml

@@ -4,8 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.immigration.field_case_finance
-    - field.field.oc_case.immigration.field_fee_calculation
-    - field.field.oc_case.immigration.field_fee_or_equivalent_cost
     - field.field.oc_case.immigration.field_level
     - field.field.oc_case.immigration.field_outcome
     - field.field.oc_case.immigration.field_type_of_applicat
@@ -26,24 +24,6 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  field_fee_calculation:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_fee_or_equivalent_cost:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
   field_level:
     type: list_default
     label: above
@@ -83,6 +63,11 @@ content:
 hidden:
   changed: true
   created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   total_fee: true

config/optional/core.entity_view_display.oc_case.volunteer_engagement.default.yml

@@ -0,0 +1,59 @@
+uuid: be83d248-b875-4cea-b0c9-dc28c4672581
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_type.volunteer_engagement
+  module:
+    - file
+id: oc_case.volunteer_engagement.default
+targetEntityType: oc_case
+bundle: volunteer_engagement
+mode: default
+content:
+  fees:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  files:
+    type: file_default
+    label: above
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  notes:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  total_fee:
+    type: number_decimal
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 4
+    region: content
+hidden:
+  changed: true
+  created: true
+  name: true
+  search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml

@@ -4,8 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.oc_case.welfare_rights.field_case_finance
-    - field.field.oc_case.welfare_rights.field_fee_calculation
-    - field.field.oc_case.welfare_rights.field_fee_or_equivalent_cost
     - field.field.oc_case.welfare_rights.field_outcome
     - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
     - opencase_cases.oc_case_type.welfare_rights
@@ -25,24 +23,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_fee_calculation:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_fee_or_equivalent_cost:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
   field_outcome:
     type: list_default
     label: above
@@ -75,6 +55,11 @@ content:
 hidden:
   changed: true
   created: true
+  field_fee_calculation: true
+  field_fee_or_equivalent_cost: true
+  name: true
   notes: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   total_fee: true

config/optional/core.entity_view_display.oc_case_fee.fee.default.yml

@@ -29,6 +29,7 @@ content:
     weight: 0
     region: content
 hidden:
+  description: true
   name: true
   oc_fee_category: true
   search_api_excerpt: true

config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml

@@ -0,0 +1,59 @@
+uuid: a943f9cf-97d5-47e4-99dd-bef53045f497
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_equal_opps.oc_equal_opps.default
+targetEntityType: oc_equal_opps
+bundle: oc_equal_opps
+mode: default
+content:
+  access_needs:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  age:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  gender:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_actor:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  race_ethnicity:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  sexuality:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 5
+    region: content
+hidden:
+  name: true
+  search_api_excerpt: true

config/optional/core.entity_view_display.oc_event.piss_up.default.yml

@@ -1,25 +0,0 @@
-uuid: d4b5d087-cb11-45a3-aeb7-9a7657f25e07
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_event.piss_up.field_test
-    - opencase_entities.oc_event_type.piss_up
-  module:
-    - datetime
-id: oc_event.piss_up.default
-targetEntityType: oc_event
-bundle: piss_up
-mode: default
-content:
-  field_test:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 51
-    region: content
-hidden:
-  name: true
-  search_api_excerpt: true

config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml

@@ -0,0 +1,42 @@
+uuid: 2018da40-3ab6-436f-8f34-8544ac73fb29
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_event_type.volunteer_training_session
+  module:
+    - datetime
+id: oc_event.volunteer_training_session.default
+targetEntityType: oc_event
+bundle: volunteer_training_session
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  attendees:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  name: true
+  search_api_excerpt: true
+  status: true
+  user_id: true

config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml

@@ -0,0 +1,57 @@
+uuid: 96b9f3c8-1433-4915-9656-4547eb1bc899
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_organisation_type.partner_organisation
+  module:
+    - file
+id: oc_organisation.partner_organisation.default
+targetEntityType: oc_organisation
+bundle: partner_organisation
+mode: default
+content:
+  contact_name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  email:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  notes:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  website:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  billing_contact_name: true
+  billing_email: true
+  billing_phone: true
+  billing_post_code: true
+  billing_postal_address: true
+  contact_role: true
+  name: true
+  phone: true
+  post_code: true
+  postal_address: true
+  search_api_excerpt: true
+  status: true

config/optional/core.entity_view_display.user.user.compact.yml

@@ -23,6 +23,8 @@ content:
     settings:
       image_link: content
       image_style: thumbnail
+      image_loading:
+        attribute: lazy
     third_party_settings: {  }
     weight: 0
     region: content

config/optional/core.entity_view_display.user.user.default.yml

@@ -16,8 +16,18 @@ targetEntityType: user
 bundle: user
 mode: default
 content:
+  field_linked_opencase_actor:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
   member_for:
-    weight: 5
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
     region: content
   user_picture:
     type: image
@@ -25,9 +35,10 @@ content:
     settings:
       image_link: content
       image_style: thumbnail
+      image_loading:
+        attribute: lazy
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
-  field_linked_opencase_actor: true
   search_api_excerpt: true

config/optional/core.extension.yml

@@ -18,6 +18,7 @@ module:
   csv_serialization: 0
   ctools: 0
   ctools_entity_mask: 0
+  ctools_views: 0
   date_popup: 0
   datetime: 0
   datetime_range: 0
@@ -45,6 +46,7 @@ module:
   link: 0
   menu_link_content: 0
   menu_ui: 0
+  mysql: 0
   node: 0
   opencase: 0
   opencase_cases: 0
@@ -80,6 +82,7 @@ module:
   views_aggregator: 0
   views_aggregator_more_functions: 0
   views_autosubmit: 0
+  views_contextual_filters_or: 0
   views_data_export: 0
   views_summarize: 0
   views_ui: 0

config/optional/core.menu.static_menu_link_overrides.yml

@@ -7,3 +7,27 @@ definitions:
     weight: 0
     expanded: false
     enabled: true
+  opencase__reporting:
+    weight: -48
+    menu_name: opencase
+    parent: ''
+    enabled: true
+    expanded: false
+  opencase__see_all:
+    weight: -50
+    menu_name: opencase
+    parent: ''
+    expanded: false
+    enabled: true
+  opencase__opencase_add_new_things_menu:
+    weight: -49
+    menu_name: opencase
+    parent: ''
+    expanded: false
+    enabled: true
+  opencase__opencase_admin_menu:
+    weight: -47
+    menu_name: opencase
+    parent: ''
+    expanded: false
+    enabled: true

config/optional/editor.editor.basic_html.yml

@@ -43,13 +43,15 @@ settings:
           items:
             - Source
   plugins:
+    language:
+      language_list: un
     stylescombo:
       styles: ''
 image_upload:
-  status: true
+  status: false
   scheme: public
   directory: inline-images
   max_size: ''
   max_dimensions:
-    width: 0
+    width: null
-    height: 0
+    height: null

config/optional/entity_extra_field.extra_field.oc_actor.client.cases.yml

@@ -0,0 +1,44 @@
+uuid: c5f2c484-212c-4b18-ad10-60cbca03029f
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase
+    - user.role.authenticated
+  module:
+    - opencase_cases
+    - user
+id: oc_actor.client.cases
+label: Cases
+display_label: true
+name: cases
+description: ''
+base_entity_type_id: oc_actor
+base_bundle_type_id: client
+field_type_id: views
+field_type_config:
+  view_name: cases
+  display: block_1
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_actor':
+    id: 'entity_bundle:oc_actor'
+    negate: false
+    context_mapping:
+      oc_actor: entity_extra_field.target_entity
+    bundles: {  }
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/entity_extra_field.extra_field.oc_actor.volunteer.cases_this_person_provides.yml

@@ -0,0 +1,48 @@
+uuid: 65c3dca3-5b99-4357-b781-bbe0e21eea6b
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.administrator
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
+  module:
+    - opencase_cases
+    - opencase_entities
+    - user
+id: oc_actor.volunteer.cases_this_person_provides
+label: Cases
+display_label: true
+name: cases_this_person_provides
+description: 'Cases that this person is providing'
+base_entity_type_id: oc_actor
+base_bundle_type_id: volunteer
+field_type_id: views
+field_type_config:
+  view_name: cases_by_provider
+  display: page_2
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_actor':
+    id: 'entity_bundle:oc_actor'
+    negate: false
+    context_mapping:
+      oc_actor: entity_extra_field.target_entity
+    bundles:
+      volunteer: volunteer
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/entity_extra_field.extra_field.oc_actor.volunteer.cases_with_this_person_as_target.yml

@@ -0,0 +1,45 @@
+uuid: f64263d6-4112-4b8b-a862-427adec4b05e
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase
+    - user.role.authenticated
+  module:
+    - opencase_cases
+    - user
+id: oc_actor.volunteer.cases_with_this_person_as_target
+label: 'Cases with this person as target'
+display_label: false
+name: cases_with_this_person_as_target
+description: ''
+base_entity_type_id: oc_actor
+base_bundle_type_id: volunteer
+field_type_id: views
+field_type_config:
+  view_name: cases
+  display: block_1
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_actor':
+    id: 'entity_bundle:oc_actor'
+    negate: false
+    context_mapping:
+      oc_actor: entity_extra_field.target_entity
+    bundles:
+      volunteer: volunteer
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml

@@ -0,0 +1,53 @@
+uuid: 77781cfa-1449-4d3b-8e87-28b1eb760e14
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_provision_type.caseworker
+    - user.role.authenticated
+  module:
+    - opencase_cases
+    - user
+id: oc_case.accommodation.caseworkers
+label: Caseworkers
+display_label: true
+name: caseworkers
+description: ''
+base_entity_type_id: oc_case
+base_bundle_type_id: accommodation
+field_type_id: views
+field_type_config:
+  view_name: case_provisions
+  display: block_2
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_case':
+    id: 'entity_bundle:oc_case'
+    negate: false
+    context_mapping:
+      oc_case: entity_extra_field.target_entity
+    bundles:
+      accommodation: accommodation
+      asylum_support: asylum_support
+      employability: employability
+      enquiry: enquiry
+      health: health
+      immigration: immigration
+      pro_bono_immigration_service: pro_bono_immigration_service
+      volunteer_engagement: volunteer_engagement
+      welfare_rights: welfare_rights
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/entity_extra_field.extra_field.oc_case.accommodation.fees.yml

@@ -0,0 +1,47 @@
+uuid: 42039090-fd08-4c7f-b24f-99f440a13916
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_cases
+id: oc_case.accommodation.fees
+label: Fees
+display_label: true
+name: fees
+description: ''
+base_entity_type_id: oc_case
+base_bundle_type_id: accommodation
+field_type_id: views
+field_type_config:
+  view_name: case_fees
+  display: page_1
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_case':
+    id: 'entity_bundle:oc_case'
+    negate: false
+    context_mapping:
+      oc_case: entity_extra_field.target_entity
+    bundles:
+      accommodation: accommodation
+      asylum_support: asylum_support
+      employability: employability
+      enquiry: enquiry
+      health: health
+      immigration: immigration
+      welfare_rights: welfare_rights
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/entity_extra_field.extra_field.oc_case.volunteer_engagement.fees.yml

@@ -0,0 +1,53 @@
+uuid: b5603345-fe45-4635-926c-8d0e49f85fba
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_provision_type.caseworker
+    - user.role.authenticated
+  module:
+    - opencase_cases
+    - user
+id: oc_case.volunteer_engagement.fees
+label: Caseworkers
+display_label: true
+name: fees
+description: ''
+base_entity_type_id: oc_case
+base_bundle_type_id: volunteer_engagement
+field_type_id: views
+field_type_config:
+  view_name: case_provisions
+  display: block_2
+  arguments: ''
+field_type_condition:
+  'entity_bundle:oc_case':
+    id: 'entity_bundle:oc_case'
+    negate: false
+    context_mapping:
+      oc_case: entity_extra_field.target_entity
+    bundles:
+      accommodation: accommodation
+      asylum_support: asylum_support
+      employability: employability
+      enquiry: enquiry
+      health: health
+      immigration: immigration
+      pro_bono_immigration_service: pro_bono_immigration_service
+      volunteer_engagement: volunteer_engagement
+      welfare_rights: welfare_rights
+  route:
+    id: route
+    negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
+field_conditions_all_pass: false
+display:
+  type: view

config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml

@@ -1,21 +0,0 @@
-uuid: e3c9dacd-b1d3-4394-8291-87dcbdb483b8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_date_attended
-    - opencase_entities.oc_activity_type.volunteer_training_session
-  module:
-    - datetime
-id: oc_activity.volunteer_training_session.field_date_attended
-field_name: field_date_attended
-entity_type: oc_activity
-bundle: volunteer_training_session
-label: 'Date attended'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime

config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml

@@ -1,19 +0,0 @@
-uuid: 5ee021de-3208-4be0-8279-0ffad8042602
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
-id: oc_activity.volunteer_training_session.field_type_of_session
-field_name: field_type_of_session
-entity_type: oc_activity
-bundle: volunteer_training_session
-label: 'Type of session'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string

config/optional/field.field.oc_actor.client.field_status.yml

@@ -0,0 +1,21 @@
+uuid: 00fcbe97-883d-496c-b22e-fa9bce157a1d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_status
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_status
+field_name: field_status
+entity_type: oc_actor
+bundle: client
+label: Status
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings: {  }
+field_type: entity_reference

config/optional/field.field.oc_case.accommodation.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: 96f7ac9c-5cbc-44f3-b414-16f1013de805
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.accommodation
-  module:
-    - options
-id: oc_case.accommodation.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: accommodation
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.accommodation.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: f02e6290-9a20-4f32-b56b-1ca92d116e08
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.accommodation
-id: oc_case.accommodation.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: accommodation
-label: 'Fee or equivalent cost'
-description: 'If the case is pro bono, state what it would have cost if it were fee paying.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_case.asylum_support.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: 3e387db9-252d-4ee4-af7a-3fc98016c231
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.asylum_support
-  module:
-    - options
-id: oc_case.asylum_support.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: asylum_support
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.asylum_support.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: 0377978c-7e7f-4bfd-a55c-7fccf992022d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.asylum_support
-id: oc_case.asylum_support.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: asylum_support
-label: 'Fee or equivalent cost'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_case.employability.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: 7cd8962e-ce35-4d4d-807b-92e202f3e011
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.employability
-  module:
-    - options
-id: oc_case.employability.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: employability
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.employability.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: aa3063fb-4d0f-4ebd-9293-fbd1d52fe33c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.employability
-id: oc_case.employability.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: employability
-label: 'Fee or equivalent cost'
-description: 'If the case is pro bono, state what it would have cost if it were fee paying.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_case.health.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: 366fddf9-2fc2-4559-af49-bb1bedb0fd32
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.health
-  module:
-    - options
-id: oc_case.health.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: health
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.health.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: 9d1c9cf8-5e49-4fa4-b81a-d3a5dd7d9698
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.health
-id: oc_case.health.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: health
-label: 'Fee or equivalent cost'
-description: 'If the case is pro bono, state what it would have cost if it were fee paying.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_case.immigration.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: 87c8d4f1-963a-4150-952f-676ce09137a7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.immigration
-  module:
-    - options
-id: oc_case.immigration.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: immigration
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.immigration.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: 4e82ad9f-4e8a-439d-8bbd-17e497bd9e01
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.immigration
-id: oc_case.immigration.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: immigration
-label: 'Fee or equivalent cost'
-description: 'If the case is pro bono, state what it would have cost if it were fee paying.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_case.welfare_rights.field_fee_calculation.yml

@@ -1,21 +0,0 @@
-uuid: f5a43306-3564-47ea-8b0d-fa8c9e18c16d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_calculation
-    - opencase_cases.oc_case_type.welfare_rights
-  module:
-    - options
-id: oc_case.welfare_rights.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-bundle: welfare_rights
-label: 'Fee calculation'
-description: 'If it is per hour, it will be calculated according to the sum of time spent on all the activities logged on the case.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string

config/optional/field.field.oc_case.welfare_rights.field_fee_or_equivalent_cost.yml

@@ -1,23 +0,0 @@
-uuid: f38fe7ef-bb7c-41af-8dbe-23ba8d8b199c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_fee_or_equivalent_cost
-    - opencase_cases.oc_case_type.welfare_rights
-id: oc_case.welfare_rights.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-bundle: welfare_rights
-label: 'Fee or equivalent cost'
-description: 'If the case is pro bono, state what it would have cost if it were fee paying.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal

config/optional/field.field.oc_event.piss_up.field_test.yml

@@ -1,21 +0,0 @@
-uuid: aef69a74-1ce8-4730-ae74-00508301ce5c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_event.field_test
-    - opencase_entities.oc_event_type.piss_up
-id: oc_event.piss_up.field_test
-field_name: field_test
-entity_type: oc_event
-bundle: piss_up
-label: test
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:oc_actor'
-  handler_settings: {  }
-field_type: entity_reference

config/optional/field.storage.oc_activity.field_date_attended.yml

@@ -1,20 +0,0 @@
-uuid: a61bfa28-fc31-4bf7-ac3c-871192b9d57e
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - opencase_entities
-id: oc_activity.field_date_attended
-field_name: field_date_attended
-entity_type: oc_activity
-type: datetime
-settings:
-  datetime_type: date
-module: datetime
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/optional/field.storage.oc_activity.field_type_of_session.yml

@@ -1,21 +0,0 @@
-uuid: 2667af61-41f7-4d8b-a154-68ce7514f559
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: oc_activity.field_type_of_session
-field_name: field_type_of_session
-entity_type: oc_activity
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/optional/field.storage.oc_actor.field_status.yml

@@ -1,18 +1,19 @@
-uuid: 9f37ed7d-87ee-4d6c-a4a2-f69077b51db0
+uuid: cde29136-624d-46a0-8199-820f26cd23fd
 langcode: en
 status: true
 dependencies:
   module:
     - opencase_entities
-id: oc_event.field_test
+    - taxonomy
-field_name: field_test
+id: oc_actor.field_status
-entity_type: oc_event
+field_name: field_status
+entity_type: oc_actor
 type: entity_reference
 settings:
-  target_type: oc_actor
+  target_type: taxonomy_term
 module: core
 locked: false
-cardinality: -1
+cardinality: 1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

config/optional/field.storage.oc_case.field_fee_calculation.yml

@@ -1,27 +0,0 @@
-uuid: aaf7cf91-c015-4468-9166-849311753ef1
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-    - options
-id: oc_case.field_fee_calculation
-field_name: field_fee_calculation
-entity_type: oc_case
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'Complete case'
-      label: 'Complete case'
-    -
-      value: 'Per hour'
-      label: 'Per hour'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml

@@ -1,20 +0,0 @@
-uuid: 35a6a6f4-9dbe-40ed-9a56-927ffda26e15
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: oc_case.field_fee_or_equivalent_cost
-field_name: field_fee_or_equivalent_cost
-entity_type: oc_case
-type: decimal
-settings:
-  precision: 10
-  scale: 2
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

config/optional/opencase_entities.oc_activity_type.telephone_call.yml

@@ -1,6 +0,0 @@
-uuid: fde52f28-d60a-46ef-9cf9-e924bd852893
-langcode: en
-status: true
-dependencies: {  }
-id: telephone_call
-label: 'Telephone call'

config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml

@@ -1,6 +0,0 @@
-uuid: 578260fa-04c2-4965-bc38-057f5669524e
-langcode: en
-status: true
-dependencies: {  }
-id: volunteer_training_session
-label: 'Volunteer training attended'

config/optional/opencase_entities.oc_event_type.piss_up.yml

@@ -1,6 +0,0 @@
-uuid: 114bb324-9157-430e-9d69-a7ae31a0cbad
-langcode: en
-status: true
-dependencies: {  }
-id: piss_up
-label: Piss-up

config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml

@@ -0,0 +1,6 @@
+uuid: 23b76c7c-1cee-4bcf-ba4b-97696774c574
+langcode: en
+status: true
+dependencies: {  }
+id: volunteer_training_session
+label: 'Volunteer training session'

config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml

@@ -3,4 +3,4 @@ langcode: en
 status: true
 dependencies: {  }
 id: partner_organisation
-label: 'Partner Organisation'
+label: 'Partner organisation'