gCubeSystem
/
Messages
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Temporarely removed possibility to add attachments

This commit is contained in:
Massimiliano Assante 2021-07-28 17:47:49 +02:00
parent 5ebf43429f
commit 3e624e687a
6 changed files with 76 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -30,11 +30,11 @@
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="target/generated-sources/gwt"> <classpathentry kind="src" output="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/messages-2.5.0/WEB-INF/classes"/> <classpathentry kind="output" path="target/messages-2.5.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

1
.settings/org.eclipse.core.resources.prefs
View File

@ -1,4 +1,5 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/main/java=UTF-8 encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8 encoding//src/main/resources=UTF-8
encoding//target/generated-sources/gwt=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8

30
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -7,7 +8,8 @@
<wb-module deploy-name="messages"> <wb-module deploy-name="messages">
@ -15,7 +17,8 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -23,7 +26,8 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -31,7 +35,8 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -39,11 +44,13 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
@ -51,7 +58,8 @@
<property name="java-output-path" value="/message-conversations/target/message-conversations-0.0.1-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/message-conversations/target/message-conversations-0.0.1-SNAPSHOT/WEB-INF/classes"/>
@ -59,7 +67,8 @@
<property name="context-root" value="messages"/> <property name="context-root" value="messages"/>
@ -67,7 +76,8 @@
</wb-module> </wb-module>

4
CHANGELOG.md
View File

@ -4,12 +4,14 @@
All notable changes to this project will be documented in this file. 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). 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 - Ported to git
- Remove HomeLibrary dependency and replace with storage hub one - Remove HomeLibrary dependency and replace with storage hub one
- Temporarely removed possibility to add attachments
## [v2.4.0] -2019-10-25 ## [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 - Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below

85
src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.java
View File

