midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4647 : filter plugins using name (#527) 

* IDEMPIERE-4647 : filter plugins using name

* Minor improvements

* Add translated message for Filter
* Use ON_CHANGE instead of ON_BLUR, allows to apply the filter with ENTER

Co-authored-by: Carlos Ruiz <carg67@gmail.com>
This commit is contained in:
Nicolas Micoud 2021-01-15 18:39:55 +01:00 committed by GitHub
parent 6c6cbf932d
commit e3c78d7501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPluginManager.java
View File

@ -35,7 +35,9 @@ import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.ListModelTable; import org.adempiere.webui.component.ListModelTable;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.ListboxFactory; import org.adempiere.webui.component.ListboxFactory;
import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.component.WListbox; import org.adempiere.webui.component.WListbox;
import org.adempiere.webui.factory.ButtonFactory;
import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.minigrid.IDColumn; import org.compiere.minigrid.IDColumn;
@ -43,6 +45,7 @@ import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException; import org.osgi.framework.BundleException;
@ -51,6 +54,7 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Listitem; import org.zkoss.zul.Listitem;
import org.zkoss.zul.Vbox; import org.zkoss.zul.Vbox;
@ -64,7 +68,7 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
/** /**
* *
*/ */
private static final long serialVersionUID = -2038792517003449189L; private static final long serialVersionUID = -5661912464378243252L;
/** Log. */ /** Log. */
private static final CLogger log = CLogger.getCLogger(WPluginManager.class); private static final CLogger log = CLogger.getCLogger(WPluginManager.class);
@ -74,6 +78,8 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
private Button pluginProcess; private Button pluginProcess;
private Vector<Vector<Object>> pluginData; private Vector<Vector<Object>> pluginData;
private Vector<String> pluginColumnNames; private Vector<String> pluginColumnNames;
private Textbox fFilter = new Textbox();
private Button btnRefresh = null;
private static final int PLUGIN_ACTION_NONE = 0; private static final int PLUGIN_ACTION_NONE = 0;
private static final int PLUGIN_ACTION_STOP = 1; private static final int PLUGIN_ACTION_STOP = 1;
@ -96,6 +102,17 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
ZKUpdateUtil.setHflex(vbox, "1"); ZKUpdateUtil.setHflex(vbox, "1");
ZKUpdateUtil.setVflex(vbox, "1"); ZKUpdateUtil.setVflex(vbox, "1");
fFilter.setPlaceholder(Msg.getMsg(ctx, "filter.by"));
fFilter.addEventListener(Events.ON_CHANGE, this);
btnRefresh = ButtonFactory.createNamedButton("Refresh");
btnRefresh.addEventListener(Events.ON_CLICK, this);
Hlayout hl = new Hlayout();
hl.setValign("middle");
hl.appendChild(fFilter);
hl.appendChild(btnRefresh);
vbox.appendChild(hl);
pluginColumnNames = new Vector<String>(); pluginColumnNames = new Vector<String>();
pluginColumnNames.add(""); pluginColumnNames.add("");
pluginColumnNames.add(Msg.getMsg(ctx, "Id")); pluginColumnNames.add(Msg.getMsg(ctx, "Id"));
@ -244,8 +261,7 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
// PLUGIN_ACTION_INSTALL not implemented yet // PLUGIN_ACTION_INSTALL not implemented yet
} }
} }
refreshPluginTable(); refreshAll();
refreshActionList();
} }
private void refreshPluginTable() { private void refreshPluginTable() {
@ -255,6 +271,10 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
BundleContext bundleCtx = WebUIActivator.getBundleContext(); BundleContext bundleCtx = WebUIActivator.getBundleContext();
for (Bundle bundle : bundleCtx.getBundles()) { for (Bundle bundle : bundleCtx.getBundles()) {
if (!Util.isEmpty(fFilter.getValue()) && !bundle.getSymbolicName().toUpperCase().contains(fFilter.getValue().toUpperCase()))
continue;
Vector<Object> line = new Vector<Object>(); Vector<Object> line = new Vector<Object>();
Integer bundl = Long.valueOf(bundle.getBundleId()).intValue(); // potential problem converting Long to Integer bundl = Long.valueOf(bundle.getBundleId()).intValue(); // potential problem converting Long to
// Integer, but WListBox cannot order Long // Integer, but WListBox cannot order Long
@ -270,11 +290,20 @@ public class WPluginManager extends ADForm implements EventListener<Event> {
pluginsTable.setSelectedIndex(idx); pluginsTable.setSelectedIndex(idx);
} }
private void refreshAll() {
refreshPluginTable();
refreshActionList();
}
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
if (Events.ON_SELECT.equals(event.getName()) && event.getTarget() == pluginsTable) if (Events.ON_SELECT.equals(event.getName()) && event.getTarget() == pluginsTable)
refreshActionList(); refreshActionList();
else if (Events.ON_CLICK.equals(event.getName()) && event.getTarget() == pluginProcess) else if (Events.ON_CLICK.equals(event.getName()) && event.getTarget() == pluginProcess)
processPlugin(); processPlugin();
else if (Events.ON_CLICK.equals(event.getName()) && event.getTarget() == btnRefresh)
refreshAll();
else if (Events.ON_CHANGE.equals(event.getName()) && event.getTarget() == fFilter)
refreshAll();
} }
} }