Merge branch 'master' of https://github.com/logicaldoc/community

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateVersionDAO.java

@@ -52,7 +52,7 @@ public List<Version> findByDocId(long docId) throws PersistenceException {
 	@Override
 	public Version findByVersion(long docId, String version) throws PersistenceException {
 		List<Version> versions = findByWhere(" " + ENTITY + DOC_ID + docId + " and " + ENTITY + ".version = :version",
-				Map.of("version", version), null, null);
+				Map.of("version", StringUtils.defaultString(version)), null, null);
 
 		if (!versions.isEmpty())
 			return versions.get(0);
@@ -64,7 +64,7 @@ public Version findByVersion(long docId, String version) throws PersistenceExcep
 	public Version findByFileVersion(long docId, String fileVersion) throws PersistenceException {
 		List<Version> versions = findByWhere(
 				" " + ENTITY + DOC_ID + docId + " and " + ENTITY + ".fileVersion = :fileVersion",
-				Map.of("fileVersion", fileVersion), ENTITY + ".date asc", null);
+				Map.of("fileVersion", StringUtils.defaultString(fileVersion)), ENTITY + ".date asc", null);
 
 		if (!versions.isEmpty())
 			return versions.get(0);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/Menu.java

@@ -137,8 +137,6 @@ public class Menu {
 
 	public static final long KEYSTORE = -1160;
 
-	public static final long VIA = -1170;
-
 	public static final long COMPARATORS = 1660;
 
 	public static final long AUTOMATION = 1570;

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIVIASettings.java

@@ -41,10 +41,12 @@ private void refresh() {
 		if (Boolean.TRUE.equals(container.contains(form)))
 			container.removeChild(form);
 
-		report = ItemFactory.newTextAreaItem("report", model.getEvaluation().getReport());
+		report = ItemFactory.newTextAreaItem("report",
+				model.getEvaluation() != null ? model.getEvaluation().getReport() : "");
 		report.setWidth("*");
 
-		confusionMatrix = ItemFactory.newStaticTextItem("confusionmatrix", model.getEvaluation().getConfusionMatrix());
+		confusionMatrix = ItemFactory.newStaticTextItem("confusionmatrix",
+				model.getEvaluation() != null ? model.getEvaluation().getConfusionMatrix() : "");
 
 		onModelChanged(model);
 
@@ -75,7 +77,7 @@ public int hashCode() {
 
 	@Override
 	public void onModelChanged(GUIModel mdl) {
-		if (this.model.getId() == mdl.getId() && mdl.isNeuralNetwork()) {
+		if (this.model.getId() == mdl.getId() && mdl.isNeuralNetwork() && mdl.getEvaluation() != null) {
 			report.setValue(mdl.getEvaluation().getReport());
 			report.setTitle(mdl.getEvaluation().getLastEvaluated() != null
 					? I18N.message("lastevaluatedon", I18N.formatDate(mdl.getEvaluation().getLastEvaluated()))

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelEvaluation.java

@@ -326,7 +326,8 @@ public void updateRecord(GUIModel model) {
 		}
 
 		rec.setAttribute("name", model.getName());
-		rec.setAttribute(LABEL, model.getLabel() != null ? model.getLabel() : model.getName());
+		rec.setAttribute(LABEL,
+				model.getLabel() != null && !model.getLabel().trim().isEmpty() ? model.getLabel() : model.getName());
 		rec.setAttribute(DESCRIPTION, model.getDescription());
 		rec.setAttribute(TRAINING, model.getTraining().isTraining());
 		if (model.isNeuralNetwork())

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelsPanel.java

@@ -48,8 +48,6 @@ public SettingsMenu() {
 
 		addKeystore();
 
-		addVia();
-
 		addAutomation();
 
 		addComparators();
@@ -107,18 +105,6 @@ private void addAutomation() {
 		}
 	}
 
-	private void addVia() {
-		Button via = new Button(I18N.message("via"));
-		via.setWidth100();
-		via.setHeight(25);
-		via.addClickHandler((ClickEvent event) -> AdminScreen.get().setContent(new VIASettingsPanel()));
-		if (Feature.visible(Feature.ARTIFICIAL_INTELLIGENCE) && Menu.enabled(Menu.VIA)) {
-			addMember(via);
-			if (!Feature.enabled(Feature.ARTIFICIAL_INTELLIGENCE))
-				setFeatureDisabled(via);
-		}
-	}
-
 	private void addKeystore() {
 		Button keystore = new Button(I18N.message("keystore"));
 		keystore.setWidth100();