[5.x]: Apply changes via EVENT_BEFORE_SAVE does not propagate on first save

[Wiejeben]

What happened?

Description

When applying changes to my entry via EVENT_BEFORE_SAVE it does not propagate these changes on the first save (vendor/craftcms/cms/src/services/Drafts.php:402). This is unexpected behaviour since saving the second time does propagate.

Steps to reproduce

1. Create a section that is applied to at least two sites.
2. Create two fields that are both non-translatable (in this case productPriceWebshop and productPriceRetail).
3. Use this little sample script, it applies the value of productPriceRetail to productPriceWebshop only when productPriceWebshop has a falsely value.

Event::on(Entry::class, Element::EVENT_BEFORE_SAVE, function ($event) {
    $entry = $event->sender;

    if (! $entry instanceof Entry) {
        return;
    }

    if (ElementHelper::isDraftOrRevision($entry)) {
        return;
    }

    $section = $entry->section;
    if (! $section) {
        return;
    }

    if ($section->handle === 'products') {
        if (! $entry->productPriceWebshop) {
            $entry->productPriceWebshop = $entry->productPriceRetail;
        }
    }
});

3. Create an entry within that section, enter a value into productPriceRetail and save the entry
4. You'll see that productPriceWebshop now has a copy of that value on the site that it was being saved from, however this value is not applied to the other site.
5. If you now re-save the entry the value would be propegated.

Expected behavior

I expect the value of any non-translatable fields to be consistent across all of my sites. However since that is probably not how this works instead I'd like to have the ability to at least catch the $entry->firstSave and somehow manually propagate the changes?

Craft CMS version

5.8.16

PHP version

8.3.20

Operating system and version

No response

Database type and version

No response

Image driver and version

No response

Installed plugins and versions

[linear]

CMS-1582 [5.x]: Apply changes via EVENT_BEFORE_SAVE does not propagate on first save

[Wiejeben]

I know if I allow draft changes from performing the value change on productPriceWebshop it would fix it however there might be a scenario where the firstSave update would have new value thats altered from the last draft save.

Also this is just an example, in reality I perform an API request and calculate some data in.

[brandonkelly]

The reason for this is, when creating a new entry, the only time that your conditions are going to actually pass when first fully saving a new entry is here, where Craft is removing the provisional draft data from the entry:

cms/src/services/Drafts.php

Line 402 in 3daa5c8

if ($draft->hasErrors() || !Craft::$app->getElements()->saveElement($draft, false, false)) {

By this point, it’s expected that the (formerly-draft) entry content is already exactly as it should be, so we pass false to the propagate argument.

To fix, I’d suggest you replace your ElementHelper::isDraftOrRevision() condition with $entry->getIsDerivative(), which will cover drafts and revisions, except for unpublished drafts (the state entries begin life as).