19271424594

Committed 11 Nov 2025 04:05PM UTC coverage: 13.961% (+0.2%) from 13.774%

Build # 19271424594

Build Type

Pull #283

github

Committed by

web-flow

Commit Message

Merge bf1649aac into cbe3edb76

Pull Request Pull Request #283: Fix the HTML rendering in `QueryResultList`

Run Details

519 of 4716 branches covered (11.01%)

Branch coverage included in aggregate %.

1355 of 8707 relevant lines covered (15.56%)

0.69 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

src/main/java/com/knowledgepixels/nanodash/component/QueryResultTable.java

package com.knowledgepixels.nanodash.component;

import com.knowledgepixels.nanodash.GrlcQuery;
import com.knowledgepixels.nanodash.Space;
import com.knowledgepixels.nanodash.Utils;
import com.knowledgepixels.nanodash.ViewDisplay;
import com.knowledgepixels.nanodash.page.ExplorePage;
import com.knowledgepixels.nanodash.page.NanodashPage;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
import org.apache.wicket.extensions.markup.html.repeater.util.SingleSortState;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.nanopub.extra.services.ApiResponse;
import org.nanopub.extra.services.ApiResponseEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * A table component that displays the results of a query.
 */
public class QueryResultTable extends Panel {

    private static final Logger logger = LoggerFactory.getLogger(QueryResultTable.class);

    private Model<String> errorMessages = Model.of("");
    private DataTable<ApiResponseEntry, String> table;
    private Label errorLabel;
    private boolean finalized = false;
    private List<AbstractLink> buttons = new ArrayList<>();
    private String contextId;
    private Space space;

    QueryResultTable(String id, GrlcQuery grlcQuery, ApiResponse response, boolean plain, ViewDisplay viewDisplay, String contextId) {
        super(id);
        this.contextId = contextId;

        add(new AttributeAppender("class", " col-" + viewDisplay.getDisplayWidth()));

        if (plain) {
            add(new Label("label").setVisible(false));
            add(new Label("morelink").setVisible(false));
        } else {
            String label = grlcQuery.getLabel();
            if (viewDisplay.getTitle() != null) label = viewDisplay.getTitle();
            add(new Label("label", label));
            if (viewDisplay.getNanopubId() != null) {
                add(new BookmarkablePageLink<Void>("morelink", ExplorePage.class, new PageParameters().set("id", viewDisplay.getNanopubId())));
            } else {
                add(new Label("morelink").setVisible(false));
            }
        }

        errorLabel = new Label("error-messages", errorMessages);
        errorLabel.setVisible(false);
        add(errorLabel);

        List<IColumn<ApiResponseEntry, String>> columns = new ArrayList<>();
        DataProvider dp;
        try {
            for (String h : response.getHeader()) {
                if (h.endsWith("_label")) continue;
                columns.add(new Column(h.replaceAll("_", " "), h));
            }
            dp = new DataProvider(response.getData());
            table = new DataTable<>("table", columns, dp, viewDisplay.getPageSize() < 1 ? Integer.MAX_VALUE : viewDisplay.getPageSize());
            table.setOutputMarkupId(true);
            table.addBottomToolbar(new AjaxNavigationToolbar(table));
            table.addBottomToolbar(new NoRecordsToolbar(table));
            table.addTopToolbar(new HeadersToolbar<String>(table, dp));
            add(table);
        } catch (Exception ex) {
            logger.error("Error creating table for query {}", grlcQuery.getQueryId(), ex);
            add(new Label("table", "").setVisible(false));
            addErrorMessage(ex.getMessage());
        }
    }

    // TODO button adding method copied and adjusted from ItemListPanel
    // TODO Improve this (member/admin) button handling:
    public QueryResultTable addButton(String label, Class<? extends NanodashPage> pageClass, PageParameters parameters) {
        if (parameters == null) parameters = new PageParameters();
        if (contextId != null) parameters.set("context", contextId);
        AbstractLink button = new BookmarkablePageLink<NanodashPage>("button", pageClass, parameters);
        button.setBody(Model.of(label));
        buttons.add(button);
        return this;
    }

    @Override
    protected void onBeforeRender() {
        if (!finalized) {
            if (!buttons.isEmpty()) {
                add(new ButtonList("buttons", space, buttons, null, null));
            } else {
                add(new Label("buttons").setVisible(false));
            }
            finalized = true;
        }
        super.onBeforeRender();
    }

    private void addErrorMessage(String errorMessage) {
        String s = errorMessages.getObject();
        if (s.isEmpty()) {
            s = "Error: " + errorMessage;
        } else {
            s += ", " + errorMessage;
        }
        errorMessages.setObject(s);
        errorLabel.setVisible(true);
        if (table != null) table.setVisible(false);
    }


    private class Column extends AbstractColumn<ApiResponseEntry, String> {

        private String key;

        public Column(String title, String key) {
            super(new Model<String>(title), key);
            this.key = key;
        }

        @Override
        public void populateItem(Item<ICellPopulator<ApiResponseEntry>> cellItem, String componentId, IModel<ApiResponseEntry> rowModel) {
            try {
                String value = rowModel.getObject().get(key);
                if (value.matches("https?://.+ .+")) {
                    List<Component> links = new ArrayList<>();
                    for (String v : value.split(" ")) {
                        links.add(new NanodashLink("component", v));
                    }
                    cellItem.add(new ComponentSequence(componentId, ", ", links));
                } else if (value.matches("https?://.+")) {
                    String label = rowModel.getObject().get(key + "_label");
                    cellItem.add(new NanodashLink(componentId, value, null, null, label, contextId));
                } else {
                    if (key.startsWith("pubkey")) {
                        cellItem.add(new Label(componentId, value).add(new AttributeAppender("style", "overflow-wrap: anywhere;")));
                    } else {
                        cellItem.add(new Label(componentId, value));
                    }
                }
            } catch (Exception ex) {
                logger.error("Failed to populate table column: ", ex);
                cellItem.add(new Label(componentId).setVisible(false));
                addErrorMessage(ex.getMessage());
            }
        }

    }


    private class DataProvider implements ISortableDataProvider<ApiResponseEntry, String> {

        private List<ApiResponseEntry> data = new ArrayList<>();
        private SingleSortState<String> sortState = new SingleSortState<>();

        public DataProvider() {
//                        sortState.setSort(new SortParam<String>("date", false));
        }

        public DataProvider(List<ApiResponseEntry> data) {
            this();
            this.data = data;
        }

        @Override
        public Iterator<? extends ApiResponseEntry> iterator(long first, long count) {
//                        List<ApiResponseEntry> copy = new ArrayList<>(data);
//                        ApiResponseComparator comparator = new ApiResponseComparator(sortState.getSort());
//                        Collections.sort(copy, comparator);
//                        return Utils.subList(copy, first, first + count).iterator();
            return Utils.subList(data, first, first + count).iterator();
        }

        @Override
        public IModel<ApiResponseEntry> model(ApiResponseEntry object) {
            return new Model<ApiResponseEntry>(object);
        }

        @Override
        public long size() {
            return data.size();
        }

        @Override
        public ISortState<String> getSortState() {
            return sortState;
        }

        @Override
        public void detach() {
        }

    }

//    private class ApiResponseComparator implements Comparator<ApiResponseEntry>, Serializable {
//
//        private SortParam<String> sortParam;
//
//        public ApiResponseComparator(SortParam<String> sortParam) {
//            this.sortParam = sortParam;
//        }
//
//        @Override
//        public int compare(ApiResponseEntry o1, ApiResponseEntry o2) {
//            String p = sortParam.getProperty();
//            int result;
//            if (o1.get(p) == null && o2.get(p) == null) {
//                result = 0;
//            } else if (o1.get(p) == null) {
//                result = 1;
//            } else if (o2.get(p) == null) {
//                result = -1;
//            } else {
//                result = o1.get(p).compareTo(o2.get(p));
//            }
//            if (!sortParam.isAscending()) result = -result;
//            return result;
//        }
//
//    }

}

