Issue #3390096: Group translation fails

modules/o365_groups/o365_groups.install

@@ -83,6 +83,16 @@ function o365_groups_update_9005() {
     ->installFieldStorageDefinition('field_o365_groups_teams_id', 'group', 'o365_groups', $groupField);
 }
 
+/**
+ * Remove groups field_o365_groups_teams_id field.
+ */
+function o365_groups_update_9006() {
+  $update_manager = Drupal::service('entity.definition_update_manager');
+  $definition = $update_manager->getFieldStorageDefinition('field_o365_groups_teams_id', 'group');
+  $update_manager->uninstallFieldStorageDefinition($definition);
+  return t('Entity: field_o365_groups_teams_id was uninstalled');
+}
+
 /**
  * Implements hook_schema().
  */

modules/o365_groups/o365_groups.module

@@ -46,42 +46,6 @@ function o365_groups_entity_extra_field_info() {
   return $extra;
 }
 
-/**
- * Implements hook_entity_base_field_info().
- */
-function o365_groups_entity_base_field_info(EntityTypeInterface $entity_type) {
-  $fields = [];
-  if ($entity_type->id() === 'group') {
-    // This field needs to be removed in the next major release.
-    $fields['field_o365_groups_teams_id'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Connected Microsoft 365 group'))
-      ->setRevisionable(TRUE)
-      ->setTranslatable(FALSE)
-      ->setDisplayOptions('form', [
-        'type' => 'select',
-        'weight' => 30,
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setRequired(FALSE)
-      ->setTranslatable(TRUE)
-      ->setStorageRequired(TRUE)
-      ->setDisplayConfigurable('view', TRUE)
-      ->setComputed(FALSE);
-  }
-  return $fields;
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter().
- */
-function o365_groups_form_group_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  // We need to hide this field in favor of the new field created.
-  // This field needs to be removed in the next major release.
-  if (isset($form['field_o365_groups_teams_id'])) {
-    $form['field_o365_groups_teams_id']['#access'] = FALSE;
-  }
-}
-
 /**
  * Implements hook_ENTITY_TYPE_view().
  */