Merge branch '225-tac-implementation' into 1.0.x

bcgov · Nov 20, 2023 · d7e2da0 · d7e2da0
2 parents 413824e + 5d8be67
commit d7e2da0
Show file tree

Hide file tree

Showing 17 changed files with 383 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
         "drupal/core-composer-scaffold": "^10.1",
         "drupal/core-recommended": "^10.1",
         "drupal/devel_php": "^1.5",
+        "drupal/field_permissions": "^1.2",
         "drupal/field_token_value": "^3.0",
         "drupal/flag": "^4.0",
         "drupal/message_gcnotify": "dev-1.0.x",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.entity_form_display.node.data_set.default.yml b/config/sync/core.entity_form_display.node.data_set.default.yml
@@ -176,14 +176,10 @@ content:
       display_label: true
     third_party_settings: {  }
   field_primary_responsibility_org:
-    type: entity_reference_autocomplete
+    type: options_buttons
     weight: 3
     region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
   field_published_date:
     type: datetime_default

diff --git a/config/sync/core.entity_form_display.node.data_set.section_2.yml b/config/sync/core.entity_form_display.node.data_set.section_2.yml
@@ -63,14 +63,10 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_primary_responsibility_org:
-    type: entity_reference_autocomplete
+    type: options_buttons
     weight: 5
     region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
   field_published_date:
     type: datetime_default

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -34,6 +34,7 @@ module:
   facets: 0
   facets_summary: 0
   field: 0
+  field_permissions: 0
   field_token_value: 0
   field_ui: 0
   file: 0

diff --git a/config/sync/field.field.node.data_set.field_primary_responsibility_org.yml b/config/sync/field.field.node.data_set.field_primary_responsibility_org.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.storage.node.field_primary_responsibility_org
     - node.type.data_set
-    - taxonomy.vocabulary.organization
 id: node.data_set.field_primary_responsibility_org
 field_name: field_primary_responsibility_org
 entity_type: node
@@ -17,13 +16,10 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: views
   handler_settings:
-    target_bundles:
-      organization: organization
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
+    view:
+      view_name: organizations
+      display_name: entity_reference_1
+      arguments: {  }
 field_type: entity_reference
diff --git a/config/sync/field.field.node.data_set.field_visibility.yml b/config/sync/field.field.node.data_set.field_visibility.yml
@@ -12,7 +12,7 @@ entity_type: node
 bundle: data_set
 label: Visibility
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/config/sync/field.storage.node.field_primary_responsibility_org.yml b/config/sync/field.storage.node.field_primary_responsibility_org.yml
@@ -3,8 +3,12 @@ langcode: en
 status: true
 dependencies:
   module:
+    - field_permissions
     - node
     - taxonomy
+third_party_settings:
+  field_permissions:
+    permission_type: custom
 id: node.field_primary_responsibility_org
 field_name: field_primary_responsibility_org
 entity_type: node

diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml
@@ -6,6 +6,7 @@ dependencies:
     - filter.format.restricted_html
   module:
     - comment
+    - field_permissions
     - filter
     - media
     - system
@@ -19,4 +20,6 @@ permissions:
   - 'access comments'
   - 'access content'
   - 'use text format restricted_html'
+  - 'view field_primary_responsibility_org'
   - 'view media'
+  - 'view own field_primary_responsibility_org'
diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml
@@ -7,6 +7,7 @@ dependencies:
   module:
     - comment
     - environment_indicator
+    - field_permissions
     - file
     - filter
     - form_mode_control
@@ -31,4 +32,6 @@ permissions:
   - 'use  The form mode default linked to  search_api_saved_search entity( default )'
   - 'use default search_api_saved_searches'
   - 'use text format basic_html'
+  - 'view field_primary_responsibility_org'
   - 'view media'
+  - 'view own field_primary_responsibility_org'
diff --git a/config/sync/user.role.data_catalogue_administrator.yml b/config/sync/user.role.data_catalogue_administrator.yml
@@ -27,6 +27,7 @@ dependencies:
     - bc_dc
     - book
     - content_moderation
+    - field_permissions
     - filter
     - flag
     - form_mode_control
@@ -62,6 +63,7 @@ permissions:
   - 'assign data_catalogue_user role'
   - 'create book content'
   - 'create data_set content'
+  - 'create field_primary_responsibility_org'
   - 'create image media'
   - 'create page content'
   - 'create terms in common_data'
@@ -100,7 +102,9 @@ permissions:
   - 'edit any data_set content'
   - 'edit any image media'
   - 'edit any page content'
+  - 'edit field_primary_responsibility_org'
   - 'edit own data_set content'
+  - 'edit own field_primary_responsibility_org'
   - 'edit terms in common_data'
   - 'edit terms in data_set_series'
   - 'edit terms in data_set_type'
@@ -151,7 +155,9 @@ permissions:
   - 'view all media revisions'
   - 'view any unpublished content'
   - 'view data_set revisions'
+  - 'view field_primary_responsibility_org'
   - 'view latest version'
+  - 'view own field_primary_responsibility_org'
   - 'view own unpublished content'
   - 'view own unpublished media'
   - 'view the administration theme'

diff --git a/config/sync/user.role.data_catalogue_editor.yml b/config/sync/user.role.data_catalogue_editor.yml
@@ -8,6 +8,7 @@ dependencies:
   module:
     - book
     - content_moderation
+    - field_permissions
     - flag
     - form_mode_control
     - node
@@ -41,7 +42,9 @@ permissions:
   - 'use editorial transition publish'
   - 'view any unpublished content'
   - 'view data_set revisions'
+  - 'view field_primary_responsibility_org'
   - 'view latest version'
+  - 'view own field_primary_responsibility_org'
   - 'view own unpublished content'
   - 'view the administration theme'
   - 'view unpublished paragraphs'
diff --git a/config/sync/user.role.data_catalogue_manager.yml b/config/sync/user.role.data_catalogue_manager.yml
@@ -26,6 +26,7 @@ dependencies:
   module:
     - book
     - content_moderation
+    - field_permissions
     - filter
     - flag
     - form_mode_control
@@ -120,7 +121,9 @@ permissions:
   - 'view all media revisions'
   - 'view any unpublished content'
   - 'view data_set revisions'
+  - 'view field_primary_responsibility_org'
   - 'view latest version'
+  - 'view own field_primary_responsibility_org'
   - 'view own unpublished content'
   - 'view own unpublished media'
   - 'view the administration theme'

diff --git a/config/sync/user.role.data_catalogue_user.yml b/config/sync/user.role.data_catalogue_user.yml
@@ -6,6 +6,7 @@ dependencies:
     - node.type.data_set
   module:
     - book
+    - field_permissions
     - flag
     - node
 id: data_catalogue_user
@@ -17,3 +18,5 @@ permissions:
   - 'flag bookmark'
   - 'unflag bookmark'
   - 'view data_set revisions'
+  - 'view field_primary_responsibility_org'
+  - 'view own field_primary_responsibility_org'