Issue #3280811 by vnech: Make possible for group managers manage book…

…s structure
goalgorilla · Jun 29, 2022 · cedf6e0 · cedf6e0
1 parent 8cf6976
commit cedf6e0
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 160 deletions.
diff --git a/...onfig/update/social_book_update_11400.yml → ...onfig/update/social_book_update_11401.yml b/...onfig/update/social_book_update_11400.yml → ...onfig/update/social_book_update_11401.yml
diff --git a/modules/social_features/social_book/social_book.install b/modules/social_features/social_book/social_book.install
@@ -279,7 +279,7 @@ function social_book_update_10301() {
 /**
  * Hide book image field labels in view displays.
  */
-function social_book_update_11400(): string {
+function social_book_update_11401(): string {
   /** @var \Drupal\update_helper\Updater $updateHelper */
   $updateHelper = \Drupal::service('update_helper.updater');
 

diff --git a/...oup_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.info.yml b/...oup_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.info.yml
@@ -2,7 +2,9 @@ name: 'Social Flexible Group - Book pages'
 description: 'Provides an ability to have Book Page node type in flexible groups.'
 type: module
 core_version_requirement: ^9
-package: Social
+package: Social (Experimental)
+lifecycle: experimental
+hidden: true
 dependencies:
   - social:social_group_flexible_group
   - social:social_book
diff --git a/...roup_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.install b/...roup_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.install
@@ -5,22 +5,85 @@
  * Install and update functions for the "social_flexible_group_book" module.
  */
 
-use Drupal\social_flexible_group_book\SocialFlexibleGroupBookInstallHelper;
-
 /**
  * Implements hook_install().
  */
 function social_flexible_group_book_install(): void {
-  /** @var \Drupal\social_flexible_group_book\SocialFlexibleGroupBookInstallHelper $install_helper */
-  $install_helper = \Drupal::classResolver(SocialFlexibleGroupBookInstallHelper::class);
-  $install_helper->setGroupPermissions();
-}
+  // Make this module hooks fired after "book" module.
+  $extension_config = \Drupal::configFactory()->getEditable('core.extension');
+  $weight = $extension_config->get('module.book');
+  // Set the weight of this module.
+  module_set_weight('social_flexible_group_book', $weight + 1);
 
-/**
- * Implements hook_uninstall().
- */
-function social_group_flexible_group_uninstall(bool $is_syncing): void {
-  /** @var \Drupal\social_flexible_group_book\SocialFlexibleGroupBookInstallHelper $install_helper */
-  $install_helper = \Drupal::classResolver(SocialFlexibleGroupBookInstallHelper::class);
-  $install_helper->revokeGroupPermissions();
+  // Set global permissions.
+  $permissions['verified'] = [
+    'add content to books',
+  ];
+
+  $roles = (array) \Drupal::entityTypeManager()->getStorage('user_role')
+    ->getQuery()
+    ->accessCheck(FALSE)
+    ->condition('id', 'administrator', '<>')
+    ->execute();
+
+  /** @var \Drupal\user\Entity\Role $role */
+  foreach ($roles as $role) {
+    if (!empty($permissions[$role->id()])) {
+      user_role_grant_permissions($role->id(), $permissions[$role->id()]);
+    }
+  }
+
+  // Set group permissions.
+  // Group anonymous.
+  $group_permissions['flexible_group-anonymous'] = [
+    'view group_node:book content',
+    'view group_node:book entity',
+  ];
+
+  // Group outsider.
+  $group_permissions['flexible_group-outsider'] = $group_permissions['flexible_group-anonymous'];
+
+  // Group member.
+  $group_permissions['flexible_group-member'] = $group_permissions['flexible_group-outsider'];
+
+  // Group manager.
+  $group_permissions['flexible_group-group_manager'] = [
+    ...$group_permissions['flexible_group-member'],
+    'create group_node:book content',
+    'create group_node:book entity',
+    'delete own group_node:book entity',
+    'delete own group_node:book content',
+    'update own group_node:book content',
+    'update own group_node:book entity',
+  ];
+  // Group outside role: Content manager.
+  $group_permissions['flexible_group-83776d798'] = $group_permissions['flexible_group-group_manager'];
+
+  // Group admin.
+  $group_permissions['flexible_group-group_admin'] = [
+    ...$group_permissions['flexible_group-group_manager'],
+    'delete any group_node:book content',
+    'delete any group_node:book entity',
+    'update any group_node:book content',
+    'update any group_node:book entity',
+    'view unpublished group_node:book entity',
+  ];
+
+  // Group outside role: Site manager.
+  $group_permissions['flexible_group-ba5854c29'] = $group_permissions['flexible_group-group_admin'];
+
+  // Group outside role: Administrator.
+  $group_permissions['flexible_group-a416e6833'] = $group_permissions['flexible_group-group_admin'];
+
+  /** @var \Drupal\group\Entity\GroupTypeInterface $group_type */
+  $group_type = \Drupal::entityTypeManager()
+    ->getStorage('group_type')
+    ->load('flexible_group');
+
+  foreach ($group_type->getRoles() as $role) {
+    if (!empty($group_permissions[$role->id()])) {
+      $role->grantPermissions($group_permissions[$role->id()])
+        ->save();
+    }
+  }
 }
diff --git a/...group_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.module b/...group_flexible_group/modules/social_flexible_group_book/social_flexible_group_book.module
@@ -18,12 +18,12 @@ use Drupal\group\Entity\GroupInterface;
  */
 function social_flexible_group_book_entity_form_display_alter(EntityFormDisplayInterface $form_display, array $context): void {
   if (
-    $context['entity_type'] === 'node'
-    && $context['bundle'] === 'book'
-    && $form_display->getMode() === 'default'
+    $context['entity_type'] === 'node' &&
+    $context['bundle'] === 'book' &&
+    $form_display->getMode() === 'default'
   ) {
     // Add "groups" field to the form.
-    /* @see \Drupal\social_group\SocialGroupSelectorWidgetConfigOverride::loadOverrides */
+    // @see \Drupal\social_group\SocialGroupSelectorWidgetConfigOverride::loadOverrides
     $form_display->setComponent('groups', [
       'type' => 'social_group_selector_widget',
       'weight' => 0,
@@ -39,9 +39,9 @@ function social_flexible_group_book_entity_form_display_alter(EntityFormDisplayI
   }
 
   if (
-    $context['entity_type'] === 'group'
-    && $context['bundle'] === 'flexible_group'
-    && $form_display->getMode() === 'default'
+    $context['entity_type'] === 'group' &&
+    $context['bundle'] === 'flexible_group' &&
+    $form_display->getMode() === 'default'
   ) {
     $form_display->setComponent('enable_books', [
       'weight' => 6,
@@ -89,6 +89,19 @@ function social_flexible_group_book_form_node_form_alter(array &$form, FormState
     $form['#fieldgroups']['group_visibility']->children[] = 'groups';
     $form['#group_children']['groups'] = 'group_visibility';
   }
+
+  // We need add this option here because by default "book" module require
+  // a specific global permission - "create new books".
+  // Group managers with only "verified" global role should be able to create
+  // new books as well even without this permission.
+  $nid = !$node->isNew() ? $node->id() : 'new';
+  $options = $form['book']['bid']['#options'];
+  if (!isset($options[$nid])) {
+    if ($nid == 'new' || ($nid != $node->book['original_bid'])) {
+      // The node can become a new book, if it is not one already.
+      $form['book']['bid']['#options'] = [$nid => t('- Create a new book -')] + $options;
+    }
+  }
 }
 
 /**
@@ -127,10 +140,9 @@ function social_flexible_group_book_block_access(Block $block, string $operation
   }
 
   if (
-    in_array($block->getPluginId(), ['group_hero_block', 'group_statistic_block'])
-    || $block->id() === 'socialblue_pagetitleblock_content'
+    in_array($block->getPluginId(), ['group_hero_block', 'group_statistic_block']) ||
+    $block->id() === 'socialblue_pagetitleblock_content'
   ) {
-    // @todo This should be added to the block configuration from here.
     $request_path = $block->getVisibility()['request_path'];
     $request_path['pages'] .= "\r\n/group/*/books";
     $block->setVisibilityConfig('request_path', $request_path);

diff --git a/...e_group_book/src/Plugin/ActivityEntityCondition/BookParentOnlyActivityEntityCondition.php b/...e_group_book/src/Plugin/ActivityEntityCondition/BookParentOnlyActivityEntityCondition.php
@@ -30,9 +30,9 @@ public function isValidEntityCondition($entity): bool {
     if (!empty($node) && $node instanceof NodeInterface) {
       // The main book page always has the depth 1.
       if (
-        $node->bundle() === 'book'
-        && isset($node->book['depth'])
-        && (int) $node->book['depth'] === 1
+        $node->bundle() === 'book' &&
+        isset($node->book['depth']) &&
+        (int) $node->book['depth'] === 1
       ) {
         return TRUE;
       }

diff --git a/..._flexible_group/modules/social_flexible_group_book/src/Plugin/Block/GroupAddBookBlock.php b/..._flexible_group/modules/social_flexible_group_book/src/Plugin/Block/GroupAddBookBlock.php
@@ -33,10 +33,7 @@ public function blockAccess(AccountInterface $account): AccessResultInterface {
     $group = _social_group_get_current_group();
 
     if ($group instanceof GroupInterface) {
-      if (
-        $group->hasPermission('create group_node:book entity', $account)
-        && $account->hasPermission('create book content')
-      ) {
+      if ($group->hasPermission('create group_node:book entity', $account)) {
         return AccessResult::allowed();
       }
     }

diff --git a/...ble_group/modules/social_flexible_group_book/src/SocialFlexibleGroupBookInstallHelper.php b/...ble_group/modules/social_flexible_group_book/src/SocialFlexibleGroupBookInstallHelper.php