css/opencase.css

@@ -147,6 +147,14 @@ td.views-field {
   font-weight: bold !important;
 }
 
+/* Styling for grouped views */
+table.views-table.views-view-table caption {
+  text-align: left;
+  margin-bottom: 1em;
+  margin-top: 2em;
+  font-weight: bold;
+}
+
 /* remove "details" accordion, see https://drupal.stackexchange.com/questions/294312/why-has-this-details-accordion-appeared-in-this-view */
 .views-table details {
     display: none;

modules/opencase_cases/opencase_cases.permissions.yml

@@ -59,3 +59,7 @@ revert all case fee revisions:
 delete all case fee revisions:
   title: 'Delete all revisions'
   description: 'Role requires permission to <em>view Case Fee revisions</em> and <em>delete rights</em> for case fee entities in question or <em>administer case fee entities</em>.'
+
+permission_callbacks:
+  - \Drupal\opencase_cases\OCCaseFeePermissions::generatePermissions
+  - \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions

modules/opencase_cases/src/CaseInvolvement.php

@@ -10,11 +10,8 @@ class CaseInvolvement {
 
   public static function userIsInvolved($account, $case) {
     $actorId = self::getLinkedActorId($account);        
-    $query = \Drupal::entityQuery('oc_case_provision')
-    ->condition('oc_provider', $actorId)
-    ->condition('oc_case', $case->id());
-    $results = $query->execute();
-    return !empty($results);
+    $involvedIds = array_column($case->actors_involved->getValue(), 'target_id');
+    return in_array($actorId, $involvedIds);
   }
 
   public static function userIsInvolved_activity($account, $activity) {

modules/opencase_cases/src/OCCaseAccessControlHandler.php

@@ -32,6 +32,7 @@ class OCCaseAccessControlHandler extends EntityAccessControlHandler {
       case 'update':   // you can edit the case only if a) you can see it and b) you have the permission to edit cases.
         return AccessResult::allowedIf(
             $account->hasPermission('edit case entities')
+            && ($account->hasPermission('view published case entities') || CaseInvolvement::userIsInvolved($account, $entity))
         );
       case 'delete':   // you can delete the case only if a) you can see it and b) you have the permission to delete cases.
         return AccessResult::allowedIf(

modules/opencase_entities/opencase_entities.permissions.yml

@@ -1,4 +1,8 @@
 
+permission_callbacks:
+  - \Drupal\opencase_entities\OCOrganisationPermissions::generatePermissions
+  - \Drupal\opencase_entities\OCEventPermissions::generatePermissions
+  - Drupal\opencase_entities\OpenCaseEntityPermissions::permissions
 
 view edit delete all actor entities:
   title: 'View/Edit/Delete all types of people'

modules/opencase_entities/src/OCActivityAccessControlHandler.php

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