Merge branch '6.x' into feature/user-permissions

Author: riasvdv

CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ## Unreleased
 
+- Fixed a bug where remove buttons within multi-select Selectize inputs weren’t working if the input wasn’t focusend and fully in view. ([#18079](https://github.com/craftcms/cms/issues/18079))
+- Fixed an error that could occur when executing a GraphQL mutation when the `lazyGqlTypes` config setting was enabled. ([#18014](https://github.com/craftcms/cms/issues/18014))
 - Fixed a bug where font icons weren’t hidden from screen readers. ([#18078](https://github.com/craftcms/cms/pull/18078))
+- Fixed a bug where relation fields weren’t handling `:empty:`/`:notempty:` element query params properly if the field had multiple instances within a field layout. ([#18092](https://github.com/craftcms/cms/pull/18092))
 
 ## 5.8.20 - 2025-11-18
 

composer.lock

@@ -6,6 +6,7 @@
 use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
 use RectorLaravel\Rector\ArrayDimFetch\EnvVariableToEnvHelperRector;
 use RectorLaravel\Rector\Class_\AnonymousMigrationsRector;
+use RectorLaravel\Rector\FuncCall\AppToResolveRector;
 use RectorLaravel\Rector\MethodCall\ResponseHelperCallToJsonResponseRector;
 use RectorLaravel\Rector\MethodCall\UseComponentPropertyWithinCommandsRector;
 use RectorLaravel\Set\LaravelSetList;
@@ -28,6 +29,7 @@
         EnvVariableToEnvHelperRector::class => [
             __DIR__.'/src/Utility/Utilities/PhpInfo.php',
         ],
+        AppToResolveRector::class,
     ])
     ->withSetProviders(LaravelSetProvider::class)
     ->withComposerBased(laravel: true)

rector.php

@@ -213,6 +213,12 @@
         },
         onChange: onChange,
         onInitialize: function () {
+            // this is needed so that you can delete selected item when the field is not fully in viewport
+            // see https://github.com/craftcms/cms/issues/18079 for details
+            {% if multi %}
+                this.isFocused = true;
+            {% endif %}
+
             // Copy all ARIA attributes from initial select to selectize
             [...$select[0].attributes]
                 .filter(attr => /^aria-/.test(attr.name))

resources/templates/_includes/forms/selectize.twig

@@ -38,8 +38,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Validation\Rule;
 use Override;
-use Twig\Error\RuntimeError;
-use yii\base\InvalidConfigException;
 
 use function CraftCms\Cms\t;
 
@@ -717,7 +715,7 @@ public function getInputSources(?ElementInterface $element = null): array
             $sources = array_merge($this->sources);
         } else {
             $sources = [];
-            foreach (app(ElementSources::class)->getSources(Asset::class) as $source) {
+            foreach (resolve(ElementSources::class)->getSources(Asset::class) as $source) {
                 if ($source['type'] !== ElementSources::TYPE_HEADING) {
                     $sources[] = $source['key'];
                 }
@@ -931,60 +929,15 @@ private function _findFolder(string $sourceKey, ?string $subpath, ?ElementInterf
             throw new InvalidFsException("Invalid source key: $sourceKey");
         }
 
-        $assetsService = Craft::$app->getAssets();
-        $rootFolder = $assetsService->getRootFolderByVolumeId($volume->id);
-
-        // Are we looking for the root folder?
-        $subpath = trim($subpath ?? '', '/');
-        if ($subpath === '') {
-            return $rootFolder;
-        }
-
-        $isDynamic = preg_match('/\{|\}/', $subpath);
-
-        if ($isDynamic) {
-            // Prepare the path by parsing tokens and normalizing slashes.
-            try {
-                if ($element?->duplicateOf) {
-                    $element = $element->duplicateOf->getCanonical();
-                }
-                $renderedSubpath = Craft::$app->getView()->renderObjectTemplate($subpath, $element);
-            } catch (InvalidConfigException|RuntimeError $e) {
-                throw new InvalidSubpathException($subpath, null, 0, $e);
-            }
-
-            // Did any of the tokens return null?
-            if (
-                $renderedSubpath === '' ||
-                trim((string) $renderedSubpath, '/') != $renderedSubpath ||
-                str_contains((string) $renderedSubpath, '//') ||
-                str($renderedSubpath)->explode('/')->contains(fn (string $segment) => ElementHelper::isTempSlug($segment))
-            ) {
-                throw new InvalidSubpathException($subpath);
-            }
-
-            // Sanitize the subpath
-            $subpath = str($renderedSubpath)
-                ->explode('/')
-                ->filter(fn (string $segment): bool => $segment !== ':ignore:')
-                ->map(fn (string $segment): string => FileHelper::sanitizeFilename($segment, [
-                    'asciiOnly' => Cms::config()->convertFilenamesToAscii,
-                ]))
-                ->implode('/');
-        }
-
-        $folder = $assetsService->findFolder([
-            'volumeId' => $volume->id,
-            'path' => $subpath.'/',
-        ]);
+        [$subpath, $folder] = AssetsHelper::resolveSubpath($volume, $subpath, $element);
 
         // Ensure that the folder exists
         if (! $folder) {
             if (! $createDynamicFolders) {
                 throw new InvalidSubpathException($subpath);
             }
 
-            $folder = $assetsService->ensureFolderByFullPathAndVolume($subpath, $volume);
+            $folder = Craft::$app->getAssets()->ensureFolderByFullPathAndVolume($subpath, $volume);
         }
 
         return $folder;

resources/translations/cy/app.php

@@ -18,6 +18,7 @@
 use craft\elements\db\ElementRelationParamParser;
 use craft\elements\ElementCollection;
 use craft\events\ElementCriteriaEvent;
+use craft\fieldlayoutelements\BaseField;
 use craft\fieldlayoutelements\CustomField;
 use craft\fields\conditions\RelationalFieldConditionRule;
 use craft\helpers\Cp;
@@ -140,8 +141,33 @@ public static function modifyQuery(Builder $query, array $instances, mixed $valu
         }
 
         if (isset($value[0]) && in_array($value[0], [':notempty:', ':empty:', 'not :empty:'])) {
-            $emptyCondition = array_shift($value);
-            if (in_array($emptyCondition, [':notempty:', 'not :empty:'])) {
+            $emptyParam = array_shift($value);
+
+            if (self::isQueryConditionFieldMultiInstance($instances)) {
+                // look at the JSON values rather than the `relations` table data
+                // (see https://github.com/craftcms/cms/issues/17290 + https://github.com/craftcms/cms/pull/18092)
+                if (in_array($emptyParam, [':notempty:', 'not :empty:'])) {
+                    $query->orWhere(function (Builder $query) use ($instances) {
+                        foreach ($instances as $instance) {
+                            $valueSql = $instance->getValueSql();
+                            $query->orWhere(function (Builder $query) use ($valueSql) {
+                                $query->whereNotNull($valueSql)
+                                    ->whereNot($valueSql, '[]');
+                            });
+                        }
+                    });
+                } else {
+                    $query->orWhere(function (Builder $query) use ($instances) {
+                        foreach ($instances as $instance) {
+                            $valueSql = $instance->getValueSql();
+                            $query->where(function (Builder $query) use ($valueSql) {
+                                $query->whereNotNull($valueSql)
+                                    ->whereNot($valueSql, '[]');
+                            });
+                        }
+                    });
+                }
+            } elseif (in_array($emptyParam, [':notempty:', 'not :empty:'])) {
                 $query->orWhereExists(static::existsQuery($field));
             } else {
                 $query->orWhereNotExists(static::existsQuery($field));
@@ -173,6 +199,26 @@ public static function modifyQuery(Builder $query, array $instances, mixed $valu
         return $query;
     }
 
+    /**
+     * @param  self[]  $instances
+     */
+    private static function isQueryConditionFieldMultiInstance(array $instances): bool
+    {
+        foreach ($instances as $instance) {
+            // See if this instance is used multiple times within its field layout
+            $allInstances = $instance->layoutElement?->getLayout()->getFields(fn (BaseField $field) => (
+                $field instanceof CustomField &&
+                $field->getFieldUid() === $instance->uid
+            ));
+
+            if ($allInstances && count($allInstances) > 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Returns a query builder-compatible condition for an element query,
      * limiting the results to only elements where the given relation field has a value.
@@ -441,7 +487,7 @@ public function validateSources(string $attribute): void
             $inputSources = [$inputSources];
         }
 
-        $elementSources = app(ElementSources::class)
+        $elementSources = resolve(ElementSources::class)
             ->getSources(static::elementType())
             ->whereIn('key', $inputSources);
 
@@ -1117,7 +1163,7 @@ public function getContentGqlMutationArgumentType(): array
      */
     protected function gqlFieldArguments(): array
     {
-        $elementSourcesService = app(ElementSources::class);
+        $elementSourcesService = resolve(ElementSources::class);
         $gqlService = Craft::$app->getGql();
         $fieldLayouts = [];
         $arguments = [];
@@ -1729,7 +1775,7 @@ protected function viewMode(): string
      */
     protected function availableSources(): array
     {
-        return app(ElementSources::class)
+        return resolve(ElementSources::class)
             ->getSources(static::elementType(), 'modal')
             ->where('type', '!=', ElementSources::TYPE_HEADING)
             ->values()

src/Field/Assets.php

@@ -587,8 +587,7 @@ protected function actionMenuItems(): array
             return $items;
         }
 
-        $userSessionService = Craft::$app->getUser();
-        if (! $userSessionService->getIsAdmin()) {
+        if (! Craft::$app->getUser()->getIsAdmin()) {
             return $items;
         }
 
@@ -616,29 +615,6 @@ protected function actionMenuItems(): array
             ]);
         }
 
-        // Copy field handle
-        if (! $userSessionService->getIdentity()->getPreference('showFieldHandles')) {
-            $copyId = sprintf('action-copy-handle-%s', mt_rand());
-            $items[] = [
-                'id' => $copyId,
-                'icon' => 'clipboard',
-                'label' => t('Copy field handle'),
-            ];
-            $view->registerJsWithVars(fn ($id, $attribute) => <<<JS
-(() => {
-$('#' + $id).on('activate', () => {
-Craft.ui.createCopyTextPrompt({
-  label: Craft.t('app', 'Field Handle'),
-  value: $attribute,
-})
-});
-})();
-JS, [
-                $view->namespaceInputId($copyId),
-                $this->handle,
-            ]);
-        }
-
         return $items;
     }
 
@@ -898,7 +874,7 @@ public function getSortOption(): array
         // see https://github.com/craftcms/cms/issues/15609
         $db = Craft::$app->getDb();
         if ($db->getIsMysql() && is_string($dbType) && DbHelper::parseColumnType($dbType) === Schema::TYPE_TEXT) {
-            $orderBy = "CAST($orderBy AS CHAR(255))";
+            $orderBy = new Cast($orderBy, 'CHAR(255)');
         }
 
         // The attribute name should match the table attribute name,

src/Field/BaseRelationField.php

@@ -8,6 +8,20 @@
 use Override;
 
 /**
+ * @method static \Illuminate\Support\Collection getAllGroups()
+ * @method static \Illuminate\Support\Collection getAssignableGroups(\craft\elements\User|null $user = null)
+ * @method static \CraftCms\Cms\User\Data\UserGroup|null getGroupById(int $groupId)
+ * @method static \CraftCms\Cms\User\Data\UserGroup|null getGroupByUid(string $uid)
+ * @method static \CraftCms\Cms\User\Data\UserGroup|null getGroupByHandle(string $groupHandle)
+ * @method static \CraftCms\Cms\User\Data\UserGroup getTeamGroup()
+ * @method static \Illuminate\Support\Collection getGroupsByUserId(int $userId)
+ * @method static void eagerLoadGroups(\craft\elements\User[] $users)
+ * @method static bool saveGroup(\CraftCms\Cms\User\Data\UserGroup $group)
+ * @method static void handleChangedUserGroup(\CraftCms\Cms\ProjectConfig\Events\ConfigEvent $event)
+ * @method static void handleDeletedUserGroup(\CraftCms\Cms\ProjectConfig\Events\ConfigEvent $event)
+ * @method static bool deleteGroupById(int $groupId)
+ * @method static bool deleteGroup(\CraftCms\Cms\User\Data\UserGroup $group)
+ *
  * @see \CraftCms\Cms\User\UserGroups
  */
 final class UserGroups extends Facade

src/Field/Field.php

@@ -46,13 +46,13 @@
 test('require2fa only gets saved when above team edition', function () {
     Edition::set(Edition::Solo);
 
-    expect(ProjectConfig::get('users.require2fa'))->toBeFalsy(false);
+    expect(ProjectConfig::get('users.require2fa'))->toBeFalsy();
 
     post(action([UserSettingsController::class, 'store'], [
         'require2fa' => true,
     ]))->assertRedirectBack();
 
-    expect(ProjectConfig::get('users.require2fa'))->toBeFalsy(false);
+    expect(ProjectConfig::get('users.require2fa'))->toBeFalsy();
 
     Edition::set(Edition::Team);