Skip to content

Commit

Permalink
Merge branch 'master' of ssh://ssh.github.com:443/lmco/eurekastreams
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Keane committed Aug 15, 2011
2 parents d7a63a4 + 930f172 commit cdac0a9
Show file tree
Hide file tree
Showing 4 changed files with 130 additions and 71 deletions.
10 changes: 10 additions & 0 deletions database/src/main/resources/migration/1/5/U0053AddDBIndexOnGadgetAndTab.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
insert into db_version (major, minor, patch, scriptname, description) values (1, 5, '0053',
'U0053AddDBIndexOnGadgetAndTab', 'Add indexes for gadget and tab tables to speed up cache warming.');

drop index if exists tabtemplateid_deleted_idx;

drop index if exists deleted_tabgroupid_idx;

create index tabtemplateid_deleted_idx on gadget(tabtemplateid, deleted);

create index deleted_tabgroupid_idx on tab(deleted, tabgroupid);
16 changes: 11 additions & 5 deletions web/src/main/java/org/eurekastreams/web/client/ui/common/stream/FeatureDialogContent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
import org.eurekastreams.server.domain.Person;
import org.eurekastreams.server.domain.dto.FeaturedStreamDTO;
import org.eurekastreams.web.client.events.EventBus;
import org.eurekastreams.web.client.events.ShowNotificationEvent;
import org.eurekastreams.web.client.events.Observer;
import org.eurekastreams.web.client.events.data.AddedFeaturedStreamResponseEvent;
import org.eurekastreams.web.client.model.FeaturedStreamModel;
import org.eurekastreams.web.client.ui.common.dialog.BaseDialogContent;
import org.eurekastreams.web.client.ui.common.form.elements.BasicTextAreaFormElement;
import org.eurekastreams.web.client.ui.common.notifier.Notification;
import org.eurekastreams.web.client.ui.pages.master.StaticResourceBundle;

import com.google.gwt.event.dom.client.ClickEvent;
Expand Down Expand Up @@ -72,12 +72,18 @@ public void onClick(final ClickEvent event)
{
featuredStreamDTO.setDescription(textArea.getValue());
FeaturedStreamModel.getInstance().insert(featuredStreamDTO);
EventBus.getInstance().notifyObservers(
new ShowNotificationEvent(new Notification("Stream has been featured.")));
close();
}
});

EventBus.getInstance().addObserver(AddedFeaturedStreamResponseEvent.class,
new Observer<AddedFeaturedStreamResponseEvent>()
{
public void update(final AddedFeaturedStreamResponseEvent event)
{
close();
}
});

container.add(body);

}
Expand Down
164 changes: 98 additions & 66 deletions .../java/org/eurekastreams/web/client/ui/common/widgets/activity/StreamDetailsComposite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@
import org.eurekastreams.server.domain.stream.StreamScope.ScopeType;
import org.eurekastreams.server.search.modelview.DomainGroupModelView;
import org.eurekastreams.server.search.modelview.PersonModelView;
import org.eurekastreams.server.search.modelview.PersonModelView.Role;
import org.eurekastreams.server.search.modelview.UsageMetricSummaryDTO;
import org.eurekastreams.server.search.modelview.PersonModelView.Role;
import org.eurekastreams.server.service.actions.requests.UsageMetricStreamSummaryRequest;
import org.eurekastreams.web.client.events.EventBus;
import org.eurekastreams.web.client.events.GotStreamPopularHashTagsEvent;
import org.eurekastreams.web.client.events.Observer;
import org.eurekastreams.web.client.events.PagerResponseEvent;
import org.eurekastreams.web.client.events.ShowNotificationEvent;
import org.eurekastreams.web.client.events.data.AddedFeaturedStreamResponseEvent;
import org.eurekastreams.web.client.events.data.DeletedFeaturedStreamResponse;
import org.eurekastreams.web.client.events.data.DeletedRequestForGroupMembershipResponseEvent;
import org.eurekastreams.web.client.events.data.GotFeaturedStreamsPageResponseEvent;
import org.eurekastreams.web.client.events.data.GotGroupModelViewInformationResponseEvent;
Expand Down Expand Up @@ -480,6 +482,11 @@ public StreamDetailsComposite()
*/
private boolean inFeatured;

/**
* FeaturedStreamDTO object representing current person/group.
*/
private FeaturedStreamDTO currentFeaturedStreamDTO;

/**
* Featured streams.
*/
Expand Down Expand Up @@ -602,11 +609,6 @@ public void onClick(final ClickEvent event)
});

addEvents();

if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
FeaturedStreamModel.getInstance().fetch(new GetFeaturedStreamsPageRequest(0, Integer.MAX_VALUE), true);
}
}

/**
Expand Down Expand Up @@ -648,59 +650,56 @@ public void update(final PagerResponseEvent event)
}
});

EventBus.getInstance().addObserver(GotUsageMetricSummaryEvent.class,
new Observer<GotUsageMetricSummaryEvent>()
{
public void update(final GotUsageMetricSummaryEvent event)
{
UsageMetricSummaryDTO data = event.getResponse();
EventBus.getInstance().addObserver(GotUsageMetricSummaryEvent.class, new Observer<GotUsageMetricSummaryEvent>()
{
public void update(final GotUsageMetricSummaryEvent event)
{
UsageMetricSummaryDTO data = event.getResponse();

List<DailyUsageSummary> stats = data.getDailyStatistics();
List<DailyUsageSummary> stats = data.getDailyStatistics();

chart.setVisible(stats != null && stats.size() > 0);
chartEmpty.getStyle().setDisplay(chart.isVisible() ? Display.NONE : Display.BLOCK);
chart.setVisible(stats != null && stats.size() > 0);
chartEmpty.getStyle().setDisplay(chart.isVisible() ? Display.NONE : Display.BLOCK);

if (stats != null)
if (stats != null)
{
for (int i = 0; i < stats.size(); i++)
{
if (null == stats.get(i))
{
for (int i = 0; i < stats.size(); i++)
{
if (null == stats.get(i))
{
chart.addPoint(i, 0.0);
}
else
{
chart.addPoint(i, stats.get(i).getStreamViewCount());
}
}
chart.addPoint(i, 0.0);
}
else
{
chart.addPoint(i, stats.get(i).getStreamViewCount());
}

avgComments.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyCommentPerActivityCount()));
avgContributors.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyStreamContributorCount()));
avgMessages.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyMessageCount()));
avgViewers.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyStreamViewerCount()));
avgViews.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyStreamViewCount()));

totalContributors.setInnerText(""
+ NumberFormat.getDecimalFormat().format(data.getTotalContributorCount()));
totalActivities.setInnerText(NumberFormat.getDecimalFormat().format(
data.getTotalActivityCount()));
totalComments.setInnerText(NumberFormat.getDecimalFormat().format(data.getTotalCommentCount()));
chart.update();
}
});
}

avgComments.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyCommentPerActivityCount()));
avgContributors.setInnerText(NumberFormat.getDecimalFormat().format(
data.getAverageDailyStreamContributorCount()));
avgMessages.setInnerText(NumberFormat.getDecimalFormat().format(data.getAverageDailyMessageCount()));
avgViewers
.setInnerText(NumberFormat.getDecimalFormat().format(data.getAverageDailyStreamViewerCount()));
avgViews.setInnerText(NumberFormat.getDecimalFormat().format(data.getAverageDailyStreamViewCount()));

totalContributors.setInnerText(""
+ NumberFormat.getDecimalFormat().format(data.getTotalContributorCount()));
totalActivities.setInnerText(NumberFormat.getDecimalFormat().format(data.getTotalActivityCount()));
totalComments.setInnerText(NumberFormat.getDecimalFormat().format(data.getTotalCommentCount()));
chart.update();
}
});

EventBus.getInstance().addObserver(GotFeaturedStreamsPageResponseEvent.class,
new Observer<GotFeaturedStreamsPageResponseEvent>()
{
public void update(final GotFeaturedStreamsPageResponseEvent response)
{
featuredStreams = response.getResponse();
updateFeatureLink(currentFeaturedStreamDTO);
}
});

Expand Down Expand Up @@ -748,6 +747,32 @@ public void update(final InsertedGroupMemberResponseEvent event)
openAdmin();
}
}, true);

EventBus.getInstance().addObserver(AddedFeaturedStreamResponseEvent.class,
new Observer<AddedFeaturedStreamResponseEvent>()
{
public void update(final AddedFeaturedStreamResponseEvent event)
{
if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
FeaturedStreamModel.getInstance().fetch(
new GetFeaturedStreamsPageRequest(0, Integer.MAX_VALUE), true);
}
}
});

EventBus.getInstance().addObserver(DeletedFeaturedStreamResponse.class,
new Observer<DeletedFeaturedStreamResponse>()
{
public void update(final DeletedFeaturedStreamResponse event)
{
if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
FeaturedStreamModel.getInstance().fetch(
new GetFeaturedStreamsPageRequest(0, Integer.MAX_VALUE), true);
}
}
});
}

/**
Expand Down Expand Up @@ -839,7 +864,6 @@ private void gotGroup(final DomainGroupModelView group)
}
else
{

streamId = group.getStreamId();

boolean isCoordinator = false;
Expand Down Expand Up @@ -888,7 +912,12 @@ private void gotGroup(final DomainGroupModelView group)
featuredStreamDTO.setStreamType(ScopeType.GROUP);
featuredStreamDTO.setDisplayName(group.getDisplayName());

updateFeatureLink(featuredStreamDTO);
currentFeaturedStreamDTO = featuredStreamDTO;

if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
FeaturedStreamModel.getInstance().fetch(new GetFeaturedStreamsPageRequest(0, Integer.MAX_VALUE), true);
}

streamName.removeFromParent();
streamName.setInnerText(group.getName());
Expand Down Expand Up @@ -946,16 +975,14 @@ private void gotGroup(final DomainGroupModelView group)
*/
public void updateFeatureLink(final FeaturedStreamDTO featuredStreamDTO)
{

if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
inFeatured = false;
featureLink.removeStyleName(style.headerFeatured());

for (FeaturedStreamDTO featured : featuredStreams.getPagedSet())
{
if (featured.getStreamId() == streamId
&& featured.getEntityType().equals(featuredStreamDTO.getEntityType()))
if (featured.getStreamId().longValue() == streamId.longValue())
{
inFeatured = true;
featuredStreamDTO.setId(featured.getId());
Expand Down Expand Up @@ -1026,14 +1053,16 @@ public void onClick(final ClickEvent event)
switch (status)
{
case FOLLOWING:
request = new SetFollowingStatusRequest(Session.getInstance().getCurrentPerson()
.getAccountId(), entityId, type, false, Follower.FollowerStatus.NOTFOLLOWING);
request = new SetFollowingStatusRequest(
Session.getInstance().getCurrentPerson().getAccountId(), entityId, type, false,
Follower.FollowerStatus.NOTFOLLOWING);
((Deletable<SetFollowingStatusRequest>) followModel).delete(request);
onFollowerStatusChanged(Follower.FollowerStatus.NOTFOLLOWING);
break;
case NOTFOLLOWING:
request = new SetFollowingStatusRequest(Session.getInstance().getCurrentPerson()
.getAccountId(), entityId, type, false, Follower.FollowerStatus.FOLLOWING);
request = new SetFollowingStatusRequest(
Session.getInstance().getCurrentPerson().getAccountId(), entityId, type, false,
Follower.FollowerStatus.FOLLOWING);
((Insertable<SetFollowingStatusRequest>) followModel).insert(request);
Dialog.showCentered(new FollowDialogContent(streamName.getInnerText(), streamReq, streamId,
subscribeModel, entityId));
Expand All @@ -1046,16 +1075,14 @@ public void onClick(final ClickEvent event)
}
});

Session.getInstance()
.getEventBus()
.addObserver(GotPersonFollowerStatusResponseEvent.class,
new Observer<GotPersonFollowerStatusResponseEvent>()
{
public void update(final GotPersonFollowerStatusResponseEvent event)
{
onFollowerStatusChanged(event.getResponse());
}
});
Session.getInstance().getEventBus().addObserver(GotPersonFollowerStatusResponseEvent.class,
new Observer<GotPersonFollowerStatusResponseEvent>()
{
public void update(final GotPersonFollowerStatusResponseEvent event)
{
onFollowerStatusChanged(event.getResponse());
}
});

CurrentUserPersonFollowingStatusModel.getInstance().fetch(
new GetCurrentUserFollowingStatusRequest(entityId, type), true);
Expand Down Expand Up @@ -1195,7 +1222,12 @@ private void gotPerson(final PersonModelView person)
featuredStreamDTO.setStreamType(ScopeType.PERSON);
featuredStreamDTO.setDisplayName(person.getDisplayName());

updateFeatureLink(featuredStreamDTO);
currentFeaturedStreamDTO = featuredStreamDTO;

if (Session.getInstance().getCurrentPersonRoles().contains(Role.SYSTEM_ADMIN))
{
FeaturedStreamModel.getInstance().fetch(new GetFeaturedStreamsPageRequest(0, Integer.MAX_VALUE), true);
}

streamName.removeFromParent();
streamName.setInnerText(person.getDisplayName());
Expand Down
11 changes: 11 additions & 0 deletions web/src/main/java/org/eurekastreams/web/client/ui/pages/activity/ActivityContent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.eurekastreams.web.client.events.StreamSearchBeginEvent;
import org.eurekastreams.web.client.events.UpdateHistoryEvent;
import org.eurekastreams.web.client.events.UpdatedHistoryParametersEvent;
import org.eurekastreams.web.client.events.data.AddedFeaturedStreamResponseEvent;
import org.eurekastreams.web.client.events.data.GotActivityResponseEvent;
import org.eurekastreams.web.client.events.data.GotCurrentUserCustomStreamsResponseEvent;
import org.eurekastreams.web.client.events.data.GotCurrentUserStreamBookmarks;
Expand Down Expand Up @@ -719,6 +720,16 @@ public void update(final UpdatedHistoryParametersEvent event)
}
});

EventBus.getInstance().addObserver(AddedFeaturedStreamResponseEvent.class,
new Observer<AddedFeaturedStreamResponseEvent>()
{
public void update(final AddedFeaturedStreamResponseEvent event)
{
EventBus.getInstance().notifyObservers(
new ShowNotificationEvent(new Notification("Stream has been featured.")));
}
});

addEntityObservers();
}

Expand Down

0 comments on commit cdac0a9

Please sign in to comment.