From 23db15876a09019717447202ad8cf198babd585e Mon Sep 17 00:00:00 2001
From: Akanksha <akankshasingh.viet@gmail.com>
Date: Tue, 4 Jun 2024 09:53:10 -0300
Subject: [PATCH 01/13] DDST-166: Make handle suffix configurable

DDST-166: Make handle suffix configurable

DDST-166: Update readme

DDST-166: Code sniffer fixes for the module

DDST-166: Hardening

DDST-166: Hardening

DDST-166: More Hardening

DDST-166: Rework implementation

DDST-166: Clean up

DDST-166: More clean-up

DDST-166: Clean up

DDST-166: cleanup
---
 modules/dgi_actions_handle/README.md          |  21 +++
 .../schema/dgi_actions_handle.schema.yml      |   4 +
 .../dgi_actions_handle_constraints/README.md  |  63 ++++++++
 ...gi_actions_handle_constraints.settings.yml |   9 ++
 .../dgi_actions_handle_constraints.schema.yml |  27 ++++
 .../dgi_actions_handle_constraints.info.yml   |   7 +
 .../dgi_actions_handle_constraints.module     | 137 ++++++++++++++++++
 .../src/Plugin/ServiceDataType/Handle.php     |   6 +
 .../src/Utility/HandleTrait.php               |   9 +-
 9 files changed, 282 insertions(+), 1 deletion(-)
 create mode 100644 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
 create mode 100644 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/install/dgi_actions_handle_constraints.settings.yml
 create mode 100644 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/schema/dgi_actions_handle_constraints.schema.yml
 create mode 100644 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
 create mode 100644 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index 2e73e17..42b431f 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -16,6 +16,27 @@ Install as usual, see
 [this](https://www.drupal.org/docs/extending-drupal/installing-modules) for
 further information.
 
+## Features
+
+- Provides Action Plugins for minting and deleting Handle.net Handles.
+- Provides a service data type plugin for Handle.net Handles.
+- Uses uuid by default as handle suffix. Also supports custom suffixes.
+
+## Usage
+- See DGI Actions readme for general usage.
+- Create a new service data type with the type `handle`.
+- There is no UI for configuring the handle suffix field. It must be set in the
+  configuration file. The default suffix field is `uuid`.
+
+## User Notes
+
+- The field that is to be used for handle suffix must be made unique and required
+  in the content type configuration so that the value does not change. If the field is not unique,
+  handle generation will fail for the duplicate value.
+- The handle also must be unique and should be non-editable.
+- To make the suffix and handle fields non-editable and required, an additional module is provided
+  `dgi_actions_handle_constraints`. This module should be enabled and configured to make the necessary field validation changes.
+- See dgi_actions_handle_constraints README for more information.
 
 ## Troubleshooting/Issues
 
diff --git a/modules/dgi_actions_handle/config/schema/dgi_actions_handle.schema.yml b/modules/dgi_actions_handle/config/schema/dgi_actions_handle.schema.yml
index ad91744..f962843 100644
--- a/modules/dgi_actions_handle/config/schema/dgi_actions_handle.schema.yml
+++ b/modules/dgi_actions_handle/config/schema/dgi_actions_handle.schema.yml
@@ -19,6 +19,10 @@ dgi_actions.service_data_type.handle:
       label: 'Prefix'
       type: string
       description: 'Handle prefix as specified from Handle.net.'
+    suffix_field:
+      label: 'Suffix'
+      type: string
+      description: 'Field to use as handle suffix.'
 
 action.configuration.dgi_actions_delete_handle:
   type: dgi_actions_action_delete_base
diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
new file mode 100644
index 0000000..d8e3be4
--- /dev/null
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
@@ -0,0 +1,63 @@
+# DGI Actions Handle Constraints Module
+
+## Introduction
+
+This module is part of the DGI Actions Handle package. It provides functionality to add unique constraints to certain fields of an entity and handles the preservation of these fields during entity save operations.
+
+## Requirements
+
+This module requires the following modules/libraries:
+
+* [DGI Actions Handle](https://github.com/discoverygarden/dgi_actions_handle)
+
+## Installation
+
+Install as usual, see
+[this](https://www.drupal.org/docs/extending-drupal/installing-modules) for
+further information.
+
+## Features
+
+1. **Unique Constraints**: The module can add a unique constraint to specified fields of an entity.
+
+2. **Entity Base Field Alteration**: The module implements the `hook_entity_base_field_info_alter` hook to add constraints to the configured fields.
+
+3. **Entity Bundle Field Alteration**: The module implements the `hook_entity_bundle_field_info_alter` hook to add constraints to the configured fields.
+
+4. **Entity Pre-save**: The module implements the `hook_entity_presave` hook to revert the value of the suffix field if it is changed. This is needed for spreadsheet ingest.
+
+5. **Form Alteration**: The module implements the `hook_form_alter` hook to disable the suffix/identifier fields that are not allowed to be changed.
+
+## Usage
+
+This module is used as part of the DGI Actions Handle package.
+It is used to ensure that the fields that are used as suffixes for the handle are unique and required. The module also ensures that the suffix field is not changed during entity save operations.
+Once the configuration is set up, the module will handle the rest.
+
+## Configuration
+
+The module uses the `dgi_actions_handle_constraints.settings` configuration, which should be set up with the appropriate constraint settings.
+For each field that is used as a suffix or identifier, a new value should be added to the constraint_settings array. An example configuration file which
+uses the field_pid as suffix and field_handle as identifier is provided with the module.
+
+## Troubleshooting/Issues
+
+Having problems or solved a problem? Contact
+[discoverygarden](http://support.discoverygarden.ca).
+
+## Maintainers/Sponsors
+
+Current maintainers:
+
+* [discoverygarden](http://www.discoverygarden.ca)
+
+## Development
+
+If you would like to contribute to this module, please check out the helpful
+[Documentation](https://github.com/Islandora/islandora/wiki#wiki-documentation-for-developers),
+[Developers](http://islandora.ca/developers) section on Islandora.ca and
+contact [discoverygarden](http://support.discoverygarden.ca).
+
+## License
+
+[GPLv3](http://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/install/dgi_actions_handle_constraints.settings.yml b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/install/dgi_actions_handle_constraints.settings.yml
new file mode 100644
index 0000000..a89cfe3
--- /dev/null
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/install/dgi_actions_handle_constraints.settings.yml
@@ -0,0 +1,9 @@
+constraint_settings:
+  - entity_type: node
+    entity_bundle: islandora_object
+    field_name: field_pid
+    field_usage: suffix
+  - entity_type: node
+    entity_bundle: islandora_object
+    field_name: field_handle
+    field_usage: identifier
diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/schema/dgi_actions_handle_constraints.schema.yml b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/schema/dgi_actions_handle_constraints.schema.yml
new file mode 100644
index 0000000..0474aab
--- /dev/null
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/config/schema/dgi_actions_handle_constraints.schema.yml
@@ -0,0 +1,27 @@
+---
+dgi_action_handle_constraints.settings:
+  type: config_object
+  label: 'DGI Actions constraint settings'
+  mapping:
+    constraint_settings:
+      type: mapping
+      label: 'Constraint data'
+      mapping:
+        entity_type:
+          type: string
+          label: 'Entity type'
+          description: 'The entity type to add the constraint to.'
+        entity_bundle:
+          type: string
+          label: 'Entity bundle'
+          description: 'The entity bundle to add the constraint to.'
+        field_name:
+            type: string
+            label: 'Field name'
+            description: 'The field name to add the constraint to.'
+        field_usage:
+            type: string
+            label: 'Field usage'
+            description: 'Either identifier or suffix.'
+            constraints:
+              Regex: '/^(identifier|suffix)$/'
diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
new file mode 100644
index 0000000..23c8e75
--- /dev/null
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
@@ -0,0 +1,7 @@
+name: 'DGI Actions Handle Constraints'
+description: "Add constraints to handle fields."
+type: module
+package: DGI Actions
+core_version_requirement: ^9 || ^10
+dependencies:
+  - dgi_actions_handle:dgi_actions_handle
diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
new file mode 100644
index 0000000..61c435f
--- /dev/null
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * @file
+ * Contains the dgi_actions_handle_constraints module.
+ */
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_entity_base_field_info_alter().
+ *
+ * Adds the UniqueField, Required constraint to the suffix and identifer fields.
+ */
+function _dgi_actions_handle_constraints_suffix_validation_add_constraint(array &$fields, EntityTypeInterface $entity_type): void {
+  try {
+    $config = \Drupal::config('dgi_actions_handle_constraints.settings');
+    $constraint_settings = $config->get('constraint_settings');
+    // Constraint settings is an array of values for each field that should be modified.
+    foreach ($constraint_settings as $constraintSetting) {
+      if (!isset($fields[$constraintSetting['field_name']]) || $constraintSetting['entity_type'] !== $entity_type->id()) {
+        continue;
+      }
+      // Both identifier and suffix fields should be unique.
+      $fields[$constraintSetting['field_name']]->addConstraint('UniqueField');
+
+      // If the field is a suffix field, set it as required.
+      if ($constraintSetting['field_usage'] === 'suffix') {
+        $fields[$constraintSetting['field_name']]->setRequired(TRUE);
+      }
+    }
+  }
+  catch (\Exception $e) {
+    Drupal::logger('dgi_actions_handle_constraints')->error($e->getMessage());
+  }
+}
+
+/**
+ * Implements hook_entity_base_field_info_alter().
+ */
+function dgi_actions_handle_constraints_entity_base_field_info_alter(&$fields, EntityTypeInterface $entity_type): void {
+  if ($entity_type instanceof ContentEntityTypeInterface) {
+    _dgi_actions_handle_constraints_suffix_validation_add_constraint($fields, $entity_type);
+  }
+}
+
+/**
+ * Implements hook_entity_bundle_field_info_alter().
+ */
+function dgi_actions_handle_constraints_entity_bundle_field_info_alter(&$fields, EntityTypeInterface $entity_type): void {
+  if ($entity_type instanceof ContentEntityTypeInterface) {
+    _dgi_actions_handle_constraints_suffix_validation_add_constraint($fields, $entity_type);
+  }
+}
+
+/**
+ * Implements hook_entity_presave().
+ *
+ * Reverts the value of the suffix field if it is changed.
+ * This is needed for spreadsheet ingest.
+ */
+function dgi_actions_handle_constraints_entity_presave(EntityInterface $entity): void {
+  try {
+    $config = \Drupal::config('dgi_actions_handle_constraints.settings');
+    $constraint_settings = $config->get('constraint_settings');
+    // Constraint settings is an array of values for each field that should be modified.
+    foreach ($constraint_settings as $constraintSetting) {
+      // Only revert the suffix field if it is changed.
+      if ($constraintSetting['field_usage'] !== 'suffix'
+        || $entity->getEntityTypeId() !== $constraintSetting['entity_type']
+        || $entity->isNew() || !$entity->hasField($constraintSetting['field_name'])) {
+        continue;
+      }
+      $original_entity = Drupal::entityTypeManager()
+        ->getStorage($entity->getEntityTypeId())
+        ->loadUnchanged($entity->id());
+      if (!$original_entity) {
+        return;
+      }
+      if ($entity->{$constraintSetting['field_name']}->value !== $original_entity->{$constraintSetting['field_name']}->value) {
+        $entity->{$constraintSetting['field_name']}->value = $original_entity->{$constraintSetting['field_name']}->value;
+        Drupal::messenger()->addWarning('The suffix field cannot be changed.');
+      }
+    }
+  }
+  catch (\Exception $e) {
+    Drupal::logger('dgi_actions_handle_constraints')->error($e->getMessage());
+  }
+}
+
+/**
+ * Implements hook_form_alter().
+ *
+ * Disables the suffix/identifier fields that are not allowed to be changed.
+ */
+function dgi_actions_handle_constraints_form_alter(array &$form, FormStateInterface $form_state, $form_id): void {
+  try {
+    $config = \Drupal::config('dgi_actions_handle_constraints.settings');
+    $constraint_settings = $config->get('constraint_settings');
+    // Constraint settings is an array of values for each field that should be modified.
+    foreach ($constraint_settings as $constraintSetting) {
+      // If the form id is not of the content form or the content edit form, return.
+      if (!($form_id === $constraintSetting['entity_type'] . '_' . $constraintSetting['entity_bundle'] . '_form'
+      || $form_id === $constraintSetting['entity_type'] . '_' . $constraintSetting['entity_bundle'] . '_edit_form')) {
+        return;
+      }
+      $entity = $form_state->getFormObject()->getEntity();
+      if (!$entity instanceof ContentEntityInterface || !isset($form[$constraintSetting['field_name']])) {
+        continue;
+      }
+      // For the suffix field, set the description and access.
+      if ($constraintSetting['field_usage'] === 'suffix') {
+        $form[$constraintSetting['field_name']]['widget'][0]['value']['#description'] = t('This field is used as the handle suffix.
+                                                    The suffix field, once set, cannot be changed.');
+        $form[$constraintSetting['field_name']]['#access'] = TRUE;
+
+        // Disable the suffix field if it has a value.
+        if ($entity->{$constraintSetting['field_name']}->value && !$entity->isNew()) {
+          $form[$constraintSetting['field_name']]['#disabled'] = TRUE;
+        }
+      }
+
+      // If the field is an identifier field and the entity is not new, disable it.
+      if ($constraintSetting['field_usage'] === 'identifier' && !$entity->isNew()) {
+        $form[$constraintSetting['field_name']]['#disabled'] = TRUE;
+      }
+
+    }
+  }
+  catch (\Exception $e) {
+    Drupal::logger('dgi_actions_handle_constraints')->error($e->getMessage());
+  }
+}
diff --git a/modules/dgi_actions_handle/src/Plugin/ServiceDataType/Handle.php b/modules/dgi_actions_handle/src/Plugin/ServiceDataType/Handle.php
index 89d5def..ab50bf0 100644
--- a/modules/dgi_actions_handle/src/Plugin/ServiceDataType/Handle.php
+++ b/modules/dgi_actions_handle/src/Plugin/ServiceDataType/Handle.php
@@ -40,6 +40,7 @@ public function defaultConfiguration(): array {
       'username' => NULL,
       'password' => NULL,
       'prefix' => NULL,
+      'suffix_field' => NULL,
     ];
   }
 
@@ -76,6 +77,10 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       '#default_value' => $this->configuration['prefix'],
       '#required' => TRUE,
     ];
+    $form['suffix_field'] = [
+      '#type' => 'hidden',
+      '#default_value' => $this->configuration['suffix_field'],
+    ];
     return $form;
   }
 
@@ -96,6 +101,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
     $this->configuration['host'] = $form_state->getValue('host');
     $this->configuration['prefix'] = $form_state->getValue('prefix');
     $this->configuration['username'] = $form_state->getValue('username');
+    $this->configuration['suffix_field'] = $form_state->getValue('suffix_field');
     $this->configuration['password'] = !empty($form_state->getValue('password')) ? $form_state->getValue('password') : $this->configuration['password'];
     // Handle the scenario where the user did not modify the password as this
     // gets stored on the entity.
diff --git a/modules/dgi_actions_handle/src/Utility/HandleTrait.php b/modules/dgi_actions_handle/src/Utility/HandleTrait.php
index 7ed92d6..b20d3a8 100644
--- a/modules/dgi_actions_handle/src/Utility/HandleTrait.php
+++ b/modules/dgi_actions_handle/src/Utility/HandleTrait.php
@@ -62,7 +62,14 @@ public function getPrefix(): string {
    * Gets the suffix for the entity.
    */
   public function getSuffix(): ?string {
-    // XXX: Should this be something different?
+    $suffix_field = $this->getIdentifier()->getServiceData()->getData()['suffix_field'];
+
+    // If a field is configured, use that.
+    if ($suffix_field && $this->getEntity()->hasField($suffix_field)) {
+      return $this->getEntity()->get($suffix_field)->value;
+    }
+
+    // Use uuid by default.
     return $this->getEntity()->uuid();
   }
 

From daa19103170239f39e6988b5b40012509c44197a Mon Sep 17 00:00:00 2001
From: Akanksha <akankshasingh.viet@gmail.com>
Date: Wed, 19 Jun 2024 08:28:55 -0300
Subject: [PATCH 02/13] DDST-166: Code sniffer fixes

---
 .../dgi_actions_handle_constraints.module         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
index 61c435f..be713b6 100644
--- a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
@@ -20,7 +20,8 @@ function _dgi_actions_handle_constraints_suffix_validation_add_constraint(array
   try {
     $config = \Drupal::config('dgi_actions_handle_constraints.settings');
     $constraint_settings = $config->get('constraint_settings');
-    // Constraint settings is an array of values for each field that should be modified.
+    // Constraint settings is an array of values
+    // for each field that should be modified.
     foreach ($constraint_settings as $constraintSetting) {
       if (!isset($fields[$constraintSetting['field_name']]) || $constraintSetting['entity_type'] !== $entity_type->id()) {
         continue;
@@ -67,7 +68,8 @@ function dgi_actions_handle_constraints_entity_presave(EntityInterface $entity):
   try {
     $config = \Drupal::config('dgi_actions_handle_constraints.settings');
     $constraint_settings = $config->get('constraint_settings');
-    // Constraint settings is an array of values for each field that should be modified.
+    // Constraint settings is an array of values
+    // for each field that should be modified.
     foreach ($constraint_settings as $constraintSetting) {
       // Only revert the suffix field if it is changed.
       if ($constraintSetting['field_usage'] !== 'suffix'
@@ -101,9 +103,11 @@ function dgi_actions_handle_constraints_form_alter(array &$form, FormStateInterf
   try {
     $config = \Drupal::config('dgi_actions_handle_constraints.settings');
     $constraint_settings = $config->get('constraint_settings');
-    // Constraint settings is an array of values for each field that should be modified.
+    // Constraint settings is an array
+    // of values for each field that should be modified.
     foreach ($constraint_settings as $constraintSetting) {
-      // If the form id is not of the content form or the content edit form, return.
+      // If the form id is not of the content
+      // form or the content edit form, return.
       if (!($form_id === $constraintSetting['entity_type'] . '_' . $constraintSetting['entity_bundle'] . '_form'
       || $form_id === $constraintSetting['entity_type'] . '_' . $constraintSetting['entity_bundle'] . '_edit_form')) {
         return;
@@ -124,7 +128,8 @@ function dgi_actions_handle_constraints_form_alter(array &$form, FormStateInterf
         }
       }
 
-      // If the field is an identifier field and the entity is not new, disable it.
+      // If the field is an identifier
+      // field and the entity is not new, disable it.
       if ($constraintSetting['field_usage'] === 'identifier' && !$entity->isNew()) {
         $form[$constraintSetting['field_name']]['#disabled'] = TRUE;
       }

From c30fb40f5c4774dfa4a052e61bbe93e6686394e2 Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:10:23 -0300
Subject: [PATCH 03/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index 42b431f..9525ca8 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -20,7 +20,7 @@ further information.
 
 - Provides Action Plugins for minting and deleting Handle.net Handles.
 - Provides a service data type plugin for Handle.net Handles.
-- Uses uuid by default as handle suffix. Also supports custom suffixes.
+- Uses uuid by default as the Handle's suffix. Also supports custom suffixes.
 
 ## Usage
 - See DGI Actions readme for general usage.

From d224c3e67a659311111e0f2d5a31a196ca2f9ae1 Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:10:30 -0300
Subject: [PATCH 04/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index 9525ca8..b9689d4 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -25,7 +25,7 @@ further information.
 ## Usage
 - See DGI Actions readme for general usage.
 - Create a new service data type with the type `handle`.
-- There is no UI for configuring the handle suffix field. It must be set in the
+- There is no UI for configuring the Handle's suffix field. It must be set in the
   configuration file. The default suffix field is `uuid`.
 
 ## User Notes

From b6fe44f13e01209943eace75562dbf0a4a54f5ca Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:10:36 -0300
Subject: [PATCH 05/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index b9689d4..d2ceaa2 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -30,7 +30,7 @@ further information.
 
 ## User Notes
 
-- The field that is to be used for handle suffix must be made unique and required
+- The field that is to be used for the Handle's suffix must be made unique and required
   in the content type configuration so that the value does not change. If the field is not unique,
   handle generation will fail for the duplicate value.
 - The handle also must be unique and should be non-editable.

From a1d26435fa1096c08e3b7739d43379ce66ddca29 Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:10:43 -0300
Subject: [PATCH 06/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index d2ceaa2..6fef0e9 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -32,7 +32,7 @@ further information.
 
 - The field that is to be used for the Handle's suffix must be made unique and required
   in the content type configuration so that the value does not change. If the field is not unique,
-  handle generation will fail for the duplicate value.
+  Handle generation will fail for the duplicate value.
 - The handle also must be unique and should be non-editable.
 - To make the suffix and handle fields non-editable and required, an additional module is provided
   `dgi_actions_handle_constraints`. This module should be enabled and configured to make the necessary field validation changes.

From 47dede6904c247b38415ff6fba4c198f9c84a1ad Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:10:50 -0300
Subject: [PATCH 07/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index 6fef0e9..c0bdf5a 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -33,7 +33,7 @@ further information.
 - The field that is to be used for the Handle's suffix must be made unique and required
   in the content type configuration so that the value does not change. If the field is not unique,
   Handle generation will fail for the duplicate value.
-- The handle also must be unique and should be non-editable.
+- The Handle also must be unique and should be non-editable.
 - To make the suffix and handle fields non-editable and required, an additional module is provided
   `dgi_actions_handle_constraints`. This module should be enabled and configured to make the necessary field validation changes.
 - See dgi_actions_handle_constraints README for more information.

From dfaeedc68752075ef04000f32b8fb9495d535c04 Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:13:01 -0300
Subject: [PATCH 08/13] Update
 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 .../dgi_actions_handle_constraints.info.yml                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
index 23c8e75..e339f51 100644
--- a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.info.yml
@@ -2,6 +2,6 @@ name: 'DGI Actions Handle Constraints'
 description: "Add constraints to handle fields."
 type: module
 package: DGI Actions
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10
 dependencies:
   - dgi_actions_handle:dgi_actions_handle

From 8f3843fad4f20f5589cb21ff9e3e5c3ac6cc664f Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:13:11 -0300
Subject: [PATCH 09/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index c0bdf5a..9c82155 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -34,7 +34,7 @@ further information.
   in the content type configuration so that the value does not change. If the field is not unique,
   Handle generation will fail for the duplicate value.
 - The Handle also must be unique and should be non-editable.
-- To make the suffix and handle fields non-editable and required, an additional module is provided
+- To make the suffix and Handle fields non-editable and required, an additional module is provided
   `dgi_actions_handle_constraints`. This module should be enabled and configured to make the necessary field validation changes.
 - See dgi_actions_handle_constraints README for more information.
 

From 3a28f97ff102a663dbb37bc26e32979f6d4ef333 Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:13:23 -0300
Subject: [PATCH 10/13] Update modules/dgi_actions_handle/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 modules/dgi_actions_handle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/README.md b/modules/dgi_actions_handle/README.md
index 9c82155..06585be 100644
--- a/modules/dgi_actions_handle/README.md
+++ b/modules/dgi_actions_handle/README.md
@@ -36,7 +36,7 @@ further information.
 - The Handle also must be unique and should be non-editable.
 - To make the suffix and Handle fields non-editable and required, an additional module is provided
   `dgi_actions_handle_constraints`. This module should be enabled and configured to make the necessary field validation changes.
-- See dgi_actions_handle_constraints README for more information.
+- See dgi_actions_handle_constraints' [README](/modules/dgi_actions_handle_constraints/README.md) for more information.
 
 ## Troubleshooting/Issues
 

From 299d5f3b34f2f5cd42a3499895246c44b1ec26cf Mon Sep 17 00:00:00 2001
From: Akanksha Singh <akankshasingh.viet@gmail.com>
Date: Fri, 21 Jun 2024 18:13:40 -0300
Subject: [PATCH 11/13] Update
 modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md

Co-authored-by: Jordan Dukart <jordan@discoverygarden.ca>
---
 .../modules/dgi_actions_handle_constraints/README.md            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
index d8e3be4..2b91a36 100644
--- a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
@@ -31,7 +31,7 @@ further information.
 ## Usage
 
 This module is used as part of the DGI Actions Handle package.
-It is used to ensure that the fields that are used as suffixes for the handle are unique and required. The module also ensures that the suffix field is not changed during entity save operations.
+It is used to ensure that the fields that are used as suffixes for the Handle are unique and required. The module also ensures that the suffix field is not changed during entity save operations.
 Once the configuration is set up, the module will handle the rest.
 
 ## Configuration

From 71c9689845d78ec92b1c33f291772620c43a00cb Mon Sep 17 00:00:00 2001
From: Akanksha <akankshasingh.viet@gmail.com>
Date: Mon, 8 Jul 2024 08:42:53 -0300
Subject: [PATCH 12/13] DDST-166: PR review fixes

---
 .../dgi_actions_handle_constraints.module                    | 5 ++---
 modules/dgi_actions_handle/src/Utility/HandleTrait.php       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
index be713b6..53c70f8 100644
--- a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/dgi_actions_handle_constraints.module
@@ -19,7 +19,7 @@ use Drupal\Core\Form\FormStateInterface;
 function _dgi_actions_handle_constraints_suffix_validation_add_constraint(array &$fields, EntityTypeInterface $entity_type): void {
   try {
     $config = \Drupal::config('dgi_actions_handle_constraints.settings');
-    $constraint_settings = $config->get('constraint_settings');
+    $constraint_settings = $config->get('constraint_settings') ?? [];
     // Constraint settings is an array of values
     // for each field that should be modified.
     foreach ($constraint_settings as $constraintSetting) {
@@ -118,8 +118,7 @@ function dgi_actions_handle_constraints_form_alter(array &$form, FormStateInterf
       }
       // For the suffix field, set the description and access.
       if ($constraintSetting['field_usage'] === 'suffix') {
-        $form[$constraintSetting['field_name']]['widget'][0]['value']['#description'] = t('This field is used as the handle suffix.
-                                                    The suffix field, once set, cannot be changed.');
+        $form[$constraintSetting['field_name']]['widget'][0]['value']['#description'] = t('This field is used as the handle suffix. The suffix field, once set, cannot be changed.');
         $form[$constraintSetting['field_name']]['#access'] = TRUE;
 
         // Disable the suffix field if it has a value.
diff --git a/modules/dgi_actions_handle/src/Utility/HandleTrait.php b/modules/dgi_actions_handle/src/Utility/HandleTrait.php
index b20d3a8..c023602 100644
--- a/modules/dgi_actions_handle/src/Utility/HandleTrait.php
+++ b/modules/dgi_actions_handle/src/Utility/HandleTrait.php
@@ -62,7 +62,7 @@ public function getPrefix(): string {
    * Gets the suffix for the entity.
    */
   public function getSuffix(): ?string {
-    $suffix_field = $this->getIdentifier()->getServiceData()->getData()['suffix_field'];
+    $suffix_field = $this->getIdentifier()->getServiceData()->getData()['suffix_field'] ?? FALSE;
 
     // If a field is configured, use that.
     if ($suffix_field && $this->getEntity()->hasField($suffix_field)) {

From d596464c951f93106c62ca9cf43a904b1fdb6562 Mon Sep 17 00:00:00 2001
From: Akanksha <akankshasingh.viet@gmail.com>
Date: Wed, 10 Jul 2024 09:20:03 -0300
Subject: [PATCH 13/13] DDST-166: Update readme

---
 .../modules/dgi_actions_handle_constraints/README.md     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
index 2b91a36..8c95b76 100644
--- a/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
+++ b/modules/dgi_actions_handle/modules/dgi_actions_handle_constraints/README.md
@@ -4,6 +4,11 @@
 
 This module is part of the DGI Actions Handle package. It provides functionality to add unique constraints to certain fields of an entity and handles the preservation of these fields during entity save operations.
 
+## Notes
+
+* This module should only be installed when a field is being used as a suffix field.
+* The developer or site administrator should note that this module would make the suffix field always required and unique.
+
 ## Requirements
 
 This module requires the following modules/libraries:
@@ -37,8 +42,8 @@ Once the configuration is set up, the module will handle the rest.
 ## Configuration
 
 The module uses the `dgi_actions_handle_constraints.settings` configuration, which should be set up with the appropriate constraint settings.
-For each field that is used as a suffix or identifier, a new value should be added to the constraint_settings array. An example configuration file which
-uses the field_pid as suffix and field_handle as identifier is provided with the module.
+For each field that is used as a suffix or identifier, a new value should be added to the constraint_settings array. A default configuration file which
+uses the field_pid as suffix and field_handle as identifier is provided with the module. This can be updated with the appropriate field names.
 
 ## Troubleshooting/Issues