1	package com.knowledgepixels.nanodash.component;
2
3	import com.knowledgepixels.nanodash.GrlcQuery;
4	import com.knowledgepixels.nanodash.Space;
5	import com.knowledgepixels.nanodash.Utils;
6	import com.knowledgepixels.nanodash.ViewDisplay;
7	import com.knowledgepixels.nanodash.page.ExplorePage;
8	import com.knowledgepixels.nanodash.page.NanodashPage;
9	import org.apache.wicket.Component;
10	import org.apache.wicket.behavior.AttributeAppender;
11	import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
12	import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
13	import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
14	import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
15	import org.apache.wicket.extensions.markup.html.repeater.util.SingleSortState;
16	import org.apache.wicket.markup.html.basic.Label;
17	import org.apache.wicket.markup.html.link.AbstractLink;
18	import org.apache.wicket.markup.html.link.BookmarkablePageLink;
19	import org.apache.wicket.markup.html.panel.Panel;
20	import org.apache.wicket.markup.repeater.Item;
21	import org.apache.wicket.model.IModel;
22	import org.apache.wicket.model.Model;
23	import org.apache.wicket.request.mapper.parameter.PageParameters;
24	import org.nanopub.extra.services.ApiResponse;
25	import org.nanopub.extra.services.ApiResponseEntry;
26	import org.slf4j.Logger;
27	import org.slf4j.LoggerFactory;
28
29	import java.util.ArrayList;
30	import java.util.Iterator;
31	import java.util.List;
32
33	/**
34	* A table component that displays the results of a query.
35	*/
36	public class QueryResultTable extends Panel {
37
38	private static final Logger logger = LoggerFactory.getLogger(QueryResultTable.class);	×
39
40	private Model<String> errorMessages = Model.of("");	×
41	private DataTable<ApiResponseEntry, String> table;
42	private Label errorLabel;
43	private boolean finalized = false;	×
44	private List<AbstractLink> buttons = new ArrayList<>();	×
45	private String contextId;
46	private Space space;
47
48	QueryResultTable(String id, GrlcQuery grlcQuery, ApiResponse response, boolean plain, ViewDisplay viewDisplay, String contextId) {
49	super(id);	×
50	this.contextId = contextId;	×
51
52	add(new AttributeAppender("class", " col-" + viewDisplay.getDisplayWidth()));	×
53
54	if (plain) {	×
55	add(new Label("label").setVisible(false));	×
56	add(new Label("morelink").setVisible(false));	×
57	} else {
58	String label = grlcQuery.getLabel();	×
59	if (viewDisplay.getTitle() != null) label = viewDisplay.getTitle();	×
60	add(new Label("label", label));	×
61	if (viewDisplay.getNanopubId() != null) {	×
62	add(new BookmarkablePageLink<Void>("morelink", ExplorePage.class, new PageParameters().set("id", viewDisplay.getNanopubId())));	×
63	} else {
64	add(new Label("morelink").setVisible(false));	×
65	}
66	}
67
68	errorLabel = new Label("error-messages", errorMessages);	×
69	errorLabel.setVisible(false);	×
70	add(errorLabel);	×
71
72	List<IColumn<ApiResponseEntry, String>> columns = new ArrayList<>();	×
73	DataProvider dp;
74	try {
75	for (String h : response.getHeader()) {	×
76	if (h.endsWith("_label")) continue;	×
77	columns.add(new Column(h.replaceAll("_", " "), h));	×
78	}
79	dp = new DataProvider(response.getData());	×
80	table = new DataTable<>("table", columns, dp, viewDisplay.getPageSize() < 1 ? Integer.MAX_VALUE : viewDisplay.getPageSize());	×
81	table.setOutputMarkupId(true);	×
82	table.addBottomToolbar(new AjaxNavigationToolbar(table));	×
83	table.addBottomToolbar(new NoRecordsToolbar(table));	×
84	table.addTopToolbar(new HeadersToolbar<String>(table, dp));	×
85	add(table);	×
86	} catch (Exception ex) {	×
87	logger.error("Error creating table for query {}", grlcQuery.getQueryId(), ex);	×
88	add(new Label("table", "").setVisible(false));	×
89	addErrorMessage(ex.getMessage());	×
90	}	×
91	}	×
92
93	// TODO button adding method copied and adjusted from ItemListPanel
94	// TODO Improve this (member/admin) button handling:
95	public QueryResultTable addButton(String label, Class<? extends NanodashPage> pageClass, PageParameters parameters) {
96	if (parameters == null) parameters = new PageParameters();	×
97	if (contextId != null) parameters.set("context", contextId);	×
98	AbstractLink button = new BookmarkablePageLink<NanodashPage>("button", pageClass, parameters);	×
99	button.setBody(Model.of(label));	×
100	buttons.add(button);	×
101	return this;	×
102	}
103
104	@Override
105	protected void onBeforeRender() {
106	if (!finalized) {	×
107	if (!buttons.isEmpty()) {	×
108	add(new ButtonList("buttons", space, buttons, null, null));	×
109	} else {
110	add(new Label("buttons").setVisible(false));	×
111	}
112	finalized = true;	×
113	}
114	super.onBeforeRender();	×
115	}	×
116
117	private void addErrorMessage(String errorMessage) {
118	String s = errorMessages.getObject();	×
119	if (s.isEmpty()) {	×
120	s = "Error: " + errorMessage;	×
121	} else {
122	s += ", " + errorMessage;	×
123	}
124	errorMessages.setObject(s);	×
125	errorLabel.setVisible(true);	×
126	if (table != null) table.setVisible(false);	×
127	}	×
128
129
130	private class Column extends AbstractColumn<ApiResponseEntry, String> {
131
132	private String key;
133
134	public Column(String title, String key) {	×
135	super(new Model<String>(title), key);	×
136	this.key = key;	×
137	}	×
138
139	@Override
140	public void populateItem(Item<ICellPopulator<ApiResponseEntry>> cellItem, String componentId, IModel<ApiResponseEntry> rowModel) {
141	try {
142	String value = rowModel.getObject().get(key);	×
143	if (value.matches("https?://.+ .+")) {	×
144	List<Component> links = new ArrayList<>();	×
145	for (String v : value.split(" ")) {	×
146	links.add(new NanodashLink("component", v));	×
147	}
148	cellItem.add(new ComponentSequence(componentId, ", ", links));	×
149	} else if (value.matches("https?://.+")) {	×
150	String label = rowModel.getObject().get(key + "_label");	×
151	cellItem.add(new NanodashLink(componentId, value, null, null, label, contextId));	×
152	} else {	×
153	if (key.startsWith("pubkey")) {	×
154	cellItem.add(new Label(componentId, value).add(new AttributeAppender("style", "overflow-wrap: anywhere;")));	×
155	} else {
156	cellItem.add(new Label(componentId, value));	×
157	}
158	}
159	} catch (Exception ex) {	×
160	logger.error("Failed to populate table column: ", ex);	×
161	cellItem.add(new Label(componentId).setVisible(false));	×
162	addErrorMessage(ex.getMessage());	×
163	}	×
164	}	×
165
166	}
167
168
169	private class DataProvider implements ISortableDataProvider<ApiResponseEntry, String> {
170
171	private List<ApiResponseEntry> data = new ArrayList<>();	×
172	private SingleSortState<String> sortState = new SingleSortState<>();	×
173
174	public DataProvider() {	×
175	// sortState.setSort(new SortParam<String>("date", false));
176	}	×
177
178	public DataProvider(List<ApiResponseEntry> data) {
179	this();	×
180	this.data = data;	×
181	}	×
182
183	@Override
184	public Iterator<? extends ApiResponseEntry> iterator(long first, long count) {
185	// List<ApiResponseEntry> copy = new ArrayList<>(data);
186	// ApiResponseComparator comparator = new ApiResponseComparator(sortState.getSort());
187	// Collections.sort(copy, comparator);
188	// return Utils.subList(copy, first, first + count).iterator();
189	return Utils.subList(data, first, first + count).iterator();	×
190	}
191
192	@Override
193	public IModel<ApiResponseEntry> model(ApiResponseEntry object) {
194	return new Model<ApiResponseEntry>(object);	×
195	}
196
197	@Override
198	public long size() {
199	return data.size();	×
200	}
201
202	@Override
203	public ISortState<String> getSortState() {
204	return sortState;	×
205	}
206
207	@Override
208	public void detach() {
209	}	×
210
211	}
212
213	// private class ApiResponseComparator implements Comparator<ApiResponseEntry>, Serializable {
214	//
215	// private SortParam<String> sortParam;
216	//
217	// public ApiResponseComparator(SortParam<String> sortParam) {
218	// this.sortParam = sortParam;
219	// }
220	//
221	// @Override
222	// public int compare(ApiResponseEntry o1, ApiResponseEntry o2) {
223	// String p = sortParam.getProperty();
224	// int result;
225	// if (o1.get(p) == null && o2.get(p) == null) {
226	// result = 0;
227	// } else if (o1.get(p) == null) {
228	// result = 1;
229	// } else if (o2.get(p) == null) {
230	// result = -1;
231	// } else {
232	// result = o1.get(p).compareTo(o2.get(p));
233	// }
234	// if (!sortParam.isAscending()) result = -result;
235	// return result;
236	// }
237	//
238	// }
239
240	}

knowledgepixels / nanodash / 19271424594

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous