when deleting activity from case redirect to case

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

@@ -25,7 +25,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 4
     region: content
   name:
     type: string
@@ -33,17 +33,9 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 4
-    region: content
-  oc_provider:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
     weight: 2
     region: content
-  oc_target:
+  oc_provider:
     type: entity_reference_label
     label: above
     settings:
@@ -63,6 +55,7 @@ content:
     weight: 3
     region: content
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
   user_id: true

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

@@ -25,7 +25,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 4
     region: content
   name:
     type: string
@@ -33,17 +33,9 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 4
-    region: content
-  oc_provider:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
     weight: 2
     region: content
-  oc_target:
+  oc_provider:
     type: entity_reference_label
     label: above
     settings:
@@ -63,6 +55,7 @@ content:
     weight: 3
     region: content
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
   user_id: true

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

@@ -39,14 +39,14 @@ content:
       scale: 2
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 5
+    weight: 4
     region: content
   field_funds_for:
     type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 4
+    weight: 3
     region: content
   name:
     type: string
@@ -54,17 +54,9 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 2
     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:
@@ -72,8 +64,19 @@ 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: 5
+    region: content
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -29,7 +29,7 @@ content:
     region: content
   name:
     type: string
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }

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

@@ -29,21 +29,13 @@ content:
     region: content
   name:
     type: string
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 2
     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:
@@ -51,8 +43,19 @@ 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
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -29,21 +29,13 @@ content:
     region: content
   name:
     type: string
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 3
+    weight: 2
     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:
@@ -51,8 +43,19 @@ 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
 hidden:
+  oc_target: true
   search_api_excerpt: true
   status: true
-  time_taken: true
   user_id: true

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

@@ -29,7 +29,7 @@ content:
     region: content
   name:
     type: string
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }

config/optional/system.site.yml

@@ -8,7 +8,7 @@ slogan: ''
 page:
   403: /user/login
   404: ''
-  front: /opencase/actors/client
+  front: /opencase/my-cases
 admin_compact_mode: false
 weight_select_max: 100
 default_langcode: en

config/optional/user.role.authenticated.yml

@@ -26,43 +26,12 @@ permissions:
   - 'access shortcuts'
   - 'access site-wide contact form'
   - 'add activity entities'
-  - 'add case entities'
-  - 'add client entities'
-  - 'add equal opps entities'
-  - 'add event entities'
-  - 'add organisation entities'
-  - 'add staff_member entities'
-  - 'add volunteer entities'
   - 'edit activity entities'
-  - 'edit bank account entities'
-  - 'edit case entities'
-  - 'edit client entities'
-  - 'edit equal opps entities'
-  - 'edit event entities'
-  - 'edit organisation entities'
-  - 'edit staff_member entities'
-  - 'edit volunteer entities'
   - 'post comments'
-  - 'revert all activity revisions'
-  - 'revert all client revisions'
-  - 'revert all organisation revisions'
-  - 'revert all staff_member revisions'
-  - 'revert all volunteer revisions'
   - 'search content'
   - 'skip comment approval'
   - 'use opencase'
   - 'use text format basic_html'
-  - 'view all activity revisions'
-  - 'view all client revisions'
-  - 'view all organisation revisions'
-  - 'view all staff_member revisions'
-  - 'view all volunteer revisions'
   - 'view published activity entities'
   - 'view published case provision entities'
-  - 'view published client entities'
-  - 'view published equal opps entities'
-  - 'view published event entities'
   - 'view published organisation entities'
-  - 'view published organisation relation entities'
-  - 'view published staff_member entities'
-  - 'view published volunteer entities'

config/optional/views.view.actors.yml

@@ -3,7 +3,10 @@ langcode: en
 status: true
 dependencies:
   config:
-    - user.role.authenticated
+    - user.role.administrator
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
   module:
     - opencase_entities
     - user
@@ -186,7 +189,10 @@ display:
         type: role
         options:
           role:
-            authenticated: authenticated
+            administrator: administrator
+            overseer: overseer
+            volunteer_co_ord: volunteer_co_ord
+            opencase_admin: opencase_admin
       cache:
         type: tag
         options: {  }

