Removed ActorCaseRelation stuff- can't get it to work, will try again if it's asked for

This reverts commit c7d36df842.

README.md

@@ -1,33 +1,36 @@
 # OpenCase
-A simple, case-management-focused CRM for small altruistic organisations.
-
-## Current Status
-**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. 
+A simple case-management system
 
 ## The Plan
 OpenCase will be available as:
 * A Drupal module, on drupal.org 
-* A Drupal install profile / distribution
 * A hosted service
 
+### Features
+#### Existing
+* Completely configurable person types, case types and activity types
+* Search
+* Basic Reporting 
+* Basic user roles (caseworker, volunteer co-ordinator, site admin etc) with access control
+
+#### Coming soon
+* Better reporting (currently only reports on defaults fields and not user-added ones)
+* Allocation of tasks, overview of tasks and their stage of completion
+* Appointments and notifications
+
+## Current Status
+**11 Nov 2018** 
+### User Base
+OpenCase is being used by a couple of organisations, early adopters on the hosted platform.
+### Availability as Free Software
+If you want to install OpenCase for yourself, please get in touch via Issues. It is changing rapidly and the install process is currently undocumented but I am more than happy to guide you through.
+### Try it out
+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. 
+
 ## Find out more
-* More details, including user stories for future development, can be found in the [OpenCase Gitbook](https://hoegrammer.gitbooks.io/zen-crm/content/)
+* More details, including user stories for future development, can be found in the [OpenCase Gitbook](https://hoegrammer.gitbooks.io/opencase/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
 
 
 

ciac_opencase_customisations.libraries.yml

@@ -0,0 +1,5 @@
+ciac_grouped_views:
+  version: 1.x
+  css:
+    layout:
+      css/grouped_views.css: {}

composer.json

@@ -1,14 +1,17 @@
 {
-  "name": "drupal/opencase",
-  "type": "drupal-module",
-  "description": "Simple Case Management",
-  "keywords": ["Drupal"],
-  "license": "GPL-2.0+",
-  "homepage": "https://www.drupal.org/project/opencase",
-  "minimum-stability": "dev",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/opencase",
-    "source": "http://cgit.drupalcode.org/opencase"
-  },
-  "require": { }
+    "name": "autonomic/opencase",
+    "type": "drupal-module",
+    "authors": [
+        {
+            "name": "autonomic",
+            "email": "helo@autonomic.zone"
+        }
+    ],
+    "require": {
+        "composer/installers": "*",
+        "drupal/superfish": "*",
+        "drupal/views_autosubmit": "*",
+        "drupal/smtp": "*",
+        "drupal/paragraphs_collapsible": "*"
+    }
 }

config/install/block.block.exposedformequal_opps_recordspage_1.yml

@@ -0,0 +1,28 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.equal_opps_records
+  module:
+    - system
+    - views
+  theme:
+    - bartik
+id: exposedformequal_opps_recordspage_1
+theme: bartik
+region: content
+weight: 0
+provider: null
+plugin: 'views_exposed_filter_block:equal_opps_records-page_1'
+settings:
+  id: 'views_exposed_filter_block:equal_opps_records-page_1'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: 'Search by (whole) first or last name.'
+visibility:
+  request_path:
+    id: request_path
+    pages: /equal-opps-records
+    negate: false
+    context_mapping: {  }

config/install/block.block.opencase.yml

@@ -2,22 +2,68 @@ langcode: en
 status: true
 dependencies:
   config:
-    - system.menu.opencase-admin
+    - system.menu.opencase
   module:
-    - system
+    - superfish
   theme:
     - bartik
 id: opencase
 theme: bartik
-region: sidebar_first
-weight: -8
+region: primary_menu
+weight: 0
 provider: null
-plugin: 'system_menu_block:opencase-admin'
+plugin: 'superfish:opencase'
 settings:
-  id: 'system_menu_block:opencase-admin'
-  label: 'OpenCase Admin'
-  provider: system
-  label_display: visible
-  level: 1
-  depth: 0
+  id: 'superfish:opencase'
+  label: OpenCase
+  provider: superfish
+  label_display: '0'
+  level: '1'
+  depth: '0'
+  menu_type: horizontal
+  style: none
+  arrow: 0
+  shadow: 1
+  speed: fast
+  delay: '800'
+  slide: vertical
+  supposition: 1
+  hoverintent: 1
+  touch: '1'
+  touchbh: '1'
+  touchbp: '768'
+  touchua: '0'
+  touchual: ''
+  touchuam: '0'
+  small: '2'
+  smallbp: '768'
+  smallua: '0'
+  smallual: ''
+  smalluam: '0'
+  smallact: '1'
+  smallset: ''
+  smallasa: 0
+  smallcmc: 0
+  smallecm: ''
+  smallchc: 0
+  smallech: ''
+  smallicm: ''
+  smallich: ''
+  smallamt: ''
+  smallabt: '1'
+  supersubs: 1
+  minwidth: '12'
+  maxwidth: '27'
+  multicolumn: 0
+  multicolumn_depth: '1'
+  multicolumn_levels: '1'
+  pathlevels: '1'
+  expanded: 0
+  clone_parent: 0
+  hide_linkdescription: 0
+  add_linkdescription: 0
+  link_depth_class: 1
+  custom_list_class: ''
+  custom_item_class: ''
+  custom_link_class: ''
 visibility: {  }

config/install/block.block.opencaseaddactors.yml

@@ -1,31 +0,0 @@
-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

@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase
-  theme:
-    - bartik
-id: opencasecontextualmenu
-theme: bartik
-region: sidebar_second
-weight: -8
-provider: null
-plugin: opencase_contextual_menu
-settings:
-  id: opencase_contextual_menu
-  label: 'OpenCase Contextual Menu'
-  provider: opencase
-  label_display: '0'
-visibility: {  }

config/install/block.block.opencaseglobal.yml

@@ -1,31 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.openc
-  module:
-    - system
-    - user
-  theme:
-    - bartik
-id: opencaseglobal
-theme: bartik
-region: sidebar_first
-weight: -7
-provider: null
-plugin: 'system_menu_block:openc'
-settings:
-  id: 'system_menu_block:openc'
-  label: 'OpenCase Global'
-  provider: system
-  label_display: '0'
-  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/views.view.contact_details_changes.yml

@@ -0,0 +1,852 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+    - user
+id: contact_details_changes
+label: 'Contact Details History'
+module: views
+description: ''
+tag: ''
+base_table: oc_actor_field_revision
+base_field: vid
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view published client entities'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      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: none
+        options:
+          offset: 0
+      style:
+        type: table
+        options:
+          grouping:
+            1:
+              field: view_oc_actor
+              rendered: true
+              rendered_strip: false
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            first_name: first_name
+            middle_names: middle_names
+            last_name: last_name
+            id: id
+            revision_created: revision_created
+            view_oc_actor: view_oc_actor
+          info:
+            first_name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            middle_names:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            last_name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            revision_created:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            view_oc_actor:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
+          relationship: none
+          group_type: min
+          admin_label: ''
+          label: Date
+          exclude: false
+          alter:
+            alter_text: true
+            text: '{{ revision_created | date(''d/m/Y'') }}'
+            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
+          set_precision: false
+          precision: 0
+          decimal: .
+          separator: ''
+          format_plural: 0
+          format_plural_string: !!binary MQNAY291bnQ=
+          prefix: ''
+          suffix: ''
+          click_sort_column: value
+          type: timestamp
+          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
+          field_api_classes: false
+          entity_type: oc_actor
+          entity_field: revision_created
+          plugin_id: field
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          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
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: field
+        middle_names:
+          id: middle_names
+          table: oc_actor_field_revision
+          field: middle_names
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Middle Names'
+          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
+          entity_type: oc_actor
+          entity_field: middle_names
+          plugin_id: field
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          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
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: field
+        email:
+          id: email
+          table: oc_actor_field_revision
+          field: email
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Email Address'
+          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
+          entity_type: oc_actor
+          entity_field: email
+          plugin_id: field
+        phone:
+          id: phone
+          table: oc_actor_field_revision
+          field: phone
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Main Phone Number'
+          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
+          entity_type: oc_actor
+          entity_field: phone
+          plugin_id: field
+        phone2:
+          id: phone2
+          table: oc_actor_field_revision
+          field: phone2
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Alternative Phone Number'
+          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
+          entity_type: oc_actor
+          entity_field: phone2
+          plugin_id: field
+        postal_address:
+          id: postal_address
+          table: oc_actor_field_revision
+          field: postal_address
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Postal Address'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: basic_string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: oc_actor
+          entity_field: postal_address
+          plugin_id: field
+        post_code:
+          id: post_code
+          table: oc_actor_field_revision
+          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
+          entity_type: oc_actor
+          entity_field: post_code
+          plugin_id: field
+        view_oc_actor:
+          id: view_oc_actor
+          table: oc_actor_field_revision
+          field: view_oc_actor
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: true
+            text: "◀\tBack to current record"
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'See "rewrite results" (had to do it that way because contains HTML).'
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_actor
+          plugin_id: entity_link
+      filters: {  }
+      sorts:
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
+          relationship: none
+          group_type: min
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: oc_actor
+          entity_field: revision_created
+          plugin_id: date
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments:
+        id:
+          id: id
+          table: oc_actor_field_revision
+          field: id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: 'not found'
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          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: {  }
+          break_phrase: false
+          not: false
+          entity_type: oc_actor
+          entity_field: id
+          plugin_id: numeric
+      display_extenders: {  }
+      group_by: true
+      title: 'Contact Details History'
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      path: opencase/oc_actor/%/contact_details_history
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.permissions
+      tags: {  }

config/install/views.view.equal_opps_records.yml

@@ -0,0 +1,308 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase
+  module:
+    - opencase_entities
+    - user
+    - views_autosubmit
+id: equal_opps_records
+label: 'Equal Opps Records'
+module: views
+description: ''
+tag: ''
+base_table: oc_equal_opps
+base_field: id
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view published equal opps entities'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: autosubmit
+        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
+          autosubmit_hide: true
+      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:
+        name:
+          id: name
+          table: oc_equal_opps
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: null
+          entity_field: name
+          plugin_id: field
+      filters:
+        status:
+          value: '1'
+          table: oc_equal_opps
+          field: status
+          plugin_id: boolean
+          entity_type: oc_equal_opps
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+          group: 1
+        first_name:
+          id: first_name
+          table: oc_actor_field_data
+          field: first_name
+          relationship: oc_actor
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: first_name_op
+            label: 'First Name'
+            description: ''
+            use_operator: false
+            operator: first_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: first_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_standard_user: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: string
+        last_name:
+          id: last_name
+          table: oc_actor_field_data
+          field: last_name
+          relationship: oc_actor
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: last_name_op
+            label: 'Last Name'
+            description: ''
+            use_operator: false
+            operator: last_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: last_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_standard_user: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: string
+      sorts: {  }
+      title: 'Equal Opps Records'
+      header: {  }
+      footer: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'There is no Equal Opps record by that name. Please check the spelling'
+            format: basic_html
+          plugin_id: text
+      relationships:
+        oc_actor:
+          id: oc_actor
+          table: oc_equal_opps
+          field: oc_actor
+          relationship: none
+          group_type: group
+          admin_label: Person
+          required: true
+          entity_type: oc_equal_opps
+          entity_field: oc_actor
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: equal-opps-records
+      exposed_block: true
+      menu:
+        type: normal
+        title: 'Equal Opps Records'
+        description: ''
+        expanded: false
+        parent: opencase.see_all
+        weight: 10
+        context: '0'
+        menu_name: opencase
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }

config/schema/oc_event.schema.yml

@@ -0,0 +1,12 @@
+opencase.oc_event.*:
+  type: config_entity
+  label: 'Event config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string

css/opencase.css

@@ -1,9 +1,45 @@
+/* MOVE THIS INTO MORE!! */
+.top_ups_bought.add-activity-link {
+  display: none;
+}
+
+/*  */
+
 body {
   font-size: 100% !important;
 }
 
+.field--type-entity-reference-revisions .field__items {
+	margin-left: 2em;
+}
+
+.field--type-entity-reference-revisions .field__items .field{
+	margin-top: 0;
+}
+.field--type-entity-reference-revisions .field__items .paragraph{
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+/* remove this confusing thing from user creation page */
+#edit-password-policy-status {
+  display: none;
+} 
+
+.form-composite > .fieldset-wrapper > .description, .form-item .description {
+    font-size: 1em !important;
+}
+
+div[data-drupal-selector=edit-user-bulk-form] {
+  display: none;
+}
+
+.layout-container {
+    max-width: 95% !important;
+}
+
 /* Free the people from the tyranny of the useless search button */
-#edit-submit-actor-search{
+#edit-submit-actor-search, #edit-submit-actor-search--2{
   display: none;
 }
 
@@ -29,3 +65,61 @@ body {
 #block-exposedformactor-searchpage-1 .form-text {
   width: 200px;
 }
+
+/* Make drop-down nav menu opaque */
+.block-superfish .menu ul {
+  background: white;
+  color: darkgray;
+}
+.block-superfish .menu ul li {
+  border-bottom: 1px dotted darkgray;
+}
+.block-superfish .menu ul li a:hover {
+  color: black;
+}
+
+/* In views, display label at top of field. Ths is because full descriptions are displayed in the activity view so having the label in the middle means it disappears down the page. */
+td.views-field {
+    vertical-align: top;
+}
+
+/* Entity displays */
+.oc_entity .left {
+  display: inline-block;
+  width: 45%;
+  padding: 1em;
+}
+
+.oc_entity .right {
+  display: inline-block;
+  width: 45%;
+  padding: 1em;
+  float: right;
+}
+.oc_entity .field {
+  margin-top: 1em;
+}
+
+/* Make entity reference field labels match normal field labels */
+.field--type-entity-reference .field__label {
+  font-family: Georgia, "Times New Roman", Times, serif;
+  font-size: 1em !important;
+  font-weight: bold !important;
+}
+
+/* Styling for grouped views */
+table.views-table.views-view-table caption {
+  text-align: left;
+  margin-bottom: 1em;
+  margin-top: 2em;
+  font-weight: bold;
+}
+
+/* remove "details" accordion, see https://drupal.stackexchange.com/questions/294312/why-has-this-details-accordion-appeared-in-this-view */
+.views-table details {
+    display: none;
+}
+
+form.oc-organisation-relation-form tr:first-child {
+  display: none;
+}

docs/install.txt

@@ -0,0 +1,67 @@
+
+composer create-project drupal/recommended-project:8.9.8 drupal
+
+# ADD THIS TO drupal/composer.json IN THE REPOSITORIES SECTION
+,{
+
+            "type": "vcs",
+            "url": "https://git.autonomic.zone/autonomic-cooperative/opencase.git"
+        }
+
+
+# INSTALL MODULES VIA COMPOSER (this will add them to composer.json, which is better than using a premade one, because this way the versions will all sort themselves out)
+composer require drupal/admin_toolbar drupal/security_review drupal/smtp drupal/opencase drupal/superfish
+
+# CREATE DIRECTORIES AND SET UP FILE PERMISSIONS
+
+# start in drupal directory
+mkdir -p config/sync
+mkdir private
+
+# if web server user =/= deployment user:
+# start in drupal directory
+    sudo chgrp www-data config/sync
+    cd web
+    cp sites/default/default.settings.php sites/default/settings.php
+    sudo chgrp www-data . -R
+    mkdir sites/default/files
+    sudo chmod g+w sites/default/files -R
+    chmod g+w sites/default/settings.php
+    sudo find -type d -exec chmod g+s {} \;
+    sudo chmod g-w sites/default/
+    sudo chmod g-w sites
+    sudo chmod g-w sites ./sites/example.settings.local.php ./sites/development.services.yml ./sites/example.sites.php ./sites/default/default.services.yml ./sites/default/default.settings.php ./autoload.php 
+    sudo chmod g-w -R modules/
+    sudo chmod g-w -R core
+    sudo chmod g-w profiles index.php update.php 
+    sudo chmod g-w themes -R
+    sudo chmod g-w web.config robots.txt 
+    cd ../
+    sudo chmod g-w -R web/modules
+    sudo chgrp www-data private
+    sudo chmod g+w,o-r,o-x private
+
+
+# INSTALL THE SITE
+
+- Create a database 
+- Go to the url and run the installer
+
+# make settings file unwriteable now that it has been generated
+sudo chmod a-w sites/default/settings.php
+
+# ENABLE all the above modules 
+drush en admin_toolbar security_review smtp opencase -y
+
+    
+# TODO set $trusted_host_patterns (in settings.php)
+# TODO private files (in settings.php)
+# TODO Set all the HTML roles to admin only - /admin/config/content/formats
+# TODO run security review (make eveything untrusted except CRM Admin and Admin) - /admin/config/security-review
+# TODO homepage -> /opencase/whatever-the-chosen-homepage, 403 - /user/login - /admin/config/system/site-information
+# TODO disable blocks: tools, main navigation, footer menu - /admin/structure/block
+# TODO logo & colours - admin/appearance/settings/bartik
+# TODO disallow registering an account & turn off personal contact forms - /admin/config/people/accounts 
+# TODO add linked actor field to form display and display display - top of both
+# TODO change which contact form is the default - /admin/structure/contact
+# TODO change "short" date formate to d/m/Y - /admin/config/regional/date-time

modules/opencase_cases/config/schema/oc_case_type.schema.yml

@@ -1,4 +1,4 @@
-opencase_entities.oc_case_type.*:
+opencase_cases.oc_case_type.*:
   type: config_entity
   label: 'Case type config'
   mapping:

modules/opencase_cases/oc_case.page.inc

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains oc_case.page.inc.
+ *
+ * Page callback for Case entities.
+ */
+
+use Drupal\Core\Render\Element;
+
+/**
+ * Prepares variables for Case templates.
+ *
+ * Default template: oc_case.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - elements: An associative array containing the user information and any
+ *   - attributes: HTML attributes for the containing element.
+ */
+function template_preprocess_oc_case(array &$variables) {
+  // Separate the fields into two sections to be displayed in two columns.
+  // Remove the name (title) field as this is displayed anyway.
+  $variables['id'] = $variables['elements']['#oc_case']->get('id')[0]->get('value')->getValue();
+  $variables['base_fields'] = array();
+  $variables['other_fields'] = array();
+  foreach (Element::children($variables['elements']) as $key) {
+    $variables['content'][$key] = $variables['elements'][$key];
+    if (in_array($key, ['created', 'changed', 'files', 'actors_involved', 'status', 'user_id'])) {
+      $variables['base_fields'][$key] = $variables['elements'][$key];
+    } else {
+      $variables['other_fields'][$key] = $variables['elements'][$key];
+      unset($variables['other_fields']['name']);
+    }
+  }
+}

modules/opencase_cases/opencase_cases.info.yml

@@ -0,0 +1,11 @@
+name: 'Opencase Cases'
+type: module
+description: 'Provides case entities and a required field on activities linking them to a case.'
+core: 8.x
+package: OpenCase
+dependencies:
+  0: opencase_entities
+  1: datetime
+  4: options
+  5: paragraphs
+  6: user

modules/opencase_cases/opencase_cases.links.action.yml

@@ -0,0 +1,12 @@
+
+entity.oc_case.add_form:
+  route_name: entity.oc_case.add_page
+  title: 'Add Case'
+  appears_on:
+    - entity.oc_case.collection
+entity.oc_case_type.add_form:
+  route_name: entity.oc_case_type.add_form
+  title: 'Add Case type'
+  appears_on:
+    - entity.oc_case_type.collection
+

