Added full_name field to actors, and made the administer entities permission finer grained

modules/opencase_entities/config/install/field.field.user.user.field_linked_opencase_actor.yml

@@ -10,7 +10,7 @@ field_name: field_linked_opencase_actor
 entity_type: user
 bundle: user
 label: 'Person in OpenCase'
-description: 'If this user is also a person in OpenCase (e.g. a staff member or a volunteer), start typing the name here to link them. This will ensure they have access to the right cases.'
+description: 'If this user is also a person in OpenCase (e.g. a staff member or a volunteer), start typing the name here to link them. This will make their name appear against activities they are involved in.'
 required: false
 translatable: false
 default_value: {  }

modules/opencase_entities/opencase_entities.permissions.yml

@@ -5,9 +5,14 @@ view edit delete all actor entities:
   title: 'View/Edit/Delete all types of people'
   description: ''
 
-administer opencase entity bundles:
-  title: 'Administer OpenCase Actor/Case/Activity Types'
-  description: 'Create, configure and delete types of actor (such as "Client" or "Legal Advisor"), types of case (such as "Housing" or "Asylum") and types of activity (such as "Case Note" or "Interview")'
+administer actor bundles:
+  title: 'Administer OpenCase Person Types'
+
+administer case bundles:
+  title: 'Administer OpenCase Case Types'
+
+administer activity bundles:
+  title: 'Administer OpenCase Activity Types'
 
 administer actor entities:
   title: 'Administer Actor entities'
@@ -45,6 +50,11 @@ revert all case revisions:
 delete all case revisions:
   title: 'Delete all revisions'
   description: 'Role requires permission to <em>view Case revisions</em> and <em>delete rights</em> for case entities in question or <em>administer case entities</em>.'
+
+
+view published activity entities:
+  title: 'View published Activity entities'
+
 add activity entities:
   title: 'Create new Activity entities'
 

modules/opencase_entities/src/Entity/OCActivityType.php

@@ -24,7 +24,7 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
  *     },
  *   },
  *   config_prefix = "oc_activity_type",
- *   admin_permission = "administer opencase entity bundles",
+ *   admin_permission = "administer activity bundles",
  *   bundle_of = "oc_activity",
  *   entity_keys = {
  *     "id" = "id",

modules/opencase_entities/src/Entity/OCActor.php

@@ -114,10 +114,14 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         $translation->setOwnerId(0);
       }
     }
-    
-    $name = $this->get('first_name')->value . ' ';
-    if ($this->get('middle_names')->value) $name .= $this->get('middle_names')->value . ' ';
-    $name .= $this->get('last_name')->value . ' ';
+     
+    if ($this->get('full_name')->value) {
+      $name = $this->get('full_name')->value . ' ';
+    } else {
+      $name = $this->get('first_name')->value . ' ';
+      if ($this->get('middle_names')->value) $name .= $this->get('middle_names')->value . ' ';
+      $name .= $this->get('last_name')->value . ' ';
+    }
     $name .= '(' . $this->type->entity->label() . ')';
   
     $this->setName($name);
@@ -238,6 +242,24 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
         'weight' => -10,
       ]);
 
+    // When configuring a person type, you will need to choose whether to have full name or first and last name fields displayed.
+    $fields['full_name'] = BaseFieldDefinition::create('string')
+      ->setDescription(t('The person\'s name.'))
+      ->setLabel(t('Name'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'max_length' => 20,
+        'text_processing' => 0,
+      ])
+      ->setDisplayConfigurable("form", true)
+      ->setDisplayConfigurable("view", true)
+      ->setDefaultValue('')
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -50,
+      ])
+      ->setRequired(TRUE);
+
     $fields['first_name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('First Name'))
       ->setDescription(t("The person's first name."))

modules/opencase_entities/src/Entity/OCActorType.php

@@ -24,7 +24,7 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
  *     },
  *   },
  *   config_prefix = "oc_actor_type",
- *   admin_permission = "administer opencase entity bundles",
+ *   admin_permission = "administer actor bundles",
  *   bundle_of = "oc_actor",
  *   entity_keys = {
  *     "id" = "id",

modules/opencase_entities/src/Entity/OCBankAccount.php

@@ -144,24 +144,7 @@ class OCBankAccount extends ContentEntityBase implements OCBankAccountInterface
       ->setDescription(t('The user ID of author of the Bank Account entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
-      ->setSetting('handler', 'default')
-      ->setDisplayOptions('view', [
-        'label' => 'hidden',
-        'type' => 'author',
-        'weight' => 0,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 5,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'autocomplete_type' => 'tags',
-          'placeholder' => '',
-        ],
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE);
+      ->setSetting('handler', 'default');
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))

modules/opencase_entities/src/Entity/OCCaseType.php

@@ -24,7 +24,7 @@ use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
  *     },
  *   },
  *   config_prefix = "oc_case_type",
- *   admin_permission = "administer opencase entity bundles",
+ *   admin_permission = "administer case bundles",
  *   bundle_of = "oc_case",
  *   entity_keys = {
  *     "id" = "id",