Issue #3343400 by kristiaanvandeneynde: Remove admin permission from Group entity type

src/Entity/Group.php

@@ -22,6 +22,7 @@ use Drupal\user\UserInterface;
  *   label = @Translation("Group"),
  *   label_singular = @Translation("group"),
  *   label_plural = @Translation("groups"),
+ *   label_collection = @Translation("Groups"),
  *   label_count = @PluralTranslation(
  *     singular = "@count group",
  *     plural = "@count groups"
@@ -43,7 +44,6 @@ use Drupal\user\UserInterface;
  *     },
  *     "access" = "Drupal\group\Entity\Access\GroupAccessControlHandler",
  *   },
- *   admin_permission = "administer group",
  *   base_table = "groups",
  *   data_table = "groups_field_data",
  *   revision_table = "groups_revision",

src/Entity/GroupRole.php

@@ -16,6 +16,7 @@ use Drupal\user\RoleInterface;
  *   label = @Translation("Group role"),
  *   label_singular = @Translation("group role"),
  *   label_plural = @Translation("group roles"),
+ *   label_collection = @Translation("Group roles"),
  *   label_count = @PluralTranslation(
  *     singular = "@count group role",
  *     plural = "@count group roles"

src/Entity/GroupType.php

@@ -15,6 +15,7 @@ use Drupal\group\PermissionScopeInterface;
  *   label = @Translation("Group type"),
  *   label_singular = @Translation("group type"),
  *   label_plural = @Translation("group types"),
+ *   label_collection = @Translation("Group types"),
  *   label_count = @PluralTranslation(
  *     singular = "@count group type",
  *     plural = "@count group types"
@@ -27,7 +28,7 @@ use Drupal\group\PermissionScopeInterface;
  *       "delete" = "Drupal\group\Entity\Form\GroupTypeDeleteForm"
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\group\Entity\Routing\GroupTypeRouteProvider",
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
  *     },
  *     "list_builder" = "Drupal\group\Entity\Controller\GroupTypeListBuilder",
  *   },

src/Entity/Routing/GroupRoleRouteProvider.php

@@ -49,9 +49,6 @@ class GroupRoleRouteProvider extends DefaultHtmlRouteProvider {
    */
   protected function getCollectionRoute(EntityTypeInterface $entity_type) {
     if ($route = parent::getCollectionRoute($entity_type)) {
-      // @todo Remove title part when https://www.drupal.org/node/2767025 lands.
-      $route->setDefault('_title', 'Group roles');
-      $route->setDefault('_title_arguments', []);
       $route->setOption('parameters', ['group_type' => ['type' => 'entity:group_type']]);
       return $route;
     }

src/Entity/Routing/GroupRouteProvider.php

@@ -4,6 +4,7 @@ namespace Drupal\group\Entity\Routing;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
 
 /**
  * Provides routes for groups.
@@ -56,11 +57,20 @@ class GroupRouteProvider extends DefaultHtmlRouteProvider {
    * {@inheritdoc}
    */
   protected function getCollectionRoute(EntityTypeInterface $entity_type) {
-    // @todo Remove this method when https://www.drupal.org/node/2767025 lands.
-    if ($route = parent::getCollectionRoute($entity_type)) {
-      $route->setDefault('_title', 'Groups');
-      $route->setDefault('_title_arguments', []);
-      $route->setRequirement('_permission', 'access group overview');
+    if ($entity_type->hasLinkTemplate('collection') && $entity_type->hasListBuilderClass()) {
+      /** @var \Drupal\Core\StringTranslation\TranslatableMarkup $label */
+      $label = $entity_type->getCollectionLabel();
+
+      $route = new Route($entity_type->getLinkTemplate('collection'));
+      $route
+        ->addDefaults([
+          '_entity_list' => $entity_type->id(),
+          '_title' => $label->getUntranslatedString(),
+          '_title_arguments' => $label->getArguments(),
+          '_title_context' => $label->getOption('context'),
+        ])
+        ->setRequirement('_permission', 'access group overview');
+
       return $route;
     }
   }

src/Entity/Routing/GroupTypeRouteProvider.php

-<?php
-
-namespace Drupal\group\Entity\Routing;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider;
-
-/**
- * Provides routes for group types.
- */
-class GroupTypeRouteProvider extends DefaultHtmlRouteProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getCollectionRoute(EntityTypeInterface $entity_type) {
-    // @todo Remove this method when https://www.drupal.org/node/2767025 lands.
-    if ($route = parent::getCollectionRoute($entity_type)) {
-      $route->setDefault('_title', 'Group types');
-      $route->setDefault('_title_arguments', []);
-      return $route;
-    }
-  }
-
-}