search view: changed no-results wording &cache off

like duh why didn't it just do that by default

.gitignore

@@ -1 +1,2 @@
 *.swp
+vendor

config/install/block.block.opencase.yml

@@ -5,13 +5,12 @@ dependencies:
     - system.menu.opencase-admin
   module:
     - system
-    - user
   theme:
     - bartik
 id: opencase
 theme: bartik
 region: sidebar_first
-weight: -6
+weight: -8
 provider: null
 plugin: 'system_menu_block:opencase-admin'
 settings:
@@ -21,11 +20,4 @@ settings:
   label_display: visible
   level: 1
   depth: 0
-visibility:
+visibility: {  }
-  user_role:
-    id: user_role
-    roles:
-      administrator: administrator
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'

config/install/block.block.opencaseaddactors.yml

@@ -16,9 +16,9 @@ provider: null
 plugin: 'system_menu_block:opencase-add-actors'
 settings:
   id: 'system_menu_block:opencase-add-actors'
-  label: 'OpenCase Add Actors'
+  label: 'Add Actors'
   provider: system
-  label_display: '0'
+  label_display: visible
   level: 1
   depth: 0
 visibility:

config/install/block.block.opencasecontextualmenu.yml

@@ -5,10 +5,10 @@ dependencies:
     - opencase
   theme:
     - bartik
-id: opencasecontextualmenu_2
+id: opencasecontextualmenu
 theme: bartik
 region: sidebar_second
-weight: 0
+weight: -8
 provider: null
 plugin: opencase_contextual_menu
 settings:

config/install/views.view.activities.yml

@@ -1,8 +1,11 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - user.role.authenticated
   module:
     - opencase_entities
+    - user
 id: activities
 label: Activities
 module: views
@@ -19,10 +22,12 @@ display:
     position: 0
     display_options:
       access:
-        type: none
+        type: role
-        options: {  }
+        options:
+          role:
+            authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -130,6 +135,71 @@ display:
           entity_type: null
           entity_field: name
           plugin_id: field
+        type:
+          id: type
+          table: oc_activity_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: oc_activity
+          entity_field: type
+          plugin_id: field
         description:
           id: description
           table: oc_activity_field_data
@@ -319,7 +389,18 @@ display:
       title: 'Activity List'
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'This case has no activities yet. To add one, use the links in the sidebar to the right.'
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         oc_case:
@@ -367,6 +448,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }
   page_1:
     display_plugin: page
@@ -383,4 +465,5 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user.roles
       tags: {  }

config/install/views.view.cases.yml

@@ -27,7 +27,7 @@ display:
           role:
             authenticated: authenticated
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query
@@ -48,10 +48,23 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: some
+        type: mini
         options:
-          items_per_page: 10
+          items_per_page: 20
           offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
       style:
         type: table
       row:
@@ -188,6 +201,71 @@ display:
           entity_type: null
           entity_field: name
           plugin_id: field
+        type:
+          id: type
+          table: oc_case_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: oc_case
+          entity_field: type
+          plugin_id: field
         actors_involved_target_id:
           id: actors_involved_target_id
           table: oc_case__actors_involved
@@ -369,7 +447,52 @@ display:
           empty_zero: false
           hide_alter_empty: false
           plugin_id: custom
-      filters: {  }
+      filters:
+        type:
+          id: type
+          table: oc_case_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Case type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            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'
+            reduce: false
+          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_case
+          entity_field: type
+          plugin_id: bundle
       sorts:
         created:
           id: created
@@ -382,14 +505,25 @@ display:
           exposed: false
           expose:
             label: ''
-          granularity: hour
+          granularity: day
           entity_type: oc_case
           entity_field: created
           plugin_id: date
-      title: 'Case List'
+      title: ''
       header: {  }
       footer: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<p>Either there are no cases involving this person, or you do not have access to them.</p>\n"
+          plugin_id: text_custom
       relationships: {  }
       arguments:
         actors_involved_target_id:
@@ -430,12 +564,14 @@ display:
           entity_field: actors_involved
           plugin_id: numeric
       display_extenders: {  }
+      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
         - user.roles
       tags: {  }
   page_1:
@@ -446,11 +582,106 @@ display:
     display_options:
       display_extenders: {  }
       path: opencase/oc_actor/%actor_id/case_list
+      defaults:
+        filters: false
+        filter_groups: false
+      filters: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
+        - url.query_args
+        - user.roles
+      tags: {  }
+  page_2:
+    display_plugin: page
+    id: page_2
+    display_title: 'All Cases'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      arguments: {  }
+      defaults:
+        arguments: false
+        filters: false
+        filter_groups: false
+        empty: false
+      path: opencase/all-cases
+      filters:
+        type:
+          id: type
+          table: oc_case_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Case type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            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'
+            reduce: false
+          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_case
+          entity_field: type
+          plugin_id: bundle
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: "<h1>No cases found</h1>\n<p>You do not have access to any existing cases.</p>\n<p>To <b>add a new case</b>, first search for the person you want to add a case to. If they are not on the system yet you can add them using the <b>Add actors</b> menu in the left sidebar.</p>\n"
+          plugin_id: text_custom
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
         - user.roles
       tags: {  }

css/opencase.css

@@ -8,3 +8,8 @@
 #edit-revision-log-message-wrapper{
   display: none;
 }
+
+/* Same for revision checkbox. */
+.js-form-item.form-item.js-form-type-checkbox.form-type-checkbox.js-form-item-new-revision.form-item-new-revision {
+  display: none;
+}

features/opencase_features_ciac_bundles/config/install/field.storage.oc_actor.field_languages_spoken.yml

