Introduce config entity for managing GDPR settings.

composer.json

@@ -11,6 +11,9 @@
     ],
     "require": {
         "drupal/checklistapi": "^1.0",
-        "drupal/entity_reference_revisions": "^1.4"
+        "drupal/entity_reference_revisions": "^1.4",
+        "drupal/message": "^1.0@RC",
+        "drupal/token": "^1.1",
+        "drupal/views_data_export": "^1.0@alpha"
     }
 }

gdpr.info.yml

@@ -6,5 +6,5 @@ configure: checklistapi.checklists.gdpr_checklist
 package: General Data Protection Regulation
 
 dependencies:
-  - drupal:checklistapi
-  - drupal:message
+  - checklistapi:checklistapi
+  - message:message

gdpr.module

@@ -489,7 +489,7 @@ function gdpr_toolbar() {
   // Just add the root menu item.
   // GDPR Tasks and GDPR Consent modules
   // will modify this in hook_toolbar_alter.
-  if ($user->hasPermission('view gdpr tasks') || $user->hasPermission('manage gdpr agreements')) {
+  if ($user->hasPermission('view task entities') || $user->hasPermission('manage gdpr agreements')) {
     $items['gdpr'] += [
       '#type' => 'toolbar_item',
       'tab' => [

gdpr.routing.yml

@@ -4,7 +4,7 @@ gdpr.collected_user_data:
     _title: 'Data stored about you'
     _controller: '\Drupal\gdpr\Controller\UserController::collectedData'
   requirements:
-    _custom_access: '\Drupal\gdpr\Controller\UserController::access'
+    _custom_access: '\Drupal\gdpr\Controller\UserController::accessCollectedData'
   options:
     parameters:
       user:

modules/gdpr_consent/gdpr_consent.info.yml

@@ -6,6 +6,6 @@ package: General Data Protection Regulation
 
 dependencies:
   - gdpr:gdpr
-  - token
-  - message
-  - entity_reference_revisions
+  - token:token
+  - message:message
+  - entity_reference_revisions:entity_reference_revisions

modules/gdpr_consent/src/Controller/ConsentAgreementController.php

@@ -97,7 +97,7 @@ public function revisionOverview($gdpr_consent_agreement) {
     $account = $this->currentUser();
     $storage = $this->entityManager()->getStorage('gdpr_consent_agreement');
 
-    $build['#title'] = $this->t('Revisions for %title', ['%title' => $agreement->label()]);
+    $build['#title'] = $this->t('Revisions for %title', ['%title' => $agreement->title->value]);
     $header = [$this->t('Revision'), $this->t('Operations')];
 
     $revert_permission = $account->hasPermission('create gdpr agreements');

modules/gdpr_consent/src/Entity/ConsentAgreement.php

@@ -256,6 +256,20 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', TRUE);
 
+    $fields['notes'] = BaseFieldDefinition::create('string_long')
+      ->setLabel(t('Notes'))
+      ->setRevisionable(TRUE)
+      ->setDescription(t('This should contain the rationale behind the agreement.'))
+      ->setDisplayOptions('view', [
+        'type' => 'textarea',
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'textarea',
+        'weight' => 4,
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
+
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
       ->setDescription(t('A boolean indicating whether the Consent Agreement is published.'))
@@ -317,5 +331,4 @@ public function __toString() {
     return $this->get('title')->getString();
   }
 
-
-}
+}

modules/gdpr_dump/gdpr_dump.info.yml

@@ -6,4 +6,4 @@ configure: gdpr_dump.settings
 package: General Data Protection Regulation
 
 dependencies:
-  - drupal:gdpr
+  - gdpr:gdpr

modules/gdpr_fields/config/schema/gdpr_field.schema.yml

@@ -7,4 +7,4 @@ field.field.*.*.*.third_party.gdpr_fields:
         label: 'Whether this field is user sensitive or not.'
     gdpr_fields_rtf:
         type: string
-        label: 'Whether this field is user sensitive or not.'
+        label: 'Whether this field is user sensitive or not.'

modules/gdpr_fields/config/schema/gdpr_fields.schema.yml

@@ -0,0 +1,30 @@
+gdpr_fields.gdpr_fields_config.*:
+  type: config_entity
+  label: 'GDPR Field Config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    bundles:
+      type: sequence
+      label: 'Entity Bundles'
+      sequence:
+        type: sequence
+        label: 'Fields'
+        sequence:
+          type: mapping
+          mapping:
+            bundle:
+              type: string
+            name:
+              type: string
+            enabled:
+              type: boolean
+            rta:
+              type: string
+            rtf:
+              type: string
+            sanitizer:
+              type: string
+            notes:
+              type: string

modules/gdpr_fields/css/field-list.css

@@ -0,0 +1,24 @@
+.notes:before {
+  content: attr(data-icon);
+  font-weight: bold;
+  display: inline-block;
+  width: 1em;
+  font-size: 2em;
+}
+
+.notes + div {
+  float: right;
+  margin-top: -3em;
+  position: absolute;
+  z-index: 3;
+  display: none;
+  border: 1px solid #ccc;
+  background: #fff;
+  padding: 10px;
+  min-width: 200px;
+}
+
+.notes:hover + div,
+.notes + div:hover {
+  display: inline-block;
+}

modules/gdpr_fields/gdpr_fields.libraries.yml

@@ -0,0 +1,4 @@
+field-list:
+  css:
+    theme:
+      css/field-list.css: {}

modules/gdpr_fields/gdpr_fields.module

@@ -7,6 +7,8 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\gdpr_fields\Entity\GdprFieldConfigEntity;
+use Drupal\gdpr_fields\Form\GdprFieldSettingsForm;
 
 /**
  * Implements hook_toolbar_alter().
@@ -52,72 +54,17 @@ function gdpr_fields_form_field_config_edit_form_alter(&$form, FormStateInterfac
     '#open' => TRUE,
   ];
 
-  $form['field']['gdpr_fields']['gdpr_fields_enabled'] = [
-    '#type' => 'checkbox',
-    '#title' => t('This is a GDPR field'),
-    '#default_value' => $field->getThirdPartySetting('gdpr_fields', 'gdpr_fields_enabled', FALSE),
-  ];
-
-  $form['field']['gdpr_fields']['gdpr_fields_rta'] = [
-    '#type' => 'select',
-    '#title' => t('Right to access'),
-    '#options' => [
-      'inc' => 'Included',
-      'maybe' => 'Maybe',
-      'no' => 'Not',
-    ],
-    '#default_value' => $field->getThirdPartySetting('gdpr_fields', 'gdpr_fields_rta', 'no'),
-    '#states' => [
-      'visible' => [
-        ':input[name="gdpr_fields_enabled"]' => [
-          'checked' => TRUE,
-        ],
-      ],
-    ],
-  ];
-
-  $form['field']['gdpr_fields']['gdpr_fields_rtf'] = [
-    '#type' => 'select',
-    '#title' => t('Right to be forgotten'),
-    '#options' => [
-      'anonymise' => 'Anonymise',
-      'remove' => 'Remove',
-      'maybe' => 'Maybe',
-      'no' => 'Not',
-    ],
-    '#default_value' => $field->getThirdPartySetting('gdpr_fields', 'gdpr_fields_rtf', 'no'),
-    '#states' => [
-      'visible' => [
-        ':input[name="gdpr_fields_enabled"]' => [
-          'checked' => TRUE,
-        ],
-      ],
-    ],
-  ];
-
-  $sanitizer_options = ['' => ''] + array_map(function ($s) {
-    return $s['label'];
-  }, $sanitizer_definitions);
+  GdprFieldSettingsForm::buildFormFields($form['field']['gdpr_fields'], $field->getTargetEntityTypeId(), $field->getTargetBundle(), $field->getName());
 
-  $form['field']['gdpr_fields']['gdpr_fields_sanitizer'] = [
-    '#type' => 'select',
-    '#title' => t('Sanitizer to use'),
-    '#options' => $sanitizer_options,
-    '#default_value' => $field->getThirdPartySetting('gdpr_fields', 'gdpr_fields_sanitizer', ''),
-    '#states' => [
-      'visible' => [
-        ':input[name="gdpr_fields_enabled"]' => ['checked' => TRUE],
-        ':input[name="gdpr_fields_rtf"]' => ['value' => 'anonymise'],
-      ],
-    ],
-  ];
-
   $form['actions']['submit']['#submit'][] = 'gdpr_fields_form_field_config_edit_form_submit';
 }
 
 /**
  * Form submission handler for gdpr_fields_form_field_config_edit_form_alter.
  *
+ * This version of the GDPR fields form is embedded on the standard field
+ * settings page.
+ *
  * @param array $form
  *   The form array.
  * @param \Drupal\Core\Form\FormStateInterface $form_state
@@ -128,21 +75,16 @@ function gdpr_fields_form_field_config_edit_form_submit(array $form, FormStateIn
   $field = $form_state->getFormObject()->getEntity();
   $form_fields = &$form_state->getValues();
 
-  // If the private option is checked, update settings.
-  if ($form_fields['gdpr_fields_enabled']) {
-    $field->setThirdPartySetting('gdpr_fields', 'gdpr_fields_enabled', TRUE);
-    $field->setThirdPartySetting('gdpr_fields', 'gdpr_fields_rta', $form_fields['gdpr_fields_rta']);
-    $field->setThirdPartySetting('gdpr_fields', 'gdpr_fields_rtf', $form_fields['gdpr_fields_rtf']);
-    $field->setThirdPartySetting('gdpr_fields', 'gdpr_fields_sanitizer', $form_fields['gdpr_fields_sanitizer']);
-    $field->save();
-  }
-  else {
-    $field->unsetThirdPartySetting('gdpr_fields', 'gdpr_fields_enabled');
-    $field->unsetThirdPartySetting('gdpr_fields', 'gdpr_fields_rta');
-    $field->unsetThirdPartySetting('gdpr_fields', 'gdpr_fields_rtf');
-    $field->unsetThirdPartySetting('gdpr_fields', 'gdpr_fields_sanitizer');
-
-    $field->save();
-  }
-
+  $config = GdprFieldConfigEntity::load($field->getTargetEntityTypeId()) ?? GdprFieldConfigEntity::create(['id' => $field->getTargetEntityTypeId()]);
+  $config->setField(
+    $field->getTargetBundle(),
+    $field->getName(), [
+      'enabled' => $form_state->getValue('gdpr_enabled'),
+      'rta' => $form_state->getValue('gdpr_rta'),
+      'rtf' => $form_state->getValue('gdpr_rtf'),
+      'sanitizer' => $form_state->getValue('gdpr_sanitizer'),
+      'notes' => $form_state->getValue('gdpr_notes'),
+    ]
+  );
+  $config->save();
 }

modules/gdpr_fields/gdpr_fields.routing.yml

@@ -1,7 +1,15 @@
 gdpr_fields.fields_list:
-  path: '/admin/reports/fields/gdpr-fields'
+  path: '/admin/reports/fields/gdpr-fields/{mode}'
   defaults:
     _controller: '\Drupal\gdpr_fields\Controller\GDPRController::fieldsList'
     _title: 'Used in GDPR'
+    mode: 'all'
   requirements:
     _permission: 'view gdpr fields'
+
+gdpr_fields.edit_field:
+  path: '/admin/gdpr/fields/{entity_type}/{bundle_name}/{field_name}'
+  defaults:
+    _form: 'Drupal\gdpr_fields\Form\GdprFieldSettingsForm'
+  requirements:
+    _permission: 'view gdpr fields'