diff --git a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html index a4d2127c75b..f77100e24b7 100644 --- a/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html +++ b/inception/inception-ui-dashboard/src/main/java/de/tudarmstadt/ukp/inception/ui/core/dashboard/projectlist/ProjectTemplateSelectionDialogPanel.html @@ -66,6 +66,5 @@
The chosen template is only a starting point for your new project. Can you fully customize the project after it has been created. - \ No newline at end of file diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.html b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.html index cf04add24b3..88a5dd22b2d 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.html +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.html @@ -20,9 +20,12 @@ +
+
-
+
+
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.java index 02ff956b78d..6f5f56f392e 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/KnowledgeBasePanel.java @@ -17,7 +17,9 @@ */ package de.tudarmstadt.ukp.inception.ui.kb; +import static de.tudarmstadt.ukp.inception.support.lambda.LambdaBehavior.visibleWhen; import static de.tudarmstadt.ukp.inception.ui.kb.KnowledgeBasePage.PAGE_PARAM_KB_NAME; +import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT; import java.util.Arrays; import java.util.List; @@ -27,6 +29,7 @@ import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.event.Broadcast; +import org.apache.wicket.extensions.ajax.markup.html.modal.ModalDialog; import org.apache.wicket.feedback.IFeedback; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.ChoiceRenderer; @@ -46,6 +49,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase; +import de.tudarmstadt.ukp.inception.bootstrap.BootstrapModalDialog; import de.tudarmstadt.ukp.inception.conceptlinking.config.EntityLinkingProperties; import de.tudarmstadt.ukp.inception.conceptlinking.service.ConceptLinkingService; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; @@ -57,6 +61,7 @@ import de.tudarmstadt.ukp.inception.kb.graph.KBStatement; import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxFormComponentUpdatingBehavior; +import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxLink; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxConceptSelectionEvent; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxInstanceSelectionEvent; import de.tudarmstadt.ukp.inception.ui.kb.event.AjaxNewConceptEvent; @@ -95,6 +100,7 @@ public class KnowledgeBasePanel private Model selectedPropertyHandle = Model.of(); private Model searchHandleModel = Model.of(); + private ModalDialog dialog; private WebMarkupContainer detailContainer; private ConceptTreePanel conceptTreePanel; private PropertyListPanel propertyListPanel; @@ -113,17 +119,22 @@ public KnowledgeBasePanel(String id, IModel aProjectModel, setOutputMarkupId(true); + dialog = new BootstrapModalDialog("dialog"); + add(dialog); + + add(new LambdaAjaxLink("query", this::actionQuery).add( + visibleWhen(() -> DEVELOPMENT.equals(getApplication().getConfigurationType())))); + kbModel = aKbModel; // add the selector for the knowledge bases - DropDownChoice ddc = new DropDownChoice("knowledgebases", - LoadableDetachableModel - .of(() -> kbService.getEnabledKnowledgeBases(aProjectModel.getObject()))); + var ddc = new DropDownChoice("knowledgebases", LoadableDetachableModel + .of(() -> kbService.getEnabledKnowledgeBases(aProjectModel.getObject()))); ddc.add(new LambdaAjaxFormComponentUpdatingBehavior("change", t -> { String kbName = aKbModel.getObject().getName(); - PageParameters pageParameters = new PageParameters(); + var pageParameters = new PageParameters(); ProjectPageBase.setProjectPageParameter(pageParameters, aProjectModel.getObject()); pageParameters.set(PAGE_PARAM_KB_NAME, kbName); setResponsePage(KnowledgeBasePage.class, pageParameters); @@ -147,6 +158,12 @@ public KnowledgeBasePanel(String id, IModel aProjectModel, detailContainer.add(details); } + private void actionQuery(AjaxRequestTarget aTarget) + { + var content = new SparqlPanel(ModalDialog.CONTENT_ID, kbModel); + dialog.open(content, aTarget); + } + private KnowledgeBaseItemAutoCompleteField createSearchField(String aId, IModel aHandleModel, IModel aProjectModel) { diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.html b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.html new file mode 100644 index 00000000000..6a56740d811 --- /dev/null +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.html @@ -0,0 +1,53 @@ + + + + + + + + + +
+
+ SPARQL Query +
+ +
+
+
+
+ +
+ +
+
+ + + +
+ Great power brings great responsibility. +
+ + + diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.java new file mode 100644 index 00000000000..cefb46a8047 --- /dev/null +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/SparqlPanel.java @@ -0,0 +1,111 @@ +/* + * Licensed to the Technische Universität Darmstadt under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The Technische Universität Darmstadt + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package de.tudarmstadt.ukp.inception.ui.kb; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Map; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.ajax.markup.html.modal.ModalDialog; +import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar; +import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar; +import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.LambdaColumn; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.TextArea; +import org.apache.wicket.markup.html.panel.GenericPanel; +import org.apache.wicket.model.CompoundPropertyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.spring.injection.annot.SpringBean; + +import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; +import de.tudarmstadt.ukp.inception.kb.model.KnowledgeBase; +import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxLink; +import de.tudarmstadt.ukp.inception.support.lambda.LambdaAjaxSubmitLink; + +public class SparqlPanel + extends GenericPanel +{ + private static final long serialVersionUID = -8435410869046010021L; + + private @SpringBean KnowledgeBaseService knowledgeBaseService; + + private WebMarkupContainer resultsContainer; + private DataTable, Void> results; + + public SparqlPanel(String aId, IModel aModel) + { + super(aId, aModel); + + queue(new Form("form", new CompoundPropertyModel<>(new QueryModel()))); + queue(new TextArea<>("query")); + queue(new LambdaAjaxSubmitLink("runQuery", this::actionQuery)); + queue(new LambdaAjaxLink("closeDialog", this::actionCancel)); + resultsContainer = new WebMarkupContainer("resultsContainer"); + resultsContainer.setOutputMarkupId(true); + queue(resultsContainer); + results = new DataTable<>("results", Collections.emptyList(), + new TupleQueryResultDataProvider(), 10); + queue(results); + } + + private void actionQuery(AjaxRequestTarget aTarget, Form aForm) + { + var model = aForm.getModelObject(); + + var columns = new ArrayList, Void>>(); + + var dataProvider = knowledgeBaseService.read(getModelObject(), conn -> { + var tupleQuery = conn.prepareTupleQuery(model.query); + + var tupleResult = tupleQuery.evaluate(); + + for (var bindingName : tupleResult.getBindingNames()) { + columns.add(new LambdaColumn<>(Model.of(bindingName), $ -> $.get(bindingName))); + } + + return new TupleQueryResultDataProvider(tupleResult); + }); + + var table = new DataTable<>("results", columns, dataProvider, 10); + table.setOutputMarkupId(true); + table.addTopToolbar(new AjaxNavigationToolbar(table)); + table.addTopToolbar(new AjaxFallbackHeadersToolbar(table, dataProvider)); + results = (DataTable, Void>) results.replaceWith(table); + + aTarget.add(resultsContainer); + } + + protected void actionCancel(AjaxRequestTarget aTarget) + { + findParent(ModalDialog.class).close(aTarget); + } + + private static class QueryModel + implements Serializable + { + private static final long serialVersionUID = -1407131006099282400L; + + String query; + } +} diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/TupleQueryResultDataProvider.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/TupleQueryResultDataProvider.java new file mode 100644 index 00000000000..40546b5583c --- /dev/null +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/TupleQueryResultDataProvider.java @@ -0,0 +1,78 @@ +/* + * Licensed to the Technische Universität Darmstadt under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The Technische Universität Darmstadt + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package de.tudarmstadt.ukp.inception.ui.kb; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.eclipse.rdf4j.query.TupleQueryResult; + +public class TupleQueryResultDataProvider + extends SortableDataProvider, Void> + implements Serializable +{ + private static final long serialVersionUID = -4546564722894830886L; + + private List> data; + + public TupleQueryResultDataProvider() + { + data = Collections.emptyList(); + } + + public TupleQueryResultDataProvider(TupleQueryResult aTupleResult) + { + data = new ArrayList>(); + + for (var bindingSet : aTupleResult) { + var map = new LinkedHashMap(); + + for (var binding : bindingSet) { + map.put(binding.getName(), String.valueOf(binding.getValue())); + } + + data.add(map); + } + } + + @Override + public Iterator> iterator(long aFirst, long aCount) + { + return data.subList((int) aFirst, (int) (aFirst + aCount)).iterator(); + } + + @Override + public long size() + { + return data.size(); + } + + @Override + public IModel> model(Map aObject) + { + return Model.ofMap(aObject); + } +}