Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added resource to web API dialog form #595

Merged
merged 5 commits into from
Jun 23, 2021
+12 −3
Merged

Added resource to web API dialog form #595

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f07cf80
Added resource to web API dialog form
anzin May 26, 2021
2a9c504
Merge branch '4.0.0-develop' into add-resource-to-web-api-dialog-form
eduard13 Jun 20, 2021
90cc3fd
Added restriction to always select a value from the dropdown
anzin Jun 22, 2021
88bd28b
Merge branch '4.0.0-develop' of github.com:magento/magento2-phpstorm-…
anzin Jun 22, 2021
ca34cd1
Merge branch '4.0.0-develop' into add-resource-to-web-api-dialog-form
eduard13 Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions ...com/magento/idea/magento2plugin/actions/generation/dialog/NewWebApiDeclarationDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
import com.magento.idea.magento2plugin.actions.generation.generator.xml.WebApiDeclarationGenerator;
import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
import com.magento.idea.magento2plugin.magento.packages.WebApiResource;
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
import com.magento.idea.magento2plugin.util.magento.GetAclResourcesListUtil;
import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.List;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JComponent;
Expand Down Expand Up @@ -54,7 +55,7 @@ public class NewWebApiDeclarationDialog extends AbstractDialog {
private JComboBox<ComboBoxItemData> httpMethod;
private JTextField serviceClass;
private JTextField serviceMethod;
private JComboBox aclResource;
private JComboBox<ComboBoxItemData> aclResource;

// labels
private JLabel routeUrlLabel;//NOPMD
Expand Down Expand Up @@ -170,11 +171,19 @@ private void fillPredefinedValuesAndDisableInputs() {
@SuppressWarnings({"PMD.UnusedPrivateMethod", "PMD.AvoidInstantiatingObjectsInLoops"})
private void createUIComponents() {
httpMethod = new ComboBox<>();
aclResource = new ComboBox<>();

for (final String method : HttpMethod.getHttpMethodList()) {
httpMethod.addItem(new ComboBoxItemData(method, method));
}
aclResource = new FilteredComboBox(WebApiResource.getDefaultResourcesList());

final List<String> aclResources = GetAclResourcesListUtil.execute(project);
final List<String> defaultResources = WebApiResource.getDefaultResourcesList();
defaultResources.addAll(aclResources);

for (final String acl : defaultResources) {
aclResource.addItem(new ComboBoxItemData(acl, acl));
}
}

/**
Expand Down