config/optional/views.view.cases.yml

@@ -4,7 +4,10 @@ status: true
 dependencies:
   config:
     - system.menu.opencase
-    - user.role.authenticated
+    - user.role.administrator
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
   module:
     - opencase_cases
     - user
@@ -318,7 +321,10 @@ display:
         type: role
         options:
           role:
-            authenticated: authenticated
+            administrator: administrator
+            overseer: overseer
+            volunteer_co_ord: volunteer_co_ord
+            opencase_admin: opencase_admin
       cache:
         type: tag
         options: {  }

config/optional/views.view.events.yml

@@ -3,7 +3,10 @@ langcode: en
 status: true
 dependencies:
   config:
-    - user.role.authenticated
+    - user.role.administrator
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
   module:
     - opencase_entities
     - user
@@ -120,7 +123,10 @@ display:
         type: role
         options:
           role:
-            authenticated: authenticated
+            administrator: administrator
+            overseer: overseer
+            volunteer_co_ord: volunteer_co_ord
+            opencase_admin: opencase_admin
       cache:
         type: tag
         options: {  }

config/optional/views.view.organisations.yml

@@ -3,7 +3,10 @@ langcode: en
 status: true
 dependencies:
   config:
-    - user.role.authenticated
+    - user.role.administrator
+    - user.role.opencase_admin
+    - user.role.overseer
+    - user.role.volunteer_co_ord
   module:
     - opencase_entities
     - user
@@ -120,7 +123,10 @@ display:
         type: role
         options:
           role:
-            authenticated: authenticated
+            administrator: administrator
+            overseer: overseer
+            volunteer_co_ord: volunteer_co_ord
+            opencase_admin: opencase_admin
       cache:
         type: tag
         options: {  }

modules/opencase_cases/opencase_cases.module

@@ -139,12 +139,9 @@ function _opencase_cases_delete_activity_redirect($form, &$form_state) {
   $entity = $form_state->getFormObject()->getEntity();
   // for some reason this fires when deleting an activity type, shouldn't do but.s
   if ($entity instanceof \Drupal\opencase_entities\Entity\OCActivityType) return;
-  if (!IsEmpty($entity->oc_case)) {
   $case_id = $entity->oc_case->target_id;
+  if ($case_id) {
     $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]);
-  } else {
-    $target_actor_id = $entity->oc_target->target_id;
-    $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $target_actor_id]);
   }
 }
 /**

opencase.module

@@ -20,12 +20,12 @@ function opencase_form_user_login_form_alter(&$form, FormStateInterface $form_st
 }
 
 /**
- * If the user does not have permissions to see all cases, then when the login they are
+ * If the user has permission to see all cases, then when the login they are
- * redirected to a view of just their own cases.
+ * redirected to the all cases view.
  */
 function opencase_user_login_form_submit($form, FormStateInterface $form_state) {
-  if (!\Drupal::currentUser()->hasPermission('view published case entities')) {
+  if (Drupal::currentUser()->hasPermission('view published case entities')) {
-    $form_state->setRedirectUrl(Url::fromRoute('view.cases_by_provider.page_1'));
+    $form_state->setRedirectUrl( Url::fromUserInput('/opencase/cases/all'));
   }  
 }
 

opencase.routing.yml

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

src/EventSubscriber/OpencaseSubscriber.php

@@ -15,7 +15,7 @@ use Drupal\Core\Url;
  */
 class OpencaseSubscriber implements EventSubscriberInterface {
 
-    private $alternativeHomePage = '/opencase/actors/client';
+    private $alternativeHomePage = '/opencase/cases/all';
 
   /**
    * Registers the methods in this class that should be listeners.
@@ -48,7 +48,7 @@ class OpencaseSubscriber implements EventSubscriberInterface {
     return $this->currentUserCanSeeAllCases();
   }
   private function currentUserCanSeeAllCases():bool {
-    return \Drupal::currentUser()->hasPermission('view all published case entities');
+    return \Drupal::currentUser()->hasPermission('view published case entities');
   }
 
   private function redirectToAlternativeHomePage(GetResponseEvent $event):void {