Better handling of inline edit actions

Author: jissereitsma

Component/Grid/GridViewModel.php

@@ -142,6 +142,7 @@ public function getJsData(): array
         return [
             ...parent::getJsData(),
             ...$this->getState()->toArray(),
+            'namespace' => $this->getNamespace(),
             'gridFilters' => $this->getGridFilterValues(),
             'columnPositions' => $this->getColumnPositions(),
             'newUrl' => $this->getNewUrl(),
@@ -313,6 +314,10 @@ public function getGridFilterValues(): array
         $gridFilterValues = [];
         foreach ($this->getGridFilters() as $gridFilter) {
             $value = $this->getState()->getFilterValue($gridFilter->getCode());
+            if (empty($value)) {
+                continue;
+            }
+
             $gridFilterValues[$gridFilter->getCode()] = $value;
         }
 

Grid/Action/InlineEditAction.php

@@ -21,6 +21,7 @@ public function execute(GridRepository $gridRepository, array $value): void
 
         $item = $providerHandler->getItem($provider, $identifier);
         $item->setData($propertyName, $propertyValue);
+
         $providerHandler->saveItem($provider, $item);
     }
 }

Grid/State.php

@@ -148,12 +148,17 @@ public function getFilterValue(string $name): mixed
     public function setFilter(string $name, mixed $value): void
     {
         $filters = $this->getFilters();
-        $filters[$name] = $value;
+        if (empty($value) && isset($filters[$name])) {
+            unset($filters[$name]);
+        } else {
+            $filters[$name] = $value;
+        }
+
         $this->setFilters($filters);
     }
 
     /**
-     * @param Filter[] $filters
+     * @param mixed[] $filters
      *
      * @return void
      */

ProviderHandler/ArrayHandler.php

@@ -25,6 +25,17 @@ public function match(object $provider): bool
 
     public function getItem(object $provider, int|string $identifier): DataObject
     {
+        /** @var ArrayProviderInterface $provider */
+        $rows = $provider->getData();
+        $primaryKey = $this->getPrimaryKey($provider);
+        if (!empty($primaryKey)) {
+            foreach ($rows as $row) {
+                if (isset($row[$primaryKey]) && $row[$primaryKey] == $identifier) {
+                    return $this->dataObjectFactory->create()->setData($row);
+                }
+            }
+        }
+
         throw new RuntimeException('Unable to retrieve item from array');
     }
 
@@ -93,6 +104,9 @@ public function getItems(object $provider, GridState $gridState): array
 
     public function saveItem(object $provider, DataObject $item)
     {
+        if (method_exists($provider, 'saveItem')) {
+            call_user_func([$provider, 'saveItem'], $item);
+        }
     }
 
     public function deleteItem(object $provider, DataObject $item)
@@ -121,4 +135,13 @@ public function getResourceModelClass(object $provider): bool|string
     {
         return false;
     }
+
+    public function getPrimaryKey(object $provider): ?string
+    {
+        if (method_exists($provider, 'getPrimaryKey')) {
+            return call_user_func([$provider, 'getPrimaryKey']);
+        }
+
+        return null;
+    }
 }

view/adminhtml/templates/grid/cell/default.phtml

@@ -1,20 +1,23 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.3.2 */
-
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
 
+/** @version 0.3.2 */
 /** @var Escaper $escaper */
 /** @var Template $block */
 $value = $block->getValue();
+$emptyValue = $block->getEmptyValue();
+
+if (empty($value) && !empty($emptyValue)) {
+    $value = $emptyValue;
+}
 
 if (is_array($value)) {
     $value = 'array';
 }
 
-
 if (is_object($value)) {
     $value = 'object';
 }

view/adminhtml/templates/grid/cell/inline_edit.phtml

@@ -1,13 +1,12 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.3.2 */
-
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\Escaper;
 use Magento\Framework\DataObject;
 use Loki\Components\Factory\ViewModelFactory;
 
+/** @version 0.3.2 */
 /** @var Template $block */
 /** @var Escaper $escaper */
 /** @var Magento\Framework\View\Element\Template $block */
@@ -16,7 +15,7 @@ use Loki\Components\Factory\ViewModelFactory;
 
 $item = $block->getItem();
 ?>
-<div x-data="LokiAdminInlineEditComponent">
+<div x-data="LokiAdminInlineEditComponent" @dblclick="toggleInlineEdit">
     <span @dblclick="toggleInlineEdit" x-show="hideInlineEdit">
         <?= $escaper->escapeHtml($block->getValue()) ?>
     </span>
@@ -30,15 +29,19 @@ $item = $block->getItem();
         />
 
         <button
-            class="action-close"
+            class="action-close2"
             @click.prevent="toggleInlineEdit"
-        ></button>
+        >
+            <?= $escaper->escapeHtml(__('Close')) ?>
+        </button>
 
         <button
             class="action-save"
             @click.prevent="saveInlineEdit"
             data-identifier="<?= $escaper->escapeHtml($item->getId()) ?>"
             data-property="<?= $escaper->escapeHtml($block->getColumnName()) ?>"
-        >save</button>
+        >
+            <?= $escaper->escapeHtml(__('Save')) ?>
+        </button>
     </span>
 </div>

view/adminhtml/templates/grid/table.phtml

@@ -118,6 +118,7 @@ $state = $viewModel->getState();
                                 [
                                     'item' => $item,
                                     'value' => $value,
+                                    'empty_value' => $column->getEmptyValue(),
                                     'column_name' => $column->getCode(),
                                 ]
                             ) ?>