modules/opencase_cases/opencase_cases.links.menu.yml

@@ -0,0 +1,25 @@
+opencase_cases.manage_case_types:
+  title: 'Manage case types'
+  description: 'Configure types of cases and their fields'
+  menu_name: opencase
+  parent: opencase.opencase_admin_menu 
+  url: internal:/admin/opencase/oc_case_type
+  weight: 2
+# Case menu items definition
+entity.oc_case.collection:
+  title: 'Case list'
+  route_name: entity.oc_case.collection
+  description: 'List Case entities'
+  parent: system.admin_structure
+  weight: 100
+
+
+# Case type menu items definition
+entity.oc_case_type.collection:
+  title: 'Case type'
+  route_name: entity.oc_case_type.collection
+  description: 'List Case type (bundles)'
+  parent: system.admin_structure
+  weight: 99
+
+

modules/opencase_cases/opencase_cases.links.task.yml

@@ -0,0 +1,23 @@
+
+# Case routing definition
+
+entity.oc_case.canonical:
+  route_name: entity.oc_case.canonical
+  base_route: entity.oc_case.canonical
+  title: 'View'
+
+entity.oc_case.edit_form:
+  route_name: entity.oc_case.edit_form
+  base_route: entity.oc_case.canonical
+  title: 'Edit'
+
+entity.oc_case.version_history:
+  route_name: entity.oc_case.version_history
+  base_route: entity.oc_case.canonical
+  title: 'Revisions'
+
+entity.oc_case.delete_form:
+  route_name:  entity.oc_case.delete_form
+  base_route:  entity.oc_case.canonical
+  title: Delete
+  weight: 10

modules/opencase_cases/opencase_cases.module

@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * @file
+ * Contains opencase_cases.module.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function opencase_cases_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    // Main module help for the opencase_cases module.
+    case 'help.page.opencase_cases':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('Provides case entities and a required field on activities linking them to a case.') . '</p>';
+      return $output;
+
+    default:
+  }
+}
+
+/**
+ * Implements hook_theme().
+ */
+function opencase_cases_theme() {
+  return [
+    'opencase_cases' => [
+      'render element' => 'children',
+    ],
+    'oc_case' => [
+      'render element' => 'elements',
+      'file' => 'oc_case.page.inc',
+      'template' => 'oc_case',
+    ],
+    'oc_case_content_add_list' => [
+      'render element' => 'content',
+      'variables' => ['content' => NULL],
+      'file' => 'oc_case.page.inc',
+    ]
+  ];
+}
+
+function opencase_cases_entity_base_field_info($entity_type) {
+  $fields = array();
+  
+  // Add Case field to Activity 
+  if ($entity_type->id() === 'oc_activity') {
+    $fields['oc_case'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Case'))
+      ->setDescription(t('The case this activity belongs to.'))
+      ->setSetting('target_type', 'oc_case')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setCardinality(1)
+      ->setDefaultValueCallback('opencase_cases_default_activity_case_value')
+      ->setDisplayOptions('view', [
+        'type' => 'string',
+        'weight' => -3,
+      ])
+      ->setRequired(TRUE);
+  }
+  return $fields;
+}
+
+/**
+ * When creating an activity, it sets the case id from the URL.
+ */
+function opencase_cases_default_activity_case_value() {
+  return array(\Drupal::request()->query->get('case_id'));
+}
+
+/**
+ * Implementation of hook_form_alter()
+ * Changes what page is redirected to after deleting things
+ */
+function opencase_cases_form_alter(&$form, &$form_state, $form_id) {
+  if (preg_match('/oc_actor_.*_delete_form/', $form_id) or (preg_match('/oc_case_.*_delete_form/', $form_id)) or (preg_match('/oc_organisation_.*_delete_form/', $form_id))) {
+    $form['actions']['submit']['#submit'][] = '_opencase_cases_redirect_to_home';
+    $form['actions']['cancel']['#url'] = $form_state->getFormObject()->getEntity()->toUrl();
+  }
+  if (preg_match('/oc_activity_.*_delete_form/', $form_id)) {
+    $form['actions']['submit']['#submit'][] = '_opencase_cases_delete_activity_redirect';
+    $form['actions']['cancel']['#url'] = $form_state->getFormObject()->getEntity()->toUrl();
+  }
+}
+
+function _opencase_cases_redirect_to_home($form, &$form_state) {
+  $form_state->setRedirect('<front>'); 
+}
+function _opencase_cases_delete_activity_redirect($form, &$form_state) {
+  $case_id = $form_state->getFormObject()->getEntity()->oc_case->target_id;
+  $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]);
+}
+/**
+* Implements hook_theme_suggestions_HOOK().
+*/
+function opencase_cases_theme_suggestions_oc_case(array $variables) {
+  $suggestions = [];
+  $entity = $variables['elements']['#oc_case'];
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+
+  $suggestions[] = 'oc_case__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case__' . $entity->bundle();
+  $suggestions[] = 'oc_case__' . $entity->bundle() . '__' . $sanitized_view_mode;
+  $suggestions[] = 'oc_case__' . $entity->id();
+  $suggestions[] = 'oc_case__' . $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_cases/src/CaseInvolvement.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 class CaseInvolvement {
 

modules/opencase_cases/src/Controller/OCCaseController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\opencase_entities\Controller;
+namespace Drupal\opencase_cases\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Url;
-use Drupal\opencase_entities\Entity\OCCaseInterface;
+use Drupal\opencase_cases\Entity\OCCaseInterface;
 
 /**
  * Class OCCaseController.
@@ -48,7 +48,7 @@ class OCCaseController extends ControllerBase implements ContainerInjectionInter
   /**
    * Generates an overview table of older revisions of a Case .
    *
-   * @param \Drupal\opencase_entities\Entity\OCCaseInterface $oc_case
+   * @param \Drupal\opencase_cases\Entity\OCCaseInterface $oc_case
    *   A Case  object.
    *
    * @return array
@@ -75,7 +75,7 @@ class OCCaseController extends ControllerBase implements ContainerInjectionInter
     $latest_revision = TRUE;
 
     foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\opencase_entities\OCCaseInterface $revision */
+      /** @var \Drupal\opencase_cases\OCCaseInterface $revision */
       $revision = $oc_case_storage->loadRevision($vid);
       // Only show revisions that are affected by the language that is being
       // displayed.

modules/opencase_cases/src/Entity/OCCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Entity;
+namespace Drupal\opencase_cases\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -13,28 +13,28 @@ use Drupal\user\UserInterface;
 /**
  * Defines the Case entity.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  *
  * @ContentEntityType(
  *   id = "oc_case",
  *   label = @Translation("Case"),
  *   bundle_label = @Translation("Case type"),
  *   handlers = {
- *     "storage" = "Drupal\opencase_entities\OCCaseStorage",
+ *     "storage" = "Drupal\opencase_cases\OCCaseStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\opencase_entities\OCCaseListBuilder",
- *     "views_data" = "Drupal\opencase_entities\Entity\OCCaseViewsData",
- *     "translation" = "Drupal\opencase_entities\OCCaseTranslationHandler",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseListBuilder",
+ *     "views_data" = "Drupal\opencase_cases\Entity\OCCaseViewsData",
+ *     "translation" = "Drupal\opencase_cases\OCCaseTranslationHandler",
  *
  *     "form" = {
- *       "default" = "Drupal\opencase_entities\Form\OCCaseForm",
- *       "add" = "Drupal\opencase_entities\Form\OCCaseForm",
- *       "edit" = "Drupal\opencase_entities\Form\OCCaseForm",
- *       "delete" = "Drupal\opencase_entities\Form\OCCaseDeleteForm",
+ *       "default" = "Drupal\opencase_cases\Form\OCCaseForm",
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseDeleteForm",
  *     },
- *     "access" = "Drupal\opencase_entities\OCCaseAccessControlHandler",
+ *     "access" = "Drupal\opencase_cases\OCCaseAccessControlHandler",
  *     "route_provider" = {
- *       "html" = "Drupal\opencase_entities\OCCaseHtmlRouteProvider",
+ *       "html" = "Drupal\opencase_cases\OCCaseHtmlRouteProvider",
  *     },
  *   },
  *   base_table = "oc_case",
@@ -74,17 +74,6 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
 
   use EntityChangedTrait;
 
-  /**
-   * When creating a case, it sets the first involved party to the actor
-   * id from the URL, and the second to the author's linked actor 
-   * (if it exists and is different)
-   */
-  public static function defaultVal() {
-    $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]);
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -222,20 +211,21 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setDefaultValue(TRUE);
 
     $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Entered by'))
+      ->setLabel(t('Created by'))
       ->setDescription(t('The user ID of author of the Case entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
       ->setTranslatable(TRUE)
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setDisplayOptions('view', [
-        'label' => 'inline',
+        'label' => 'above',
         'type' => 'author',
-        'weight' => -4,
+        'weight' => 80,
       ]);
     $fields['name'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Case Title'))
-      ->setDescription(t('A short phrase summing up what this case is about.'))
+      ->setLabel(t('Title'))
       ->setRevisionable(TRUE)
       ->setSettings([
         'max_length' => 50,
@@ -245,37 +235,13 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
-        'weight' => -3,
       ])
       ->setDisplayOptions('form', [
         'type' => 'string_textfield',
-        'weight' => -3,
+        'weight' => -100,
       ])
       ->setRequired(TRUE);
 
-    $fields['actors_involved'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Involved Parties'))
-      ->setDescription(t('People involved in this case. To add one, start typing their name.'))
-      ->setSetting('target_type', 'oc_actor')
-      ->setSetting('handler', 'default')
-      ->setTranslatable(TRUE)
-      ->setCardinality(-1)
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => -2,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'autocomplete_type' => 'tags',
-          'placeholder' => '',
-        ],
-      ])
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'weight' => -2
-      ])
-      ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCCase::defaultVal')
-      ->setRequired(TRUE);
 
     $fields['files'] = BaseFieldDefinition::create('file')
       ->setLabel(t('Files'))
@@ -286,6 +252,8 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setSetting('description_field', 'true')
       ->setSetting('uri_scheme', 'private')
       ->setCardinality(-1)
+      ->setDisplayConfigurable('form', true)
+      ->setDisplayConfigurable('view', true)
       ->setDisplayOptions('form', [
         'type' => 'file_generic',
         'weight' => -1,
@@ -295,17 +263,24 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ])
       ->setDisplayOptions('view', [
         'label' => 'above',
-        'weight' => -1,
         'settings' => ['use_description_as_link_text' => 'true']
       ]);
 
     $fields['created'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Created'))
-      ->setDescription(t('The time that the entity was created.'));
+      ->setLabel(t('Created on'))
+      ->setDescription(t('When the case was created.'))
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'weight' => 80,
+      ]);
 
     $fields['changed'] = BaseFieldDefinition::create('changed')
-      ->setLabel(t('Changed'))
-      ->setDescription(t('The time that the entity was last edited.'));
+      ->setLabel(t('Last updated'))
+      ->setDescription(t('When the case was last edited.'))
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'weight' => 80,
+      ]);
 
     $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Revision translation affected'))

modules/opencase_cases/src/Entity/OCCaseInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Entity;
+namespace Drupal\opencase_cases\Entity;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\RevisionLogInterface;
@@ -10,7 +10,7 @@ use Drupal\user\EntityOwnerInterface;
 /**
  * Provides an interface for defining Case entities.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityOwnerInterface {
 
@@ -30,7 +30,7 @@ interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface,
    * @param string $name
    *   The Case name.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The called Case entity.
    */
   public function setName($name);
@@ -49,7 +49,7 @@ interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface,
    * @param int $timestamp
    *   The Case creation timestamp.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The called Case entity.
    */
   public function setCreatedTime($timestamp);
@@ -70,7 +70,7 @@ interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface,
    * @param bool $published
    *   TRUE to set this Case to published, FALSE to set it to unpublished.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The called Case entity.
    */
   public function setPublished($published);
@@ -89,7 +89,7 @@ interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface,
    * @param int $timestamp
    *   The UNIX timestamp of when this revision was created.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The called Case entity.
    */
   public function setRevisionCreationTime($timestamp);
@@ -108,7 +108,7 @@ interface OCCaseInterface extends ContentEntityInterface, RevisionLogInterface,
    * @param int $uid
    *   The user ID of the revision author.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The called Case entity.
    */
   public function setRevisionUserId($uid);

modules/opencase_cases/src/Entity/OCCaseType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Entity;
+namespace Drupal\opencase_cases\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
 
@@ -11,20 +11,20 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
  *   id = "oc_case_type",
  *   label = @Translation("Case type"),
  *   handlers = {
- *     "access" = "Drupal\opencase_entities\OCCaseTypeAccessControlHandler",
+ *     "access" = "Drupal\opencase_cases\OCCaseTypeAccessControlHandler",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\opencase_entities\OCCaseTypeListBuilder",
+ *     "list_builder" = "Drupal\opencase_cases\OCCaseTypeListBuilder",
  *     "form" = {
- *       "add" = "Drupal\opencase_entities\Form\OCCaseTypeForm",
- *       "edit" = "Drupal\opencase_entities\Form\OCCaseTypeForm",
- *       "delete" = "Drupal\opencase_entities\Form\OCCaseTypeDeleteForm"
+ *       "add" = "Drupal\opencase_cases\Form\OCCaseTypeForm",
+ *       "edit" = "Drupal\opencase_cases\Form\OCCaseTypeForm",
+ *       "delete" = "Drupal\opencase_cases\Form\OCCaseTypeDeleteForm"
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\opencase_entities\OCCaseTypeHtmlRouteProvider",
+ *       "html" = "Drupal\opencase_cases\OCCaseTypeHtmlRouteProvider",
  *     },
  *   },
  *   config_prefix = "oc_case_type",
