From 0fd53fd3173d1b9ada80e09611f8e8eaec5eca33 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 11 Jun 2018 17:00:23 +0000 Subject: [PATCH] Feature #11782 News Feed: Users fetching for Mentioning is slow when portlet is in displayed at root level. git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@169025 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 ++--- .settings/org.eclipse.wst.common.component | 5 +++- pom.xml | 4 ++-- .../client/ui/AddCommentTemplate.java | 2 ++ .../client/ui/AddCommentTemplate.ui.xml | 5 ---- .../client/ui/SuperPosedTextArea.java | 23 ++++++++----------- .../newsfeed/client/ui/TweetTemplate.java | 12 ++++++---- src/main/webapp/NewsFeed.css | 8 +++---- src/main/webapp/NewsFeed.html | 11 ++------- src/main/webapp/WEB-INF/liferay-portlet.xml | 1 - src/main/webapp/WEB-INF/web.xml | 10 ++++++++ 11 files changed, 45 insertions(+), 42 deletions(-) diff --git a/.classpath b/.classpath index e45ccef..589b77a 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -39,5 +39,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index f644c75..a891999 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -8,7 +8,10 @@ uses - + + uses + + uses diff --git a/pom.xml b/pom.xml index 5ecf876..a9de664 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user news-feed war - 2.6.1-SNAPSHOT + 2.7.0-SNAPSHOT gCube News Feed Portlet @@ -200,7 +200,7 @@ org.gcube.portlets.widgets pickitem-widget - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.portlets.widgets diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java index 8f90c5a..716a406 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java @@ -65,6 +65,7 @@ public class AddCommentTemplate extends Composite { submitButton.setVisible(false); cancelButton.setVisible(false); commentTextArea.setHeight("30px"); + commentTextArea.setContext(owner.getVREContext()); } /** * called on edit comment @@ -84,6 +85,7 @@ public class AddCommentTemplate extends Composite { commentText = commentText.replaceAll("&","&"); owner = caller; + commentTextArea.setContext(owner.getVREContext()); avatarImage.setPixelSize(30, 30); avatarImage.setUrl(caller.getMyUserInfo().getAvatarId()); commentTextArea.setText(commentText); diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml index b07a56c..695e24f 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml @@ -4,11 +4,6 @@ xmlns:w="urn:import:org.gcube.portlets.user.gcubewidgets.client.elements" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" xmlns:m="urn:import:org.gcube.portlets.user.newsfeed.client.ui"> - - .important { - font-weight: bold; - } - diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java index a262f4d..c6ac00c 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.newsfeed.client.ui; -import java.util.ArrayList; import java.util.HashSet; import org.gcube.portlets.user.gcubewidgets.client.elements.Div; @@ -28,7 +27,6 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Random; import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.TextArea; /** @@ -45,7 +43,7 @@ public class SuperPosedTextArea extends TextArea { private Div highlighterDIV; public final static int ARROW_UP = 38; public final static int ARROW_DOWN = 40; - + private String context; private HashSet mentionedUsers = new HashSet(); private String areaId; @@ -87,16 +85,8 @@ public class SuperPosedTextArea extends TextArea { this.addFocusHandler(new FocusHandler() { @Override public void onFocus(FocusEvent event) { - newsService.getOrganizationUsers(new AsyncCallback>() { - @Override - public void onSuccess(ArrayList users) { - pickUserDlg = new PickItemsDialog('@', users, eventBus, 460); - } - - @Override - public void onFailure(Throwable caught) { - } - }); + pickUserDlg = new PickItemsDialog('@', eventBus, 430, context); + pickUserDlg.withPhoto(); } }); @@ -116,6 +106,13 @@ public class SuperPosedTextArea extends TextArea { public SuperPosedTextArea(Element element) { super(element); } + /** + * + * @param context e.g. /gcube/devNext/NextNext + */ + public void setContext(String context) { + this.context = context; + } /** * paste event overridden diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java index 934dd6a..d8c5bf6 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java @@ -712,12 +712,16 @@ public class TweetTemplate extends Composite { * @return */ public int numberOfComments(){ - - // quite easy.. return myComments.size(); - } - + /** + * Returns the context of the Post + * @return the context (scope) of the Post + */ + public String getVREContext() { + return this.myFeed.getFeed().getVreid(); + } + /** * Returns the number of likes this post has * @return diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css index f59a08f..1c44f7e 100644 --- a/src/main/webapp/NewsFeed.css +++ b/src/main/webapp/NewsFeed.css @@ -588,10 +588,10 @@ a.person-link { margin-left: -15px; } .tweet-actions { - width: 270px; + width: 330px; } .feed-filters { - width: 260px; + width: 320px; } } @@ -625,9 +625,9 @@ a.person-link { margin-left: -10px; } .tweet-actions { - width: 280px; + width: 330px; } .feed-filters { - width: 300px; + width: 320px; } } \ No newline at end of file diff --git a/src/main/webapp/NewsFeed.html b/src/main/webapp/NewsFeed.html index e0b7f9b..8fc4496 100644 --- a/src/main/webapp/NewsFeed.html +++ b/src/main/webapp/NewsFeed.html @@ -18,19 +18,12 @@ News Feed - + - - - - + diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml index 282346b..b831c8c 100644 --- a/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -8,7 +8,6 @@ false false /NewsFeed.css - /js/pagebus.js administrator diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index f6b853e..da47c9f 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -24,6 +24,16 @@ imageservices /newsfeed/imageservices + + + pickItemServlet + org.gcube.portlets.widgets.pickitem.server.PickItemServiceImpl + + + + pickItemServlet + /newsfeed/pickItemServlet +