22618039211

Committed 03 Mar 2026 10:05AM UTC coverage: 16.058% (+0.2%) from 15.884%

Build # 22618039211

Build Type

Pull #365

github

Committed by

web-flow

Commit Message

Merge 1e7e700f0 into a8c4b4a77

Pull Request Pull Request #365: Refactor of `ResourceWithProfile` and related classes

Run Details

699 of 5287 branches covered (13.22%)

Branch coverage included in aggregate %.

1721 of 9783 relevant lines covered (17.59%)

2.41 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.*;
import com.knowledgepixels.nanodash.domain.MaintainedResource;
import com.knowledgepixels.nanodash.page.NanodashPage;
import com.knowledgepixels.nanodash.page.PublishPage;
import com.knowledgepixels.nanodash.repository.MaintainedResourceRepository;
import com.knowledgepixels.nanodash.template.Template;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
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.table.*;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
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.eclipse.rdf4j.model.IRI;
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 java.util.ArrayList;
import java.util.List;

/**
 * Component for displaying query results in a table format.
 */
public class QueryResultTable extends QueryResult {

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

    private Model<String> errorMessages = Model.of("");
    private DataTable<ApiResponseEntry, String> table;
    private Label errorLabel;
    private FilteredQueryResultDataProvider filteredDataProvider;
    private Model<String> filterModel = Model.of("");

    QueryResultTable(String id, QueryRef queryRef, ApiResponse response, ViewDisplay viewDisplay, boolean plain) {
        super(id, queryRef, response, viewDisplay);

        if (plain) {
            add(new Label("label").setVisible(false));
            add(new Label("np").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 SourceNanopub("np", viewDisplay.getNanopubId(), "smallbutton"));
            } else {
                add(new Label("np").setVisible(false));
            }
        }

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

        TextField<String> filterField = new TextField<>("filter", filterModel);
        filterField.setOutputMarkupId(true);
        filterField.add(new AjaxFormComponentUpdatingBehavior("change") {
            @Override
            protected void onUpdate(AjaxRequestTarget target) {
                if (filteredDataProvider != null && table != null) {
                    filteredDataProvider.setFilterText(filterModel.getObject());
                    target.add(table);
                }
            }
        });
        add(filterField);