- *   admin_permission = "administer opencase entity bundles",
+ *   admin_permission = "administer case bundles",
  *   bundle_of = "oc_case",
  *   entity_keys = {
  *     "id" = "id",

modules/opencase_cases/src/Entity/OCCaseTypeInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Entity;
+namespace Drupal\opencase_cases\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 

modules/opencase_cases/src/Entity/OCCaseViewsData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Entity;
+namespace Drupal\opencase_cases\Entity;
 
 use Drupal\views\EntityViewsData;
 

modules/opencase_cases/src/Form/OCCaseDeleteForm.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
 
 /**
  * Provides a form for deleting Case entities.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseDeleteForm extends ContentEntityDeleteForm {
 

modules/opencase_cases/src/Form/OCCaseForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,7 +8,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Form controller for Case edit forms.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseForm extends ContentEntityForm {
 
@@ -16,7 +16,7 @@ class OCCaseForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var $entity \Drupal\opencase_entities\Entity\OCCase */
+    /* @var $entity \Drupal\opencase_cases\Entity\OCCase */
     $form = parent::buildForm($form, $form_state);
 
     if (!$this->entity->isNew()) {

modules/opencase_cases/src/Form/OCCaseRevisionDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -12,7 +12,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
  * Provides a form for deleting a Case revision.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseRevisionDeleteForm extends ConfirmFormBase {
 
@@ -20,7 +20,7 @@ class OCCaseRevisionDeleteForm extends ConfirmFormBase {
   /**
    * The Case revision.
    *
-   * @var \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @var \Drupal\opencase_cases\Entity\OCCaseInterface
    */
   protected $revision;
 

modules/opencase_cases/src/Form/OCCaseRevisionRevertForm.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\opencase_entities\Entity\OCCaseInterface;
+use Drupal\opencase_cases\Entity\OCCaseInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Case revision.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseRevisionRevertForm extends ConfirmFormBase {
 
@@ -21,7 +21,7 @@ class OCCaseRevisionRevertForm extends ConfirmFormBase {
   /**
    * The Case revision.
    *
-   * @var \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @var \Drupal\opencase_cases\Entity\OCCaseInterface
    */
   protected $revision;
 
@@ -130,12 +130,12 @@ class OCCaseRevisionRevertForm extends ConfirmFormBase {
   /**
    * Prepares a revision to be reverted.
    *
-   * @param \Drupal\opencase_entities\Entity\OCCaseInterface $revision
+   * @param \Drupal\opencase_cases\Entity\OCCaseInterface $revision
    *   The revision to be reverted.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\opencase_entities\Entity\OCCaseInterface
+   * @return \Drupal\opencase_cases\Entity\OCCaseInterface
    *   The prepared revision ready to be stored.
    */
   protected function prepareRevertedRevision(OCCaseInterface $revision, FormStateInterface $form_state) {

modules/opencase_cases/src/Form/OCCaseRevisionRevertTranslationForm.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\opencase_entities\Entity\OCCaseInterface;
+use Drupal\opencase_cases\Entity\OCCaseInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Case revision for a single translation.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseRevisionRevertTranslationForm extends OCCaseRevisionRevertForm {
 
@@ -93,7 +93,7 @@ class OCCaseRevisionRevertTranslationForm extends OCCaseRevisionRevertForm {
   protected function prepareRevertedRevision(OCCaseInterface $revision, FormStateInterface $form_state) {
     $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
 
-    /** @var \Drupal\opencase_entities\Entity\OCCaseInterface $default_revision */
+    /** @var \Drupal\opencase_cases\Entity\OCCaseInterface $default_revision */
     $latest_revision = $this->OCCaseStorage->load($revision->id());
     $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
 

modules/opencase_cases/src/Form/OCCaseSettingsForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,7 +8,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Class OCCaseSettingsForm.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseSettingsForm extends FormBase {
 

modules/opencase_cases/src/Form/OCCaseTypeDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;

modules/opencase_cases/src/Form/OCCaseTypeForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities\Form;
+namespace Drupal\opencase_cases\Form;
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -30,7 +30,7 @@ class OCCaseTypeForm extends EntityForm {
       '#type' => 'machine_name',
       '#default_value' => $oc_case_type->id(),
       '#machine_name' => [
-        'exists' => '\Drupal\opencase_entities\Entity\OCCaseType::load',
+        'exists' => '\Drupal\opencase_cases\Entity\OCCaseType::load',
       ],
       '#disabled' => !$oc_case_type->isNew(),
     ];

modules/opencase_cases/src/OCCaseAccessControlHandler.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 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;
+use Drupal\opencase_cases\CaseInvolvement;
 
 /**
  * Access controller for the Case entity.
  *
- * @see \Drupal\opencase_entities\Entity\OCCase.
+ * @see \Drupal\opencase_cases\Entity\OCCase.
  */
 class OCCaseAccessControlHandler extends EntityAccessControlHandler {
 
@@ -19,7 +19,7 @@ class OCCaseAccessControlHandler extends EntityAccessControlHandler {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\opencase_entities\Entity\OCCaseInterface $entity */
+    /** @var \Drupal\opencase_cases\Entity\OCCaseInterface $entity */
     switch ($operation) {
       case 'view':
         if (!$entity->isPublished()) {

modules/opencase_cases/src/OCCaseHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
@@ -64,7 +64,7 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route
         ->setDefaults([
           '_title' => "{$entity_type->getLabel()} revisions",
-          '_controller' => '\Drupal\opencase_entities\Controller\OCCaseController::revisionOverview',
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseController::revisionOverview',
         ])
         ->setRequirement('_permission', 'access case revisions')
         ->setOption('_admin_route', TRUE);
@@ -87,8 +87,8 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision'));
       $route
         ->setDefaults([
-          '_controller' => '\Drupal\opencase_entities\Controller\OCCaseController::revisionShow',
-          '_title_callback' => '\Drupal\opencase_entities\Controller\OCCaseController::revisionPageTitle',
+          '_controller' => '\Drupal\opencase_cases\Controller\OCCaseController::revisionShow',
+          '_title_callback' => '\Drupal\opencase_cases\Controller\OCCaseController::revisionPageTitle',
         ])
         ->setRequirement('_permission', 'access case revisions')
         ->setOption('_admin_route', TRUE);
@@ -111,7 +111,7 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\opencase_entities\Form\OCCaseRevisionRevertForm',
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseRevisionRevertForm',
           '_title' => 'Revert to earlier revision',
         ])
         ->setRequirement('_permission', 'revert all case revisions')
@@ -135,7 +135,7 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_delete'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\opencase_entities\Form\OCCaseRevisionDeleteForm',
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseRevisionDeleteForm',
           '_title' => 'Delete earlier revision',
         ])
         ->setRequirement('_permission', 'delete all case revisions')
@@ -159,7 +159,7 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('translation_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\opencase_entities\Form\OCCaseRevisionRevertTranslationForm',
+          '_form' => '\Drupal\opencase_cases\Form\OCCaseRevisionRevertTranslationForm',
           '_title' => 'Revert to earlier revision of a translation',
         ])
         ->setRequirement('_permission', 'revert all case revisions')
@@ -183,7 +183,7 @@ class OCCaseHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route("/admin/structure/{$entity_type->id()}/settings");
       $route
         ->setDefaults([
-          '_form' => 'Drupal\opencase_entities\Form\OCCaseSettingsForm',
+          '_form' => 'Drupal\opencase_cases\Form\OCCaseSettingsForm',
           '_title' => "{$entity_type->getLabel()} settings",
         ])
         ->setRequirement('_permission', $entity_type->getAdminPermission())

modules/opencase_cases/src/OCCaseListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
@@ -9,7 +9,7 @@ use Drupal\Core\Link;
 /**
  * Defines a class to build a listing of Case entities.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseListBuilder extends EntityListBuilder {
 
@@ -27,7 +27,7 @@ class OCCaseListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\opencase_entities\Entity\OCCase */
+    /* @var $entity \Drupal\opencase_cases\Entity\OCCase */
     $row['id'] = $entity->id();
     $row['name'] = Link::createFromRoute(
       $entity->label(),

modules/opencase_cases/src/OCCaseStorage.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\opencase_entities\Entity\OCCaseInterface;
+use Drupal\opencase_cases\Entity\OCCaseInterface;
 
 /**
  * Defines the storage handler class for Case entities.
@@ -13,7 +13,7 @@ use Drupal\opencase_entities\Entity\OCCaseInterface;
  * This extends the base storage class, adding required special handling for
  * Case entities.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 class OCCaseStorage extends SqlContentEntityStorage implements OCCaseStorageInterface {
 

modules/opencase_cases/src/OCCaseStorageInterface.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\opencase_entities\Entity\OCCaseInterface;
+use Drupal\opencase_cases\Entity\OCCaseInterface;
 
 /**
  * Defines the storage handler class for Case entities.
@@ -13,14 +13,14 @@ use Drupal\opencase_entities\Entity\OCCaseInterface;
  * This extends the base storage class, adding required special handling for
  * Case entities.
  *
- * @ingroup opencase_entities
+ * @ingroup opencase_cases
  */
 interface OCCaseStorageInterface extends ContentEntityStorageInterface {
 
   /**
    * Gets a list of Case revision IDs for a specific Case.
    *
-   * @param \Drupal\opencase_entities\Entity\OCCaseInterface $entity
+   * @param \Drupal\opencase_cases\Entity\OCCaseInterface $entity
    *   The Case entity.
    *
    * @return int[]
@@ -42,7 +42,7 @@ interface OCCaseStorageInterface extends ContentEntityStorageInterface {
   /**
    * Counts the number of revisions in the default language.
    *
-   * @param \Drupal\opencase_entities\Entity\OCCaseInterface $entity
+   * @param \Drupal\opencase_cases\Entity\OCCaseInterface $entity
    *   The Case entity.
    *
    * @return int

modules/opencase_cases/src/OCCaseTranslationHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\content_translation\ContentTranslationHandler;
 

modules/opencase_cases/src/OCCaseTypeAccessControlHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Session\AccountInterface;
@@ -11,7 +11,7 @@ use Drupal\Core\Access\AccessResult;
  * Defines the access control handler for the OCCaseType Config Entity.
  * Always allows viewing the label of the bundle.
  *
- * @see Drupal\opencase_entities\Entity\OCCaseType
+ * @see Drupal\opencase_cases\Entity\OCCaseType
  */
 class OCCaseTypeAccessControlHandler extends EntityAccessControlHandler {
 

modules/opencase_cases/src/OCCaseTypeHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;

modules/opencase_cases/src/OCCaseTypeListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\opencase_entities;
+namespace Drupal\opencase_cases;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;

modules/opencase_cases/templates/oc-case-content-add-list.html.twig

@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of custom content entity types/bundles.
+ *
+ * Available variables:
+ * - types: A collection of all the available custom entity types/bundles.
+ *   Each type/bundle contains the following:
+ *   - link: A link to add a content entity of this type.
+ *   - description: A description of this content entity types/bundle.
+ *
+ * @see template_preprocess_oc_activity_content_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% spaceless %}
+  <dl>
+    {% for id,type in bundles %}
+      <dt><a href="/opencase/oc_case/add/{{ id }}?client_id={{ client_id }}">{{ type.label }}</a></dt>
+    {% endfor %}
+  </dl>
+{% endspaceless %}

modules/opencase_cases/templates/oc_case.html.twig

@@ -16,7 +16,18 @@
  */
 #}
 <div{{ attributes.addClass('oc_case') }}>
-  {% if content %}
-    {{- content -}}
-  {% endif %}
+  <h2>{{ title }}</h2>
+  <div class="oc_entity">
+    <div class="left">
+      {{ base_fields.actors_involved }}
+      {{ base_fields.changed }}
+      {{ base_fields.created }}
+      {{ base_fields.user_id }}
+    </div>
+    <div class="right">
+      {% for field in other_fields %}
+        {{ field }}
+      {% endfor %}
+    </div>
+  </div>
 </div>

modules/opencase_cases/templates/opencase-cases.html.twig

@@ -0,0 +1 @@
+<!-- Add you custom twig html here -->

modules/opencase_default_reporting/config/install/block.block.involvedparties.yml

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

modules/opencase_default_reporting/config/install/block.block.nationalities.yml

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

modules/opencase_default_reporting/config/install/block.block.osiclevel.yml

@@ -23,6 +23,6 @@ settings:
 visibility:
   request_path:
     id: request_path
-    pages: '/opencase/reporting/*'
+    pages: /opencase/reporting/volunteers
     negate: false
     context_mapping: {  }

modules/opencase_default_reporting/config/install/block.block.outcome.yml

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

modules/opencase_default_reporting/config/install/facets.facet.asylum_status.yml

@@ -10,7 +10,7 @@ id: asylum_status
 name: 'Asylum status'
 url_alias: asylum_status
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_asylum_status
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'

modules/opencase_default_reporting/config/install/facets.facet.asylum_status_export.yml

@@ -10,7 +10,7 @@ id: asylum_status_export
 name: 'Asylum status'
 url_alias: asylum_status
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_asylum_status
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'

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

@@ -10,7 +10,7 @@ id: created
 name: Created
 url_alias: created
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: created
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'

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

@@ -9,7 +9,7 @@ id: created_export
 name: 'Created - Export'
 url_alias: created
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: created
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'

modules/opencase_default_reporting/config/install/facets.facet.disability.yml

@@ -10,7 +10,7 @@ id: disability
 name: 'Disability'
 url_alias: disability
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_disability
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'

modules/opencase_default_reporting/config/install/facets.facet.disability_export.yml

@@ -10,7 +10,7 @@ id: disability_export
 name: 'Disability'
 url_alias: disability
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_disability
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'

modules/opencase_default_reporting/config/install/facets.facet.gender_identified_with.yml

@@ -10,7 +10,7 @@ id: gender_identified_with
 name: 'Gender Identity'
 url_alias: gender_identified_with
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_gender_identified_with
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'

modules/opencase_default_reporting/config/install/facets.facet.gender_identified_with_export.yml

@@ -10,7 +10,7 @@ id: gender_identified_with_export
 name: 'Gender Identity'
 url_alias: gender_identified_with
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_gender_identified_with
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'

modules/opencase_default_reporting/config/install/facets.facet.involved_parties.yml

@@ -0,0 +1,62 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: involved_parties
+name: 'Involved Parties'
+url_alias: involved_parties
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: actors_involved
+facet_source_id: 'search_api:views_page__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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
+  exclude_specified_items:
+    processor_id: exclude_specified_items
+    weights:
+      build: 50
+    settings:
+      exclude: client
+      regex: true
+  translate_entity:
+    processor_id: translate_entity
+    weights:
+      build: 5
+    settings: {  }
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.involved_parties_export.yml

@@ -0,0 +1,55 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: involved_parties_export
+name: 'Involved Parties (Export)'
+url_alias: involved_parties
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: actors_involved
+facet_source_id: 'search_api:views_data_export__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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
+  translate_entity:
+    processor_id: translate_entity
+    weights:
+      build: 5
+    settings: {  }
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.languages.yml

@@ -10,7 +10,7 @@ id: languages
 name: 'Languages'
 url_alias: languages
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_languages_spoken
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'

modules/opencase_default_reporting/config/install/facets.facet.languages_export.yml

@@ -10,7 +10,7 @@ id: languages_export
 name: 'Languages'
 url_alias: languages
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_languages_spoken
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'

modules/opencase_default_reporting/config/install/facets.facet.nationalities.yml

@@ -6,13 +6,13 @@ dependencies:
     - views.view.reporting_clients
   module:
     - search_api
-id: nationality
-name: 'Nationality'
-url_alias: nationality
+id: nationalities
+name: Nationalities
+url_alias: nationalities
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
-field_identifier: field_nationality
+field_identifier: field_nationalities
 facet_source_id: 'search_api:views_page__reporting_clients__page_1'
 widget:
   type: checkbox

modules/opencase_default_reporting/config/install/facets.facet.nationalities_export.yml

@@ -3,19 +3,18 @@ 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
+    - views_data_export
+id: nationalities_export
+name: Nationalities-export
+url_alias: nationalities_export
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
-field_identifier: field_nationality
+field_identifier: field_nationalities
 facet_source_id: 'search_api:views_data_export__reporting_clients__data_export_1'
 widget:
-  type: checkbox
+  type: links
   config:
     show_numbers: false
     soft_limit: 0
@@ -30,6 +29,18 @@ 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:

modules/opencase_default_reporting/config/install/facets.facet.osic_level.yml

@@ -10,7 +10,7 @@ id: osic_level
 name: 'OSIC level'
 url_alias: osic_level
 weight: 0
-min_count: 1
+min_count: 0
 show_only_one_result: false
 field_identifier: field_osic_level
 facet_source_id: 'search_api:views_page__reporting_volunteers__page_1'

modules/opencase_default_reporting/config/install/facets.facet.osic_level_export.yml

@@ -3,11 +3,10 @@ status: true
 dependencies:
   config:
     - search_api.index.opencase_reporting_volunteers
-    - views.view.reporting_volunteers
   module:
-    - search_api
+    - views_data_export
 id: osic_level_export
-name: 'OSIC level (Export)'
+name: 'OSIC level Export'
 url_alias: osic_level
 weight: 0
 min_count: 1
@@ -15,7 +14,7 @@ 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
+  type: links
   config:
     show_numbers: false
     soft_limit: 0
@@ -30,6 +29,18 @@ 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:

modules/opencase_default_reporting/config/install/facets.facet.outcome.yml

@@ -0,0 +1,52 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: outcome
+name: Outcome
+url_alias: outcome
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_outcome
+facet_source_id: 'search_api:views_page__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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: false
+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: text
+  text_format: plain_text
+  text: ''
+show_title: false

modules/opencase_default_reporting/config/install/facets.facet.outcome_export.yml

@@ -0,0 +1,52 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.opencase_reporting_cases
+    - views.view.reporting_cases
+  module:
+    - search_api
+id: outcome_export
+name: Outcome (Export)
+url_alias: outcome
+weight: 0
+min_count: 0
+show_only_one_result: false
+field_identifier: field_outcome
+facet_source_id: 'search_api:views_data_export__reporting_cases__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'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+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: false
+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: text
+  text_format: plain_text
+  text: ''
+show_title: false

modules/opencase_default_reporting/config/install/search_api.index.opencase_reporting_clients.yml

@@ -6,7 +6,7 @@ dependencies:
     - 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
+    - field.storage.oc_actor.field_nationalities
     - search_api.server.opencase_reporting_server
   module:
     - opencase_entities
@@ -56,14 +56,38 @@ field_settings:
     dependencies:
       config:
         - field.storage.oc_actor.field_languages_spoken
-  field_nationality:
+  field_nationalities:
     label: Nationality
     datasource_id: 'entity:oc_actor'
-    property_path: field_nationality
+    property_path: field_nationalities
     type: string
     dependencies:
       config:
-        - field.storage.oc_actor.field_nationality
+        - field.storage.oc_actor.field_nationalities
+  first_name:
+    label: 'First Name'
+    datasource_id: 'entity:oc_actor'
+    property_path: first_name
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
+  last_name:
+    label: 'Last Name'
+    datasource_id: 'entity:oc_actor'
+    property_path: last_name
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
+  post_code:
+    label: 'Post Code'
+    datasource_id: 'entity:oc_actor'
+    property_path: post_code
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
 datasource_settings:
   'entity:oc_actor':
     bundles:

modules/opencase_default_reporting/config/install/search_api.index.opencase_reporting_volunteers.yml

@@ -1,25 +1,26 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_osic_level
+    - search_api.server.opencase_reporting_server
   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
+  field_languages_spoken:
+    label: 'Languages spoken'
     datasource_id: 'entity:oc_actor'
-    property_path: created
-    type: date
+    property_path: field_languages_spoken
+    type: string
     dependencies:
-      module:
-        - opencase_entities
+      config:
+        - field.storage.oc_actor.field_languages_spoken
   field_osic_level:
     label: 'OSIC level'
     datasource_id: 'entity:oc_actor'
@@ -28,6 +29,14 @@ field_settings:
     dependencies:
       config:
         - field.storage.oc_actor.field_osic_level
+  name:
+    label: Name
+    datasource_id: 'entity:oc_actor'
+    property_path: name
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
 datasource_settings:
   'entity:oc_actor':
     bundles:

modules/opencase_default_reporting/config/install/views.view.name_and_status_changes.yml

@@ -2,18 +2,19 @@ langcode: en
 status: true
 dependencies:
   config:
-    - user.role.authenticated
+    - field.storage.oc_actor.field_asylum_status
+    - field.storage.oc_actor.field_marital_
   module:
     - opencase_entities
+    - options
     - user
-id: cases
-label: Cases
+id: name_and_status_changes
+label: 'Name and Status Changes'
 module: views
 description: ''
 tag: ''
-base_table: oc_case_field_data
-base_field: id
-core: 8.x
+base_table: oc_actor_field_revision
+base_field: vid
 display:
   default:
     display_plugin: default
@@ -22,12 +23,11 @@ display:
     position: 0
     display_options:
       access:
-        type: role
+        type: perm
         options:
-          role:
-            authenticated: authenticated
+          perm: 'view published case entities'
       cache:
-        type: none
+        type: tag
         options: {  }
       query:
         type: views_query
@@ -40,48 +40,112 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Go
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
+          expose_sort_order: false
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: mini
+        type: none
         options:
-          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
+        options:
+          grouping:
+            -
+              field: view_oc_actor
+              rendered: true
+              rendered_strip: false
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            first_name: first_name
+            middle_names: middle_names
+            last_name: last_name
+            field_asylum_status-revision_id: field_asylum_status-revision_id
+            field_marital_-revision_id: field_marital_-revision_id
+            view_oc_actor: view_oc_actor
+            revision_created: revision_created
+          info:
+            first_name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            middle_names:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            last_name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_asylum_status-revision_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_marital_-revision_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            view_oc_actor:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            revision_created:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
       row:
         type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
       fields:
-        id:
-          id: id
-          table: oc_case_field_data
-          field: id
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
           relationship: none
-          group_type: group
+          group_type: min
           admin_label: ''
-          label: ID
-          exclude: true
+          label: 'Date changed'
+          exclude: false
           alter:
-            alter_text: false
-            text: ''
+            alter_text: true
+            text: '{{ revision_created | date(''d/m/Y'') }}'
             make_link: false
             path: ''
             absolute: false
@@ -118,11 +182,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
+          set_precision: false
+          precision: 0
+          decimal: .
+          separator: ''
+          format_plural: 0
+          format_plural_string: !!binary MQNAY291bnQ=
+          prefix: ''
+          suffix: ''
           click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
+          type: timestamp
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -131,24 +201,23 @@ display:
           delta_reversed: false
           delta_first_last: false
           multi_type: separator
-          separator: ', '
           field_api_classes: false
-          entity_type: oc_case
-          entity_field: id
+          entity_type: oc_actor
+          entity_field: revision_created
           plugin_id: field
-        name:
-          id: name
-          table: oc_case_field_data
-          field: name
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          field: first_name
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Case Title'
+          label: 'First Name'
           exclude: false
           alter:
             alter_text: false
             text: ''
-            make_link: true
+            make_link: false
             path: ''
             absolute: false
             external: false
@@ -159,7 +228,7 @@ display:
             rel: ''
             link_class: ''
             prefix: ''
-            suffix: foo
+            suffix: ''
             target: ''
             nl2br: false
             max_length: 0
@@ -198,147 +267,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: null
-          entity_field: name
+          entity_type: oc_actor
+          entity_field: first_name
           plugin_id: field
-        type:
-          id: type
-          table: oc_case_field_data
-          field: type
+        middle_names:
+          id: middle_names
+          table: oc_actor_field_revision
+          field: middle_names
           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
-          entity_type: oc_case
-          entity_field: type
-          plugin_id: field
-        actors_involved_target_id:
-          id: actors_involved_target_id
-          table: oc_case__actors_involved
-          field: actors_involved_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Involved Parties'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: oc_case
-          entity_field: actors_involved
-          plugin_id: field
-        created:
-          id: created
-          table: oc_case_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Created
+          label: 'Middle Names'
           exclude: false
           alter:
             alter_text: false
@@ -380,11 +319,9 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: string
           settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+            link_to_entity: false
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -395,21 +332,21 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_case
-          entity_field: created
+          entity_type: oc_actor
+          entity_field: middle_names
           plugin_id: field
-        nothing:
-          id: nothing
-          table: views
-          field: nothing
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          field: last_name
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Go to'
+          label: 'Last Name'
           exclude: false
           alter:
-            alter_text: true
-            text: "<ul><li><a href='/opencase/oc_case/{{ id }}'>Details/Files</a></li>\n<li><a href='/opencase/oc_case/{{ id}}/activity_list'>Activities</a>\n</li></ul>"
+            alter_text: false
+            text: ''
             make_link: false
             path: ''
             absolute: false
@@ -445,153 +382,347 @@ display:
           empty: ''
           hide_empty: false
           empty_zero: false
-          hide_alter_empty: false
-          plugin_id: custom
-      filters:
-      sorts:
-        created:
-          id: created
-          table: oc_case_field_data
-          field: created
+          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
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: field
+        field_asylum_status-revision_id:
+          id: field_asylum_status-revision_id
+          table: oc_actor_revision__field_asylum_status
+          field: field_asylum_status-revision_id
           relationship: none
           group_type: group
           admin_label: ''
-          order: DESC
+          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
+          plugin_id: field
+        field_marital_-revision_id:
+          id: field_marital_-revision_id
+          table: oc_actor_revision__field_marital_
+          field: field_marital_-revision_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Marital 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
+          plugin_id: field
+        view_oc_actor:
+          id: view_oc_actor
+          table: oc_actor_field_revision
+          field: view_oc_actor
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: true
+            text: 'View current record for this person &#9660;'
+            make_link: true
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: 'See "rewrite results" (had to do it that way because contains HTML).'
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_actor
+          plugin_id: entity_link
+      filters:
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: starts
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: first_name_op
+            label: 'First Name'
+            description: ''
+            use_operator: false
+            operator: first_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: first_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: string
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: starts
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: last_name_op
+            label: 'Last Name'
+            description: ''
+            use_operator: false
+            operator: last_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: last_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: string
+      sorts:
+        revision_created:
+          id: revision_created
+          table: oc_actor_revision
+          field: revision_created
+          relationship: none
+          group_type: min
+          admin_label: ''
+          order: ASC
           exposed: false
           expose:
             label: ''
-          granularity: day
-          entity_type: oc_case
-          entity_field: created
+          granularity: second
+          entity_type: oc_actor
+          entity_field: revision_created
           plugin_id: date
-      title: ''
       header: {  }
       footer: {  }
-      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
+      empty: {  }
       relationships: {  }
-      arguments:
-        actors_involved_target_id:
-          id: actors_involved_target_id
-          table: oc_case__actors_involved
-          field: actors_involved_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          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: {  }
-          break_phrase: false
-          not: false
-          entity_type: oc_case
-          entity_field: actors_involved
-          plugin_id: numeric
+      arguments: {  }
       display_extenders: {  }
+      group_by: true
       use_ajax: true
+      title: 'Name, Asylum and Marital Status Report'
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
-        - user.roles
-      tags: {  }
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_marital_'
   page_1:
     display_plugin: page
     id: page_1
     display_title: Page
     position: 1
     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
+      path: opencase/reporting/name_and_status_changes
+      display_extenders:
+        library_in_views_display_extender: {  }
     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 People.</b> menu.</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: {  }
+        - user.permissions
+      tags:
+        - 'config:field.storage.oc_actor.field_asylum_status'
+        - 'config:field.storage.oc_actor.field_marital_'

modules/opencase_default_reporting/config/install/views.view.reporting_cases.yml

@@ -2,11 +2,8 @@ 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'
+    - field.storage.oc_case.field_outcome
+    - search_api.index.opencase_reporting_cases
   module:
     - csv_serialization
     - options
@@ -15,12 +12,12 @@ dependencies:
     - serialization
     - user
     - views_data_export
-id: reporting_volunteers
-label: 'Reporting: Volunteers'
+id: reporting_cases
+label: 'Reporting: Cases'
 module: views
 description: ''
 tag: ''
-base_table: search_api_index_opencase_reporting_volunteers
+base_table: search_api_index_opencase_reporting_cases
 base_field: search_api_id
 core: 8.x
 display:
@@ -35,13 +32,14 @@ display:
         options:
           perm: 'use opencase'
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
         options:
           bypass_access: false
           skip_access: false
+          preserve_facet_query_args: false
       exposed_form:
         type: basic
         options:
@@ -55,7 +53,7 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 20
           offset: 0
           id: 0
           total_pages: null
@@ -72,17 +70,58 @@ display:
             next: ››
       style:
         type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            name: name
+            type: type
+            actors_involved: actors_involved
+            field_outcome: field_outcome
+          info:
+            name:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            actors_involved:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_outcome:
+              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_volunteers_entity_oc_actor
-          field: first_name
+        name:
+          id: name
+          table: search_api_datasource_opencase_reporting_cases_entity_oc_case
+          field: name
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'First Name'
+          label: ''
           exclude: false
           alter:
             alter_text: false
@@ -126,7 +165,7 @@ display:
           click_sort_column: value
           type: string
           settings:
-            link_to_entity: false
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -144,87 +183,16 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: oc_actor
+          entity_type: oc_case
           plugin_id: search_api_field
-        last_name:
-          id: last_name
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
-          field: last_name
+        type:
+          id: type
+          table: search_api_datasource_opencase_reporting_cases_entity_oc_case
+          field: type
           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'
+          label: ''
           exclude: false
           alter:
             alter_text: false
@@ -265,13 +233,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
+          click_sort_column: target_id
+          type: entity_reference_label
           settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
+            link: false
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -282,96 +248,28 @@ display:
           separator: ', '
           field_api_classes: false
           field_rendering: true
-          fallback_handler: search_api_date
+          fallback_handler: search_api_entity
           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
+            display_methods:
+              oc_case_type:
+                display_method: label
+          entity_type: oc_case
           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: ', '
+        actors_involved:
+          table: search_api_index_opencase_reporting_cases
+          field: actors_involved
+          id: actors_involved
           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
+          label: ''
           exclude: false
           alter:
             alter_text: false
@@ -412,6 +310,75 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings: {  }
+          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: {  }
+        field_outcome:
+          id: field_outcome
+          table: search_api_index_opencase_reporting_cases
+          field: field_outcome
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
           click_sort_column: value
           type: list_default
           settings: {  }
@@ -432,31 +399,16 @@ display:
             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
+      title: 'Reporting: Cases'
+      header: {  }
       footer: {  }
       empty: {  }
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
@@ -465,8 +417,7 @@ display:
         - url.query_args
         - user.permissions
       tags:
-        - 'config:field.storage.oc_actor.field_languages_spoken'
-        - 'config:field.storage.oc_actor.field_osic_level'
+        - 'config:field.storage.oc_case.field_outcome'
   data_export_1:
     display_plugin: data_export
     id: data_export_1
@@ -474,8 +425,11 @@ display:
     position: 2
     display_options:
       display_extenders: {  }
-      path: opencase/reporting/volunteers
+      path: opencase/reporting/cases
       filename: '[view:title].csv'
+      displays:
+        page_1: page_1
+        default: '0'
       style:
         type: data_export
         options:
@@ -508,8 +462,7 @@ display:
         - request_format
         - user.permissions
       tags:
-        - 'config:field.storage.oc_actor.field_languages_spoken'
-        - 'config:field.storage.oc_actor.field_osic_level'
+        - 'config:field.storage.oc_case.field_outcome'
   page_1:
     display_plugin: page
     id: page_1
@@ -517,7 +470,7 @@ display:
     position: 1
     display_options:
       display_extenders: {  }
-      path: opencase/reporting/volunteers
+      path: opencase/reporting/cases
     cache_metadata:
       max-age: -1
       contexts:
@@ -526,5 +479,4 @@ display:
         - url.query_args
         - user.permissions
       tags:
-        - 'config:field.storage.oc_actor.field_languages_spoken'
-        - 'config:field.storage.oc_actor.field_osic_level'
+        - 'config:field.storage.oc_case.field_outcome'

modules/opencase_default_reporting/config/install/views.view.reporting_clients.yml

@@ -6,11 +6,10 @@ dependencies:
     - 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
+    - field.storage.oc_actor.field_nationalities
     - search_api.index.opencase_reporting_clients
-  content:
-    - 'block_content:basic:944ff38d-5931-4439-91d5-f53b5ad7aac7'
   module:
+    - csv_serialization
     - options
     - rest
     - search_api
@@ -57,10 +56,13 @@ display:
       pager:
         type: mini
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -69,22 +71,19 @@ display:
             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
+        name:
+          id: name
           table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
-          field: first_name
+          field: name
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'First Name'
+          label: Name
           exclude: false
           alter:
             alter_text: false
@@ -128,78 +127,7 @@ display:
           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
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -429,14 +357,14 @@ display:
             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
+        field_nationalities:
+          id: field_nationalities
+          table: search_api_datasource_opencase_reporting_clients_entity_oc_actor
+          field: field_nationalities
           relationship: none
           group_type: group
           admin_label: ''
-          label: Languages
+          label: Nationality
           exclude: false
           alter:
             alter_text: false
@@ -497,15 +425,16 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
+          entity_type: oc_actor
           plugin_id: search_api_field
-        field_nationality:
-          id: field_nationality
+        field_languages_spoken:
+          id: field_languages_spoken
           table: search_api_index_opencase_reporting_clients
-          field: field_nationality
+          field: field_languages_spoken
           relationship: none
           group_type: group
           admin_label: ''
-          label: Nationality
+          label: Languages
           exclude: false
           alter:
             alter_text: false
@@ -547,9 +476,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
+          type: list_default
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -661,7 +589,6 @@ display:
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
@@ -674,7 +601,7 @@ display:
         - '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'
+        - 'config:field.storage.oc_actor.field_nationalities'
   data_export_1:
     display_plugin: data_export
     id: data_export_1
@@ -684,6 +611,37 @@ display:
       display_extenders: {  }
       path: opencase/reporting/clients
       filename: '[view:title].csv'
+      cache:
+        type: none
+      defaults:
+        cache: false
+      displays:
+        page_1: page_1
+        default: '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_metadata:
       max-age: -1
       contexts:
@@ -696,7 +654,7 @@ display:
         - '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'
+        - 'config:field.storage.oc_actor.field_nationalities'
   page_1:
     display_plugin: page
     id: page_1
@@ -721,4 +679,4 @@ display:
         - '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'
+        - 'config:field.storage.oc_actor.field_nationalities'

modules/opencase_default_reporting/config/install/views.view.reporting_volunteers.yml

@@ -0,0 +1,395 @@
+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
+  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: 50
+          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
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            field_languages_spoken: field_languages_spoken
+          info:
+            field_languages_spoken:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: search_api_index_opencase_reporting_volunteers
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          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_1:
+          id: field_languages_spoken_1
+          table: search_api_index_opencase_reporting_volunteers
+          field: field_languages_spoken
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Languages spoken'
+          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_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: ', '
+          plugin_id: search_api_field
+      filters: {  }
+      sorts: {  }
+      title: 'Volunteer Report'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    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'
+      cache:
+        type: none
+      defaults:
+        cache: false
+      displays:
+        page_1: page_1
+        default: '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_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:
+        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_languages_spoken'
+        - 'config:field.storage.oc_actor.field_osic_level'

modules/opencase_default_reporting/opencase_default_reporting.info.yml

@@ -0,0 +1,9 @@
+name: 'Opencase example reporting'
+type: module
+description: 'Reporting on the types of people, cases etc that the Opencase Defaults module provides'
+core: 8.x
+package: 'OpenCase'
+dependencies:
+  - opencase_defaults
+  - opencase_reporting
+  - opencase_cases

modules/opencase_default_reporting/opencase_default_reporting.links.menu.yml

@@ -0,0 +1,7 @@
+opencase_default_reporting.report_on_status_changes:
+  title: 'Status Changes'
+  description: "Report on changes to people's name, asylum or marital status"
+  parent: opencase_reporting.reporting_menu
+  url: internal:/opencase/reporting/name_and_status_changes
+  weight: 2
+

modules/opencase_default_reporting/opencase_default_reporting.module

@@ -0,0 +1,43 @@
+<?php
+
+function opencase_default_reporting_uninstall() {
+  $configs = [
+    'search_api.index.opencase_reporting_cases',
+    'search_api.index.opencase_reporting_clients',
+    'search_api.index.opencase_reporting_volunteers',
+    'block.block.facet_asylum_status',
+    'block.block.facet_created',
+    'block.block.facet_disability',
+    'block.block.facet_gender_identified_with',
+    'block.block.facet_languages',
+    'block.block.nationalities',
+    'block.block.osiclevel',
+    'block.block.outcome',
+    'block.block.involvedparties',
+    'views.view.reporting_clients',
+    'views.view.reporting_volunteers',
+    'views.view.reporting_cases',
+    'views.view.name_and_status_changes',
+    'facets.facet.asylum_status_export',
+    'facets.facet.disability',
+    'facets.facet.nationalities_export',
+    'facets.facet.asylum_status',
+    'facets.facet.gender_identified_with_export',
+    'facets.facet.nationalities',
+    'facets.facet.created_export',
+    'facets.facet.gender_identified_with',
+    'facets.facet.osic_level_export',
+    'facets.facet.created',
+    'facets.facet.languages_export',
+    'facets.facet.osic_level',
+    'facets.facet.disability_export',
+    'facets.facet.languages',
+    'facets.facet.outcome',
+    'facets.facet.outcome_export',
+    'facets.facet.involved_parties',
+    'facets.facet.involved_parties_export',
+  ];
+  foreach($configs as $config) {
+    Drupal::configFactory()->getEditable($config)->delete();
+  }
+}

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

@@ -1,11 +0,0 @@
-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

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

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

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.accommodation
-id: oc_case.accommodation.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: accommodation
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.base_field_override.oc_case.asylum_support.actors_involved.yml

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.asylum_support
-id: oc_case.asylum_support.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: asylum_support
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.base_field_override.oc_case.employability.actors_involved.yml

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.employability
-id: oc_case.employability.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: employability
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.base_field_override.oc_case.health.actors_involved.yml

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.health
-id: oc_case.health.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: health
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.base_field_override.oc_case.immigration.actors_involved.yml

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.immigration
-id: oc_case.immigration.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: immigration
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.base_field_override.oc_case.volunteer_engagement.actors_involved.yml

@@ -1,22 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_case_type.volunteer_engagement
-id: oc_case.volunteer_engagement.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: volunteer_engagement
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: 'Drupal\opencase_entities\Entity\OCCase::defaultVal'
-settings:
-  handler_settings:
-    target_bundles:
-      volunteer: volunteer
-  handler: default
-field_type: entity_reference

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

@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_actor_type.client
-    - opencase_entities.oc_actor_type.volunteer
-    - opencase_entities.oc_case_type.welfare_rights
-id: oc_case.welfare_rights.actors_involved
-field_name: actors_involved
-entity_type: oc_case
-bundle: welfare_rights
-label: 'Involved Parties'
-description: 'People involved in this case. To add one, start typing their name.'
-required: true
-translatable: true
-default_value: {  }
-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.case_note.default.yml

@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - opencase_entities.oc_activity_type.case_note
-id: oc_activity.case_note.default
-targetEntityType: oc_activity
-bundle: case_note
-mode: default
-content: {  }
-hidden: {  }

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

@@ -1,26 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.destitution_funds_provided.field_amount
-    - field.field.oc_activity.destitution_funds_provided.field_funds_for
-    - opencase_entities.oc_activity_type.destitution_funds_provided
-id: oc_activity.destitution_funds_provided.default
-targetEntityType: oc_activity
-bundle: destitution_funds_provided
-mode: default
-content:
-  field_amount:
-    weight: 28
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-    type: number
-    region: content
-  field_funds_for:
-    weight: 27
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-hidden: {  }

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

@@ -1,29 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
-    - field.field.oc_activity.volunteer_training_session.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
-  module:
-    - datetime
-id: oc_activity.volunteer_training_session.default
-targetEntityType: oc_activity
-bundle: volunteer_training_session
-mode: default
-content:
-  field_date_attended:
-    weight: 27
-    settings: {  }
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
-  field_type_of_session:
-    weight: 26
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-hidden: {  }

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

@@ -1,165 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_actor.client.field_asylum_status
-    - field.field.oc_actor.client.field_confidentiality_form
-    - field.field.oc_actor.client.field_date_of_birth
-    - field.field.oc_actor.client.field_dependants
-    - field.field.oc_actor.client.field_disability
-    - field.field.oc_actor.client.field_ethnic_o
-    - field.field.oc_actor.client.field_gender_identified_with
-    - field.field.oc_actor.client.field_how_heard
-    - field.field.oc_actor.client.field_income
-    - field.field.oc_actor.client.field_languages_spoken
-    - field.field.oc_actor.client.field_marital_
-    - field.field.oc_actor.client.field_nationality
-    - field.field.oc_actor.client.field_referred_by
-    - opencase_entities.oc_actor_type.client
-  module:
-    - datetime
-    - file
-id: oc_actor.client.default
-targetEntityType: oc_actor
-bundle: client
-mode: default
-content:
-  field_asylum_status:
-    weight: 6
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_client_field_1:
-    weight: 26
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_confidentiality_form:
-    weight: 15
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-    type: file_generic
-    region: content
-  field_date_of_birth:
-    weight: 3
-    settings: {  }
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
-  field_dependants:
-    weight: 12
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_disability:
-    weight: 10
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_ethnic_o:
-    weight: 7
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_gender_identified_with:
-    weight: 4
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_how_heard:
-    weight: 13
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_income:
-    weight: 11
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_languages_spoken:
-    weight: 9
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_marital_:
-    weight: 5
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_nationality:
-    weight: 8
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_referred_by:
-    weight: 14
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  name:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  phone2:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  postal_address:
-    type: string_textarea
-    weight: 2
-    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_actor.volunteer.default.yml

@@ -1,43 +0,0 @@
-langcode: en
-status: true
-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
-bundle: volunteer
-mode: default
-content:
-  field_languages_spoken:
-    weight: 1
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_nationality:
-    weight: 0
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-    type: string_textfield
-    region: content
-  field_osic_level:
-    weight: 2
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_skills:
-    type: string_textarea
-    weight: 3
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }

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

@@ -1,49 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.accommodation.field_case_finance
-    - field.field.oc_case.accommodation.field_fee_calculation
-    - field.field.oc_case.accommodation.field_fee_or_equivalent_cost
-    - field.field.oc_case.accommodation.field_outcome
-    - field.field.oc_case.accommodation.field_type_of_acco
-    - opencase_entities.oc_case_type.accommodation
-  module:
-    - file
-id: oc_case.accommodation.default
-targetEntityType: oc_case
-bundle: accommodation
-mode: default
-content:
-  field_case_finance:
-    weight: 1
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_fee_calculation:
-    weight: 3
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_fee_or_equivalent_cost:
-    weight: 2
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-    type: number
-    region: content
-  field_outcome:
-    weight: 26
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_type_of_acco:
-    weight: 0
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-hidden: {  }

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

@@ -1,49 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_case.asylum_support.field_case_finance
-    - field.field.oc_case.asylum_support.field_fee_calculation
-    - field.field.oc_case.asylum_support.field_fee_or_equivalent_cost
-    - field.field.oc_case.asylum_support.field_outcome
-    - field.field.oc_case.asylum_support.field_type_of_as
-    - opencase_entities.oc_case_type.asylum_support
-  module:
-    - file
-id: oc_case.asylum_support.default
-targetEntityType: oc_case
-bundle: asylum_support
-mode: default
-content:
-  field_case_finance:
-    weight: 27
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_fee_calculation:
-    weight: 29
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_fee_or_equivalent_cost:
-    weight: 28
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-    type: number
-    region: content
-  field_outcome:
-    weight: 30
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_type_of_as:
-    weight: 26
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-hidden: {  }