Ui test fix

.travis.yml

@@ -2,30 +2,27 @@ language: php
 sudo: true
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   global:
     - COMPOSER_MEMORY_LIMIT=2G
   matrix:
-    - TEST_SUITE=8.5.x
-    - TEST_SUITE=8.6.x
+    - TEST_SUITE=8.7.x
+    - TEST_SUITE=8.8.x
     - TEST_SUITE=PHP_CodeSniffer
 
 # Only run the coding standards check once.
 matrix:
   exclude:
-    - php: 5.6
-      env: TEST_SUITE=PHP_CodeSniffer
-    - php: 7.0
-      env: TEST_SUITE=PHP_CodeSniffer
     - php: 7.1
       env: TEST_SUITE=PHP_CodeSniffer
+    - php: 7.2
+      env: TEST_SUITE=PHP_CodeSniffer
   allow_failures:
-    - env: TEST_SUITE=8.6.x
+    - env: TEST_SUITE=8.8.x
 
 mysql:
   database: og
@@ -44,9 +41,6 @@ before_script:
   # Remember the current directory for later use in the Drupal installation.
   - MODULE_DIR=$(pwd)
 
-  # Install Composer dependencies for OG.
-  - composer install
-
   # Navigate out of module directory to prevent blown stack by recursive module
   # lookup.
   - cd ..

composer.json

@@ -10,9 +10,10 @@
         "source": "https://cgit.drupalcode.org/og"
     },
     "require": {
-        "drupal/core": "~8.5"
+        "drupal/core": "~8.7"
     },
     "require-dev": {
         "drupal/coder": "~8.2"
-    }
+    },
+    "minimum-stability": "RC"
 }

config/install/core.entity_form_display.og_membership.default.default.yml

@@ -18,4 +18,17 @@ content:
       rows: 2
       placeholder: ''
     third_party_settings: {  }
+  roles:
+    type: options_buttons
+    weight: 0
+    settings: {  }
+    third_party_settings: {  }
+  uid:
+    type: og_autocomplete
+    weight: -1
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
 hidden: {  }

config/install/core.entity_view_display.og_membership.default.default.yml

@@ -14,7 +14,21 @@ content:
   og_membership_request:
     label: above
     type: basic_string
-    weight: 0
+    weight: 2
     settings: {  }
     third_party_settings: {  }
+  roles:
+    type: entity_reference_label
+    weight: 1
+    label: above
+    settings:
+      link: false
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_label
+    weight: 0
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
 hidden: {  }

config/optional/views.view.og_members_overview.yml

@@ -3,6 +3,7 @@ status: true
 dependencies:
   module:
     - og
+    - options
     - user
 _core:
   default_config_hash: RnChWtrF4u0Q13iQMFypL0Uz6IsB4NY6ZTk_LorSbJg
@@ -22,8 +23,9 @@ display:
     position: 0
     display_options:
       access:
-        type: none
-        options: {  }
+        type: perm
+        options:
+          perm: 'access user profiles'
       cache:
         type: none
         options: {  }
@@ -46,12 +48,17 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: mini
+        type: full
         options:
-          items_per_page: 10
+          items_per_page: 50
           offset: 0
           id: 0
           total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+            first: '« First'
+            last: 'Last »'
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -60,9 +67,7 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
+          quantity: 9
       style:
         type: table
         options:
@@ -356,10 +361,10 @@ display:
           entity_type: og_membership
           entity_field: state
           plugin_id: field
-        roles:
-          id: roles
+        roles_target_id:
+          id: roles_target_id
           table: og_membership__roles
-          field: roles
+          field: roles_target_id
           relationship: none
           group_type: group
           admin_label: ''
@@ -421,6 +426,57 @@ display:
           entity_type: og_membership
           entity_field: roles
           plugin_id: field
+        operations:
+          id: operations
+          table: og_membership
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Operations links'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: og_membership
+          plugin_id: entity_operations
       filters: {  }
       sorts: {  }
       header: {  }

config/schema/og.schema.yml

@@ -193,3 +193,18 @@ condition.plugin.og_group_type:
       type: sequence
       sequence:
         type: string
+
+# Copied and adapted from core.entity.schema.yml
+field.widget.settings.og_autocomplete:
+  type: mapping
+  label: 'OG context based entity reference autocomplete with display format settings'
+  mapping:
+    match_operator:
+      type: string
+      label: 'Autocomplete matching'
+    size:
+      type: integer
+      label: 'Size of textfield'
+    placeholder:
+      type: label
+      label: 'Placeholder'

og.install

