diff --git a/inception/inception-doc/src/main/resources/META-INF/asciidoc/admin-guide.adoc b/inception/inception-doc/src/main/resources/META-INF/asciidoc/admin-guide.adoc index 003b2f6d949..2421cebb254 100644 --- a/inception/inception-doc/src/main/resources/META-INF/asciidoc/admin-guide.adoc +++ b/inception/inception-doc/src/main/resources/META-INF/asciidoc/admin-guide.adoc @@ -127,6 +127,8 @@ include::{include-dir}settings_recommender.adoc[leveloffset=+1] include::{include-dir}settings_string_relation_recommender.adoc[leveloffset=+2] include::{include-dir}settings_recommendation_external.adoc[leveloffset=+2] +include::{include-dir}settings_bulk_processing.adoc[leveloffset=+1] + include::{include-dir}settings_sharing.adoc[leveloffset=+1] include::{include-dir}settings_versioning.adoc[leveloffset=+1] diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java index b75a559414d..7cf9274cd90 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/config/RecommenderServiceAutoConfiguration.java @@ -24,6 +24,7 @@ import javax.servlet.ServletContext; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -237,6 +238,7 @@ public SuggestionSupportRegistry layerRecommendtionSupportRegistry( @ConditionalOnWebApplication @Bean + @ConditionalOnExpression("${websocket.enabled:true} and ${bulk-processing.enabled:false}") public BulkProcessingPageMenuItem bulkProcessingPageMenuItem(UserDao aUserRepo, ProjectService aProjectService, ServletContext aServletContext) { diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/processor/BulkProcessingPage.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/processor/BulkProcessingPage.java index 22e865f5f54..11afd90e816 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/processor/BulkProcessingPage.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/processor/BulkProcessingPage.java @@ -18,14 +18,17 @@ package de.tudarmstadt.ukp.inception.recommendation.processor; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.MANAGER; +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.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; +import org.wicketstuff.annotation.mount.MountPath; 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.page.ProjectPageBase; +@MountPath(NS_PROJECT + "/${" + PAGE_PARAM_PROJECT + "}/process") public class BulkProcessingPage extends ProjectPageBase { @@ -37,7 +40,7 @@ public BulkProcessingPage(PageParameters aParameters) { super(aParameters); - User user = userRepository.getCurrentUser(); + var user = userRepository.getCurrentUser(); requireProjectRole(user, MANAGER); diff --git a/inception/inception-recommendation/src/main/resources/META-INF/asciidoc/admin-guide/settings_bulk_processing.adoc b/inception/inception-recommendation/src/main/resources/META-INF/asciidoc/admin-guide/settings_bulk_processing.adoc new file mode 100644 index 00000000000..0591203bd37 --- /dev/null +++ b/inception/inception-recommendation/src/main/resources/META-INF/asciidoc/admin-guide/settings_bulk_processing.adoc @@ -0,0 +1,38 @@ +// 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. + +[[sect_settings_bulk_processing]] += Bulk Processing Settings + +==== +CAUTION: Experimental feature. +==== + +This section describes the global settings related to the bulk processing module. + +.Recommender settings overview +[cols="4*", options="header"] +|=== +| Setting +| Description +| Default +| Example + +| `bulk-processing.enabled` +| enable/disable bulk processing +| `false` +| `true` +|=== \ No newline at end of file diff --git a/inception/inception-versioning/src/main/resources/META-INF/asciidoc/admin-guide/settings_versioning.adoc b/inception/inception-versioning/src/main/resources/META-INF/asciidoc/admin-guide/settings_versioning.adoc index 77ff00a20a2..11c3b912d2f 100644 --- a/inception/inception-versioning/src/main/resources/META-INF/asciidoc/admin-guide/settings_versioning.adoc +++ b/inception/inception-versioning/src/main/resources/META-INF/asciidoc/admin-guide/settings_versioning.adoc @@ -34,9 +34,9 @@ This git repository can also be used to push to a remote repository, e.g. saving | Default | Example -| versioning.enabled +| `versioning.enabled` | enable/disable versioning -| false -| true +| `false` +| `true` |===