        populateComponent();
    }

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

    @Override
    protected void populateComponent() {
        List<IColumn<ApiResponseEntry, String>> columns = new ArrayList<>();
        QueryResultDataProvider dataProvider;
        try {
            for (String h : response.getHeader()) {
                if (h.endsWith("_label")) {
                    continue;
                }
                columns.add(new Column(h.replaceAll("_", " "), h));
            }
            if (viewDisplay.getView() != null && !viewDisplay.getView().getViewEntryActionList().isEmpty()) {
                columns.add(new Column("", Column.ACTIONS));
            }
            dataProvider = new QueryResultDataProvider(response.getData());
            filteredDataProvider = new FilteredQueryResultDataProvider(dataProvider, response);
            table = new DataTable<>("table", columns, filteredDataProvider, 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, dataProvider));
            add(table);
        } catch (Exception ex) {
            logger.error("Error creating table for query {}", grlcQuery.getQueryId(), ex);
            add(new Label("table", "").setVisible(false));
            addErrorMessage(ex.getMessage());
        }
    }

    private class Column extends AbstractColumn<ApiResponseEntry, String> {

        private String key;
        public static final String ACTIONS = "*actions*";

        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 {
                View view = viewDisplay.getView();
                if (key.equals(ACTIONS) && view != null) {
                    List<AbstractLink> links = new ArrayList<>();
                    for (IRI actionIri : view.getViewEntryActionList()) {
                        // TODO Copied code and adjusted from QueryResultTableBuilder:
                        Template t = view.getTemplateForAction(actionIri);
                        if (t == null) continue;
                        String targetField = view.getTemplateTargetFieldForAction(actionIri);
                        if (targetField == null) targetField = "resource";
                        String label = view.getLabelForAction(actionIri);
                        if (label == null) label = "action...";
                        PageParameters params = new PageParameters().set("template", t.getId())
                                .set("param_" + targetField, contextId)
                                .set("context", contextId)
                                .set("template-version", "latest");
                        if (partId != null && contextId != null && !partId.equals(contextId)) {
                            params.set("part", partId);
                        }
                        String partField = view.getTemplatePartFieldForAction(actionIri);
                        if (partField != null) {
                            // TODO Find a better way to pass the MaintainedResource object to this method:
                            MaintainedResource r = MaintainedResourceRepository.get().findById(contextId);
                            if (r != null && r.getNamespace() != null) {
                                params.set("param_" + partField, r.getNamespace() + "<SET-SUFFIX>");
                            }
                        }
                        String queryMapping = view.getTemplateQueryMapping(actionIri);
                        if (queryMapping != null && queryMapping.contains(":")) {
                            // This part is different from the code in QueryResultTableBuilder:
                            String queryParam = queryMapping.split(":")[0];
                            String templateParam = queryMapping.split(":")[1];
                            params.set("param_" + templateParam, rowModel.getObject().get(queryParam));
                        }
                        params.set("refresh-upon-publish", queryRef.getAsUrlString());
                        AbstractLink button = new BookmarkablePageLink<NanodashPage>("button", PublishPage.class, params);
                        button.setBody(Model.of(label));
                        links.add(button);
                    }
                    cellItem.add(new ButtonList(componentId, resourceWithProfile, links, null, null));
                } else {
                    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 {
                            Label cellLabel;
                            if (Utils.looksLikeHtml(value)) {
                                cellLabel = (Label) new Label(componentId, Utils.sanitizeHtml(value))
                                        .setEscapeModelStrings(false)
                                        .add(new AttributeAppender("class", "cell-data-html"));
                            } else {
                                cellLabel = new Label(componentId, value);
                            }
                            cellItem.add(cellLabel);
                        }
                    }
                }
            } catch (Exception ex) {
                logger.error("Failed to populate table column: ", ex);
                cellItem.add(new Label(componentId).setVisible(false));
                addErrorMessage(ex.getMessage());
            }
        }

    }

