Skip to content

GitLab

Commit ecb90a98 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

bring the shelf back. wip.

parent 0558881f
Hide whitespace changes
Inline Side-by-side
src/main/java/info/textgrid/rep/basket/BasketController.java
View file @ ecb90a98
package info.textgrid.rep.basket;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import info.textgrid.namespaces.middleware.tgsearch.ResultType;
import info.textgrid.rep.service.tgsearch.TgrepConfigurationService;
import info.textgrid.rep.service.tgsearch.TgsearchClientService;
import info.textgrid.rep.shared.Utils;
import info.textgrid.rep.shared.ViewMode;
import info.textgrid.rep.i18n.I18N;
import info.textgrid.rep.i18n.I18NProvider;
@Controller
public class BasketController {
private I18NProvider i18nProvider;
private TgsearchClientService tgsearchClientService;
private TgrepConfigurationService tgrepConfig;
private I18NProvider i18nProvider;
private static final Log log = LogFactory.getLog(BasketController.class);
@Autowired
public BasketController(I18NProvider i18nProvider) {
public BasketController(TgsearchClientService tgsearchClientService, TgrepConfigurationService tgrepConfig, I18NProvider i18nProvider) {
this.tgsearchClientService = tgsearchClientService;
this.tgrepConfig = tgrepConfig;
this.i18nProvider = i18nProvider;
}
@GetMapping("/shelf")
public String render(
Model model,
Locale locale) {
Locale locale,
HttpSession session,
@RequestParam(value="mode", required=false) String mode) {
I18N i18n = i18nProvider.getI18N(locale);
model.addAttribute("mode", mode);
List<ResultType> results = new ArrayList<ResultType>();
List<String> basket = (List<String>) session.getAttribute("basket");
if(basket != null) {
for(String textgridUri : basket) {
ResultType res = tgsearchClientService.getMetadata(textgridUri);
results.add(res);
}
}
List<ViewMode> tools = new ArrayList<ViewMode>();
tools.add(new ViewMode("Voyant v1", "#", false, "digivoy-basket-button"));
tools.add(new ViewMode("Voyant v2", "#", false, "digivoy2-basket-button"));
model.addAttribute("tools", tools);
List<ViewMode> viewmodes = new ArrayList<ViewMode>();
viewmodes.add(new ViewMode(i18n.get("list"), "/shelf/-/shelf/list", false));
viewmodes.add(new ViewMode(i18n.get("gallery"), "/shelf/-/shelf/gallery", false));
model.addAttribute("viewmodes", viewmodes);
model.addAttribute("results", results);
//model.addAttribute("basket", Utils.getBasketItems(renderRequest));
model.addAttribute("aggregatorUrl", tgrepConfig.getTextgridHost()+"/1.0/aggregator");
model.addAttribute("basketItemString", Utils.getBasketItemsAsString(session));
model.addAttribute("textgridHost", this.tgrepConfig.getTextgridHost());
// translation array
model.addAttribute("i18n", i18n.getTranslationMap());
model.addAttribute("language", i18n.getLanguage());
......
src/main/java/info/textgrid/rep/shared/Utils.java
View file @ ecb90a98
......@@ -12,6 +12,7 @@ import java.net.URLEncoder;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3._1999._02._22_rdf_syntax_ns_.RdfType;
......@@ -106,19 +107,15 @@ public class Utils {
return sb.toString();
}
/*
public static List<String> getBasketItems(PortletRequest request) {
long userId = PortalUtil.getUserId(request);
if(userId > 0) {
return BasketLocalServiceUtil.getUrlsByUser(userId);
} else {
PortletSession session = request.getPortletSession();
return (List<String>) session.getAttribute("basket", PortletSession.APPLICATION_SCOPE);
}
public static List<String> getBasketItems(HttpSession session) {
return (List<String>) session.getAttribute("basket");
}
public static String getBasketItemsAsString(PortletRequest request) {
return join(getBasketItems(request), ",");
public static String getBasketItemsAsString(HttpSession session) {
// TODO: String.join vom java8
//return String.join(",", getBasketItems(session));
return join(getBasketItems(session), ",");
}
// http://stackoverflow.com/a/63274
......@@ -137,7 +134,7 @@ public class Utils {
return sb.toString();
}
*/
public static String urlencode(String string) {
try {
string = URLEncoder.encode(string, "UTF-8");
......
src/main/webapp/WEB-INF/jsp/basket.jsp
View file @ ecb90a98
......@@ -4,31 +4,211 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://textgrid.info/rep/utils" prefix="utils" %>
<!--
<portlet:defineObjects />
<portlet:resourceURL id="removeFromBasket" var="removeFromBasketUrl" ></portlet:resourceURL>
<portlet:resourceURL id="clearBasket" var="clearBasketUrl" ></portlet:resourceURL>
-->
<%@ include file="base/head.jsp" %>
<%@ include file="components/js-incl.jsp" %>
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function(event) {
$(document).on('click', '.-remove-from-shelf', function(e) {
var $this = $(this);
$.ajax({
url: "${removeFromBasketUrl}" ,
type: 'POST',
dataType:'json',
data: {
uri: $this.attr('data-textgrid-targeturi')
},
success: function(data) {
$this.closest('li.tgrep.result').remove();
$('.tgrep.header_count').html(data.basketSize);
setBasketCount(data.basketSize); // this call needs the basketcount portlet available
}
});
});
$(document).on('click', '.tgrep.header_button.-clear', function(e) {
var $this = $(this);
$.ajax({
url: "${clearBasketUrl}" ,
type: 'POST',
dataType:'json',
data: {
empty: "empty"
},
success: function(data) {
$('.tgrep.results_list').empty();
$('.tgrep.header_count').html(0);
setBasketCount(0); // this call needs the basketcount portlet available
}
});
});
/*
* VOYANT
*
*/
//var voyantURL = "https://textgridrep.de/voyant/"
$(document).on('click', '.digivoy-basket-button', function(e) {
var toolUrl = 'https://voyant.de.dariah.eu/voyant';
var documentLinks = [];
var settings_serialized = "target="+encodeURIComponent('${textgridHost}/voyant')+"%2F&e=castList&e=desc&e=figure&e=head&e=note&e=speaker&e=stage&e=title";
$('.tgrep.result_main').each(function() {
var documentId = unescape($(this).attr('data-tg-uri'));
documentLinks.push(filteredTGCrudDataLink(documentId, settings_serialized));
});
sendToVoyant(toolUrl, documentLinks.join('\n'));
});
$(document).on('click', '.digivoy2-basket-button', function(e) {
var toolUrl = 'https://voyant.de.dariah.eu/voyant2/';
//var toolUrl = 'http://voyant.de.dariah.eu/voyant2';
var documentLinks = [];
var settings_serialized = "target="+encodeURIComponent('${textgridHost}/voyant2')+"%2F&e=castList&e=desc&e=figure&e=head&e=note&e=speaker&e=stage&e=title";
$('.tgrep.result_main').each(function() {
var documentId = unescape($(this).attr('data-tg-uri'));
documentLinks.push(filteredTGCrudDataLink(documentId, settings_serialized));
});
sendToVoyant2(toolUrl, documentLinks.join('\n'));
});
$(document).on('click', '.collate-button', function(e) {
});
});
</script>
<div class="tgrep wrap">
<div class="tgrep sidebar-toggle">
<button class="tgrep sidebar-toggle_button -show">${i18n['show-sidebar']}</button>
<button class="tgrep sidebar-toggle_button -hide">${i18n['hide-sidebar']}</button>
</div>
<div class="tgrep sidebar-toggle">
<button class="tgrep sidebar-toggle_button -show">${i18n['show-sidebar']}</button>
<button class="tgrep sidebar-toggle_button -hide">${i18n['hide-sidebar']}</button>
</div>
<aside class="tgrep sidebar">
<!--
<section class="tgrep sidebar_panel">
<h3 class="tgrep sidebar_subheading">${i18n['views']}<h3>
<ul class="tgrep sidebar_list">
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link">XML</a>
</li>
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link">Browse</a>
</li>
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link">Gallery</a>
</li>
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link">Digilib</a>
</li>
</ul>
</section>
<aside class="tgrep sidebar">
<section class="tgrep sidebar_panel">
<h3 class="tgrep sidebar_subheading">${i18n['tools']}</h3>
<ul class="tgrep sidebar_list">
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link voyant-button">Digivoy</a>
</li>
<li class="tgrep sidebar_item">
<a class="tgrep sidebar_link collate-button">CollateX</a>
</li>
</ul>
</section>
-->
</aside>
<c:if test="${viewmodes != null}">
<section class="tgrep sidebar_panel">
<h3 class="tgrep sidebar_subheading">${i18n['views']}</h3>
<ul class="tgrep sidebar_list">
<c:forEach items="${viewmodes}" var="viewmode">
<li class="tgrep sidebar_item">
<a href="${viewmode.url}" rel="noindex nofollow" class="tgrep sidebar_link">${viewmode.label}</a>
</li>
</c:forEach>
</ul>
<c:if test="${viewmodes.size() > 6}">
<button class="tgrep sidebar_expand">${i18n['expand']}</button>
</c:if>
</section>
</c:if>
<main class="tgrep main">
<h1 class="tgrep main_heading">${i18n['shelf']}</h1>
<c:if test="${tools != null and tools.size() > 0}">
<section class="tgrep sidebar_panel">
<h3 class="tgrep sidebar_subheading">${i18n['tools']}</h3>
<ul class="tgrep sidebar_list">
<c:forEach items="${tools}" var="tool">
<li class="tgrep sidebar_item">
<a href="${tool.url}" rel="noindex nofollow" class="tgrep sidebar_link ${tool.cssClass}">${tool.label}</a>
</li>
</c:forEach>
</ul>
<c:if test="${tools.size() > 6}">
<button class="tgrep sidebar_expand">${i18n['expand']}</button>
</c:if>
</section>
</c:if>
</aside>
<header class="tgrep header">
<h2 class="tgrep header_heading">The shelf is temporarely disabled. It will be back soon.</h2>
</header>
<main class="tgrep main">
<h1 class="tgrep main_heading">${i18n['shelf']}</h1>
<header class="tgrep header">
<h2 class="tgrep header_heading">${i18n['manage-the-shelf']}</h2>
<div class="tgrep header_info">
${i18n['there-are-currently']} <span class="tgrep header_count">${results.size()}</span> ${i18n['objects-on-your-shelf']}
</div>
<div class="tgrep header_actions">
<button class="tgrep header_button -expand-all">${i18n['expand-all']}</button>
<button class="tgrep header_button -collapse-all">${i18n['collapse-all']}</button>
<button class="tgrep header_button -clear">${i18n['clear']}</button>
<div class="tg dropdown" role="group">
<a class="tg dropdown_toggle">${i18n['download-all']}</a>
<ul class="tg dropdown_menu">
<li class="tg dropdown_item"><a class="tg dropdown_link" href="${aggregatorUrl}/epub/${basketItemString}" data-type="ebook">E-Book</a></li>
<li class="tg dropdown_item"><a class="tg dropdown_link" href="${aggregatorUrl}/zip/${basketItemString}" data-type="zip">ZIP</a></li>
<li class="tg dropdown_item"><a class="tg dropdown_link" href="${aggregatorUrl}/teicorpus/${basketItemString}" data-type="teicorpus">TEI-Corpus</a></li>
</ul>
</div>
</div>
</header>
</main>
<c:choose>
<c:when test="${mode eq 'gallery'}">
<ul class="tgrep results_gallery">
<c:forEach items="${results}" var="result">
<%@ include file="components/singleGalleryResult.jsp" %>
</c:forEach>
</ul>
</c:when>
<c:otherwise>
<ul class="tgrep results_list">
<c:forEach items="${results}" var="result">
<%@ include file="components/singleListResult.jsp" %>
</c:forEach>
</ul>
</c:otherwise>
</c:choose>
</main>
</div>
<%@ include file="base/foot.jsp" %>
src/main/webapp/WEB-INF/jsp/browse.jsp
View file @ ecb90a98
......@@ -4,11 +4,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://textgrid.info/rep/utils" prefix="utils" %>
<!--
<portlet:defineObjects />
<portlet:resourceURL id="addToBasket" var="addToBasketUrl" ></portlet:resourceURL>
<portlet:resourceURL id="removeFromBasket" var="removeFromBasketUrl" ></portlet:resourceURL>
-->
<%@ include file="base/head.jsp" %>
<%@ include file="components/js-incl.jsp" %>
......
src/main/webapp/WEB-INF/jsp/components/js-incl.jsp
View file @ ecb90a98
......@@ -5,7 +5,7 @@
$(document).on('click', '.-add-to-shelf', function(e) {
var $this = $(this);
$.ajax({
url: "${addToBasketUrl}" ,
url: "/service/shelf/add" ,
type: 'POST',
dataType:'json',
data: {
......@@ -23,7 +23,7 @@
$(document).on('click', '.-remove-from-shelf', function(e) {
var $this = $(this);
$.ajax({
url: "${removeFromBasketUrl}" ,
url: "/service/shelf/remove" ,
type: 'POST',
dataType:'json',
data: {
......
src/test/java/info/textgrid/rep/search/BrowseControllerTest.java
View file @ ecb90a98
package info.textgrid.rep.search;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
......@@ -12,14 +15,12 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import com.fasterxml.jackson.annotation.JsonCreator.Mode;
import info.textgrid.rep.shared.ViewMode;
@SpringBootTest
@AutoConfigureMockMvc
public class BrowseControllterTest {
public class BrowseControllerTest {
@Autowired
private MockMvc mvc;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment