Merge branch 'master' of ssh://git.autonomic.zone:2222/autonomic-cooperative/opencase

config/optional/block.block.addactivity.yml

@@ -0,0 +1,25 @@
+uuid: 036ff73a-049d-4979-abf0-95b1a9d1b830
+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_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.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,14 +4,22 @@ 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
+    weight: 5
     region: content
     settings:
       rows: 5
@@ -19,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 2
+    weight: 3
     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
@@ -37,7 +45,7 @@ content:
     third_party_settings: {  }
   oc_target:
     type: entity_reference_autocomplete
-    weight: 0
+    weight: 1
     region: content
     settings:
       match_operator: CONTAINS
@@ -45,25 +53,14 @@ content:
       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
+    weight: 4
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
+  revision_log: true
   status: true
+  user_id: true

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

@@ -4,41 +4,63 @@ 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: 5
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 4
     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: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      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
+  revision_log: true
-  description: true
-  oc_provider: true
-  oc_target: true
   status: true
+  user_id: true

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

@@ -6,54 +6,70 @@ 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: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_amount:
     type: number
-    weight: 28
+    weight: 5
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_funds_for:
     type: options_select
-    weight: 27
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 3
     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:
+  oc_target:
-    type: number
+    type: entity_reference_autocomplete
-    weight: -3
+    weight: 1
     region: content
     settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
-  activity_date_time: true
+  revision_log: true
-  description: true
-  oc_provider: true
-  oc_target: true
   status: true
+  time_taken: true
+  user_id: true

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

@@ -0,0 +1,60 @@
+uuid: c9168804-754e-4c9c-872e-34d340c0db2a
+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
+    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_activity.interview.default.yml

@@ -0,0 +1,60 @@
+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: 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_activity.lete.default.yml

@@ -0,0 +1,60 @@
+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: 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_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: 3
     region: content
     settings:
       size: 60
@@ -46,25 +53,8 @@ content:
       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
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  description: true
+  revision_log: true
   status: true
+  time_taken: true
+  user_id: true

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

@@ -0,0 +1,60 @@
+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: 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_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_activity.volunteer_training_session.default.yml

@@ -1,62 +0,0 @@
-uuid: 13b48008-63b7-4485-babe-9b72256f976a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
-    - 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
-targetEntityType: oc_activity
-bundle: volunteer_training_session
-mode: default
-content:
-  field_date_attended:
-    type: datetime_default
-    weight: 27
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_type_of_session:
-    type: string_textfield
-    weight: 26
-    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
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  status: true

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_provision.caseworker.default.yml

@@ -3,12 +3,25 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_case_provision.caseworker.field_test
     - opencase_cases.oc_case_provision_type.caseworker
+  module:
+    - hide_revision_field
 id: oc_case_provision.caseworker.default
 targetEntityType: oc_case_provision
 bundle: caseworker
 mode: default
 content:
+  field_test:
+    type: entity_reference_autocomplete
+    weight: 81
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   oc_case:
     type: entity_reference_autocomplete
     weight: 0

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.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: 5
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 4
     region: content
   oc_provider:
     type: entity_reference_label
@@ -25,7 +41,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   oc_target:
     type: entity_reference_label
@@ -33,7 +49,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
   time_taken:
     type: number_decimal
@@ -44,16 +60,9 @@ 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
-  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,51 @@ 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: 5
+    region: content
   name:
     type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 4
+    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
   time_taken:
     type: number_decimal
@@ -28,18 +60,9 @@ 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: 5
     region: content
   field_funds_for:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 4
     region: content
   name:
     type: string
@@ -38,29 +54,26 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
-    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: 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:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
   search_api_excerpt: true
+  status: true
+  time_taken: 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: 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_activity.interview.default.yml

@@ -0,0 +1,58 @@
+uuid: a696fdb4-5317-4bfa-ac92-c15b09c3a7d2
+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
+    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_activity.lete.default.yml

@@ -0,0 +1,58 @@
+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: 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_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,58 @@
+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: 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_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_activity.volunteer_training_session.default.yml

@@ -1,65 +0,0 @@
-uuid: f33b1e75-dcc3-4471-9637-0bda9d795804
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
-    - 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.volunteer_training_session.default
-targetEntityType: oc_activity
-bundle: volunteer_training_session
-mode: default
-content:
-  field_date_attended:
-    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
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: -3
-    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: 2
-    region: content
-hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  search_api_excerpt: true

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

@@ -17,31 +17,36 @@ 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
     - 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 +62,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 +71,7 @@ content:
       timezone_override: ''
       format_type: short
     third_party_settings: {  }
-    weight: 0
+    weight: 5
     region: content
   field_dependants:
     type: string
@@ -74,7 +79,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 9
+    weight: 14
     region: content
   field_disability:
     type: string
@@ -82,7 +87,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 7
+    weight: 12
     region: content
   field_ethnic_o:
     type: string
@@ -90,56 +95,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 +152,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 11
+    weight: 16
     region: content
   name:
     type: string
@@ -163,7 +168,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -4
+    weight: 1
     region: content
   phone2:
     type: string
@@ -171,7 +176,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -3
+    weight: 2
     region: content
   post_code:
     type: string
@@ -179,14 +184,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 +199,5 @@ hidden:
   last_name: true
   middle_names: true
   search_api_excerpt: true
+  status: 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_provision.caseworker.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_case_provision.caseworker.field_test
     - opencase_cases.oc_case_provision_type.caseworker
   module:
     - user
@@ -11,6 +12,14 @@ targetEntityType: oc_case_provision
 bundle: caseworker
 mode: default
 content:
+  field_test:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 4
+    region: content
   oc_case_provider_role:
     type: entity_reference_label
     label: above

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.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
@@ -26,8 +36,7 @@ content:
       image_link: content
       image_style: thumbnail
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
-  field_linked_opencase_actor: true
   search_api_excerpt: true

config/optional/core.extension.yml

@@ -81,6 +81,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_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/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_case_provision.caseworker.field_test.yml

@@ -0,0 +1,31 @@
+uuid: 561fe652-6e6b-401a-a5d7-eef6402f6d07
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case_provision.field_test
+    - opencase_cases.oc_case_provision_type.caseworker
+    - opencase_entities.oc_actor_type.staff_member
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_case_provision.caseworker.field_test
+field_name: field_test
+entity_type: oc_case_provision
+bundle: caseworker
+label: test
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:oc_actor'
+  handler_settings:
+    target_bundles:
+      staff_member: staff_member
+      volunteer: volunteer
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: staff_member
+field_type: entity_reference

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_case_provision.field_test.yml

@@ -1,18 +1,19 @@
-uuid: 9f37ed7d-87ee-4d6c-a4a2-f69077b51db0
+uuid: f90d1b9f-ee8a-4f79-ae7d-fafd4ec10cea
 langcode: en
 status: true
 dependencies:
   module:
+    - opencase_cases
     - opencase_entities
-id: oc_event.field_test
+id: oc_case_provision.field_test
 field_name: field_test
-entity_type: oc_event
+entity_type: oc_case_provision
 type: entity_reference
 settings:
   target_type: oc_actor
 module: core
 locked: false
-cardinality: -1
+cardinality: 1
 translatable: true
 indexes: {  }
 persist_with_no_fields: 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'

config/optional/system.performance.yml

@@ -4,7 +4,7 @@ cache:
   page:
     max_age: 0
 css:
-  preprocess: true
+  preprocess: false
   gzip: true
 fast_404:
   enabled: true
@@ -12,6 +12,6 @@ fast_404:
   exclude_paths: '/\/(?:styles|imagecache)\//'
   html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
 js:
-  preprocess: true
+  preprocess: false
   gzip: true
 stale_file_threshold: 2592000

config/optional/system.site.yml

@@ -8,7 +8,7 @@ slogan: ''
 page:
   403: /user/login
   404: ''
-  front: /node
+  front: /opencase/actors/client
 admin_compact_mode: false
 weight_select_max: 100
 default_langcode: en

config/optional/user.role.authenticated.yml

@@ -8,6 +8,8 @@ dependencies:
     - comment
     - contact
     - filter
+    - opencase
+    - opencase_entities
     - search
     - shortcut
     - system
@@ -22,7 +24,43 @@ permissions:
   - 'access content'
   - 'access shortcuts'
   - 'access site-wide contact form'
+  - 'add activity entities'
+  - 'add case entities'
+  - 'add client entities'
+  - 'add equal opps entities'
+  - 'add event entities'
+  - 'add organisation entities'
+  - 'add staff_member entities'
+  - 'add volunteer entities'
+  - 'edit activity entities'
+  - 'edit bank account entities'
+  - 'edit case entities'
+  - 'edit client entities'
+  - 'edit equal opps entities'
+  - 'edit event entities'
+  - 'edit organisation entities'
+  - 'edit staff_member entities'
+  - 'edit volunteer entities'
   - 'post comments'
+  - 'revert all activity revisions'
+  - 'revert all client revisions'
+  - 'revert all organisation revisions'
+  - 'revert all staff_member revisions'
+  - 'revert all volunteer revisions'
   - 'search content'
   - 'skip comment approval'
+  - 'use opencase'
   - 'use text format basic_html'
+  - 'view all activity revisions'
+  - 'view all client revisions'
+  - 'view all organisation revisions'
+  - 'view all staff_member revisions'
+  - 'view all volunteer revisions'
+  - 'view published activity entities'
+  - 'view published client entities'
+  - 'view published equal opps entities'
+  - 'view published event entities'
+  - 'view published organisation entities'
+  - 'view published organisation relation entities'
+  - 'view published staff_member entities'
+  - 'view published volunteer entities'

config/optional/user.role.caseworker.yml

@@ -1,7 +1,9 @@
 uuid: 82123195-ae6e-4d7a-9755-df73244e110d
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - opencase_entities
 id: caseworker
 label: Caseworker
 weight: 5

config/optional/user.role.opencase_admin.yml

@@ -1,7 +1,12 @@
 uuid: 89e8d1a4-b540-4ce5-b503-bf6f32178d49
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - field_ui
+    - opencase
+    - opencase_cases
+    - opencase_entities
 _core:
   default_config_hash: NYNlwo5WdxRZXhqrfBgLvCR19LE64SrLojs7_zOGJ5Q
 id: opencase_admin

config/optional/user.role.overseer.yml

@@ -1,7 +1,9 @@
 uuid: 7f74c263-619c-41d8-a528-6eacff355fe7
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - opencase_entities
 id: overseer
 label: Overseer
 weight: 4

config/optional/user.role.volunteer_co_ord.yml

@@ -1,7 +1,9 @@
 uuid: 88bb4aeb-bccc-41ed-8799-bdb10d5e4f4e
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - opencase_entities
 id: volunteer_co_ord
 label: 'Volunteer Co-ordinator'
 weight: 6

config/optional/views.view.activities.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - user.role.authenticated
   module:
+    - datetime
     - opencase_entities
     - user
 id: activities
@@ -23,6 +24,267 @@ display:
     display_options:
       title: Activities
       fields:
+        type:
+          id: type
+          table: oc_activity_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: type
+          plugin_id: field
+          label: 'Activity type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        activity_date_time:
+          id: activity_date_time
+          table: oc_activity_field_data
+          field: activity_date_time
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: activity_date_time
+          plugin_id: field
+          label: Date
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_default
+          settings:
+            timezone_override: ''
+            format_type: short
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_target:
+          id: oc_target
+          table: oc_activity_field_data
+          field: oc_target
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_target
+          plugin_id: field
+          label: Target
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
+          plugin_id: field
+          label: Provider
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
         name:
           id: name
           table: oc_activity_field_data
@@ -33,7 +295,7 @@ display:
           entity_type: null
           entity_field: name
           plugin_id: field
-          label: ''
+          label: Subject
           exclude: false
           alter:
             alter_text: false
@@ -88,16 +350,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        delete_oc_activity:
+        description:
-          id: delete_oc_activity
+          id: description
-          table: oc_activity
+          table: oc_activity_field_data
-          field: delete_oc_activity
+          field: description
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_activity
-          plugin_id: entity_link_delete
+          entity_field: description
-          label: 'Link to delete Activity'
+          plugin_id: field
+          label: Notes
           exclude: false
           alter:
             alter_text: false
@@ -138,9 +401,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: delete
+          click_sort_column: value
-          output_url_as_text: false
+          type: basic_string
-          absolute: false
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
       pager:
         type: mini
         options:
@@ -218,6 +491,44 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
+          plugin_id: numeric
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
       filters: {  }
       style:
         type: table
@@ -226,11 +537,51 @@ display:
           row_class: ''
           default_row_class: true
           columns:
+            type: type
+            activity_date_time: activity_date_time
+            oc_target: oc_target
+            oc_provider: oc_provider
             name: name
+            description: description
           default: '-1'
           info:
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            activity_date_time:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_target:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            oc_provider:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             name:
-              sortable: false
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            description:
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
@@ -257,6 +608,7 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
+          contextual_filters_or: true
       relationships: {  }
       header: {  }
       footer: {  }

config/optional/views.view.actor_search.yml

@@ -28,14 +28,15 @@ display:
       fields:
         name:
           id: name
-          table: search_api_index_opencase_actors
+          table: search_api_datasource_opencase_actors_entity_oc_actor
           field: name
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_actor
           plugin_id: search_api_field
-          label: 'Organisation name '
+          label: Name
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -106,7 +107,7 @@ display:
           entity_type: oc_actor
           plugin_id: search_api_field
           label: 'Person type'
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -170,222 +171,6 @@ display:
             display_methods:
               oc_actor_type:
                 display_method: label
-        type_1:
-          id: type_1
-          table: search_api_datasource_opencase_actors_entity_oc_organisation
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_organisation
-          plugin_id: search_api_field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ type }}{{ type_1 }}'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '{{ type }}{{ type_1 }}'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api_entity
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            display_methods:
-              oc_organisation_type:
-                display_method: label
-        first_name:
-          id: first_name
-          table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: first_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          plugin_id: search_api_field
-          label: 'First Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-        last_name:
-          id: last_name
-          table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: last_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_actor
-          plugin_id: search_api_field
-          label: 'Last Name'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
       pager:
         type: mini
         options:

config/optional/views.view.actors.yml

@@ -87,6 +87,73 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        created:
+          id: created
+          table: oc_actor_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: created
+          plugin_id: field
+          label: 'Date added'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
       pager:
         type: mini
         options:
@@ -124,7 +191,22 @@ display:
         type: tag
         options: {  }
       empty: {  }
-      sorts: {  }
+      sorts:
+        name:
+          id: name
+          table: oc_actor_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: name
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
       arguments:
         type:
           id: type
@@ -142,7 +224,7 @@ display:
             title_enable: false
             title: All
           title_enable: true
-          title: '{{ arguments.type }} '
+          title: '{{ arguments.type }}s'
           default_argument_type: raw
           default_argument_options:
             index: 1
@@ -164,7 +246,7 @@ display:
           validate_options: {  }
           glossary: false
           limit: 0
-          case: none
+          case: ucfirst
           path_case: none
           transform_dash: false
           break_phrase: false
@@ -177,15 +259,23 @@ display:
           default_row_class: true
           columns:
             name: name
+            created: created
           default: '-1'
           info:
             name:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
           override: true
           sticky: false
           summary: ''

config/optional/views.view.case_providers.yml

@@ -5,8 +5,10 @@ dependencies:
   config:
     - opencase_entities.oc_actor_type.staff_member
     - opencase_entities.oc_actor_type.volunteer
+    - user.role.authenticated
   module:
     - opencase_entities
+    - user
 id: case_providers
 label: 'Case providers'
 module: views
@@ -115,8 +117,10 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       access:
-        type: none
+        type: role
-        options: {  }
+        options:
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -199,6 +203,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url.query_args
+        - user.roles
       tags: {  }
   entity_reference_1:
     id: entity_reference_1
@@ -217,4 +222,5 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - user.roles
       tags: {  }

config/optional/views.view.case_provisions.yml

@@ -0,0 +1,701 @@
+uuid: 00afe158-4881-4478-b808-06e2841efc36
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_cases.oc_case_provision_type.caseworker
+    - user.role.authenticated
+  module:
+    - opencase_cases
+    - user
+id: case_provisions
+label: 'Case provisions'
+module: views
+description: ''
+tag: ''
+base_table: oc_case_provision_field_data
+base_field: id
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+      title: 'Case provisions'
+      fields:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: field
+          label: Case
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_case_provider_role:
+          id: oc_case_provider_role
+          table: oc_case_provision_field_data
+          field: oc_case_provider_role
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
+          label: Role
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      pager:
+        type: none
+        options:
+          offset: 0
+          items_per_page: null
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: role
+        options:
+          role:
+            authenticated: authenticated
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments:
+        oc_provider:
+          id: oc_provider
+          table: oc_case_provision_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_provider
+          plugin_id: numeric
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+      filters:
+        status:
+          id: status
+          table: oc_case_provision_field_data
+          field: status
+          entity_type: oc_case_provision
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+        type:
+          id: type
+          table: oc_case_provision_field_data
+          field: type
+          entity_type: oc_case_provision
+          entity_field: type
+          plugin_id: bundle
+          value:
+            caseworker: caseworker
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+      style:
+        type: table
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.roles
+      tags: {  }
+  block_1:
+    id: block_1
+    display_title: 'By provider'
+    display_plugin: block
+    position: 1
+    display_options:
+      fields:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: field
+          label: Case
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_case_provider_role:
+          id: oc_case_provider_role
+          table: oc_case_provision_field_data
+          field: oc_case_provider_role
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
+          label: Role
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_target:
+          id: oc_target
+          table: oc_case_field_data
+          field: oc_target
+          relationship: oc_case
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: oc_target
+          plugin_id: field
+          label: Target
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      defaults:
+        relationships: false
+        fields: false
+      relationships:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: Case
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: standard
+          required: false
+      display_description: ''
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.roles
+      tags: {  }
+  block_2:
+    id: block_2
+    display_title: 'By case'
+    display_plugin: block
+    position: 2
+    display_options:
+      fields:
+        oc_provider:
+          id: oc_provider
+          table: oc_case_provision_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_provider
+          plugin_id: field
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_case_provider_role:
+          id: oc_case_provider_role
+          table: oc_case_provision_field_data
+          field: oc_case_provider_role
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case_provider_role
+          plugin_id: field
+          label: Role
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      arguments:
+        oc_case:
+          id: oc_case
+          table: oc_case_provision_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          entity_field: oc_case
+          plugin_id: numeric
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 2
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+      defaults:
+        relationships: false
+        fields: false
+        arguments: false
+        header: false
+      relationships: {  }
+      display_description: ''
+      header:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: '<a href=''/opencase/oc_case_provision/add/caseworker?case_id={{ raw_arguments.oc_case }}''>Add a caseworker</a>'
+          tokenize: true
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.roles
+      tags: {  }

config/optional/views.view.equal_opps_records.yml

@@ -7,7 +7,6 @@ dependencies:
   module:
     - opencase_entities
     - user
-    - views_autosubmit
 _core:
   default_config_hash: eYcO9ivZP8SZgdNDXedppm0USNqwvJM7jFy6LOV6tcg
 id: equal_opps_records
@@ -110,7 +109,7 @@ display:
             offset: false
             offset_label: Offset
       exposed_form:
-        type: autosubmit
+        type: input_required
         options:
           submit_button: Apply
           reset_button: false
@@ -119,7 +118,8 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-          autosubmit_hide: true
+          text_input_required: ''
+          text_input_required_format: basic_html
       access:
         type: perm
         options:

config/optional/views.view.organisations.yml

@@ -143,7 +143,7 @@ display:
             title_enable: false
             title: All
           title_enable: true
-          title: '{{ arguments.type }}'
+          title: '{{ arguments.type }}s'
           default_argument_type: raw
           default_argument_options:
             index: 1
@@ -165,7 +165,7 @@ display:
           validate_options: {  }
           glossary: false
           limit: 0
-          case: none
+          case: ucfirst
           path_case: none
           transform_dash: false
           break_phrase: false

config/optional/views.view.sample_downloadable_report.yml

@@ -2,11 +2,15 @@ uuid: 0c812021-ff90-442b-a7a0-353d538d6e15
 langcode: en
 status: true
 dependencies:
+  config:
+    - system.menu.opencase
+    - user.role.authenticated
   module:
     - csv_serialization
     - opencase_entities
     - rest
     - serialization
+    - user
     - views_data_export
 id: sample_downloadable_report
 label: 'Sample Downloadable Report'
@@ -22,7 +26,7 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      title: 'Sample Downloadable Report'
+      title: 'Sample Report'
       fields:
         name:
           id: name
@@ -117,8 +121,10 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       access:
-        type: none
+        type: role
-        options: {  }
+        options:
+          role:
+            authenticated: authenticated
       cache:
         type: tag
         options: {  }
@@ -197,6 +203,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }
   data_export_1:
     id: data_export_1
@@ -236,6 +243,7 @@ display:
         - 'languages:language_interface'
         - request_format
         - url
+        - user.roles
       tags: {  }
   page_1:
     id: page_1
@@ -245,6 +253,15 @@ display:
     display_options:
       display_extenders: {  }
       path: sample-downloadable-report
+      menu:
+        type: normal
+        title: 'Sample downloadable report'
+        description: ''
+        weight: 0
+        expanded: false
+        menu_name: opencase
+        parent: opencase.reporting
+        context: '0'
     cache_metadata:
       max-age: -1
       contexts:
@@ -252,4 +269,5 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }

config/optional/views.view.search_content.yml

@@ -4,8 +4,10 @@ status: true
 dependencies:
   config:
     - search_api.index.default_index
+    - user.role.authenticated
   module:
     - search_api
+    - user
 _core:
   default_config_hash: EeNNkLARDmftWehrk-ew_OW8srW2RgDKI1mZrWxZ-ao
 id: search_content
@@ -54,8 +56,10 @@ display:
           text_input_required: 'Please enter some keywords to search.'
           text_input_required_format: basic_html
       access:
-        type: none
+        type: role
-        options: {  }
+        options:
+          role:
+            authenticated: authenticated
       cache:
         type: none
         options: {  }
@@ -133,13 +137,15 @@ display:
       footer: {  }
       display_extenders: {  }
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
-      tags: {  }
+        - 'user.node_grants:view'
+        - user.roles
+      tags:
+        - 'config:search_api.index.default_index'
       cacheable: false
   page_1:
     id: page_1
@@ -150,11 +156,13 @@ display:
       display_extenders: {  }
       path: search/content
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
-      tags: {  }
+        - 'user.node_grants:view'
+        - user.roles
+      tags:
+        - 'config:search_api.index.default_index'
       cacheable: false

css/opencase.css

@@ -3,6 +3,13 @@
   display: none;
 }
 
+/* download icon for reports */
+.feed-icons .views-data-export-feed .feed-icon {
+  background-image: url('/modules/contrib/opencase/resources/download.png');
+  width: 50px;
+  height: 50px;
+}
+
 /* paragraphs */
 
 

modules/opencase_cases/opencase_cases.module

@@ -156,11 +156,14 @@ function _opencase_cases_redirect_to_home($form, &$form_state) {
 
 // Upon deletion of an activity, go to the related case if there is one, otherwise to its target.
 function _opencase_cases_delete_activity_redirect($form, &$form_state) {
-  if (!IsEmpty($form_state->getFormObject()->getEntity()->oc_case)) {
+  $entity = $form_state->getFormObject()->getEntity();
-    $case_id = $form_state->getFormObject()->getEntity()->oc_case->target_id;
+  // for some reason this fires when deleting an activity type, shouldn't do but.s
+  if ($entity instanceof \Drupal\opencase_entities\Entity\OCActivityType) return;
+  if (!IsEmpty($entity->oc_case)) {
+    $case_id = $entity->oc_case->target_id;
     $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]);
   } else {
-    $target_actor_id = $form_state->getFormObject()->getEntity()->oc_target->target_id;
+    $target_actor_id = $entity->oc_target->target_id;
     $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $target_actor_id]);
   }
 }

modules/opencase_entities/src/OCActivityAccessControlHandler.php

@@ -25,12 +25,12 @@ class OCActivityAccessControlHandler extends EntityAccessControlHandler {
           return AccessResult::allowedIfHasPermission($account, 'view unpublished activity entities');
         }
         return AccessResult::allowedIf(
-            $account->hasPermission('view published case entities')  // activity permissions are inherited from case
+            $account->hasPermission('view published activity entities')
             || $entity->getOwner()->id() == $account->id()
         );
       case 'update':  // allowed only if a) they can see the case the activity is on and b) they can edit activities
         return AccessResult::allowedIf(
-            $account->hasPermission('edit activity entities')  // activity permissions are inherited from case
+            $account->hasPermission('edit activity entities')
             || $entity->getOwner()->id() == $account->id()
         );
       case 'delete':  // allowed only if a) they can see the case the activity is on and b) they can delete activities

opencase.links.menu.yml

@@ -39,7 +39,7 @@ opencase.add_events_links:
   menu_name: opencase
   parent: opencase.opencase_add_new_things_menu
 opencase.add_equal_opps:
-  title: 'Equal Opportunies record'
+  title: 'Equal Opps record'
   menu_name: opencase
   url: internal:/opencase/oc_equal_opps/add
   parent: opencase.opencase_add_new_things_menu

opencase.module

@@ -14,6 +14,7 @@ function opencase_element_info_alter(array &$types) {
   $types['datetime']['#process'][] = 'opencase_process_element';
 }
 
+
 /**
  * Element process callback for datetime fields. Removes the seconds part.
  */
@@ -126,6 +127,19 @@ function opencase_entity_field_access($operation, \Drupal\Core\Field\FieldDefini
   return AccessResult::neutral();
 }
 
+/*
+  Implementation of hook_relevant_activity_type_ids which is a custom hook invoked in the AddActivity block.
+*/
+function opencase_relevant_activity_type_ids($actorTypeID) {
+  switch ($actorTypeID) {
+    case 'volunteer':
+      return ['email', 'phone_call', 'supervision'];
+    case 'client': 
+      return ['email', 'lete', 'phone_call', 'case_note', 'destitution_funds_provided', 'research', 'application'];
+    case 'staff_member':
+        return ['application', 'interview'];
+  }
+}
 
 /**
  * Implementation of hook_form_alter()

src/EmailAlerter.php

@@ -4,9 +4,8 @@ namespace Drupal\opencase;
 use Drupal\user\Entity\User;
 
 class EmailAlerter {
-    public function send_email_to_users_with_role(array $params, string $key, string $role): void {
+    public function send_email_to_users_with_role(array $params, string $key, string $role, string $module): void {
         $mailManager = \Drupal::service('plugin.manager.mail');
-        $module = 'goodnightout_opencase';
         $to = implode(',', $this->get_email_addresses_of_users_with_role($role));
         $send = true;
         $result = $mailManager->mail($module, $key, $to, NULL, $params, NULL, $send);

src/Plugin/Block/AddActivity.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\opencase\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a Block with some help text about actor type fields
+ *
+ * @Block(
+ *   id = "add_activity",
+ *   admin_label = @Translation("Add Activity"),
+ *   category = @Translation("Opencase"),
+ * )
+ */
+class AddActivity extends BlockBase {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build():array {
+        $actor = \Drupal::routeMatch()->getParameter('oc_actor');
+        $target_id = $actor->id();
+        $actorType = $actor->bundle();
+        $markup = "<ul>";
+        $activity_types = $this->getActivityTypesToDisplay($actorType);
+        foreach($activity_types as $id => $info) {
+            $label = $info['label'];
+            $markup .= "<li><a href='/opencase/oc_activity/add/$id?target_id=$target_id&destination=/opencase/oc_actor/$target_id'>$label</a></li>";
+        }
+        $markup .= "</ul>";
+        return array('#markup' => $markup);
+    }
+
+    public function getCacheMaxAge():int {
+        return 0;
+    }
+
+    private function getActivityTypesToDisplay(string $actorType): array {
+        // Client modules will provide a list of what activity types (bundles) are relevant for each actor type.
+        // Check if they are implemented, and if so display them.
+        $implemented_activity_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_activity');
+        $relevant_activity_type_ids = \Drupal::moduleHandler()->invokeAll('relevant_activity_type_ids', [$actorType]);
+        $activity_types_to_display = [];
+        foreach ($relevant_activity_type_ids as $type_id) {
+            if (array_key_exists($type_id, $implemented_activity_types)) {
+                $activity_types_to_display[$type_id] = $implemented_activity_types[$type_id];
+            }
+        }
+        return $activity_types_to_display;
+    }
+}

src/Plugin/Derivative/AddEventsMenuLink.php

