Made caseless demo version with add-activity block

2022-05-12 14:58:56 +01:00 · 2022-05-12 14:58:56 +01:00 · d1bf996c82
commit d1bf996c82
parent ae7c333179
32 changed files with 1080 additions and 434 deletions
--- a/config/optional/block.block.addactivity.yml
+++ b/config/optional/block.block.addactivity.yml
@ -0,0 +1,25 @@
+uuid: 036ff73a-049d-4979-abf0-95b1a9d1b830
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase
+    - route_condition
+  theme:
+    - bartik
+id: addactivity
+theme: bartik
+region: sidebar_second
+weight: 0
+provider: null
+plugin: add_activity
+settings:
+  id: add_activity
+  label: 'Add Activity'
+  label_display: visible
+  provider: opencase
+visibility:
+  route:
+    id: route
+    negate: false
+    routes: entity.oc_actor.canonical
--- a/config/optional/core.date_format.short.yml
+++ b/config/optional/core.date_format.short.yml
@ -7,4 +7,4 @@ _core:
 id: short
 label: 'Default short date'
 locked: false
-pattern: 'd/m/Y - H:i'
+pattern: 'd M Y'
--- a/config/optional/core.entity_form_display.oc_activity.application.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.application.default.yml
@ -4,14 +4,22 @@ status: true
 dependencies:
  config:
    - opencase_entities.oc_activity_type.application
+  module:
+    - datetime
 id: oc_activity.application.default
 targetEntityType: oc_activity
 bundle: application
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
  description:
    type: string_textarea
-    weight: 4
+    weight: 5
    region: content
    settings:
      rows: 5
@ -19,7 +27,7 @@ content:
    third_party_settings: {  }
  name:
    type: string_textfield
-    weight: 2
+    weight: 3
    region: content
    settings:
      size: 60
@ -27,7 +35,7 @@ content:
    third_party_settings: {  }
  oc_provider:
    type: entity_reference_autocomplete
-    weight: 1
+    weight: 2
    region: content
    settings:
      match_operator: CONTAINS
@ -37,7 +45,7 @@ content:
    third_party_settings: {  }
  oc_target:
    type: entity_reference_autocomplete
-    weight: 0
+    weight: 1
    region: content
    settings:
      match_operator: CONTAINS
@ -45,25 +53,14 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
  time_taken:
    type: number
-    weight: 3
+    weight: 4
    region: content
    settings:
      placeholder: ''
    third_party_settings: {  }
 hidden:
-  activity_date_time: true
+  revision_log: true
  status: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.case_note.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.case_note.default.yml
@ -4,41 +4,63 @@ status: true
 dependencies:
  config:
    - opencase_entities.oc_activity_type.case_note
+  module:
+    - datetime
 id: oc_activity.case_note.default
 targetEntityType: oc_activity
 bundle: case_note
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 5
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
  name:
    type: string_textfield
-    weight: -3
+    weight: 4
    region: content
    settings:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
    region: content
    settings:
-      rows: 5
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
    third_party_settings: {  }
  time_taken:
    type: number
-    weight: -3
+    weight: 3
    region: content
    settings:
      placeholder: ''
    third_party_settings: {  }
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
+  revision_log: true
  status: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml
@ -6,54 +6,70 @@ dependencies:
    - field.field.oc_activity.destitution_funds_provided.field_amount
    - field.field.oc_activity.destitution_funds_provided.field_funds_for
    - opencase_entities.oc_activity_type.destitution_funds_provided
+  module:
+    - datetime
 id: oc_activity.destitution_funds_provided.default
 targetEntityType: oc_activity
 bundle: destitution_funds_provided
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
  field_amount:
    type: number
-    weight: 28
+    weight: 5
    region: content
    settings:
      placeholder: ''
    third_party_settings: {  }
  field_funds_for:
    type: options_select
-    weight: 27
+    weight: 4
    region: content
    settings: {  }
    third_party_settings: {  }
  name:
    type: string_textfield
-    weight: -3
+    weight: 3
    region: content
    settings:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
    region: content
    settings:
-      rows: 5
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
    region: content
    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
      placeholder: ''
    third_party_settings: {  }
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
+  revision_log: true
  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.email.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.email.default.yml
@ -0,0 +1,60 @@
+uuid: c9168804-754e-4c9c-872e-34d340c0db2a
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.email
+  module:
+    - datetime
+id: oc_activity.email.default
+targetEntityType: oc_activity
+bundle: email
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.interview.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.interview.default.yml
@ -0,0 +1,60 @@
+uuid: 86825dc4-21cd-4670-80f5-fd3fc6c67e25
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.interview
+  module:
+    - datetime
+id: oc_activity.interview.default
+targetEntityType: oc_activity
+bundle: interview
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.lete.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.lete.default.yml
@ -0,0 +1,60 @@
+uuid: a86206a2-d677-4276-8450-39941361eee1
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.lete
+  module:
+    - datetime
+id: oc_activity.lete.default
+targetEntityType: oc_activity
+bundle: lete
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml
@ -6,7 +6,6 @@ dependencies:
    - opencase_entities.oc_activity_type.phone_call
  module:
    - datetime
