Added a commented out bit of code for automatic permissions

Also removed some other fields that I'm not sure why were there...

README.md

@@ -2,7 +2,7 @@
 A simple, case-management-focused CRM for small altruistic organisations.
 
 ## Current Status
-**13 May 2018** A demo site, with basic functionality is available at demo.opencase.org.uk. If you are interested, raise an issue and I will get the login to you somehow. 
+**24 July 2018** A demo site, with basic functionality is available at demo.opencase.org.uk. If you are interested, raise an issue and I will get the login to you somehow. 
 
 ## The Plan
 OpenCase will be available as:
@@ -14,4 +14,20 @@ OpenCase will be available as:
 * More details, including user stories for future development, can be found in the [OpenCase Gitbook](https://hoegrammer.gitbooks.io/zen-crm/content/)
 * Raise an issue to contact the developer. 
 
+## Differences between current version (v0.2.6, July 2018) and previous version ##
+
+**Access control**: Previously everyone could see all cases. Now, users can see cases that they are involved in. By creating case you automatically become involve in it (although you can later be removed or remove yourself). Caseworkers can see all clients and volunteer co-ordinators can see all volunteers. Site admins and overseers can see everything.
+
+**Editing types**: As a site admin you can now add, remove and configure types of actor, types of case and types of activity and you can configure fields on these and add your own fields.s
+
+**Relations between types**: For each type of case, you can specify what types of actors (people) can be involved in it, e.g. for a volunteer recruitment case it would be volunteers and/or staff; for a legal advice case maybe clients, volunteers and solicitors. You can also specify what activities belong on what kinds of cases.
+
+## Not done yet ##
+
+* Reporting
+* Donations
+* Anything to do with emails/bounces
+* Any specific guidelines or features relating to the GDPR
+
+
 

config/install/block.block.actortypehelp.yml

@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - system
+  theme:
+    - bartik
+id: actortypehelp
+theme: bartik
+region: content
+weight: -11
+provider: null
+plugin: actor_type_help
+settings:
+  id: actor_type_help
+  label: 'Actor Type Help'
+  provider: opencase
+  label_display: '0'
+visibility:
+  request_path:
+    id: request_path
+    pages: '/admin/opencase/oc_actor_type/*/edit/fields'
+    negate: false
+    context_mapping: {  }

config/install/block.block.opencaseaddactors.yml

@@ -0,0 +1,31 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase-add-actors
+  module:
+    - system
+    - user
+  theme:
+    - bartik
+id: opencaseaddactors
+theme: bartik
+region: sidebar_first
+weight: -8
+provider: null
+plugin: 'system_menu_block:opencase-add-actors'
+settings:
+  id: 'system_menu_block:opencase-add-actors'
+  label: 'Add Actors'
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility:
+  user_role:
+    id: user_role
+    roles:
+      authenticated: authenticated
+    negate: false
+    context_mapping:
+      user: '@user.current_user_context:current_user'

config/install/block.block.opencasecontextualmenu.yml

@@ -15,5 +15,5 @@ settings:
   id: opencase_contextual_menu
   label: 'OpenCase Contextual Menu'
   provider: opencase
-  label_display: visible
+  label_display: '0'
 visibility: {  }

config/install/system.menu.opencase-add-actors.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+id: opencase-add-actors
+label: 'OpenCase Add Actors'
+description: ''
+locked: false

config/install/views.view.activities.yml

@@ -27,7 +27,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -389,7 +389,18 @@ display:
       title: 'Activity List'
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'This case has no activities yet. To add one, use the links in the sidebar to the right.'
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         oc_case:

config/install/views.view.cases.yml

@@ -27,7 +27,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -48,10 +48,23 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: some
+        type: mini
         options:
-          items_per_page: 10
+          items_per_page: 20
           offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+          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
       style:
         type: table
       row:
@@ -434,7 +447,7 @@ display:
           empty_zero: false
           hide_alter_empty: false
           plugin_id: custom
-      filters: {  }
+      filters:
       sorts:
         created:
           id: created
@@ -447,14 +460,25 @@ display:
           exposed: false
           expose:
             label: ''
-          granularity: hour
+          granularity: day
           entity_type: oc_case
           entity_field: created
           plugin_id: date
-      title: 'Case List'
+      title: ''
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<p>Either there are no cases involving this person, or you do not have access to them.</p>\n"
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         actors_involved_target_id:
@@ -495,12 +519,14 @@ display:
           entity_field: actors_involved
           plugin_id: numeric
       display_extenders: {  }
+      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
         - user.roles
       tags: {  }
   page_1:
@@ -511,11 +537,61 @@ display:
     display_options:
       display_extenders: {  }
       path: opencase/oc_actor/%actor_id/case_list
+      defaults:
+        filters: false
+        filter_groups: false
+      filters: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
+        - user.roles
+      tags: {  }
+  page_2:
+    display_plugin: page
+    id: page_2
+    display_title: 'All Cases'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      arguments: {  }
+      defaults:
+        arguments: false
+        filters: false
+        filter_groups: false
+        empty: false
+      path: opencase/all-cases
+      filters:
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<h1>No cases found</h1>\n<p>You do not have access to any existing cases.</p>\n<p>To <b>add a new case</b>, first search for the person you want to add a case to. If they are not on the system yet you can add them using the <b>Add actors</b> menu in the left sidebar.</p>\n"
+          plugin_id: text_custom
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
         - user.roles
       tags: {  }

css/opencase.css

@@ -1,3 +1,6 @@
+body {
+  font-size: 100% !important;
+}
 
 /* Free the people from the tyranny of the useless search button */
 #edit-submit-actor-search{

modules/opencase_defaults/config/optional/block.block.facet_asylum_status.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.asylum_status
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_asylum_status
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:asylum_status'
+settings:
+  id: 'facet_block:asylum_status'
+  label: 'Asylum Status'
+  provider: facets
+  label_display: visible
+  block_id: facet_asylum_status
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.facet_created.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.created
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_created
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:created'
+settings:
+  id: 'facet_block:created'
+  label: 'Created Date'
+  provider: facets
+  label_display: visible
+  block_id: facet_created
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.facet_disability.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.disability
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_disability
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:disability'
+settings:
+  id: 'facet_block:disability'
+  label: 'Disability'
+  provider: facets
+  label_display: visible
+  block_id: facet_disability
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.facet_gender_identified_with.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.gender_identified_with
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_gender_identified_with
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:gender_identified_with'
+settings:
+  id: 'facet_block:gender_identified_with'
+  label: 'Gender Identity'
+  provider: facets
+  label_display: visible
+  block_id: facet_gender_identified_with
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.facet_languages.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.languages
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_languages
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:languages'
+settings:
+  id: 'facet_block:languages'
+  label: 'Languages'
+  provider: facets
+  label_display: visible
+  block_id: facet_languages
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.facet_nationality.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.nationality
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_nationality
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:nationality'
+settings:
+  id: 'facet_block:nationality'
+  label: 'Nationality'
+  provider: facets
+  label_display: visible
+  block_id: facet_nationality
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/clients'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/block.block.osiclevel.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.osic_level
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: osiclevel
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:osic_level'
+settings:
+  id: 'facet_block:osic_level'
+  label: 'OSIC level'
+  provider: facets
+  label_display: visible
+  block_id: osiclevel
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/*'
+    negate: false
+    context_mapping: {  }

modules/opencase_defaults/config/optional/contact.form.contact_opencase.yml

@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies: {  }
+id: contact_opencase
+label: 'Contact the OpenCase Developers'
+recipients:
+  - naomi@aktivix.org
+reply: ''
+weight: 0
+message: 'Thank you for your message. The OpenCase team will get back to you ASAP.'
+redirect: ''

modules/opencase_defaults/config/optional/contact.settings.yml

@@ -0,0 +1,5 @@
+default_form: contact_opencase
+flood:
+  limit: 5
+  interval: 3600
+user_default_enabled: false

modules/opencase_defaults/config/optional/core.base_field_override.oc_case.volunteer_engagement.actors_involved.yml

@@ -3,7 +3,6 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
     - opencase_entities.oc_case_type.volunteer_engagement
 id: oc_case.volunteer_engagement.actors_involved
 field_name: actors_involved
@@ -18,7 +17,6 @@ default_value_callback: 'Drupal\opencase_entities\Entity\OCCase::defaultVal'
 settings:
   handler_settings:
     target_bundles:
-      client: client
       volunteer: volunteer
   handler: default
 field_type: entity_reference

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

@@ -15,7 +15,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_funds_for:
     weight: 27

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

@@ -25,12 +25,10 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 35
+    weight: 6
-    settings:
+    settings: {  }
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   field_client_field_1:
     weight: 26
@@ -41,20 +39,20 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 39
+    weight: 15
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_date_of_birth:
-    weight: 27
+    weight: 3
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 36
+    weight: 12
     settings:
       size: 60
       placeholder: ''
@@ -62,7 +60,7 @@ content:
     type: string_textfield
     region: content
   field_disability:
-    weight: 31
+    weight: 10
     settings:
       size: 60
       placeholder: ''
@@ -70,7 +68,7 @@ content:
     type: string_textfield
     region: content
   field_ethnic_o:
-    weight: 33
+    weight: 7
     settings:
       size: 60
       placeholder: ''
@@ -78,39 +76,37 @@ content:
     type: string_textfield
     region: content
   field_gender_identified_with:
-    weight: 30
+    weight: 4
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_how_heard:
-    weight: 37
+    weight: 13
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_income:
-    weight: 34
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_languages_spoken:
-    weight: 32
+    weight: 9
-    settings:
+    settings: {  }
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   field_marital_:
-    weight: 29
+    weight: 5
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_nationality:
-    weight: 28
+    weight: 8
     settings:
       size: 60
       placeholder: ''
@@ -118,7 +114,7 @@ content:
     type: string_textfield
     region: content
   field_referred_by:
-    weight: 38
+    weight: 14
     settings:
       size: 60
       placeholder: ''
@@ -135,7 +131,7 @@ content:
     third_party_settings: {  }
   phone:
     type: string_textfield
-    weight: 2
+    weight: 0
     region: content
     settings:
       size: 60
@@ -143,7 +139,7 @@ content:
     third_party_settings: {  }
   phone2:
     type: string_textfield
-    weight: 3
+    weight: 1
     region: content
     settings:
       size: 60
@@ -151,7 +147,7 @@ content:
     third_party_settings: {  }
   postal_address:
     type: string_textarea
-    weight: 5
+    weight: 2
     region: content
     settings:
       rows: 5

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

@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.field.oc_actor.volunteer.field_languages_spoken
     - field.field.oc_actor.volunteer.field_nationality
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
     - opencase_entities.oc_actor_type.volunteer
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -11,68 +13,31 @@ bundle: volunteer
 mode: default
 content:
   field_languages_spoken:
-    weight: 28
+    weight: 1
-    settings:
+    settings: {  }
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   field_nationality:
-    weight: 27
+    weight: 0
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
-  field_sdfdsfds:
+  field_osic_level:
-    weight: 26
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-    type: text_textarea
-    region: content
-  name:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone:
-    type: string_textfield
     weight: 2
-    region: content
+    settings: {  }
-    settings:
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-  phone2:
+    type: options_select
-    type: string_textfield
+    region: content
+  field_skills:
+    type: string_textarea
     weight: 3
     region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 5
-    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 5
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    region: content
-    third_party_settings: {  }
 hidden: {  }

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

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 26

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

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

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

@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_gave_list_of_agencies:
     weight: 27

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

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

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

@@ -33,7 +33,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_level:
     weight: 26

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

@@ -32,7 +32,7 @@ content:
     settings:
       placeholder: ''
     third_party_settings: {  }
-    type: number_decimal
+    type: number
     region: content
   field_outcome:
     weight: 30

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

@@ -27,12 +27,11 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 15
+    weight: 6
     label: above
-    settings:
+    settings: {  }
-      link_to_entity: false
     third_party_settings: {  }
-    type: string
+    type: list_default
     region: content
   field_client_field_1:
     weight: 1
@@ -43,7 +42,7 @@ content:
     type: string
     region: content
   field_confidentiality_form:
-    weight: 19
+    weight: 15
     label: above
     settings:
       use_description_as_link_text: true
@@ -51,60 +50,15 @@ content:
     type: file_default
     region: content
   field_date_of_birth:
-    weight: 7
+    weight: 3
     label: above
     settings:
-      format_type: medium
       timezone_override: ''
+      format_type: short
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 16
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_disability:
-    weight: 11
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_ethnic_o:
-    weight: 13
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_gender_identified_with:
-    weight: 10
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_how_heard:
-    weight: 17
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_income:
-    weight: 14
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_languages_spoken:
     weight: 12
     label: above
     settings:
@@ -112,13 +66,57 @@ content:
     third_party_settings: {  }
     type: string
     region: content
-  field_marital_:
+  field_disability:
+    weight: 10
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  field_ethnic_o:
+    weight: 7
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  field_gender_identified_with:
+    weight: 4
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_how_heard:
+    weight: 13
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_income:
+    weight: 11
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_languages_spoken:
     weight: 9
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
+  field_marital_:
+    weight: 5
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
   field_nationality:
     weight: 8
     label: above
@@ -128,7 +126,7 @@ content:
     type: string
     region: content
   field_referred_by:
-    weight: 18
+    weight: 14
     label: above
     settings:
       link_to_entity: false
@@ -143,27 +141,4 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-  phone:
-    label: above
-    type: string
-    weight: 2
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  phone2:
-    label: above
-    type: string
-    weight: 3
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  postal_address:
-    label: above
-    type: basic_string
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
 hidden: {  }

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

@@ -4,8 +4,11 @@ dependencies:
   config:
     - field.field.oc_actor.volunteer.field_languages_spoken
     - field.field.oc_actor.volunteer.field_nationality
+    - field.field.oc_actor.volunteer.field_osic_level
+    - field.field.oc_actor.volunteer.field_skills
     - opencase_entities.oc_actor_type.volunteer
   module:
+    - options
     - user
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -13,20 +16,26 @@ bundle: volunteer
 mode: default
 content:
   field_languages_spoken:
-    weight: 8
+    weight: 4
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_nationality:
+    weight: 3
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
-  field_nationality:
+  field_osic_level:
-    weight: 7
+    weight: 5
     label: above
-    settings:
+    settings: {  }
-      link_to_entity: false
     third_party_settings: {  }
-    type: string
+    type: list_default
     region: content
   field_sdfdsfds:
     weight: 1
@@ -35,6 +44,13 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  field_skills:
+    type: basic_string
+    weight: 6
+    region: content
+    label: above
+    settings: {  }
+    third_party_settings: {  }
   name:
     label: above
     type: string
@@ -46,7 +62,7 @@ content:
   phone:
     label: above
     type: string
-    weight: 2
+    weight: 0
     region: content
     settings:
       link_to_entity: false
@@ -54,7 +70,7 @@ content:
   phone2:
     label: above
     type: string
-    weight: 3
+    weight: 1
     region: content
     settings:
       link_to_entity: false
@@ -62,7 +78,7 @@ content:
   postal_address:
     label: above
     type: basic_string
-    weight: 5
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }

modules/opencase_defaults/config/optional/facets.facet.asylum_status.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: asylum_status
+name: 'Asylum status'
+url_alias: asylum_status
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_asylum_status
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.asylum_status_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: asylum_status_export
+name: 'Asylum status'
+url_alias: asylum_status
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_asylum_status
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.created.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: created
+name: Created
+url_alias: created
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: -8
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -9
+    settings:
+      sort: DESC
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.created_export.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+  module:
+    - views_data_export
+id: created_export
+name: 'Created - Export'
+url_alias: created
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false
+

modules/opencase_defaults/config/optional/facets.facet.disability.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: disability
+name: 'Disability'
+url_alias: disability
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_disability
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.disability_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: disability_export
+name: 'Disability'
+url_alias: disability
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_disability
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.gender_identified_with.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: gender_identified_with
+name: 'Gender Identity'
+url_alias: gender_identified_with
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_gender_identified_with
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.gender_identified_with_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: gender_identified_with_export
+name: 'Gender Identity'
+url_alias: gender_identified_with
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_gender_identified_with
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.languages.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: languages
+name: 'Languages'
+url_alias: languages
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_languages_spoken
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.languages_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: languages_export
+name: 'Languages'
+url_alias: languages
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_languages_spoken
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.nationality.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: nationality
+name: 'Nationality'
+url_alias: nationality
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_nationality
+facet_source_id: 'search_api:views_page__reporting_clients__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.nationality_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_clients
+    - views.view.reporting_clients
+  module:
+    - search_api
+id: nationality_export
+name: 'Nationality'
+url_alias: nationality
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_nationality
+facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.osic_level.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_volunteers
+    - views.view.reporting_volunteers
+  module:
+    - search_api
+id: osic_level
+name: 'OSIC level'
+url_alias: osic_level
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_osic_level
+facet_source_id: 'search_api:views_page__reporting_volunteers__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/facets.facet.osic_level_export.yml

@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_volunteers
+    - views.view.reporting_volunteers
+  module:
+    - search_api
+id: osic_level_export
+name: 'OSIC level (Export)'
+url_alias: osic_level
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_osic_level
+facet_source_id: 'search_api:views_data_export__reporting_volunteers__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: false
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_asylum_status.yml

@@ -4,6 +4,8 @@ dependencies:
   config:
     - field.storage.oc_actor.field_asylum_status
     - opencase_entities.oc_actor_type.client
+  module:
+    - options
 id: oc_actor.client.field_asylum_status
 field_name: field_asylum_status
 entity_type: oc_actor
@@ -15,4 +17,4 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_languages_spoken.yml

@@ -4,15 +4,17 @@ dependencies:
   config:
     - field.storage.oc_actor.field_languages_spoken
     - opencase_entities.oc_actor_type.client
+  module:
+    - options
 id: oc_actor.client.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
 bundle: client
 label: 'Languages spoken'
-description: ''
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
 required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_languages_spoken.yml

@@ -4,15 +4,17 @@ dependencies:
   config:
     - field.storage.oc_actor.field_languages_spoken
     - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
 id: oc_actor.volunteer.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
 bundle: volunteer
 label: 'Languages spoken'
-description: ''
+description: 'Hold down <b>Ctrl</b> (or the Mac equivalent) while clicking, and you can select more than one.'
 required: false
 translatable: true
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: string
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_osic_level.yml

@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_osic_level
+    - opencase_entities.oc_actor_type.volunteer
+  module:
+    - options
+id: oc_actor.volunteer.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+bundle: volunteer
+label: 'OSIC level'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string

modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_skills.yml

@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_skills
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.field_skills
+field_name: field_skills
+entity_type: oc_actor
+bundle: volunteer
+label: Skills
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long

modules/opencase_defaults/config/optional/field.storage.oc_activity.field_amount.yml

@@ -6,7 +6,7 @@ dependencies:
 id: oc_activity.field_amount
 field_name: field_amount
 entity_type: oc_activity
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_asylum_status.yml

@@ -3,15 +3,21 @@ status: true
 dependencies:
   module:
     - opencase_entities
+    - options
 id: oc_actor.field_asylum_status
 field_name: field_asylum_status
 entity_type: oc_actor
-type: string
+type: list_string
 settings:
-  max_length: 255
+  allowed_values:
-  is_ascii: false
+    -
-  case_sensitive: false
+      value: Refused
-module: core
+      label: Refused
+    -
+      value: 'Leave to remain'
+      label: 'Leave to remain'
+  allowed_values_function: ''
+module: options
 locked: false
 cardinality: 1
 translatable: true

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_languages_spoken.yml

@@ -3,15 +3,30 @@ status: true
 dependencies:
   module:
     - opencase_entities
+    - options
 id: oc_actor.field_languages_spoken
 field_name: field_languages_spoken
 entity_type: oc_actor
-type: string
+type: list_string
 settings:
-  max_length: 255
+  allowed_values:
-  is_ascii: false
+    -
-  case_sensitive: false
+      value: English
-module: core
+      label: English
+    -
+      value: French
+      label: French
+    -
+      value: Arabic
+      label: Arabic
+    -
+      value: Kurdish
+      label: Kurdish
+    -
+      value: Farsi
+      label: Farsi
+  allowed_values_function: ''
+module: options
 locked: false
 cardinality: -1
 translatable: true

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_osic_level.yml

@@ -0,0 +1,32 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - options
+id: oc_actor.field_osic_level
+field_name: field_osic_level
+entity_type: oc_actor
+type: list_string
+settings:
+  allowed_values:
+    -
+      value: 'Under supervision'
+      label: 'Under supervision'
+    -
+      value: 'Level 1'
+      label: 'Level 1'
+    -
+      value: 'Level 2'
+      label: 'Level 2'
+    -
+      value: 'Level 3'
+      label: 'Level 3'
+  allowed_values_function: ''
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_defaults/config/optional/field.storage.oc_actor.field_skills.yml

@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_actor.field_skills
+field_name: field_skills
+entity_type: oc_actor
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

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

@@ -6,7 +6,7 @@ dependencies:
 id: oc_case.field_fee_or_equivalent_cost
 field_name: field_fee_or_equivalent_cost
 entity_type: oc_case
-type: number_decimal
+type: decimal
 settings:
   precision: 10
   scale: 2

modules/opencase_defaults/config/optional/opencase_entities.oc_activity_type.supervision.yml

@@ -0,0 +1,5 @@
+langcode: en
+status: true
+dependencies: {  }
+id: supervision
+label: Supervision

modules/opencase_defaults/config/optional/opencase_entities.oc_case_type.volunteer_engagement.yml

@@ -10,6 +10,7 @@ allowedActivityTypes:
   interview: interview
   lete: lete
   research: research
+  supervision: supervision
   telephone_call: telephone_call
   volunteer_training_session: volunteer_training_session
   destitution_funds_provided: 0

modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_cases.yml

@@ -0,0 +1,57 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - search_api
+  config:
+    - field.storage.oc_case.field_outcome
+    - search_api.server.opencase_reporting_server
+id: opencase_reporting_cases
+name: 'OpenCase Reporting: Cases'
+description: ''
+read_only: false
+field_settings:
+  actors_involved:
+    label: 'Involved Parties'
+    datasource_id: 'entity:oc_case'
+    property_path: actors_involved
+    type: integer
+    dependencies:
+      module:
+        - opencase_entities
+  created:
+    label: Created
+    datasource_id: 'entity:oc_case'
+    property_path: created
+    type: date
+    dependencies:
+      module:
+        - opencase_entities
+  field_outcome:
+    label: Outcome
+    datasource_id: 'entity:oc_case'
+    property_path: field_outcome
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_case.field_outcome
+datasource_settings:
+  'entity:oc_case':
+    bundles:
+      default: true
+      selected: {  }
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_clients.yml

@@ -0,0 +1,86 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_asylum_status
+    - field.storage.oc_actor.field_disability
+    - field.storage.oc_actor.field_gender_identified_with
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_nationality
+    - search_api.server.opencase_reporting_server
+  module:
+    - opencase_entities
+    - search_api
+id: opencase_reporting_clients
+name: 'OpenCase Reporting: Clients'
+description: ''
+read_only: false
+field_settings:
+  created:
+    label: Created
+    datasource_id: 'entity:oc_actor'
+    property_path: created
+    type: date
+    dependencies:
+      module:
+        - opencase_entities
+  field_asylum_status:
+    label: 'Asylum status'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_asylum_status
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_asylum_status
+  field_disability:
+    label: Disability
+    datasource_id: 'entity:oc_actor'
+    property_path: field_disability
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_disability
+  field_gender_identified_with:
+    label: 'Gender identified with'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_gender_identified_with
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_gender_identified_with
+  field_languages_spoken:
+    label: 'Languages spoken'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_languages_spoken
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_languages_spoken
+  field_nationality:
+    label: Nationality
+    datasource_id: 'entity:oc_actor'
+    property_path: field_nationality
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_nationality
+datasource_settings:
+  'entity:oc_actor':
+    bundles:
+      default: false
+      selected:
+        - client
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_volunteers.yml

@@ -0,0 +1,50 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - search_api
+  config:
+    - field.storage.oc_actor.field_osic_level
+    - search_api.server.opencase_reporting_server
+id: opencase_reporting_volunteers
+name: 'OpenCase Reporting: Volunteers'
+description: ''
+read_only: false
+field_settings:
+  created:
+    label: Created
+    datasource_id: 'entity:oc_actor'
+    property_path: created
+    type: date
+    dependencies:
+      module:
+        - opencase_entities
+  field_osic_level:
+    label: 'OSIC level'
+    datasource_id: 'entity:oc_actor'
+    property_path: field_osic_level
+    type: string
+    dependencies:
+      config:
+        - field.storage.oc_actor.field_osic_level
+datasource_settings:
+  'entity:oc_actor':
+    bundles:
+      default: false
+      selected:
+        - volunteer
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_defaults/config/optional/user.role.caseworker.yml

@@ -12,5 +12,9 @@ permissions:
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete client entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
+  - 'use opencase'
+  - 'view own cases'
   - 'view published client entities'

modules/opencase_defaults/config/optional/user.role.opencase_admin.yml

@@ -6,16 +6,30 @@ label: 'CRM Admin'
 weight: 7
 is_admin: null
 permissions:
+  - 'add activity entities'
+  - 'add case entities'
   - 'add client entities'
   - 'add volunteer entities'
+  - 'administer oc_activity display'
   - 'administer oc_activity fields'
+  - 'administer oc_activity form display'
+  - 'administer oc_actor display'
   - 'administer oc_actor fields'
+  - 'administer oc_actor form display'
   - 'administer oc_case fields'
+  - 'administer oc_case form display'
   - 'administer opencase entity bundles'
   - 'administer users'
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete client entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
   - 'edit volunteer entities'
+  - 'use opencase'
+  - 'view published activity entities'
+  - 'view published case entities'
+  - 'view published client entities'
+  - 'view published volunteer entities'

modules/opencase_defaults/config/optional/user.role.overseer.yml

@@ -14,7 +14,11 @@ permissions:
   - 'delete case entities'
   - 'delete client entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit client entities'
   - 'edit volunteer entities'
+  - 'use opencase'
+  - 'view published case entities'
   - 'view published client entities'
   - 'view published volunteer entities'

modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml

@@ -7,9 +7,13 @@ weight: 6
 is_admin: null
 permissions:
   - 'add activity entities'
+  - 'add case entities'
   - 'add volunteer entities'
   - 'delete activity entities'
   - 'delete case entities'
   - 'delete volunteer entities'
+  - 'edit activity entities'
+  - 'edit case entities'
   - 'edit volunteer entities'
+  - 'use opencase'
   - 'view published volunteer entities'

modules/opencase_defaults/config/optional/views.view.reporting_clients.yml

@@ -0,0 +1,724 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_asylum_status
+    - field.storage.oc_actor.field_disability
+    - field.storage.oc_actor.field_gender_identified_with
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_nationality
+    - search_api.index.opencase_reporting_clients
+  content:
+    - 'block_content:basic:944ff38d-5931-4439-91d5-f53b5ad7aac7'
+  module:
+    - options
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_clients
+label: 'Reporting: Clients'
+module: views
+description: ''
+tag: ''
+base_table: search_api_index_opencase_reporting_clients
+base_field: search_api_id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'use opencase'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+      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
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          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
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+      row:
+        type: fields
+      fields:
+        first_name:
+          id: first_name
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'First Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        last_name:
+          id: last_name
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        field_asylum_status:
+          id: field_asylum_status
+          table: search_api_index_opencase_reporting_clients
+          field: field_asylum_status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Asylum status'
+          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: list_default
+          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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: null
+          entity_field: null
+          plugin_id: search_api_field
+        field_disability:
+          id: field_disability
+          table: search_api_index_opencase_reporting_clients
+          field: field_disability
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Disability
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          plugin_id: search_api_field
+        field_gender_identified_with:
+          id: field_gender_identified_with
+          table: search_api_index_opencase_reporting_clients
+          field: field_gender_identified_with
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Gender ID'
+          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: list_default
+          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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          plugin_id: search_api_field
+        field_languages_spoken:
+          id: field_languages_spoken
+          table: search_api_index_opencase_reporting_clients
+          field: field_languages_spoken
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Languages
+          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: list_default
+          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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          plugin_id: search_api_field
+        field_nationality:
+          id: field_nationality
+          table: search_api_index_opencase_reporting_clients
+          field: field_nationality
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Nationality
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          plugin_id: search_api_field
+        post_code:
+          id: post_code
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: post_code
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Post Code'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+      filters: {  }
+      sorts: {  }
+      title: 'Client Report'
+      header:
+        entity_block_content:
+          id: entity_block_content
+          table: views
+          field: entity_block_content
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: true
+          target: 944ff38d-5931-4439-91d5-f53b5ad7aac7
+          view_mode: default
+          bypass_access: false
+          plugin_id: entity
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_disability'
+        - 'config:field.storage.oc_actor.field_gender_identified_with'
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_nationality'
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/clients
+      filename: '[view:title].csv'
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_disability'
+        - 'config:field.storage.oc_actor.field_gender_identified_with'
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_nationality'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/clients
+      cache:
+        type: none
+      defaults:
+        cache: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_disability'
+        - 'config:field.storage.oc_actor.field_gender_identified_with'
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_nationality'

modules/opencase_defaults/config/optional/views.view.reporting_volunteers.yml

@@ -0,0 +1,530 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_osic_level
+    - search_api.index.opencase_reporting_volunteers
+  content:
+    - 'block_content:basic:944ff38d-5931-4439-91d5-f53b5ad7aac7'
+  module:
+    - csv_serialization
+    - options
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_volunteers
+label: 'Reporting: Volunteers'
+module: views
+description: ''
+tag: ''
+base_table: search_api_index_opencase_reporting_volunteers
+base_field: search_api_id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'use opencase'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+      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
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          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
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+      row:
+        type: fields
+      fields:
+        first_name:
+          id: first_name
+          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'First Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: 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: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        last_name:
+          id: last_name
+          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        created:
+          id: created
+          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Created Date'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: 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: timestamp
+          settings:
+            date_format: medium
+            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
+          field_rendering: true
+          fallback_handler: search_api_date
+          fallback_options:
+            date_format: fallback
+            custom_date_format: ''
+            timezone: ''
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        field_osic_level:
+          id: field_osic_level
+          table: search_api_index_opencase_reporting_volunteers
+          field: field_osic_level
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'OSIC Level'
+          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: list_default
+          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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: null
+          entity_field: null
+          plugin_id: search_api_field
+        field_languages_spoken:
+          id: field_languages_spoken
+          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          field: field_languages_spoken
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Languages
+          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: list_default
+          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
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+      filters: {  }
+      sorts: {  }
+      title: 'Volunteer Report'
+      header:
+        entity_block_content:
+          id: entity_block_content
+          table: views
+          field: entity_block_content
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: true
+          target: 944ff38d-5931-4439-91d5-f53b5ad7aac7
+          view_mode: default
+          bypass_access: false
+          plugin_id: entity
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/volunteers
+      filename: '[view:title].csv'
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+          xls_settings:
+            xls_format: Excel2007
+            metadata:
+              creator: ''
+              last_modified_by: ''
+              title: ''
+              description: ''
+              subject: ''
+              keywords: ''
+              category: ''
+              manager: ''
+              company: ''
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/volunteers
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'

modules/opencase_defaults/opencase_defaults.info.yml

@@ -3,3 +3,8 @@ type: module
 description: 'Actor types, case types, activity types and user roles suited to an asylum advice group'
 core: 8.x
 package: 'OpenCase'
+dependencies:
+  - contact
+  - field
+  - opencase_entities
+  - options

modules/opencase_defaults/opencase_defaults.links.menu.yml

@@ -1,12 +1,12 @@
-opencase.add_volunteer:
+opencase_reporting.clients:
-  title: 'Add a new volunteer'
+  title: 'Clients'
-  description: 'Create a new volunteer record'
+  description: 'Report on clients'
-  menu_name: opencase-add-actors
+  menu_name: opencase_reporting
-  url: internal:/opencase/oc_actor/add/volunteer
+  url: internal:/opencase/reporting/clients
   weight: 0
-opencase.add_client:
+opencase_reporting.volunteers:
-  title: 'Add a new client'
+  title: 'Volunteers'
-  description: 'Create a new client record'
+  description: 'Report on volunteers'
-  menu_name: opencase-add-actors
+  menu_name: opencase_reporting
-  url: internal:/opencase/oc_actor/add/client
+  url: internal:/opencase/reporting/volunteers
   weight: 1

modules/opencase_defaults/opencase_defaults.module

@@ -6,6 +6,26 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * When a new actor type is created, this gives the CRM Admin and Overseer roles permission
+ * to view, edit and delete them.
+ */
+#function opencase_defaults_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
+#  if (get_class($entity) == 'Drupal\opencase_entities\Entity\OCActorType') {
+#    $type = $entity->id();
+#    $roles = Role::loadMultiple(['opencase_admin', 'overseer']);
+#    foreach ($roles as $role) {
+#      $role->grantPermission("view published $type entities");
+#      $role->grantPermission("edit $type entities");
+#      $role->grantPermission("delete $type entities");
+#      $role->grantPermission("add new $type entities");
+#    }
+#    \Drupal::logger('foo')->notice("<pre>".print_r(user_role_permissions(['overseer']), true) . "</pre>");
+#  }
+#}
 
 /**
  * Implements hook_help().

modules/opencase_entities/config/install/field.field.user.user.field_linked_opencase_actor.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_linked_opencase_actor
+  module:
+    - user
+id: user.user.field_linked_opencase_actor
+field_name: field_linked_opencase_actor
+entity_type: user
+bundle: user
+label: 'Person in OpenCase'
+description: 'If this user is also a person in OpenCase (e.g. a staff member or a volunteer), start typing the name here to link them. This will ensure they have access to the right cases.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:oc_actor'
+  handler_settings:
+    target_bundles:
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference

modules/opencase_entities/config/install/field.storage.user.field_linked_opencase_actor.yml

@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - user
+id: user.field_linked_opencase_actor
+field_name: field_linked_opencase_actor
+entity_type: user
+type: entity_reference
+settings:
+  target_type: oc_actor
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/opencase_entities/opencase_entities.module

@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\opencase_entities\CaseInvolvement;
 
 /**
  * Implements hook_help().
@@ -111,3 +112,30 @@ function opencase_entities_theme_suggestions_oc_activity(array $variables) {
   $suggestions[] = 'oc_activity__' . $entity->id() . '__' . $sanitized_view_mode;
   return $suggestions;
 }
+
+function opencase_views_query_alter(Drupal\views\ViewExecutable $view, $query) {
+  if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_case') {
+    $query->addTag('oc_case_access');
+  }
+  if ($view->getBaseEntityType() && $view->getBaseEntityType()->id() == 'oc_activity') {
+    $query->addTag('oc_activity_access');
+  }
+}
+
+function opencase_query_oc_case_access_alter($query) {
+  if (\Drupal::currentUser()->hasPermission('view published case entities')) {
+    return;
+  } 
+  $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
+  $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_case_field_data.id');
+  $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
+}
+
+function opencase_query_oc_activity_access_alter($query) {
+  if (\Drupal::currentUser()->hasPermission('view published case entities')) {
+    return;
+  } 
+  $linked_actor_id = CaseInvolvement::getLinkedActorId(\Drupal::currentUser());
+  $query->addJoin('INNER', 'oc_case__actors_involved', 'access_filter', 'access_filter.entity_id = oc_activity_field_data.oc_case');
+  $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
+}

modules/opencase_entities/opencase_entities.permissions.yml

@@ -1,3 +1,7 @@
+permission_callbacks:
+  - Drupal\opencase_entities\OpenCaseEntityPermissions::permissions
+
+
 administer opencase entity bundles:
   title: 'Administer OpenCase Actor/Case/Activity Types'
   description: 'Create, configure and delete types of actor (such as "Client" or "Legal Advisor"), types of case (such as "Housing" or "Asylum") and types of activity (such as "Case Note" or "Interview")'
@@ -7,61 +11,57 @@ administer actor entities:
   description: 'Allow to access the administration form to configure Actor entities.'
   restrict access: true
 
-add client entities:
+#add client entities:
-  title: 'Create new Client entities'
+#  title: 'Create new Client entities'
-
+#
-delete client entities:
+#delete client entities:
-  title: 'Delete Client entities'
+#  title: 'Delete Client entities'
-
+#
-edit client entities:
+#edit client entities:
-  title: 'Edit Client entities'
+#  title: 'Edit Client entities'
-
+#
-view published client entities:
+#view published client entities:
-  title: 'View published Client entities'
+#  title: 'View published Client entities'
-
+#
-view unpublished client entities:
+#view unpublished client entities:
-  title: 'View unpublished Client entities'
+#  title: 'View unpublished Client entities'
-
+#
-view all client revisions:
+#view all client revisions:
-  title: 'View all Client revisions'
+#  title: 'View all Client revisions'
-
+#
-revert all client revisions:
+#revert all client revisions:
-  title: 'Revert all Client revisions'
+#  title: 'Revert all Client revisions'
-  description: 'Role requires permission <em>view Client revisions</em> and <em>edit rights</em> for client entities in question or <em>administer client entities</em>.'
+#  description: 'Role requires permission <em>view Client revisions</em> and <em>edit rights</em> for client entities in question or <em>administer client entities</em>.'
-
+#
-delete all client revisions:
+#delete all client revisions:
-  title: 'Delete all Client revisions'
+#  title: 'Delete all Client revisions'
-  description: 'Role requires permission to <em>view Client revisions</em> and <em>delete rights</em> for client entities in question or <em>administer client entities</em>.'
+#  description: 'Role requires permission to <em>view Client revisions</em> and <em>delete rights</em> for client entities in question or <em>administer client entities</em>.'
-
+#
-view volunteer involvement in cases:
+#add volunteer entities:
-  title: 'View names of Volunteers involved in Cases'
+#  title: 'Create new Volunteer entities'
-  description: "When viewing a case record, they can see the names of the volunteers involved, but cannot click through to volunteer's details."
+#
-
+#delete volunteer entities:
-add volunteer entities:
+#  title: 'Delete Volunteer entities'
-  title: 'Create new Volunteer entities'
+#
-
+#edit volunteer entities:
-delete volunteer entities:
+#  title: 'Edit Volunteer entities'
-  title: 'Delete Volunteer entities'
+#
-
+#view published volunteer entities:
-edit volunteer entities:
+#  title: 'View published Volunteer entities'
-  title: 'Edit Volunteer entities'
+#
-
+#view unpublished volunteer entities:
-view published volunteer entities:
+#  title: 'View unpublished Volunteer entities'
-  title: 'View published Volunteer entities'
+#
-
+#view all volunteer revisions:
-view unpublished volunteer entities:
+#  title: 'View all Volunteer revisions'
-  title: 'View unpublished Volunteer entities'
+#
-
+#revert all volunteer revisions:
-view all volunteer revisions:
+#  title: 'Revert all Volunteer revisions'
-  title: 'View all Volunteer revisions'
+#  description: 'Role requires permission <em>view Volunteer revisions</em> and <em>edit rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
-
+#
-revert all volunteer revisions:
+#delete all volunteer revisions:
-  title: 'Revert all Volunteer revisions'
+#  title: 'Delete all Volunteer revisions'
-  description: 'Role requires permission <em>view Volunteer revisions</em> and <em>edit rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
+#  description: 'Role requires permission to <em>view Volunteer revisions</em> and <em>delete rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
-
-delete all volunteer revisions:
-  title: 'Delete all Volunteer revisions'
-  description: 'Role requires permission to <em>view Volunteer revisions</em> and <em>delete rights</em> for volunteer entities in question or <em>administer volunteer entities</em>.'
 
 add case entities:
   title: 'Create new Case entities'
@@ -78,7 +78,8 @@ edit case entities:
   title: 'Edit Case entities'
 
 view published case entities:
-  title: 'View published Case entities'
+  title: 'View all cases'
+  description: 'All users can see cases which they are involved in. This grants permission to see all cases regardless of involvement.'
 
 view unpublished case entities:
   title: 'View unpublished Case entities'
@@ -107,9 +108,6 @@ delete activity entities:
 edit activity entities:
   title: 'Edit Activity entities'
 
-view published activity entities:
-  title: 'View published Activity entities'
-
 view unpublished activity entities:
   title: 'View unpublished Activity entities'
 

modules/opencase_entities/src/CaseInvolvement.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\opencase_entities;
+
+class CaseInvolvement {
+
+  public static function getLinkedActorId($account) {
+    return \Drupal\user\Entity\User::load($account->id())->get('field_linked_opencase_actor')->target_id;
+  }
+
+  public static function userIsInvolved($account, $case) {
+    $actorId = self::getLinkedActorId($account);        
+    $involvedIds = array_column($case->actors_involved->getValue(), 'target_id');
+    return in_array($actorId, $involvedIds);
+  }
+
+  public static function userIsInvolved_activity($account, $activity) {
+    $case_id = $activity->oc_case->target_id;
+    $case = \Drupal::entityTypeManager()->getStorage('oc_case')->load($case_id);
+    return self::userIsInvolved($account, $case);
+  }
+}

modules/opencase_entities/src/Entity/OCActor.php

@@ -235,7 +235,7 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'inline',
         'type' => 'author',
-        'weight' => -4,
+        'weight' => -10,
       ]);
 
     $fields['first_name'] = BaseFieldDefinition::create('string')
@@ -250,11 +250,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -3,
+        'weight' => -9,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -3,
+        'weight' => -9,
       ])
       ->setRequired(TRUE);
 
@@ -270,11 +270,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -2,
+        'weight' => -8,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -2,
+        'weight' => -8,
       ])
       ->setRequired(FALSE);
 
@@ -290,14 +290,25 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', [
         'label' => 'above',
         'type' => 'string',
-        'weight' => -1,
+        'weight' => -7,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -1,
+        'weight' => -7,
       ])
       ->setRequired(TRUE);
 
+    $fields['consent'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Consent to data storage'))
+      ->setDescription(t('Has this person explicitly consented to having their personal data stored on this system?'))
+      ->setRevisionable(TRUE)
+      ->setDefaultValue(FALSE)
+      ->setRequired(TRUE)
+      ->setDisplayOptions('form', array(
+        'type' => 'boolean_checkbox',
+        'weight' => -6,
+      ));
+
     // Contact details.
     // so it is not exposed to user configuration. 
     $fields['email'] = BaseFieldDefinition::create('string')
@@ -310,16 +321,14 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 0,
+        'weight' => -5,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 0,
+        'weight' => -5,
       ));
     $fields['phone'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Main Phone Number'))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 20,
@@ -328,11 +337,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 2,
+        'weight' => -4,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 2,
+        'weight' => -4,
       ));
     $fields['phone2'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Alternative Phone Number'))
@@ -341,22 +350,18 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'max_length' => 20,
         'text_processing' => 0,
       ))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 3,
+        'weight' => -3,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 3,
+        'weight' => -3,
       ));
     $fields['postal_address'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Postal Address'))
       ->setDescription(t('Full address, apart from post code.'))
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayConfigurable('form', TRUE)
       ->setSettings(array(
         'default_value' => '',
         'max_length' => 255,
@@ -365,11 +370,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'basic_string',
-        'weight' => 5,
+        'weight' => -2,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textarea',
-        'weight' => 5,
+        'weight' => -2,
       ));
     $fields['post_code'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Post Code'))
@@ -381,11 +386,11 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       ->setDisplayOptions('view', array(
         'label' => 'above',
         'type' => 'string',
-        'weight' => 6,
+        'weight' => -1,
       ))
       ->setDisplayOptions('form', array(
         'type' => 'string_textfield',
-        'weight' => 6,
+        'weight' => -1,
       ));
 
     $fields['created'] = BaseFieldDefinition::create('created')

modules/opencase_entities/src/Entity/OCCase.php

@@ -76,10 +76,13 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
 
   /**
    * When creating a case, it sets the first involved party to the actor
-   * id from the URL.
+   * id from the URL, and the second to the author's linked actor 
+   * (if it exists and is different)
    */
   public static function defaultVal() {
-    return array(\Drupal::request()->query->get('actor_id'));
+    $author_linked_actor_id = \Drupal\user\Entity\User::load(\Drupal::currentUser()->id())->get('field_linked_opencase_actor')->target_id;
+    $currently_viewed_actor_id = \Drupal::request()->query->get('actor_id');
+    return array_unique([$currently_viewed_actor_id, $author_linked_actor_id]);
   }
 
   /**

modules/opencase_entities/src/OCActivityAccessControlHandler.php

@@ -24,13 +24,28 @@ class OCActivityAccessControlHandler extends EntityAccessControlHandler {
         if (!$entity->isPublished()) {
           return AccessResult::allowedIfHasPermission($account, 'view unpublished activity entities');
         }
-        return AccessResult::allowedIfHasPermission($account, 'view published activity entities');
+        return AccessResult::allowedIf(
-
+            $account->hasPermission('view published case entities')  // activity permissions are inherited from case
-      case 'update':
+            || CaseInvolvement::userIsInvolved_activity($account, $entity)
-        return AccessResult::allowedIfHasPermission($account, 'edit activity entities');
+        );
-
+      case 'update':  // allowed only if a) they can see the case the activity is on and b) they can edit activities
-      case 'delete':
+        if (!$account->hasPermission('edit activity entities')) {
-        return AccessResult::allowedIfHasPermission($account, 'delete activity entities');
+            return AccessResult::forbidden();
+        } else {
+            return AccessResult::allowedIf(
+              $account->hasPermission('view published case entities') 
+              || CaseInvolvement::userIsInvolved_activity($account, $entity)
+            );
+        }
+      case 'delete':  // allowed only if a) they can see the case the activity is on and b) they can delete activities
+        if (!$account->hasPermission('delete activity entities')) {
+            return AccessResult::forbidden();
+        } else {
+            return AccessResult::allowedIf(
+              $account->hasPermission('view published case entities') 
+              || CaseInvolvement::userIsInvolved_activity($account, $entity)
+            );
+        }
     }
 
     // Unknown operation, no opinion.

modules/opencase_entities/src/OCActorAccessControlHandler.php

@@ -14,6 +14,9 @@ use Drupal\Core\Access\AccessResult;
  */
 class OCActorAccessControlHandler extends EntityAccessControlHandler {
 
+
+  protected $viewLabelOperation = TRUE;
+
   /**
    * {@inheritdoc}
    * Permissions are assigned by bundle.
@@ -22,21 +25,18 @@ class OCActorAccessControlHandler extends EntityAccessControlHandler {
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     /** @var \Drupal\opencase_entities\Entity\OCActorInterface $entity */
     $bundle = $entity->bundle();
-    $route_name = \Drupal::routeMatch()->getRouteName();
-    $case_routes = ['entity.oc_case.canonical', 'entity.oc_case.edit_form', 'view.cases.page_1', 'entity.oc_case.add_form'];
-    $is_case_context = in_array($route_name, $case_routes);
-
     switch ($operation) {
+      case 'view label':
+        return AccessResult::allowed();    
+
       case 'view':
         if (!$entity->isPublished()) {
           return AccessResult::allowedIf(
             $account->hasPermission("view unpublished $bundle entities")
-            or ($is_case_context && $account->hasPermission("view unpublished $bundle entities"))
           );
         }
         return AccessResult::allowedIf(
           $account->hasPermission("view published $bundle entities")
-          or ($is_case_context && $account->hasPermission("view $bundle involvement in cases"))
         );
 
       case "update":

modules/opencase_entities/src/OCCaseAccessControlHandler.php

@@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Access\AccessResult;
+use Drupal\opencase_entities\CaseInvolvement;
 
 /**
  * Access controller for the Case entity.
@@ -24,13 +25,20 @@ class OCCaseAccessControlHandler extends EntityAccessControlHandler {
         if (!$entity->isPublished()) {
           return AccessResult::allowedIfHasPermission($account, 'view unpublished case entities');
         }
-        return AccessResult::allowedIfHasPermission($account, 'view published case entities');
+        return AccessResult::allowedIf(
-
+            $account->hasPermission('view published case entities')
-      case 'update':
+            || CaseInvolvement::userIsInvolved($account, $entity)
-        return AccessResult::allowedIfHasPermission($account, 'edit case entities');
+        );
-
+      case 'update':   // you can edit the case only if a) you can see it and b) you have the permission to edit cases.
-      case 'delete':
+        return AccessResult::allowedIf(
-        return AccessResult::allowedIfHasPermission($account, 'delete case entities');
+            $account->hasPermission('edit case entities')
+            && ($account->hasPermission('view published case entities') || CaseInvolvement::userIsInvolved($account, $entity))
+        );
+      case 'delete':   // you can delete the case only if a) you can see it and b) you have the permission to delete cases.
+        return AccessResult::allowedIf(
+            $account->hasPermission('delete case entities')
+            && ($account->hasPermission('view published case entities') || CaseInvolvement::userIsInvolved($account, $entity))
+        );
     }
 
     // Unknown operation, no opinion.

modules/opencase_entities/src/OpenCaseEntityPermissions.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Drupal\opencase_entities;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class OpenCaseEntityPermissions implements ContainerInjectionInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructor for MyModulePermissions.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('entity_type.manager'));
+  }
+
+  /**
+   * Get permissions for MyModule.
+   *
+   * @return array
+   *   Permissions array.
+   */
+  public function permissions() {
+    $permissions = [];
+
+    foreach ($this->entityTypeManager->getStorage('oc_actor_type')->loadMultiple() as $id => $type) {
+      $permissions += [
+        "add $id entities" => [
+          'title' => $this->t('Create new %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "edit $id entities" => [
+          'title' => $this->t('Edit %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "delete $id entities" => [
+          'title' => $this->t('Delete %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "view published $id entities" => [
+          'title' => $this->t('View published %type entities', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "view all $id revisions" => [
+          'title' => $this->t('View %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "revert all $id revisions" => [
+          'title' => $this->t('Revert %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+      $permissions += [
+        "delete all $id revisions" => [
+          'title' => $this->t('Delete %type revisions', array('%type' => $type->label())),
+        ]
+      ];
+
+    }
+    return $permissions;
+  }
+}

modules/opencase_reporting/config/install/block.block.facet_actortype.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.actor_type
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_actortype
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:actor_type'
+settings:
+  id: 'facet_block:actor_type'
+  label: 'Actor type'
+  provider: facets
+  label_display: visible
+  block_id: facet_actortype
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/actors'
+    negate: false
+    context_mapping: {  }

modules/opencase_reporting/config/install/block.block.facet_created.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.created
+  module:
+    - facets
+    - system
+  theme:
+    - bartik
+id: facet_created
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'facet_block:created'
+settings:
+  id: 'facet_block:created'
+  label: 'Created Date'
+  provider: facets
+  label_display: visible
+  block_id: facet_created
+visibility:
+  request_path:
+    id: request_path
+    pages: '/opencase/reporting/actors'
+    negate: false
+    context_mapping: {  }

modules/opencase_reporting/config/install/block.block.opencase_reporting.yml

@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase_reporting
+  module:
+    - system
+  theme:
+    - bartik
+id: opencase_reporting_menu
+theme: bartik
+region: sidebar_first
+weight: -8
+provider: null
+plugin: 'system_menu_block:opencase_reporting'
+settings:
+  id: 'system_menu_block:opencase_reporting'
+  label: 'Reporting'
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }

modules/opencase_reporting/config/install/facets.facet.actor_type.yml

@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+    - views.view.reporting_actors
+  module:
+    - search_api
+id: actor_type
+name: 'Actor type'
+url_alias: actor_type
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: type
+facet_source_id: 'search_api:views_page__reporting_actors__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: -9
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -8
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_reporting/config/install/facets.facet.actor_type_export.yml

@@ -0,0 +1,59 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+  module:
+    - views_data_export
+id: actor_type_export
+name: 'Actor type - Export'
+url_alias: actor_type
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: type
+facet_source_id: 'search_api:views_data_export__reporting_actors__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false
+

modules/opencase_reporting/config/install/facets.facet.created.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+    - views.view.reporting_actors
+  module:
+    - search_api
+id: created
+name: Created
+url_alias: created
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_page__reporting_actors__page_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: -8
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -9
+    settings:
+      sort: DESC
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_reporting/config/install/facets.facet.created_export.yml

@@ -0,0 +1,67 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+  module:
+    - views_data_export
+id: created_export
+name: 'Created - Export'
+url_alias: created
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: created
+facet_source_id: 'search_api:views_data_export__reporting_actors__data_export_1'
+widget:
+  type: checkbox
+  config:
+    show_numbers: true
+    soft_limit: 0
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  date_item:
+    processor_id: date_item
+    weights:
+      build: 35
+    settings:
+      date_display: actual_date
+      granularity: 5
+      date_format: ''
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false
+

modules/opencase_reporting/config/install/search_api.index.opencase_reporting_actors.yml

@@ -0,0 +1,42 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.server.opencase_reporting_server
+  module:
+    - search_api
+    - opencase_entities
+id: opencase_reporting_actors
+name: 'OpenCase Reporting: Actors'
+description: ''
+read_only: false
+field_settings:
+  created:
+    label: Created
+    datasource_id: 'entity:oc_actor'
+    property_path: created
+    type: date
+  type:
+    label: 'Actor type'
+    datasource_id: 'entity:oc_actor'
+    property_path: type
+    type: string
+datasource_settings:
+  'entity:oc_actor':
+    bundles:
+      default: true
+      selected: {  }
+    languages:
+      default: true
+      selected: {  }
+processor_settings:
+  add_url: {  }
+  aggregated_field: {  }
+  rendered_item: {  }
+tracker_settings:
+  default:
+    indexing_order: fifo
+options:
+  index_directly: true
+  cron_limit: 50
+server: opencase_reporting_server

modules/opencase_reporting/config/install/search_api.server.opencase_reporting_server.yml

@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - search_api_db
+id: opencase_reporting_server
+name: 'OpenCase Reporting'
+description: ''
+backend: search_api_db
+backend_config:
+  database: 'default:default'
+  min_chars: 1
+  partial_matches: false
+  autocomplete:
+    suggest_suffix: true
+    suggest_words: true

modules/opencase_reporting/config/install/system.menu.opencase_reporting.yml

@@ -0,0 +1,7 @@
+langcode: en
+status: true
+dependencies: {  }
+id: opencase_reporting
+label: 'OpenCase Reporting'
+description: ''
+locked: false

modules/opencase_reporting/config/install/views.view.reporting_actors.yml

@@ -0,0 +1,588 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_actors
+  content:
+    - 'block_content:basic:944ff38d-5931-4439-91d5-f53b5ad7aac7'
+  module:
+    - csv_serialization
+    - rest
+    - search_api
+    - serialization
+    - user
+    - views_data_export
+id: reporting_actors
+label: 'Reporting: Actors'
+module: views
+description: 'A basic reporting view, for illustrative purposes, that does not assume the existence of any specific actor types or fields'
+tag: ''
+base_table: search_api_index_opencase_reporting_actors
+base_field: search_api_id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          bypass_access: false
+          skip_access: false
+      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
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+          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
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            created: created
+            type: type
+          info:
+            created:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        first_name:
+          id: first_name
+          table: search_api_datasource_opencase_reporting_actors_entity_oc_actor
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'First Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        last_name:
+          id: last_name
+          table: search_api_datasource_opencase_reporting_actors_entity_oc_actor
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        type:
+          id: type
+          table: search_api_index_opencase_reporting_actors
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              oc_actor_type:
+                display_method: label
+          plugin_id: search_api_field
+        created:
+          id: created
+          table: search_api_index_opencase_reporting_actors
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Created date'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: medium
+            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
+          field_rendering: true
+          fallback_handler: search_api_date
+          fallback_options:
+            date_format: fallback
+            custom_date_format: ''
+            timezone: ''
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: null
+          entity_field: null
+          plugin_id: search_api_field
+      filters: {  }
+      sorts: {  }
+      title: 'Reporting: Actors'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments:
+        'null':
+          id: 'null'
+          table: views
+          field: 'null'
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ "now"|date("Y/m/d") }}-{{ raw_arguments.null }} '
+          default_argument_type: query_parameter
+          default_argument_options:
+            query_param: title
+            fallback: Report
+            multiple: and
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          must_not_be: false
+          plugin_id: 'null'
+      display_extenders: {  }
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  data_export_1:
+    display_plugin: data_export
+    id: data_export_1
+    display_title: 'Data export'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/actors
+      filename: '[view:title].csv'
+      displays:
+        default: '0'
+        page_1: '0'
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+          xls_settings:
+            xls_format: Excel2007
+            metadata:
+              creator: ''
+              last_modified_by: ''
+              title: ''
+              description: ''
+              subject: ''
+              keywords: ''
+              category: ''
+              manager: ''
+              company: ''
+      cache:
+        type: none
+      defaults:
+        cache: false
+        arguments: false
+      pager:
+        type: none
+        options:
+          offset: 0
+      arguments:
+        'null':
+          id: 'null'
+          table: views
+          field: 'null'
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ raw_arguments.null }}'
+          default_argument_type: query_parameter
+          default_argument_options:
+            query_param: title
+            fallback: New+Report
+            multiple: and
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          must_not_be: false
+          plugin_id: 'null'
+      auth:
+        - cookie
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: opencase/reporting/actors
+      cache:
+        type: none
+      defaults:
+        cache: false
+        header: false
+      menu:
+        type: tab
+        title: Reporting
+        description: ''
+        expanded: false
+        parent: ''
+        weight: 0
+        context: '0'
+        menu_name: main
+      header:
+        entity_block_content:
+          id: entity_block_content
+          table: views
+          field: entity_block_content
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          target: 944ff38d-5931-4439-91d5-f53b5ad7aac7
+          view_mode: default
+          bypass_access: false
+          plugin_id: entity
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }

modules/opencase_reporting/config/schema/opencase_report.schema.yml

@@ -0,0 +1,12 @@
+opencase_reporting.opencase_report.*:
+  type: config_entity
+  label: 'OpenCase Report config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string

modules/opencase_reporting/css/opencase-reporting.css

@@ -0,0 +1,15 @@
+.facet-item label {
+    display: inline;
+    padding-left: 5px;
+}
+
+li.facet-item {
+      list-style-type: none;
+}
+
+.views-data-export-feed.csv-feed .feed-icon {
+  background-image: url(/modules/contrib/opencase/modules/opencase_reporting/assets/download.png);
+  width: 200px;
+  height: 27px;
+  float: right;
+}

modules/opencase_reporting/opencase_reporting.info.yml

@@ -0,0 +1,18 @@
+name: 'OpenCase Reporting'
+type: module
+description: 'Reporting functionality for OpenCase'
+core: 8.x
+package: 'OpenCase'
+dependencies:
+  - opencase_entities
+  - search_api
+  - search_api_db
+  - facets
+  - csv_serialization
+  - rest
+  - serialization
+  - user
+  - views_data_export
+
+libraries:
+  - opencase_reporting/opencase-reporting-lib

modules/opencase_reporting/opencase_reporting.libraries.yml

@@ -0,0 +1,7 @@
+opencase-reporting-lib:
+  version: 1.x
+  css:
+    theme:
+      css/opencase-reporting.css: {}
+  js:
+    js/opencase-reporting.js: {}

modules/opencase_reporting/opencase_reporting.module

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains opencase_reporting.module.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function opencase_reporting_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    // Main module help for the opencase_reporting module.
+    case 'help.page.opencase_reporting':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('Reporting functionality for OpenCase.') . '</p>';
+      return $output;
+
+    default:
+  }
+}
+
+/**
+ * Implements hook_page_attachments
+ *
+ * Add the opencase library to every page
+ */
+function opencase_reporting_page_attachments(array &$page) {
+  $page['#attached']['library'][] = 'opencase_reporting/opencase-reporting-lib';
+}
+
+/**
+ * Implements hook_uninstall().
+ * Removes configs.
+ */
+function opencase_reporting_uninstall() {
+  $configs = [
+    'search_api.server.opencase_reporting_server',
+    'search_api.index.opencase_reporting_actors',
+    'facets.facet.actor_type',
+    'facets.facet.actor_type_export',
+    'facets.facet.created',
+    'facets.facet.created_export',
+    'views.view.reporting_actors',
+    'block.block.facet_actortype',
+    'block.block.facet_created',
+    'block.block.opencase_reporting_menu',
+    'system.menu.opencase_reporting'
+  ];
+  foreach($configs as $config) {
+    Drupal::configFactory()->getEditable($config)->delete();
+  }
+} 

modules/opencase_search/config/install/search_api.index.opencase_actors.yml

@@ -7,14 +7,19 @@ dependencies:
     - search_api
     - opencase_entities
 id: opencase_actors
-name: 'OpenCase Actors'
+name: 'OpenCase Search: Actors'
 description: ''
 read_only: false
 field_settings:
-  name:
+  first_name:
-    label: Name
+    label: 'First Name'
     datasource_id: 'entity:oc_actor'
-    property_path: name
+    property_path: first_name
+    type: text
+  last_name:
+    label: 'Last Name'
+    datasource_id: 'entity:oc_actor'
+    property_path: last_name
     type: text
 datasource_settings:
   'entity:oc_actor':
@@ -25,16 +30,17 @@ datasource_settings:
       default: true
       selected: {  }
 processor_settings:
-  rendered_item: {  }
+  add_url: {  }
   aggregated_field: {  }
   ignorecase:
     all_fields: true
     fields:
-      - name
+      - first_name
+      - last_name
     weights:
       preprocess_index: -20
       preprocess_query: -20
-  add_url: {  }
+  rendered_item: {  }
 tracker_settings:
   default:
     indexing_order: fifo

modules/opencase_search/config/install/search_api.server.opencase_server.yml

@@ -4,13 +4,13 @@ dependencies:
   module:
     - search_api_db
 id: opencase_server
-name: 'OpenCase Server'
+name: 'OpenCase Search'
 description: ''
 backend: search_api_db
 backend_config:
   database: 'default:default'
   min_chars: 3
-  partial_matches: false
+  matching: partial
   autocomplete:
     suggest_suffix: true
     suggest_words: true

modules/opencase_search/config/install/views.view.actor_search.yml

@@ -28,7 +28,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -115,14 +115,14 @@ display:
       row:
         type: fields
       fields:
-        name:
+        first_name:
-          id: name
+          id: first_name
           table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: name
+          field: first_name
           relationship: none
           group_type: group
           admin_label: ''
-          label: Name
+          label: 'First Name'
           exclude: false
           alter:
             alter_text: false
@@ -186,6 +186,151 @@ display:
             multi_separator: ', '
           entity_type: oc_actor
           plugin_id: search_api_field
+        last_name:
+          id: last_name
+          table: search_api_datasource_opencase_actors_entity_oc_actor
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last Name'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+          entity_type: oc_actor
+          plugin_id: search_api_field
+        type:
+          id: type
+          table: search_api_datasource_opencase_actors_entity_oc_actor
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              oc_actor_type:
+                display_method: label
+          entity_type: oc_actor
+          plugin_id: search_api_field
         created:
           id: created
           table: search_api_datasource_opencase_actors_entity_oc_actor
@@ -262,80 +407,6 @@ display:
             multi_separator: ', '
           entity_type: oc_actor
           plugin_id: search_api_field
-        type:
-          id: type
-          table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Type
-          exclude: true
-          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
-          field_rendering: true
-          fallback_handler: search_api_entity
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            display_methods:
-              oc_actor_type:
-                display_method: label
-          entity_type: oc_actor
-          plugin_id: search_api_field
         id:
           id: id
           table: search_api_datasource_opencase_actors_entity_oc_actor
@@ -483,7 +554,7 @@ display:
           expose:
             operator_id: search_api_fulltext_op
             label: 'Search by Name'
-            description: 'Type a first or last name and press enter.'
+            description: 'Type at least 3 letters of a first or last name and press enter.'
             use_operator: false
             operator: search_api_fulltext_op
             identifier: search_api_fulltext