@@ -28,9 +28,14 @@ function og_update_8001(&$sandbox) {
     \Drupal::entityDefinitionUpdateManager()->installFieldStorageDefinition('entity_bundle', 'og_membership', 'og', $storage_definition);
 
     $sandbox['#finished'] = 0;
+    $sandbox['batch_size'] = 500;
     $sandbox['current'] = 0;
     $sandbox['total'] = $storage->getQuery()->count()->execute();
-    $sandbox['batch_size'] = 500;
+
+    if (!$sandbox['total']) {
+      $sandbox['#finished'] = 1;
+      return t('No OG memberships found.');
+    }
   }
 
   // Update the existing memberships to include the group bundle ID.

og.links.action.yml

@@ -0,0 +1,8 @@
+og_membership.add:
+  deriver: \Drupal\og\Plugin\Derivative\OgActionLink
+
+og_membership.type_add:
+  route_name: og_membership.type_add
+  title: 'Add membership type'
+  appears_on:
+    - entity.og_membership_type.collection

og.links.menu.yml

@@ -0,0 +1,5 @@
+entity.og_membership_type.collection:
+  title: 'Membership types'
+  parent: system.admin_structure
+  description: 'Create and manage fields, forms, and display settings for OG memberships.'
+  route_name: entity.og_membership_type.collection

og.links.task.yml

@@ -1,2 +1,15 @@
 og.og_admin_routes:
   deriver: \Drupal\og\Plugin\Derivative\OgLocalTask
+entity.og_membership.canonical:
+  route_name: entity.og_membership.canonical
+  base_route: entity.og_membership.canonical
+  title: View
+entity.og_membership.edit_form:
+  route_name: entity.og_membership.edit_form
+  base_route: entity.og_membership.canonical
+  title: Edit
+entity.og_membership.delete_form:
+  route_name: entity.og_membership.delete_form
+  base_route: entity.og_membership.canonical
+  title: Delete
+  weight: 10

og.module

@@ -17,6 +17,7 @@ use Drupal\og\Entity\OgRole;
 use Drupal\og\Og;
 use Drupal\og\OgGroupAudienceHelperInterface;
 use Drupal\og\OgMembershipInterface;
+use Drupal\og\OgMembershipTypeInterface;
 use Drupal\og\OgRoleInterface;
 use Drupal\system\Entity\Action;
 use Drupal\user\EntityOwnerInterface;
@@ -53,11 +54,7 @@ function og_entity_insert(EntityInterface $entity) {
 
   // Other modules that implement hook_entity_insert() might already have
   // created a membership ahead of us.
-  if (!Og::getMembership($entity, $entity->getOwner(), [
-    OgMembershipInterface::STATE_ACTIVE,
-    OgMembershipInterface::STATE_PENDING,
-    OgMembershipInterface::STATE_BLOCKED,
-  ])) {
+  if (!Og::getMembership($entity, $entity->getOwner(), OgMembershipInterface::ALL_STATES)) {
     $membership = Og::createMembership($entity, $entity->getOwner());
     $membership->save();
   }
@@ -177,6 +174,47 @@ function og_entity_access(EntityInterface $entity, $operation, AccountInterface
   return AccessResult::forbidden();
 }
 
+/**
+ * Implements hook_ENTITY_TYPE_access().
+ */
+function og_og_membership_type_access(OgMembershipTypeInterface $entity, $operation, AccountInterface $account) {
+  // Do not allow deleting the default membership type.
+  if ($operation === 'delete' && $entity->id() === OgMembershipInterface::TYPE_DEFAULT) {
+    return AccessResult::forbidden();
+  }
+
+  // If the user has permission to administer all groups, allow access.
+  if ($account->hasPermission('administer group')) {
+    return AccessResult::allowed();
+  }
+
+  return AccessResult::forbidden();
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_access().
+ */
+function og_og_membership_access(OgMembershipInterface $entity, $operation, AccountInterface $account) {
+  $group = $entity->getGroup();
+
+  // If there's a group owner, don't let them leave.
+  if (
+    isset($group_fields['uid'])
+    && $operation === 'delete'
+    && $group_fields['uid']->entity->id() === $entity->getOwner()->id()
+  ) {
+    return AccessResult::forbidden();
+  }
+
+  // Ensure that there's at least one member in the group.
+  if ($operation === 'delete' && \Drupal::service('og.membership_manager')->getGroupMembershipCount($group) === 1) {
+    return AccessResult::forbidden();
+  }
+
+  return \Drupal::service('og.access')
+    ->userAccess($entity->getGroup(), 'manage members');
+}
+
 /**
  * Implements hook_entity_create_access().
  */
@@ -378,6 +416,11 @@ function og_og_role_insert(OgRoleInterface $role) {
     return;
   }
 
+  // Do not create config while config import is in progress.
+  if (\Drupal::isConfigSyncing()) {
+    return;
+  }
+
   $add_id = 'og_membership_add_single_role_action.' . $role->getName();
   if (!Action::load($add_id)) {
     $action = Action::create([