From ddd2be5167ad32105b5ccecf42b4f5f2e40dfc18 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 22 Apr 2015 17:08:32 +0000 Subject: [PATCH] Updated Rules git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@114347 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/client/TabularDataController.java | 6 +- .../client/resource/TabularDataResources.java | 8 +- .../td/client/resource/rule-column-detach.png | Bin 0 -> 862 bytes .../client/resource/rule-column-detach_32.png | Bin 0 -> 1918 bytes .../user/td/client/ribbon/RuleToolBar.java | 34 ++--- .../td/client/ribbon/RuleToolBarMessages.java | 4 +- ...pliedDialog.java => RuleActiveDialog.java} | 10 +- ...AppliedPanel.java => RuleActivePanel.java} | 130 ++++++++++++++++-- .../user/td/client/rule/RuleApplyPanel.java | 62 ++++----- .../td/client/resource/rule-column-detach.png | Bin 0 -> 862 bytes .../client/resource/rule-column-detach_32.png | Bin 0 -> 1918 bytes .../ribbon/RuleToolBarMessages.properties | 4 +- .../ribbon/RuleToolBarMessages_es.properties | 4 +- .../ribbon/RuleToolBarMessages_it.properties | 4 +- 14 files changed, 188 insertions(+), 78 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/rule-column-detach.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/rule-column-detach_32.png rename src/main/java/org/gcube/portlets/user/td/client/rule/{RuleAppliedDialog.java => RuleActiveDialog.java} (83%) rename src/main/java/org/gcube/portlets/user/td/client/rule/{RuleAppliedPanel.java => RuleActivePanel.java} (82%) create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/rule-column-detach.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/rule-column-detach_32.png diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index 49178d1..a64728c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -8,7 +8,7 @@ import java.util.HashMap; import org.gcube.portlets.user.td.chartswidget.client.ChartsWidgetTD; import org.gcube.portlets.user.td.client.logs.TDMLogs; import org.gcube.portlets.user.td.client.rstudio.RStudio; -import org.gcube.portlets.user.td.client.rule.RuleAppliedDialog; +import org.gcube.portlets.user.td.client.rule.RuleActiveDialog; import org.gcube.portlets.user.td.client.rule.RuleApplyDialog; import org.gcube.portlets.user.td.client.rule.RuleDeleteDialog; import org.gcube.portlets.user.td.client.rule.RuleOpenDialog; @@ -907,7 +907,7 @@ public class TabularDataController { case RULE_APPLY: openApplyRule(); break; - case RULES_APPLIED_ON_TABULAR_RESOURCE: + case RULES_ACTIVE: openRulesAppliedOnTabularResource(); break; case RULE_SHARE: @@ -1759,7 +1759,7 @@ public class TabularDataController { private void openRulesAppliedOnTabularResource() { Log.debug("Request Open Rules Applied on TabularResource Dialog"); if (trId != null) { - RuleAppliedDialog raDialog = new RuleAppliedDialog( + RuleActiveDialog raDialog = new RuleActiveDialog( trId, eventBus); raDialog.show(); } else { diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index e8ab342..24a6e4d 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -171,11 +171,17 @@ public interface TabularDataResources extends ClientBundle { @Source("rule-column-apply_32.png") ImageResource ruleColumnApply32(); + @Source("rule-column-detach.png") + ImageResource ruleColumnDetach(); + + @Source("rule-column-detach_32.png") + ImageResource ruleColumnDetach32(); + @Source("rule-tabularresource.png") ImageResource ruleTabularResource(); @Source("rule-tabularresource_32.png") - ImageResource ruleTabularResource32(); + ImageResource ruleActive32(); @Source("table-filter_32.png") diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/rule-column-detach.png b/src/main/java/org/gcube/portlets/user/td/client/resource/rule-column-detach.png new file mode 100644 index 0000000000000000000000000000000000000000..c78de347b541adeed99f0498c6fb572e5b9d2791 GIT binary patch literal 862 zcmV-k1EKthP)ZdEB}8_i&MTHs4ttID7%%@^WW9bLxdD zu1=|jnq%sSDI$)dXsL*UsWU8O@bNp(?S{)&JL6g8`}>_@*4zU`!;zd#vq=4Zr^&pdut`!dRn0^T{S=N-0ih zN~-3l8t%{^jBr!h4>ws@m?upWR@eSQEYKeoJl#6Uzr8;0dv;u%X#3iX$adCZeK1X# zG^kdqT>I@8cB?ZCC9r;Po7?3y-AW7fh^kYl62%l1!-1`yaqjF>G$%7eglFdFiS3_Q zI5o{&v&P%6Ow;Kpgg_~ZJ46vjR0$!_>l@$xu!^~pn~`K0r_U@>6eUgsAcg=2VooVS zR9DoEM~@4FI)Ak5)MA6$cVE-H_B#*SkH|~qrKKet2m~BQR4|29O+6*@&CeZ9HtXzm zc4&O@8HZ2Lz}j_=ZfsDmSGZDJAl00SdWt!SIHeis)?+_*;!w5LYL2n<&kl1}E;9S_ zJV_RrIx-0{vU}q;Z!I1K;LGJra7WEBGtz_Ol~13Y9-G+d38grryyX9c7$8Pm3rfHW z;q?~|GtoG}ATNWdk*Zq5+)-85x4gT&aBgt^s|(fE(({wI{(P`qHYSTF8WmoBZ<(r& zP&Ed58BR@&-|FT%NVmG>`IYtVB@yqnxAXUFQ^(qy<0sOIA6G7o4z)i2WbWOS%BUCS o(-e^eGsD#A<~q3g(QCW^0YS>_=>XY8^;ZNCQodWP10G!jKs#2~-ii#pM1E{S1aF@+V zE0}x7$nFJ1ghF7;PUN>h{|W%ATCPUQw-0Qfo+xBhQPSUgJLmTvRc^XDKEu}X^QN--*44&^31_7$d($W$GgM*Yx zrHnffPK1$>5vtWH>Xg_exoVuSHh`v6rT1}^qySntGBY#7@bEB0Lqqx4)YKF%Nl4-t zRV9jIL>$Fpk5RL~%Y8c3ol_SB_(hB!$@tKgypm&7P0Bf21B*HJ;n0V|G~!h`sp!I+d__4*8@@JdEl zA&Md{UA|1m=tER`H?ny57T!o7mzRb1-a$Ms$TOQbct8@c9xAMpfy~<*wK6z7V~7#~ z49+E}3L?^!kt!HVZE>2#OYhKE?xS9*VEso3I(jh%d}~wv)0Ru!$vRG`S;J}QJW7PG zeLk)C^z|BN-@TgEQ1LvEty{NpY4S8qgrUJf#>U3DcI_IEeX5_{4P^ihot(qkrbJVv znYA+@_YlOiEWEYwQU3M~4wTDfip3(%Il?f^=Mq_af06bAO(op0@OwGXYBsSGs&&WY z3pW&P%2!fR+Mbn7V7R_2d&@>3uH2qW8E4*^_GQG=x zqEsp|GBT0|j$;tXRMNZ_78dB~>7iIGuJQV*5+%#tY8B8d!JSINrRgdK-(&u6Lf!6U z_ZEva1{N3SnfN`Gu)sgY_oT!Hk|d$KyPLgx_u}6JEN{u0WkwHRwKSk#;3cHe#J?!ly7 z4}H6$$E@mxFZ^_h7oXck;*?qy7VjpEZ%%_Nuw025z3@l2zyE96`b+dYw1?#jAJBE{ z2D{#V4I2ay1lYjC1?`-9?3*}0T$P8+Vw!%_0Px~-+j#z!sqR|MG0+q8z-W=cvxvfS zHKus(ZN?^kNjNw_>2v!qzDMV-9a&v7p;|+7`wq2#F7Wi;A@G_iICOFj&zc;?stkPZ zXMZo%qU2CtXUL8$xB``GMDNMh*?QtN+V9^&>EX{{qAFauiV?TcB{tp%#-c6(QD}0E ztZSzpfmylp0{kf98|9whKqKvXpo>eW za}*068uKc_Ag~6SmRTII68U z+9~3hEVw?M+w`+9U)*Me*Ef|5<0Ive*umtD3bTvR@jG|qtH*w{d#SPb!$&{+E#rAF zn;`Ig%kQ?lapFt=>EZM%2M=@P;4_$4zpI=W_+XoQ`W;n1EkZ4J@&_B+U;OI(rzijmIYBzd0rU3q1Yz%Qa)7rT_o{07*qoM6N<$ Ef}6mhK>z>% literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java index 95cc108..fe00e6a 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java @@ -39,7 +39,7 @@ public class RuleToolBar { // Rules private TextButton ruleOpenButton; private TextButton ruleDeleteButton; - private TextButton ruleOnTabularResourceButton; + private TextButton ruleActiveButton; private TextButton ruleShareButton; // On Column @@ -107,24 +107,24 @@ public class RuleToolBar { ruleLayout.setWidget(0, 1, ruleDeleteButton); ruleLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); - ruleOnTabularResourceButton = new TextButton( - msgs.ruleTabularResourceButton(), - TabularDataResources.INSTANCE.ruleTabularResource32()); - ruleOnTabularResourceButton.disable(); - ruleOnTabularResourceButton.setScale(ButtonScale.LARGE); - ruleOnTabularResourceButton.setIconAlign(IconAlign.TOP); - ruleOnTabularResourceButton.setToolTip(msgs - .ruleTabularResourceButtonToolTip()); - ruleOnTabularResourceButton.setArrowAlign(ButtonArrowAlign.BOTTOM); - ruleOnTabularResourceButton.addSelectHandler(new SelectHandler() { + ruleActiveButton = new TextButton( + msgs.ruleActiveButton(), + TabularDataResources.INSTANCE.ruleActive32()); + ruleActiveButton.disable(); + ruleActiveButton.setScale(ButtonScale.LARGE); + ruleActiveButton.setIconAlign(IconAlign.TOP); + ruleActiveButton.setToolTip(msgs + .ruleActiveButtonToolTip()); + ruleActiveButton.setArrowAlign(ButtonArrowAlign.BOTTOM); + ruleActiveButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { eventBus.fireEvent(new RibbonEvent( - RibbonType.RULES_APPLIED_ON_TABULAR_RESOURCE)); + RibbonType.RULES_ACTIVE)); } }); - ruleLayout.setWidget(0, 2, ruleOnTabularResourceButton); + ruleLayout.setWidget(0, 2, ruleActiveButton); ruleLayout.getFlexCellFormatter().setRowSpan(0, 2, 2); ruleShareButton = new TextButton(msgs.ruleShareButton(), @@ -222,7 +222,7 @@ public class RuleToolBar { case START: ruleOpenButton.enable(); ruleDeleteButton.enable(); - ruleOnTabularResourceButton.disable(); + ruleActiveButton.disable(); ruleShareButton.enable(); ruleOnColumnNewButton.enable(); ruleOnColumnApplyButton.disable(); @@ -231,7 +231,7 @@ public class RuleToolBar { case TR_READONLY: ruleOpenButton.enable(); ruleDeleteButton.enable(); - ruleOnTabularResourceButton.disable(); + ruleActiveButton.disable(); ruleShareButton.enable(); ruleOnColumnNewButton.enable(); ruleOnColumnApplyButton.disable(); @@ -242,7 +242,7 @@ public class RuleToolBar { case TABLECURATION: ruleOpenButton.enable(); ruleDeleteButton.enable(); - ruleOnTabularResourceButton.enable(); + ruleActiveButton.enable(); ruleShareButton.enable(); ruleOnColumnNewButton.enable(); ruleOnColumnApplyButton.enable(); @@ -251,7 +251,7 @@ public class RuleToolBar { case WIZARD_OPEN: ruleOpenButton.disable(); ruleDeleteButton.disable(); - ruleOnTabularResourceButton.disable(); + ruleActiveButton.disable(); ruleShareButton.disable(); ruleOnColumnNewButton.disable(); ruleOnColumnApplyButton.disable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.java index 4da7152..96b5efe 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.java @@ -32,10 +32,10 @@ public interface RuleToolBarMessages extends Messages { String ruleShareButtonToolTip(); @DefaultMessage("Applied") - String ruleTabularResourceButton(); + String ruleActiveButton(); @DefaultMessage("Applied") - String ruleTabularResourceButtonToolTip(); + String ruleActiveButtonToolTip(); @DefaultMessage("On Column") diff --git a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedDialog.java b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleActiveDialog.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedDialog.java rename to src/main/java/org/gcube/portlets/user/td/client/rule/RuleActiveDialog.java index 797a78e..5518133 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleActiveDialog.java @@ -14,15 +14,15 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class RuleAppliedDialog extends Window { +public class RuleActiveDialog extends Window { private static final String WIDTH = "720px"; private static final String HEIGHT = "428px"; - public RuleAppliedDialog(TRId trId, EventBus eventBus) { + public RuleActiveDialog(TRId trId, EventBus eventBus) { initWindow(); - RuleAppliedPanel ruleApplyPanel = new RuleAppliedPanel(this, + RuleActivePanel ruleActivePanel = new RuleActivePanel(this, trId, eventBus); - add(ruleApplyPanel); + add(ruleActivePanel); } protected void initWindow() { @@ -30,7 +30,7 @@ public class RuleAppliedDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Rules Applied On TabularResource"); + setHeadingText("Active Rules On TabularResource"); setClosable(true); setModal(true); forceLayoutOnResize = true; diff --git a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedPanel.java b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleActivePanel.java similarity index 82% rename from src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedPanel.java rename to src/main/java/org/gcube/portlets/user/td/client/rule/RuleActivePanel.java index eb02140..a621c2a 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleAppliedPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleActivePanel.java @@ -12,6 +12,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalExcept import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.rule.AppliedRulesResponseData; +import org.gcube.portlets.user.td.gwtservice.shared.rule.DetachColumnRulesSession; import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleDescriptionData; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; @@ -65,7 +66,7 @@ import com.sencha.gxt.widget.core.client.menu.MenuItem; * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it * */ -public class RuleAppliedPanel extends FramedPanel { +public class RuleActivePanel extends FramedPanel { private static final int RULE_ON_COLUMN_FIELDSET_HEIGHT = 348; private static final String RULES_GRID_HEIGHT = "102px"; private static final String WIDTH = "630px"; @@ -77,20 +78,21 @@ public class RuleAppliedPanel extends FramedPanel { } private EventBus eventBus; - private RuleAppliedDialog parent; + private RuleActiveDialog parent; private TRId trId; private ArrayList columns; private AppliedRulesResponseData appliedRuleResponseData; private TextButton btnClose; + private VerticalLayoutContainer mainLayoutContainer; - public RuleAppliedPanel(RuleAppliedDialog parent, TRId trId, + public RuleActivePanel(RuleActiveDialog parent, TRId trId, EventBus eventBus) { this.parent = parent; this.trId = trId; - Log.debug("RuleAppliedPanel"); + Log.debug("RuleActivePanel"); setWidth(WIDTH); setHeight(HEIGHT); setHeaderVisible(false); @@ -140,7 +142,7 @@ public class RuleAppliedPanel extends FramedPanel { } columns = result; - getAppliedBaseColumnRules(); + getActiveRulesOnColumn(); } }); @@ -148,7 +150,7 @@ public class RuleAppliedPanel extends FramedPanel { protected void create() { - Log.debug("Create RuleAppliedPanel(): " + trId); + Log.debug("Create RuleActivePanel(): " + trId); // SimpleContainer rulesOnColumnContainer=new SimpleContainer(); FieldSet columnRulesFieldSet = new FieldSet(); @@ -200,12 +202,12 @@ public class RuleAppliedPanel extends FramedPanel { flowButton.setPack(BoxLayoutPack.CENTER); flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4))); - VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.add(columnRulesFieldSet, new VerticalLayoutData(-1, + mainLayoutContainer = new VerticalLayoutContainer(); + mainLayoutContainer.add(columnRulesFieldSet, new VerticalLayoutData(-1, RULE_ON_COLUMN_FIELDSET_HEIGHT, new Margins(0))); - v.add(flowButton, + mainLayoutContainer.add(flowButton, new VerticalLayoutData(1, 36, new Margins(5, 2, 5, 2))); - add(v); + add(mainLayoutContainer); } @@ -292,6 +294,7 @@ public class RuleAppliedPanel extends FramedPanel { final Grid gridAppliedRules = new Grid( appliedRulesStore, cm); + gridAppliedRules.setItemId(column.getColumnId()); gridAppliedRules.setHeight(RULES_GRID_HEIGHT); gridAppliedRules.getView().setStripeRows(true); gridAppliedRules.getView().setColumnLines(true); @@ -316,9 +319,38 @@ public class RuleAppliedPanel extends FramedPanel { return rulesAppliedLabel; } - protected void getAppliedBaseColumnRules() { + protected void getActiveRulesOnColumn() { - ExpressionServiceAsync.INSTANCE.getAppliedRulesByTabularResourceId( + ExpressionServiceAsync.INSTANCE.getActiveRulesByTabularResourceId( + trId, new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent( + SessionExpiredType.EXPIREDONSERVER)); + } else { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error retrieving active rules", + caught.getLocalizedMessage()); + } + + } + + @Override + public void onSuccess(AppliedRulesResponseData result) { + Log.trace("AppliedRuleResponseData: " + result); + appliedRuleResponseData = result; + create(); + } + }); + + } + + + protected void updateActiveRulesOnColumn() { + + ExpressionServiceAsync.INSTANCE.getActiveRulesByTabularResourceId( trId, new AsyncCallback() { @Override @@ -338,15 +370,19 @@ public class RuleAppliedPanel extends FramedPanel { public void onSuccess(AppliedRulesResponseData result) { Log.trace("AppliedRuleResponseData: " + result); appliedRuleResponseData = result; - create(); + recreate(); } }); } + protected void close() { parent.close(); } + + + protected void requestInfo(RuleDescriptionData rule) { @@ -422,6 +458,7 @@ public class RuleAppliedPanel extends FramedPanel { MenuItem infoItem = new MenuItem(); infoItem.setText("Info"); + infoItem.setToolTip("Info"); infoItem.setIcon(TabularDataResources.INSTANCE.information()); infoItem.addSelectionHandler(new SelectionHandler() { @@ -433,6 +470,24 @@ public class RuleAppliedPanel extends FramedPanel { requestInfo(selected); } }); + + MenuItem detachItem = new MenuItem(); + detachItem.setText("Detach"); + detachItem.setToolTip("Detach rule"); + detachItem.setIcon(TabularDataResources.INSTANCE.ruleColumnDetach()); + detachItem.addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + RuleDescriptionData selected = grid.getSelectionModel() + .getSelectedItem(); + Log.debug(selected.toString()); + requestDetach(selected, grid); + } + + + }); + contextMenu.add(infoItem); @@ -440,4 +495,53 @@ public class RuleAppliedPanel extends FramedPanel { } + protected void requestDetach(RuleDescriptionData selected, + final Grid grid) { + + String columnLocalId=grid.getItemId(); + ColumnData columnData=new ColumnData(); + columnData.setColumnId(columnLocalId); + ArrayList detachRules=new ArrayList(); + detachRules.add(selected); + + DetachColumnRulesSession detachColumnRulesSession=new DetachColumnRulesSession(trId, columnData, detachRules); + + ExpressionServiceAsync.INSTANCE.setDetachColumnRules(detachColumnRulesSession, + new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + if (caught instanceof TDGWTSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent( + SessionExpiredType.EXPIREDONSERVER)); + } else { + Log.error(caught.getLocalizedMessage()); + UtilsGXT3.alert("Error in detach rules", + caught.getLocalizedMessage()); + } + + } + + @Override + public void onSuccess(Void result) { + updateActiveRulesOnColumn(); + Log.debug("The rule is detached!"); + UtilsGXT3.info("Detach Rule", + "The rule is detached!"); + + } + }); + + } + + + protected void recreate(){ + remove(mainLayoutContainer); + create(); + forceLayout(); + + + } + + } diff --git a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleApplyPanel.java b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleApplyPanel.java index 00db03c..4adf27c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/rule/RuleApplyPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/rule/RuleApplyPanel.java @@ -99,8 +99,8 @@ public class RuleApplyPanel extends FramedPanel { private ComboBox comboColumns; private ListStore applicableRulesStore; private Grid gridApplicableRules; - private ListStore appliesRulesStore; - private Grid gridAppliesRules; + private ListStore selectedRulesStore; + private Grid gridSelectedRules; public RuleApplyPanel(RuleApplyDialog parent, TRId trId, EventBus eventBus) { this.parent = parent; @@ -292,38 +292,38 @@ public class RuleApplyPanel extends FramedPanel { createContextMenu(gridApplicableRules); - // Applies Rules - appliesRulesStore = new ListStore(propsRules.id()); + // Selected Rules + selectedRulesStore = new ListStore(propsRules.id()); - gridAppliesRules = new Grid(appliesRulesStore, cm); - gridAppliesRules.setHeight(RULES_GRID_HEIGHT); - gridAppliesRules.getView().setStripeRows(true); - gridAppliesRules.getView().setColumnLines(true); - gridAppliesRules.getView().setAutoFill(true); - gridAppliesRules.setBorders(false); - gridAppliesRules.setLoadMask(true); - gridAppliesRules.setColumnReordering(true); - gridAppliesRules.setColumnResize(true); - gridAppliesRules.getView().setAutoExpandColumn(descriptionCol); + gridSelectedRules = new Grid(selectedRulesStore, cm); + gridSelectedRules.setHeight(RULES_GRID_HEIGHT); + gridSelectedRules.getView().setStripeRows(true); + gridSelectedRules.getView().setColumnLines(true); + gridSelectedRules.getView().setAutoFill(true); + gridSelectedRules.setBorders(false); + gridSelectedRules.setLoadMask(true); + gridSelectedRules.setColumnReordering(true); + gridSelectedRules.setColumnResize(true); + gridSelectedRules.getView().setAutoExpandColumn(descriptionCol); - GridFilters filtersAppliesRules = new GridFilters(); - filtersAppliesRules.initPlugin(gridAppliesRules); - filtersAppliesRules.setLocal(true); - filtersAppliesRules.addFilter(nameFilter); - filtersAppliesRules.addFilter(descriptionFilter); + GridFilters filtersSelectedRules = new GridFilters(); + filtersSelectedRules.initPlugin(gridSelectedRules); + filtersSelectedRules.setLocal(true); + filtersSelectedRules.addFilter(nameFilter); + filtersSelectedRules.addFilter(descriptionFilter); - createContextMenu(gridAppliesRules); + createContextMenu(gridSelectedRules); // new GridDragSource(gridApplicableRules) .setGroup(SET_RULES); - new GridDragSource(gridAppliesRules) + new GridDragSource(gridSelectedRules) .setGroup(SET_RULES); new GridDropTarget(gridApplicableRules) .setGroup(SET_RULES); - new GridDropTarget(gridAppliesRules) + new GridDropTarget(gridSelectedRules) .setGroup(SET_RULES); // @@ -333,17 +333,17 @@ public class RuleApplyPanel extends FramedPanel { configurationFieldSetLayout.add(rulesApplicableLabel, new VerticalLayoutData(1, -1, new Margins(0))); - FieldLabel rulesAppliesLabel = new FieldLabel(gridAppliesRules, - "Applies Rules"); + FieldLabel rulesSelectedLabel = new FieldLabel(gridSelectedRules, + "Selected Rules"); - configurationFieldSetLayout.add(rulesAppliesLabel, + configurationFieldSetLayout.add(rulesSelectedLabel, new VerticalLayoutData(1, -1, new Margins(0))); // Button btnApply = new TextButton("Apply"); btnApply.setIcon(TabularDataResources.INSTANCE.ruleColumnApply()); btnApply.setIconAlign(IconAlign.RIGHT); - btnApply.setToolTip("Apply Template"); + btnApply.setToolTip("Apply Rule"); btnApply.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -403,7 +403,7 @@ public class RuleApplyPanel extends FramedPanel { protected void updateRulesInGrids(ColumnData columnData) { column = columnData; applicableRulesStore.clear(); - appliesRulesStore.clear(); + selectedRulesStore.clear(); HashMap> columnRuleMapping = appliedRuleResponseData .getColumnRuleMapping(); @@ -413,7 +413,7 @@ public class RuleApplyPanel extends FramedPanel { if (applied != null) { appliedRules = applied; - appliesRulesStore.addAll(new ArrayList( + selectedRulesStore.addAll(new ArrayList( applied)); } @@ -472,7 +472,7 @@ public class RuleApplyPanel extends FramedPanel { protected void getAppliedBaseColumnRules() { - ExpressionServiceAsync.INSTANCE.getAppliedRulesByTabularResourceId( + ExpressionServiceAsync.INSTANCE.getActiveRulesByTabularResourceId( trId, new AsyncCallback() { @Override @@ -482,7 +482,7 @@ public class RuleApplyPanel extends FramedPanel { SessionExpiredType.EXPIREDONSERVER)); } else { Log.error(caught.getLocalizedMessage()); - UtilsGXT3.alert("Error retrieving applied rules", + UtilsGXT3.alert("Error retrieving selected rules", caught.getLocalizedMessage()); } @@ -499,7 +499,7 @@ public class RuleApplyPanel extends FramedPanel { } protected ArrayList getSelectedItems() { - List selectedItems = appliesRulesStore.getAll(); + List selectedItems = selectedRulesStore.getAll(); ArrayList rulesSelected = new ArrayList( selectedItems); return rulesSelected; diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-column-detach.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/rule-column-detach.png new file mode 100644 index 0000000000000000000000000000000000000000..c78de347b541adeed99f0498c6fb572e5b9d2791 GIT binary patch literal 862 zcmV-k1EKthP)ZdEB}8_i&MTHs4ttID7%%@^WW9bLxdD zu1=|jnq%sSDI$)dXsL*UsWU8O@bNp(?S{)&JL6g8`}>_@*4zU`!;zd#vq=4Zr^&pdut`!dRn0^T{S=N-0ih zN~-3l8t%{^jBr!h4>ws@m?upWR@eSQEYKeoJl#6Uzr8;0dv;u%X#3iX$adCZeK1X# zG^kdqT>I@8cB?ZCC9r;Po7?3y-AW7fh^kYl62%l1!-1`yaqjF>G$%7eglFdFiS3_Q zI5o{&v&P%6Ow;Kpgg_~ZJ46vjR0$!_>l@$xu!^~pn~`K0r_U@>6eUgsAcg=2VooVS zR9DoEM~@4FI)Ak5)MA6$cVE-H_B#*SkH|~qrKKet2m~BQR4|29O+6*@&CeZ9HtXzm zc4&O@8HZ2Lz}j_=ZfsDmSGZDJAl00SdWt!SIHeis)?+_*;!w5LYL2n<&kl1}E;9S_ zJV_RrIx-0{vU}q;Z!I1K;LGJra7WEBGtz_Ol~13Y9-G+d38grryyX9c7$8Pm3rfHW z;q?~|GtoG}ATNWdk*Zq5+)-85x4gT&aBgt^s|(fE(({wI{(P`qHYSTF8WmoBZ<(r& zP&Ed58BR@&-|FT%NVmG>`IYtVB@yqnxAXUFQ^(qy<0sOIA6G7o4z)i2WbWOS%BUCS o(-e^eGsD#A<~q3g(QCW^0YS>_=>XY8^;ZNCQodWP10G!jKs#2~-ii#pM1E{S1aF@+V zE0}x7$nFJ1ghF7;PUN>h{|W%ATCPUQw-0Qfo+xBhQPSUgJLmTvRc^XDKEu}X^QN--*44&^31_7$d($W$GgM*Yx zrHnffPK1$>5vtWH>Xg_exoVuSHh`v6rT1}^qySntGBY#7@bEB0Lqqx4)YKF%Nl4-t zRV9jIL>$Fpk5RL~%Y8c3ol_SB_(hB!$@tKgypm&7P0Bf21B*HJ;n0V|G~!h`sp!I+d__4*8@@JdEl zA&Md{UA|1m=tER`H?ny57T!o7mzRb1-a$Ms$TOQbct8@c9xAMpfy~<*wK6z7V~7#~ z49+E}3L?^!kt!HVZE>2#OYhKE?xS9*VEso3I(jh%d}~wv)0Ru!$vRG`S;J}QJW7PG zeLk)C^z|BN-@TgEQ1LvEty{NpY4S8qgrUJf#>U3DcI_IEeX5_{4P^ihot(qkrbJVv znYA+@_YlOiEWEYwQU3M~4wTDfip3(%Il?f^=Mq_af06bAO(op0@OwGXYBsSGs&&WY z3pW&P%2!fR+Mbn7V7R_2d&@>3uH2qW8E4*^_GQG=x zqEsp|GBT0|j$;tXRMNZ_78dB~>7iIGuJQV*5+%#tY8B8d!JSINrRgdK-(&u6Lf!6U z_ZEva1{N3SnfN`Gu)sgY_oT!Hk|d$KyPLgx_u}6JEN{u0WkwHRwKSk#;3cHe#J?!ly7 z4}H6$$E@mxFZ^_h7oXck;*?qy7VjpEZ%%_Nuw025z3@l2zyE96`b+dYw1?#jAJBE{ z2D{#V4I2ay1lYjC1?`-9?3*}0T$P8+Vw!%_0Px~-+j#z!sqR|MG0+q8z-W=cvxvfS zHKus(ZN?^kNjNw_>2v!qzDMV-9a&v7p;|+7`wq2#F7Wi;A@G_iICOFj&zc;?stkPZ zXMZo%qU2CtXUL8$xB``GMDNMh*?QtN+V9^&>EX{{qAFauiV?TcB{tp%#-c6(QD}0E ztZSzpfmylp0{kf98|9whKqKvXpo>eW za}*068uKc_Ag~6SmRTII68U z+9~3hEVw?M+w`+9U)*Me*Ef|5<0Ive*umtD3bTvR@jG|qtH*w{d#SPb!$&{+E#rAF zn;`Ig%kQ?lapFt=>EZM%2M=@P;4_$4zpI=W_+XoQ`W;n1EkZ4J@&_B+U;OI(rzijmIYBzd0rU3q1Yz%Qa)7rT_o{07*qoM6N<$ Ef}6mhK>z>% literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties index 26fda7c..59378ab 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties @@ -5,8 +5,8 @@ ruleDeleteButton = Delete ruleDeleteButtonToolTip = Delete ruleShareButton = Share ruleShareButtonToolTip = Share -ruleTabularResourceButton = Applied -ruleTabularResourceButtonToolTip = Applied +ruleActiveButton = Active +ruleActiveButtonToolTip = Active ruleOnColumnGroupHeadingText = On Column ruleNewButton = New ruleNewButtonToolTip = New diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties index bacd768..bd7b460 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties @@ -5,8 +5,8 @@ ruleDeleteButton = Borrar ruleDeleteButtonToolTip = Borrar ruleShareButton = Cuota ruleShareButtonToolTip = Cuota -ruleTabularResourceButton = Aplicado -ruleTabularResourceButtonToolTip = Aplicado +ruleActiveButton = Activo +ruleActiveToolTip = Activo ruleOnColumnGroupHeadingText = On Columna ruleNewButton = Nuevo ruleNewButtonToolTip = Nuevo diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties index e1c3ff7..188430d 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties @@ -5,8 +5,8 @@ ruleDeleteButton = Elimina ruleDeleteButtonToolTip = Elimina ruleShareButton = Condividi ruleShareButtonToolTip = Condividi -ruleTabularResourceButton = Applicate -ruleTabularResourceButtonToolTip = Applicate +ruleActiveButton = Attive +ruleActiveButtonToolTip = Attive ruleOnColumnGroupHeadingText = Su Colonna ruleNewButton = Nuova ruleNewButtonToolTip = Nuova