-    - hide_revision_field
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
@ -18,9 +17,17 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
  name:
    type: string_textfield
-    weight: 4
+    weight: 3
    region: content
    settings:
      size: 60
@ -46,25 +53,8 @@ content:
      size: 60
      placeholder: ''
    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 5
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: 3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  description: true
+  revision_log: true
  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.research.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.research.default.yml
@ -0,0 +1,60 @@
+uuid: 0751919f-0018-47c0-b5fd-074d40ccc2df
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.supervision.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.supervision.default.yml
@ -0,0 +1,60 @@
+uuid: 43b06d48-94ac-4f74-9adc-f40bb63d4f4e
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 4
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_provider:
+    type: entity_reference_autocomplete
+    weight: 2
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  oc_target:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  revision_log: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml
+++ b/config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml
@ -1,62 +0,0 @@
-uuid: 13b48008-63b7-4485-babe-9b72256f976a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
-    - field.field.oc_activity.volunteer_training_session.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
-  module:
-    - datetime
-id: oc_activity.volunteer_training_session.default
-targetEntityType: oc_activity
-bundle: volunteer_training_session
-mode: default
-content:
-  field_date_attended:
-    type: datetime_default
-    weight: 27
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_type_of_session:
-    type: string_textfield
-    weight: 26
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: true
-      default: ''
-      permission_based: false
-      allow_user_settings: true
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  status: true
--- a/config/optional/core.entity_form_display.user.user.default.yml
+++ b/config/optional/core.entity_form_display.user.user.default.yml
@ -17,24 +17,41 @@ bundle: user
 mode: default
 content:
  account:
-    weight: -10
-    region: content
-  contact:
-    weight: 5
-    region: content
-  language:
    weight: 0
    region: content
-  timezone:
-    weight: 6
+    settings: {  }
+    third_party_settings: {  }
+  contact:
+    weight: 4
    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_linked_opencase_actor:
+    type: entity_reference_autocomplete
+    weight: 1
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  language:
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  timezone:
+    weight: 5
+    region: content
+    settings: {  }
+    third_party_settings: {  }
  user_picture:
    type: image_image
-    weight: -1
+    weight: 2
    region: content
    settings:
      progress_indicator: throbber
      preview_image_style: thumbnail
    third_party_settings: {  }
-hidden:
-  field_linked_opencase_actor: true
+hidden: {  }
--- a/config/optional/core.entity_view_display.oc_activity.application.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.application.default.yml
@ -5,19 +5,35 @@ dependencies:
  config:
    - opencase_entities.oc_activity_type.application
  module:
-    - user
+    - datetime
 id: oc_activity.application.default
 targetEntityType: oc_activity
 bundle: application
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
  name:
    type: string
    label: hidden
    settings:
      link_to_entity: false
    third_party_settings: {  }
-    weight: 3
+    weight: 4
    region: content
  oc_provider:
    type: entity_reference_label
@ -25,7 +41,7 @@ content:
    settings:
      link: true
    third_party_settings: {  }
-    weight: 1
+    weight: 2
    region: content
  oc_target:
    type: entity_reference_label
@ -33,7 +49,7 @@ content:
    settings:
      link: true
    third_party_settings: {  }
-    weight: 0
+    weight: 1
    region: content
  time_taken:
    type: number_decimal
@ -44,16 +60,9 @@ content:
      scale: 2
      prefix_suffix: true
    third_party_settings: {  }
-    weight: 2
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
+    weight: 3
    region: content
 hidden:
-  activity_date_time: true
-  description: true
  search_api_excerpt: true
+  status: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.case_note.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml
@ -5,19 +5,51 @@ dependencies:
  config:
    - opencase_entities.oc_activity_type.case_note
  module:
-    - user
+    - datetime
 id: oc_activity.case_note.default
 targetEntityType: oc_activity
 bundle: case_note
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
  name:
    type: string
    label: hidden
    settings:
      link_to_entity: false
    third_party_settings: {  }
-    weight: -3
+    weight: 4
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
    region: content
  time_taken:
    type: number_decimal
@ -28,18 +60,9 @@ content:
      scale: 2
      prefix_suffix: true
    third_party_settings: {  }
-    weight: -3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
+    weight: 3
    region: content
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
  search_api_excerpt: true
+  status: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml
@ -7,13 +7,29 @@ dependencies:
    - field.field.oc_activity.destitution_funds_provided.field_funds_for
    - opencase_entities.oc_activity_type.destitution_funds_provided
  module:
