160 remove complex widget

config/schema/og.schema.yml

@@ -1,25 +1,3 @@
-field.storage_settings.og_membership_reference:
-  type: mapping
-  label: 'Organic Groups reference field storage settings'
-  mapping:
-    target_type:
-      type: string
-      label: 'Type of entity to reference'
-
-field.field_settings.og_membership_reference:
-  type: mapping
-  label: 'Organic Groups reference field settings'
-  mapping:
-    handler:
-      type: string
-      label: 'Reference method'
-    handler_settings:
-      type: entity_reference_selection.[%parent.handler]
-      label: 'Organic Groups reference selection plugin settings'
-    access_override:
-      type: boolean
-      label: 'Access Override'
-
 field.storage_settings.og_standard_reference:
   type: mapping
   label: 'Organic Groups reference field storage settings'
@@ -38,9 +16,6 @@ field.field_settings.og_standard_reference:
     handler_settings:
       type: entity_reference_selection.[%parent.handler]
       label: 'Organic Groups reference selection plugin settings'
-    access_override:
-      type: boolean
-      label: 'Access Override'
 
 entity_reference_selection.og:default:
   type: entity_reference_selection.default
@@ -136,20 +111,6 @@ og.og_role.*:
       type: string
       label: 'Role type'
 
-field.widget.settings.og_complex:
-  type: mapping
-  label: 'OG Group Audience field widget'
-  mapping:
-    match_operator:
-      type: string
-      label: 'Autocomplete matching'
-    size:
-      type: integer
-      label: 'Size of textfield'
-    placeholder:
-      type: label
-      label: 'Placeholder'
-
 views.field.og_membership_bulk_form:
   type: views_field_bulk_form
   label: 'OG Membership bulk form'

og.module

