19889430572

Committed 03 Dec 2025 09:46AM UTC coverage: 15.268% (+0.1%) from 15.14%

Build # 19889430572

Build Type

push

github

Committed by

tkuhn

Commit Message

fix(ViewList): Set namespace parameter when applicable

Run Details

592 of 4988 branches covered (11.87%)

Branch coverage included in aggregate %.

1562 of 9120 relevant lines covered (17.13%)

0.76 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/ViewList.java

package com.knowledgepixels.nanodash.component;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.knowledgepixels.nanodash.*;
import com.knowledgepixels.nanodash.vocabulary.KPXL_TERMS;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.rdf4j.model.IRI;
import org.nanopub.extra.services.QueryRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;
import java.util.Set;

public class ViewList extends Panel {

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

    public ViewList(String markupId, ProfiledResource profiledResource) {
        super(markupId);

        final List<ViewDisplay> topLevelViewDisplays = profiledResource.getViewDisplays(true, null);

        add(new DataView<ViewDisplay>("views", new ListDataProvider<ViewDisplay>(topLevelViewDisplays)) {

            @Override
            protected void populateItem(Item<ViewDisplay> item) {
                ResourceView view = item.getModelObject().getView();
                Multimap<String, String> queryRefParams = ArrayListMultimap.create();
                for (String p : view.getQuery().getPlaceholdersList()) {
                    String paramName = QueryParamField.getParamName(p);
                    if (paramName.equals(view.getQueryField())) {
                        queryRefParams.put(view.getQueryField(), profiledResource.getId());
                        if (QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {
                            // TODO Support this also for maintained resources and users.
                            for (String altId : space.getAltIDs()) {
                                queryRefParams.put(view.getQueryField(), altId);
                            }
                        }
                    } else if (paramName.equals(view.getQueryField() + "Namespace") && profiledResource.getNamespace() != null) {
                        queryRefParams.put(view.getQueryField() + "Namespace", profiledResource.getNamespace());
                    } else if (paramName.equals(view.getQueryField() + "Np")) {
                        queryRefParams.put(view.getQueryField() + "Np", profiledResource.getNanopubId());
                    } else if (paramName.equals("user_pubkey") && QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {
                        for (IRI userId : space.getUsers()) {
                            for (String memberHash : User.getUserData().getPubkeyhashes(userId, true)) {
                                queryRefParams.put("user_pubkey", memberHash);
                            }
                        }
                    } else if (paramName.equals("admin_pubkey") && QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {
                        for (IRI adminId : space.getAdmins()) {
                            for (String adminHash : User.getUserData().getPubkeyhashes(adminId, true)) {
                                queryRefParams.put("admin_pubkey", adminHash);
                            }
                        }
                    } else if (!QueryParamField.isOptional(p)) {
                        item.add(new Label("view", "<span class=\"negative\">Error: Query has non-optional parameter</span>").setEscapeModelStrings(false));
                        logger.error("Error: Query has non-optional parameter: " + view.getQuery().getQueryId() + " " + p);
                        return;
                    }
                }
                QueryRef queryRef = new QueryRef(view.getQuery().getQueryId(), queryRefParams);
                if (view.getViewType().equals(KPXL_TERMS.TABULAR_VIEW)) {
                    item.add(QueryResultTableBuilder.create("view", queryRef, item.getModelObject())
                            .profiledResource(profiledResource)
                            .contextId(profiledResource.getId())
                            .id(profiledResource.getId())
                            .build());
                } else {
                    item.add(QueryResultListBuilder.create("view", queryRef, item.getModelObject())
                            .space(profiledResource.getSpace())
                            .id(profiledResource.getId())
                            .contextId(profiledResource.getId())
                            .build());
                }
            }

        });

        add(new WebMarkupContainer("emptynotice").setVisible(topLevelViewDisplays.isEmpty()));
    }

    public ViewList(String markupId, ProfiledResource profiledResource, String partId, String nanopubId, Set<IRI> partClasses) {
        super(markupId);

        final String id;
        final List<ViewDisplay> viewDisplays;
        final String namespace;
        final Space space;

        if (profiledResource instanceof MaintainedResource r) {
            id = r.getId();
            viewDisplays = r.getViewDisplays(false, partClasses);
            namespace = r.getNamespace();
            space = r.getSpace();
        } else if (profiledResource instanceof Space s) {
            id = s.getId();
            viewDisplays = s.getViewDisplays(false, partClasses);
            namespace = null;
            space = s;
        } else {
            throw new IllegalArgumentException("Neither MaintainedResource nor Space: " + profiledResource);
        }

        add(new DataView<ViewDisplay>("views", new ListDataProvider<ViewDisplay>(viewDisplays)) {

            @Override
            protected void populateItem(Item<ViewDisplay> item) {
                ResourceView view = item.getModelObject().getView();
                Multimap<String, String> queryRefParams = ArrayListMultimap.create();
                for (String p : view.getQuery().getPlaceholdersList()) {
                    String paramName = QueryParamField.getParamName(p);
                    if (paramName.equals(view.getQueryField())) {
                        queryRefParams.put(view.getQueryField(), partId);
//                        if (QueryParamField.isMultiPlaceholder(p)) {
//                            for (String altId : resource.getAltIDs()) {
//                                queryRefParams.put(view.getQueryField(), altId);
//                            }
//                        }
                    } else if (paramName.equals(view.getQueryField() + "Namespace") && namespace != null) {
                        queryRefParams.put(view.getQueryField() + "Namespace", namespace);
                    } else if (paramName.equals(view.getQueryField() + "Np")) {
                        if (!QueryParamField.isOptional(p) && nanopubId == null) {
                            queryRefParams.put(view.getQueryField() + "Np", "x:");
                        } else {
                            queryRefParams.put(view.getQueryField() + "Np", nanopubId);
                        }
//                    } else if (paramName.equals("user_pubkey") && QueryParamField.isMultiPlaceholder(p)) {
//                        for (IRI userId : resource.getSpace().getUsers()) {
//                            for (String memberHash : User.getUserData().getPubkeyhashes(userId, true)) {
//                                queryRefParams.put("user_pubkey", memberHash);
//                            }
//                        }
                    } else if (!QueryParamField.isOptional(p)) {
                        item.add(new Label("view", "<span class=\"negative\">Error: Query has non-optional parameter.</span>").setEscapeModelStrings(false));
                        logger.error("Error: Query has non-optional parameter: " + view.getQuery().getQueryId() + " " + p);
                        return;
                    }
                }
                QueryRef queryRef = new QueryRef(view.getQuery().getQueryId(), queryRefParams);
                if (view.getViewType().equals(KPXL_TERMS.TABULAR_VIEW)) {
                    item.add(QueryResultTableBuilder.create("view", queryRef, item.getModelObject())
                            .profiledResource(profiledResource)
                            .id(partId)
                            .contextId(id)
                            .build());
                } else {
                    item.add(QueryResultListBuilder.create("view", queryRef, item.getModelObject())
                            .space(space)
                            .id(partId)
                            .contextId(id)
                            .build());
                }
            }

        });

        add(new WebMarkupContainer("emptynotice").setVisible(viewDisplays.isEmpty()));
    }


}

1	package com.knowledgepixels.nanodash.component;
2
3	import com.google.common.collect.ArrayListMultimap;
4	import com.google.common.collect.Multimap;
5	import com.knowledgepixels.nanodash.*;
6	import com.knowledgepixels.nanodash.vocabulary.KPXL_TERMS;
7	import org.apache.wicket.markup.html.WebMarkupContainer;
8	import org.apache.wicket.markup.html.basic.Label;
9	import org.apache.wicket.markup.html.panel.Panel;
10	import org.apache.wicket.markup.repeater.Item;
11	import org.apache.wicket.markup.repeater.data.DataView;
12	import org.apache.wicket.markup.repeater.data.ListDataProvider;
13	import org.eclipse.rdf4j.model.IRI;
14	import org.nanopub.extra.services.QueryRef;
15	import org.slf4j.Logger;
16	import org.slf4j.LoggerFactory;
17
18	import java.util.List;
19	import java.util.Set;
20
21	public class ViewList extends Panel {
22
23	private static final Logger logger = LoggerFactory.getLogger(ViewList.class);	×
24
25	public ViewList(String markupId, ProfiledResource profiledResource) {
26	super(markupId);	×
27
28	final List<ViewDisplay> topLevelViewDisplays = profiledResource.getViewDisplays(true, null);	×
29
30	add(new DataView<ViewDisplay>("views", new ListDataProvider<ViewDisplay>(topLevelViewDisplays)) {	×
31
32	@Override
33	protected void populateItem(Item<ViewDisplay> item) {
34	ResourceView view = item.getModelObject().getView();	×
35	Multimap<String, String> queryRefParams = ArrayListMultimap.create();	×
36	for (String p : view.getQuery().getPlaceholdersList()) {	×
37	String paramName = QueryParamField.getParamName(p);	×
38	if (paramName.equals(view.getQueryField())) {	×
39	queryRefParams.put(view.getQueryField(), profiledResource.getId());	×
40	if (QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {	×
41	// TODO Support this also for maintained resources and users.
42	for (String altId : space.getAltIDs()) {	×
43	queryRefParams.put(view.getQueryField(), altId);	×
44	}	×
45	}
46	} else if (paramName.equals(view.getQueryField() + "Namespace") && profiledResource.getNamespace() != null) {	×
47	queryRefParams.put(view.getQueryField() + "Namespace", profiledResource.getNamespace());	×
48	} else if (paramName.equals(view.getQueryField() + "Np")) {	×
49	queryRefParams.put(view.getQueryField() + "Np", profiledResource.getNanopubId());	×
50	} else if (paramName.equals("user_pubkey") && QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {	×
51	for (IRI userId : space.getUsers()) {	×
52	for (String memberHash : User.getUserData().getPubkeyhashes(userId, true)) {	×
53	queryRefParams.put("user_pubkey", memberHash);	×
54	}	×
55	}	×
56	} else if (paramName.equals("admin_pubkey") && QueryParamField.isMultiPlaceholder(p) && profiledResource instanceof Space space) {	×
57	for (IRI adminId : space.getAdmins()) {	×
58	for (String adminHash : User.getUserData().getPubkeyhashes(adminId, true)) {	×
59	queryRefParams.put("admin_pubkey", adminHash);	×
60	}	×
61	}	×
62	} else if (!QueryParamField.isOptional(p)) {	×
63	item.add(new Label("view", "<span class=\"negative\">Error: Query has non-optional parameter</span>").setEscapeModelStrings(false));	×
64	logger.error("Error: Query has non-optional parameter: " + view.getQuery().getQueryId() + " " + p);	×
65	return;	×
66	}
67	}	×
68	QueryRef queryRef = new QueryRef(view.getQuery().getQueryId(), queryRefParams);	×
69	if (view.getViewType().equals(KPXL_TERMS.TABULAR_VIEW)) {	×
70	item.add(QueryResultTableBuilder.create("view", queryRef, item.getModelObject())	×
71	.profiledResource(profiledResource)	×
72	.contextId(profiledResource.getId())	×
73	.id(profiledResource.getId())	×
74	.build());	×
75	} else {
76	item.add(QueryResultListBuilder.create("view", queryRef, item.getModelObject())	×
77	.space(profiledResource.getSpace())	×
78	.id(profiledResource.getId())	×
79	.contextId(profiledResource.getId())	×
80	.build());	×
81	}
82	}	×
83
84	});
85
86	add(new WebMarkupContainer("emptynotice").setVisible(topLevelViewDisplays.isEmpty()));	×
87	}	×
88
89	public ViewList(String markupId, ProfiledResource profiledResource, String partId, String nanopubId, Set<IRI> partClasses) {
90	super(markupId);	×
91
92	final String id;
93	final List<ViewDisplay> viewDisplays;
94	final String namespace;
95	final Space space;
96
97	if (profiledResource instanceof MaintainedResource r) {	×
98	id = r.getId();	×
99	viewDisplays = r.getViewDisplays(false, partClasses);	×
100	namespace = r.getNamespace();	×
101	space = r.getSpace();	×
102	} else if (profiledResource instanceof Space s) {	×
103	id = s.getId();	×
104	viewDisplays = s.getViewDisplays(false, partClasses);	×
105	namespace = null;	×
106	space = s;	×
107	} else {
108	throw new IllegalArgumentException("Neither MaintainedResource nor Space: " + profiledResource);	×
109	}
110
111	add(new DataView<ViewDisplay>("views", new ListDataProvider<ViewDisplay>(viewDisplays)) {	×
112
113	@Override
114	protected void populateItem(Item<ViewDisplay> item) {
115	ResourceView view = item.getModelObject().getView();	×
116	Multimap<String, String> queryRefParams = ArrayListMultimap.create();	×
117	for (String p : view.getQuery().getPlaceholdersList()) {	×
118	String paramName = QueryParamField.getParamName(p);	×
119	if (paramName.equals(view.getQueryField())) {	×
120	queryRefParams.put(view.getQueryField(), partId);	×
121	// if (QueryParamField.isMultiPlaceholder(p)) {
122	// for (String altId : resource.getAltIDs()) {
123	// queryRefParams.put(view.getQueryField(), altId);
124	// }
125	// }
126	} else if (paramName.equals(view.getQueryField() + "Namespace") && namespace != null) {	×
127	queryRefParams.put(view.getQueryField() + "Namespace", namespace);	×
128	} else if (paramName.equals(view.getQueryField() + "Np")) {	×
129	if (!QueryParamField.isOptional(p) && nanopubId == null) {	×
130	queryRefParams.put(view.getQueryField() + "Np", "x:");	×
131	} else {
132	queryRefParams.put(view.getQueryField() + "Np", nanopubId);	×
133	}
134	// } else if (paramName.equals("user_pubkey") && QueryParamField.isMultiPlaceholder(p)) {
135	// for (IRI userId : resource.getSpace().getUsers()) {
136	// for (String memberHash : User.getUserData().getPubkeyhashes(userId, true)) {
137	// queryRefParams.put("user_pubkey", memberHash);
138	// }
139	// }
140	} else if (!QueryParamField.isOptional(p)) {	×
141	item.add(new Label("view", "<span class=\"negative\">Error: Query has non-optional parameter.</span>").setEscapeModelStrings(false));	×
142	logger.error("Error: Query has non-optional parameter: " + view.getQuery().getQueryId() + " " + p);	×
143	return;	×
144	}
145	}	×
146	QueryRef queryRef = new QueryRef(view.getQuery().getQueryId(), queryRefParams);	×
147	if (view.getViewType().equals(KPXL_TERMS.TABULAR_VIEW)) {	×
148	item.add(QueryResultTableBuilder.create("view", queryRef, item.getModelObject())	×
149	.profiledResource(profiledResource)	×
150	.id(partId)	×
151	.contextId(id)	×
152	.build());	×
153	} else {
154	item.add(QueryResultListBuilder.create("view", queryRef, item.getModelObject())	×
155	.space(space)	×
156	.id(partId)	×
157	.contextId(id)	×
158	.build());	×
159	}
160	}	×
161
162	});
163
164	add(new WebMarkupContainer("emptynotice").setVisible(viewDisplays.isEmpty()));	×
165	}	×
166
167
168	}

knowledgepixels / nanodash / 19889430572

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