[6.x] Elements

CHANGELOG-WIP.md

@@ -52,7 +52,7 @@
 - Deprecated `craft\enums\Color`. `CraftCms\Cms\Support\Enums\Color` should be used instead.
 - Deprecated `craft\enums\AttributeStatus`. `CraftCms\Cms\Element\Enums\AttributeStatus` should be used instead.
 - Deprecated `craft\enums\CmsEdition`. `CraftCms\Cms\Edition` should be used instead.
-- Deprecated `craft\enums\ElementIndexViewMode`. `CraftCms\Cms\Field\Enums\ElementIndexViewMode` should be used instead.
+- Deprecated `craft\enums\ElementIndexViewMode`. `CraftCms\Cms\Element\Enums\ElementIndexViewMode` should be used instead.
 - Deprecated `craft\enums\LicenseKeyStatus`. `CraftCms\Cms\Support\Enums\LicenseKeyStatus` should be used instead.
 - Deprecated `craft\enums\MenuItemType`. `CraftCms\Cms\Element\Enums\MenuItemType` should be used instead.
 - Deprecated `craft\enums\PropagationMethod`. `CraftCms\Cms\Element\Enums\PropagationMethod` should be used instead.
@@ -440,7 +440,7 @@ Craft 6 now uses [Laravel's authorization system](https://laravel.com/docs/12.x/
   - Deprecated `craft\services\Elements::trackActivity()`. `CraftCms\Cms\Element\ElementActivity::trackActivity()` should be used instead.
 - Added `CraftCms\Cms\Element\Actions\ElementAction`, `CraftCms\Cms\Element\ElementActions`, `CraftCms\Cms\Element\Contracts\DeleteActionInterface`, `CraftCms\Cms\Element\Contracts\ElementActionInterface`, `CraftCms\Cms\Element\Events\AfterPerformAction`, `CraftCms\Cms\Element\Events\BeforePerformAction`, `CraftCms\Cms\Http\Controllers\Elements\PerformElementActionController`, and `CraftCms\Cms\Support\Facades\ElementActions`.
 - Added Laravel-native element action classes under `CraftCms\Cms\Element\Actions`, `CraftCms\Cms\Asset\Actions`, `CraftCms\Cms\Entry\Actions`, and `CraftCms\Cms\User\Actions`.
-- Added `CraftCms\Cms\Element\ElementExporters`, `CraftCms\Cms\Element\Contracts\ElementExporterInterface`, `CraftCms\Cms\Element\Exporters\ElementExporter`, `CraftCms\Cms\Http\Controllers\Elements\ExportElementIndexController`, and `CraftCms\Cms\Support\Facades\ElementExporters`.
+- Added `CraftCms\Cms\Element\ElementExporters`, `CraftCms\Cms\Element\Contracts\ElementExporterInterface`, `CraftCms\Cms\Element\Exporters\ElementExporter`, `CraftCms\Cms\Http\Controllers\Elements\ElementIndex\ExportElementIndexController`, and `CraftCms\Cms\Support\Facades\ElementExporters`.
 - Added Laravel-native element exporter classes under `CraftCms\Cms\Element\Exporters`.
 - Deprecated `craft\errors\InvalidTypeException`. `CraftCms\Cms\Element\Exceptions\InvalidTypeException` should be used instead.
 - Deprecated `craft\errors\UnsupportedSiteException`. `CraftCms\Cms\Element\Exceptions\UnsupportedSiteException` should be used instead.

database/Factories/AddressFactory.php

@@ -4,11 +4,11 @@
 
 namespace CraftCms\Cms\Database\Factories;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address as AddressElement;
 use CraftCms\Cms\Address\Models\Address;
 use CraftCms\Cms\Database\Factories\Concerns\CreatesElement;
 use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Models\Element;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\DB;

database/Factories/EntryFactory.php

@@ -16,6 +16,7 @@
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Facades\EntryTypes;
 use CraftCms\Cms\Support\Facades\Fields;
+use CraftCms\Cms\Support\Facades\Search;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Override;
 
@@ -97,6 +98,13 @@ public function withFieldLayout(FieldLayout|FieldLayoutFactory $fieldLayout): st
         });
     }
 
+    public function indexed(): static
+    {
+        return $this->afterCreating(function (Entry $entry) {
+            Search::indexElementAttributes($this->queryElement($entry->id));
+        });
+    }
+
     public function createElement(array $attributes = []): EntryElement
     {
         $factory = $this;

resources/templates/_components/fieldtypes/Assets/input.twig

@@ -11,7 +11,7 @@
     sources: sources,
     condition: condition ? condition.getConfig() : null,
     referenceElementId: referenceElement.id ?? null,
-    referenceElementOwnerId: (referenceElement ?? null) is instance of('craft\\base\\NestedElementInterface')
+    referenceElementOwnerId: (referenceElement ?? null) is instance of('CraftCms\\Cms\\Element\\Contracts\\NestedElementInterface')
         ? referenceElement.getOwnerId()
         : null,
     referenceElementSiteId: referenceElement.siteId ?? null,

resources/templates/_includes/forms/elementSelect.twig

@@ -114,7 +114,7 @@
         sources: sources,
         condition: condition ? condition.getConfig() : null,
         referenceElementId: referenceElement.id ?? null,
-        referenceElementOwnerId: (referenceElement ?? null) is instance of('craft\\base\\NestedElementInterface')
+        referenceElementOwnerId: (referenceElement ?? null) is instance of('CraftCms\\Cms\\Element\\Contracts\\NestedElementInterface')
             ? referenceElement.getOwnerId()
             : null,
         referenceElementSiteId: referenceElement.siteId ?? null,

routes/actions.php

@@ -30,8 +30,14 @@
 use CraftCms\Cms\Http\Controllers\Dashboard\Widgets\NewUsersController;
 use CraftCms\Cms\Http\Controllers\Dashboard\WidgetsController;
 use CraftCms\Cms\Http\Controllers\EditionController;
-use CraftCms\Cms\Http\Controllers\Elements\ExportElementIndexController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementIndex\ElementIndexController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementIndex\ElementIndexSourcesController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementIndex\ExportElementIndexController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementIndex\SaveElementIndexElementsController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementSelectorModalController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementSourcesController;
 use CraftCms\Cms\Http\Controllers\Elements\PerformElementActionController;
+use CraftCms\Cms\Http\Controllers\Elements\SearchController as ElementSearchController;
 use CraftCms\Cms\Http\Controllers\Entries\CreateEntryController;
 use CraftCms\Cms\Http\Controllers\Entries\MoveEntryToSectionController;
 use CraftCms\Cms\Http\Controllers\Entries\StoreEntryController;
@@ -235,8 +241,23 @@
         });
 
         // Elements
