diff --git a/modules/tide_ckeditor/tide_ckeditor.info.yml b/modules/tide_ckeditor/tide_ckeditor.info.yml
new file mode 100644
index 000000000..d54d5289d
--- /dev/null
+++ b/modules/tide_ckeditor/tide_ckeditor.info.yml
@@ -0,0 +1,8 @@
+name: Tide CKEDITOR5 Module
+type: module
+description: "Tide CKEDITOR5 Module"
+package: CKEditor 5
+core_version_requirement: ^9 || ^10
+dependencies:
+ - drupal:ckeditor5
+ - ckeditor5_embedded_content:ckeditor5_embedded_content
diff --git a/modules/tide_ckeditor/tide_ckeditor.install b/modules/tide_ckeditor/tide_ckeditor.install
new file mode 100644
index 000000000..ffe32fac9
--- /dev/null
+++ b/modules/tide_ckeditor/tide_ckeditor.install
@@ -0,0 +1,34 @@
+grantPermission('use ckeditor5 embedded content')->save();
+ }
+ }
+}
+
+/**
+ * Assign `use text format advanced` to editor,approver and site_admin.
+ */
+function tide_ckeditor_update_10001() {
+ $role_ids = ['editor', 'approver', 'site_admin', 'contributor'];
+ foreach ($role_ids as $role_id) {
+ $role = Role::load($role_id);
+ if ($role) {
+ $role->grantPermission('use ckeditor5 embedded content')->save();
+ }
+ }
+}
diff --git a/modules/tide_ckeditor/tide_ckeditor.libraries.yml b/modules/tide_ckeditor/tide_ckeditor.libraries.yml
new file mode 100644
index 000000000..d5f208e3d
--- /dev/null
+++ b/modules/tide_ckeditor/tide_ckeditor.libraries.yml
@@ -0,0 +1,5 @@
+callout:
+ js:
+ js/build/callout.js: { preprocess: false, minified: true }
+ dependencies:
+ - ckeditor5/ckeditor5
diff --git a/modules/tide_ckeditor/tide_ckeditor.module b/modules/tide_ckeditor/tide_ckeditor.module
new file mode 100644
index 000000000..b4bbfed3a
--- /dev/null
+++ b/modules/tide_ckeditor/tide_ckeditor.module
@@ -0,0 +1,23 @@
+ [
+ 'variables' => [
+ 'title' => NULL,
+ 'url' => NULL,
+ 'width' => NULL,
+ 'height' => NULL,
+ ],
+ 'template' => 'embedded-content/tide-iframe',
+ ],
+ ];
+}
diff --git a/modules/tide_ckeditor/tide_ckeditor.permissions.yml b/modules/tide_ckeditor/tide_ckeditor.permissions.yml
new file mode 100644
index 000000000..ffc88c3e4
--- /dev/null
+++ b/modules/tide_ckeditor/tide_ckeditor.permissions.yml
@@ -0,0 +1,6 @@
+'use text format advanced':
+ title: 'use text format advanced'
+ description: 'Allow user to select ckeditor templates.'
+'use ckeditor5 embedded content':
+ title: 'Use ckeditor5 embedded content'
+ description: 'Allow user to use ckeditor5 embedded content.'
diff --git a/modules/tide_ckeditor/webpack.config.js b/modules/tide_ckeditor/webpack.config.js
new file mode 100644
index 000000000..ea600d757
--- /dev/null
+++ b/modules/tide_ckeditor/webpack.config.js
@@ -0,0 +1,69 @@
+const path = require('path');
+const fs = require('fs');
+const webpack = require('webpack');
+const { styles, builds } = require('@ckeditor/ckeditor5-dev-utils');
+const TerserPlugin = require('terser-webpack-plugin');
+
+function getDirectories(srcpath) {
+ return fs
+ .readdirSync(srcpath)
+ .filter((item) => fs.statSync(path.join(srcpath, item)).isDirectory());
+}
+
+module.exports = [];
+// Loop through every subdirectory in src, each a different plugin, and build
+// each one in ./build.
+getDirectories('./js/ckeditor5_plugins').forEach((dir) => {
+ const bc = {
+ mode: 'production',
+ optimization: {
+ minimize: true,
+ minimizer: [
+ new TerserPlugin({
+ terserOptions: {
+ format: {
+ comments: false,
+ },
+ },
+ test: /\.js(\?.*)?$/i,
+ extractComments: false,
+ }),
+ ],
+ moduleIds: 'named',
+ },
+ entry: {
+ path: path.resolve(
+ __dirname,
+ 'js/ckeditor5_plugins',
+ dir,
+ 'src/index.js',
+ ),
+ },
+ output: {
+ path: path.resolve(__dirname, './js/build'),
+ filename: `${dir}.js`,
+ library: ['CKEditor5', dir],
+ libraryTarget: 'umd',
+ libraryExport: 'default',
+ },
+ plugins: [
+ // It is possible to require the ckeditor5-dll.manifest.json used in
+ // core/node_modules rather than having to install CKEditor 5 here.
+ // However, that requires knowing the location of that file relative to
+ // where your module code is located.
+ new webpack.DllReferencePlugin({
+ manifest: require('./node_modules/ckeditor5/build/ckeditor5-dll.manifest.json'), // eslint-disable-line global-require, import/no-unresolved
+ scope: 'ckeditor5/src',
+ name: 'CKEditor5.dll',
+ }),
+ ],
+ module: {
+ rules: [
+ { test: /\.svg$/, use: 'raw-loader' },
+ { test: /\.css$/, use: 'raw-loader' }
+ ],
+ },
+ };
+
+ module.exports.push(bc);
+});
diff --git a/modules/tide_cms_support/config/optional/block.block.admin_tide_cms_help.yml b/modules/tide_cms_support/config/optional/block.block.admin_tide_cms_help.yml
new file mode 100644
index 000000000..16ae050f5
--- /dev/null
+++ b/modules/tide_cms_support/config/optional/block.block.admin_tide_cms_help.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - tide_cms_support
+ theme:
+ - claro
+id: admin_tide_cms_help
+theme: claro
+region: help
+weight: -100
+provider: null
+plugin: tide_help_block
+settings:
+ id: tide_help_block
+ label: 'Tide CMS Help'
+ label_display: ''
+ provider: tide_cms_support
+visibility: { }
diff --git a/modules/tide_cms_support/src/Plugin/Block/HelpBlock.php b/modules/tide_cms_support/src/Plugin/Block/HelpBlock.php
index 45b06a405..2276c0d8c 100644
--- a/modules/tide_cms_support/src/Plugin/Block/HelpBlock.php
+++ b/modules/tide_cms_support/src/Plugin/Block/HelpBlock.php
@@ -8,7 +8,7 @@
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
/**
* Provides a 'Help' block.
@@ -31,18 +31,18 @@ class HelpBlock extends BlockBase implements ContainerFactoryPluginInterface {
protected $moduleHandler;
/**
- * The current request.
+ * The current route match.
*
- * @var \Symfony\Component\HttpFoundation\Request
+ * @var \Drupal\Core\Routing\RouteMatchInterface
*/
- protected $request;
+ protected $routeMatch;
/**
* The current route match.
*
- * @var \Drupal\Core\Routing\RouteMatchInterface
+ * @var \Symfony\Component\HttpFoundation\Request | null
*/
- protected $routeMatch;
+ protected $request;
/**
* Creates a HelpBlock instance.
@@ -53,19 +53,19 @@ class HelpBlock extends BlockBase implements ContainerFactoryPluginInterface {
* The plugin_id for the plugin instance.
* @param mixed $plugin_definition
* The plugin implementation definition.
- * @param \Symfony\Component\HttpFoundation\Request $request
- * The current request.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+ * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack
+ * The request stack.
+ * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler
* The module handler.
- * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+ * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
* The current route match.
*/
- public function __construct(array $configuration, $plugin_id, $plugin_definition, Request $request, ModuleHandlerInterface $module_handler, RouteMatchInterface $route_match) {
+ public function __construct(array $configuration, $plugin_id, $plugin_definition, RequestStack $requestStack, ModuleHandlerInterface $moduleHandler, RouteMatchInterface $routeMatch) {
parent::__construct($configuration, $plugin_id, $plugin_definition);
- $this->request = $request;
- $this->moduleHandler = $module_handler;
- $this->routeMatch = $route_match;
+ $this->request = $requestStack->getCurrentRequest();
+ $this->moduleHandler = $moduleHandler;
+ $this->routeMatch = $routeMatch;
}
/**
@@ -76,7 +76,7 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration,
$plugin_id,
$plugin_definition,
- $container->get('request_stack')->getCurrentRequest(),
+ $container->get('request_stack'),
$container->get('module_handler'),
$container->get('current_route_match')
);
@@ -91,17 +91,14 @@ public function build() {
return [];
}
- $implementations = $this->moduleHandler->getImplementations('tide_help');
+ $implementations = $this->moduleHandler->getModuleList();
$build = [];
$args = [
$this->routeMatch->getRouteName(),
$this->routeMatch,
];
- foreach ($implementations as $module) {
- // Don't add empty strings to $build array.
+ foreach ($implementations as $module => $moduleInfo) {
if ($help = $this->moduleHandler->invoke($module, 'tide_help', $args)) {
- // Convert strings to #markup render arrays so that they will XSS admin
- // filtered.
$build[] = is_array($help) ? $help : ['#markup' => $help];
}
}
diff --git a/modules/tide_cms_support/tide_cms_support.info.yml b/modules/tide_cms_support/tide_cms_support.info.yml
index 5734f18bf..8a6756a68 100644
--- a/modules/tide_cms_support/tide_cms_support.info.yml
+++ b/modules/tide_cms_support/tide_cms_support.info.yml
@@ -2,4 +2,4 @@ name: Tide CMS Support
description: Tide CMS Support Related Content.
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/modules/tide_cms_support/tide_cms_support.install b/modules/tide_cms_support/tide_cms_support.install
index a79eb1c2e..dab217cf5 100644
--- a/modules/tide_cms_support/tide_cms_support.install
+++ b/modules/tide_cms_support/tide_cms_support.install
@@ -9,9 +9,14 @@ use Drupal\block\Entity\Block;
use Drupal\Core\Utility\UpdateException;
/**
- * Create Tide CMS Help block.
+ * Implements hook_install().
*/
-function tide_cms_support_update_8001() {
+function tide_cms_support_install() {
+ $block = Block::load('admin_tide_cms_help');
+ if ($block !== NULL) {
+ return;
+ }
+ // Create Tide CMS Help block.
$block = Block::create([
'id' => 'admin_tide_cms_help',
'theme' => \Drupal::config('system.theme')->get('admin'),
diff --git a/modules/tide_dashboard/tide_dashboard.info.yml b/modules/tide_dashboard/tide_dashboard.info.yml
index 28cebba6a..84b24d6dd 100644
--- a/modules/tide_dashboard/tide_dashboard.info.yml
+++ b/modules/tide_dashboard/tide_dashboard.info.yml
@@ -2,7 +2,7 @@ name: Tide Dashboard
description: Provides Dashboard for Tide distro.
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- admin_toolbar:admin_toolbar
- admin_toolbar:admin_toolbar_tools
diff --git a/modules/tide_dashboard/tide_dashboard.install b/modules/tide_dashboard/tide_dashboard.install
index 7b8013d42..a15dc7c4b 100644
--- a/modules/tide_dashboard/tide_dashboard.install
+++ b/modules/tide_dashboard/tide_dashboard.install
@@ -56,10 +56,3 @@ function tide_dashboard_install($is_syncing) {
$workbench_config->set('overview_main', 'tide_dashboard_my_content:overview');
$workbench_config->save();
}
-
-/**
- * Uninstall Login Redirect per Role.
- */
-function tide_dashboard_update_8001() {
- \Drupal::service('module_installer')->uninstall(['login_redirect_per_role']);
-}
diff --git a/modules/tide_edit_protection/tide_edit_protection.info.yml b/modules/tide_edit_protection/tide_edit_protection.info.yml
index 16affeaa5..521e7d3da 100644
--- a/modules/tide_edit_protection/tide_edit_protection.info.yml
+++ b/modules/tide_edit_protection/tide_edit_protection.info.yml
@@ -1,7 +1,7 @@
name: Tide edit protection
type: module
description: Extends Node Edit Protection module to provide custom functions
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
package: tide
dependencies:
- tide_site:tide_site
diff --git a/modules/tide_edit_protection/tide_edit_protection.install b/modules/tide_edit_protection/tide_edit_protection.install
index 55ab66c89..e6c93fae6 100644
--- a/modules/tide_edit_protection/tide_edit_protection.install
+++ b/modules/tide_edit_protection/tide_edit_protection.install
@@ -5,8 +5,8 @@
* Installation functions for tide_edit_protection.
*/
-use Drupal\views\Entity\View;
use Drupal\user\Entity\Role;
+use Drupal\views\Entity\View;
/**
* Updates locked_content view.
@@ -33,132 +33,11 @@ function tide_edit_protection_install() {
$contentTimeOutSettings->save();
// Changes content_lock weight.
module_set_weight('content_lock', 1000);
-}
-
-/**
- * Enables content_lock_timeout module.
- */
-function tide_edit_protection_update_8001() {
- if (!\Drupal::moduleHandler()
- ->moduleExists('content_lock_timeout')) {
- \Drupal::service('module_installer')->install(['content_lock_timeout']);
- }
- $contentTimeOutSettings = \Drupal::configFactory()
- ->getEditable('content_lock_timeout.settings');
- $contentTimeOutSettings->set('content_lock_timeout_minutes', '240');
- $contentTimeOutSettings->set('content_lock_timeout_on_edit', 1);
- $contentTimeOutSettings->save();
-}
-
-/**
- * Changes content_lock weight.
- */
-function tide_edit_protection_update_8002() {
- module_set_weight('content_lock', 1000);
-}
-
-/**
- * Adds node site filter to lock_content view.
- */
-function tide_edit_protection_update_8003() {
- if (!\Drupal::moduleHandler()->moduleExists('tide_site_restriction')) {
- return;
- }
- $site_filter =
- [
- 'id' => 'field_node_site_target_id',
- 'table' => 'node__field_node_site',
- 'field' => 'field_node_site_target_id',
- 'relationship' => 'none',
- 'group_type' => 'group',
- 'admin_label' => '',
- 'operator' => 'or',
- 'value' => [],
- 'group' => 1,
- 'exposed' => TRUE,
- 'expose' =>
- [
- 'operator_id' => 'field_node_site_target_id_op',
- 'label' => 'Sites',
- 'description' => '',
- 'use_operator' => FALSE,
- 'operator' => 'field_node_site_target_id_op',
- 'operator_limit_selection' => FALSE,
- 'operator_list' => [],
- 'identifier' => 'field_node_site_target_id',
- 'required' => FALSE,
- 'remember' => FALSE,
- 'multiple' => TRUE,
- 'remember_roles' =>
- [
- 'authenticated' => 'authenticated',
- 'anonymous' => '0',
- 'administrator' => '0',
- 'approver' => '0',
- 'site_admin' => '0',
- 'editor' => '0',
- 'previewer' => '0',
- 'event_author' => '0',
- 'grant_author' => '0',
- ],
- 'reduce' => FALSE,
- ],
- 'is_grouped' => FALSE,
- 'group_info' =>
- [
- 'label' => '',
- 'description' => '',
- 'identifier' => '',
- 'optional' => TRUE,
- 'widget' => 'select',
- 'multiple' => FALSE,
- 'remember' => FALSE,
- 'default_group' => 'All',
- 'default_group_multiple' => [],
- 'group_items' => [],
- ],
- 'reduce_duplicates' => FALSE,
- 'type' => 'select',
- 'limit' => TRUE,
- 'vid' => 'sites',
- 'hierarchy' => TRUE,
- 'error_message' => TRUE,
- 'plugin_id' => 'taxonomy_index_tid',
- ];
-
- $config = \Drupal::configFactory()
- ->getEditable('views.view.tide_locked_content')
- ->get('display');
- if (!isset($config['default']['display_options']['filters']['field_node_site_target_id'])) {
- $config['default']['display_options']['filters']['field_node_site_target_id'] = $site_filter;
- \Drupal::configFactory()
- ->getEditable('views.view.tide_locked_content')
- ->set('display', $config)
- ->save();
- }
-}
-/**
- * Assign `admin lock content view` permission to approvers.
- */
-function tide_edit_protection_update_8004() {
+ // Assign `admin lock content view` permission to approvers.
$approver = Role::load('approver');
if ($approver) {
$approver->grantPermission('admin lock content view');
$approver->save();
}
}
-
-/**
- * Updates uid_current form label.
- */
-function tide_edit_protection_update_8005() {
- $config = Drupal::configFactory()
- ->getEditable('views.view.tide_locked_content');
- $options = $config->get('display');
- if (isset($options['default']['display_options']['filters']['uid_current']['expose']['label'])) {
- $options['default']['display_options']['filters']['uid_current']['expose']['label'] = 'Is the user logged in right now?';
- $config->set('display', $options);
- $config->save();
- }
-}
diff --git a/modules/tide_edit_protection/tide_edit_protection.module b/modules/tide_edit_protection/tide_edit_protection.module
index d8d55152d..715c377e5 100644
--- a/modules/tide_edit_protection/tide_edit_protection.module
+++ b/modules/tide_edit_protection/tide_edit_protection.module
@@ -6,12 +6,12 @@
*/
use Drupal\Component\Utility\Html;
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ViewExecutable;
-use Drupal\user\Entity\User;
use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\user\Entity\User;
+use Drupal\views\ViewExecutable;
/**
* Implements hook_help().
diff --git a/modules/tide_jira/src/Plugin/QueueWorker/TideJiraProcessorBase.php b/modules/tide_jira/src/Plugin/QueueWorker/TideJiraProcessorBase.php
index 3a9c015a5..91b67e523 100644
--- a/modules/tide_jira/src/Plugin/QueueWorker/TideJiraProcessorBase.php
+++ b/modules/tide_jira/src/Plugin/QueueWorker/TideJiraProcessorBase.php
@@ -2,15 +2,15 @@
namespace Drupal\tide_jira\Plugin\QueueWorker;
+use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Queue\QueueWorkerBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\tide_jira\TideJiraConnector;
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\Core\Queue\SuspendQueueException;
use Drupal\Core\State\StateInterface;
-use Drupal\Core\Config\ConfigFactory;
+use Drupal\tide_jira\TideJiraConnector;
use Drupal\tide_jira\TideJiraTicketModel;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Implements a queue worker for Tide Jira.
diff --git a/modules/tide_jira/src/TideJiraAPI.php b/modules/tide_jira/src/TideJiraAPI.php
index b42f18d88..a4f70f95b 100644
--- a/modules/tide_jira/src/TideJiraAPI.php
+++ b/modules/tide_jira/src/TideJiraAPI.php
@@ -3,13 +3,13 @@
namespace Drupal\tide_jira;
use Drupal\Core\Config\ConfigFactory;
-use Drupal\node\NodeInterface;
-use Drupal\Core\Queue\QueueFactory;
+use Drupal\Core\Datetime\DateFormatter;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\tide_site_preview\TideSitePreviewHelper;
+use Drupal\Core\Queue\QueueFactory;
+use Drupal\node\NodeInterface;
use Drupal\tide_site\TideSiteHelper;
+use Drupal\tide_site_preview\TideSitePreviewHelper;
use Symfony\Component\HttpFoundation\RequestStack;
/**
diff --git a/modules/tide_jira/src/TideJiraConnector.php b/modules/tide_jira/src/TideJiraConnector.php
index 18c5edebb..c718f8953 100644
--- a/modules/tide_jira/src/TideJiraConnector.php
+++ b/modules/tide_jira/src/TideJiraConnector.php
@@ -3,10 +3,10 @@
namespace Drupal\tide_jira;
use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Logger\LoggerChannelFactoryInterface;
use Drupal\jira_rest\JiraRestWrapperService;
use JiraRestApi\Issue\IssueField;
-use Drupal\Core\Config\ConfigFactory;
/**
* Tide JIRA Connector class.
diff --git a/modules/tide_jira/tide_jira.info.yml b/modules/tide_jira/tide_jira.info.yml
index 7d8df7977..b7c50ecea 100644
--- a/modules/tide_jira/tide_jira.info.yml
+++ b/modules/tide_jira/tide_jira.info.yml
@@ -1,7 +1,7 @@
name: Tide Jira
type: module
description: Tide Jira integration
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
package: tide
dependencies:
- jira_rest:jira_rest
diff --git a/modules/tide_oauth/tide_oauth.info.yml b/modules/tide_oauth/tide_oauth.info.yml
index beb1b1766..d1ac9804f 100644
--- a/modules/tide_oauth/tide_oauth.info.yml
+++ b/modules/tide_oauth/tide_oauth.info.yml
@@ -2,7 +2,7 @@ name: Tide Simple OAuth
description: Provides Simple OAuth for Tide.
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- consumers:consumers
- simple_oauth:simple_oauth
diff --git a/modules/tide_oauth/tide_oauth.install b/modules/tide_oauth/tide_oauth.install
index 779c77427..8d8fe0f66 100644
--- a/modules/tide_oauth/tide_oauth.install
+++ b/modules/tide_oauth/tide_oauth.install
@@ -17,7 +17,7 @@ use Drupal\user\Entity\Role;
* Add the field_long_description field to Consumer entity display.
*/
function _tide_oauth_update_consumer_long_description_field() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
+ \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
// Update the UUID of field storage and field config.
$field_name = 'field_long_description';
@@ -140,7 +140,7 @@ function _tide_oauth_update_consumer_long_description_field() {
* Add the machine_name field to Consumer entity display.
*/
function _tide_oauth_update_consumer_machine_name_field() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
+ \Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
// Update the UUID of field storage and field config.
$field_name = 'machine_name';
diff --git a/modules/tide_paragraphs_enhanced_modal/js/paragraphs.enhanced_modal.js b/modules/tide_paragraphs_enhanced_modal/js/paragraphs.enhanced_modal.js
index 4f1d3971b..19c503551 100644
--- a/modules/tide_paragraphs_enhanced_modal/js/paragraphs.enhanced_modal.js
+++ b/modules/tide_paragraphs_enhanced_modal/js/paragraphs.enhanced_modal.js
@@ -3,18 +3,13 @@
* JS paragraphs.enhanced_modal.js.
*/
-(function ($, Drupal) {
+(function ($, Drupal, once) {
'use strict';
- /**
- * Click handler for clicking the enhance paragraph modal.
- *
- * @type {Drupal~behavior}
- */
Drupal.behaviors.paragraphsEnhancedModalAdd = {
attach: function (context) {
- $('.paragraphs-add-dialog-enhanced .paragraphs-add-dialog-row', context).once('add-click-handler').on('click', function (event) {
+ $(once('add-click-handler', '.paragraphs-add-dialog-enhanced .paragraphs-add-dialog-row', context)).on('click', function (event) {
var $button = $(this).find('input.button').first();
$button.trigger('mousedown');
// Stop default execution of click event.
@@ -24,4 +19,4 @@
}
};
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);
diff --git a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.info.yml b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.info.yml
index 6b679f897..7a026fe6c 100644
--- a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.info.yml
+++ b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.info.yml
@@ -2,7 +2,7 @@ name: Tide Paragraphs Enhanced Modal
description: Provides enhancements for modal dialog of paragraph widget.
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- paragraphs:paragraphs
config_devel:
diff --git a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.libraries.yml b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.libraries.yml
index bbcafd3c0..537e3fe8f 100644
--- a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.libraries.yml
+++ b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.libraries.yml
@@ -1,5 +1,5 @@
paragraphs.enhanced_modal:
- version: VERSION
+ version: 1.0
css:
theme:
css/paragraphs.enhanced_modal.css: {}
@@ -7,3 +7,6 @@ paragraphs.enhanced_modal:
js/paragraphs.enhanced_modal.js: {}
dependencies:
- paragraphs/drupal.paragraphs.modal
+ - core/drupal
+ - core/jquery
+ - core/once
diff --git a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.module b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.module
index 921929e34..665edf15c 100644
--- a/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.module
+++ b/modules/tide_paragraphs_enhanced_modal/tide_paragraphs_enhanced_modal.module
@@ -36,7 +36,7 @@ function tide_paragraphs_enhanced_modal_preprocess_paragraphs_add_dialog(&$varia
if (isset($variables['buttons'])) {
$variables['button_enhancements'] = [];
$placeholder_icon_path = \Drupal::service('extension.list.module')->getPath('tide_paragraphs_enhanced_modal') . '/icons/placeholder.svg';
- $placeholder_icon_url = file_create_url($placeholder_icon_path);
+ $placeholder_icon_url = \Drupal::service('file_url_generator')->generateAbsoluteString($placeholder_icon_path);
foreach (Element::children($variables['buttons']) as $key) {
$bundle_machine_name = $variables['buttons'][$key]['#bundle_machine_name'];
/** @var \Drupal\paragraphs\Entity\ParagraphsType $paragraph_type */
diff --git a/modules/tide_site_alert/config/optional/block.block.tide_site_alert_header.yml b/modules/tide_site_alert/config/optional/block.block.tide_site_alert_header.yml
index 77ae560ca..e8dcbf5c8 100644
--- a/modules/tide_site_alert/config/optional/block.block.tide_site_alert_header.yml
+++ b/modules/tide_site_alert/config/optional/block.block.tide_site_alert_header.yml
@@ -4,9 +4,9 @@ dependencies:
module:
- tide_site_alert
theme:
- - seven
+ - claro
id: tide_site_alert_header
-theme: seven
+theme: claro
region: header
weight: -100
provider: null
@@ -16,5 +16,5 @@ settings:
label: 'Tide Site Alert'
label_display: '0'
provider: tide_site_alert
- timeout: '5'
+ timeout: '600'
visibility: { }
diff --git a/modules/tide_site_alert/tide_site_alert.install b/modules/tide_site_alert/tide_site_alert.install
new file mode 100644
index 000000000..fa839413c
--- /dev/null
+++ b/modules/tide_site_alert/tide_site_alert.install
@@ -0,0 +1,27 @@
+getStorage('block');
+ $id = 'tide_site_alert_header';
+ $config_entity = $storage->load($id);
+ if ($config_entity !== NULL) {
+ $storage->delete([$config_entity]);
+ }
+}
+
+/**
+ * Update timeout to 10 mins.
+ */
+function tide_site_alert_update_10001() {
+ $tide_site_alert_header_block = \Drupal::configFactory()->getEditable('block.block.tide_site_alert_header');
+ $tide_site_alert_header_block->set('settings.timeout', 600)
+ ->save();
+}
diff --git a/modules/tide_spell_checker/README.md b/modules/tide_spell_checker/README.md
deleted file mode 100644
index a3be92490..000000000
--- a/modules/tide_spell_checker/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tide Spell Checker
-
diff --git a/modules/tide_spell_checker/composer.json b/modules/tide_spell_checker/composer.json
deleted file mode 100644
index 5409a9be0..000000000
--- a/modules/tide_spell_checker/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "dpc-sdp/tide_spell_checker",
- "description": "Tide Spell Checker integration",
- "type": "drupal-module"
-}
diff --git a/modules/tide_spell_checker/tide_spell_checker.info.yml b/modules/tide_spell_checker/tide_spell_checker.info.yml
deleted file mode 100644
index a20339156..000000000
--- a/modules/tide_spell_checker/tide_spell_checker.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Tide Spell Checker
-type: module
-description: Tide Spell Checker integration
-core_version_requirement: ^8.9 || ^9
-package: tide
-dependencies:
- - ckeditor_scayt:ckeditor_scayt
- - ckeditor_config:ckeditor_config
diff --git a/modules/tide_spell_checker/tide_spell_checker.install b/modules/tide_spell_checker/tide_spell_checker.install
deleted file mode 100644
index bb8a38253..000000000
--- a/modules/tide_spell_checker/tide_spell_checker.install
+++ /dev/null
@@ -1,60 +0,0 @@
-getEditable($config);
- // Insert Scayt inside Tools group toolbar.
- $rows = $editable_config->get('settings.toolbar.rows.0');
- if (isset($rows)) {
- $updated_rows = [];
-
- foreach ($rows as $key => $row) {
- if ($row['name'] === 'Tools' && !in_array('Scayt', $row['items'])) {
- array_splice($row['items'], 7, 0, 'Scayt');
- }
- $updated_rows[] = $row;
- }
-
- $editable_config->set('settings.toolbar.rows.0', $updated_rows);
- $editable_config->save();
- }
- // Setting Scayt plugins and customer id.
- $plugins = $editable_config->get('settings.plugins');
- if (isset($plugins)) {
- $plugins['customconfig'] = [
- 'ckeditor_custom_config' => '',
- ];
- $plugins['scayt'] = [
- 'scayt_autoStartup' => 1,
- 'scayt_sLang' => 'en_GB',
- 'scayt_disableOptionsStorage' => 'all',
- ];
- $editable_config->set('settings.plugins', $plugins);
- $editable_config->save();
- }
- // Update seckit module to allow spell check serivce.
- $seckit_config = $config_factory->getEditable('seckit.settings');
- $domain = 'svc.webspellchecker.net';
- $srcs = [
- 'seckit_xss.csp.script-src',
- 'seckit_xss.csp.default-src',
- 'seckit_xss.csp.style-src',
- 'seckit_xss.csp.img-src',
- ];
- foreach ($srcs as $src) {
- $seckit_str = $seckit_config->get($src);
- if (strpos($seckit_str, $domain) === FALSE) {
- $seckit_config->set($src, $seckit_str . ' ' . $domain);
- $seckit_config->save();
- }
- }
-}
diff --git a/modules/tide_spell_checker/tide_spell_checker.module b/modules/tide_spell_checker/tide_spell_checker.module
deleted file mode 100644
index b7c31deea..000000000
--- a/modules/tide_spell_checker/tide_spell_checker.module
+++ /dev/null
@@ -1,6 +0,0 @@
- $value) {
- if (str_contains($var, 'CKEDITOR_')) {
- $var = strtolower(trim(str_replace('CKEDITOR_', '', $var)));
- switch ($var) {
- case 'scayt_slang':
- $var = 'scayt_sLang';
- break;
-
- case 'forcepasteasplaintext':
- $var = 'forcePasteAsPlainText';
- break;
-
- case 'pastefilter':
- $var = 'pasteFilter';
- break;
- }
- $array_of_config[$var] = $value;
- }
- }
-}
-if (isset($array_of_config)) {
- foreach ($array_of_config as $key => $value) {
- $ckeditor_config = $ckeditor_config . "\r\n$key = \"$value\"";
- }
-}
-// Add ckeditor custom config.
-if ($ckeditor_config) {
- $config['editor.editor.rich_text']['settings']['plugins']['customconfig']['ckeditor_custom_config'] = $ckeditor_config;
-}
diff --git a/modules/tide_ui_restriction/config/install/config_perms.custom_perms_entity.administer_custom_block_types.yml b/modules/tide_ui_restriction/config/optional/config_perms.custom_perms_entity.administer_custom_block_types.yml
similarity index 100%
rename from modules/tide_ui_restriction/config/install/config_perms.custom_perms_entity.administer_custom_block_types.yml
rename to modules/tide_ui_restriction/config/optional/config_perms.custom_perms_entity.administer_custom_block_types.yml
diff --git a/modules/tide_ui_restriction/config/install/config_perms.custom_perms_entity.bulk_update_url_aliases.yml b/modules/tide_ui_restriction/config/optional/config_perms.custom_perms_entity.bulk_update_url_aliases.yml
similarity index 100%
rename from modules/tide_ui_restriction/config/install/config_perms.custom_perms_entity.bulk_update_url_aliases.yml
rename to modules/tide_ui_restriction/config/optional/config_perms.custom_perms_entity.bulk_update_url_aliases.yml
diff --git a/modules/tide_ui_restriction/src/EventSubscriber/TideAdminUIRedirectAlter.php b/modules/tide_ui_restriction/src/EventSubscriber/TideAdminUIRedirectAlter.php
index 57169274a..adb93be73 100644
--- a/modules/tide_ui_restriction/src/EventSubscriber/TideAdminUIRedirectAlter.php
+++ b/modules/tide_ui_restriction/src/EventSubscriber/TideAdminUIRedirectAlter.php
@@ -4,7 +4,7 @@
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\KernelEvents;
/**
@@ -26,7 +26,7 @@ public static function getSubscribedEvents() {
/**
* Redirects modules management page to 404.
*/
- public function onAdminModules(GetResponseEvent $event) {
+ public function onAdminModules(RequestEvent $event) {
$uri = $event->getRequest()->getRequestUri();
if ($uri == '/admin/modules' || $uri == '/admin/modules/uninstall') {
$response = new Response();
diff --git a/modules/tide_ui_restriction/tide_ui_restriction.info.yml b/modules/tide_ui_restriction/tide_ui_restriction.info.yml
index 30dadba7e..2f0435c16 100644
--- a/modules/tide_ui_restriction/tide_ui_restriction.info.yml
+++ b/modules/tide_ui_restriction/tide_ui_restriction.info.yml
@@ -1,7 +1,7 @@
name: Tide UI restriction
type: module
description: Admin UI restriction
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
package: tide
dependencies:
- config_perms:config_perms
diff --git a/modules/tide_ui_restriction/tide_ui_restriction.install b/modules/tide_ui_restriction/tide_ui_restriction.install
index 8801ab369..02641254c 100644
--- a/modules/tide_ui_restriction/tide_ui_restriction.install
+++ b/modules/tide_ui_restriction/tide_ui_restriction.install
@@ -14,38 +14,6 @@ function tide_ui_restriction_install($is_syncing) {
_tide_ui_restriction_tighten_permissions();
}
-/**
- * Tighten permissions.
- */
-function tide_ui_restriction_update_8001() {
- if (!\Drupal::moduleHandler()->moduleExists('config_perms')) {
- \Drupal::service('module_installer')->install(['config_perms']);
- }
-
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [
- drupal_get_path('module', 'tide_ui_restriction') . '/config/install',
- ];
- $configs = [
- 'config_perms.custom_perms_entity.administer_custom_block_types',
- 'config_perms.custom_perms_entity.bulk_update_url_aliases',
- ];
- foreach ($configs as $config) {
- try {
- $config_read = _tide_read_config($config, $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()
- ->getStorage('custom_perms_entity');
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
- catch (\Exception $exception) {
- watchdog_exception('tide_ui_restriction', $exception);
- }
- }
-
- _tide_ui_restriction_tighten_permissions();
-}
-
/**
* Tighten the default permissions.
*
@@ -57,6 +25,7 @@ function _tide_ui_restriction_tighten_permissions() {
$admin_only = ['administrator'];
$site_admin_only = ['administrator', 'site_admin'];
$approver_only = ['administrator', 'site_admin', 'approver'];
+ $auditor_only = ['site_auditor', 'administrator', 'site_admin'];
$editor_only = ['administrator', 'site_admin', 'approver', 'editor'];
$custom_perms = [
@@ -75,15 +44,13 @@ function _tide_ui_restriction_tighten_permissions() {
'access taxonomy overview' => $site_admin_only,
'administer taxonomy' => $site_admin_only,
'administer users' => $site_admin_only,
- 'access admin audit trail' => $site_admin_only,
- 'access event log track' => $site_admin_only,
+ 'access admin audit trail' => $auditor_only,
'administer pathauto' => $site_admin_only,
'administer redirect settings' => $site_admin_only,
'Bulk update url aliases' => $approver_only,
'access administration pages' => $editor_only,
- 'administer redirects' => $editor_only,
'administer url aliases' => $editor_only,
'create url aliases' => $editor_only,
];
diff --git a/modules/tide_ui_restriction/tide_ui_restriction.module b/modules/tide_ui_restriction/tide_ui_restriction.module
index 0a32b26b2..2a7068b6a 100644
--- a/modules/tide_ui_restriction/tide_ui_restriction.module
+++ b/modules/tide_ui_restriction/tide_ui_restriction.module
@@ -57,6 +57,7 @@ function tide_ui_restriction_admin_config_access_check_exclude($path) : bool {
'/admin/config/search',
'/admin/config/search/path',
'/admin/config/search/redirect',
+ '/admin/config/content/ckeditor-templates/template-selector/{editor}',
];
if (in_array($path, $paths, TRUE)) {
return TRUE;
diff --git a/modules/tide_ui_restriction/tide_ui_restriction.permissions.yml b/modules/tide_ui_restriction/tide_ui_restriction.permissions.yml
index 2e8526ccf..fe920acd2 100644
--- a/modules/tide_ui_restriction/tide_ui_restriction.permissions.yml
+++ b/modules/tide_ui_restriction/tide_ui_restriction.permissions.yml
@@ -1,3 +1,6 @@
access admin_config pages:
title: 'Access admin_config pages'
description: 'Allows users to access administration pages starting with /admin/config/.'
+'access event log track':
+ title: 'Access event log track'
+ description: 'Allow user to access event log track.'
diff --git a/modules/tide_user_expire/tide_user_expire.module b/modules/tide_user_expire/tide_user_expire.module
index 1c8de111a..4aaa4eff6 100644
--- a/modules/tide_user_expire/tide_user_expire.module
+++ b/modules/tide_user_expire/tide_user_expire.module
@@ -5,8 +5,8 @@
* Contains tide_user_expire.module.
*/
-use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Form\FormStateInterface;
use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
/**
diff --git a/modules/tide_workflow_notification/tide_workflow_notification.info.yml b/modules/tide_workflow_notification/tide_workflow_notification.info.yml
index 00a6312ed..3bea37e04 100644
--- a/modules/tide_workflow_notification/tide_workflow_notification.info.yml
+++ b/modules/tide_workflow_notification/tide_workflow_notification.info.yml
@@ -2,7 +2,7 @@ name: Tide Workflow Notification
description: Functionality to send notifications upon workflow state changes.
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- queue_mail:queue_mail
config_devel:
diff --git a/modules/tide_workflow_notification/tide_workflow_notification.module b/modules/tide_workflow_notification/tide_workflow_notification.module
index c0e86d2be..000857b45 100644
--- a/modules/tide_workflow_notification/tide_workflow_notification.module
+++ b/modules/tide_workflow_notification/tide_workflow_notification.module
@@ -8,7 +8,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\node\NodeInterface;
-module_load_include('inc', 'tide_workflow_notification', 'tide_workflow_notification.tokens');
+\Drupal::moduleHandler()->loadInclude('tide_workflow_notification', 'inc', 'tide_workflow_notification.tokens');
/**
* Implements hook_form_FORM_ID_alter().
diff --git a/modules/tide_workflow_notification/tide_workflow_notification.permissions.yml b/modules/tide_workflow_notification/tide_workflow_notification.permissions.yml
new file mode 100644
index 000000000..54362bd25
--- /dev/null
+++ b/modules/tide_workflow_notification/tide_workflow_notification.permissions.yml
@@ -0,0 +1,6 @@
+'use draft_needs_review transition':
+ title: 'Use draft_needs_review transition'
+ description: 'Allows user to use draft_needs_review transition.'
+'use needs_review_draft transition':
+ title: 'Use needs_review_draft transition'
+ description: 'Allows user to use needs_review_draft transition.'
diff --git a/src/Form/EntityArchiveForm.php b/src/Form/EntityArchiveForm.php
index a031f83a3..ea56506ee 100644
--- a/src/Form/EntityArchiveForm.php
+++ b/src/Form/EntityArchiveForm.php
@@ -3,10 +3,10 @@
namespace Drupal\tide_core\Form;
use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Url;
use Drupal\workflows\Entity\Workflow;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/src/Form/NodeActionForm.php b/src/Form/NodeActionForm.php
index 8790f74d1..096ae7432 100644
--- a/src/Form/NodeActionForm.php
+++ b/src/Form/NodeActionForm.php
@@ -172,7 +172,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
*/
public function access(AccountInterface $account) {
return AccessResult::allowedIfHasPermission($this->currentUser, 'bypass node access')->orIf(
- AccessResult::allowedIfHasPermission($this->currentUser, 'administer nodes')
+ AccessResult::allowedIfHasPermission($this->currentUser, 'administer nodes')->orIf(AccessResult::allowedIfHasPermission($this->currentUser, 'tide node bulk update'))
);
}
diff --git a/src/Plugin/CKEditorPlugin/TideCallout.php b/src/Plugin/CKEditorPlugin/TideCallout.php
index 0d2e65394..f900a9e4f 100644
--- a/src/Plugin/CKEditorPlugin/TideCallout.php
+++ b/src/Plugin/CKEditorPlugin/TideCallout.php
@@ -2,8 +2,8 @@
namespace Drupal\tide_core\Plugin\CKEditorPlugin;
-use Drupal\ckeditor\CKEditorPluginInterface;
use Drupal\ckeditor\CKEditorPluginButtonsInterface;
+use Drupal\ckeditor\CKEditorPluginInterface;
use Drupal\Component\Plugin\PluginBase;
use Drupal\editor\Entity\Editor;
diff --git a/src/Plugin/EntityReferenceSelection/TideNodeSelection.php b/src/Plugin/EntityReferenceSelection/TideNodeSelection.php
index a17052609..9a23fd698 100644
--- a/src/Plugin/EntityReferenceSelection/TideNodeSelection.php
+++ b/src/Plugin/EntityReferenceSelection/TideNodeSelection.php
@@ -2,10 +2,10 @@
namespace Drupal\tide_core\Plugin\EntityReferenceSelection;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\tide_core\ContentEntitySortingTrait;
use Drupal\Component\Utility\Html;
+use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\node\Plugin\EntityReferenceSelection\NodeSelection;
+use Drupal\tide_core\ContentEntitySortingTrait;
/**
* Provides labels for the node entity type.
diff --git a/src/Plugin/Field/FieldWidget/PresetParagraphsWidget.php b/src/Plugin/Field/FieldWidget/PresetParagraphsWidget.php
index 13f1f819b..e0f978963 100644
--- a/src/Plugin/Field/FieldWidget/PresetParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/PresetParagraphsWidget.php
@@ -2,13 +2,13 @@
namespace Drupal\tide_core\Plugin\Field\FieldWidget;
-use Drupal\paragraphs\Plugin\Field\FieldWidget\ParagraphsWidget;
use Drupal\Component\Utility\Html;
use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\FieldFilteredMarkup;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\paragraphs\Plugin\Field\FieldWidget\ParagraphsWidget;
/**
* Plugin implementation of the 'entity_reference paragraphs' widget.
diff --git a/src/Plugin/Linkit/Matcher/PhoneMatcher.php b/src/Plugin/Linkit/Matcher/PhoneMatcher.php
new file mode 100644
index 000000000..a77f31aa8
--- /dev/null
+++ b/src/Plugin/Linkit/Matcher/PhoneMatcher.php
@@ -0,0 +1,36 @@
+validate($string)) {
+ $suggestion = new DescriptionSuggestion();
+ $suggestion->setLabel($this->t('Phone number: @tel', ['@tel' => $string]))
+ ->setPath('tel:' . Html::escape($string))
+ ->setGroup($this->t('Phone'));
+ $suggestions->addSuggestion($suggestion);
+ }
+ return $suggestions;
+ }
+
+}
diff --git a/src/Plugin/views/field/SortedRolesViewsField.php b/src/Plugin/views/field/SortedRolesViewsField.php
new file mode 100644
index 000000000..8e4ac36bf
--- /dev/null
+++ b/src/Plugin/views/field/SortedRolesViewsField.php
@@ -0,0 +1,56 @@
+items = [];
+
+ foreach ($values as $result) {
+ $uids[] = $this->getValue($result);
+ }
+
+ if ($uids) {
+ $roles = user_roles();
+ asort($roles);
+ $result = $this->database->query(
+ 'SELECT [u].[entity_id] AS [uid], [u].[roles_target_id] AS [rid]
+ FROM {user__roles} [u]
+ WHERE [u].[entity_id]
+ IN ( :uids[] ) AND [u].[roles_target_id]
+ IN ( :rids[] )', [':uids[]' => $uids, ':rids[]' => array_keys($roles)]
+ );
+ foreach ($result as $role) {
+ $this->items[$role->uid][$role->rid]['role'] = $roles[$role->rid]->label();
+ $this->items[$role->uid][$role->rid]['rid'] = $role->rid;
+ }
+ // Sort the roles for each user by role weight.
+ $ordered_roles = array_flip(array_keys($roles));
+ foreach ($this->items as &$user_roles) {
+ // Create an array of rids that the user has in the role weight order.
+ $sorted_keys = array_intersect_key($ordered_roles, $user_roles);
+ // Merge with the unsorted array of role information which has the
+ // effect of sorting it.
+ $user_roles = array_merge($sorted_keys, $user_roles);
+ }
+ }
+ }
+
+}
diff --git a/src/Plugin/views/filter/EnhancedMineTypeFilter.php b/src/Plugin/views/filter/EnhancedMineTypeFilter.php
index 8bec59e2a..350cb9406 100644
--- a/src/Plugin/views/filter/EnhancedMineTypeFilter.php
+++ b/src/Plugin/views/filter/EnhancedMineTypeFilter.php
@@ -2,9 +2,9 @@
namespace Drupal\tide_core\Plugin\views\filter;
+use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\filter\InOperator;
use Drupal\views\ViewExecutable;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
/**
* Enhanced MIME Type Filter.
diff --git a/src/TideCoreOperation.php b/src/TideCoreOperation.php
new file mode 100644
index 000000000..499b07efd
--- /dev/null
+++ b/src/TideCoreOperation.php
@@ -0,0 +1,236 @@
+ $term,
+ 'vid' => $vid,
+ 'parent' => [],
+ ])->save();
+ }
+ }
+
+ /**
+ * Update default Editorial workflow of Content Moderation.
+ */
+ public function updateEditorialWorkflow() {
+ $editorial_workflow = Workflow::load('editorial');
+ if ($editorial_workflow) {
+ $type_settings = [
+ 'states' => [
+ 'draft' => [
+ 'label' => 'Draft',
+ 'published' => FALSE,
+ 'default_revision' => FALSE,
+ 'weight' => -10,
+ ],
+ 'needs_review' => [
+ 'published' => FALSE,
+ 'default_revision' => FALSE,
+ 'label' => 'Needs Review',
+ 'weight' => -9,
+ ],
+ 'published' => [
+ 'label' => 'Published',
+ 'published' => TRUE,
+ 'default_revision' => TRUE,
+ 'weight' => -8,
+ ],
+ 'archived' => [
+ 'label' => 'Archived',
+ 'weight' => -7,
+ 'published' => FALSE,
+ 'default_revision' => TRUE,
+ ],
+ 'archive_pending' => [
+ 'label' => 'Archive pending',
+ 'published' => FALSE,
+ 'default_revision' => FALSE,
+ 'weight' => -6,
+ ],
+ ],
+ 'transitions' => [
+ 'create_archive_pending' => [
+ 'label' => 'Archive pending',
+ 'from' => ['draft', 'published', 'needs_review'],
+ 'to' => 'archive_pending',
+ 'weight' => -11,
+ ],
+ 'create_new_draft' => [
+ 'label' => 'Create New Draft',
+ 'from' => ['draft', 'published', 'archive_pending'],
+ 'to' => 'draft',
+ 'weight' => -10,
+ ],
+ 'needs_review' => [
+ 'label' => 'Needs Review',
+ 'from' => ['draft', 'archive_pending'],
+ 'to' => 'needs_review',
+ 'weight' => -9,
+ ],
+ 'needs_review_draft' => [
+ 'label' => 'Send back to Draft',
+ 'from' => ['needs_review'],
+ 'to' => 'draft',
+ 'weight' => -8,
+ ],
+ 'publish' => [
+ 'label' => 'Publish',
+ 'from' => ['draft', 'needs_review', 'published'],
+ 'to' => 'published',
+ 'weight' => -7,
+ ],
+ 'archive' => [
+ 'label' => 'Archive',
+ 'from' => ['published'],
+ 'to' => 'archived',
+ 'weight' => -6,
+ ],
+ 'archived_draft' => [
+ 'label' => 'Restore to Draft',
+ 'from' => ['archived'],
+ 'to' => 'draft',
+ 'weight' => -5,
+ ],
+ 'archived_published' => [
+ 'label' => 'Restore',
+ 'from' => ['archived', 'archive_pending'],
+ 'to' => 'published',
+ 'weight' => -4,
+ ],
+ ],
+ 'entity_types' => [],
+ ];
+ $editorial_workflow->set('type_settings', $type_settings);
+ $editorial_workflow->save();
+ }
+ }
+
+ /**
+ * Update authenticated user permission.
+ */
+ public function updateAuthenticatedUserPermission() {
+ $permissions = [
+ 'access content',
+ 'edit own field_business_contact_number',
+ 'edit own field_business_name',
+ 'view media',
+ 'view own field_business_contact_number',
+ 'view own field_business_name',
+ ];
+ if (Role::load('authenticated') && !is_null(Role::load('authenticated'))) {
+ user_role_grant_permissions(Role::load('authenticated')->id(), $permissions);
+ }
+ }
+
+ /**
+ * Deletes unsupported actions from /admin/contents view.
+ */
+ public function deleteUnsupportedActions() {
+ // Actions whose provided by drupal core.
+ $unsupported_actions = [
+ 'system.action.node_make_sticky_action',
+ 'system.action.node_make_unsticky_action',
+ 'system.action.node_promote_action',
+ 'system.action.node_save_action',
+ 'system.action.node_unpromote_action',
+ 'system.action.node_publish_action',
+ 'system.action.node_unpublish_action',
+ 'system.action.pathauto_update_alias_node',
+ ];
+ $config_storage = \Drupal::service('config.storage');
+ $config_factory = \Drupal::configFactory();
+ foreach ($unsupported_actions as $action) {
+ if ($config_storage->read($action)) {
+ $config = $config_factory->getEditable($action);
+ $config->delete();
+ }
+ }
+ }
+
+ /**
+ * Add contact field to user account form display.
+ */
+ public function addBusinessFieldsToUserAccountForm() {
+ $config_factory = \Drupal::configFactory();
+ $config = $config_factory->getEditable('core.entity_form_display.user.user.default');
+ $config->set('content.field_notes.weight', 12);
+ $config->set('content.field_notes.type', 'text_textarea');
+ $config->set('content.field_notes.region', 'content');
+ $config->set('content.field_notes.settings.rows', 5);
+ $config->set('content.field_notes.settings.placeholder', '');
+ $config->set('content.field_notes.third_party_settings', []);
+
+ $config->set('content.field_business_name.weight', 10);
+ $config->set('content.field_business_name.type', 'string_textfield');
+ $config->set('content.field_business_name.region', 'content');
+ $config->set('content.field_business_name.settings.size', 60);
+ $config->set('content.field_business_name.settings.placeholder', '');
+ $config->set('content.field_business_name.third_party_settings', []);
+
+ $config->set('content.field_business_contact_number.weight', 11);
+ $config->set('content.field_business_contact_number.type', 'telephone_default');
+ $config->set('content.field_business_contact_number.region', 'content');
+ $config->set('content.field_business_contact_number.settings.placeholder', '');
+ $config->set('content.field_business_contact_number.third_party_settings', []);
+
+ $config->save();
+ }
+
+ /**
+ * Updates files view.
+ */
+ public function useCustomFilesView() {
+ module_load_include('inc', 'tide_core', 'includes/helpers');
+ $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
+ $config_read = _tide_read_config('views.view.enhanced_files', $config_location, TRUE);
+ $storage = \Drupal::entityTypeManager()->getStorage('view');
+ if ($storage->load('enhanced_files') == NULL) {
+ $config_entity = $storage->createFromStorageRecord($config_read);
+ $config_entity->save();
+ }
+ $view = View::load('files');
+ if ($view) {
+ if ($view->status() == TRUE) {
+ $view->setStatus(FALSE);
+ $view->save();
+ }
+ }
+ }
+
+ /**
+ * Changes the diff modules general_settings.revision_pager_limit to 16.
+ */
+ public function chagneDiffSettings() {
+ if (\Drupal::moduleHandler()->moduleExists('diff')) {
+ $config = \Drupal::configFactory()
+ ->getEditable('diff.settings');
+ if (!$config->isNew() && !empty($config->get('general_settings.revision_pager_limit'))) {
+ $config->set('general_settings.revision_pager_limit', 16)->save();
+ }
+ }
+ }
+
+}
diff --git a/src/TideEntityUpdateHelper.php b/src/TideEntityUpdateHelper.php
index f8d2926d4..8aa45e20d 100644
--- a/src/TideEntityUpdateHelper.php
+++ b/src/TideEntityUpdateHelper.php
@@ -172,4 +172,54 @@ public function getFieldStorageDefinitions(string $entity_type_id) {
return $this->entityFieldManager->getFieldStorageDefinitions($entity_type_id);
}
+ /**
+ * Gets the entity type's most recently installed field storage definitions.
+ *
+ * During the application lifetime, field storage definitions can change. For
+ * example, updated code can be deployed. The getFieldStorageDefinitions()
+ * method will always return the definitions as determined by the current
+ * codebase. This method, however, returns what the definitions were when the
+ * last time that one of the
+ * \Drupal\Core\Field\FieldStorageDefinitionListenerInterface events was last
+ * fired and completed successfully. In other words, the definitions that
+ * the entity type's handlers have incorporated into the application state.
+ * For example, if the entity type's storage handler is SQL-based, the
+ * definitions for which database tables were created.
+ *
+ * Application management code can check if getFieldStorageDefinitions()
+ * differs from getLastInstalledFieldStorageDefinitions() and decide whether
+ * to:
+ * - Invoke the appropriate
+ * \Drupal\Core\Field\FieldStorageDefinitionListenerInterface
+ * events so that handlers react to the new definitions.
+ * - Raise a warning that the application state is incompatible with the
+ * codebase.
+ * - Perform some other action.
+ *
+ * @param string $entity_type_id
+ * The entity type ID.
+ *
+ * @return \Drupal\Core\Field\FieldStorageDefinitionInterface[]
+ * The array of installed field storage definitions for the entity type,
+ * keyed by field name.
+ *
+ * @see \Drupal\Core\Entity\EntityTypeListenerInterface
+ */
+ public function getOriginalStorageDefinitions(string $entity_type_id) {
+ return $this->lastInstalledSchema->getLastInstalledFieldStorageDefinitions($entity_type_id);
+ }
+
+ /**
+ * Performs a field storage definition update.
+ */
+ public function updateFieldTable(string $entity_type_id, string $field_name) {
+ $storage_definitions = $this->entityFieldManager->getFieldStorageDefinitions($entity_type_id);
+ $original_storage_definitions = $this->lastInstalledSchema->getLastInstalledFieldStorageDefinitions($entity_type_id);
+ $storage_definition = $storage_definitions[$field_name] ?? NULL;
+ $original_storage_definition = $original_storage_definitions[$field_name] ?? NULL;
+ if ($storage_definition && $original_storage_definition) {
+ $this->fieldStorageDefinitionListener->onFieldStorageDefinitionUpdate($storage_definition, $original_storage_definition);
+ }
+ }
+
}
diff --git a/tests/behat/features/bulk_update.feature b/tests/behat/features/bulk_update.feature
new file mode 100644
index 000000000..85c6673c4
--- /dev/null
+++ b/tests/behat/features/bulk_update.feature
@@ -0,0 +1,29 @@
+@tide
+Feature: Bulk update
+
+ @api @javascript
+ Scenario: Users with approver should be able to bulk publish content.
+ Given test content:
+ | title | body |
+ | test_1 | demo 1 |
+ | test_2 | demo 2 |
+ Given I am logged in as a user with the "Approver" role
+ When I visit "/admin/content"
+ Then I check "edit-node-bulk-form-0"
+ Then I check "edit-node-bulk-form-1"
+ Then I select "Publish content" from "Action"
+ Then I press "Apply to selected items"
+ And I wait for 1 second
+ Then I press "Confirm"
+ And I wait for 180 seconds
+ Then I should see the text "Selected content has been processed"
+
+ # Load a user without the permission.
+ Given I am logged in as a user with the "Contributor" role
+ When I visit "/admin/content"
+ Then I check "edit-node-bulk-form-0"
+ Then I check "edit-node-bulk-form-1"
+ Then I select "Publish content" from "Action"
+ Then I press "Apply to selected items"
+ And I wait for 1 second
+ Then I should see the text "The requested page could not be found."
diff --git a/tests/behat/features/cms_support.feature b/tests/behat/features/cms_support.feature
index 1a0dd9335..2318e024f 100644
--- a/tests/behat/features/cms_support.feature
+++ b/tests/behat/features/cms_support.feature
@@ -1,4 +1,4 @@
-@tide @install:toolbar
+@tide @install:tide_cms_support
Feature: CMS Support
@api
diff --git a/tests/behat/features/roles_list.feature b/tests/behat/features/roles_list.feature
new file mode 100644
index 000000000..b488a787f
--- /dev/null
+++ b/tests/behat/features/roles_list.feature
@@ -0,0 +1,18 @@
+@tide
+Feature: Roles
+
+ Ensure that users's role are listed in the profile page
+
+ @api
+ Scenario Outline: User with assigned roles visits profile page
+ Given I am logged in as a user with the "
" role
+ And I visit "/user"
+ Then the ".views-label-sorted-roles-views-field" element should contain "Roles"
+ Examples:
+ | role |
+ | administrator |
+ | site_admin |
+ | approver |
+ | editor |
+ | previewer |
+ | site_auditor |
diff --git a/tests/behat/features/tide_user_expire.feature b/tests/behat/features/tide_user_expire.feature
index a99178e48..12f8a62c7 100644
--- a/tests/behat/features/tide_user_expire.feature
+++ b/tests/behat/features/tide_user_expire.feature
@@ -1,4 +1,4 @@
-@tide_core
+@tide_core @install:tide_user_expire
Feature: Data Driven Fields for the user expire
Ensure that user expire email notification template exist.
diff --git a/tests/behat/features/wysiwyg.blockquote_template.feature b/tests/behat/features/wysiwyg.blockquote_template.feature
index da85f58aa..09dee67c0 100644
--- a/tests/behat/features/wysiwyg.blockquote_template.feature
+++ b/tests/behat/features/wysiwyg.blockquote_template.feature
@@ -6,7 +6,7 @@ Feature: WYSIWYG Blockquote template
@api
Scenario: User with permission can see WYSIWYG Blockquote template.
Given I am logged in as a user with the "administrator" role
- And I visit "admin/config/content/wysiwyg-templates"
+ And I visit "admin/config/content/ckeditor-templates"
Then I should see "Blockquote"
@api @javascript @skipped
diff --git a/tests/behat/features/wysiwyg.buttons_template.feature b/tests/behat/features/wysiwyg.buttons_template.feature
index 4cc322986..538451790 100644
--- a/tests/behat/features/wysiwyg.buttons_template.feature
+++ b/tests/behat/features/wysiwyg.buttons_template.feature
@@ -6,11 +6,11 @@ Feature: WYSIWYG Blockquote template
@api
Scenario: User with permission can see WYSIWYG buttons template.
Given I am logged in as a user with the "administrator" role
- And I visit "admin/config/content/wysiwyg-templates"
+ And I visit "admin/config/content/ckeditor-templates"
Then I should see "Primary Button"
And I should see "Secondary Button"
- @api @javascript
+ @api @javascript @skipped
Scenario Outline: User with permission can add button WYSIWYG editor.
Given I am logged in as a user with the "Approver" role
When I go to "node/add/test"
diff --git a/tests/behat/features/wysiwyg.embedded_maps.feature b/tests/behat/features/wysiwyg.embedded_maps.feature
index 4b889267a..f9b935516 100644
--- a/tests/behat/features/wysiwyg.embedded_maps.feature
+++ b/tests/behat/features/wysiwyg.embedded_maps.feature
@@ -4,7 +4,7 @@ Feature: Embedded Maps Feature
As a user with access to Admin Text and Rich Text formats,
I would like to embed Google Map using WYSIWYG editor.
- @api @javascript
+ @api @javascript @skipped
Scenario: Admin Text formats provide embedding of a Google Map using WYSIWYG editor.
Given I am logged in as a user with the "Approver" role
When I go to "node/add/test"
diff --git a/tests/behat/features/wysiwyg.toolbar.feature b/tests/behat/features/wysiwyg.toolbar.feature
index 51c098aa9..d06860118 100644
--- a/tests/behat/features/wysiwyg.toolbar.feature
+++ b/tests/behat/features/wysiwyg.toolbar.feature
@@ -3,7 +3,7 @@ Feature: WYSIWYG toolbar configuration
As an Approver or Editor, I want to to have access to all configured WYSIWYG buttons.
- @api @javascript @trait:VisibilityTrait
+ @api @javascript @trait:VisibilityTrait @skipped
Scenario: Rich Text format has expected WYSIWYG buttons
Given I am logged in as a user with the "create test content, use text format rich_text" permissions
When I go to "node/add/test"
@@ -40,7 +40,7 @@ Feature: WYSIWYG toolbar configuration
And I should see a visible "#cke_edit-body-0-value .cke_top .cke_button__templateselector" element
And I should not see a visible "#cke_edit-body-0-value .cke_top .cke_button__wenzgmap" element
- @api @javascript
+ @api @javascript @skipped
Scenario: Admin Text format has expected WYSIWYG buttons
Given I am logged in as a user with the "create test content, use text format admin_text" permissions
When I go to "node/add/test"
@@ -78,7 +78,7 @@ Feature: WYSIWYG toolbar configuration
And I should see a visible "#cke_edit-body-0-value .cke_top .cke_button__wenzgmap" element
And I should see a visible "#cke_edit-body-0-value .cke_top .cke_button__iframe" element
- @api @javascript
+ @api @javascript @skipped
Scenario: Plain Text format has no WYSIWYG buttons
Given I am logged in as a user with the "create test content" permissions
When I go to "node/add/test"
diff --git a/tide_core.info.yml b/tide_core.info.yml
index 012e9cfae..548ab30cc 100644
--- a/tide_core.info.yml
+++ b/tide_core.info.yml
@@ -2,12 +2,12 @@ name: 'Tide Core'
description: 'Provides core components required by other features.'
type: module
package: Tide
-core_version_requirement: ^8.9 || ^9
+core_version_requirement: ^9 || ^10
dependencies:
- address:address
- allowed_formats:allowed_formats
- better_exposed_filters:better_exposed_filters
- - ckeditor_iframe:ckeditor_iframe
+ - ckeditor5_embedded_content:ckeditor5_embedded_content
- clamav:clamav
- config_split:config_split
- config_update:config_update
@@ -16,7 +16,7 @@ dependencies:
- drupal:block
- drupal:block_content
- drupal:content_moderation
- - drupal:ckeditor
+ - drupal:ckeditor5
- drupal:datetime_range
- drupal:dynamic_page_cache
- drupal:entity_embed
@@ -29,10 +29,14 @@ dependencies:
- drupal:taxonomy
- drupal:telephone
- drupal:text
+ - drupal:toolbar
+ - drupal:token
- drupal:user
+ - drupal:user_created_by_field
+ - drupal:user_expire
+ - drupal:views
+ - drupal:views_data_export
- drupal:workflows
- - drupal:hal
- - drupal:token
- editor_advanced_link:editor_advanced_link
- entity_browser:entity_browser
- entity_browser:entity_browser_entity_form
@@ -49,7 +53,6 @@ dependencies:
- admin_audit_trail:admin_audit_trail_workflows
- admin_audit_trail:admin_audit_trail_block_content
- admin_audit_trail:admin_audit_trail_redirect
- - fakeobjects:fakeobjects
- fast_404:fast404
- link_field_autocomplete_filter:link_field_autocomplete_filter
- linkit:linkit
@@ -68,21 +71,21 @@ dependencies:
- seckit:seckit
- simple_sitemap:simple_sitemap
- tablefield:tablefield
+ - tide_ckeditor:tide_ckeditor
- token_conditions:token_conditions
- token_filter:token_filter
- twig_field_value:twig_field_value
- views_menu_children_filter:views_menu_children_filter
- viewsreference:viewsreference
- - wysiwyg_template:wysiwyg_template
- - wysiwyg_template:wysiwyg_template_core
- scheduled_transitions:scheduled_transitions
- dynamic_entity_reference:dynamic_entity_reference
- admin_audit_trail:admin_audit_trail
- - user_expire:user_expire
+ - username_enumeration_prevention:username_enumeration_prevention
- field_permissions:field_permissions
- content_lock:content_lock
+ - ckeditor_templates:ckeditor_templates
themes:
- - seven
+ - claro
config_devel:
install:
- core.entity_form_display.paragraph.accordion.default
@@ -97,6 +100,9 @@ config_devel:
- core.entity_view_display.paragraph.accordion.preview
- core.entity_view_display.paragraph.accordion_content.default
- core.entity_view_display.paragraph.accordion_content.preview
+ - ckeditor_templates.ckeditor_templates.blockquote
+ - ckeditor_templates.ckeditor_templates.primary_button
+ - ckeditor_templates.ckeditor_templates.secondary_button
- field.field.paragraph.accordion.field_paragraph_accordion
- field.field.paragraph.accordion.field_paragraph_accordion_style
- field.field.paragraph.accordion.field_paragraph_title
@@ -104,6 +110,9 @@ config_devel:
- field.field.paragraph.accordion_content.field_paragraph_accordion_name
- field.field.paragraph.links.field_paragraph_link
- field.field.paragraph.related_links.field_paragraph_link
+ - field.field.user.user.field_business_contact_number
+ - field.field.user.user.field_business_name
+ - field.field.user.user.field_notes
- field.storage.node.field_audience
- field.storage.node.field_featured_image
- field.storage.node.field_landing_page_intro_text
@@ -159,23 +168,19 @@ config_devel:
- user.role.previewer
- user.role.site_admin
- workflows.workflow.editorial
- - wysiwyg_template.wysiwyg_template.blockquote
- - wysiwyg_template.wysiwyg_template.primary_button
- - wysiwyg_template.wysiwyg_template.secondary_button
- field.storage.block_content.field_tags
- field.storage.block_content.field_topic
- field.storage.user.field_business_contact_number
- field.storage.user.field_business_name
- field.storage.user.field_notes
optional:
- - block.block.seven_breadcrumbs
- - block.block.seven_content
- - block.block.seven_local_actions
- - block.block.seven_login
- - block.block.seven_messages
- - block.block.seven_page_title
- - block.block.seven_primary_local_tasks
- - block.block.seven_secondary_local_tasks
+ - block.block.claro_breadcrumbs
+ - block.block.claro_content
+ - block.block.claro_local_actions
+ - block.block.claro_messages
+ - block.block.claro_page_title
+ - block.block.claro_primary_local_tasks
+ - block.block.claro_secondary_local_tasks
- clamav.settings
- editor.editor.admin_text
- editor.editor.rich_text
diff --git a/tide_core.install b/tide_core.install
index b332e36ca..b7a72bcc1 100644
--- a/tide_core.install
+++ b/tide_core.install
@@ -5,1722 +5,90 @@
* Installation functions for Tide Core.
*/
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\paragraphs\Entity\ParagraphsType;
-use Drupal\pathauto\Entity\PathautoPattern;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\user\Entity\User;
-use Drupal\workflows\Entity\Workflow;
-use Drupal\Core\Config\FileStorage;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\scheduled_transitions\ScheduledTransitionsPermissions;
+use Drupal\tide_core\TideCoreOperation;
use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
use Drupal\user\UserInterface;
-use Drupal\node\Entity\NodeType;
-use Drupal\views\Entity\View;
/**
* Implements hook_install().
*/
function tide_core_install() {
- // Assign user 1 the "administrator" role.
- $user = User::load(1);
- $user->roles[] = 'administrator';
- $user->save();
-
- // Install and disable views.view.files. Will use views.view.enhanced_files.
- try {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- $config_read = _tide_read_config('views.view.files', $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()->getStorage('view');
- if ($storage->load('files') == NULL) {
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
- }
- catch (Exception $e) {
- watchdog_exception('tide_core', $e);
- }
-
- // Override default Plain Text format from Core.
- try {
- $plain_text = FilterFormat::load('plain_text');
- if ($plain_text) {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- _tide_import_single_config('filter.format.plain_text', $config_location);
- }
- }
- catch (Exception $exception) {
- watchdog_exception('tide_core', $exception);
- }
-
// Don't do anything else during config sync.
if (\Drupal::isConfigSyncing()) {
return;
}
+ // Assign user 1 the "administrator" role.
+ $user = User::load(1);
+ $user->roles[] = 'administrator';
+ $user->save();
+
// Restrict user registration to admin role creation.
\Drupal::configFactory()
->getEditable('user.settings')
->set('register', UserInterface::REGISTER_ADMINISTRATORS_ONLY)
->save(TRUE);
+ $tideCoreOperation = new TideCoreOperation();
// Creates terms for Topic vocabulary.
- _tide_core_create_topic_terms();
+ $tideCoreOperation->createTopicTermsVocabulary();
// Update default Editorial workflow of Content Moderation.
- _tide_core_update_editorial_workflow();
-
- $excluded = [
- 'tide_core_update_8015',
- 'tide_core_update_8038',
- 'tide_core_update_8043',
- ];
- $functions = get_defined_functions();
- foreach ($functions['user'] as $function) {
- if (strpos($function, 'tide_core_update_') === 0) {
- // We don't want the tide_core_update_8015 to run during the CI.
- if (in_array($function, $excluded)) {
- continue;
- }
- call_user_func($function);
- }
- }
-}
-
-/**
- * Creates terms for Topic vocabulary.
- */
-function _tide_core_create_topic_terms() {
- $vid = 'topic';
-
- $terms = [
- 'Arts',
- 'Business',
- 'Education',
- ];
- foreach ($terms as $term) {
- Term::create([
- 'name' => $term,
- 'vid' => $vid,
- 'parent' => [],
- ])->save();
- }
-}
-
-/**
- * Update default Editorial workflow of Content Moderation.
- */
-function _tide_core_update_editorial_workflow() {
- $editorial_workflow = Workflow::load('editorial');
- if ($editorial_workflow) {
- $type_settings = [
- 'states' => [
- 'draft' => [
- 'label' => 'Draft',
- 'published' => FALSE,
- 'default_revision' => FALSE,
- 'weight' => -10,
- ],
- 'needs_review' => [
- 'published' => FALSE,
- 'default_revision' => FALSE,
- 'label' => 'Needs Review',
- 'weight' => -9,
- ],
- 'published' => [
- 'label' => 'Published',
- 'published' => TRUE,
- 'default_revision' => TRUE,
- 'weight' => -8,
- ],
- 'archived' => [
- 'label' => 'Archived',
- 'weight' => -7,
- 'published' => FALSE,
- 'default_revision' => TRUE,
- ],
- 'archive_pending' => [
- 'label' => 'Archive pending',
- 'published' => FALSE,
- 'default_revision' => FALSE,
- 'weight' => -6,
- ],
- ],
- 'transitions' => [
- 'create_archive_pending' => [
- 'label' => 'Archive pending',
- 'from' => ['draft', 'published', 'needs_review'],
- 'to' => 'archive_pending',
- 'weight' => -11,
- ],
- 'create_new_draft' => [
- 'label' => 'Create New Draft',
- 'from' => ['draft', 'published', 'archive_pending'],
- 'to' => 'draft',
- 'weight' => -10,
- ],
- 'needs_review' => [
- 'label' => 'Needs Review',
- 'from' => ['draft', 'archive_pending'],
- 'to' => 'needs_review',
- 'weight' => -9,
- ],
- 'needs_review_draft' => [
- 'label' => 'Send back to Draft',
- 'from' => ['needs_review'],
- 'to' => 'draft',
- 'weight' => -8,
- ],
- 'publish' => [
- 'label' => 'Publish',
- 'from' => ['draft', 'needs_review', 'published'],
- 'to' => 'published',
- 'weight' => -7,
- ],
- 'archive' => [
- 'label' => 'Archive',
- 'from' => ['published'],
- 'to' => 'archived',
- 'weight' => -6,
- ],
- 'archived_draft' => [
- 'label' => 'Restore to Draft',
- 'from' => ['archived'],
- 'to' => 'draft',
- 'weight' => -5,
- ],
- 'archived_published' => [
- 'label' => 'Restore',
- 'from' => ['archived', 'archive_pending'],
- 'to' => 'published',
- 'weight' => -4,
- ],
- ],
- 'entity_types' => [],
- ];
- $editorial_workflow->set('type_settings', $type_settings);
- $editorial_workflow->save();
- }
-}
-
-/**
- * Implements hook_update_dependencies().
- */
-function tide_core_update_dependencies() {
- $dependencies = [];
- $dependencies['tide_core'][8007] = ['system' => 8805];
- $dependencies['tide_core'][8016] = ['system' => 8805];
-
- return $dependencies;
-}
-
-/**
- * Add field storage for Show Related Content and Show Social Sharing.
- */
-function tide_core_update_8001() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- _tide_import_single_config('field.storage.node.field_show_related_content', $config_location);
- _tide_import_single_config('field.storage.node.field_show_social_sharing', $config_location);
-}
-
-/**
- * Add field storage for Featured Image.
- */
-function tide_core_update_8002() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- _tide_import_single_config('field.storage.node.field_featured_image', $config_location);
-}
-
-/**
- * Enable Pathauto with default config.
- */
-function tide_core_update_8003() {
- /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['pathauto']);
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- _tide_import_single_config('pathauto.pattern.content_title', $config_location);
-}
-
-/**
- * Import ClamAV default config.
- */
-function tide_core_update_8004() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- _tide_import_single_config('clamav.settings', $config_location);
-}
-
-/**
- * Enable PRLP with default config.
- */
-function tide_core_update_8005() {
- /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['prlp']);
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- _tide_import_single_config('prlp.settings', $config_location);
-}
-
-/**
- * Enable the blockquote template available to all Node types.
- */
-function tide_core_update_8006() {
- if ($wysiwyg_template = \Drupal::entityTypeManager()
- ->getStorage('wysiwyg_template')
- ->load('blockquote')) {
- if (count($wysiwyg_template->getNodeTypes()) > 0) {
- $wysiwyg_template->set('node_types', [])->save();
- }
- }
-}
-
-/**
- * Delete and uninstall all scheduled_update entities.
- */
-function tide_core_update_8007() {
- if (\Drupal::moduleHandler()->moduleExists('scheduled_updates')) {
- // Delete content entities.
- $scheduled_updates = \Drupal::entityTypeManager()
- ->getStorage('scheduled_update')
- ->loadMultiple();
- foreach ($scheduled_updates as $scheduled_update) {
- $scheduled_update->delete();
- }
- // Delete configs.
- $scheduled_fields = ['scheduled_archiving', 'scheduled_publishing'];
- foreach ($scheduled_fields as $scheduled_field) {
- $field_storage = FieldStorageConfig::loadByName('node', $scheduled_field);
- if (!empty($field_storage)) {
- $bundles = $field_storage->getBundles();
- foreach ($bundles as $bundle) {
- $field = FieldConfig::loadByName('node', $bundle, $scheduled_field);
- if (!empty($field)) {
- $field->delete();
- }
- }
- field_purge_batch(10);
- }
- }
- }
-}
-
-/**
- * Change %uid token to %user in login redirect URL of PRLP settings.
- */
-function tide_core_update_8008() {
- // Issue https://www.drupal.org/project/prlp/issues/2785087 was fixed.
- $config = \Drupal::configFactory()->getEditable('prlp.settings');
- $login_destination = $config->get('login_destination');
- if (!empty($login_destination) && strpos($login_destination, '%uid') !== FALSE) {
- $login_destination = str_replace('%uid', '%user', $login_destination);
- $config->set('login_destination', $login_destination)->save();
- }
-}
-
-/**
- * Create pathauto pattern for Taxonomy terms.
- */
-function tide_core_update_8009() {
- if (!PathautoPattern::load('taxonomy_term')) {
- $pattern = PathautoPattern::create([
- 'id' => 'taxonomy_term',
- 'label' => 'Taxonomy term',
- 'type' => 'canonical_entities:taxonomy_term',
- 'pattern' => '[term:vocabulary:machine-name]/[term:name]',
- 'weight' => 0,
- ]);
- $pattern->save();
- }
- try {
- $batch = [
- 'title' => 'Bulk updating Term URL aliases',
- 'operations' => [
- ['Drupal\pathauto\Form\PathautoBulkUpdateForm::batchStart', []],
- [
- 'Drupal\pathauto\Form\PathautoBulkUpdateForm::batchProcess',
- [
- 'canonical_entities:taxonomy_term',
- 'all',
- ],
- ],
- ],
- 'finished' => 'Drupal\pathauto\Form\PathautoBulkUpdateForm::batchFinished',
- 'progressive' => FALSE,
- ];
-
- batch_set($batch);
- batch_process();
- }
- catch (\Exception $e) {
- \Drupal::logger("default")
- ->warning($e->getMessage());
- return;
- }
-}
-
-/**
- * Enable scheduled_transitions module.
- */
-function tide_core_update_8010() {
- if (!\Drupal::moduleHandler()->moduleExists('scheduled_transitions')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['scheduled_transitions']);
- }
-}
-
-/**
- * Update og:image metatag for node.
- */
-function tide_core_update_8011() {
- $metatag = \Drupal::configFactory()->getEditable('metatag.metatag_defaults.node');
- $og_image = $metatag->get('tags.og_image');
- if (!$og_image) {
- $metatag->set('tags.og_image', '[node:field_featured_image:entity:field_media_image:entity:url]')
- ->save();
- }
-}
-
-/**
- * Imports default permissions to approver and site_admin.
- */
-function tide_core_update_8012() {
- $roles = ['approver', 'site_admin'];
- $node_types = \Drupal::entityTypeManager()
- ->getStorage('node_type')
- ->loadMultiple();
- foreach ($roles as $role) {
- $permissions = [];
- foreach ($node_types as $type => $details) {
- $permissions[] = ScheduledTransitionsPermissions::viewScheduledTransitionsPermission('node', $type);
- $permissions[] = ScheduledTransitionsPermissions::addScheduledTransitionsPermission('node', $type);
- }
- $permissions[] = 'view all scheduled transitions';
- user_role_grant_permissions(Role::load($role)->id(), $permissions);
- }
-}
-
-/**
- * Fix permissions for Previewers.
- */
-function tide_core_update_8013() {
- $role = Role::load('previewer');
- if ($role) {
- $role->grantPermission('view all revisions');
- $role->grantPermission('view any unpublished content');
- $role->grantPermission('view latest version');
- $role->save();
- }
-}
-
-/**
- * Enable link_field_autocomplete_filter module.
- */
-function tide_core_update_8014() {
- if (!\Drupal::moduleHandler()->moduleExists('link_field_autocomplete_filter')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['link_field_autocomplete_filter']);
- }
-}
-
-/**
- * ClamAV configuration is updated to use central service.
- */
-function tide_core_update_8015() {
- if (\Drupal::moduleHandler()->moduleExists('clamav')) {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('clamav.settings');
- if ($config->isNew()) {
- return;
- }
- $config->set('scan_mode', 0);
- $config->set('mode_daemon_tcpip.hostname', 'clamav.sdp-central-clamav-master.svc.cluster.local');
- $config->save();
- }
-}
-
-/**
- * Fix permissions for to access video entity browser.
- */
-function tide_core_update_8016() {
- $role = Role::load('approver');
- if ($role) {
- $role->grantPermission('access tide_embedded_video_browser entity browser pages');
- $role->save();
- }
- $role = Role::load('editor');
- if ($role) {
- $role->grantPermission('access tide_embedded_video_browser entity browser pages');
- $role->save();
- }
- $role = Role::load('site_admin');
- if ($role) {
- $role->grantPermission('access tide_embedded_video_browser entity browser pages');
- $role->save();
- }
-}
-
-/**
- * Uninstall Scheduled Update modules.
- */
-function tide_core_update_8017() {
- $modules = [
- 'scheduled_updates',
- 'content_moderation_scheduled_updates',
- ];
-
- $module_installer = \Drupal::service('module_installer');
- $module_installer->uninstall($modules);
-}
-
-/**
- * Update Scheduled Transitions View.
- */
-function tide_core_update_8018() {
- $title_fields = [
- 'label',
- 'display.default.display_options.title',
- ];
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('views.view.scheduled_transitions');
- if ($config->isNew()) {
- return;
- }
- // Update field labels/titles.
- foreach ($title_fields as $field) {
- $config->set($field, 'Scheduled update list');
- }
- // Update empty View results.
- $config->set('display.default.display_options.empty.area.content.value', 'There are no scheduled updates yet.');
- $config->save();
-}
-
-/**
- * Update workflow to add archive pending SDPA-3781.
- */
-function tide_core_update_8019() {
- $config_factory = \Drupal::configFactory();
-
- // Updating the workflow states & transitions.
- $base_states = 'type_settings.states.';
- $base_transitions = 'type_settings.transitions.';
- $config = $config_factory->getEditable('workflows.workflow.editorial');
- if (!$config->isNew()) {
-
- $from_fields = [
- 'archive.from',
- 'archived_published.from',
- 'create_new_draft.from',
- 'needs_review.from',
- ];
-
- foreach ($from_fields as $field) {
- $form_value = [];
- $form_value = $config->get($base_transitions . $field);
- $form_value[] = 'archive_pending';
- $config->set($base_transitions . $field, $form_value);
- }
-
- $config->set($base_states . 'archive_pending', [
- 'label' => 'Archive pending',
- 'published' => FALSE,
- 'default_revision' => FALSE,
- 'weight' => -6,
- ]);
-
- $config->set($base_transitions . 'archive_pending', [
- 'label' => 'Archive pending',
- 'from' => [
- 'draft',
- 'published',
- 'needs_review',
- ],
- 'to' => 'archive_pending',
- 'weight' => -11,
- ]);
-
- $config->save();
- }
-
- // Updating the tide_workflow_notification.
- $notification_status = [
- 'draft_needs_review',
- 'draft_published',
- 'needs_review_draft',
- 'needs_review_published',
- 'published_archived',
- ];
-
- $current_string = [
- '([node:url])',
- '(https://www.vic.gov.au/how-publish-content-vicgovau).',
- ];
- $replacement_string = [
- ' - [node:url]',
- ' https://www.vic.gov.au/how-publish-content-vicgovau',
- ];
-
- $notification_fields = [
- 'draft_archive_pending',
- 'needs_review_archive_pending',
- 'published_archive_pending',
- 'archive_pending_archived',
- ];
-
- if (\Drupal::moduleHandler()->moduleExists('tide_workflow_notification')) {
- $config_notification = $config_factory->getEditable('tide_workflow_notification.settings');
- if (!$config_notification->isNew()) {
-
- // Update existing email template to fix link issue SDPSUP-1309.
- foreach ($notification_status as $status) {
- $current_status_message = $config_notification->get()['notifications'][$status]['message'];
- $updated_status_message = str_replace($current_string,
- $replacement_string, $current_status_message);
- $config_notification->set('notifications.' . $status . '.message',
- $updated_status_message);
- }
-
- // Add new email templates SDPA-3781.
- foreach ($notification_fields as $field) {
- $status = '';
- if ($field == 'draft_archive_pending') {
- $status = 'Draft';
- }
- if ($field == 'needs_review_archive_pending') {
- $status = 'Needs Review';
- }
- if ($field == 'published_archive_pending') {
- $status = 'Published';
- }
- $common_message = "Hi, [workflow-notification:recipient:display-name],\n\nThe status of the web content [node:title] - [node:url] has changed from " . $status . " to Archive pending.\n\nRemember to remove all menu links and navigation links to the page as well.\n\nNeed help? Read about workflow and roles https://www.vic.gov.au/publishing-workflow-Drupal-CMS\n";
- $archive_pending_message = "Hi [workflow-notification:recipient:display-name],\n\nThe status of your web content at [node:title] - [node:url] has changed from Archive pending to Archived. This is because:\n• your approver approved your request to archive it\n• the content had a scheduled archive date\n\nWhen a page is archived, it is no longer available to view on the internet, but SDP CMS users can still find it. If you have reason to make sure noone can access a page, you should request to have the content deleted from the CMS.\n\nNeed help? Read about workflow and roles https://www.vic.gov.au/publishing-workflow-Drupal-CMS\n";
-
- $config_notification->set('notifications.' . $field, [
- 'enabled' => 1,
- 'subject' => ($field !== 'archive_pending_archived') ? 'Archive of web content required: [node:title]' : 'Your web content has been archived: [node:title]',
- 'message' => ($field !== 'archive_pending_archived') ? $common_message : $archive_pending_message,
- ]);
- }
- $config_notification->save();
- }
- }
-
- // Add required permissions.
- $role = Role::load('editor');
- if ($role) {
- $role->grantPermission('use editorial transition archive_pending');
- $role->save();
- }
- $role = Role::load('site_admin');
- if ($role) {
- $role->grantPermission('use editorial transition archive_pending');
- $role->save();
- }
-}
-
-/**
- * Disable moderated_content view.
- */
-function tide_core_update_8020() {
- $view = \Drupal::entityTypeManager()->getStorage('view')->load('moderated_content');
- if ($view) {
- $view->setStatus(FALSE)->save();
- }
-}
-
-/**
- * Import tide_core_moderated_content_filters.
- */
-function tide_core_update_8021() {
- $view = 'views.view.tide_core_moderated_content_filters';
- $config_path = \Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install';
- $source = new FileStorage($config_path);
- $config_storage = \Drupal::service('config.storage');
- if ($source->read($view)) {
- $config_storage->write($view, $source->read($view));
- }
-}
-
-/**
- * Update accordion name and content fields to be mandatory.
- */
-function tide_core_update_8022() {
- $config_factory = \Drupal::configFactory();
- $fields = [
- 'field.field.paragraph.accordion_content.field_paragraph_accordion_name',
- 'field.field.paragraph.accordion_content.field_paragraph_accordion_body',
- ];
- foreach ($fields as $field) {
- $config = $config_factory->getEditable($field);
- if ($config->isNew()) {
- continue;
- }
- $config->set('required', TRUE);
- $config->save();
- }
-}
-
-/**
- * Changes the order of transitions list.
- */
-function tide_core_update_8023() {
- $order = [
- 'Create New Draft',
- 'Needs Review',
- 'Send back to Draft',
- 'Publish',
- 'Archive pending',
- 'Archive',
- 'Restore to Draft',
- 'Published',
- ];
- $editorial_workflow = Workflow::load('editorial');
- $type_settings = $editorial_workflow->get('type_settings');
- if (isset($type_settings['transitions']) && !empty($type_settings['transitions'])) {
- $keys = array_flip($order);
- foreach ($keys as $label => $key) {
- foreach ($type_settings['transitions'] as &$transition) {
- if ($label == $transition['label']) {
- $transition['weight'] = $key;
- continue;
- }
- }
- }
- $editorial_workflow->set('type_settings', $type_settings);
- $editorial_workflow->save();
- }
-}
-
-/**
- * Clean up cloudflare module.
- */
-function tide_core_update_8024() {
- $module_handler = \Drupal::moduleHandler();
- $module_exist = $module_handler->moduleExists('cloudflare');
- if ($module_exist) {
- \Drupal::service('module_installer')->uninstall(['cloudflare']);
- }
-}
-
-/**
- * Make user creation require admin approval.
- */
-function tide_core_update_8025() {
- // Don't do anything else during config sync.
- if (\Drupal::isConfigSyncing()) {
- return;
- }
-
- // Restrict user registration to admin role creation.
- \Drupal::configFactory()
- ->getEditable('user.settings')
- ->set('register', UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)
- ->save(TRUE);
-}
-
-/**
- * Update Scheduled Transitions View.
- */
-function tide_core_update_8026() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('views.view.scheduled_transitions');
- if ($config->isNew()) {
- return;
- }
-
- // Update empty View results.
- $config->set('display.default.display_options.empty.area.content.format', 'plain_text');
- $config->save();
-}
-
-/**
- * Enable username_enumeration_prevention module.
- */
-function tide_core_update_8027() {
- if (!\Drupal::moduleHandler()->moduleExists('username_enumeration_prevention')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['username_enumeration_prevention']);
- }
-}
-
-/**
- * Deletes unsupported actions from /admin/contents view.
- */
-function tide_core_update_8028() {
- // Actions whose provided by drupal core.
- $unsupported_actions = [
- 'system.action.node_make_sticky_action',
- 'system.action.node_make_unsticky_action',
- 'system.action.node_promote_action',
- 'system.action.node_save_action',
- 'system.action.node_unpromote_action',
- 'system.action.node_publish_action',
- 'system.action.node_unpublish_action',
- 'system.action.pathauto_update_alias_node',
- ];
- $config_storage = \Drupal::service('config.storage');
- $config_factory = \Drupal::configFactory();
- foreach ($unsupported_actions as $action) {
- if ($config_storage->read($action)) {
- $config = $config_factory->getEditable($action);
- if (!$config->isNew()) {
- $config->delete();
- }
- }
- }
-}
-
-/**
- * Imports custom actions.
- */
-function tide_core_update_8029() {
- $actions = [
- 'system.action.tide_core_archive',
- 'system.action.tide_core_publish',
- ];
- $config_path = \Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install';
- $source = new FileStorage($config_path);
- $config_storage = \Drupal::service('config.storage');
- foreach ($actions as $action) {
- $config_storage->write($action, $source->read($action));
- }
-}
-
-/**
- * Moves introduction up to top.
- */
-function tide_core_update_8030() {
- $node_types = NodeType::loadMultiple();
- $entity_view_display_storage = \Drupal::entityTypeManager()
- ->getStorage('entity_view_display');
- $skipped_items = ['title', 'uuid', 'created'];
- foreach ($node_types as $node_type_id => $node_type) {
- $order = [];
- $entity_view_display_id = 'node.' . $node_type_id . '.default';
- $field_name = 'field_' . $node_type_id . '_intro_text';
- // Some of fields named as field_{node_type_id}_intro_text,
- // so we have to deal with them separately.
- $entity_view_display = $entity_view_display_storage->loadByProperties([
- 'id' => $entity_view_display_id,
- 'bundle' => $node_type_id,
- 'content.' . $field_name . '.region' => 'content',
- ]);
- // Some of fields named as field_landing_page_intro_text.
- if (!$entity_view_display) {
- $field_name = 'field_landing_page_intro_text';
- $entity_view_display = $entity_view_display_storage->loadByProperties([
- 'id' => $entity_view_display_id,
- 'bundle' => $node_type_id,
- 'content.' . $field_name . '.region' => 'content',
- ]);
- }
- if ($entity_view_display) {
- foreach ($content = $entity_view_display[$entity_view_display_id]->get('content') as $key => $item) {
- if (in_array($key, $skipped_items)) {
- continue;
- }
- if ($key == 'content_moderation_control') {
- continue;
- }
- if ($key == $field_name) {
- $content[$field_name]['weight'] = $content['content_moderation_control']['weight'] + 1;
- }
- else {
- $content[$key]['weight'] += 1;
- }
- }
- $entity_view_display[$entity_view_display_id]->set('content', $content)->save();
- }
- }
-}
-
-/**
- * Changes allowed HTML list.
- */
-function tide_core_update_8031() {
- $config_factory = \Drupal::configFactory();
- $filter_ids = [
- 'filter.format.admin_text',
- 'filter.format.rich_text',
- ];
- foreach ($filter_ids as $filter_id) {
- $filter = $config_factory->getEditable($filter_id);
- if ($filter->isNew()) {
- continue;
- }
- $value = $filter->get('filters.filter_html.settings.allowed_html');
- $replaced = str_replace('', ' | ', $value);
- $replaced = str_replace(' | ', ' | ', $replaced);
- $filter->set('filters.filter_html.settings.allowed_html', $replaced);
- $filter->save();
- }
-}
-
-/**
- * Changes display of dates in CMS to Australian style DD/MM/YYYY.
- */
-function tide_core_update_8032() {
- // Changes media view.
- $media_view = \Drupal::configFactory()->getEditable('views.view.media');
- if ($media_view->isNew()) {
- return;
- }
- $display = $media_view->get('display');
- $display['default']['display_options']['fields']['changed']['settings']['date_format'] = 'custom';
- $display['default']['display_options']['fields']['changed']['settings']['custom_date_format'] = 'd/m/Y - H:i';
- $media_view->set('display', $display)->save();
-}
-
-/**
- * Enable addition of a second contact block on screen sidebar.
- */
-function tide_core_update_8033() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('field.storage.node.field_landing_page_contact');
- if ($config->isNew()) {
- return;
- }
- $config->set('cardinality', 2);
- $config->save();
-}
-
-/**
- * CMS UI improvements - Accordion.
- */
-function tide_core_update_8034() {
- // Changes select style.
- $entity_form_display = \Drupal::entityTypeManager()
- ->getStorage('entity_form_display')
- ->load('paragraph.accordion.default');
- $component = $entity_form_display->getComponent('field_paragraph_accordion_style');
- $component['type'] = 'options_buttons';
- $entity_form_display->setComponent('field_paragraph_accordion_style', $component);
- $entity_form_display->save();
- // Changes field_paragraph_accordion label.
- $field_paragraph_accordion = \Drupal::configFactory()
- ->getEditable('field.field.paragraph.accordion.field_paragraph_accordion');
- $field_paragraph_accordion->set('label', 'Accordion items')->save();
- // Changes field_paragraph_title label.
- $field_paragraph_title = \Drupal::configFactory()->getEditable('field.field.paragraph.accordion.field_paragraph_title');
- $field_paragraph_title->set('label', 'Accordion title')->save();
- $field_paragraph_title->set('description', 'Add a heading 2 if you need a heading above your accordions (not mandatory).')->save();
- // Changes accordion_content label.
- $field_paragraph_accordion_name = \Drupal::configFactory()->getEditable('field.field.paragraph.accordion_content.field_paragraph_accordion_name');
- $field_paragraph_accordion_name->set('label', 'Item title')->save();
-
- // Changes field_paragraph_accordion_style label to Style.
- $field_paragraph_accordion_style = \Drupal::configFactory()
- ->getEditable('field.field.paragraph.accordion.field_paragraph_accordion_style');
- $field_paragraph_accordion_style->set('label', 'Style');
- $field_paragraph_accordion_style->set('required', TRUE);
- $field_paragraph_accordion_style->set('description', 'Choose standard or numbered.');
- $field_paragraph_accordion_style->save();
-
- // Changes field_paragraph_accordion_style value.
- $config = \Drupal::configFactory()
- ->getEditable('field.storage.paragraph.field_paragraph_accordion_style');
- $settings = $config->get('settings');
- foreach ($settings['allowed_values'] as $key => &$allowed_value) {
- if ($allowed_value['label'] == 'Basic') {
- $allowed_value['label'] = 'Standard';
- }
- }
- // Changes field_paragraph_accordion_body label.
- $config->set('settings', $settings)->save();
- $field_paragraph_accordion_body = \Drupal::configFactory()
- ->getEditable('field.field.paragraph.accordion_content.field_paragraph_accordion_body');
- $field_paragraph_accordion_body->set('label', 'Item content')->save();
-}
-
-/**
- * Imports new format and editor.
- */
-function tide_core_update_8035() {
- $configs = [
- 'filter.format.summary_text' => 'filter_format',
- 'editor.editor.summary_text' => 'editor',
- ];
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- // Check if field already exported to config/sync.
- foreach ($configs as $config => $type) {
- $config_read = _tide_read_config($config, $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()->getStorage($type);
- $id = substr($config, strrpos($config, '.') + 1);
- if ($storage->load($id) == NULL) {
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
- }
-}
-
-/**
- * Approver, site_admin and editor should access to `summary_text` text format.
- */
-function tide_core_update_8036() {
- $permissions = [];
- $roles = ['approver', 'site_admin', 'editor'];
- $permissions[] = 'use text format summary_text';
- foreach ($roles as $role) {
- user_role_grant_permissions(Role::load($role)->id(), $permissions);
- }
-}
-
-/**
- * Add field storage for field_display_headings.
- */
-function tide_core_update_8037() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- $field_storage = 'field.storage.node.field_node_display_headings';
- $storage = \Drupal::entityTypeManager()->getStorage('field_storage_config');
- if (empty($storage->load('node.field_node_display_headings'))) {
- $config_read = _tide_read_config($field_storage, $config_location, TRUE);
- // Obtain the storage manager for field storage bases.
- // Create a new field from the yaml configuration and save.
- $storage->createFromStorageRecord($config_read)->save();
- }
-}
-
-/**
- * Add Callout template to wysiwyg toolbar.
- */
-function tide_core_update_8038() {
- $config_factory = \Drupal::configFactory();
- $configs = [
- 'editor.editor.admin_text',
- 'editor.editor.rich_text',
- ];
- foreach ($configs as $config) {
- $editable_config = $config_factory->getEditable($config);
- if ($editable_config->isNew()) {
- continue;
- }
- $rows = $editable_config->get('settings.toolbar.rows.0');
- if (!isset($rows)) {
- continue;
- }
- $updated_rows = [];
-
- foreach ($rows as $key => $row) {
- if ($row['name'] === 'Media' && !in_array('TideCallout', $row['items'])) {
- // Insert tide_callout inside Media group toolbar.
- array_splice($row['items'], 1, 0, 'TideCallout');
- }
- $updated_rows[] = $row;
- }
-
- $editable_config->set('settings.toolbar.rows.0', $updated_rows);
- $editable_config->save();
- }
-}
-
-/**
- * Enable ckeditor_liststyle module.
- */
-function tide_core_update_8039() {
- if (!\Drupal::moduleHandler()->moduleExists('ckeditor_liststyle')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['ckeditor_liststyle']);
- }
-
- // Update allowed HTML list.
- $config_factory = \Drupal::configFactory();
- $filter_ids = [
- 'filter.format.admin_text',
- 'filter.format.rich_text',
- ];
- foreach ($filter_ids as $filter_id) {
- $filter = $config_factory->getEditable($filter_id);
- if ($filter->isNew()) {
- continue;
- }
-
- $value = $filter->get('filters.filter_html.settings.allowed_html');
- $replaced = str_replace('', '', $value);
- $replaced = str_replace('', '', $replaced);
- $filter->set('filters.filter_html.settings.allowed_html', $replaced);
- $filter->save();
- }
-}
-
-/**
- * Editor should not have access to redirects.
- */
-function tide_core_update_8040() {
- $role = 'editor';
- $permissions = ['administer redirect settings', 'administer redirects'];
- user_role_revoke_permissions($role, $permissions);
-}
-
-/**
- * Enables quick node clone module.
- */
-function tide_core_update_8041() {
- if (!\Drupal::moduleHandler()->moduleExists('quick_node_clone')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['quick_node_clone']);
- }
- $roles = [
- 'editor',
- 'site_admin',
- ];
- $node_types = NodeType::loadMultiple();
- $permissions = [];
- foreach ($node_types as $type => $node_type) {
- $permissions[] = 'clone ' . $type . ' content';
- }
-
- foreach ($roles as $role) {
- user_role_grant_permissions($role, $permissions);
- }
-}
-
-/**
- * Updates site_admin permissions.
- */
-function tide_core_update_8042() {
- $permissions = ['administer nodes', 'bypass node access'];
- user_role_grant_permissions('site_admin', $permissions);
-}
-
-/**
- * Enable Maximize button in wysiwyg toolbar.
- */
-function tide_core_update_8043() {
- $config_factory = \Drupal::configFactory();
- $configs = [
- 'editor.editor.admin_text',
- 'editor.editor.rich_text',
- 'editor.editor.summary_text',
- ];
- foreach ($configs as $config) {
- $editable_config = $config_factory->getEditable($config);
- if ($editable_config->isNew()) {
- continue;
- }
- $rows = $editable_config->get('settings.toolbar.rows.0');
- if (!isset($rows)) {
- continue;
- }
- $updated_rows = [];
+ $tideCoreOperation->updateEditorialWorkflow();
- foreach ($rows as $key => $row) {
- if ($row['name'] === 'Tools' && !in_array('Maximize', $row['items'])) {
- // Insert Maximise inside Tools group toolbar.
- array_splice($row['items'], 3, 0, 'Maximize');
- }
- $updated_rows[] = $row;
- }
-
- $editable_config->set('settings.toolbar.rows.0', $updated_rows);
- $editable_config->save();
- }
-}
+ // Update authenticated user permission.
+ $tideCoreOperation->updateAuthenticatedUserPermission();
-/**
- * Updates files view.
- */
-function tide_core_update_8044() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/optional'];
- $config_read = _tide_read_config('views.view.enhanced_files', $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()->getStorage('view');
- if ($storage->load('enhanced_files') == NULL) {
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
- $view = View::load('files');
- if ($view) {
- if ($view->status() == TRUE) {
- $view->setStatus(FALSE);
- $view->save();
- }
- }
-}
-
-/**
- * Enable tablefield module.
- */
-function tide_core_update_8045() {
- if (!\Drupal::moduleHandler()->moduleExists('tablefield')) {
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['tablefield']);
- }
- $roles = ['approver', 'site_admin', 'editor'];
- $permissions = [
- 'addrow tablefield',
- 'rebuild tablefield',
- 'import tablefield',
- ];
- foreach ($roles as $role) {
- user_role_grant_permissions(Role::load($role)->id(), $permissions);
- }
-}
-
-/**
- * Enable tide_edit_protection module.
- */
-function tide_core_update_8046() {
- // @todo This update will be removed before Drupal 9.0.0
-}
-
-/**
- * Update paragraph description and icon.
- */
-function tide_core_update_8047() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $icon_dir = \Drupal::service('extension.list.module')->getPath('tide_core') . DIRECTORY_SEPARATOR . 'icons';
+ // Deletes unsupported actions from /admin/contents view.
+ $tideCoreOperation->deleteUnsupportedActions();
- $paragraphs = [
- 'accordion' => 'Add a list of headings that can be clicked on to show or hide content.',
- ];
- foreach ($paragraphs as $paragraph_type_id => $description) {
- /** @var \Drupal\paragraphs\Entity\ParagraphsType $paragraph_type */
- $paragraph_type = ParagraphsType::load($paragraph_type_id);
- if ($paragraph_type) {
- $paragraph_type->set('description', $description);
- $paragraph_type->save();
+ // Add business contact fields to user account form display.
+ $tideCoreOperation->addBusinessFieldsToUserAccountForm();
- $icon_filename = $icon_dir . DIRECTORY_SEPARATOR . $paragraph_type_id . '.svg';
- _tide_set_paragraph_type_icon($paragraph_type, $icon_filename);
- }
- }
-}
+ // Use custom files view and disable the default one.
+ $tideCoreOperation->useCustomFilesView();
-/**
- * Set default home page and login redirect.
- */
-function tide_core_update_8048() {
- // Keeps the hook signature.
-}
+ // Changes the diff modules general_settings.revision_pager_limit to 16.
+ $tideCoreOperation->chagneDiffSettings();
-/**
- * Disable node preview for all content types.
- */
-function tide_core_update_8049() {
- /** @var \Drupal\node\NodeTypeInterface[] $node_types */
- $node_types = \Drupal::entityTypeManager()->getStorage('node_type')->loadMultiple();
- foreach ($node_types as $node_type) {
- $node_type->setPreviewMode(0);
- $node_type->save();
- }
}
/**
- * Remove insecure domains from SecKit policies.
+ * Increase character limit of URLs.
*/
-function tide_core_update_8050() {
- $config_factory = \Drupal::configFactory();
- $config = $config_factory->getEditable('seckit.settings');
- $insecure_domains = [
- 'cdn.jsdelivr.net',
- 'cdnjs.cloudflare.com',
- 'cdn.rawgit.com',
- 'raw.githubusercontent.com',
- ];
- $double_space = ' ';
- $script_src = $config->get('seckit_xss.csp.script-src');
- $img_src = $config->get('seckit_xss.csp.img-src');
- $style_src = $config->get('seckit_xss.csp.style-src');
-
- $script_src = str_replace($insecure_domains, '', $script_src);
- $img_src = str_replace($insecure_domains, '', $img_src);
- $style_src = str_replace($insecure_domains, '', $style_src);
-
- // Clean up double spaces.
- $script_src = str_replace($double_space, ' ', $script_src);
- $img_src = str_replace($double_space, ' ', $img_src);
- $style_src = str_replace($double_space, ' ', $style_src);
-
- $config->set('seckit_xss.csp.script-src', $script_src);
- $config->set('seckit_xss.csp.img-src', $img_src);
- $config->set('seckit_xss.csp.style-src', $style_src);
-
+function tide_core_update_10000() {
+ $config = \Drupal::configFactory()->getEditable('pathauto.settings');
+ $config->set('max_length', 255);
$config->save();
}
/**
- * Make user creation require admin approval.
+ * Revokes `delete any media` and `delete media` from the editor role.
*/
-function tide_core_update_8051() {
- // Don't do anything else during config sync.
- if (\Drupal::isConfigSyncing()) {
+function tide_core_update_10001() {
+ $editor = Role::load('editor');
+ if (!$editor) {
return;
}
-
- // Restrict user registration to admin role creation.
- \Drupal::configFactory()
- ->getEditable('user.settings')
- ->set('register', UserInterface::REGISTER_ADMINISTRATORS_ONLY)
- ->save(TRUE);
-}
-
-/**
- * Create new role and assign audit trail permission.
- */
-function tide_core_update_8052() {
- $role = Role::load('site_auditor');
- if (!$role) {
- $auditor_role = Role::create([
- 'id' => 'site_auditor',
- 'label' => 'Site Auditor',
- 'permissions' => [
- 'access admin audit trail',
- 'access site reports',
- ],
- ]);
- $auditor_role->save();
- }
-}
-
-/**
- * Enable better_exposed_filters module's dependencies.
- *
- * @see https://www.drupal.org/project/better_exposed_filters/issues/3109536#comment-13737523
- */
-function tide_core_update_8053() {
- $module_handler = \Drupal::moduleHandler();
- $module_exist = $module_handler->moduleExists('better_exposed_filters');
- if ($module_exist) {
- $modules = [
- 'jquery_ui',
- 'jquery_ui_slider',
- 'jquery_ui_touch_punch',
- 'jquery_ui_datepicker',
- ];
-
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install($modules);
- }
-}
-
-/**
- * Changes the location field cardinality to -1.
- */
-function tide_core_update_8054() {
- $config = \Drupal::configFactory()
- ->getEditable('field.storage.node.field_location');
- $value = $config->get('cardinality');
- if ($value === 1) {
- $config->set('cardinality', -1)->save();
- }
-}
-
-/**
- * Adds field_show_site_section_nav storage.
- */
-function tide_core_update_8055() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- // Check if field already exported to config/sync.
- $config_read = _tide_read_config('field.storage.node.field_show_site_section_nav', $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()->getStorage('field_storage_config');
- $id = 'node.field_show_site_section_nav';
- if ($storage->load($id) == NULL) {
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
-}
-
-/**
- * Enable "tide_cms_support" module, if not enabled.
- */
-function tide_core_update_8056() {
- if (!\Drupal::moduleHandler()->moduleExists('tide_cms_support')) {
- /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['tide_cms_support']);
- }
-}
-
-/**
- * Adds field_statistics_grid storage.
- */
-function tide_core_update_8057() {
- $configs = [
- [
- 'location' => 'field.storage.paragraph.field_statistics_grid_theme',
- 'type' => 'paragraph.field_statistics_grid_theme',
- ],
- [
- 'location' => 'field.storage.paragraph.field_statistic_heading',
- 'type' => 'paragraph.field_statistic_heading',
- ],
- [
- 'location' => 'field.storage.paragraph.field_statistic_body',
- 'type' => 'paragraph.field_statistic_body',
- ],
- [
- 'location' => 'field.storage.paragraph.field_statistic_block',
- 'type' => 'paragraph.field_statistic_block',
- ],
- ];
-
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- // Check if field already exported to config/sync.
- foreach ($configs as $config) {
- $config_read = _tide_read_config($config['location'], $config_location, TRUE);
- $storage = \Drupal::entityTypeManager()->getStorage('field_storage_config');
- $id = $config['type'];
- if ($storage->load($id) == NULL) {
- $config_entity = $storage->createFromStorageRecord($config_read);
- $config_entity->save();
- }
- }
-}
-
-/**
- * Changes the diff modules general_settings.revision_pager_limit to 16.
- */
-function tide_core_update_8058() {
- if (\Drupal::moduleHandler()->moduleExists('diff')) {
- $config = \Drupal::configFactory()
- ->getEditable('diff.settings');
- if (!$config->isNew() && !empty($config->get('general_settings.revision_pager_limit'))) {
- $config->set('general_settings.revision_pager_limit', 16)->save();
- }
- }
-}
-
-/**
- * Add storage for new timeline component field.
- */
-function tide_core_update_8059() {
- module_load_include('inc', 'tide_core', 'includes/helpers');
- $config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];
- $field_storage = 'field.storage.paragraph.field_current_milestone';
- $storage = \Drupal::entityTypeManager()->getStorage('field_storage_config');
- if (empty($storage->load('paragraph.field_current_milestone'))) {
- $config_read = _tide_read_config($field_storage, $config_location, TRUE);
- // Obtain the storage manager for field storage bases.
- // Create a new field from the yaml configuration and save.
- $storage->createFromStorageRecord($config_read)->save();
- }
-}
-
-/**
- * Changes allowed HTML list.
- */
-function tide_core_update_8060() {
- // Update allowed HTML list.
- $config_factory = \Drupal::configFactory();
- $filter_ids = [
- 'filter.format.admin_text',
- 'filter.format.rich_text',
- 'filter.format.summary_text',
- ];
- foreach ($filter_ids as $filter_id) {
- $filter = $config_factory->getEditable($filter_id);
- if ($filter->isNew()) {
- continue;
+ $permissionsToRemove = ['delete any media', 'delete media'];
+ $changed = FALSE;
+ foreach ($permissionsToRemove as $permission) {
+ if ($editor->hasPermission($permission)) {
+ $editor->revokePermission($permission);
+ $changed = TRUE;
}
-
- $value = $filter->get('filters.filter_html.settings.allowed_html');
- $replaced = str_replace(' |