andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

sort tiles on the dashboard

Browse Source
This commit is contained in:
Andreas Huber
2018-04-28 19:03:07 +02:00
parent 913057c6df
commit 2da54432ff
7 changed files with 183 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java
View File

@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.SortedSet;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.lang3.StringUtils;
@@ -24,8 +25,8 @@ import org.lucares.pdbui.domain.AutocompleteProposalByValue;
import org.lucares.pdbui.domain.AutocompleteResponse;
import org.lucares.pdbui.domain.PlotRequest;
import org.lucares.pdbui.domain.PlotResponse;
import org.lucares.pdbui.domain.PlotResponseStats;
import org.lucares.performance.db.PerformanceDb;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.InternalPlottingException;
import org.lucares.recommind.logs.NoDataPointsException;
import org.lucares.recommind.logs.PlotResult;
@@ -94,7 +95,7 @@ public class PdbController implements HardcodedValues {
// TODO the UI should cancel requests that are in flight before sending a plot
// request
if (plotterLock.tryLock()) {
if (plotterLock.tryLock(5, TimeUnit.SECONDS)) {
try {
final PlotResult result = plotter.plot(plotSettings);
@@ -105,7 +106,8 @@ public class PdbController implements HardcodedValues {
? WEB_IMAGE_OUTPUT_PATH + "/" + result.getThumbnailName()
: imageUrl;
return new PlotResponse(DataSeries.toMap(result.getDataSeries()), imageUrl, thumbnailUrl);
final PlotResponseStats stats = PlotResponseStats.fromDataSeries(result.getDataSeries());
return new PlotResponse(stats, imageUrl, thumbnailUrl);
} catch (final NoDataPointsException e) {
throw new NotFoundException(e);
} finally {