+    - datetime
    - options
-    - user
 id: oc_activity.destitution_funds_provided.default
 targetEntityType: oc_activity
 bundle: destitution_funds_provided
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
  field_amount:
    type: number_decimal
    label: above
@ -23,14 +39,14 @@ content:
      scale: 2
      prefix_suffix: true
    third_party_settings: {  }
-    weight: 2
+    weight: 5
    region: content
  field_funds_for:
    type: list_default
    label: above
    settings: {  }
    third_party_settings: {  }
-    weight: 1
+    weight: 4
    region: content
  name:
    type: string
@ -38,29 +54,26 @@ content:
    settings:
      link_to_entity: false
    third_party_settings: {  }
-    weight: -3
-    region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: -3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
    weight: 3
    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
 hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.email.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.email.default.yml
@ -0,0 +1,58 @@
+uuid: bcd68faf-74c4-457e-9fc3-6e2fb7a25c97
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.email
+  module:
+    - datetime
+id: oc_activity.email.default
+targetEntityType: oc_activity
+bundle: email
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.interview.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.interview.default.yml
@ -0,0 +1,58 @@
+uuid: a696fdb4-5317-4bfa-ac92-c15b09c3a7d2
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.interview
+  module:
+    - datetime
+id: oc_activity.interview.default
+targetEntityType: oc_activity
+bundle: interview
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.lete.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.lete.default.yml
@ -0,0 +1,58 @@
+uuid: 46f32ceb-da51-40ce-adba-1f3e4bd206ec
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.lete
+  module:
+    - datetime
+id: oc_activity.lete.default
+targetEntityType: oc_activity
+bundle: lete
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml
@ -6,7 +6,6 @@ dependencies:
    - opencase_entities.oc_activity_type.phone_call
  module:
    - datetime
-    - user
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
@ -21,13 +20,20 @@ content:
    third_party_settings: {  }
    weight: 0
    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
  name:
    type: string
    label: hidden
    settings:
      link_to_entity: false
    third_party_settings: {  }
-    weight: 4
+    weight: 3
    region: content
  oc_provider:
    type: entity_reference_label
@ -45,24 +51,8 @@ content:
    third_party_settings: {  }
    weight: 1
    region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
 hidden:
-  description: true
  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.research.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.research.default.yml
@ -0,0 +1,58 @@
+uuid: 5277f0e8-d0c5-4faf-8978-f0c6d7cc0f5b
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.research
+  module:
+    - datetime
+id: oc_activity.research.default
+targetEntityType: oc_activity
+bundle: research
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.supervision.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.supervision.default.yml
@ -0,0 +1,58 @@
+uuid: bc3147a1-d263-4fb3-8059-4fe0dc180df9
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_activity_type.supervision
+  module:
+    - datetime
+id: oc_activity.supervision.default
+targetEntityType: oc_activity
+bundle: supervision
+mode: default
+content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  name:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  oc_provider:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  oc_target:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  search_api_excerpt: true
+  status: true
+  time_taken: true
+  user_id: true
--- a/config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml
+++ b/config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml
@ -1,65 +0,0 @@
-uuid: f33b1e75-dcc3-4471-9637-0bda9d795804
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.oc_activity.volunteer_training_session.field_date_attended
-    - field.field.oc_activity.volunteer_training_session.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
-  module:
-    - datetime
-    - user
-id: oc_activity.volunteer_training_session.default
-targetEntityType: oc_activity
-bundle: volunteer_training_session
-mode: default
-content:
-  field_date_attended:
-    type: datetime_default
-    label: above
-    settings:
-      timezone_override: ''
-      format_type: medium
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_type_of_session:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: -3
-    region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: -3
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  activity_date_time: true
-  description: true
-  oc_provider: true
-  oc_target: true
-  search_api_excerpt: true
--- a/config/optional/core.entity_view_display.user.user.default.yml
+++ b/config/optional/core.entity_view_display.user.user.default.yml
@ -16,8 +16,18 @@ targetEntityType: user
 bundle: user
 mode: default
 content:
+  field_linked_opencase_actor:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
  member_for:
-    weight: 5
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
    region: content
  user_picture:
    type: image
@ -26,8 +36,7 @@ content:
      image_link: content
      image_style: thumbnail
    third_party_settings: {  }
-    weight: 0
+    weight: 1
    region: content
 hidden:
-  field_linked_opencase_actor: true
  search_api_excerpt: true
--- a/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml
+++ b/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml
@ -1,43 +0,0 @@
-uuid: 4c460157-a452-4eec-9616-6c00b30c110c
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.authenticated
-  module:
-    - opencase_entities
-    - user
-id: oc_actor.client.activities
-label: Activities
-display_label: true
-name: activities
-description: ''
-base_entity_type_id: oc_actor
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: activities
-  display: block_1
-  arguments: ''
-field_type_condition:
-  'entity_bundle:oc_actor':
-    id: 'entity_bundle:oc_actor'
-    negate: false
-    context_mapping:
-      oc_actor: entity_extra_field.target_entity
-    bundles: {  }
-  route:
-    id: route
-    negate: false
-    routes: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: ''
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
--- a/config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml
+++ b/config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml
@ -1,21 +0,0 @@
-uuid: e3c9dacd-b1d3-4394-8291-87dcbdb483b8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_date_attended
-    - opencase_entities.oc_activity_type.volunteer_training_session
-  module:
-    - datetime
-id: oc_activity.volunteer_training_session.field_date_attended
-field_name: field_date_attended
-entity_type: oc_activity
-bundle: volunteer_training_session
-label: 'Date attended'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: datetime
--- a/config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml
+++ b/config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml
@ -1,19 +0,0 @@
-uuid: 5ee021de-3208-4be0-8279-0ffad8042602
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_activity.field_type_of_session
-    - opencase_entities.oc_activity_type.volunteer_training_session
-id: oc_activity.volunteer_training_session.field_type_of_session
-field_name: field_type_of_session
-entity_type: oc_activity
-bundle: volunteer_training_session
-label: 'Type of session'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
--- a/config/optional/field.storage.oc_activity.field_date_attended.yml
+++ b/config/optional/field.storage.oc_activity.field_date_attended.yml
@ -1,20 +0,0 @@
-uuid: a61bfa28-fc31-4bf7-ac3c-871192b9d57e
-langcode: en
-status: true
-dependencies:
-  module:
-    - datetime
-    - opencase_entities
-id: oc_activity.field_date_attended
-field_name: field_date_attended
-entity_type: oc_activity
-type: datetime
-settings:
-  datetime_type: date
-module: datetime
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
--- a/config/optional/field.storage.oc_activity.field_type_of_session.yml
+++ b/config/optional/field.storage.oc_activity.field_type_of_session.yml
@ -1,21 +0,0 @@
-uuid: 2667af61-41f7-4d8b-a154-68ce7514f559
-langcode: en
-status: true
-dependencies:
-  module:
-    - opencase_entities
-id: oc_activity.field_type_of_session
-field_name: field_type_of_session
-entity_type: oc_activity
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
--- a/config/optional/opencase_entities.oc_activity_type.telephone_call.yml
+++ b/config/optional/opencase_entities.oc_activity_type.telephone_call.yml
@ -1,6 +0,0 @@
-uuid: fde52f28-d60a-46ef-9cf9-e924bd852893
-langcode: en
-status: true
-dependencies: {  }
-id: telephone_call
-label: 'Telephone call'
--- a/config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml
+++ b/config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml
@ -1,6 +0,0 @@
-uuid: 578260fa-04c2-4965-bc38-057f5669524e
-langcode: en
-status: true
-dependencies: {  }
-id: volunteer_training_session
-label: 'Volunteer training attended'
--- a/config/optional/views.view.activities.yml
+++ b/config/optional/views.view.activities.yml
@ -5,6 +5,7 @@ dependencies:
  config:
    - user.role.authenticated
  module:
+    - datetime
    - opencase_entities
    - user
 id: activities
@ -23,6 +24,202 @@ display:
    display_options:
      title: Activities
      fields:
+        type:
+          id: type
+          table: oc_activity_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: type
+          plugin_id: field
+          label: 'Activity type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        activity_date_time:
+          id: activity_date_time
+          table: oc_activity_field_data
+          field: activity_date_time
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: activity_date_time
+          plugin_id: field
+          label: Date
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_default
+          settings:
+            timezone_override: ''
+            format_type: short
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
+          plugin_id: field
+          label: Provider
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
        name:
          id: name
          table: oc_activity_field_data
@ -33,7 +230,7 @@ display:
          entity_type: null
          entity_field: name
          plugin_id: field
-          label: ''
+          label: Subject
          exclude: false
          alter:
            alter_text: false
@ -88,16 +285,17 @@ display:
          multi_type: separator
          separator: ', '
          field_api_classes: false
-        delete_oc_activity:
-          id: delete_oc_activity
-          table: oc_activity
-          field: delete_oc_activity
+        description:
+          id: description
+          table: oc_activity_field_data
+          field: description
          relationship: none
          group_type: group
          admin_label: ''
          entity_type: oc_activity
-          plugin_id: entity_link_delete
-          label: 'Link to delete Activity'
+          entity_field: description
+          plugin_id: field
+          label: Notes
          exclude: false
          alter:
            alter_text: false
@ -138,9 +336,19 @@ display:
          hide_empty: false
          empty_zero: false
          hide_alter_empty: true
-          text: delete
-          output_url_as_text: false
-          absolute: false
+          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
      pager:
        type: mini
        options: