Commit Graph

1954 Commits

Author SHA1 Message Date
Michael Stenta b0a45f357b Include symfony/finder in require-dev to fix version pinning issue when using composer-merge-plugin.
Resolves:

Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - drupal/core-dev[9.2.0-alpha1, ..., 9.2.x-dev] require symfony/finder ^4.4 -> found symfony/finder[v4.4.0-BETA1, ..., 4.4.x-dev] but the package is fixed to v5.3.7 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
    - Root composer.json requires drupal/core-dev ~9.2.0 -> satisfiable by drupal/core-dev[9.2.0-alpha1, ..., 9.2.x-dev].
2021-09-28 13:54:43 -04:00
Michael Stenta bd33d0f139 Issue #3239420: Use composer-merge-plugin to manage project composer.json dependencies
This enables more of the dependencies and configuration that need to be
present in the root project composer.json to be managed in the farmOS
repository itself, including drupal/core-composer-scaffold and
drupal/core-dev, which should match the drupal/core version defined in
the farmOS composer.json.

Previously these were declared in the project composer.json template
in https://github.com/farmOS/composer-project. This configuraton is
used as a template when a new farmOS project is created via
`composer create-project farmos/project`, but after initial setup it
is maintained by the end user. This means that updates to the project
composer.json generally requires the end-user to make changes
manually. This would be required every time farmOS requires a minor
version update of Drupal core.

So instead, we can manage those update in this new composer.project.json,
and use wikimedia/composer-merge-plugin to merge that into the project
composer.json. This allows the project composer.json to be much simpler,
and therefore will require less frequent manual updates.
2021-09-28 13:54:43 -04:00
Michael Stenta 092b6936d4 Clarify that farm_update only reverts configuration entities - not simple config. 2021-09-27 09:50:22 -04:00
paul121 3a46ccb60b Issue #3239191 by paul121: Change farm_update to ignore simple config 2021-09-27 09:50:10 -04:00
Michael Stenta fa3ead44a1 Remove redundant properties from composer.libraries.json. 2021-09-26 16:34:49 -04:00
Michael Stenta 1d0dd9c053 Update to Drupal 9.2 #449 2021-09-24 14:29:51 -04:00
Michael Stenta da6888f75d Use default test result printer now that updated version of HtmlOutputPrinter is available. 2021-09-24 14:29:29 -04:00
Michael Stenta 405749bed0 Update patch for Issue #2339235. 2021-09-24 14:29:29 -04:00
Michael Stenta fdfa953e71 Update drupal/core to ~9.2.0. 2021-09-24 14:29:29 -04:00
Symbioquine efb8535150 Improve plan archive timestamp behavior #446
**Why?** Fix some weird behavior and make sure
  inconsistent states cannot occur;

* Allow setting the archived timestamp at the same
  time as moving a plan to the archived state.
* Ensure that the archived timestamp cannot be set
  without also transitioning into the archived state.
* Ensure that the arhived timestamp cannot be set to
  NULL without transitioning back to the active state.
2021-09-24 12:36:14 -04:00
Symbioquine 27142866d3 Improve asset archive timestamp behavior #446
**Why?** Fix some weird behavior and make sure
inconsistent states cannot occur;

* Allow setting the archived timestamp at the same
  time as moving an asset to the archived state.
* Ensure that the archived timestamp cannot be set
  without also transitioning into the archived state.
* Ensure that the arhived timestamp cannot be set to
  NULL without transitioning back to the active state.