@ -59,8 +59,8 @@ public class WriteMessage extends Composite {
@UiField MaterialAutoComplete acModal; @UiField MaterialAutoComplete acModal;
@UiField MaterialButton btnSendModal, btnCloseModal; @UiField MaterialButton btnSendModal, btnCloseModal;
@UiField MaterialPanel modalContent, sendingLoader; @UiField MaterialPanel modalContent, sendingLoader;
@UiField MaterialRow attachmentsRow; // @UiField MaterialRow attachmentsRow;
@UiField MaterialLink attachButton; // @UiField MaterialLink attachButton;
@UiField MaterialLabel sendingFeedback; @UiField MaterialLabel sendingFeedback;
@UiField MaterialPreLoader sendingSpinner; @UiField MaterialPreLoader sendingSpinner;
@UiField MaterialTextArea txtArea; @UiField MaterialTextArea txtArea;
@ -205,39 +205,39 @@ public class WriteMessage extends Composite {
toReturn.add(new WSUser("testing", "username testing", "Andrea testing", "@gmail.com")); toReturn.add(new WSUser("testing", "username testing", "Andrea testing", "@gmail.com"));
return toReturn; return toReturn;
} }
@UiHandler("attachButton") // @UiHandler("attachButton")
void onAttach(ClickEvent e) { // void onAttach(ClickEvent e) {
List<ItemType> types = new ArrayList<>(); // List<ItemType> types = new ArrayList<>();
ItemType[] theTypes = ItemType.values(); // ItemType[] theTypes = ItemType.values();
for (int i = 0; i < theTypes.length; i++) { // for (int i = 0; i < theTypes.length; i++) {
if (theTypes[i] != ItemType.FOLDER) // if (theTypes[i] != ItemType.FOLDER)
types.add(theTypes[i]); // types.add(theTypes[i]);
} // }
FilterCriteria criteria = null; // FilterCriteria criteria = null;
final WorkspaceExplorerSelectDialog wpTreepopup = new WorkspaceExplorerSelectDialog("Select an item", criteria, types); // final WorkspaceExplorerSelectDialog wpTreepopup = new WorkspaceExplorerSelectDialog("Select an item", criteria, types);
wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP); // wpTreepopup.setId(Utils.ID_MODALBOOTSTRAP);
wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT); // wpTreepopup.getElement().getStyle().setLeft(50, Unit.PCT);
wpTreepopup.setZIndex(10010); // wpTreepopup.setZIndex(10010);
WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() { // WorskpaceExplorerSelectNotificationListener listener = new WorskpaceExplorerSelectNotificationListener() {
@Override // @Override
public void onSelectedItem(Item item) { // public void onSelectedItem(Item item) {
attachmentsRow.add(getChip(item.getId(), item.getName(), item.isFolder(), true)); // attachmentsRow.add(getChip(item.getId(), item.getName(), item.isFolder(), true));
wpTreepopup.hide(); // wpTreepopup.hide();
} // }
@Override // @Override
public void onFailed(Throwable throwable) { // public void onFailed(Throwable throwable) {
Window.alert("There are networks problem, please check your connection."); // Window.alert("There are networks problem, please check your connection.");
} // }
@Override // @Override
public void onAborted() {} // public void onAborted() {}
@Override // @Override
public void onNotValidSelection() { // public void onNotValidSelection() {
} // }
}; // };
//
wpTreepopup.addWorkspaceExplorerSelectNotificationListener(listener); // wpTreepopup.addWorkspaceExplorerSelectNotificationListener(listener);
wpTreepopup.show(); // wpTreepopup.show();
} // }
//for the attachments we distinguish between folder and files //for the attachments we distinguish between folder and files
private MaterialChip getChip(String itemId, String itemName, boolean isFolder, boolean deletable) { private MaterialChip getChip(String itemId, String itemName, boolean isFolder, boolean deletable) {
@ -263,13 +263,13 @@ public class WriteMessage extends Composite {
private ArrayList<String> getSelectedFilesAndFoldersId() { private ArrayList<String> getSelectedFilesAndFoldersId() {
ArrayList<String> toReturn = new ArrayList<>(); ArrayList<String> toReturn = new ArrayList<>();
int n = attachmentsRow.getWidgetCount(); // int n = attachmentsRow.getWidgetCount();
for (int i = 0; i < n; i++) { // for (int i = 0; i < n; i++) {
Widget w = attachmentsRow.getWidget(i); // Widget w = attachmentsRow.getWidget(i);
if (w instanceof MaterialChip) { // if (w instanceof MaterialChip) {
toReturn.add(((MaterialChip) w).getId()); // toReturn.add(((MaterialChip) w).getId());
} // }
} // }
return toReturn; return toReturn;
} }
@ -297,7 +297,6 @@ public class WriteMessage extends Composite {
txtArea.reset(); txtArea.reset();
} }
GWT.log(getSelectedUsers()+""); GWT.log(getSelectedUsers()+"");
GWT.log(getSelectedFilesAndFoldersId()+"");
ArrayList<String> recipientIds = new ArrayList<>(); ArrayList<String> recipientIds = new ArrayList<>();
for (WSUser u : getSelectedUsers()) { for (WSUser u : getSelectedUsers()) {
recipientIds.add(u.getScreenname()); recipientIds.add(u.getScreenname());

12
src/main/java/org/gcube/portets/user/message_conversations/client/ui/WriteMessage.ui.xml
View File

@ -44,12 +44,12 @@
<m:MaterialTextBox label="Subject" ui:field="txtBoxSubject" <m:MaterialTextBox label="Subject" ui:field="txtBoxSubject"
marginBottom="0" /> marginBottom="0" />
</m:MaterialRow> </m:MaterialRow>
<m:MaterialRow marginBottom="0"> <!-- <m:MaterialRow marginBottom="0"> -->
<m:MaterialLink href="#attach" text="Select files to attach" <!-- <m:MaterialLink href="#attach" text="Select files to attach" -->
textColor="BLACK" iconType="ATTACHMENT" iconPosition="LEFT" <!-- textColor="BLACK" iconType="ATTACHMENT" iconPosition="LEFT" -->
ui:field="attachButton" /> <!-- ui:field="attachButton" /> -->
</m:MaterialRow> <!-- </m:MaterialRow> -->
<m:MaterialRow ui:field="attachmentsRow" marginBottom="0" /> <!-- <m:MaterialRow ui:field="attachmentsRow" marginBottom="0" /> -->
<m:MaterialRow> <m:MaterialRow>
<m:MaterialTextArea ui:field="txtArea" label="Body" resizeRule="AUTO"/> <m:MaterialTextArea ui:field="txtArea" label="Body" resizeRule="AUTO"/>
</m:MaterialRow> </m:MaterialRow>