redirect home page by permission

This reverts commit 809dbfc837.

config/optional/block.block.addactivity.yml

@@ -1,4 +1,4 @@
-uuid: 036ff73a-049d-4979-abf0-95b1a9d1b830
+uuid: 50fe4dcf-2304-49df-94a5-62ccdc502480
 langcode: en
 status: true
 dependencies:
@@ -22,4 +22,4 @@ visibility:
   route:
     id: route
     negate: false
-    routes: entity.oc_actor.canonical
+    routes: entity.oc_case.canonical

config/optional/block.block.addcase.yml

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

config/optional/block.block.exposedformactor_searchpage_1.yml

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

config/optional/block.block.views_block__activities_block_2.yml

@@ -1,4 +1,4 @@
-uuid: 14120f1a-9009-4ed1-858a-875d748f93fe
+uuid: 62e27553-4443-4047-8212-2af44dd4afa1
 langcode: en
 status: true
 dependencies:
@@ -9,14 +9,14 @@ dependencies:
     - views
   theme:
     - bartik
-id: views_block__activities_block_1
+id: views_block__activities_block_2
 theme: bartik
 region: content
 weight: 0
 provider: null
-plugin: 'views_block:activities-block_1'
+plugin: 'views_block:activities-block_2'
 settings:
-  id: 'views_block:activities-block_1'
+  id: 'views_block:activities-block_2'
   label: ''
   label_display: visible
   provider: views
@@ -27,4 +27,4 @@ visibility:
   route:
     id: route
     negate: false
-    routes: entity.oc_actor.canonical
+    routes: entity.oc_case.canonical

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

@@ -19,7 +19,7 @@ content:
     third_party_settings: {  }
   description:
     type: string_textarea
-    weight: 5
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,24 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   time_taken:
     type: number
-    weight: 4
+    weight: 3
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
   user_id: true

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

@@ -19,7 +19,7 @@ content:
     third_party_settings: {  }
   description:
     type: string_textarea
-    weight: 5
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 4
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,16 +43,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   time_taken:
     type: number
     weight: 3
@@ -61,6 +51,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
   user_id: true

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

@@ -21,7 +21,7 @@ content:
     third_party_settings: {  }
   description:
     type: string_textarea
-    weight: 6
+    weight: 5
     region: content
     settings:
       rows: 5
@@ -29,20 +29,20 @@ content:
     third_party_settings: {  }
   field_amount:
     type: number
-    weight: 5
+    weight: 4
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_funds_for:
     type: options_select
-    weight: 4
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -58,17 +58,8 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
   time_taken: true

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

@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,18 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,18 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,18 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,18 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -27,7 +27,7 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -43,18 +43,15 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  oc_target:
-    type: entity_reference_autocomplete
-    weight: 1
+  time_taken:
+    type: number
+    weight: 3
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  oc_target: true
   revision_log: true
   status: true
-  time_taken: true
   user_id: true

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

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

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

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

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

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

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

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

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

@@ -3,77 +3,27 @@ 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
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   oc_case_provider_role:
-    type: entity_reference_autocomplete
-    weight: 2
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  oc_provider:
-    type: entity_reference_autocomplete
+    type: options_select
     weight: 1
     region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
+  oc_provider:
+    type: options_select
+    weight: 0
     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: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
 hidden:
   name: true
+  oc_case: true
+  revision_log: true
   status: true
+  user_id: true

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

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

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

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

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

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

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

@@ -33,7 +33,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 1
     region: content
   oc_provider:
     type: entity_reference_label
@@ -43,16 +43,19 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  oc_target:
-    type: entity_reference_label
+  time_taken:
+    type: number_decimal
     label: above
     settings:
-      link: true
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
     third_party_settings: {  }
-    weight: 1
+    weight: 3
     region: content
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -18,6 +18,7 @@ dependencies:
     - field.field.oc_actor.client.field_nationalities
     - field.field.oc_actor.client.field_referred_by
     - field.field.oc_actor.client.field_sex
+    - field.field.oc_actor.client.field_status
     - opencase_entities.oc_actor_type.client
   module:
     - datetime
@@ -154,6 +155,14 @@ content:
     third_party_settings: {  }
     weight: 16
     region: content
+  field_status:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 20
+    region: content
   name:
     type: string
     label: above
@@ -200,4 +209,5 @@ hidden:
   middle_names: true
   search_api_excerpt: true
   status: true
+  total_cases: true
   user_id: true

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

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

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

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

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

@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.oc_case_provision.caseworker.field_test
     - opencase_cases.oc_case_provision_type.caseworker
   module:
     - user
@@ -12,14 +11,6 @@ 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.user.user.compact.yml

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

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

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

config/optional/core.extension.yml

@@ -46,6 +46,7 @@ module:
   link: 0
   menu_link_content: 0
   menu_ui: 0
+  mysql: 0
   node: 0
   opencase: 0
   opencase_cases: 0

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

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

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

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

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

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

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

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

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

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

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

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

config/optional/field.field.oc_case_provision.caseworker.field_test.yml

@@ -1,31 +0,0 @@
-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.storage.oc_actor.field_status.yml

@@ -1,16 +1,16 @@
-uuid: f90d1b9f-ee8a-4f79-ae7d-fafd4ec10cea
+uuid: cde29136-624d-46a0-8199-820f26cd23fd
 langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
     - opencase_entities
-id: oc_case_provision.field_test
-field_name: field_test
-entity_type: oc_case_provision
+    - taxonomy
+id: oc_actor.field_status
+field_name: field_status
+entity_type: oc_actor
 type: entity_reference
 settings:
-  target_type: oc_actor
+  target_type: taxonomy_term
 module: core
 locked: false
 cardinality: 1

config/optional/taxonomy.vocabulary.client_statuses.yml

@@ -0,0 +1,8 @@
+uuid: ba139c72-00f4-44d1-be2d-f8ada5aef0c1
+langcode: en
+status: true
+dependencies: {  }
+name: 'Client statuses'
+vid: client_statuses
+description: ''
+weight: 0

config/optional/user.role.authenticated.yml

@@ -9,6 +9,7 @@ dependencies:
     - contact
     - filter
     - opencase
+    - opencase_cases
     - opencase_entities
     - search
     - shortcut
@@ -57,6 +58,7 @@ permissions:
   - 'view all staff_member revisions'
   - 'view all volunteer revisions'
   - 'view published activity entities'
+  - 'view published case provision entities'
   - 'view published client entities'
   - 'view published equal opps entities'
   - 'view published event entities'

config/optional/views.view.activities.yml

@@ -24,17 +24,17 @@ display:
     display_options:
       title: Activities
       fields:
-        type:
-          id: type
+        name:
+          id: name
           table: oc_activity_field_data
-          field: type
+          field: name
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: oc_activity
-          entity_field: type
+          entity_type: null
+          entity_field: name
           plugin_id: field
-          label: 'Activity type'
+          label: Subject
           exclude: false
           alter:
             alter_text: false
@@ -67,7 +67,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: true
+          element_label_colon: false
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -75,11 +75,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
+          click_sort_column: value
+          type: string
           settings:
-            link: false
-          group_column: target_id
+            link_to_entity: true
+          group_column: value
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -155,17 +155,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        oc_target:
-          id: oc_target
+        type:
+          id: type
           table: oc_activity_field_data
-          field: oc_target
+          field: type
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_activity
-          entity_field: oc_target
+          entity_field: type
           plugin_id: field
-          label: Target
+          label: 'Activity type'
           exclude: false
           alter:
             alter_text: false
@@ -209,7 +209,7 @@ display:
           click_sort_column: target_id
           type: entity_reference_label
           settings:
-            link: true
+            link: false
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -285,71 +285,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        name:
-          id: name
-          table: oc_activity_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: name
-          plugin_id: field
-          label: Subject
-          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: false
-          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: true
-          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
         description:
           id: description
           table: oc_activity_field_data
@@ -491,44 +426,6 @@ 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
@@ -640,3 +537,61 @@ display:
         - url.query_args
         - user.roles
       tags: {  }
+  block_2:
+    id: block_2
+    display_title: 'By case'
+    display_plugin: block
+    position: 2
+    display_options:
+      arguments:
+        oc_case:
+          id: oc_case
+          table: oc_activity_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          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:
+        arguments: false
+      display_description: ''
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }

config/optional/views.view.actor_search.yml

@@ -314,7 +314,7 @@ display:
       row:
         type: fields
       query:
-        type: views_query
+        type: search_api_query
         options:
           bypass_access: false
           skip_access: false

config/optional/views.view.case_fees.yml

@@ -0,0 +1,468 @@
+uuid: 030eab69-63e0-46a4-920b-73efece239c8
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_cases
+id: case_fees
+label: 'Case fees'
+module: views
+description: ''
+tag: ''
+base_table: oc_case_fee_field_data
+base_field: id
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+      title: 'Case fees'
+      fields:
+        amount:
+          id: amount
+          table: oc_case_fee_field_data
+          field: amount
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          entity_field: amount
+          plugin_id: field
+          label: Amount
+          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: number_decimal
+          settings:
+            thousand_separator: ''
+            decimal_separator: .
+            scale: 2
+            prefix_suffix: true
+          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_fee_category:
+          id: oc_fee_category
+          table: oc_case_fee_field_data
+          field: oc_fee_category
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          entity_field: oc_fee_category
+          plugin_id: field
+          label: 'Fee Category'
+          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
+        description:
+          id: description
+          table: oc_case_fee_field_data
+          field: description
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          entity_field: description
+          plugin_id: field
+          label: Description
+          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: basic_string
+          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
+        edit_oc_case_fee:
+          id: edit_oc_case_fee
+          table: oc_case_fee
+          field: edit_oc_case_fee
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          plugin_id: entity_link_edit
+          label: 'Link to edit Case Fee'
+          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
+          text: edit
+          output_url_as_text: false
+          absolute: false
+        delete_oc_case_fee:
+          id: delete_oc_case_fee
+          table: oc_case_fee
+          field: delete_oc_case_fee
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          plugin_id: entity_link_delete
+          label: 'Link to delete Case Fee'
+          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
+          text: delete
+          output_url_as_text: false
+          absolute: false
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      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: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments:
+        oc_case:
+          id: oc_case
+          table: oc_case_fee_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_fee
+          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
+      filters:
+        status:
+          id: status
+          table: oc_case_fee_field_data
+          field: status
+          entity_type: oc_case_fee
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            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: {  }
+          contextual_filters_or: false
+      relationships: {  }
+      header:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: '<a href=''/opencase/oc_case_fee/add/fee?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}''>Add a fee</a>'
+            format: basic_html
+          tokenize: true
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/case-fees/%case_id
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }

config/optional/views.view.case_provisions.yml

@@ -556,7 +556,7 @@ display:
           click_sort_column: target_id
           type: entity_reference_label
           settings:
-            link: true
+            link: false
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -621,7 +621,7 @@ display:
           click_sort_column: target_id
           type: entity_reference_label
           settings:
-            link: true
+            link: false
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -632,6 +632,112 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        edit_oc_case_provision:
+          id: edit_oc_case_provision
+          table: oc_case_provision
+          field: edit_oc_case_provision
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          plugin_id: entity_link_edit
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: edit
+          output_url_as_text: false
+          absolute: false
+        delete_oc_case_provision:
+          id: delete_oc_case_provision
+          table: oc_case_provision
+          field: delete_oc_case_provision
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case_provision
+          plugin_id: entity_link_delete
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: delete
+          output_url_as_text: false
+          absolute: false
       arguments:
         oc_case:
           id: oc_case
@@ -688,7 +794,7 @@ display:
           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>'
+          content: '<a href=''/opencase/oc_case_provision/add/caseworker?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}''>Add a caseworker</a>'
           tokenize: true
       display_extenders: {  }
     cache_metadata:

config/optional/views.view.cases.yml

@@ -219,6 +219,73 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        created:
+          id: created
+          table: oc_case_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: created
+          plugin_id: field
+          label: 'Created on'
+          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:
@@ -256,7 +323,23 @@ display:
         type: tag
         options: {  }
       empty: {  }
-      sorts: {  }
+      sorts:
+        created:
+          id: created
+          table: oc_case_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
+          granularity: day
       arguments: {  }
       filters: {  }
       style:
@@ -285,7 +368,7 @@ display:
       tags: {  }
   block_1:
     id: block_1
-    display_title: Block
+    display_title: 'By target'
     display_plugin: block
     position: 2
     display_options:
@@ -420,6 +503,73 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        created:
+          id: created
+          table: oc_case_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: created
+          plugin_id: field
+          label: 'Created on'
+          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
       arguments:
         oc_target:
           id: oc_target
@@ -462,6 +612,7 @@ display:
       defaults:
         fields: false
         arguments: false
+      display_description: ''
       display_extenders: {  }
       block_description: 'Cases: by target'
     cache_metadata:
@@ -475,10 +626,11 @@ display:
       tags: {  }
   page_1:
     id: page_1
-    display_title: Page
+    display_title: All
     display_plugin: page
     position: 1
     display_options:
+      display_description: ''
       display_extenders: {  }
       path: cases/all
       menu:

config/optional/views.view.cases_by_provider.yml

@@ -0,0 +1,385 @@
+uuid: 24db3b38-2204-47be-8347-20c277b05d2a
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.administrator
+    - user.role.authenticated
+    - user.role.caseworker
+    - user.role.content_editor
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
+  module:
+    - opencase_cases
+    - opencase_entities
+    - user
+id: cases_by_provider
+label: 'Cases by provider'
+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: 'My cases'
+      fields:
+        name_1:
+          id: name_1
+          table: oc_case_field_data
+          field: name
+          relationship: oc_case
+          group_type: group
+          admin_label: ''
+          entity_type: oc_case
+          entity_field: name
+          plugin_id: field
+          label: Title
+          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: true
+          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:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      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
+            content_editor: content_editor
+            administrator: administrator
+            overseer: overseer
+            caseworker: caseworker
+            volunteer_co_ord: volunteer_co_ord
+            opencase_admin: opencase_admin
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: 'This person is not '
+            format: basic_html
+          tokenize: false
+      sorts: {  }
+      arguments:
+        uid:
+          id: uid
+          table: users_field_data
+          field: uid
+          relationship: reverse__user__field_linked_opencase_actor
+          group_type: group
+          admin_label: ''
+          entity_type: user
+          entity_field: uid
+          plugin_id: user_uid
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: current_user
+          default_argument_options: {  }
+          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: {  }
+      style:
+        type: table
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      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: true
+        oc_provider:
+          id: oc_provider
+          table: oc_case_provision_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: Person
+          entity_type: oc_case_provision
+          entity_field: oc_provider
+          plugin_id: standard
+          required: true
+        reverse__user__field_linked_opencase_actor:
+          id: reverse__user__field_linked_opencase_actor
+          table: oc_actor_field_data
+          field: reverse__user__field_linked_opencase_actor
+          relationship: oc_provider
+          group_type: group
+          admin_label: User
+          entity_type: oc_actor
+          plugin_id: entity_reverse
+          required: true
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - user.roles
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: 'You are not assigned to any cases.'
+            format: basic_html
+          tokenize: false
+      defaults:
+        empty: false
+      display_extenders: {  }
+      path: opencase/my-cases
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - user.roles
+      tags: {  }
+  page_2:
+    id: page_2
+    display_title: 'Page 2'
+    display_plugin: page
+    position: 2
+    display_options:
+      title: 'Cases by provider'
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: 'This person is not assigned to any cases.'
+            format: basic_html
+          tokenize: false
+      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
+      defaults:
+        empty: false
+        title: false
+        relationships: false
+        arguments: 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: true
+      display_extenders: {  }
+      path: opencase/cases-by-provider/%actor_id
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }

modules/opencase_cases/src/Entity/OCCase.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\opencase_cases\Entity;
 
+use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\RevisionableContentEntityBase;
@@ -83,6 +84,10 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface
   /**
    * {@inheritdoc}
    */
+
+  public static function loadFromUrlQueryParameter(string $param) {
+    return self::load(\Drupal::request()->query->get($param));
+  }
   public static function preCreate(EntityStorageInterface $storage_controller, array &$values)
   {
     parent::preCreate($storage_controller, $values);
@@ -91,6 +96,26 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface
     ];
   }
 
+  public function getCaseProviderIds(int $role_id = null): array {
+    $case_provision_ids = $this->getCaseProvisionIds();
+    $provider_ids = [];
+    foreach($case_provision_ids as $id) {
+      $provision = \Drupal::entityTypeManager()->getStorage('oc_case_provision')->load($id);
+      if ($provision instanceOf OCCaseProvision) {
+        if (is_null($role_id) || $role_id == $provision->get('oc_case_provider_role')->target_id)  {
+          $provider_ids[] = $provision->get('oc_provider')->target_id;
+        }
+      }
+    }
+    return $provider_ids;
+  }
+
+  private function getCaseProvisionIds(): array {
+    $query = \Drupal::entityTypeManager()->getStorage('oc_case_provision')->getQuery();
+    $query->condition('oc_case.target_id', $this->id());
+    return $query->execute();
+  }
+
   public function deleteCaseProvisions(): void {
     $this->deleteChildren('oc_case_provision');
   }
@@ -98,8 +123,7 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface
     $this->deleteChildren('oc_activity');
   }
 
-
-  public function deleteChildren($child_entity_type):void {
+  private function deleteChildren($child_entity_type):void {
     $query = \Drupal::entityQuery($child_entity_type)
       ->condition('oc_case.target_id', $this->id());
     $ids =  $query->execute();
@@ -116,6 +140,16 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface
     else return [];
   }
 
+  public function getTargetEntity(): ContentEntityBase {
+    if (!$this->oc_target->isEmpty()) {
+      return $this->oc_target->entity;
+    } elseif ($this->hasField('client') && !$this->client->isEmpty()) {
+      return $this->client->entity;
+    } else {
+      throw new \Exception('No target found on case');
+    }
+  }
+
   /**
    * {@inheritdoc}
    */

modules/opencase_cases/src/Entity/OCCaseFee.php

@@ -230,7 +230,8 @@ class OCCaseFee extends EditorialContentEntityBase implements OCCaseFeeInterface
       ->setLabel(t('Visible'))
       ->setDescription(t('A boolean indicating whether the Case Fee is published.'))
       ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE);
+      ->setDisplayConfigurable('view', TRUE)
+      ->setDefaultValue(TRUE);
 
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))

modules/opencase_cases/src/Form/OCCaseForm.php

@@ -36,7 +36,7 @@ class OCCaseForm extends ContentEntityForm {
   /**
    * {@inheritdoc}
    */
-  public function save(array $form, FormStateInterface $form_state) {
+  public function save(array $form, FormStateInterface $form_state): void {
     $entity = $this->entity;
     $entity->setNewRevision();
     $entity->setRevisionCreationTime(REQUEST_TIME);
@@ -57,7 +57,7 @@ class OCCaseForm extends ContentEntityForm {
         ]));
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
-    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished case entities')) {
+    if (!$this->isPublished($form_state) && !\Drupal::currentUser()->hasPermission('view unpublished case entities')) {
       \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [
         '%label' => $entity->label(),
       ]));
@@ -67,4 +67,12 @@ class OCCaseForm extends ContentEntityForm {
     }
   }
 
+  private function isPublished(FormStateInterface $form_state): bool {
+    if (is_null($form_state->getValue('status'))) {
+      return false; // some entities have nothing set for the status in which case we want to treat them as published by default.
+      // TODO why don't they??
+    }
+    return $form_state->getValue('status')['value'];
+  }
+
 }

modules/opencase_cases/src/Plugin/Block/AddCase.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\opencase_cases\Plugin\Block;
-
-use Drupal\Core\Block\BlockBase;
-
-/**
- * Provides a Block for adding a case for the current client
- *
- * @Block(
- *   id = "add_case",
- *   admin_label = @Translation("Add Case"),
- *   category = @Translation("Opencase"),
- * )
- */
-class AddCase extends BlockBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build():array {
-    $target_id = \Drupal::routeMatch()->getParameter('oc_actor')->id();
-    $case_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_case');
-    $markup = "<ul>";
-    foreach($case_types as $id => $info) {
-        $label = $info['label'];
-        $markup .= "<li><a href='/opencase/oc_case/add/$id?target_id=$target_id'>$label</a></li>";
-    }
-    $markup .= "</ul>";
-    return array(
-      '#markup' => $markup
-    );
-  }
-
-
-  public function getCacheMaxAge():int {
-    return 0;
-  }
-
-}

modules/opencase_entities/opencase_entities.install

@@ -4,6 +4,30 @@
 use \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchemaConverter;
 use \Drupal\Core\Field\BaseFieldDefinition;
 
+function opencase_entities_update_90004() {
+  $update_manager = \Drupal::entityDefinitionUpdateManager();
+  $definition = $update_manager->getFieldStorageDefinition('website', 'oc_organisation');
+  $update_manager->uninstallFieldStorageDefinition($definition);
+}
+
+function opencase_entities_update_90003() {
+  $field_storage_definition = BaseFieldDefinition::create('link')
+      ->setLabel(t('Website'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'max_length' => 50,
+        'text_processing' => 0,
+      ])
+      ->setDefaultValue('')
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
+      ->setRequired(FALSE);
+ 
+
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('org_website', 'oc_organisation', 'opencase_entities', $field_storage_definition);
+}
+
 
 function opencase_entities_update_90002() {
   $field_storage_definition = BaseFieldDefinition::create('entity_reference')

modules/opencase_entities/src/Entity/OCActor.php

@@ -211,6 +211,9 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
   public function getCountOfCaseProvisions(array $conditionsToApplyToCaseProvisionQuery = []): int {
     $query = \Drupal::entityQuery('oc_case_provision');
     $query->condition('oc_provider', $this->id()); 
+    foreach($conditionsToApplyToCaseProvisionQuery as $condition) {
+      $query->condition($condition[0], $condition[1], $condition[2] ?? '='); 
+    }
     return count($query->execute());
   }
 
@@ -291,7 +294,7 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setRequired(TRUE);
 
     // Contact details.
-    $fields['email'] = BaseFieldDefinition::create('string')
+    $fields['email'] = BaseFieldDefinition::create('email')
       ->setLabel(t('Email Address'))
       ->setRevisionable(TRUE)
       ->setSettings(array(

modules/opencase_entities/src/Entity/OCOrganisation.php

@@ -211,17 +211,20 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
         'max_length' => 255,
         'text_processing' => 0,
       ));
-    $fields['website'] = BaseFieldDefinition::create('string')
+    
+    $fields['org_website'] = BaseFieldDefinition::create('link')
       ->setLabel(t('Website'))
       ->setRevisionable(TRUE)
       ->setSettings([
-        'max_length' => 50,
         'text_processing' => 0,
+        'title' => 0,
+        'link_type' => 16
       ])
       ->setDefaultValue('')
       ->setDisplayConfigurable('form', true)
       ->setDisplayConfigurable('view', true)
       ->setRequired(FALSE);
+
     $fields['contact_name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Contact Name'))
       ->setDescription(t('Name of the main contact for this organisation.'))
@@ -247,14 +250,10 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
       ->setDisplayConfigurable('form', true)
       ->setDisplayConfigurable('view', true)
       ->setRequired(FALSE);
-    $fields['email'] = BaseFieldDefinition::create('string')
+      
+    $fields['email'] = BaseFieldDefinition::create('email')
       ->setLabel(t('Email Address'))
       ->setRevisionable(TRUE)
-      ->setSettings(array(
-        'default_value' => '',
-        'max_length' => 100,
-        'text_processing' => 0,
-      ))
       ->setDisplayConfigurable('form', true)
       ->setDisplayConfigurable('view', true);
 
@@ -302,7 +301,7 @@ class OCOrganisation extends EditorialContentEntityBase implements OCOrganisatio
       ->setDisplayConfigurable('view', true)
       ->setRequired(FALSE);
 
-    $fields['billing_email'] = BaseFieldDefinition::create('string')
+    $fields['billing_email'] = BaseFieldDefinition::create('email')
       ->setLabel(t('Billing Email Address'))
       ->setRevisionable(TRUE)
       ->setSettings(array(

opencase.links.menu.yml

@@ -56,7 +56,7 @@ opencase.manage_taxonomy_links:
   menu_name: opencase
   parent: opencase.opencase_admin_menu
 opencase.manage_user_logins:
-  title: 'Manage user logins'
+  title: 'Manage User Logins'
   description: 'Manage who can access the system'
   menu_name: opencase
   parent: opencase.opencase_admin_menu

opencase.module

@@ -9,6 +9,25 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\opencase_cases\Entity\OCCase;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\opencase_cases\Entity\OCCaseProvision;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function opencase_form_user_login_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $form['#submit'][] = 'opencase_user_login_form_submit';
+}
+
+/**
+ * If the user does not have permissions to see all cases, then when the login they are
+ * redirected to a view of just their own cases.
+ */
+function opencase_user_login_form_submit($form, FormStateInterface $form_state) {
+  if (!\Drupal::currentUser()->hasPermission('view published case entities')) {
+    $form_state->setRedirectUrl(Url::fromRoute('view.cases_by_provider.page_1'));
+  }  
+}
 
 /**
  * Implements hook_element_info_alter().
@@ -158,18 +177,43 @@ function opencase_entity_field_access($operation, \Drupal\Core\Field\FieldDefini
 }
 
 /*
-  Implementation of hook_relevant_activity_type_ids which is a custom hook invoked in the AddActivity block.
+  Custom hook
 */
-function opencase_relevant_activity_type_ids($actorTypeID) {
-  switch ($actorTypeID) {
+function opencase_relevant_case_type_ids(string $bundle):array {
+  switch ($bundle) {
+    case 'client':
+      return ['accommodation', 'asylum_support', 'employability', 'health', 'immigration', 'welfare_rights'];
     case 'volunteer': 
-      return ['email', 'phone_call', 'supervision'];
+      return ['volunteer_engagement'];
+  }
+  return [];
+}
+
+
+/*
+  Custom hook
+*/
+function opencase_relevant_activity_type_ids(string $entityType, string $bundle):array {
+  if ($entityType == 'oc_actor') {
+    switch ($bundle) {
+      case 'volunteer':
+        return ['email', 'phone_call', 'supervision', 'application', 'interview'];
       case 'client': 
         return ['email', 'lete', 'phone_call', 'case_note', 'destitution_funds_provided', 'research', 'application'];
       case 'staff_member':
           return ['application', 'interview'];
     }
   }
+  if ($entityType == 'oc_case') {
+    switch ($bundle) {
+      case 'volunteer_engagement':
+        return ['email', 'phone_call', 'supervision', 'application', 'interview'];
+      default:
+        return ['email', 'lete', 'phone_call', 'case_note', 'destitution_funds_provided', 'research', 'application'];
+    }  
+  }
+  return [];
+}
 
 /**
  * Implementation of hook_form_alter()

opencase.permissions.yml

@@ -2,4 +2,8 @@ use opencase:
   title: 'Use OpenCase'
   description: 'Use the OpenCase case management system'
   restrict access: true
+view opencase add new things menu:
+  title: 'View OpenCase "add new things" menu'
+  description: 'View OpenCase "add new things" menu'
+  restrict access: true
 

opencase.routing.yml

@@ -5,12 +5,12 @@ opencase.opencase_admin_menu:
 opencase.opencase_cases_menu:
   path: '/'
   requirements:
-    _permission: 'use opencase'
+    _permission: 'view all published case entities'
 opencase.opencase_add_new_things_menu:
   path: '/'
   requirements:
-    _permission: 'use opencase'
+    _permission: 'view add new things menu'
 opencase.opencase_reporting_menu:
   path: '/'
   requirements:
-    _permission: 'use opencase'
+    _permission: 'view reporting menu'

opencase.services.yml

@@ -0,0 +1,13 @@
+services:
+  opencase.breadcrumb:
+  # The namespace + classname from your BreadcrumbBuilderInterface class
+    class: Drupal\opencase\Breadcrumb\BreadcrumbBuilder
+    
+    # Priority determines the order in which Breadcrumb services run.
+    tags:
+      - { name: breadcrumb_builder, priority: 100 }
+
+  opencase.subscriber:
+    class: Drupal\opencase\EventSubscriber\OpencaseSubscriber
+    tags:
+      - { name: event_subscriber }

resources/Client Report-24 May 2022.csv

@@ -0,0 +1,37 @@
+Name,"Accreditation date","Client type","Client subtype","Client Status","Client substatus",Tags,"Umbrella client","Type of umbrella client",Address
+testqweqew,"03 Apr 2022","Nightlife Organisation",,Accredited,"Recently Accredited",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,test,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead","Community Project",,,
+test,,,,Lead,"New lead",,test,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,test,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+test,,,,Lead,"New lead",,,,
+testd,,,,Lead,"New lead",,,,
+Friday,"16 May 2022",,,Accredited,"Recently Accredited","Open Access Session",test,,

resources/Debrief Report-24 May 2022.csv

@@ -0,0 +1,23 @@
+"Date submitted",Training,"Submitted by",view_oc_activity
+"12 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"11 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"17 Sep 2021",,,view
+"23 Oct 2021",,,view
+"23 Oct 2021",,,view
+"12 Nov 2021",,,view
+"12 Nov 2021",,,view
+"16 Nov 2021",,,view

src/Breadcrumb/BreadcrumbBuilder.php

@@ -0,0 +1,105 @@
+<?php  declare(strict_types = 1);
+
+namespace Drupal\opencase\Breadcrumb;
+ 
+use Drupal\Core\Link ;
+use Drupal\Core\Breadcrumb\Breadcrumb;
+use Drupal\opencase_cases\Entity\OCCase;
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\opencase_entities\Entity\OCOrganisation;
+use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
+
+class BreadcrumbBuilder implements BreadcrumbBuilderInterface {
+
+  private string $title;
+  private function addTitle($route_match) {
+    $title = $this->title ?? $this->getPageTitle($route_match);
+    $this->breadcrumb->addLink(Link::createFromRoute($title, '<none>'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(RouteMatchInterface $route_match) {
+      return TRUE;
+  }
+
+  private function getPageTitle($route_match) {
+    $request = \Drupal::request();
+    return \Drupal::service('title_resolver')->getTitle($request, $route_match->getRouteObject());
+  }
+
+  private function addLinksForCaseTarget(ContentEntityBase $entity) {
+    if ($entity instanceof OCOrganisation) {
+      $this->addLinksForOrganisation($entity);
+    }
+  }
+
+  private function addLinksForOrganisation(ContentEntityBase $entity) {
+    $fields = ['field_umbrella_client'];
+    $this->addLinks($entity, $fields);
+  }
+
+  private function addLinksForCase(OCCase $case) {
+    $fields = ['client', 'field_project'];
+    $this->addLinksForCaseTarget($case->getTargetEntity());
+    $this->addLinks($case, $fields);
+  }
+
+  private function addLinks(ContentEntityBase $entity, array $fields) {
+    foreach ($fields as $field) {
+      if ($entity->hasField($field) && !$entity->get($field)->isEmpty()) {
+        $this->breadcrumb->addLink($entity->$field->entity->toLink());
+      }
+    } 
+  }
+ 
+  /**
+   * {@inheritdoc}
+   */
+  public function build(RouteMatchInterface $route_match) {
+    $this->breadcrumb = new Breadcrumb();
+    $this->breadcrumb->addLink(Link::createFromRoute('Home', '<front>'));
+    $params = $route_match->getParameters();
+
+    if ($params->has('oc_activity')) {
+      $activity = $params->get('oc_activity');
+      if (!$activity->get('oc_case')->isEmpty()){
+        $this->addLinksForCase($activity->get('oc_case')->entity);
+      } 
+      $this->addLinks($activity, ['client', 'oc_case']);
+      $this->title = $activity->getName() ?? $activity->type->entity->label();
+    }
+
+    elseif ($params->has('oc_organisation')) {
+      $this->addLinksForOrganisation($params->get('oc_organisation'));
+    }
+
+    elseif ($params->has('oc_case')) {
+      $this->addLinksForCase($params->get('oc_case'));
+    }
+
+    elseif ($params->has('oc_case_fee')) {
+      $case_provision = $params->get('oc_case_fee');
+      $this->addLinksForCase($case_provision->get('oc_case')->entity);
+      $this->addLinks($case_provision, ['oc_case']);
+      $this->title = "Fee";
+    }
+
+    elseif ($params->has('oc_case_provision')) {
+      $case_provision = $params->get('oc_case_provision');
+      $this->addLinksForCase($case_provision->get('oc_case')->entity);
+      $this->addLinks($case_provision, ['oc_case']);
+      $this->title = $case_provision->type->entity->label();
+    }
+
+    $this->addTitle($route_match);
+
+    // Don't forget to add cache control by a route.
+    // Otherwise all pages will have the same breadcrumb.
+    $this->breadcrumb->addCacheContexts(['route']);
+    return $this->breadcrumb;
+  }
+ 
+}

src/EventSubscriber/OpencaseSubscriber.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\opencase\EventSubscriber;
+ 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Drupal\Core\Url;
+ 
+/**
+ * Class OpencaseSubscriber.
+ *
+ * @package Drupal\opencase\EventSubscriber
+ */
+class OpencaseSubscriber implements EventSubscriberInterface {
+
+    private $alternativeHomePage = '/opencase/actors/client';
+
+  /**
+   * Registers the methods in this class that should be listeners.
+   *
+   * @return array
+   *   An array of event listener definitions.
+   */
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['onRequest'];
+    return $events;
+  }
+
+  /**
+   * Manipulates the request object.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   *   The Event to process.
+   */
+  public function onRequest(GetResponseEvent $event): void {
+    if ($this->requestIsForHomePage($event) && $this->currentUserShouldBeDirectedToAlternativeHomePage()){
+        $this->redirectToAlternativeHomePage($event);
+    }
+  }
+
+  private function requestIsForHomePage($event):bool {
+    return $event->getRequest()->getRequestUri() == '/';
+  }
+  
+  private function currentUserShouldBeDirectedToAlternativeHomePage():bool {
+    return $this->currentUserCanSeeAllCases();
+  }
+  private function currentUserCanSeeAllCases():bool {
+    return \Drupal::currentUser()->hasPermission('view all published case entities');
+  }
+
+  private function redirectToAlternativeHomePage(GetResponseEvent $event):void {
+    $redirect_target_url = Url::fromUserInput($this->alternativeHomePage);
+    $response = new RedirectResponse($redirect_target_url->setAbsolute()->toString());
+    $event->setResponse($response);
+  }
+}

src/Plugin/Block/AddActivity.php

@@ -3,6 +3,8 @@
 namespace Drupal\opencase\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
+use Drupal\opencase_cases\Entity\OCCase;
+use Drupal\opencase_entities\Entity\OCActor;
 
 /**
  * Provides a Block with some help text about actor type fields
@@ -19,28 +21,57 @@ class AddActivity extends BlockBase {
      * {@inheritdoc}
      */
     public function build():array {
+        if ($this->isOnACase()) {
+            return $this->makeBlockForAddingActivityToCase();
+        } elseif ($this->isOnAnActor()) {
+            return $this->makeBlockForAddingActivityToActor();
+        }
+        return ['#markup' => 'This block should only be placed on a case or on an actor.'];
+    }
+
+    private function makeBlockForAddingActivityToCase():array {
+        $case = \Drupal::routeMatch()->getParameter('oc_case');
+        $case_id = $case->id();
+        $markup = "<ul>";
+        $bundles = $this->getActivityBundlesFor('oc_case', $case->bundle());
+        foreach($bundles as $bundle => $info) {
+            $label = $info['label'];
+            $markup .= "<li><a href='/opencase/oc_activity/add/$bundle?case_id=$case_id&destination=/opencase/oc_case/$case_id'>$label</a></li>";
+        }
+        $markup .= "</ul>";
+        return array('#markup' => $markup);
+    }
+    private function makeBlockForAddingActivityToActor():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) {
+        $bundles = $this->getActivityBundlesFor('oc_actor', $actor->bundle());
+        foreach($bundles as $bundle => $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 .= "<li><a href='/opencase/oc_activity/add/$bundle?target_id=$target_id&destination=/opencase/oc_actor/$target_id'>$label</a></li>";
         }
         $markup .= "</ul>";
         return array('#markup' => $markup);
     }
 
+    private function isOnACase():bool {
+        return \Drupal::routeMatch()->getParameter('oc_case') instanceof OCCase;
+    }
+
+    private function isOnAnActor():bool {
+        return \Drupal::routeMatch()->getParameter('oc_actor') instanceof OCActor;
+    }
+
+
     public function getCacheMaxAge():int {
         return 0;
     }
 
-    private function getActivityTypesToDisplay(string $actorType): array {
+    private function getActivityBundlesFor(string $entityType, string $bundle): 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]);
+        $relevant_activity_type_ids = \Drupal::moduleHandler()->invokeAll('relevant_activity_type_ids', [$entityType, $bundle]);
         $activity_types_to_display = [];
         foreach ($relevant_activity_type_ids as $type_id) {
             if (array_key_exists($type_id, $implemented_activity_types)) {

src/Plugin/Block/AddCase.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\opencase\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a Block for adding cases to an actor
+ *
+ * @Block(
+ *   id = "add_case",
+ *   admin_label = @Translation("Add Case"),
+ *   category = @Translation("Opencase"),
+ * )
+ */
+class AddCase extends BlockBase {
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build():array {
+        $actor = \Drupal::routeMatch()->getParameter('oc_actor');
+        $target_id = $actor->id();
+        $actorType = $actor->bundle();
+        $markup = "<ul>";
+        $case_types = $this->getCaseTypesToDisplay($actorType);
+        foreach($case_types as $id => $info) {
+            $label = $info['label'];
+            $markup .= "<li><a href='/opencase/oc_case/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 getCaseTypesToDisplay(string $actorType): array {
+        // Client modules will provide a list of what case types (bundles) are relevant for each actor type.
+        // Check if they are implemented, and if so display them.
+        $implemented_case_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_case');
+        $relevant_case_type_ids = \Drupal::moduleHandler()->invokeAll('relevant_case_type_ids', [$actorType]);
+        $case_types_to_display = [];
+        foreach ($relevant_case_type_ids as $type_id) {
+            if (array_key_exists($type_id, $implemented_case_types)) {
+                $case_types_to_display[$type_id] = $implemented_case_types[$type_id];
+            }
+        }
+        return $case_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(),
+        'title' => $eventType->label() . " Event",
         'route_name' => "entity.oc_event.add_form",
         'route_parameters' => ['oc_event_type' => $eventType->id()]
       ] + $base_plugin_definition;

src/Pluraliser.php

@@ -2,8 +2,14 @@
 
 namespace Drupal\opencase;
 
+
 class Pluraliser {
+    const NO_CHANGE = ['Staff'];
     public static function pluralise($text) {
+        if (in_array($text, self::NO_CHANGE)) {
+            return $text;
+        } else {
             return $text . "s";
         }
     }
+}

src/TimeBasedFieldUpdater.php

@@ -2,25 +2,21 @@
 
 namespace Drupal\opencase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\opencase\Utils;
 
 final class TimeBasedFieldUpdater {
 
     private EntityTypeManagerInterface $entityTypeManager;
     private string $date_field;
-    private Utils $utils;
     private string $entity_type;
     private string $date_format;
     private string $bundle;
 
     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->date_format = $date_format;
         $this->entity_type = $entity_type;
@@ -39,7 +35,7 @@ final class TimeBasedFieldUpdater {
             $this->updateEntity($id, $new_values);
         }
     }
-    private function updateEntity(int $entity_id, array $new_values): void {
+    private function updateEntity(string $entity_id, array $new_values): void {
         $entity = $this->entityTypeManager->getStorage($this->entity_type)->load($entity_id);
         foreach($new_values as $new_field=>$new_value) {
             $entity->$new_field = $new_value;

tests/src/Unit/EntityTrait.php

@@ -0,0 +1,38 @@
+<?php 
+namespace Drupal\Tests\opencase\Unit;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+
+trait EntityTrait {
+    public function getEntityTypeManager() {
+        return $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
+    }
+
+    public function getStorage(MockObject $entityTypeManager, string $entityTypeToExpect = ''): MockObject  {
+        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock(); 
+        $entityTypeManager->method('getStorage')->willReturn($storage);  
+        if ($entityTypeToExpect) {
+            $entityTypeManager->expects($this->any())->method('getStorage')->with($entityTypeToExpect)->willReturn($storage);  
+        }
+        return $storage; 
+    }
+
+    public function getQuery(MockObject $storage): MockObject {
+        $query = $this->getMockBuilder('\\Drupal\\Core\\Entity\\Query\\QueryInterface')->getMock();
+        $storage->method('getQuery')->willReturn($query);
+        return $query;
+    }
+
+    public function getEntity(): MockObject {
+        return $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityBase')->disableOriginalConstructor()->getMock();
+    }
+    public function getContainer(array $services): ContainerBuilder {
+        $container = new ContainerBuilder();
+        foreach ($services as $key => $mock) {
+            $container->set($key, $mock);
+        }
+        \Drupal::setContainer($container);
+        return $container;
+    }
+}

tests/src/Unit/OCActivityRevisionRevertFormTest.php

@@ -1,40 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Drupal\Tests\opencase\Unit;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Form\FormState;
-use Drupal\opencase_entities\Form\OCActivityRevisionRevertForm;
-use Drupal\Tests\UnitTestCase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-class OCActivityRevisionRevertFormTest extends UnitTestCase{
-    public function setUp(): void {
-        $container = new ContainerBuilder();
-        $entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
-        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
-        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock();
-        $revision = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\OCActivity')->disableOriginalConstructor()->getMock();
-        $request = new Request([], [], [], [], [], [], [], json_encode([
-            'foo' => 'bar'
-        ]));
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-        $dateFormatter->method('format');
-        $container->set('entity_type.manager', $entityTypeManager);
-        $container->set('date.formatter', $dateFormatter);
-        $entityTypeManager->method('getStorage')->willReturn($storage);
-        $storage->method('loadRevision')->willReturn($revision);
-        $container->set('string_translation', self::getStringTranslationStub());
-        $container->set('request_stack', $requestStack);
-        \Drupal::setContainer($container);
-        $this->reverter = OCActivityRevisionRevertForm::create($container);
-    }
-
-    public function testBuildForm():void {
-        $form = [];
-        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
-    }
-
-}

tests/src/Unit/OCActorRevisionRevertFormTest.php

@@ -1,40 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Drupal\Tests\opencase\Unit;
-
-use Drupal\opencase_entities\Form\OCActorRevisionRevertForm;
-use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Form\FormState;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-
-class OCActorRevisionRevertFormTest extends UnitTestCase{
-    public function setUp(): void {
-        $container = new ContainerBuilder();
-        $entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
-        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
-        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock();
-        $revision = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\OCActor')->disableOriginalConstructor()->getMock();
-        $request = new Request([], [], [], [], [], [], [], json_encode([
-            'foo' => 'bar'
-        ]));
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-        $dateFormatter->method('format');
-        $container->set('entity_type.manager', $entityTypeManager);
-        $container->set('date.formatter', $dateFormatter);
-        $entityTypeManager->method('getStorage')->willReturn($storage);
-        $storage->method('loadRevision')->willReturn($revision);
-        $container->set('string_translation', self::getStringTranslationStub());
-        $container->set('request_stack', $requestStack);
-        \Drupal::setContainer($container);
-        $this->reverter = OCActorRevisionRevertForm::create($container);
-    }
-
-    public function testBuildForm():void {
-        $form = [];
-        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
-    }
-
-}

tests/src/Unit/OCActorTest.php

@@ -0,0 +1,61 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\Tests\opencase\Unit;
+
+use Drupal\Tests\UnitTestCase;
+
+class OCActorTest extends UnitTestCase{
+
+    use EntityTrait;
+
+    public function setUp(): void {
+        $this->etm = $this->getEntityTypeManager();
+        $this->getContainer([
+            'entity_type.manager' => $this->etm
+        ]);
+    }
+
+    public function testGetCountOfCaseProvisionsWithNoExtraConditions(): void{  
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $actor = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\\OCActor')->disableOriginalConstructor()
+            ->onlyMethods(['id'])
+            ->getMock();
+        $actor->expects($this->once())->method('id')->willReturn(5);
+        $query->expects($this->once())->method('condition')->with('oc_provider', 5);
+        $query->expects($this->once())->method('execute')->willReturn([1,2,3,4]);
+        $count = $actor->getCountOfCaseProvisions();
+        $this->assertTrue($count == 4);
+    }
+
+
+    public function testGetCountOfCaseProvisionsWithExtraConditions(): void{  
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $actor = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\\OCActor')->disableOriginalConstructor()
+            ->onlyMethods(['id'])
+            ->getMock();
+        $actor->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->exactly(2))->method('condition')->withConsecutive(
+            ['oc_provider', 5],
+            ['some_date_field', '2022-01-01', '<']);
+        $query->expects($this->once())->method('execute')->willReturn([1,2,3,4]);
+        $count = $actor->getCountOfCaseProvisions([['some_date_field', '2022-01-01', '<']]);
+        $this->assertTrue($count == 4);
+    }
+
+    public function testGetCountOfCaseProvisionsWithExtraConditionsWithAssumedEqualityOperator(): void{  
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $actor = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\\OCActor')->disableOriginalConstructor()
+            ->onlyMethods(['id'])
+            ->getMock();
+        $actor->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->exactly(2))->method('condition')->withConsecutive(
+            ['oc_provider', 5],
+            ['some_date_field', '2022-01-01', '=']);
+        $query->expects($this->once())->method('execute')->willReturn([1,2,3,4]);
+        $count = $actor->getCountOfCaseProvisions([['some_date_field', '2022-01-01']]);
+        $this->assertTrue($count == 4);
+    }
+}

tests/src/Unit/OCCaseRevisionRevertFormTest.php

@@ -1,40 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Drupal\Tests\opencase\Unit;
-
-use Drupal\opencase_cases\Form\OCCaseRevisionRevertForm;
-use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Form\FormState;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-
-class OCCaseRevisionRevertFormTest extends UnitTestCase{
-    public function setUp(): void {
-        $container = new ContainerBuilder();
-        $entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
-        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
-        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock();
-        $revision = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\OCCase')->disableOriginalConstructor()->getMock();
-        $request = new Request([], [], [], [], [], [], [], json_encode([
-            'foo' => 'bar'
-        ]));
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-        $dateFormatter->method('format');
-        $container->set('entity_type.manager', $entityTypeManager);
-        $container->set('date.formatter', $dateFormatter);
-        $entityTypeManager->method('getStorage')->willReturn($storage);
-        $storage->method('loadRevision')->willReturn($revision);
-        $container->set('string_translation', self::getStringTranslationStub());
-        $container->set('request_stack', $requestStack);
-        \Drupal::setContainer($container);
-        $this->reverter = OCCaseRevisionRevertForm::create($container);
-    }
-
-    public function testBuildForm():void {
-        $form = [];
-        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
-    }
-
-}

tests/src/Unit/OCCaseTest.php

@@ -0,0 +1,125 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\Tests\opencase\Unit;
+
+use Drupal\Tests\UnitTestCase;
+
+class OCCaseTest extends UnitTestCase{
+
+    use EntityTrait;
+
+    private $case;
+
+    public function setUp(): void {
+        $this->etm = $this->getEntityTypeManager();
+        $this->getContainer([
+            'entity_type.manager' => $this->etm
+        ]);
+        $this->case = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCase')->disableOriginalConstructor()
+            ->onlyMethods(['id'])
+            ->getMock();
+    }
+   
+    public function testGetCaseProviderIds_SingleCaseProvision(): void{  
+        // It will first get the id of the case provision that references this case
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $this->case->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->once())->method('condition')->with('oc_case.target_id', 5);
+        $query->expects($this->once())->method('execute')->willReturn([1]);
+
+        // Then it will load the provision
+        $provision = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $storage->expects($this->once())->method('load')->with(1)->willReturn($provision);      
+
+        // Then it will get the target id of the provider field from the provision and return it as an array
+        $providerField = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField->target_id = '45';
+        $provision->expects($this->once())->method('get')->with('oc_provider')->willReturn($providerField);
+
+        $ids = $this->case->getCaseProviderIds();
+        $this->assertTrue($ids == [45]);
+    }
+
+       
+    public function testGetCaseProviderIds_MultipleCaseProvisions(): void{  
+        // It will first get the id of the case provisions that reference this case
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $this->case->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->once())->method('condition')->with('oc_case.target_id', 5);
+        $query->expects($this->once())->method('execute')->willReturn([1, 2, 3]);
+
+        // Then it will load the provisions
+        $provision1 = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $provision2 = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $provision3 = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $storage->method('load')->willReturnMap([[1, $provision1], [2, $provision2], [3, $provision3]]);      
+
+        // Then it will get the target id of the provider field from each provision and return them as an array
+        $providerField1 = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField1->target_id = '45';
+        $provision1->expects($this->once())->method('get')->with('oc_provider')->willReturn($providerField1);
+        $providerField2 = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField2->target_id = '55';
+        $provision2->expects($this->once())->method('get')->with('oc_provider')->willReturn($providerField2);
+        $providerField3 = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField3->target_id = '65';
+        $provision3->expects($this->once())->method('get')->with('oc_provider')->willReturn($providerField3);
+
+        $ids = $this->case->getCaseProviderIds();
+        $this->assertTrue($ids == [45, 55, 65]);
+    }
+
+    public function testGetCaseProviderIds_SingleCaseProvision_RoleSpecifiedAndMatched(): void{  
+        // It will first get the id of the case provision that references this case
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $this->case->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->once())->method('condition')->with('oc_case.target_id', 5);
+        $query->expects($this->once())->method('execute')->willReturn([1]);
+
+        // Then it will load the provision
+        $provision = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $storage->expects($this->once())->method('load')->with(1)->willReturn($provision);      
+
+        // Then it will check the role field, and find that the role is the one specified
+        // so it will get the target id of the provider field from the provision and return it as an array
+        $roleField = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $roleField->target_id = '7';        
+        $providerField = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField->target_id = '45';
+        $provision->expects($this->any())->method('get')->withConsecutive(['oc_case_provider_role'], ['oc_provider'])->willReturnMap(
+            [['oc_provider', $providerField], ['oc_case_provider_role', $roleField]]
+        );
+
+        $ids = $this->case->getCaseProviderIds(7);
+        $this->assertTrue($ids == [45]);
+    }
+
+    public function testGetCaseProviderIds_SingleCaseProvision_RoleSpecifiedAndNotMatched(): void{  
+        // It will first get the id of the case provision that references this case
+        $storage = $this->getStorage($this->etm, 'oc_case_provision');
+        $query = $this->getQuery($storage); 
+        $this->case->expects($this->once())->method('id')->willReturn(5);        
+        $query->expects($this->once())->method('condition')->with('oc_case.target_id', 5);
+        $query->expects($this->once())->method('execute')->willReturn([1]);
+
+        // Then it will load the provision
+        $provision = $this->getMockBuilder('\\Drupal\\opencase_cases\\Entity\\OCCaseProvision')->disableOriginalConstructor()->getMock();
+        $storage->expects($this->once())->method('load')->with(1)->willReturn($provision);      
+
+        // Then it will check the role field, and find that the role is *not* the one specified
+        // so it will return nothing
+        $roleField = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $roleField->target_id = '7';        
+        $providerField = $this->getMockBuilder('\\Drupal\\COre\\Field\\FieldItemListInterface')->disableOriginalConstructor()->getMock();
+        $providerField->target_id = '45';
+        $provision->expects($this->any())->method('get')->withConsecutive(['oc_case_provider_role'], ['oc_provider'])->willReturnMap(
+            [['oc_provider', $providerField], ['oc_case_provider_role', $roleField]]
+        );
+
+        $ids = $this->case->getCaseProviderIds(8);
+        $this->assertTrue($ids == []);
+    }
+}

tests/src/Unit/OCOrganisationRevisionRevertFormTest.php

@@ -1,40 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Drupal\Tests\opencase\Unit;
-
-use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Form\FormState;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\opencase_entities\Form\OCOrganisationRevisionRevertForm;
-
-class OCOrganisationRevisionRevertFormTest extends UnitTestCase{
-    public function setUp(): void {
-        $container = new ContainerBuilder();
-        $entityTypeManager = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityTypeManager')->disableOriginalConstructor()->getMock();
-        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
-        $storage = $this->getMockBuilder('\\Drupal\\Core\\Entity\\EntityStorageInterface')->disableOriginalConstructor()->getMock();
-        $revision = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\OCOrganisation')->disableOriginalConstructor()->getMock();
-        $request = new Request([], [], [], [], [], [], [], json_encode([
-            'foo' => 'bar'
-        ]));
-        $requestStack = new RequestStack();
-        $requestStack->push($request);
-        $dateFormatter->method('format');
-        $container->set('entity_type.manager', $entityTypeManager);
-        $container->set('date.formatter', $dateFormatter);
-        $entityTypeManager->method('getStorage')->willReturn($storage);
-        $storage->method('loadRevision')->willReturn($revision);
-        $container->set('string_translation', self::getStringTranslationStub());
-        $container->set('request_stack', $requestStack);
-        \Drupal::setContainer($container);
-        $this->reverter = OCOrganisationRevisionRevertForm::create($container);    
-    }
-
-    public function testBuildForm():void {
-        $form = [];
-        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
-    }
-
-}

tests/src/Unit/RevisionRevertFormTest.php

@@ -0,0 +1,60 @@
+<?php declare(strict_types = 1);
+
+namespace Drupal\Tests\opencase\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\Core\Form\FormState;
+use Drupal\Tests\opencase\Unit\EntityTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Drupal\opencase_cases\Form\OCCaseRevisionRevertForm;
+use Drupal\opencase_entities\Form\OCActorRevisionRevertForm;
+use Drupal\opencase_entities\Form\OCActivityRevisionRevertForm;
+use Drupal\opencase_entities\Form\OCOrganisationRevisionRevertForm;
+
+class RevisionRevertFormTest extends UnitTestCase{
+
+    use EntityTrait;
+
+    public function setUp(): void {
+        $entityTypeManager = $this->getEntityTypeManager();
+        $storage = $this->getStorage($entityTypeManager);
+        $dateFormatter = $this->getMockBuilder('\\Drupal\\Core\\Datetime\\DateFormatterInterface')->disableOriginalConstructor()->getMock();
+        $revision = $this->getMockBuilder('\\Drupal\\opencase_entities\\Entity\OCActivity')->disableOriginalConstructor()->getMock();
+        $request = new Request([], [], [], [], [], [], [], json_encode([
+            'foo' => 'bar'
+        ]));
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+        $dateFormatter->method('format');
+        $storage->method('loadRevision')->willReturn($revision);
+        $this->container = $this->getContainer([
+            'entity_type.manager'=> $entityTypeManager,
+            'date.formatter' => $dateFormatter,
+            'string_translation'=> self::getStringTranslationStub(),
+            'request_stack'=> $requestStack
+        ]);
+
+    }
+
+    public function testBuildFormForRevertingActivity():void {
+        $this->reverter = OCActivityRevisionRevertForm::create($this->container);
+        $form = [];
+        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
+    }
+    public function testBuildFormForRevertingActor():void {
+        $this->reverter = OCActorRevisionRevertForm::create($this->container);
+        $form = [];
+        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
+    }
+    public function testBuildFormForRevertingCase():void {
+        $this->reverter = OCCaseRevisionRevertForm::create($this->container);
+        $form = [];
+        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
+    }
+    public function testBuildFormForRevertingOrganisation():void {
+        $this->reverter = OCOrganisationRevisionRevertForm::create($this->container);
+        $form = [];
+        $this->assertTrue(is_array($this->reverter->buildForm($form, new FormState())));
+    }
+}

tests/src/Unit/TimeBasedFieldUpdaterTest.php

@@ -7,42 +7,39 @@ use Drupal\opencase\TimeBasedFieldUpdater;
 
 class TimeBasedFieldUpdaterTest extends UnitTestCase{
 
+    use EntityTrait;
+
     function setUp():void {
-        /** @var \Drupal\opencase\Utils&\PHPUnit\Framework\MockObject\MockObject $utils */
-        $this->utils = $this->getMockBuilder('\\Drupal\\opencase\\Utils')->disableOriginalConstructor()->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');
+        $this->etm = $this->getEntityTypeManager();
+        $this->storage = $this->getStorage($this->etm);
+        $this->query = $this->getQuery($this->storage);
+        $this->updater = new TimeBasedFieldUpdater($this->etm, 'dummy_entity_type', 'dummy_bundle', 'dummy_date_field');
 
     }
     function testFieldIsUpdatedOnEntityReturnedByQuery():void {
-        $this->query->method('execute')->willReturn([1]);
+        $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]);
         $this->assertEquals($this->entity->dummy_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]]);
+        $this->query->method('execute')->willReturn(['1', '2']);
+        $entity = $this->getEntity();
+        $entity2 = $this->getEntity();
+        $this->storage->method('load')->willReturnMap([['1', $entity], ['2', $entity2]]);
         $this->updater->update([], '3 months', ['dummy_field' => 4]);
-        $this->assertEquals($this->entity->dummy_field, 4);
-        $this->assertEquals($this->entity2->dummy_field, 4);
+        $this->assertEquals($entity->dummy_field, 4);
+        $this->assertEquals($entity2->dummy_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->query->method('execute')->willReturn(['1']);
+        $entity = $this->getEntity();       
+        $this->storage->expects($this->once())->method('load')->with(1)->willReturn($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);
+        $this->assertEquals($entity->dummy_field, 4);
+        $this->assertEquals($entity->dummy_field_2, 5);
 
     }