Skip to content

Commit

Permalink
Merge pull request #5 from WeareJH/grids-rework-and-fixes
Browse files Browse the repository at this point in the history 
Grids rework and fixes
  • Loading branch information
@bartoszkubicki
bartoszkubicki committed Oct 4, 2023
2 parents de79c23 + c39fe65 commit 9e2b8df
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 157 deletions.
Empty file added .gitignore
View file
Empty file.
18 changes: 18 additions & 0 deletions Model/Issue/Source/IsActive.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

namespace Jh\Logger\Model\Issue\Source;

use Magento\Framework\Data\OptionSourceInterface;

class IsActive implements OptionSourceInterface
{
public function toOptionArray(): array
{
return [
['value' => 1, 'label' => __('Active')],
['value' => 0, 'label' => __('Resolved')]
];
}
}
20 changes: 0 additions & 20 deletions Ui/Component/Listing/Column/Status.php
View file

This file was deleted.

127 changes: 64 additions & 63 deletions view/adminhtml/ui_component/issue_listing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,88 +3,89 @@
<argument name="data" xsi:type="array">
<item name="js_config" xsi:type="array">
<item name="provider" xsi:type="string">issue_listing.issue_listing_data_source</item>
<item name="deps" xsi:type="string">issue_listing.issue_listing_data_source</item>
</item>

<item name="spinner" xsi:type="string">issue_columns</item>
</argument>
<settings>
<spinner>issue_columns</spinner>
<deps>
<dep>issue_listing.issue_listing_data_source</dep>
</deps>
</settings>

<dataSource name="issue_listing_data_source">
<argument name="dataProvider" xsi:type="configurableObject">
<argument name="class" xsi:type="string">Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider</argument>
<argument name="name" xsi:type="string">issue_listing_data_source</argument>
<argument name="primaryFieldName" xsi:type="string">issue_id</argument>
<argument name="requestFieldName" xsi:type="string">issue_id</argument>
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
<item name="update_url" xsi:type="url" path="mui/index/render"/>
</item>
</argument>
</argument>
<dataSource name="issue_listing_data_source" component="Magento_Ui/js/grid/provider">
<settings>
<storageConfig>
<param name="indexField" xsi:type="string">issue_id</param>
</storageConfig>
<updateUrl path="mui/index/render"/>
</settings>
<dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"
name="issue_listing_data_source">
<settings>
<requestFieldName>id</requestFieldName>
<primaryFieldName>issue_id</primaryFieldName>
</settings>
</dataProvider>
</dataSource>

<listingToolbar name="listing_top">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="sticky" xsi:type="boolean">true</item>
</item>
</argument>

<filters name="listing_filter" />
<settings>
<sticky>true</sticky>
</settings>
<bookmark name="bookmarks"/>
<columnsControls name="columns_controls"/>
<filterSearch name="fulltext"/>
<filters name="listing_filters"/>
<paging name="listing_paging"/>
<exportButton name="export_button"/>
</listingToolbar>

<columns name="issue_columns" class="Magento\Ui\Component\Listing\Columns">
<column name="issue_id">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Issue ID</item>
<item name="sortOrder" xsi:type="number">10</item>
<item name="filter" xsi:type="string">text</item>
<item name="sorting" xsi:type="string">desc</item>
</item>
</argument>
<selectionsColumn name="ids" sortOrder="0">
<settings>
<indexField>issue_id</indexField>
</settings>
</selectionsColumn>
<column name="issue_id" sortOrder="10">
<settings>
<filter>textRange</filter>
<label translate="true">ID</label>
<sorting>desc</sorting>
</settings>
</column>

<column name="type">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Type</item>
<item name="sortOrder" xsi:type="number">20</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="type" sortOrder="20">
<settings>
<filter>text</filter>
<label translate="true">Title</label>
</settings>
</column>

<column name="timestamp">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Timestamp</item>
<item name="filter" xsi:type="string">dateRange</item>
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
<item name="dataType" xsi:type="string">date</item>
<item name="sortOrder" xsi:type="number">30</item>
</item>
</argument>
<column name="timestamp" class="Magento\Ui\Component\Listing\Columns\Date"
component="Magento_Ui/js/grid/columns/date" sortOrder="30">
<settings>
<filter>dateRange</filter>
<dataType>date</dataType>
<label translate="true">Timestamp</label>
</settings>
</column>

<column name="is_active" class="Jh\Logger\Ui\Component\Listing\Column\Status">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Status</item>
<item name="sortOrder" xsi:type="number">40</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="is_active" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
<settings>
<options class="Jh\Logger\Model\Issue\Source\IsActive"/>
<filter>select</filter>
<editor>
<editorType>select</editorType>
</editor>
<dataType>select</dataType>
<label translate="true">Status</label>
</settings>
</column>

<actionsColumn name="resolve" class="Jh\Logger\Ui\Component\Listing\Column\Resolve">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="indexField" xsi:type="string">issue_id</item>
</item>
</argument>
<settings>
<indexField>issue_id</indexField>
</settings>
</actionsColumn>
</columns>
</listing>
140 changes: 66 additions & 74 deletions view/adminhtml/ui_component/log_listing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,100 +3,92 @@
<argument name="data" xsi:type="array">
<item name="js_config" xsi:type="array">
<item name="provider" xsi:type="string">log_listing.jh_logger_listing_data_source</item>
<item name="deps" xsi:type="string">log_listing.jh_logger_listing_data_source</item>
</item>

<item name="spinner" xsi:type="string">log_columns</item>
</argument>
<settings>
<spinner>log_columns</spinner>
<deps>
<dep>log_listing.jh_logger_listing_data_source</dep>
</deps>
</settings>

<dataSource name="jh_logger_listing_data_source">
<argument name="dataProvider" xsi:type="configurableObject">
<argument name="class" xsi:type="string">Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider</argument>
<argument name="name" xsi:type="string">jh_logger_listing_data_source</argument>
<argument name="primaryFieldName" xsi:type="string">logger_id</argument>
<argument name="requestFieldName" xsi:type="string">logger_id</argument>
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
<item name="update_url" xsi:type="url" path="mui/index/render"/>
</item>
</argument>
</argument>
<dataSource name="jh_logger_listing_data_source" component="Magento_Ui/js/grid/provider">
<settings>
<storageConfig>
<param name="indexField" xsi:type="string">logger_id</param>
</storageConfig>
<updateUrl path="mui/index/render"/>
</settings>
<dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"
name="jh_logger_listing_data_source">
<settings>
<requestFieldName>id</requestFieldName>
<primaryFieldName>logger_id</primaryFieldName>
</settings>
</dataProvider>
</dataSource>

<listingToolbar name="listing_top">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="sticky" xsi:type="boolean">true</item>
</item>
</argument>

<filters name="listing_filter" />
<settings>
<sticky>true</sticky>
</settings>
<bookmark name="bookmarks"/>
<columnsControls name="columns_controls"/>
<filterSearch name="fulltext"/>
<filters name="listing_filters"/>
<paging name="listing_paging"/>
<exportButton name="export_button"/>
</listingToolbar>

<columns name="log_columns" class="Magento\Ui\Component\Listing\Columns">
<column name="logger_id">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Log ID</item>
<item name="sortOrder" xsi:type="number">10</item>
<item name="filter" xsi:type="string">text</item>
<item name="sorting" xsi:type="string">desc</item>
</item>
</argument>
<selectionsColumn name="ids" sortOrder="0">
<settings>
<indexField>logger_id</indexField>
</settings>
</selectionsColumn>
<column name="logger_id" sortOrder="10">
<settings>
<filter>textRange</filter>
<label translate="true">ID</label>
<sorting>desc</sorting>
</settings>
</column>

<column name="type">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Type</item>
<item name="sortOrder" xsi:type="number">30</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="type" sortOrder="20">
<settings>
<filter>text</filter>
<label translate="true">Title</label>
</settings>
</column>

<column name="message">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Message</item>
<item name="sortOrder" xsi:type="number">40</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="message" sortOrder="30">
<settings>
<filter>text</filter>
<label translate="true">Message</label>
</settings>
</column>

<column name="identifier_label">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Identifier Label</item>
<item name="sortOrder" xsi:type="number">60</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="identifier_label" sortOrder="40">
<settings>
<filter>text</filter>
<label translate="true">Identifier label</label>
</settings>
</column>

<column name="identifier_value">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Identifier Value</item>
<item name="sortOrder" xsi:type="number">70</item>
<item name="filter" xsi:type="string">text</item>
</item>
</argument>
<column name="identifier_value" sortOrder="50">
<settings>
<filter>text</filter>
<label translate="true">Identifier value</label>
</settings>
</column>

<column name="timestamp">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Timestamp</item>
<item name="filter" xsi:type="string">dateRange</item>
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
<item name="dataType" xsi:type="string">date</item>
<item name="sortOrder" xsi:type="number">80</item>
</item>
</argument>
<column name="timestamp" class="Magento\Ui\Component\Listing\Columns\Date"
component="Magento_Ui/js/grid/columns/date" sortOrder="60">
<settings>
<filter>dateRange</filter>
<dataType>date</dataType>
<label translate="true">Timestamp</label>
</settings>
</column>
</columns>
</listing>

0 comments on commit 9e2b8df

Please sign in to comment.