Group roles and permissions UI

og.routing.yml

@@ -1,5 +1,38 @@
 # Routes for Organic groups.
 
+# OgRole entity routes.
+
+entity.og_role.collection:
+  path: 'admin/config/group/roles/{entity_type_id}/{bundle_id}'
+  defaults:
+    _entity_list: 'og_role'
+    _title_callback: '\Drupal\og_ui\Controller\OgUiController::rolesOverviewPageTitleCallback'
+  requirements:
+    _permission: 'administer organic groups'
+
+entity.og_role.add_form:
+  path: 'admin/config/group/roles/{entity_type_id}/{bundle_id}/add'
+  defaults:
+    _entity_form: og_role.default
+    _title: 'Add role'
+  requirements:
+    _permission: 'administer organic groups'
+
+entity.og_role.edit_form:
+  path: 'admin/config/group/role/{og_role}/edit'
+  defaults:
+    _entity_form: og_role.default
+    _title_callback: '\Drupal\og_ui\Form\OgRoleForm::editRoleTitleCallback'
+  requirements:
+    _entity_access: 'og_role.update'
+
+entity.og_role.delete_form:
+  path: 'admin/config/group/role/{og_role}/delete'
+  defaults:
+    _entity_form: og_role.delete
+  requirements:
+    _entity_access: 'og_role.delete'
+
 og.subscribe:
   path: 'group/{entity_type_id}/{group}/subscribe/{og_membership_type}'
   defaults:

og_ui/og_ui.links.action.yml

@@ -0,0 +1,5 @@
+entity.og_role.add_form:
+  route_name: entity.og_role.add_form
+  title: 'Add role'
+  appears_on:
+    - entity.og_role.collection

og_ui/og_ui.links.menu.yml

@@ -11,3 +11,19 @@ og_ui.settings:
   parent: og_ui.admin_index
   description: 'Administer OG settings.'
   route_name: og_ui.settings
+
+og_ui.roles_permissions_overview:
+  title: 'OG roles'
+  parent: og_ui.admin_index
+  description: 'Administer OG roles.'
+  route_name: og_ui.roles_permissions_overview
+  route_parameters:
+    type: 'roles'
+
+og_ui.permissions_overview:
+  title: 'OG permissions'
+  parent: og_ui.admin_index
+  description: 'Administer OG permissions.'
+  route_name: og_ui.roles_permissions_overview
+  route_parameters:
+    type: 'permissions'

og_ui/og_ui.routing.yml

@@ -25,18 +25,18 @@ og_ui.roles_permissions_overview:
     _permission: 'administer organic groups'
     type: '^(roles|permissions)$'
 
-og_ui.roles_form:
-  path: 'admin/config/group/roles/{entity_type}/{bundle}'
+og_ui.permissions_overview:
+  path: 'admin/config/group/permissions/{entity_type_id}/{bundle_id}'
   defaults:
-    _form: '\Drupal\og_ui\Form\OgRolesForm'
-    _title: '@todo - create title callback'
+    _form: '\Drupal\og_ui\Form\OgPermissionsForm'
+    _title_callback: '\Drupal\og_ui\Form\OgPermissionsForm::titleCallback'
   requirements:
     _permission: 'administer organic groups'
 
-og_ui.permissions_form:
-  path: 'admin/config/group/permissions/{entity_type}/{bundle}'
+og_ui.permissions_edit_form:
+  path: 'admin/config/group/permissions/{entity_type_id}/{bundle_id}/{role_name}'
   defaults:
-    _form: '\Drupal\og_ui\Form\OgPermissionsForm'
-    _title: '@todo - create title callback'
+    _form: '\Drupal\og_ui\Form\OgRolePermissionsForm'
+    _title_callback: '\Drupal\og_ui\Form\OgRolePermissionsForm::rolePermissionTitleCallback'
   requirements:
     _permission: 'administer organic groups'

og_ui/src/Controller/OgUiController.php

@@ -4,6 +4,7 @@
 
 namespace Drupal\og_ui\Controller;
 
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -74,30 +75,44 @@ public static function create(ContainerInterface $container) {
    *   The overview as a render array.
    */
   public function rolesPermissionsOverviewPage($type) {
+    $route = $type === 'roles' ? 'entity.og_role.collection' : 'og_ui.permissions_overview';
     $action = $type === 'roles' ? $this->t('Edit roles') : $this->t('Edit permissions');
     $header = [$this->t('Group type'), $this->t('Operations')];
     $rows = [];
     $build = [];
 
     foreach ($this->groupTypeManager->getGroupMap() as $entity_type => $bundles) {
-      $definition = $this->entityTypeManager->getDefinition($entity_type);
+      try {
+        $definition = $this->entityTypeManager->getDefinition($entity_type);
+      }
+      catch (PluginNotFoundException $e) {
+        // The entity type manager might throw this exception if the entity type
+        // is not defined. If this happens it means there is a discrepancy
+        // between the group types in config, and the modules that providing
+        // these entity types. This is not something we can rectify here but it
+        // does not block the rendering of the page. In the rare case that this
+        // occurs, let's log an error and exclude the entity type from the page.
+        $this->getLogger('og')->error('Error: the %entity_type entity type is not defined but is supposed to have group bundles.', ['%entity_type' => $entity_type]);
+        continue;
+      }
+
       $bundle_info = $this->entityTypeBundleInfo->getBundleInfo($entity_type);
       foreach ($bundles as $bundle) {
         $rows[] = [
           [
             'data' => $definition->getLabel() . ' - ' . $bundle_info[$bundle]['label'],
           ],
           [
-            'data' => Link::createFromRoute($action, 'og_ui.' . $type . '_form', [
-              'entity_type' => $entity_type,
-              'bundle' => $bundle,
+            'data' => Link::createFromRoute($action, $route, [
+              'entity_type_id' => $entity_type,
+              'bundle_id' => $bundle,
             ]),
           ],
         ];
       }
     }
 
-    $build['roles_table'] = [
+    $build['roles_permissions_table'] = [
       '#theme' => 'table',
       '#header' => $header,
       '#rows' => $rows,
@@ -108,7 +123,7 @@ public function rolesPermissionsOverviewPage($type) {
   }
 
   /**
-   * Title callback for rolesPermissionsOverviewPage.
+   * Title callback for rolesPermissionsOverviewPage().
    *
    * @param string $type
    *   The type of overview, either 'roles' or 'permissions'.
@@ -120,4 +135,25 @@ public function rolesPermissionsOverviewTitleCallback($type) {
     return $this->t('OG @type overview', ['@type' => $type]);
   }
 
+  /**
+   * Title callback for the roles overview page.
+   *
+   * @param string $entity_type_id
+   *   The group entity type ID.
+   * @param string $bundle_id
+   *   The group bundle ID.
+   *
+   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
+   *   The roles overview page title.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
+   *   Thrown when the entity type with the given ID is not defined.
+   */
+  public function rolesOverviewPageTitleCallback($entity_type_id, $bundle_id) {
+    return $this->t('OG @type - @bundle roles', [
+      '@type' => $this->entityTypeManager->getDefinition($entity_type_id)->getLabel(),
+      '@bundle' => $this->entityTypeBundleInfo->getBundleInfo($entity_type_id)[$bundle_id]['label'],
+    ]);
+  }
+
 }