Skip to content

Commit f5708e1

Browse files
author
Vitaliy
authored
Merge branch '2.0.0-develop' into issue-186
2 parents f58461d + 4e9ca38 commit f5708e1

File tree

53 files changed

+3180
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3180
-140
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Run automated tests
55

66
on:
77
pull_request:
8-
branches: [ master, 1.0.1-develop, 1.0.2-develop ]
8+
branches: [ master, 1.0.2-develop, 2.0.0-develop ]
99

1010
jobs:
1111
build-linux:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This is a plugin for Magento 2 development in the PhpStorm IDE. It is available
1515
6. Check `Enable` and `OK` button.
1616

1717
## Works with
18-
* PhpStorm >= 2019.3.3
18+
* PhpStorm >= 2020.1.1
1919
* JRE >= 1.8
2020

2121
## Features

‎build.gradle‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
plugins {
7-
id 'org.jetbrains.intellij' version '0.4.15'
7+
id 'org.jetbrains.intellij' version '0.4.22'
88
id 'checkstyle'
99
id 'pmd'
1010
}
@@ -14,14 +14,16 @@ repositories {
1414
}
1515

1616
group 'com.magento.idea'
17-
version '1.0.2'
17+
version '2.0.0'
1818

1919
apply plugin: 'org.jetbrains.intellij'
2020
apply plugin: 'java'
2121
apply plugin: 'groovy'
2222

23-
def phpPluginVersion = System.getProperty("phpPluginVersion", "193.6494.35")
24-
def ideaVersion = System.getProperty("ideaVersion", "2019.3.3")
23+
gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS_FULL
24+
25+
def phpPluginVersion = System.getProperty("phpPluginVersion", "201.7223.91")
26+
def ideaVersion = System.getProperty("ideaVersion", "2020.1.1")
2527
def javaVersion = 1.8
2628

2729
sourceCompatibility = javaVersion
@@ -31,7 +33,16 @@ intellij {
3133
version ideaVersion
3234
type 'IU'
3335
pluginName 'com.magento.idea.magento2plugin'
34-
plugins = ["com.jetbrains.php:$phpPluginVersion", 'yaml', 'java-i18n', 'properties', 'CSS', 'JavaScriptLanguage', 'com.intellij.lang.jsgraphql:2.3.0']
36+
plugins = [
37+
"com.jetbrains.php:$phpPluginVersion",
38+
'yaml',
39+
'java-i18n',
40+
'properties',
41+
'CSS',
42+
'JavaScriptLanguage',
43+
'com.intellij.lang.jsgraphql:2.3.0',
44+
'platform-images'
45+
]
3546
updateSinceUntilBuild false
3647
sameSinceUntilBuild false
3748
downloadSources !Boolean.valueOf(System.getenv('CI'))

‎resources/META-INF/plugin.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<idea-plugin>
88
<id>com.magento.idea.magento2plugin</id>
99
<name>Magento PhpStorm</name>
10-
<version>1.0.2</version>
10+
<version>2.0.0</version>
1111
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
1212

1313
<description><![CDATA[
@@ -24,7 +24,7 @@
2424
</change-notes>
2525

2626
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
27-
<idea-version since-build="193.6494.35"/>
27+
<idea-version since-build="201.7223.91"/>
2828

2929
<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
3030
on how to target different products -->
@@ -34,6 +34,7 @@
3434
<depends>com.jetbrains.php</depends>
3535
<depends>JavaScript</depends>
3636
<depends>com.intellij.modules.platform</depends>
37+
<depends>com.intellij.platform.images</depends>
3738
<depends optional="true" config-file="withJsGraphQl.xml">com.intellij.lang.jsgraphql</depends>
3839

3940
<actions>
@@ -63,6 +64,7 @@
6364
<action id="MagentoCreateAViewModel" class="com.magento.idea.magento2plugin.actions.generation.NewViewModelAction" />
6465
<action id="MagentoCreateAGraphQlResolver" class="com.magento.idea.magento2plugin.actions.generation.NewGraphQlResolverAction" />
6566
<action id="MagentoCreateCLICommand" class="com.magento.idea.magento2plugin.actions.generation.NewCLICommandAction" />
67+
<action id="MagentoCreateUiComponentGrid" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction" />
6668
<add-to-group group-id="NewGroup" anchor="last"/>
6769
</group>
6870

@@ -116,6 +118,7 @@
116118
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.TestNameIndex" />
117119
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.RequireJsIndex" />
118120
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
121+
<fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex" />
119122

120123
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
121124
<codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>
@@ -169,6 +172,13 @@
169172
enabledByDefault="true" level="ERROR"
170173
implementationClass="com.magento.idea.magento2plugin.inspections.xml.ModuleDeclarationInModuleXmlInspection"/>
171174

175+
<localInspection language="XML" groupPath="XML"
176+
shortName="AclResourceXmlInspection"
177+
displayName="Inspection for the Title XML required attribute in the `etc/acl.xml` file"
178+
groupName="Magento 2"
179+
enabledByDefault="true" level="ERROR"
180+
implementationClass="com.magento.idea.magento2plugin.inspections.xml.AclResourceXmlInspection"/>
181+
172182
<libraryRoot id=".phpstorm.meta.php" path=".phpstorm.meta.php/" runtime="false"/>
173183

174184
<internalFileTemplate name="Magento Module Composer"/>
@@ -182,10 +192,15 @@
182192
<internalFileTemplate name="Magento GraphQL Resolver Class"/>
183193
<internalFileTemplate name="Magento Cronjob Class"/>
184194
<internalFileTemplate name="Magento Crontab Xml"/>
185-
<internalFileTemplate name="Magento CLI Command"/>
195+
<internalFileTemplate name="Magento CLI Command Class"/>
186196
<internalFileTemplate name="Magento Module Controller Backend Class"/>
187197
<internalFileTemplate name="Magento Module Controller Frontend Class"/>
188198
<internalFileTemplate name="Magento Module Cron Groups Xml"/>
199+
<internalFileTemplate name="Magento Module UI Component Grid Xml"/>
200+
<internalFileTemplate name="Magento Module Ui Grid Collection Data Provider Php"/>
201+
<internalFileTemplate name="Magento Module Ui Grid Custom Data Provider Php"/>
202+
203+
<postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
189204
</extensions>
190205

191206
<extensions defaultExtensionNs="com.jetbrains.php">

‎resources/fileTemplates/internal/Magento Module UI Component Grid Xml.xml.ft‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0"?>
2+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
3+
<argument name="data" xsi:type="array">
4+
<item name="js_config" xsi:type="array">
5+
<item name="provider" xsi:type="string">${NAME}.${NAME}_data_source</item>
6+
<item name="deps" xsi:type="string">${NAME}.${NAME}_data_source</item>
7+
</item>
8+
</argument>
9+
<settings>
10+
<spinner>${NAME}_columns</spinner>
11+
<deps>
12+
<dep>${NAME}.${NAME}_data_source</dep>
13+
</deps>
14+
</settings>
15+
<dataSource name="${NAME}_data_source" component="Magento_Ui/js/grid/provider">
16+
<settings>
17+
<storageConfig>
18+
<param name="indexField" xsi:type="string">${ID_FIELD_NAME}</param>
19+
</storageConfig>
20+
<updateUrl path="mui/index/render"/>
21+
</settings>
22+
#if (${ACL})
23+
<aclResource>${ACL}</aclResource>
24+
#end
25+
<dataProvider class="${PROVIDER_CLASS}" name="${NAME}_data_source">
26+
<settings>
27+
<requestFieldName>${ID_FIELD_NAME}</requestFieldName>
28+
<primaryFieldName>${ID_FIELD_NAME}</primaryFieldName>
29+
</settings>
30+
</dataProvider>
31+
</dataSource>
32+
#if (${TOOLBAR})
33+
<listingToolbar name="listing_top">
34+
#if (${BOOKMARKS})
35+
<bookmark name="bookmarks"/>
36+
#end
37+
#if (${COLUMNS_CONTROLS})
38+
<columnsControls name="columns_controls"/>
39+
#end
40+
#if (${FULLTEXT_SEARCH})
41+
<filterSearch name="fulltext"/>
42+
#end
43+
#if (${LISTING_FILTERS})
44+
<filters name="listing_filters"/>
45+
#end
46+
#if (${LISTING_PAGING})
47+
<paging name="listing_paging"/>
48+
#end
49+
</listingToolbar>
50+
#end
51+
<columns name="${NAME}_columns">
52+
<column name="${ID_FIELD_NAME}">
53+
<settings>
54+
<filter>textRange</filter>
55+
<label translate="true">ID</label>
56+
<sorting>desc</sorting>
57+
</settings>
58+
</column>
59+
</columns>
60+
</listing>

‎resources/fileTemplates/internal/Magento Module UI Component Grid Xml.xml.html‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<html lang="en">
8+
<body>
9+
<p face="verdana" size="-1">
10+
The <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-listing-grid.html">Listing (Grid) component</a> configuration with filtering, pagination, sorting, and other features.
11+
</p>
12+
13+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
14+
<tr>
15+
<td colspan="3"><font face="verdana" size="-1">Template's predefined variables:</font></td>
16+
</tr>
17+
<tr>
18+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${NAME}</b></font></nobr></td>
19+
<td width="10">&nbsp;</td>
20+
<td width="100%" valign="top"><font face="verdana" size="-1">The name of the component.</font></td>
21+
</tr>
22+
<tr>
23+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ID_FIELD_NAME}</b></font></nobr></td>
24+
<td width="10">&nbsp;</td>
25+
<td width="100%" valign="top"><font face="verdana" size="-1">The identifier field name.</font></td>
26+
</tr>
27+
<tr>
28+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${ACL}</b></font></nobr></td>
29+
<td width="10">&nbsp;</td>
30+
<td width="100%" valign="top"><font face="verdana" size="-1">The name of ACL resource that allows to restrict an access to the listing view.</font></td>
31+
</tr>
32+
<tr>
33+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${PROVIDER_CLASS}</b></font></nobr></td>
34+
<td width="10">&nbsp;</td>
35+
<td width="100%" valign="top"><font face="verdana" size="-1">The data provider class name.</font></td>
36+
</tr>
37+
<tr>
38+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${TOOLBAR}</b></font></nobr></td>
39+
<td width="10">&nbsp;</td>
40+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-toolbar.html">Toolbar component</a> configuration.</font></td>
41+
</tr>
42+
<tr>
43+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${BOOKMARKS}</b></font></nobr></td>
44+
<td width="10">&nbsp;</td>
45+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-bookmarks.html">Bookmarks component</a> configuration.</font></td>
46+
</tr>
47+
<tr>
48+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${COLUMNS_CONTROLS}</b></font></nobr></td>
49+
<td width="10">&nbsp;</td>
50+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columnscontrols.html">Columns Controls component</a> configuration.</font></td>
51+
</tr>
52+
<tr>
53+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${FULLTEXT_SEARCH}</b></font></nobr></td>
54+
<td width="10">&nbsp;</td>
55+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the Full Search component configuration.</font></td>
56+
</tr>
57+
<tr>
58+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${LISTING_FILTERS}</b></font></nobr></td>
59+
<td width="10">&nbsp;</td>
60+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-filters.html">Listing Filters component</a> configuration.</font></td>
61+
</tr>
62+
<tr>
63+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${LISTING_PAGING}</b></font></nobr></td>
64+
<td width="10">&nbsp;</td>
65+
<td width="100%" valign="top"><font face="verdana" size="-1">Adding the <a href="https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-paging.html">Paging component</a> configuration.</font></td>
66+
</tr>
67+
</table>
68+
</body>
69+
</html>

‎resources/fileTemplates/internal/Magento Module Ui Grid Collection Data Provider Php.php.ft‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?php
2+
#parse("PHP File Header.php")
3+
#if (${NAMESPACE})
4+
5+
namespace ${NAMESPACE};
6+
#end
7+
8+
use Magento\Framework\Api\FilterBuilder;
9+
use Magento\Framework\Api\Search\ReportingInterface;
10+
use Magento\Framework\Api\Search\SearchCriteriaBuilder;
11+
use Magento\Framework\Api\Search\SearchResultInterface;
12+
use Magento\Framework\Api\Search\SearchResultInterfaceFactory;
13+
use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
14+
use Magento\Framework\App\RequestInterface;
15+
use ${COLLECTION_CLASS_FQN};
16+
use ${COLLECTION_CLASS_FQN}Factory;
17+
use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider;
18+
19+
class ${CLASS_NAME} extends DataProvider
20+
{
21+
/**
22+
* @var ${COLLECTION_CLASS_NAME}Factory
23+
*/
24+
private $collectionFactory;
25+
26+
/**
27+
* @var CollectionProcessorInterface
28+
*/
29+
private $collectionProcessor;
30+
31+
/**
32+
* @var SearchResultInterfaceFactory
33+
*/
34+
private $searchResultFactory;
35+
36+
/**
37+
* ${CLASS_NAME} constructor.
38+
*
39+
* @param string $name
40+
* @param string $primaryFieldName
41+
* @param string $requestFieldName
42+
* @param ReportingInterface $reporting
43+
* @param SearchCriteriaBuilder $searchCriteriaBuilder
44+
* @param RequestInterface $request
45+
* @param FilterBuilder $filterBuilder
46+
* @param ${COLLECTION_CLASS_NAME}Factory $collectionFactory
47+
* @param CollectionProcessorInterface $collectionProcessor
48+
* @param SearchResultInterfaceFactory $searchResultFactory
49+
* @param array $meta
50+
* @param array $data
51+
*/
52+
public function __construct(
53+
string $name = '',
54+
string $primaryFieldName = '',
55+
string $requestFieldName = '',
56+
ReportingInterface $reporting,
57+
SearchCriteriaBuilder $searchCriteriaBuilder,
58+
RequestInterface $request,
59+
FilterBuilder $filterBuilder,
60+
${COLLECTION_CLASS_NAME}Factory $collectionFactory,
61+
CollectionProcessorInterface $collectionProcessor,
62+
SearchResultInterfaceFactory $searchResultFactory,
63+
array $meta = [],
64+
array $data = []
65+
) {
66+
parent::__construct(
67+
$name,
68+
$primaryFieldName,
69+
$requestFieldName,
70+
$reporting,
71+
$searchCriteriaBuilder,
72+
$request,
73+
$filterBuilder,
74+
$meta,
75+
$data
76+
);
77+
78+
$this->collectionFactory = $collectionFactory;
79+
$this->collectionProcessor = $collectionProcessor;
80+
$this->searchResultFactory = $searchResultFactory;
81+
}
82+
83+
/**
84+
* Get search result
85+
*
86+
* @return SearchResultInterface
87+
*/
88+
public function getSearchResult()
89+
{
90+
/** @var SearchResultInterface $searchResults */
91+
$searchResults = $this->searchResultFactory->create();
92+
$searchCriteria = $this->getSearchCriteria();
93+
/** @var ${COLLECTION_CLASS_NAME} $collection */
94+
$collection = $this->collectionFactory->create();
95+
$this->collectionProcessor->process($this->getSearchCriteria(), $collection);
96+
$items = $collection->getItems();
97+
$searchResults->setItems($items);
98+
$searchResults->setTotalCount($collection->getSize());
99+
$searchResults->setSearchCriteria($searchCriteria);
100+
101+
return $searchResults;
102+
}
103+
104+
/**
105+
* Search result to output
106+
*
107+
* @param SearchResultInterface $searchResult
108+
*
109+
* @return array
110+
*/
111+
public function searchResultToOutput(SearchResultInterface $searchResult)
112+
{
113+
$result = ['items' => []];
114+
$items = $searchResult->getItems();
115+
116+
if (!$items || !count($items)) {
117+
$result['totalRecords'] = 0;
118+
119+
return $result;
120+
}
121+
122+
foreach ($items as $index => $item) {
123+
$result['items'][$index] = $item->getData();
124+
}
125+
126+
$result['totalRecords'] = $searchResult->getTotalCount();
127+
128+
return $result;
129+
}
130+
}

0 commit comments

Comments
 (0)