@@ -123,6 +123,7 @@ function og_entity_delete(EntityInterface $entity) {
  * Implements hook_entity_access().
  */
 function og_entity_access(EntityInterface $entity, $operation, AccountInterface $account) {
+
   // Grant access to view roles, so that they can be shown in listings.
   if ($entity instanceof OgRoleInterface && $operation == 'view') {
     return AccessResult::allowed();
@@ -159,6 +160,21 @@ function og_entity_access(EntityInterface $entity, $operation, AccountInterface
   /** @var \Drupal\Core\Access\AccessResult $access */
   $access = \Drupal::service('og.access')->userAccessEntity($operation, $entity, $account);
 
+  $audience_fields = \Drupal::service('og.group_audience_helper')->getAllGroupAudienceFields($entity_type_id, $bundle_id);
+  if (count($audience_fields) === 1) {
+    $field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type_id, $bundle_id);
+    foreach ($field_definitions as $field_name => $field_definition) {
+
+      /** @var \Drupal\Core\Field\FieldDefinitionInterface $field_definition */
+      if (!in_array($field_definition->getName(), array_keys($audience_fields))) {
+        continue;
+      }
+
+      // Check if the field needs to be required.
+      $field_definition->setRequired($access);
+    }
+  }
+
   if ($access->isAllowed()) {
     return $access;
   }
@@ -179,6 +195,11 @@ function og_entity_access(EntityInterface $entity, $operation, AccountInterface
 function og_entity_create_access(AccountInterface $account, array $context, $bundle) {
   $entity_type_id = $context['entity_type_id'];
 
+  if (!empty($context['skip_og_permission'])) {
+    // We've already been here or we want to skip the access check.
+    return;
+  }
+
   if (!Og::isGroupContent($entity_type_id, $bundle)) {
     // Not a group content.
     return AccessResult::neutral();
@@ -203,17 +224,32 @@ function og_entity_create_access(AccountInterface $account, array $context, $bun
   // @see \Drupal\og\Plugin\EntityReferenceSelection\OgSelection::buildEntityQuery()
   $required = FALSE;
 
+  /** @var \Drupal\og\OgGroupAudienceHelperInterface $audience_helper */
+  $audience_helper = \Drupal::service('og.group_audience_helper');
+  $audience_fields = $audience_helper->getAllGroupAudienceFields($entity_type_id, $bundle);
   $field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type_id, $bundle);
+
   foreach ($field_definitions as $field_name => $field_definition) {
     /** @var \Drupal\Core\Field\FieldDefinitionInterface $field_definition */
-    if (!\Drupal::service('og.group_audience_helper')->isGroupAudienceField($field_definition)) {
+    if (!in_array($field_definition->getName(), array_keys($audience_fields))) {
       continue;
     }
 
-    $handler = Og::getSelectionHandler($field_definition);
+    if (count($audience_fields) === 1) {
+      // Set the field to required only if we have a single audience field.
+      // If we have multiple fields then the require logic will perform at the
+      // entity constraint level.
+      $field_definition->setRequired(!\Drupal::entityTypeManager()
+        ->getAccessControlHandler($entity_type_id)
+        ->createAccess($bundle, $account, ['skip_og_permission' => TRUE]));
+    }
 
-    if ($handler->getReferenceableEntities()) {
-      return AccessResult::neutral();
+    $handler = Og::getSelectionHandler($field_definition);
+    if ($handler->countReferenceableEntities()) {
+      // At least one of the fields has referenceable groups. That mean that
+      // the user can create group content when referencing the group content in
+      // at least one of the fields.
+      return AccessResult::allowed();
     }
 
     // Allow users to create content outside of groups, if none of the
@@ -284,7 +320,16 @@ function og_field_formatter_info_alter(array &$info) {
  * Implements hook_field_widget_info_alter().
  */
 function og_field_widget_info_alter(array &$info) {
-  $info['options_buttons']['field_types'][] = OgGroupAudienceHelperInterface::GROUP_REFERENCE;
+  $field_types = [
+    'entity_reference_autocomplete',
+    'entity_reference_autocomplete_tags',
+    'options_buttons',
+    'options_select',
+  ];
+
+  foreach ($field_types as $field_type) {
+    $info[$field_type]['field_types'][] = OgGroupAudienceHelperInterface::GROUP_REFERENCE;
+  }
 }
 
 /**
@@ -297,9 +342,24 @@ function og_field_widget_info_alter(array &$info) {
  * be rebuilt via RouteBuilder::setRebuildNeeded.
  */
 function og_entity_type_alter(array &$entity_types) {
+
   /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */
   foreach ($entity_types as $entity_type_id => $entity_type) {
+
+    // Add link template to groups. We add it to all the entity types, and later
+    // on return the correct access, depending if the bundle is indeed a group
+    // and accessible. We do not filter here the entity type by groups, so
+    // whenever GroupTypeManager::addGroup is called, it's enough to mark route
+    // to be rebuilt via RouteBuilder::setRebuildNeeded.
     $entity_type->setLinkTemplate('og-admin-routes', "/group/$entity_type_id/{{$entity_type_id}}/admin");
+
+    // We won't check if an entity might be group content because we need to
+    // check if that entity has any bundle that could be a group entity and this
+    // would cause a recursion. The constraint will check there if the entity is
+    // group content or not.
+    if ($entity_type->entityClassImplements(ContentEntityInterface::class)) {
+      $entity_type->addConstraint('ValidOgMembershipMultipleReference');
+    }
   }
 }
 

src/Entity/OgMembership.php

@@ -475,10 +475,12 @@ public function preSave(EntityStorageInterface $storage) {
       }
     }
 
+    $uid = $this->get('uid')->target_id;
+
     // Check for an existing membership.
     $query = \Drupal::entityQuery('og_membership');
     $query
-      ->condition('uid', $this->get('uid')->target_id)
+      ->condition('uid', $uid)
       ->condition('entity_id', $this->get('entity_id')->value)
       ->condition('entity_type', $this->get('entity_type')->value);
 
@@ -493,7 +495,7 @@ public function preSave(EntityStorageInterface $storage) {
       ->execute();
 
     if ($count) {
-      throw new \LogicException(sprintf('An OG membership already exists for uid %s in group of entity-type %s and ID: %s', $this->get('uid')->target_id, $entity_type_id, $this->getGroup()->id()));
+      throw new \LogicException(sprintf('An OG membership already exists for user ID %d and group of entity type %s and ID %s', $uid, $entity_type_id, $this->getGroup()->id()));
     }
 
     parent::preSave($storage);
@@ -507,7 +509,6 @@ public function save() {
 
     // Reset internal cache.
     Og::reset();
-    \Drupal::service('og.access')->reset();
 
     return $result;
   }

src/GroupTypeManager.php

@@ -191,8 +191,22 @@ public function getGroupBundleIdsByEntityType($entity_type_id) {
    * {@inheritdoc}
    */
   public function getAllGroupBundles($entity_type = NULL) {
+    // Todo - should be remove since this method don't do any thing.
+    return $this->getGroupMap();
+  }
+
+  /**
+   * Get group bundles of an entity type.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   *
+   * @return array
+   *   An associative array of bundle IDs, or an empty array if none found.
+   */
+  public function getGroupBundlesByEntityType($entity_type_id) {
     $group_map = $this->getGroupMap();
-    return !empty($group_map[$entity_type]) ? $group_map[$entity_type] : $group_map;
+    return isset($group_map[$entity_type_id]) ? $group_map[$entity_type_id] : [];
   }
 
   /**

src/Og.php

@@ -375,8 +375,6 @@ protected static function getFieldBaseDefinition($plugin_id) {
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
    *   The field definition.
-   * @param array $options
-   *   Overriding the default options of the selection handler.
    *
    * @return \Drupal\og\Plugin\EntityReferenceSelection\OgSelection
    *   Returns the OG selection handler.
@@ -385,22 +383,28 @@ protected static function getFieldBaseDefinition($plugin_id) {
    *   Thrown when the passed in field definition is not of a group audience
    *   field.
    */
-  public static function getSelectionHandler(FieldDefinitionInterface $field_definition, array $options = []) {
+  public static function getSelectionHandler(FieldDefinitionInterface $field_definition) {
     if (!\Drupal::service('og.group_audience_helper')->isGroupAudienceField($field_definition)) {
       $field_name = $field_definition->getName();
-      throw new \Exception("The field $field_name is not an audience field.");
+      throw new \Exception("The field $field_name is not a group audience field.");
     }
 
-    $options = NestedArray::mergeDeep([
+    $entity_type_id = $field_definition->getTargetEntityTypeId();
+    $definition = \Drupal::entityTypeManager()->getDefinition($entity_type_id);
+
+    $values = [];
+    if ($bundle_key = $definition->getKey('bundle')) {
+      $values[$bundle_key] = $field_definition->getTargetBundle();
+    }
+
+    $entity = \Drupal::entityTypeManager()->getStorage($entity_type_id)->create($values);
+
+    $options = [
       'target_type' => $field_definition->getFieldStorageDefinition()->getSetting('target_type'),
       'handler' => $field_definition->getSetting('handler'),
-      'handler_settings' => [
-        'field_mode' => 'default',
-      ],
-    ], $options);
-
-    // Deep merge the handler settings.
-    $options['handler_settings'] = NestedArray::mergeDeep($field_definition->getSetting('handler_settings'), $options['handler_settings']);
+      'handler_settings' => $field_definition->getSetting('handler_settings'),
+      'entity' => $entity,
+    ];
 
     return \Drupal::service('plugin.manager.entity_reference_selection')->createInstance('og:default', $options);
   }
@@ -410,6 +414,8 @@ public static function getSelectionHandler(FieldDefinitionInterface $field_defin
    */
   public static function reset() {
     static::$cache = [];
+
+    \Drupal::service('og.access')->reset();
   }
 
 }