@@ -45,7 +45,7 @@ class AddEventsMenuLink extends DeriverBase implements ContainerDeriverInterface
     $eventTypes = $this->entityTypeManager->getStorage('oc_event_type')->loadMultiple();
     foreach ($eventTypes as $id => $eventType) {
       $links[$id] = [
-        'title' => $eventType->label() . " Event",
+        'title' => $eventType->label(),
         'route_name' => "entity.oc_event.add_form",
         'route_parameters' => ['oc_event_type' => $eventType->id()]
       ] + $base_plugin_definition;

src/Plugin/Derivative/SeeAllActorsMenuLink.php

@@ -45,7 +45,7 @@ class SeeAllActorsMenuLink extends DeriverBase implements ContainerDeriverInterf
     $actorTypes = $this->entityTypeManager->getStorage('oc_actor_type')->loadMultiple();
     foreach ($actorTypes as $id => $actorType) {
       $links[$id] = [
-        'title' => $actorType->label(),
+        'title' => \Drupal\opencase\Pluraliser::pluralise($actorType->label()),
         'route_name' => "view.actors.page_1",
         'route_parameters' => ['type' => $actorType->id()]
       ] + $base_plugin_definition;

src/Plugin/Derivative/SeeAllEventsMenuLink.php

@@ -50,7 +50,7 @@ class SeeAllEventsMenuLink extends DeriverBase implements ContainerDeriverInterf
     $eventTypes = $this->entityTypeManager->getStorage('oc_event_type')->loadMultiple();
     foreach ($eventTypes as $id => $eventType) {
       $links[$id] = [
-          'title' => $eventType->label(),
+        'title' => \Drupal\opencase\Pluraliser::pluralise($eventType->label()),
           'route_name' => "view.events.page_1",
           'route_parameters' => ['type' => $eventType->id()]
         ] + $base_plugin_definition;

src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php

@@ -45,7 +45,7 @@ class SeeAllOrganisationsMenuLink extends DeriverBase implements ContainerDerive
     $organisationTypes = $this->entityTypeManager->getStorage('oc_organisation_type')->loadMultiple();
     foreach ($organisationTypes as $id => $organisationType) {
       $links[$id] = [
-        'title' => $organisationType->label(),
+        'title' => \Drupal\opencase\Pluraliser::pluralise($organisationType->label()),
         'route_name' => "view.organisations.page_1",
         'route_parameters' => ['type' => $organisationType->id()]
       ] + $base_plugin_definition;

src/Pluraliser.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace Drupal\opencase;
+
+class Pluraliser {
+    public static function pluralise($text) {
+        return $text . "s";
+    }
+}

src/TimeBasedFieldUpdater.php

@@ -3,6 +3,7 @@
 namespace Drupal\opencase;
 use Drupal;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\opencase\Utils;
 
 final class TimeBasedFieldUpdater {
 
@@ -12,24 +13,25 @@ final class TimeBasedFieldUpdater {
     private array $conditions;
     private string $date_format;
 
-    final public function __construct(EntityTypeManagerInterface $entityTypeManager, string $entity_type, string $date_field, array $conditions = [], string $date_format = 'Y-m-d')
+    final public function __construct(
+        EntityTypeManagerInterface $entityTypeManager, 
+        Utils $utils,
+        string $entity_type, string $bundle, string $date_field, string $date_format = 'Y-m-d'
+    )
     {   
         $this->entityTypeManager = $entityTypeManager;
+        $this->utils = $utils;
         $this->date_field = $date_field;
-        $this->conditions = $conditions;
         $this->date_format = $date_format;
         $this->entity_type = $entity_type;
+        $this->bundle = $bundle;
     }
 
-    final public function update(string $time_elapsed, array $old_values, array $new_values): void {
+    final public function update(array $conditions, string $time_elapsed, array $new_values): void {
         $query = $this->entityTypeManager->getStorage($this->entity_type)->getQuery();
-        foreach($this->conditions as $cond_field=>$cond_value) {
+        $conditions[] = [$this->date_field, date($this->date_format, strtotime('-'.$time_elapsed)), "<"];
-            $query->condition($cond_field, $cond_value);
+        $conditions[] = ['type', $this->bundle, '='];
-        }
+        $this->utils->addConditionsToQuery($query, $conditions);
-        foreach($old_values as $old_field=>$old_value) {
-            $query->condition($old_field, $old_value);
-        }
-        $query->condition($this->date_field, date($this->date_format, strtotime('-'.$time_elapsed)), "<");
         foreach($query->execute() as $id) {
             $entity = $this->entityTypeManager->getStorage($this->entity_type)->load($id);
             foreach($new_values as $new_field=>$new_value) {

src/Utils.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types =1);
+
+namespace Drupal\opencase;
+
+use \Drupal;
+use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\Query\QueryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+
+class Utils {
+
+    public function __construct(
+        EntityTypeManager $entityTypeManager = null
+    ) {
+        if ($entityTypeManager == null) {
+            $entityTypeManager = Drupal::entityTypeManager();
+        }
+        $this->entityTypeManager = $entityTypeManager;
+    }
+
+    public function addConditionsToQuery(QueryInterface $query, array $conditions): void {
+        foreach($conditions as $condition) {
+            $field = $condition[0];
+            $value = $condition[1];
+            $operator = $condition[2];
+            $query->condition($field, $value, $operator);
+        }
+    } 
+
+     /**
+   * Utility: find term by name and vid.
+   *
+   * @param string $name
+   *   Term name.
+   * @param string $vid
+   *   Term vid.
+   * @return int
+   *   Term id, or 0 if none.
+   */
+    public function getTidByName(string $name, string $vid):int {
+        if (empty($name) || empty($vid)) {
+        return 0;
+        }
+        $properties = [
+            'name' => $name,
+            'vid' => $vid,
+        ];
+        $terms = $this->entityTypeManager->getStorage('taxonomy_term')->loadByProperties($properties);
+        $term = reset($terms);
+        return (int)(!empty($term) ? $term->id() : 0);
+    }
+}

tests/src/Unit/TimeBasedFieldUpdaterTest.php

@@ -8,28 +8,53 @@ use Drupal\opencase\TimeBasedFieldUpdater;
 class TimeBasedFieldUpdaterTest extends UnitTestCase{
 
     function setUp():void {
+        /** @var \Drupal\opencase\Utils&\PHPUnit\Framework\MockObject\MockObject $utils */
+        $this->utils = $this->getMockBuilder('\\Drupal\\opencase\\Utils')->getMock();
+        /** @var \Drupal\core\Entity\EntityTypeManagerInterface&\PHPUnit\Framework\MockObject\MockObject $entityTypeManager */
         $this->entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
         $this->storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->getMock();
         $this->query = $this->getMockBuilder('\\Drupal\\Core\\Entity\\Query\\QueryInterface')->getMock();
         $this->entityTypeManager->method('getStorage')->willReturn($this->storage);
         $this->storage->method('getQuery')->willReturn($this->query);
+        $this->updater = new TimeBasedFieldUpdater($this->entityTypeManager, $this->utils, 'dummy_entity_type', 'dummy_bundle', 'dummy_date_field');
+
     }
     function testFieldIsUpdatedOnEntityReturnedByQuery():void {
         $this->query->method('execute')->willReturn([1]);
         $this->entity = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
         $this->storage->expects($this->once())->method('load')->with(1)->willReturn($this->entity); 
-        $updater = new TimeBasedFieldUpdater($this->entityTypeManager, 'dummy_entity', 'dummy_date_field');
+        $this->updater->update([], '3 months', ['dummy_field' => 4]);
-        $updater->update('3 months', ['dummy_status_field' => 3], ['dummy_status_field' => 4]);
+        $this->assertEquals($this->entity->dummy_field, 4);
-        $this->assertEquals($this->entity->dummy_status_field, 4);
     }
     function testFieldIsUpdatedOnAllEntitiesReturnedByQuery():void {
         $this->query->method('execute')->willReturn([1, 2]);
         $this->entity = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
         $this->entity2 = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
         $this->storage->method('load')->willReturnMap([[1, $this->entity], [2, $this-> entity2]]); 
-        $updater = new TimeBasedFieldUpdater($this->entityTypeManager, 'dummy_entity', 'dummy_date_field');
+        $this->updater->update([], '3 months', ['dummy_field' => 4]);
-        $updater->update('3 months', ['dummy_status_field' => 3], ['dummy_status_field' => 4]);
+        $this->assertEquals($this->entity->dummy_field, 4);  
-        $this->assertEquals($this->entity->dummy_status_field, 4);  
+        $this->assertEquals($this->entity2->dummy_field, 4);     
-        $this->assertEquals($this->entity2->dummy_status_field, 4);     
+    }
+
+    function testMultipleFieldsAreUpdated(): void {
+        $this->query->method('execute')->willReturn([1]);
+        $this->entity = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
+        $this->storage->expects($this->once())->method('load')->with(1)->willReturn($this->entity); 
+        $this->updater->update([], '3 months', ['dummy_field' => 4, 'dummy_field_2' => 5]);
+        $this->assertEquals($this->entity->dummy_field, 4);
+        $this->assertEquals($this->entity->dummy_field_2, 5);
+
+    }
+
+    function testBundleAndDateAndExtraConditionsAreAllAddedAsQueryConditions(): void {
+        $this->query->method('execute')->willReturn([]);
+        $expected_conditions= [
+            ['dummy_field', 'dummy_value', '<'],
+            ['dummy_field_2', 'dummy_value_2', '='],
+            ['dummy_date_field', date('Y-m-d', strtotime('- 3 months')), "<"],
+            ['type', 'dummy_bundle', '=']      
+        ];
+        $this->utils->expects($this->once())->method('addConditionsToQuery')->with($this->query, $expected_conditions);
+        $this->updater->update([['dummy_field', 'dummy_value', '<'], ['dummy_field_2', 'dummy_value_2', '='] ], '3 months', ['dummy_field' => 4]);
     }      
 }

tests/src/Unit/UtilsTest.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\Tests\opencase\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\opencase\Utils;
+
+class UtilsTest extends UnitTestCase{
+    public function setUp(): void {
+        /** @var \Drupal\core\Entity\EntityTypeManager&\PHPUnit\Framework\MockObject\MockObject $entityTypeManager */
+        $this->entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
+        $this->utils = new Utils($this->entityTypeManager);
+    }
+}