Add email field to Add team form for AppGroups

Author: shishir-intelli

modules/apigee_edge_teams/src/Entity/Form/TeamForm.php

@@ -199,6 +199,18 @@ public function form(array $form, FormStateInterface $form_state) {
       '#default_value' => $team->id(),
     ];
 
+    // The parent form adds an 'email' field. We modify it here.
+    if (isset($form['email'])) {
+      $form['email']['widget'][0]['value']['#title'] = $this->t('Team Administrator Email');
+      $form['email']['widget'][0]['value']['#description'] = $this->t('The email address of the team administrator.');
+      $form['email']['widget'][0]['value']['#required'] = TRUE;
+
+      // For non-Apigee X, the email is stored as an attribute.
+      if (!$this->orgController->isOrganizationApigeeX()) {
+        $default_email = !$team->isNew() ? $team->getAttribute(static::ADMIN_EMAIL_ATTRIBUTE) : $this->currentUser->getEmail();
+        $form['email']['widget'][0]['value']['#default_value'] = $default_email;
+      }
+    }
     return $form;
   }
 

modules/apigee_edge_teams/src/Entity/Team.php

@@ -307,6 +307,22 @@ public function setChannelId(string $channelId): void {
     $this->decorated->setChannelId($channelId);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getEmail(): ?string
+  {
+    return $this->decorated->getEmail();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setEmail(string $email): void
+  {
+    $this->decorated->setEmail($email);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -330,6 +346,19 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t("@team name", ['@team' => $team_singular_label]))
       ->setRequired(TRUE);
 
+    if (self::isApigeeX()) {
+      $definitions['email']
+        ->setDisplayOptions('view', [
+          'label' => 'inline',
+          'weight' => 1,
+        ])
+        ->setDisplayOptions('form', [
+          'weight' => 1,
+        ])
+        ->setLabel(t("Email"))
+        ->setRequired(FALSE);
+    }
+
     $definitions['status']
       ->setDisplayOptions('view', [
         'label' => 'inline',