@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: oc_actor.field_languages_spoken
-field_name: field_languages_spoken
-entity_type: oc_actor
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.accommodation.yml

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

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.asylum_support.yml

@@ -1,5 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: asylum_support
-label: 'Asylum support'

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.employability.yml

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

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.health.yml

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

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.immigration.yml

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

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.volunteer_engagement.yml

@@ -1,5 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: volunteer_engagement
-label: 'Volunteer Engagement'

features/opencase_features_ciac_bundles/config/install/opencase_entities.oc_case_type.welfare_rights.yml

@@ -1,5 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: welfare_rights
-label: 'Welfare Rights'

features/opencase_features_ciac_bundles/opencase_features_ciac_bundles.features.yml

@@ -1,2 +0,0 @@
-bundle: opencase_features
-required: true

features/opencase_features_ciac_bundles/opencase_features_ciac_bundles.info.yml

@@ -1,11 +0,0 @@
-name: 'Ciac Bundles'
-type: module
-core: 8.x
-dependencies:
-  - datetime
-  - field
-  - file
-  - opencase_entities
-  - options
-  - user
-package: 'OpenCase Features'

features/opencase_features_opencase_search/opencase_features_opencase_search.features.yml

@@ -1,2 +0,0 @@
-bundle: opencase_features
-required: true

features/opencase_features_opencase_search/opencase_features_opencase_search.info.yml

@@ -1,11 +0,0 @@
-name: 'Opencase Search'
-type: module
-core: 8.x
-dependencies:
-  - block
-  - opencase_entities
-  - search_api
-  - search_api_db
-  - user
-  - views
-package: 'OpenCase Features'

features/opencase_features_opencase_ui/config/install/core.date_format.long.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: long
-label: 'Default long date'
-locked: false
-pattern: 'D j M Y - H:i'

features/opencase_features_opencase_ui/config/install/core.date_format.medium.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: medium
-label: 'Default medium date'
-locked: false
-pattern: 'd/m/Y - H:i'

features/opencase_features_opencase_ui/config/install/core.date_format.short.yml

@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: short
-label: 'Default short date'
-locked: false
-pattern: d/m/Y

features/opencase_features_opencase_ui/opencase_features_opencase_ui.features.yml

@@ -1,2 +0,0 @@
-bundle: opencase_features
-required: true

features/opencase_features_opencase_ui/opencase_features_opencase_ui.info.yml

@@ -1,12 +0,0 @@
-name: 'OpenCase UI'
-type: module
-core: 8.x
-dependencies:
-  - block
-  - contact
-  - opencase
-  - opencase_entities
-  - system
-  - user
-  - views
-package: 'OpenCase Features'

features/opencase_features_opencase_user_roles/opencase_features_opencase_user_roles.features.yml

@@ -1 +0,0 @@
-bundle: opencase_features

features/opencase_features_opencase_user_roles/opencase_features_opencase_user_roles.info.yml

@@ -1,4 +0,0 @@
-name: 'Opencase User Roles'
-type: module
-core: 8.x
-package: 'OpenCase Features'

modules/opencase_defaults/composer.json

@@ -0,0 +1,14 @@
+{
+  "name": "drupal/opencase_defaults",
+  "type": "drupal-module",
+  "description": "OpenCase Default Configuration",
+  "keywords": ["Drupal"],
+  "license": "GPL-2.0+",
+  "homepage": "https://www.drupal.org/project/opencase_defaults",
+  "minimum-stability": "dev",
+  "support": {
+    "issues": "https://www.drupal.org/project/issues/opencase_defaults",
+    "source": "http://cgit.drupalcode.org/opencase_defaults"
+  },
+  "require": { }
+}

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

@@ -0,0 +1,31 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.opencase-add-actors
+  module:
+    - system
+    - user
+  theme:
+    - bartik
+id: opencaseaddactors
+theme: bartik
+region: sidebar_first
+weight: -8
+provider: null
+plugin: 'system_menu_block:opencase-add-actors'
+settings:
+  id: 'system_menu_block:opencase-add-actors'
+  label: 'Add Records'
+  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'

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+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:
+      client: client
+  handler: default
+field_type: entity_reference

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

@@ -0,0 +1,24 @@
+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_actor.client.default.yml

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

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

@@ -4,6 +4,7 @@ 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
     - opencase_entities.oc_actor_type.volunteer
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -12,11 +13,9 @@ mode: default
 content:
   field_languages_spoken:
     weight: 28
-    settings:
+    settings: {  }
-      size: 60
-      placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
+    type: options_select
     region: content
   field_nationality:
     weight: 27
@@ -26,6 +25,12 @@ content:
     third_party_settings: {  }
     type: string_textfield
     region: content
+  field_osic_level:
+    weight: 29
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_sdfdsfds:
     weight: 26
     settings:

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

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

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

@@ -4,8 +4,10 @@ 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
     - opencase_entities.oc_actor_type.volunteer
   module:
+    - options
     - user
 id: oc_actor.volunteer.default
 targetEntityType: oc_actor
@@ -15,10 +17,9 @@ content:
   field_languages_spoken:
     weight: 8
     label: above
-    settings:
+    settings: {  }
-      link_to_entity: false
     third_party_settings: {  }
-    type: string
+    type: list_default
     region: content
   field_nationality:
     weight: 7
@@ -28,6 +29,13 @@ content:
     third_party_settings: {  }
     type: string
     region: content
+  field_osic_level:
+    weight: 9
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
   field_sdfdsfds:
     weight: 1
     label: above

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

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

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

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

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

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

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

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