-
-
-
-
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.java
deleted file mode 100644
index c1cdf9ec31c..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2019
- * Ubiquitous Knowledge Processing (UKP) Lab
- * Technische Universität Darmstadt
- *
- * 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.recommendation.evaluation;
-
-import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.MANAGER;
-import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhenModelIsNotNull;
-import static de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase.NS_PROJECT;
-import static de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase.PAGE_PARAM_PROJECT;
-
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.wicketstuff.annotation.mount.MountPath;
-
-import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService;
-import de.tudarmstadt.ukp.clarin.webanno.model.Project;
-import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
-import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ProjectPageBase;
-import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender;
-import de.tudarmstadt.ukp.inception.recommendation.project.RecommenderListPanel;
-
-@MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/simulation")
-public class EvaluationSimulationPage
- extends ProjectPageBase
-{
- private static final long serialVersionUID = 3042218455285633439L;
-
- private IModel selectedRecommenderModel;
- private @SpringBean ProjectService projectService;
- private @SpringBean UserDao userRepository;
-
- private static final String MID_EVALUATION_SIMULATION_CONTAINER = "evaluation-simulation-container";
- private static final String MID_RECOMMENDER_LIST = "recommenderList";
- private static final String MID_RECOMMENDER_VIEW = "recommenderView";
-
- public EvaluationSimulationPage(final PageParameters aPageParameters)
- {
- super(aPageParameters);
-
- Project project = getProject();
-
- requireProjectRole(userRepository.getCurrentUser(), MANAGER);
-
- selectedRecommenderModel = Model.of();
-
- SimulationLearningCurvePanel evaluationSimulationPanel = new SimulationLearningCurvePanel(
- MID_EVALUATION_SIMULATION_CONTAINER, project, selectedRecommenderModel);
- add(evaluationSimulationPanel);
-
- RecommenderViewPanel recommenderViewPanel = new RecommenderViewPanel(MID_RECOMMENDER_VIEW,
- selectedRecommenderModel);
- recommenderViewPanel.setOutputMarkupPlaceholderTag(true);
- recommenderViewPanel.add(visibleWhenModelIsNotNull(recommenderViewPanel));
- add(recommenderViewPanel);
-
- RecommenderListPanel recommenderListPanel = new RecommenderListPanel(MID_RECOMMENDER_LIST,
- Model.of(project), selectedRecommenderModel, false);
- recommenderListPanel.setChangeAction(_target -> {
- evaluationSimulationPanel.recommenderChanged();
- _target.add(recommenderViewPanel);
- });
- add(recommenderListPanel);
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.properties b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.properties
deleted file mode 100644
index ad24199dbd1..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPage.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-page.title=Evaluation
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPageMenuItem.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPageMenuItem.java
deleted file mode 100644
index a8bfaae83dd..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/EvaluationSimulationPageMenuItem.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.recommendation.evaluation;
-
-import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.MANAGER;
-
-import org.apache.wicket.Page;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
-import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService;
-import de.tudarmstadt.ukp.clarin.webanno.model.Project;
-import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
-import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
-import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem;
-import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService;
-import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration;
-import wicket.contrib.input.events.key.KeyType;
-
-/**
- *
- * This class is exposed as a Spring Component via
- * {@link RecommenderServiceAutoConfiguration#evaluationSimulationPageMenuItem()}.
- *
- */
-@Order(300)
-public class EvaluationSimulationPageMenuItem
- implements ProjectMenuItem
-{
- private @Autowired UserDao userRepo;
- private @Autowired ProjectService projectService;
- private @Autowired RecommendationService recommenderService;
-
- @Override
- public String getPath()
- {
- return "/evaluation";
- }
-
- @Override
- public IconType getIcon()
- {
- return FontAwesome5IconType.chart_line_s;
- }
-
- @Override
- public String getLabel()
- {
- return "Evaluation";
- }
-
- @Override
- public boolean applies(Project aProject)
- {
- // Visible if the current user is a curator
- User user = userRepo.getCurrentUser();
- if (!(projectService.hasRole(user, aProject, MANAGER))) {
- return false;
- }
-
- return !recommenderService.listRecommenders(aProject).isEmpty();
- }
-
- @Override
- public Class getPageClass()
- {
- return EvaluationSimulationPage.class;
- }
-
- @Override
- public KeyType[] shortcut()
- {
- return new KeyType[] { KeyType.Alt, KeyType.s };
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.html b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.html
deleted file mode 100644
index 5ec6631884d..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.java
deleted file mode 100644
index adff0fdd90c..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.recommendation.evaluation;
-
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.ComponentPropertyModel;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-
-import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature;
-import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer;
-import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry;
-import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender;
-import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory;
-
-public class RecommenderViewPanel
- extends Panel
-{
- private static final long serialVersionUID = -5278078988218713188L;
-
- private static final String MID_FORM = "form";
- private static final String MID_NAME = "name";
- private static final String MID_FEATURE = "feature";
- private static final String MID_LAYER = "layer";
- private static final String MID_TOOL = "tool";
-
- private @SpringBean RecommenderFactoryRegistry recommenderRegistry;
-
- public RecommenderViewPanel(String aId, IModel aRecommender)
- {
- super(aId, aRecommender);
-
- Form form = new Form<>(MID_FORM, CompoundPropertyModel.of(aRecommender));
- add(form);
-
- form.add(new TextField<>(MID_NAME, String.class));
- form.add(new TextField<>(MID_TOOL, LoadableDetachableModel.of(this::getToolName),
- String.class));
- form.add(new TextField(MID_FEATURE,
- new ComponentPropertyModel<>("feature.uiName")));
- form.add(new TextField(MID_LAYER,
- new ComponentPropertyModel<>("layer.uiName")));
- }
-
- public Recommender getModelObject()
- {
- return (Recommender) getDefaultModelObject();
- }
-
- private String getToolName()
- {
- if (getModelObject() == null) {
- return null;
- }
-
- RecommendationEngineFactory factory = recommenderRegistry
- .getFactory(getModelObject().getTool());
- if (factory == null) {
- return "[UNSUPPORTED]";
- }
-
- return factory.getName();
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.properties b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.properties
deleted file mode 100644
index 2d5ce95f857..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/RecommenderViewPanel.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-details=Details
-name=Name
-layer=Layer
-tool=Tool
-feature=Feature
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.html b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.html
deleted file mode 100644
index fb54df69264..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.java
deleted file mode 100644
index da824d6be60..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * 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.recommendation.evaluation;
-
-import static de.tudarmstadt.ukp.clarin.webanno.api.CasUpgradeMode.AUTO_CAS_UPGRADE;
-import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.SHARED_READ_ONLY_ACCESS;
-import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.ANNOTATOR;
-import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.CURATION_USER;
-import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.INITIAL_CAS_PSEUDO_USER;
-import static de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaBehavior.visibleWhen;
-import static de.tudarmstadt.ukp.inception.recommendation.model.RecommenderEvaluationScoreMetricEnum.Accuracy;
-import static java.util.Collections.emptyList;
-import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
-import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.uima.cas.CAS;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.feedback.IFeedback;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.util.ListModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService;
-import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService;
-import de.tudarmstadt.ukp.clarin.webanno.model.Project;
-import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;
-import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
-import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
-import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxButton;
-import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaChoiceRenderer;
-import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry;
-import de.tudarmstadt.ukp.inception.recommendation.api.evaluation.EvaluationResult;
-import de.tudarmstadt.ukp.inception.recommendation.api.evaluation.IncrementalSplitter;
-import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender;
-import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngine;
-import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationEngineFactory;
-import de.tudarmstadt.ukp.inception.recommendation.api.recommender.RecommendationException;
-import de.tudarmstadt.ukp.inception.recommendation.chart.ChartPanel;
-import de.tudarmstadt.ukp.inception.recommendation.model.RecommenderEvaluationScoreMetricEnum;
-
-public class SimulationLearningCurvePanel
- extends Panel
-{
- private static final long serialVersionUID = 4306746527837380863L;
-
- private static final String MID_CHART_CONTAINER = "chart-container";
- private static final String MID_SIMULATION_START_BUTTON = "simulation-start-button";
- private static final String MID_FORM = "form";
-
- private static final double TRAIN_PERCENTAGE = 0.8;
- private static final int STEPS = 10;
- private static final int LOW_SAMPLE_THRESHOLD = 10;
-
- private static final Logger LOG = LoggerFactory.getLogger(SimulationLearningCurvePanel.class);
-
- private static final List DROPDOWN_VALUES = Arrays
- .asList(RecommenderEvaluationScoreMetricEnum.values());
-
- private @SpringBean DocumentService documentService;
- private @SpringBean ProjectService projectService;
- private @SpringBean UserDao userDao;
- private @SpringBean RecommenderFactoryRegistry recommenderRegistry;
-
- private final Project project;
- private final IModel recommender;
- private final IModel user;
- private final IModel metric;
-
- private final DropDownChoice metricChoice;
- private final DropDownChoice annotatorChoice;
- private final ChartPanel chartPanel;
-
- private final IModel> evaluationResults;
-
- public SimulationLearningCurvePanel(String aId, Project aProject,
- IModel aRecommender)
- {
- super(aId, aRecommender);
-
- project = aProject;
- recommender = aRecommender;
- evaluationResults = new ListModel(emptyList());
- metric = new Model(Accuracy);
-
- Form form = new Form<>(MID_FORM);
- add(form);
-
- chartPanel = new ChartPanel(MID_CHART_CONTAINER, evaluationResults, metric);
- chartPanel.setOutputMarkupPlaceholderTag(true);
- chartPanel.add(visibleWhen(() -> isNotEmpty(chartPanel.getModelObject())));
- form.add(chartPanel);
-
- metricChoice = new DropDownChoice("metric", metric,
- new ListModel(DROPDOWN_VALUES));
- metricChoice.setOutputMarkupId(true);
- form.add(metricChoice);
-
- IModel> annotatorChoiceModel = LoadableDetachableModel
- .of(this::getSelectableAnnotators);
- user = Model.of(annotatorChoiceModel.getObject().get(0));
- annotatorChoice = new DropDownChoice("annotator", user, annotatorChoiceModel);
- annotatorChoice.setChoiceRenderer(new LambdaChoiceRenderer<>(User::getUiName));
- annotatorChoice.setOutputMarkupId(true);
- form.add(annotatorChoice);
-
- // clicking the start button the annotated documents are evaluated and the learning curve
- // for the selected recommender is plotted in the hCart Panel
- form.add(new LambdaAjaxButton<>(MID_SIMULATION_START_BUTTON, (_target, _form) -> {
- recommenderChanged();
- evaluate();
- _target.add(chartPanel);
- }));
- }
-
- private List getSelectableAnnotators()
- {
- List list = new ArrayList<>();
- list.add(new User(INITIAL_CAS_PSEUDO_USER, ""));
- list.add(new User(CURATION_USER, ""));
- list.addAll(projectService.listProjectUsersWithPermissions(project, ANNOTATOR));
- return list;
- }
-
- /**
- * evaluates the selected recommender with the help of the annotated documents in the project.
- */
- private void evaluate()
- {
- if (evaluationResults.getObject() != null) {
- return;
- }
-
- Optional target = RequestCycle.get().find(AjaxRequestTarget.class);
-
- // there must be some recommender selected by the user on the UI
- if (recommender.getObject() == null || recommender.getObject().getTool() == null) {
- error("Please select a recommender from the list");
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- return;
- }
-
- List casList = new ArrayList<>();
- try {
- for (SourceDocument doc : documentService.listSourceDocuments(project)) {
- if (INITIAL_CAS_PSEUDO_USER.equals(user.getObject().getUsername())) {
- casList.add(documentService.createOrReadInitialCas(doc, AUTO_CAS_UPGRADE,
- SHARED_READ_ONLY_ACCESS));
- }
- else {
- if (documentService.existsAnnotationDocument(doc, user.getObject())) {
- casList.add(documentService.readAnnotationCas(doc,
- user.getObject().getUsername(), AUTO_CAS_UPGRADE,
- SHARED_READ_ONLY_ACCESS));
- }
- }
- }
- }
- catch (IOException e) {
- error("Unable to load chart data: " + getRootCauseMessage(e));
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- LOG.error("Unable to render chart", e);
- return;
- }
-
- @SuppressWarnings("rawtypes")
- RecommendationEngineFactory factory = recommenderRegistry
- .getFactory(recommender.getObject().getTool());
- RecommendationEngine recommenderEngine = factory.build(recommender.getObject());
-
- if (recommenderEngine == null) {
- error("Unknown recommender type selected: [" + recommender.getObject().getTool() + "]");
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- return;
- }
-
- int estimatedDatasetSize = recommenderEngine.estimateSampleCount(casList);
- if (estimatedDatasetSize < 0) {
- error("Evaluation is not supported for the selected recommender.");
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- return;
- }
-
- int incrementSize = (int) Math.ceil((estimatedDatasetSize * TRAIN_PERCENTAGE)) / STEPS;
- if (incrementSize <= 0) {
- error("Not enough training data: " + estimatedDatasetSize + " samples");
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- return;
- }
-
- IncrementalSplitter splitStrategy = new IncrementalSplitter(TRAIN_PERCENTAGE, incrementSize,
- LOW_SAMPLE_THRESHOLD);
-
- evaluationResults.setObject(new ArrayList<>());
-
- // Create a list of comma separated string of scores from every iteration of evaluation.
- while (splitStrategy.hasNext()) {
- splitStrategy.next();
-
- try {
- EvaluationResult evaluationResult = recommenderEngine.evaluate(casList,
- splitStrategy);
-
- if (!evaluationResult.isEvaluationSkipped()) {
- evaluationResults.getObject().add(evaluationResult);
- }
- }
- catch (RecommendationException e) {
- error("Unable to run simulation: " + getRootCauseMessage(e));
- target.ifPresent(_target -> _target.addChildren(getPage(), IFeedback.class));
- LOG.error("Unable to run simulation", e);
- continue;
- }
- }
- }
-
- public void recommenderChanged()
- {
- evaluationResults.setObject(null);
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.properties b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.properties
deleted file mode 100644
index 7a66901cda5..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/evaluation/SimulationLearningCurvePanel.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-simulation=Evaluation Simulation
-start=Start
-metric=Select Evaluation Metric
-annotator=Annotator
\ No newline at end of file
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/model/LearningCurve.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/model/LearningCurve.java
deleted file mode 100644
index 6dc9e478179..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/model/LearningCurve.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.recommendation.model;
-
-import java.io.Serializable;
-import java.util.Map;
-
-public class LearningCurve
- implements Serializable
-{
- private static final long serialVersionUID = 6542281189066805238L;
-
- private Map curveData;
- private String xAxis;
-
- public Map getCurveData()
- {
- return curveData;
- }
-
- public void setCurveData(Map aCurveData)
- {
- curveData = aCurveData;
- }
-
- public String getXaxis()
- {
- return xAxis;
- }
-
- public void setXaxis(String aXAxis)
- {
- this.xAxis = aXAxis;
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartJsReference.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartJsReference.java
deleted file mode 100644
index 649db35a984..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartJsReference.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.recommendation.sidebar.learningcurve;
-
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-
-/**
- * @deprecated The current implementation of the learning curve panel has a memory leak in the
- * browser code. It should be re-implemented.
- */
-@Deprecated
-public class ChartJsReference
- extends JavaScriptResourceReference
-{
- private static final long serialVersionUID = 1L;
-
- private static final ChartJsReference INSTANCE = new ChartJsReference();
-
- /**
- * Gets the instance of the resource reference
- *
- * @return the single instance of the resource reference
- */
- public static ChartJsReference get()
- {
- return INSTANCE;
- }
-
- /**
- * Private constructor
- */
- private ChartJsReference()
- {
- super(ChartJsReference.class, "chart.js");
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.html b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.html
deleted file mode 100644
index b2c5a3d3dc4..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.java
deleted file mode 100644
index fb1d5852e8a..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/ChartPanel.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * 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.recommendation.sidebar.learningcurve;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptContentHeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.TextRequestHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-import de.tudarmstadt.ukp.inception.recommendation.model.LearningCurve;
-
-/**
- * @deprecated The current implementation of the learning curve panel has a memory leak in the
- * browser code. It should be re-implemented.
- */
-@Deprecated
-public class ChartPanel
- extends Panel
-{
- private static final long serialVersionUID = -3849226240909011148L;
-
- private static final Logger LOG = LoggerFactory.getLogger(ChartPanel.class);
-
- private static final String MID_CHART_CONTAINER = "chart";
- private static final String OUTPUT_MARKUP_ID_CHART = "canvas";
-
- private final WebMarkupContainer chart;
- private final ChartAjaxBejavior chartAjaxBejavior;
-
- public ChartPanel(String aId, IModel aModel)
- {
- super(aId, aModel);
-
- chart = new WebMarkupContainer(MID_CHART_CONTAINER);
- chart.setMarkupId(OUTPUT_MARKUP_ID_CHART);
- add(chart);
-
- chartAjaxBejavior = new ChartAjaxBejavior();
- add(chartAjaxBejavior);
- }
-
- public LearningCurve getModelObject()
- {
- return (LearningCurve) getDefaultModelObject();
- }
-
- @Override
- public void renderHead(IHeaderResponse aResponse)
- {
- super.renderHead(aResponse);
-
- // import Js
- aResponse.render(JavaScriptHeaderItem
- .forReference(new WebjarsJavaScriptResourceReference("c3/current/c3.js")));
- aResponse.render(JavaScriptHeaderItem
- .forReference(new WebjarsJavaScriptResourceReference("d3js/current/d3.js")));
-
- // import Css
- aResponse.render(
- CssHeaderItem.forReference(new WebjarsCssResourceReference("c3/current/c3.css")));
-
- aResponse.render(JavaScriptReferenceHeaderItem.forReference(
- getApplication().getJavaScriptLibrarySettings().getJQueryReference()));
-
- aResponse.render(JavaScriptHeaderItem.forReference(ChartJsReference.get()));
-
- String chartTriggerJavascript = String.join("\n", //
- "$(document).ready(function(){", //
- " $.ajax({", //
- " url:'" + chartAjaxBejavior.getCallbackUrl().toString() + "',", //
- " type:'post',", //
- " contentType:'application/json',", //
- " dataType:'json',", //
- " success : function(result){", //
- " createLearningCurveDiagram(result)", //
- " }", //
- " })", //
- "})");
-
- aResponse.render(JavaScriptContentHeaderItem.forScript(chartTriggerJavascript, null));
- }
-
- private final class ChartAjaxBejavior
- extends AbstractAjaxBehavior
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onRequest()
- {
- RequestCycle requestCycle = RequestCycle.get();
-
- LearningCurve learningCurve = getModelObject();
-
- try {
- String json = addLearningCurve(learningCurve);
-
- // return the chart data back to the UI with the JSON. JSON define te learning
- // curves and the xaxis
- requestCycle.scheduleRequestHandlerAfterCurrent(
- new TextRequestHandler("application/json", "UTF-8", json));
- }
- catch (JsonProcessingException e) {
- LOG.error(e.toString(), e);
- }
- }
- }
-
- public String addLearningCurve(LearningCurve aLearningCurve) throws JsonProcessingException
- {
- List> lines = new ArrayList<>();
-
- // add xaxis to the list of lines
- List asList = new ArrayList<>();
- asList.add("x");
-
- // only add the x-axis if it is present (C3 Javascript Library will handle the "no-data" )
- if (aLearningCurve != null && aLearningCurve.getXaxis() != null
- && !aLearningCurve.getXaxis().isEmpty()) {
- asList.addAll(Arrays.asList(aLearningCurve.getXaxis().split(",")));
- }
- lines.add(asList);
-
- // only add the curve data if it is present. (C3 Javascript Library will handle the
- // "no-data" )
- if (aLearningCurve != null && aLearningCurve.getCurveData() != null
- && !aLearningCurve.getCurveData().isEmpty()) {
- // there can be multiple learning curves. add them to te list of lines
- for (String data : aLearningCurve.getCurveData().keySet()) {
- List newLine = new ArrayList();
- newLine.add(data);
- newLine.addAll(Arrays.asList(aLearningCurve.getCurveData().get(data).split(",")));
- lines.add(newLine);
- }
- }
-
- ObjectMapper mapper = new ObjectMapper();
- String json = mapper.writeValueAsString(lines);
-
- return json;
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/DropDownEvent.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/DropDownEvent.java
deleted file mode 100644
index f749e840689..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/DropDownEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.recommendation.sidebar.learningcurve;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import de.tudarmstadt.ukp.inception.recommendation.model.RecommenderEvaluationScoreMetricEnum;
-
-/**
- * @deprecated The current implementation of the learning curve panel has a memory leak in the
- * browser code. It should be re-implemented.
- */
-@Deprecated
-public class DropDownEvent
-{
- public RecommenderEvaluationScoreMetricEnum selectedValue;
- public AjaxRequestTarget target;
-
- public RecommenderEvaluationScoreMetricEnum getSelectedValue()
- {
- return selectedValue;
- }
-
- public void setSelectedValue(RecommenderEvaluationScoreMetricEnum selectedValue)
- {
- this.selectedValue = selectedValue;
- }
-
- public AjaxRequestTarget getTarget()
- {
- return target;
- }
-
- public void setTarget(AjaxRequestTarget target)
- {
- this.target = target;
- }
-}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/LearningCurveChartPanel.html b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/LearningCurveChartPanel.html
deleted file mode 100644
index 4cb0c6b6a0a..00000000000
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/LearningCurveChartPanel.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
+ * This class is exposed as a Spring Component via
+ * {@link AnnotationUIAutoConfiguration#closeSessionActionBarExtension}.
+ *
+ */
+@Order(10000)
+public class CloseSessionActionBarExtension
+ implements ActionBarExtension
+{
+ @Override
+ public boolean accepts(AnnotationPageBase aPage)
+ {
+ return aPage.visitChildren(MenuBar.class, (c, v) -> {
+ v.stop(!((MenuBar) c).isVisible());
+ });
+ }
+
+ @Override
+ public Panel createActionBarItem(String aId, AnnotationPageBase aPage)
+ {
+ return new CloseSessionPanel(aId, aPage);
+ }
+}
diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/MetricSelectDropDownPanel.html b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.html
similarity index 58%
rename from inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/MetricSelectDropDownPanel.html
rename to inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.html
index 24d9357fb6a..10bf7ffeb5a 100644
--- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/learningcurve/MetricSelectDropDownPanel.html
+++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.html
@@ -1,9 +1,9 @@
+
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.java
new file mode 100644
index 00000000000..1f296eed3d7
--- /dev/null
+++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/actionbar/closesession/CloseSessionPanel.java
@@ -0,0 +1,48 @@
+/*
+ * 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.clarin.webanno.ui.annotation.actionbar.closesession;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+
+import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase;
+import de.tudarmstadt.ukp.clarin.webanno.security.config.LoginProperties;
+import de.tudarmstadt.ukp.clarin.webanno.security.config.PreauthenticationProperties;
+import de.tudarmstadt.ukp.clarin.webanno.support.lambda.LambdaAjaxLink;
+import de.tudarmstadt.ukp.clarin.webanno.ui.core.logout.LogoutPanel;
+
+public class CloseSessionPanel
+ extends Panel
+{
+ private static final long serialVersionUID = -9213541738534665790L;
+
+ private @SpringBean PreauthenticationProperties preauthenticationProperties;
+ private @SpringBean LoginProperties securityProperties;
+
+ public CloseSessionPanel(String aId, AnnotationPageBase aPage)
+ {
+ super(aId);
+ queue(new LambdaAjaxLink("logoutButton", this::actionLogout));
+ }
+
+ private void actionLogout(AjaxRequestTarget aTarget)
+ {
+ LogoutPanel.actionLogout(this, preauthenticationProperties, securityProperties);
+ }
+}
diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java
index d76ad21694a..b9c61136013 100644
--- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java
+++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/config/AnnotationUIAutoConfiguration.java
@@ -28,6 +28,7 @@
import de.tudarmstadt.ukp.clarin.webanno.api.ProjectService;
import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.AnnotationPageMenuItem;
+import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.closesession.CloseSessionActionBarExtension;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.AnnotationUndoActionBarExtension;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.ChainAnnotationActionUndoSupport;
import de.tudarmstadt.ukp.clarin.webanno.ui.annotation.actionbar.undo.actions.FeatureValueActionUndoSupport;
@@ -84,4 +85,10 @@ public FeatureValueActionUndoSupport featureValueActionUndoSupport()
{
return new FeatureValueActionUndoSupport();
}
+
+ @Bean
+ public CloseSessionActionBarExtension closeSessionActionBarExtension()
+ {
+ return new CloseSessionActionBarExtension();
+ }
}
diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties
index a79c1d43ff6..20c76c4ca69 100644
--- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties
+++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties
@@ -40,6 +40,7 @@ redo=Redo
moveUp=Up
moveDown=Down
busy=Busy...
+logOut=Log out
enabled=Enabled
diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.css b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.css
index d789c1de1cb..c24f4517379 100644
--- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.css
+++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.css
@@ -23,6 +23,11 @@
.login-form {
min-width: 440px;
max-width: 30%;
+ transition: box-shadow .3s;
+}
+
+.login-form:hover {
+ box-shadow: 0 0 10px var(--bs-tertiary-color);
}
.login-form input[type=text],input[type=password] {
@@ -39,4 +44,4 @@
.form-floating > .form-control:not(:placeholder-shown) ~ label::after {
background-color: unset !important;
-}
\ No newline at end of file
+}
diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.html b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.html
index 29543eade0e..a46de32ba17 100644
--- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.html
+++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.html
@@ -21,7 +21,7 @@
-
+
Welcome!
diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
index e1c1ea6262a..39081022c27 100644
--- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
+++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/login/LoginPage.java
@@ -62,7 +62,6 @@
import com.giffing.wicket.spring.boot.context.scan.WicketSignInPage;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import de.tudarmstadt.ukp.clarin.webanno.api.SessionMetaData;
import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
import de.tudarmstadt.ukp.clarin.webanno.security.config.LoginProperties;
@@ -81,7 +80,7 @@
public class LoginPage
extends ApplicationPageBase
{
- private static final String PARAM_SKIP_AUTP_LOGIN = "skipAutoLogin";
+ public static final String PARAM_SKIP_AUTO_LOGIN = "skipAutoLogin";
private static final String PARAM_ERROR = "error";
private static final String PROP_RESTORE_DEFAULT_ADMIN_ACCOUNT = "restoreDefaultAdminAccount";
@@ -123,7 +122,7 @@ public LoginPage(PageParameters aParameters)
saml2LoginPanel.add(visibleWhen(this::isLoginAllowed));
queue(saml2LoginPanel);
- var skipAutoLogin = aParameters.get(PARAM_SKIP_AUTP_LOGIN).toBoolean(false)
+ var skipAutoLogin = aParameters.get(PARAM_SKIP_AUTO_LOGIN).toBoolean(false)
|| tooManyUsers.getObject();
// Failed OAuth2/SAML call this page with the parameter `?error` so we display a message
@@ -236,9 +235,6 @@ public void renderHead(IHeaderResponse aResponse)
{
super.renderHead(aResponse);
- aResponse.render(CssHeaderItem
- .forReference(new WebjarsCssResourceReference("hover/current/css/hover.css")));
-
aResponse.render(CssHeaderItem.forReference(LoginPageCssResourceReference.get()));
// Capture the URL fragment into a hidden form field so we can use it later when
diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/logout/LogoutPanel.html b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/logout/LogoutPanel.html
index ed974763c1e..f8d7511d2bb 100644
--- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/logout/LogoutPanel.html
+++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/logout/LogoutPanel.html
@@ -34,7 +34,7 @@
- Log out
+