Merge remote-tracking branch 'origin/4.0.x' into checksum_access

* origin/4.0.x: (41 commits)
  patch from issue 3420771 (eileenmcnaughton#475)
  only check for data in enabled components on module uninstall (eileenmcnaughton#476)
  Adds is Empty/NULL operators (eileenmcnaughton#423)
  Pathauto (eileenmcnaughton#470)
  fix test to use string instead of integer for zip code (eileenmcnaughton#474)
  4.0.x field mappings (eileenmcnaughton#430)
  Adding a raw value function to return value from values array (eileenmcnaughton#465)
  Add filter for state province. (eileenmcnaughton#453)
  Update default timezone handling for dates in CiviEntityStorage.php (eileenmcnaughton#461)
  fix testLoadContact birthdate assertion (eileenmcnaughton#472)
  port to 4.0.x from 436: Include dblocale table names in list of civicrm entity info (eileenmcnaughton#438)
  Ignore convert to UTC if custom field is date only (eileenmcnaughton#469)
  update contact entity referece field on contact merge (eileenmcnaughton#456)
  update test versions of Drupal 10.2 and CiviCRM 5.69 (eileenmcnaughton#468)
  Clean value on custom field for Float (Number) and Money field type (eileenmcnaughton#463)
  From eileenmcnaughton#378 for 4.0.x (eileenmcnaughton#466)
  Add reset to the file URLs generated. (eileenmcnaughton#458)
  fix Views field custom date field output for year only (eileenmcnaughton#439)
  update Add Contact to Group Views Bulk operations action plugin access handler (eileenmcnaughton#464)
  Readme update (eileenmcnaughton#457)
  ...

.github/workflows/main.yml

@@ -15,7 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - drupal: '10.0.*'
+          - drupal: '10.2.*'
+            civicrm: '5.69.*'
+          - drupal: '10.2.*'
             civicrm: 'dev-master'
     name: Drupal ${{ matrix.drupal }} | CiviCRM ${{ matrix.civicrm }}
     services:

README.md

@@ -1,19 +1,8 @@
-# CiviCRM Entity for Drupal 8
+# CiviCRM Entity for Drupal 10
 
-## Installing 8.x-3.0-Beta2 or later.
+## Installing 4.0.0-alpha7 or later.
 
-From 8.x-3.0-Beta2 onwards this module should be installable with normal Drupal composer install steps, `composer require drupal/civicrm_entity`.
-
-## Installing 8.x-3.0-Beta1 or earlier Drupal 8 versions.
-
-Due to a [bug](https://www.drupal.org/project/project_composer/issues/3051746) with Drupal.org's composer facade. It's not possible to simply `composer require drupal/civicrm_entity` without some preparation.
-
-To get CiviCRM Entity installed with composer the following steps will work:
-
-1. Add the CiviCRM Entity repository to your composer.json:  
-    `composer config repositories.civicrm_entity vcs https://github.com/eileenmcnaughton/civicrm_entity`
-2. Require CiviCRM Entity's `8.x-3.x` git branch:  
-    `composer require drupal/civicrm_entity:dev-8.x-3.x`
+This module is installable with normal Drupal composer install steps, `composer require drupal/civicrm_entity`.
 
 **Note:**
 
@@ -22,8 +11,82 @@ You should ensure that your `composer.json` file has versioned requirements for
 For example:
 
 ``` json
-       "civicrm/civicrm-core": "^5.19",
-       "civicrm/civicrm-drupal-8": "^5.19",
+       "civicrm/civicrm-core": "^5.63",
+       "civicrm/civicrm-packages": "^5.63",
+       "civicrm/civicrm-drupal-8": "^5.63",
 ```
+## CiviCRM Entity Leaflet upgrade to Drupal 10
+
+In the 4.0.x version the civicrm_entity_leaflet module has been removed from the main module repo and put into its own module project http://drupal.org/project/civicrm_entity_leaflet
+
+If upgrading from Drupal 9 to Drupal 10, simply include that module:
+`composer require drupal/civicrm_entity_leaflet`
+
+## Version support
+
+8.x-3.x for Drupal 9 Known to work with CiviCRM 5.51+
+4.0.x for Drupal 10 Requires CiviCRM 5.60+
+
+We do our best to support as many versions of CiviCRM Core as is feasible. 
+
+CiviCRM Entity is primarily tested and developed with a focus on Extended Support Release (ESR) versions of CiviCRM. Updates needed due to CiviCRM Core are typically driven by reported issues or contributed changes. While it's uncommon for a newer CiviCRM version to encounter issues, for best success use the ESR version.
+https://civicrm.org/esr
+
+## Issues
+
+For bug reports, support requests, or feature requests please create an issue in the Drupal.org issue queue https://www.drupal.org/project/issues/civicrm_entity
+
+
+## Contribution
+
+Primary development happens in the github repo: https://github.com/eileenmcnaughton/civicrm_entity
+
+Please make PRs against the 4.0.x branch first. Changes will be merged there, and then backported to the 8.x-3.x branch.
+
+We do plan on shifting primary development to the drupal.org Gitlab infrastructure in time.
+
+
+### Develop with the most recent version versions.
+
+To get CiviCRM Entity github repo installed with composer the following steps will work:
+
+1. Add the CiviCRM Entity repository to your composer.json:  
+    `composer config repositories.civicrm_entity vcs https://github.com/eileenmcnaughton/civicrm_entity`
+2. Require CiviCRM Entity's `4.0.x` git branch:  
+    `composer require drupal/civicrm_entity:dev-4.0.x`
+
+## Get support now
+
+CiviCRM Entity is open source software. Its support and improvement depends upon the good will and contribution of open source developers' time and the investment of money by individuals and organizations.
+
+We do our best to answer requests and fix bugs, and are committed to continuing development and supporting the module as both Drupal Core and CiviCRM evolve.
+
+Primary development is managed by [Skvare](https://skvare.com), but a community of developers supports and contributes to the module.
+
+If you or your organization has specific or immediate needs, or simply wishes to support the continued development and maintenance of CiviCRM Entity you can [Contact Skvare](https://skvare.com/contact) and our dedicated team of account managers, business analysts, project managers, and developers will work to get the solution you need, as fast as we can.
+
+## Developers
+
+[Mark Hanna](https://www.drupal.org/u/markusa), Architect and Senior Developer at Skvare, module maintainer.
+
+[Arnold French](https://www.drupal.org/u/dsdeiz), Developer at Skvare
+
+[Eileen Mcnaughton](https://github.com/eileenmcnaughton) Original creator of CiviCRM Entity, and tireless contributor to CiviCRM core and a multitude of CiviCRM Extensions
+
+[Matt Glaman](https://www.drupal.org/u/mglaman) Initial development of the Drupal 8 version was a massive contribution.
+
+[Jitendra Purohit](https://www.drupal.org/u/jitendrapurohit) Developer and contributor
+
+See all contributors: https://github.com/eileenmcnaughton/civicrm_entity/graphs/contributors
+
+## Supporting Organizations
+
+[Skvare](https://skvare.com) Skvare Supporting and managing CiviCRM since 2008. [Every Skvare team member](https://skvare.com/about) has a hand in CiviCRM Entity's continued development.
+
+[Fuzion](https://www.drupal.org/fuzion) Founding organization of the initial versions of CiviCRM Entity, and steady support and contribution throughout the years.
+
+[SemperIT](https://semper-it.com/) Sponsors contribution from D8 onwards
+
+[CiviCRM Core Team](https://civicrm.org/about/core-team) For creating CiviCRM, and supporting us all and Drupal integration in general.
 
-By default the **RoundEarth** method uses `dev-master` for `civicrm/civicrm-drupal-8` - this is [dangerous and not recommended](https://lab.civicrm.org/dev/drupal/issues/87#note_23534)!
+[MyDropWizard](https://www.drupal.org/mydropwizard) Original funding for the Drupal 8 version, and the composerization of CiviCRM

civicrm_entity.install

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the civicrm_entity module.
+ */
+
+/**
+ * Implements hook_install().
+ */
+function civicrm_entity_install() {
+  module_set_weight('civicrm_entity', 1);
+}
+
+/**
+ * Set the module weight.
+ */
+function civicrm_entity_update_8001() {
+  module_set_weight('civicrm_entity', 1);
+}
+
+/**
+ * Enable Drupal pages for enabled entity types.
+ */
+function civicrm_entity_update_8002() {
+  $config = \Drupal::service('config.factory')->getEditable('civicrm_entity.settings');
+  $enable_links_per_type = [];
+
+  foreach ($config->get('enabled_entity_types') as $entity_type) {
+    $enable_links_per_type[$entity_type]['values'] = [
+      'view' => 'view',
+      'add' => 'add',
+      'edit' => 'edit',
+      'delete' => 'delete',
+    ];
+  }
+
+  $config
+    ->set('enable_links_per_type', $enable_links_per_type)
+    ->save();
+}

civicrm_entity.libraries.yml

@@ -3,3 +3,12 @@ form:
   css:
     theme:
       css/civicrm_entity.form.css: {}
+
+states:
+  version: VERSION
+  js:
+    js/civicrm_entity.states.js: {}
+  dependencies:
+    - core/drupal
+    - core/jquery
+    - core/once