From 3e624e687a2d7a4f1a28851e784cac9ddaa5b22e Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 28 Jul 2021 17:47:49 +0200 Subject: [PATCH] Temporarely removed possibility to add attachments --- .classpath | 8 +- .settings/org.eclipse.core.resources.prefs | 1 + .settings/org.eclipse.wst.common.component | 30 ++++--- CHANGELOG.md | 4 +- .../client/ui/WriteMessage.java | 85 +++++++++---------- .../client/ui/WriteMessage.ui.xml | 12 +-- 6 files changed, 76 insertions(+), 64 deletions(-) diff --git a/.classpath b/.classpath index 7e59c31..70f4612 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -30,11 +30,11 @@ - + - + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index abdea9a..0bf7f20 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 +encoding//target/generated-sources/gwt=UTF-8 encoding/=UTF-8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 3479a06..e19deb5 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -7,7 +8,8 @@ - + + @@ -15,7 +17,8 @@ - + + @@ -23,7 +26,8 @@ - + + @@ -31,7 +35,8 @@ - + + @@ -39,11 +44,13 @@ - + + - + + @@ -51,7 +58,8 @@ - + + @@ -59,7 +67,8 @@ - + + @@ -67,7 +76,8 @@ - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b6ce48..aa2468d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v2.5.0] -2021-04-14 +## [v2.5.0] -2021-07-28 - Ported to git - Remove HomeLibrary dependency and replace with storage hub one +- Temporarely removed possibility to add attachments + ## [v2.4.0] -2019-10-25 - Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java index 421e7eb..955e560 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java @@ -59,8 +59,8 @@ public class WriteMessage extends Composite { @UiField MaterialAutoComplete acModal; @UiField MaterialButton btnSendModal, btnCloseModal; @UiField MaterialPanel modalContent, sendingLoader; - @UiField MaterialRow attachmentsRow; - @UiField MaterialLink attachButton; +// @UiField MaterialRow attachmentsRow; +// @UiField MaterialLink attachButton; @UiField MaterialLabel sendingFeedback; @UiField MaterialPreLoader sendingSpinner; @UiField MaterialTextArea txtArea; @@ -205,39 +205,39 @@ public class WriteMessage extends Composite { toReturn.add(new WSUser("testing", "username testing", "Andrea testing", "@gmail.com")); return toReturn; } - @UiHandler("attachButton") - void onAttach(ClickEvent e) { - List types = new ArrayList<>(); - ItemType[] theTypes = ItemType.values(); - for (int i = 0; i < theTypes.length; i++) { - if (theTypes[i] != ItemType.FOLDER) - types.add(theTypes[i]); - } - FilterCriteria criteria = null; - final WorkspaceExplorerSelectDialog wpTreepopup = new WorkspaceExplorerSelectDialog("Select an item", criteria, types); - wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP); - wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT); - wpTreepopup.setZIndex(10010); - WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { - @Override - public void onSelectedItem(Item item) { - attachmentsRow.add(getChip(item.getId(), item.getName(), item.isFolder(), true)); - wpTreepopup.hide(); - } - @Override - public void onFailed(Throwable throwable) { - Window.alert("There are networks problem, please check your connection."); - } - @Override - public void onAborted() {} - @Override - public void onNotValidSelection() { - } - }; - - wpTreepopup.addWorkspaceExplorerSelectNotificationListener(listener); - wpTreepopup.show(); - } +// @UiHandler("attachButton") +// void onAttach(ClickEvent e) { +// List types = new ArrayList<>(); +// ItemType[] theTypes = ItemType.values(); +// for (int i = 0; i < theTypes.length; i++) { +// if (theTypes[i] != ItemType.FOLDER) +// types.add(theTypes[i]); +// } +// FilterCriteria criteria = null; +// final WorkspaceExplorerSelectDialog wpTreepopup = new WorkspaceExplorerSelectDialog("Select an item", criteria, types); +// wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP); +// wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT); +// wpTreepopup.setZIndex(10010); +// WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { +// @Override +// public void onSelectedItem(Item item) { +// attachmentsRow.add(getChip(item.getId(), item.getName(), item.isFolder(), true)); +// wpTreepopup.hide(); +// } +// @Override +// public void onFailed(Throwable throwable) { +// Window.alert("There are networks problem, please check your connection."); +// } +// @Override +// public void onAborted() {} +// @Override +// public void onNotValidSelection() { +// } +// }; +// +// wpTreepopup.addWorkspaceExplorerSelectNotificationListener(listener); +// wpTreepopup.show(); +// } //for the attachments we distinguish between folder and files private MaterialChip getChip(String itemId, String itemName, boolean isFolder, boolean deletable) { @@ -263,13 +263,13 @@ public class WriteMessage extends Composite { private ArrayList getSelectedFilesAndFoldersId() { ArrayList toReturn = new ArrayList<>(); - int n = attachmentsRow.getWidgetCount(); - for (int i = 0; i < n; i++) { - Widget w = attachmentsRow.getWidget(i); - if (w instanceof MaterialChip) { - toReturn.add(((MaterialChip) w).getId()); - } - } +// int n = attachmentsRow.getWidgetCount(); +// for (int i = 0; i < n; i++) { +// Widget w = attachmentsRow.getWidget(i); +// if (w instanceof MaterialChip) { +// toReturn.add(((MaterialChip) w).getId()); +// } +// } return toReturn; } @@ -297,7 +297,6 @@ public class WriteMessage extends Composite { txtArea.reset(); } GWT.log(getSelectedUsers()+""); - GWT.log(getSelectedFilesAndFoldersId()+""); ArrayList recipientIds = new ArrayList<>(); for (WSUser u : getSelectedUsers()) { recipientIds.add(u.getScreenname()); diff --git a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.ui.xml b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.ui.xml index f487264..fee39c5 100644 --- a/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.ui.xml +++ b/src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.ui.xml @@ -44,12 +44,12 @@ - - - - + + + + + +