//    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.*;
4	import com.knowledgepixels.nanodash.domain.MaintainedResource;
5	import com.knowledgepixels.nanodash.page.NanodashPage;
6	import com.knowledgepixels.nanodash.page.PublishPage;
7	import com.knowledgepixels.nanodash.repository.MaintainedResourceRepository;
8	import com.knowledgepixels.nanodash.template.Template;
9	import org.apache.wicket.Component;
10	import org.apache.wicket.ajax.AjaxRequestTarget;
11	import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
12	import org.apache.wicket.behavior.AttributeAppender;
13	import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
14	import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
15	import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
16	import org.apache.wicket.markup.html.basic.Label;
17	import org.apache.wicket.markup.html.form.TextField;
18	import org.apache.wicket.markup.html.link.AbstractLink;
19	import org.apache.wicket.markup.html.link.BookmarkablePageLink;
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.eclipse.rdf4j.model.IRI;
25	import org.nanopub.extra.services.ApiResponse;
26	import org.nanopub.extra.services.ApiResponseEntry;
27	import org.nanopub.extra.services.QueryRef;
28	import org.slf4j.Logger;
29	import org.slf4j.LoggerFactory;
30
31	import java.util.ArrayList;
32	import java.util.List;
33
34	/**
35	* Component for displaying query results in a table format.
36	*/
37	public class QueryResultTable extends QueryResult {
38
39	private static final Logger logger = LoggerFactory.getLogger(QueryResultTable.class);	×
40
41	private Model<String> errorMessages = Model.of("");	×
42	private DataTable<ApiResponseEntry, String> table;
43	private Label errorLabel;
44	private FilteredQueryResultDataProvider filteredDataProvider;
45	private Model<String> filterModel = Model.of("");	×
46
47	QueryResultTable(String id, QueryRef queryRef, ApiResponse response, ViewDisplay viewDisplay, boolean plain) {
48	super(id, queryRef, response, viewDisplay);	×
49
50	if (plain) {	×
51	add(new Label("label").setVisible(false));	×
52	add(new Label("np").setVisible(false));	×
53	} else {
54	String label = grlcQuery.getLabel();	×
55	if (viewDisplay.getTitle() != null) {	×
56	label = viewDisplay.getTitle();	×
57	}
58	add(new Label("label", label));	×
59	if (viewDisplay.getNanopubId() != null) {	×
60	add(new SourceNanopub("np", viewDisplay.getNanopubId(), "smallbutton"));	×
61	} else {
62	add(new Label("np").setVisible(false));	×
63	}
64	}
65
66	errorLabel = new Label("error-messages", errorMessages);	×
67	errorLabel.setVisible(false);	×
68	add(errorLabel);	×
69
70	TextField<String> filterField = new TextField<>("filter", filterModel);	×
71	filterField.setOutputMarkupId(true);	×
72	filterField.add(new AjaxFormComponentUpdatingBehavior("change") {	×
73	@Override
74	protected void onUpdate(AjaxRequestTarget target) {
75	if (filteredDataProvider != null && table != null) {	×
76	filteredDataProvider.setFilterText(filterModel.getObject());	×
77	target.add(table);	×
78	}
79	}	×
80	});
81	add(filterField);	×
82
83	populateComponent();	×
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	@Override
99	protected void populateComponent() {
100	List<IColumn<ApiResponseEntry, String>> columns = new ArrayList<>();	×
101	QueryResultDataProvider dataProvider;
102	try {
103	for (String h : response.getHeader()) {	×
104	if (h.endsWith("_label")) {	×
105	continue;	×
106	}
107	columns.add(new Column(h.replaceAll("_", " "), h));	×
108	}
109	if (viewDisplay.getView() != null && !viewDisplay.getView().getViewEntryActionList().isEmpty()) {	×
110	columns.add(new Column("", Column.ACTIONS));	×
111	}
112	dataProvider = new QueryResultDataProvider(response.getData());	×
113	filteredDataProvider = new FilteredQueryResultDataProvider(dataProvider, response);	×
114	table = new DataTable<>("table", columns, filteredDataProvider, viewDisplay.getPageSize() < 1 ? Integer.MAX_VALUE : viewDisplay.getPageSize());	×
115	table.setOutputMarkupId(true);	×
116	table.addBottomToolbar(new AjaxNavigationToolbar(table));	×
117	table.addBottomToolbar(new NoRecordsToolbar(table));	×
118	table.addTopToolbar(new HeadersToolbar<String>(table, dataProvider));	×
119	add(table);	×
120	} catch (Exception ex) {	×
121	logger.error("Error creating table for query {}", grlcQuery.getQueryId(), ex);	×
122	add(new Label("table", "").setVisible(false));	×
123	addErrorMessage(ex.getMessage());	×
124	}	×
125	}	×
126
127	private class Column extends AbstractColumn<ApiResponseEntry, String> {
128
129	private String key;
130	public static final String ACTIONS = "actions";
131
132	public Column(String title, String key) {	×
133	super(new Model<String>(title), key);	×
134	this.key = key;	×
135	}	×
136
137	@Override
138	public void populateItem(Item<ICellPopulator<ApiResponseEntry>> cellItem, String componentId, IModel<ApiResponseEntry> rowModel) {
139	try {
140	View view = viewDisplay.getView();	×
141	if (key.equals(ACTIONS) && view != null) {	×
142	List<AbstractLink> links = new ArrayList<>();	×
143	for (IRI actionIri : view.getViewEntryActionList()) {	×
144	// TODO Copied code and adjusted from QueryResultTableBuilder:
145	Template t = view.getTemplateForAction(actionIri);	×
146	if (t == null) continue;	×
147	String targetField = view.getTemplateTargetFieldForAction(actionIri);	×
148	if (targetField == null) targetField = "resource";	×
149	String label = view.getLabelForAction(actionIri);	×
150	if (label == null) label = "action...";	×
151	PageParameters params = new PageParameters().set("template", t.getId())	×
152	.set("param_" + targetField, contextId)	×
153	.set("context", contextId)	×
154	.set("template-version", "latest");	×
155	if (partId != null && contextId != null && !partId.equals(contextId)) {	×
156	params.set("part", partId);	×
157	}
158	String partField = view.getTemplatePartFieldForAction(actionIri);	×
159	if (partField != null) {	×
160	// TODO Find a better way to pass the MaintainedResource object to this method:
161	MaintainedResource r = MaintainedResourceRepository.get().findById(contextId);	×
162	if (r != null && r.getNamespace() != null) {	×
163	params.set("param_" + partField, r.getNamespace() + "<SET-SUFFIX>");	×
164	}
165	}
166	String queryMapping = view.getTemplateQueryMapping(actionIri);	×
167	if (queryMapping != null && queryMapping.contains(":")) {	×
168	// This part is different from the code in QueryResultTableBuilder:
169	String queryParam = queryMapping.split(":")[0];	×
170	String templateParam = queryMapping.split(":")[1];	×
171	params.set("param_" + templateParam, rowModel.getObject().get(queryParam));	×
172	}
173	params.set("refresh-upon-publish", queryRef.getAsUrlString());	×
174	AbstractLink button = new BookmarkablePageLink<NanodashPage>("button", PublishPage.class, params);	×
175	button.setBody(Model.of(label));	×
176	links.add(button);	×
177	}	×
178	cellItem.add(new ButtonList(componentId, resourceWithProfile, links, null, null));	×
179	} else {	×
180	String value = rowModel.getObject().get(key);	×
181	if (value.matches("https?://.+ .+")) {	×
182	List<Component> links = new ArrayList<>();	×
183	for (String v : value.split(" ")) {	×
184	links.add(new NanodashLink("component", v));	×
185	}
186	cellItem.add(new ComponentSequence(componentId, ", ", links));	×
187	} else if (value.matches("https?://.+")) {	×
188	String label = rowModel.getObject().get(key + "_label");	×
189	cellItem.add(new NanodashLink(componentId, value, null, null, label, contextId));	×
190	} else {	×
191	if (key.startsWith("pubkey")) {	×
192	cellItem.add(new Label(componentId, value).add(new AttributeAppender("style", "overflow-wrap: anywhere;")));	×
193	} else {
194	Label cellLabel;
195	if (Utils.looksLikeHtml(value)) {	×
196	cellLabel = (Label) new Label(componentId, Utils.sanitizeHtml(value))	×
197	.setEscapeModelStrings(false)	×
198	.add(new AttributeAppender("class", "cell-data-html"));	×
199	} else {
200	cellLabel = new Label(componentId, value);	×
201	}
202	cellItem.add(cellLabel);	×
203	}
204	}
205	}
206	} catch (Exception ex) {	×
207	logger.error("Failed to populate table column: ", ex);	×
208	cellItem.add(new Label(componentId).setVisible(false));	×
209	addErrorMessage(ex.getMessage());	×
210	}	×
211	}	×
212
213	}
214
215	// private class ApiResponseComparator implements Comparator<ApiResponseEntry>, Serializable {
216	//
217	// private SortParam<String> sortParam;
218	//
219	// public ApiResponseComparator(SortParam<String> sortParam) {
220	// this.sortParam = sortParam;
221	// }
222	//
223	// @Override
224	// public int compare(ApiResponseEntry o1, ApiResponseEntry o2) {
225	// String p = sortParam.getProperty();
226	// int result;
227	// if (o1.get(p) == null && o2.get(p) == null) {
228	// result = 0;
229	// } else if (o1.get(p) == null) {
230	// result = 1;
231	// } else if (o2.get(p) == null) {
232	// result = -1;
233	// } else {
234	// result = o1.get(p).compareTo(o2.get(p));
235	// }
236	// if (!sortParam.isAscending()) result = -result;
237	// return result;
238	// }
239	//
240	// }
241
242	}

knowledgepixels / nanodash / 22618039211

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