Merge branch 'master' of github.com:LokiExtensions/Loki_AdminComponents

jissereitsma · jissereitsma · commit 4b24af6302a9 · 2025-07-21T16:42:13.000+02:00
diff --git a/Component/Form/FormRepository.php b/Component/Form/FormRepository.php
@@ -13,7 +13,7 @@
 use Loki\AdminComponents\Form\Action\ActionListing;
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerInterface;
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;
-use Yireo\LokiComponents\Component\ComponentRepository;
+use Loki\Components\Component\ComponentRepository;
 
 class FormRepository extends ComponentRepository
 {
diff --git a/Component/Form/FormViewModel.php b/Component/Form/FormViewModel.php
@@ -12,7 +12,7 @@
 use Loki\AdminComponents\Form\Field\FieldFactory;
 use Loki\AdminComponents\Ui\Button;
 use Loki\AdminComponents\Ui\ButtonFactory;
-use Yireo\LokiComponents\Component\ComponentViewModel;
+use Loki\Components\Component\ComponentViewModel;
 
 /**
  * @method FormRepository getRepository()
diff --git a/Component/Grid/GridRepository.php b/Component/Grid/GridRepository.php
@@ -11,7 +11,7 @@
 use Loki\AdminComponents\Grid\StateManager;
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerInterface;
 use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;
-use Yireo\LokiComponents\Component\ComponentRepository;
+use Loki\Components\Component\ComponentRepository;
 
 class GridRepository extends ComponentRepository
 {
diff --git a/Component/Grid/GridViewModel.php b/Component/Grid/GridViewModel.php
@@ -18,8 +18,8 @@
 use Loki\AdminComponents\Grid\StateManager;
 use Loki\AdminComponents\Ui\Button;
 use Loki\AdminComponents\Ui\ButtonFactory;
-use Yireo\LokiComponents\Component\ComponentViewModel;
-use Yireo\LokiComponents\Util\CamelCaseConvertor;
+use Loki\Components\Component\ComponentViewModel;
+use Loki\Components\Util\CamelCaseConvertor;
 
 /**
  * @method GridRepository getRepository()
diff --git a/Form/Action/ActionListing.php b/Form/Action/ActionListing.php
@@ -5,7 +5,7 @@
 class ActionListing
 {
     public function __construct(
-        private array $actions,
+        private array $actions = [],
     ) {
     }
 
diff --git a/Form/Action/SaveAction.php b/Form/Action/SaveAction.php
@@ -6,7 +6,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Message\Manager;
 use Loki\AdminComponents\Component\Form\FormRepository;
-use Yireo\LokiComponents\Util\CamelCaseConvertor;
+use Loki\Components\Util\CamelCaseConvertor;
 
 class SaveAction implements ActionInterface
 {
diff --git a/MODULE.json b/MODULE.json
@@ -1,6 +1,6 @@
 {
     "modules": [
-        "Yireo_LokiComponents",
+        "Loki_Components",
         "Magento_Backend",
         "Magento_Catalog",
         "Magento_Customer",
@@ -10,4 +10,4 @@
     "components": [],
     "config": [],
     "tests": []
-}
+}
diff --git a/README.md b/README.md
@@ -4,16 +4,16 @@
 a faster way. No more ugly UiComponents that nobody understands. Create grids and forms quickly. And gradually add
 features to them, without getting stuck.**
 
-The LokiAdminComponents are based on the [Loki_Components](https://github.com/yireo/Loki_Components)
+The LokiAdminComponents are based on the [Loki Components](https://github.com/LokiExtensions/Loki_Components)
 module which is also used in the [LokiCheckout](https://loki-checkout.com/). However, this admin tool shows
 that the Loki suite of Yireo can be applied in many more places.
 
 *Note that this library makes use of Alpine.js in the Magento Admin Panel. However, TailwindCSS is not used, we stick to the native Magento Admin Panel classes instead.*
 
 ## Installation
 ```bash
-composer require loki-extensions/magento2-admin-components
-bin/magento module:enable Loki_AdminComponents Yireo_LokiComponents
+composer require loki/magento2-admin-components
+bin/magento module:enable Loki_AdminComponents Loki_Components
 ```
 
 ## Examples
@@ -52,7 +52,7 @@ As a demo, you could opt to install the following examples:
 - ... (more docs coming soon)
 
 ### Documentation
-See [the wiki](https://github.com/yireo/Loki_AdminComponents/wiki)
+See [the wiki](https://github.com/LokiExtensions/Loki_AdminComponents/wiki)
 
 # Todo
 - Easily extend LokiComponent partials via XML layout
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     "magento/module-customer": "^102.0 | ^103.0",
     "magento/module-eav": "^100.0 | ^101.0 | ^102.0",
     "magento/module-ui": "^101.0",
-    "yireo/magento2-loki-components": "^1.0",
+    "loki/magento2-components": "^1.0",
     "ext-json": "*"
   },
   "license": [
diff --git a/etc/loki_components.xml b/etc/loki_components.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<components xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Yireo_LokiComponents:etc/loki_components.xsd">
+<components xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Loki_Components:etc/loki_components.xsd">
     <group
         name="loki_admin.grid"
         viewModel="Loki\AdminComponents\Component\Grid\GridViewModel"
diff --git a/etc/module.xml b/etc/module.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Loki_AdminComponents">
         <sequence>
-            <module name="Yireo_LokiComponents"/>
+            <module name="Loki_Components"/>
             <module name="Magento_Backend"/>
             <module name="Magento_Catalog"/>
             <module name="Magento_Customer"/>
diff --git a/view/adminhtml/templates/form.phtml b/view/adminhtml/templates/form.phtml
@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Form\FormViewModel;
-use Yireo\LokiComponents\Util\Block\BlockRenderer;
-use Yireo\LokiComponents\Util\Block\ChildRenderer;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\BlockRenderer;
+use Loki\Components\Util\Block\ChildRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var FormViewModel $viewModel */
diff --git a/view/adminhtml/templates/form/actions.phtml b/view/adminhtml/templates/form/actions.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Form\FormViewModel;
 use Loki\AdminComponents\Form\Fieldset\Field;
-use Yireo\LokiComponents\Util\Block\ChildRenderer;
+use Loki\Components\Util\Block\ChildRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field.phtml b/view/adminhtml/templates/form/field.phtml
@@ -4,8 +4,8 @@ declare(strict_types=1);
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\ViewModel\FieldViewModel;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Factory\ViewModelFactory;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field_type/from_to.phtml b/view/adminhtml/templates/form/field_type/from_to.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\Form\Field\FieldType\Text;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field_type/select.phtml b/view/adminhtml/templates/form/field_type/select.phtml
@@ -5,7 +5,7 @@ use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\Form\Field\FieldType\Select;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field_type/select/option.phtml b/view/adminhtml/templates/form/field_type/select/option.phtml
@@ -2,7 +2,7 @@
 declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var TemplateRenderer $templateRenderer */
diff --git a/view/adminhtml/templates/form/field_type/switch.phtml b/view/adminhtml/templates/form/field_type/switch.phtml
@@ -5,7 +5,7 @@ use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\Form\Field\FieldType\Select;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field_type/text.phtml b/view/adminhtml/templates/form/field_type/text.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\Form\Field\FieldType\Text;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/form/field_type/view.phtml b/view/adminhtml/templates/form/field_type/view.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Form\Field\Field;
 use Loki\AdminComponents\Form\Field\FieldType\Text;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var Field $field */
diff --git a/view/adminhtml/templates/grid.phtml b/view/adminhtml/templates/grid.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\BlockRenderer;
+use Loki\Components\Util\Block\BlockRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */
diff --git a/view/adminhtml/templates/grid/actions.phtml b/view/adminhtml/templates/grid/actions.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */
diff --git a/view/adminhtml/templates/grid/cell/attribute_set_id.phtml b/view/adminhtml/templates/grid/cell/attribute_set_id.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\AttributeSet;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/customer_id.phtml b/view/adminhtml/templates/grid/cell/customer_id.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\ViewModel\Customer;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/inline_edit.phtml b/view/adminhtml/templates/grid/cell/inline_edit.phtml
@@ -2,7 +2,7 @@
 declare(strict_types=1);
 
 use Magento\Framework\DataObject;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/price.phtml b/view/adminhtml/templates/grid/cell/price.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\ProductImage;
 use Loki\AdminComponents\ViewModel\PriceFormatter;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/product_id.phtml b/view/adminhtml/templates/grid/cell/product_id.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\ViewModel\Product;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/product_image.phtml b/view/adminhtml/templates/grid/cell/product_image.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\ProductImage;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/product_type.phtml b/view/adminhtml/templates/grid/cell/product_type.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\ProductType;
 use Loki\AdminComponents\ViewModel\Status;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/status.phtml b/view/adminhtml/templates/grid/cell/status.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\Status;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/cell/visibility.phtml b/view/adminhtml/templates/grid/cell/visibility.phtml
@@ -5,7 +5,7 @@ use Magento\Catalog\Api\Data\ProductInterface;
 use Loki\AdminComponents\ViewModel\ProductImage;
 use Loki\AdminComponents\ViewModel\PriceFormatter;
 use Loki\AdminComponents\ViewModel\Visibility;
-use Yireo\LokiComponents\Factory\ViewModelFactory;
+use Loki\Components\Factory\ViewModelFactory;
 
 /** @var Magento\Framework\View\Element\Template $block */
 /** @var ViewModelFactory $viewModelFactory */
diff --git a/view/adminhtml/templates/grid/filters.phtml b/view/adminhtml/templates/grid/filters.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */
diff --git a/view/adminhtml/templates/grid/massactions.phtml b/view/adminhtml/templates/grid/massactions.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */
diff --git a/view/adminhtml/templates/grid/pager.phtml b/view/adminhtml/templates/grid/pager.phtml
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\ChildRenderer;
+use Loki\Components\Util\Block\ChildRenderer;
 
 /** @var Template $block */
 /** @var ChildRenderer $childRenderer */
diff --git a/view/adminhtml/templates/grid/table.phtml b/view/adminhtml/templates/grid/table.phtml
@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
-use Yireo\LokiComponents\Util\Block\TemplateRenderer;
+use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Loki\AdminComponents\Form\Action\ActionListing;`
`14`	`14`	`use Loki\AdminComponents\ProviderHandler\ProviderHandlerInterface;`
`15`	`15`	`use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;`
`16`		`-use Yireo\LokiComponents\Component\ComponentRepository;`
	`16`	`+use Loki\Components\Component\ComponentRepository;`
`17`	`17`
`18`	`18`	`class FormRepository extends ComponentRepository`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Loki\AdminComponents\Grid\StateManager;`
`12`	`12`	`use Loki\AdminComponents\ProviderHandler\ProviderHandlerInterface;`
`13`	`13`	`use Loki\AdminComponents\ProviderHandler\ProviderHandlerListing;`
`14`		`-use Yireo\LokiComponents\Component\ComponentRepository;`
	`14`	`+use Loki\Components\Component\ComponentRepository;`
`15`	`15`
`16`	`16`	`class GridRepository extends ComponentRepository`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`class ActionListing`
`6`	`6`	`{`
`7`	`7`	`public function __construct(`
`8`		`- private array $actions,`
	`8`	`+ private array $actions = [],`
`9`	`9`	`) {`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Magento\Framework\DataObject;`
`7`	`7`	`use Magento\Framework\Message\Manager;`
`8`	`8`	`use Loki\AdminComponents\Component\Form\FormRepository;`
`9`		`-use Yireo\LokiComponents\Util\CamelCaseConvertor;`
	`9`	`+use Loki\Components\Util\CamelCaseConvertor;`
`10`	`10`
`11`	`11`	`class SaveAction implements ActionInterface`
`12`	`12`	`{`