Apigee X tests for team, team membership level and admin permissions,…

… team roles (#1045)
apigee · Feb 27, 2024 · 0f0e59a · 0f0e59a
1 parent d3f04aa
commit 0f0e59a
Show file tree

Hide file tree

Showing 3 changed files with 729 additions and 2 deletions.
diff --git a/modules/apigee_edge_teams/src/Entity/ListBuilder/TeamAppListBuilder.php b/modules/apigee_edge_teams/src/Entity/ListBuilder/TeamAppListBuilder.php
@@ -51,7 +51,8 @@ protected function buildInfoRow(AppInterface $app, array &$rows) {
     /** @var \Drupal\apigee_edge_teams\Entity\TeamInterface[] $teams */
     $teams = $this->entityTypeManager->getStorage('team')->loadMultiple();
     $css_id = $this->getCssIdForInfoRow($app);
-    $rows[$css_id]['data']['team']['data'] = $teams[$app->getCompanyName()]->access('view') ? $teams[$app->getCompanyName()]->toLink()->toRenderable() : $teams[$app->getCompanyName()]->label();
+    $team_name = $app->isApigeeX() ? $app->getAppGroup() : $app->getCompanyName();
+    $rows[$css_id]['data']['team']['data'] = $teams[$team_name]->access('view') ? $teams[$team_name]->toLink()->toRenderable() : $teams[$team_name]->label();
     parent::buildInfoRow($app, $rows);
   }
 

diff --git a/modules/apigee_edge_teams/src/Entity/TeamApp.php b/modules/apigee_edge_teams/src/Entity/TeamApp.php
@@ -86,6 +86,13 @@
 #[\AllowDynamicProperties]
 class TeamApp extends App implements TeamAppInterface {
 
+  /**
+   * True if organization is Apigee X.
+   *
+   * @var bool
+   */
+  public static $apigeex = FALSE;
+
   /**
    * The decorated company app entity from the SDK.
    *
@@ -156,7 +163,11 @@ public function getAppGroup(): ?string {
    */
   public static function isApigeeX(): bool {
     $orgController = \Drupal::service('apigee_edge.controller.organization');
-    return $orgController->isOrganizationApigeeX();
+    if ($orgController->isOrganizationApigeeX()) {
+      TeamApp::$apigeex = $orgController->isOrganizationApigeeX();
+    }
+
+    return TeamApp::$apigeex;
   }
 
   /**