2021-09-24 12:36:14 -04:00
Michael Stenta 20ceb84193 Move ID Tag base field to farm_id_tag. 2021-09-24 12:23:01 -04:00
Michael Stenta e9e523c095 Move flag base field, action, config, and logic to farm_flag. 2021-09-24 12:22:25 -04:00
Michael Stenta 0029cfbf01 Move Views stuff from farm_entity to new farm_entity_views sub-module. 2021-09-24 12:21:15 -04:00
Michael Stenta 9e26868112 Move base field definitions from farm_entity to new farm_entity_fields sub-module. 2021-09-24 12:21:15 -04:00
Michael Stenta 10f486e606 Merge branch '2.x-owner' into 2.x 2021-09-24 12:20:53 -04:00
Michael Stenta 792c24edce When a log is saved without owner(s), set the current user as the owner. 2021-09-24 11:50:32 -04:00
Michael Stenta 1502115bc7 Move log assignment action to farm_owner module. 2021-09-24 11:50:32 -04:00
Michael Stenta 0f84ff1575 Move Log Owner base field to dedicated farm_owner module. 2021-09-24 11:50:32 -04:00
Michael Stenta 1f0c254e79 Remove explicit dependency on farm_flag from farm_maintenance. 2021-09-24 11:50:02 -04:00
paul121 6646a31d37 Log the result after reverting config. #447 2021-09-24 10:03:19 -04:00
Michael Stenta c26ac4f5a2 Bump Gin to alpha36. 2021-09-24 09:41:46 -04:00
paul121 585f3eaecb Add missing default_measure key for material quantity. #448 2021-09-24 07:30:32 -04:00
Michael Stenta e0e34d6e01 The farm_geo module depends on geofield for the geofield.geophp service. 2021-09-23 16:54:55 -04:00
Michael Stenta bc7af7bd47 Issue #3220627: Optionally apply configuration changes automatically 2021-09-23 10:05:49 -04:00
Michael Stenta 74bbbd180f Document that it may be necessary to clear caches after farmOS updates. 2021-09-23 10:01:41 -04:00
Michael Stenta db40dc13a6 Exclude system.performance config from automatic updates. 2021-09-23 09:55:41 -04:00
Michael Stenta b08c9ab1b5 Exclude user.role.anonymous and user.role.authenticated config from automatic updates. 2021-09-23 09:55:41 -04:00
Michael Stenta 7eccc896cd Document farmOS Update module's automatic configuration updates and exclusion options. 2021-09-23 09:55:41 -04:00
Michael Stenta d51176aef1 Automated tests of farmOS Update module. 2021-09-23 09:55:41 -04:00
Michael Stenta f575b0039f Exclude farm_update.settings config from automatic updates, just to be safe. 2021-09-23 09:55:41 -04:00
Michael Stenta f881bea2e3 Allow additional config exclusions to be defined in farm_update.settings. 2021-09-23 09:55:41 -04:00
Michael Stenta e36ac7a33f Exclude quantity.settings config from automatic updates. 2021-09-23 09:55:41 -04:00
Michael Stenta 938fb5926c Exclude config that we override in hook_install(). 2021-09-23 09:55:41 -04:00
Michael Stenta a46c0923a0 Exclude core configuration items from automatic updates. 2021-09-23 09:55:41 -04:00
Michael Stenta 24d158341f Add a hook_farm_update_exclude_config() to allow modules to exclude config from automatic updates. 2021-09-23 09:55:41 -04:00
Michael Stenta 95702e5be4 Log when reverting config fails. 2021-09-23 09:55:41 -04:00
Michael Stenta 8d034c5186 Revert overridden configuration on rebuild().
Inspired by ConfigUpdateUiCliService.
2021-09-23 09:55:41 -04:00
Michael Stenta 59dd58a962 Provide a farm_update:rebuild Drush command. 2021-09-23 09:55:41 -04:00
Michael Stenta 039eb0fbf5 Run FarmUpdate::rebuild() via hook_rebuild(). 2021-09-23 09:55:41 -04:00
Michael Stenta 2dd6a268f8 Initial farm.update service with rebuild() method. 2021-09-23 09:55:41 -04:00
Michael Stenta fbb589655d Initial farm_update module.
Installed with base modules.
2021-09-23 09:55:41 -04:00
Symbioquine cc01293168 Update testing docs to reflect recent changes #445
**Why?** The docs were out of date - not capturing the
need for a Chrome/Selenium container and including info
about an XDebug work-around that isn't needed any more.
2021-09-23 09:44:54 -04:00
Michael Stenta 9e7598955c Issue #3236712 by evamtinez, m.stenta: Allow render custom blocks in the dashboard 2021-09-22 15:18:49 -04:00
Michael Stenta 7092a0830f Refactor dashboard block handling to always expect block plugin ID. 2021-09-22 15:17:17 -04:00
Eva Martinez 3ea20c1d63 #3236712: Renamed block plugin variable and use the renamed dashboard pane key and simplify block access check. 2021-09-22 15:10:31 -04:00
Eva Martinez ddefa1e2c9 #3236712: Rename new dashboard pane key. 2021-09-22 15:10:31 -04:00
Eva Martinez af786a9abc #3236712: Added functionality to render custom blocks in dashboard. 2021-09-22 15:10:31 -04:00
Eva Martinez 62562def8f #3236712: Added new plugin block key to dashboard pane. 2021-09-22 15:10:31 -04:00
Michael Stenta 2170fd57c4 Issue #3196834 by s33a, paul121, m.stenta, Symbioquine: Material assets, types, quantities, inventory, and filtering 2021-09-22 14:45:37 -04:00