Merge changes from develop.

composer.json

@@ -55,7 +55,6 @@
         "Automated Drupal 10 compatibility fixes - https://www.drupal.org/project/jira_rest/issues/3288088#comment-14567776": "https://www.drupal.org/files/issues/2022-06-16/jira_rest.4.x-dev.rector.patch"
       },
       "drupal/jsonapi_extras": {
-        "Issue #3473990: Fix PHP Fatal error on Declaration of the normalize function must be compatible with normalize function return type after Schemata 8.x-1.0 was released": "https://git.drupalcode.org/project/jsonapi_extras/-/commit/d7ab37658999b5fae74769ade4155ec7310aa468.diff",
         "Make max value of page[limit] configurable per entity/bundle - https://www.drupal.org/project/jsonapi_extras/issues/2884292#comment-14794882": "https://www.drupal.org/files/issues/2022-11-21/max_page_limit_configuration-2884292-33.patch"
       },
       "drupal/jsonapi_menu_items": {
@@ -423,6 +422,7 @@
     "drupal/password_policy": "^4.0",
     "drupal/password_strength": "^2.0@beta",
     "drupal/pathauto": "^1.11",
+    "drupal/private_files_download_permission": "^3.1",
     "drupal/prlp": "^1.10",
     "drupal/queue_mail": "^1.5",
     "drupal/quick_node_clone": "^1.16",

config/install/user.role.approver.yml

@@ -33,15 +33,19 @@ permissions:
   - 'administer redirects'
   - 'administer url aliases'
   - 'break content lock'
-  - 'create media'
+  - 'create document media'
+  - 'create file media'
+  - 'create image media'
   - 'create url aliases'
   - 'delete all revisions'
-  - 'delete any media'
   - 'delete media'
+  - 'edit any audio media'
+  - 'edit any document media'
+  - 'edit any file media'
+  - 'edit any image media'
   - 'import tablefield'
   - 'rebuild tablefield'
   - 'revert all revisions'
-  - 'update any media'
   - 'update media'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'

config/install/user.role.contributor.yml

@@ -4,6 +4,11 @@ dependencies:
   config:
     - filter.format.rich_text
     - filter.format.summary_text
+    - media.type.audio
+    - media.type.document
+    - media.type.embedded_video
+    - media.type.file
+    - media.type.image
   module:
     - block
     - content_moderation
@@ -28,16 +33,19 @@ permissions:
   - 'administer blocks'
   - 'administer menu'
   - 'administer url aliases'
-  - 'create media'
+  - 'create document media'
+  - 'create file media'
+  - 'create image media'
   - 'create url aliases'
-  - 'delete all revisions'
-  - 'delete any media'
-  - 'delete media'
+  - 'edit any audio media'
+  - 'edit any document media'
+  - 'edit any file media'
+  - 'edit any image media'
   - 'enter all revision log entry'
+  - 'delete media'
   - 'import tablefield'
   - 'rebuild tablefield'
   - 'revert all revisions'
-  - 'update any media'
   - 'update media'
   - 'use editorial transition create_new_draft'
   - 'use editorial transition needs_review_draft'

config/install/user.role.editor.yml

@@ -4,6 +4,11 @@ dependencies:
   config:
     - filter.format.rich_text
     - filter.format.summary_text
+    - media.type.audio
+    - media.type.document
+    - media.type.embedded_video
+    - media.type.file
+    - media.type.image
     - workflows.workflow.editorial
   module:
     - block
@@ -28,15 +33,18 @@ permissions:
   - 'addrow tablefield'
   - 'administer menu'
   - 'administer url aliases'
-  - 'create media'
+  - 'create document media'
+  - 'create file media'
+  - 'create image media'
   - 'create url aliases'
-  - 'delete all revisions'
-  - 'delete any media'
+  - 'edit any audio media'
+  - 'edit any document media'
+  - 'edit any file media'
+  - 'edit any image media'
   - 'delete media'
   - 'rebuild tablefield'
   - 'revert all revisions'
   - 'revert all revisions'
-  - 'update any media'
   - 'update media'
   - 'use editorial transition archive_pending'
   - 'use editorial transition create_archive_pending'

config/install/user.role.site_admin.yml

@@ -5,6 +5,11 @@ dependencies:
     - filter.format.admin_text
     - filter.format.rich_text
     - filter.format.summary_text
+    - media.type.audio
+    - media.type.document
+    - media.type.embedded_video
+    - media.type.file
+    - media.type.image
     - taxonomy.vocabulary.audience
     - taxonomy.vocabulary.department
     - taxonomy.vocabulary.location
@@ -58,15 +63,21 @@ permissions:
   - 'create field_business_contact_number'
   - 'create field_business_name'
   - 'create field_notes'
-  - 'create media'
+  - 'create document media'
+  - 'create file media'
+  - 'create image media'
   - 'create terms in audience'
   - 'create terms in department'
   - 'create terms in location'
   - 'create terms in tags'
   - 'create terms in topic'
   - 'create url aliases'
   - 'delete all revisions'
-  - 'delete any media'
+  - 'delete any audio media'
+  - 'delete any document media'
+  - 'delete any embedded_video media'
+  - 'delete any file media'
+  - 'delete any image media'
   - 'delete media'
   - 'delete terms in audience'
   - 'delete terms in department'
@@ -84,7 +95,6 @@ permissions:
   - 'import tablefield'
   - 'rebuild tablefield'
   - 'revert all revisions'
-  - 'update any media'
   - 'update media'
   - 'use editorial transition archive'
   - 'use editorial transition archived_draft'

modules/tide_media/modules/tide_media_secure_files/README.md

@@ -0,0 +1,5 @@
+# tide_media_secure_files
+Allows author to create secure private files
+
+## Purpose
+- media

modules/tide_media/modules/tide_media_secure_files/config/install/core.entity_form_display.media.secure_file.default.yml

@@ -0,0 +1,55 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.secure_file.field_media_site
+    - field.field.media.secure_file.field_secure_file
+    - media.type.secure_file
+  module:
+    - file
+id: media.secure_file.default
+targetEntityType: media
+bundle: secure_file
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_media_site:
+    type: options_buttons
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+    field_name: field_media_site
+  field_secure_file:
+    type: file_generic
+    weight: 1
+    region: content
+    settings:
+      progress_indicator: throbber
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 3
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  path: true
+  status: true

modules/tide_media/modules/tide_media_secure_files/config/install/core.entity_view_display.media.secure_file.default.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.secure_file.field_secure_file
+    - media.type.secure_file
+  module:
+    - file
+id: media.secure_file.default
+targetEntityType: media
+bundle: secure_file
+mode: default
+content:
+  field_secure_file:
+    type: file_default
+    label: visually_hidden
+    settings:
+      use_description_as_link_text: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  name: true
+  thumbnail: true
+  uid: true

modules/tide_media/modules/tide_media_secure_files/config/install/field.field.media.secure_file.field_media_site.yml

@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_site
+    - media.type.secure_file
+    - taxonomy.vocabulary.sites
+id: media.secure_file.field_media_site
+field_name: field_media_site
+entity_type: media
+bundle: secure_file
+label: Site
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      sites: sites
+field_type: entity_reference

modules/tide_media/modules/tide_media_secure_files/config/install/field.field.media.secure_file.field_secure_file.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_secure_file
+    - media.type.secure_file
+  module:
+    - file
+id: media.secure_file.field_secure_file
+field_name: field_secure_file
+entity_type: media
+bundle: secure_file
+label: File
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:file'
+  handler_settings: {  }
+  file_directory: 'secure/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'xls xlsx csv xlsm doc docx dotx pdf ppt pptx'
+  max_filesize: ''
+  description_field: true
+field_type: file

modules/tide_media/modules/tide_media_secure_files/config/install/field.storage.media.field_secure_file.yml

@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - field_permissions
+    - file
+    - media
+third_party_settings:
+  field_permissions:
+    permission_type: custom
+id: media.field_secure_file
+field_name: field_secure_file
+entity_type: media
+type: file
+settings:
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: private
+module: file
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

modules/tide_media/modules/tide_media_secure_files/config/install/media.type.secure_file.yml

@@ -0,0 +1,12 @@
+langcode: en
+status: true
+dependencies: {  }
+id: secure_file
+label: 'Secure File'
+description: ''
+source: file
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+  source_field: field_secure_file
+field_map: {  }

modules/tide_media/modules/tide_media_secure_files/config/install/pfdp.pfdp_directory.secure.yml

@@ -0,0 +1,24 @@
+langcode: en
+status: true
+dependencies: {  }
+id: secure
+path: /secure
+bypass: false
+grant_file_owners: false
+users: {  }
+roles:
+  administrator: administrator
+  secure_file_user: secure_file_user
+  site_admin: '0'
+  approver: '0'
+  editor: '0'
+  contributor: '0'
+  previewer: '0'
+  anonymous: '0'
+  authenticated: '0'
+  grant_author: '0'
+  html_editor: '0'
+  emergency_recovery_resource: '0'
+  data_importer: '0'
+  site_auditor: '0'
+  jobs_editor: '0'

modules/tide_media/modules/tide_media_secure_files/config/install/system.action.user_add_role_action.secure_file_user.yml

@@ -0,0 +1,13 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.secure_file_user
+  module:
+    - user
+id: user_add_role_action.secure_file_user
+label: 'Add the Secure File User role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: secure_file_user

modules/tide_media/modules/tide_media_secure_files/config/install/system.action.user_remove_role_action.secure_file_user.yml

@@ -0,0 +1,13 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.secure_file_user
+  module:
+    - user
+id: user_remove_role_action.secure_file_user
+label: 'Remove the Secure File User role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: secure_file_user