18276018002

Committed 06 Oct 2025 09:17AM UTC coverage: 14.684% (+1.0%) from 13.692%

Build # 18276018002

Build Type

push

github

Committed by

tkuhn

Commit Message

feat: Improved design and implementation of Space query views

Run Details

477 of 4120 branches covered (11.58%)

Branch coverage included in aggregate %.

1242 of 7587 relevant lines covered (16.37%)

0.73 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 java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

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.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
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.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.nanopub.extra.services.QueryRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.knowledgepixels.nanodash.ApiCache;
import com.knowledgepixels.nanodash.GrlcQuery;
import com.knowledgepixels.nanodash.Utils;
import com.knowledgepixels.nanodash.page.QueryPage;

/**
 * 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 QueryResultTable(String id, GrlcQuery q, ApiResponse response, boolean plain, String title, long rowsPerPage) {
        super(id);

        if (plain) {
            add(new Label("label").setVisible(false));
            add(new Label("morelink").setVisible(false));
        } else {
            String label = q.getLabel();
            if (title != null) label = title;
            add(new Label("label", label));
            add(new BookmarkablePageLink<Void>("morelink", QueryPage.class, new PageParameters().add("id", q.getNanopub().getUri())));
        }

        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, rowsPerPage);
            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 {}", q.getQueryId(), ex);
            add(new Label("table", "").setVisible(false));
            addErrorMessage(ex.getMessage());
        }
    }

    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));
                } 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;
//        }
//
//    }

    public static Component createComponent(final String markupId, QueryRef queryRef, String title, long rowsPerPage) {
        final GrlcQuery q = GrlcQuery.get(queryRef);
        ApiResponse response = ApiCache.retrieveResponse(queryRef);
        if (response != null) {
            return new QueryResultTable(markupId, q, response, false, title, rowsPerPage);
        } else {
            return new ApiResultComponent(markupId, queryRef) {

                @Override
                public Component getApiResultComponent(String markupId, ApiResponse response) {
                    return new QueryResultTable(markupId, q, response, false, title, rowsPerPage);
                }

            };
        }
    }

    /**
     * <p>createComponent.</p>
     *
     * @param markupId a {@link java.lang.String} object
     * @param queryRef the query reference
     * @return a {@link org.apache.wicket.Component} object
     */
    public static Component createPlainComponent(final String markupId, QueryRef queryRef, long rowsPerPage) {
        final GrlcQuery q = GrlcQuery.get(queryRef);
        ApiResponse response = ApiCache.retrieveResponse(queryRef);
        if (response != null) {
            return new QueryResultTable(markupId, q, response, true, null, rowsPerPage);
        } else {
            return new ApiResultComponent(markupId, queryRef) {

                @Override
                public Component getApiResultComponent(String markupId, ApiResponse response) {
                    return new QueryResultTable(markupId, q, response, true, null, rowsPerPage);
                }

            };
        }
    }

}

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

knowledgepixels / nanodash / 18276018002

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