+        Route::post('element-indexes/source-path', [ElementIndexSourcesController::class, 'sourcePath']);
+        Route::post('element-indexes/source-attribute-info', [ElementIndexSourcesController::class, 'sourceAttributeInfo']);
+        Route::post('element-indexes/get-elements', [ElementIndexController::class, 'getElements']);
+        Route::post('element-indexes/get-more-elements', [ElementIndexController::class, 'getMoreElements']);
+        Route::post('element-indexes/count-elements', [ElementIndexController::class, 'countElements']);
+        Route::post('element-indexes/get-source-tree-html', [ElementIndexSourcesController::class, 'getSourceTreeHtml']);
+        Route::post('element-indexes/filter-hud', [ElementIndexController::class, 'filterHud']);
+        Route::post('element-indexes/element-table-html', [ElementIndexController::class, 'elementTableHtml']);
+        Route::post('element-indexes/save-elements', SaveElementIndexElementsController::class);
         Route::post('element-indexes/export', ExportElementIndexController::class);
         Route::post('element-indexes/perform-action', PerformElementActionController::class);
+        Route::post('element-search/search', ElementSearchController::class);
+        Route::post('element-selector-modals/body', ElementSelectorModalController::class);
+        Route::middleware([RequireAdminChanges::class])->group(function () {
+            Route::post('element-index-settings/get-customize-sources-modal-data', [ElementSourcesController::class, 'show']);
+            Route::post('element-index-settings/save-customize-sources-modal-settings', [ElementSourcesController::class, 'store']);
+        });
 
         // Entries
         Route::post('entries/create', CreateEntryController::class);

routes/cp.php

@@ -10,6 +10,8 @@
 use CraftCms\Cms\Http\Controllers\Auth\TwoFactorAuthenticationController;
 use CraftCms\Cms\Http\Controllers\Auth\VerifyEmailController;
 use CraftCms\Cms\Http\Controllers\Dashboard\DashboardController;
+use CraftCms\Cms\Http\Controllers\Elements\ElementRedirectController;
+use CraftCms\Cms\Http\Controllers\Elements\PreviewElementController;
 use CraftCms\Cms\Http\Controllers\Entries\CreateEntryController;
 use CraftCms\Cms\Http\Controllers\Entries\EntriesIndexController;
 use CraftCms\Cms\Http\Controllers\FieldsController;
@@ -79,6 +81,19 @@
         Route::view('settings/addresses', 'settings/addresses/_fields');
     });
 
+    /**
+     * Elements
+     */
+    Route::get('preview/{id}{slug}', PreviewElementController::class)->where([
+        'id' => '\d+',
+        'slug' => '(?:-[^\/]*)',
+    ]);
+    Route::get('edit/{id}{slug}', ElementRedirectController::class)->where([
+        'id' => '\d+',
+        'slug' => '(?:-[^\/]*)',
+    ]);
+    Route::get('edit/{uid}', ElementRedirectController::class);
+
     /**
      * Entries & Content
      */

src/Address/Conditions/AddressLine1ConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/AddressLine2ConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/AddressLine3ConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/AdministrativeAreaConditionRule.php

@@ -4,11 +4,11 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseMultiSelectConditionRule;
 use CraftCms\Cms\Cp\FormFields;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 use CraftCms\Cms\Support\Facades\Addresses;

src/Address/Conditions/CountryConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseMultiSelectConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 use CraftCms\Cms\Support\Facades\Addresses;

src/Address/Conditions/DependentLocalityConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/FieldConditionRule.php

@@ -4,11 +4,11 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseMultiSelectConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
 use CraftCms\Cms\Element\Conditions\HintableConditionRuleTrait;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 use CraftCms\Cms\Field\Addresses;

src/Address/Conditions/FullNameConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/LocalityConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/OrganizationConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/OrganizationTaxIdConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/PostalCodeConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 

src/Address/Conditions/SortingCodeConditionRule.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Address\Conditions;
 
-use craft\base\ElementInterface;
 use CraftCms\Cms\Address\Elements\Address;
 use CraftCms\Cms\Condition\BaseTextConditionRule;
 use CraftCms\Cms\Element\Conditions\Contracts\ElementConditionRuleInterface;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Queries\AddressQuery;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;