give a label to model and sampler types

car031 · car031 · commit 297fbb2fd288 · 2025-05-08T14:38:41.000+02:00
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelProperties.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelProperties.java
@@ -106,15 +106,16 @@ private void refresh() {
 		SelectItem type = ItemFactory.newSelectItem(TYPE);
 		type.setOptionDataSource(new ModelTypesDS());
 		type.setValueField(VALUE);
-		type.setDisplayField(VALUE);
+		type.setDisplayField("label");
 		type.setValue(model.getType());
 		type.addChangedHandler(changedHandler);
 		type.addChangedHandler(changed -> layersStack.setVisible(NEURAL.equals(type.getValueAsString())));
 		type.setRequired(true);
 		type.setDisabled(model.getId() != 0L);
 		type.setVisible(model.getId() == 0L);
 
-		StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE, model.getType());
+		StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE,
+				I18N.message("aimodeltype." + model.getType()));
 		typeValue.setVisible(model.getId() != 0L);
 
 		StaticTextItem id = ItemFactory.newStaticTextItem(ID, Long.toString(model.getId()));
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelTypesDS.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelTypesDS.java
@@ -23,7 +23,9 @@ private void init(String url) {
 		value.setPrimaryKey(true);
 		value.setRequired(true);
 
-		setFields(value);
+		DataSourceTextField label = new DataSourceTextField("label");
+
+		setFields(value, label);
 		setClientOnly(true);
 
 		setDataURL(url);
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelsPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelsPanel.java
@@ -103,6 +103,7 @@ public void onDraw() {
 
 		ListGridField modelType = new ListGridField("type", I18N.message("type"));
 		modelType.setAutoFit(AutoFitWidthApproach.BOTH);
+		modelType.setCellFormatter((value, record, rowNum, colNum) -> I18N.message("aimodeltype." + value));
 
 		ListGridField training = new RunningListGridField(TRAINING);
 		training.setTitle(I18N.message(TRAINING));
@@ -159,7 +160,7 @@ public void onDraw() {
 		stats.setTitle(I18N.message("stats"));
 		toolStrip.addButton(stats);
 		stats.addClickHandler(event -> new AIStats().show());
-		
+
 		toolStrip.addSeparator();
 
 		ToolStripButton importModel = new ToolStripButton();
@@ -252,17 +253,16 @@ public void onSuccess(Void result) {
 
 		MenuItem evaluate = new MenuItem();
 		evaluate.setTitle(I18N.message("startevaluation"));
-		evaluate.addClickHandler(
-				event -> LD.ask(I18N.message(QUESTION), I18N.message("confirmevaluation"), confirm -> {
-					if (Boolean.TRUE.equals(confirm)) {
-						AIService.Instance.get().evaluateModel(ids.get(0), new DefaultAsyncCallback<>() {
-							@Override
-							public void onSuccess(Void result) {
-								// Nothing to do
-							}
-						});
+		evaluate.addClickHandler(event -> LD.ask(I18N.message(QUESTION), I18N.message("confirmevaluation"), confirm -> {
+			if (Boolean.TRUE.equals(confirm)) {
+				AIService.Instance.get().evaluateModel(ids.get(0), new DefaultAsyncCallback<>() {
+					@Override
+					public void onSuccess(Void result) {
+						// Nothing to do
 					}
-				}));
+				});
+			}
+		}));
 		evaluate.setEnabled(
 				!selection[0].getAttributeAsBoolean(TRAINING) && !selection[0].getAttributeAsBoolean(EVALUATING)
 						&& "neural".equals(selection[0].getAttributeAsString("type"))
@@ -305,11 +305,12 @@ public void onSuccess(GUIModel mdl) {
 	}
 
 	protected void showModelDetails(GUIModel model) {
-		if (!(details instanceof ModelDetailsPanel)) {
-			detailsContainer.removeMember(details);
+		detailsContainer.removeMember(details);
+		if (model!=null)
 			details = new ModelDetailsPanel(this);
-			detailsContainer.addMember(details);
-		}
+		else
+			details = SELECT_MODEL;
+		detailsContainer.addMember(details);
 		((ModelDetailsPanel) details).setModel(model);
 	}
 
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerProperties.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerProperties.java
@@ -106,14 +106,15 @@ private void refresh() {
 		delimiter.setWidth(30);
 		delimiter.setLength(2);
 		delimiter.setStartRow(true);
-		delimiter.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
-		delimiter.setRequiredWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
+		AdvancedCriteria delimiterCriteria = new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV);
+		delimiter.setVisibleWhen(delimiterCriteria);
+		delimiter.setRequiredWhen(delimiterCriteria);
 
 		TextItem quote = ItemFactory.newTextItem("quote", sampler.getQuote());
 		quote.addChangedHandler(changedHandler);
 		quote.setWidth(30);
 		quote.setLength(2);
-		quote.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
+		quote.setVisibleWhen(delimiterCriteria);
 
 		TextAreaItem description = ItemFactory.newTextAreaItem(DESCRIPTION, sampler.getDescription());
 		description.addChangedHandler(changedHandler);
@@ -125,40 +126,45 @@ private void refresh() {
 		automation.addChangedHandler(changedHandler);
 		automation.setColSpan(4);
 		automation.setWidth(400);
-		automation.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
+		AdvancedCriteria folderCriteria = new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA);
+		automation.setVisibleWhen(folderCriteria);
 
 		SelectItem type = ItemFactory.newSelectItem(TYPE);
 		type.setOptionDataSource(new SamplerTypeDS());
 		type.setValueField(VALUE);
-		type.setDisplayField(VALUE);
+		type.setDisplayField("label");
 		type.setValue(sampler.getType());
 		type.addChangedHandler(changedHandler);
 		type.addChangedHandler(changed -> chainStack.setVisible(CHAIN.equals(type.getValueAsString())));
 		type.setRequired(true);
 		type.setDisabled(sampler.getId() != 0L);
 		type.setVisible(sampler.getId() == 0L);
 
-		StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE, sampler.getType());
+		StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE,
+				I18N.message("aisamplertype." + sampler.getType()));
 		typeValue.setVisible(sampler.getId() != 0L);
 
 		StaticTextItem id = ItemFactory.newStaticTextItem(ID, Long.toString(sampler.getId()));
 		id.setVisible(sampler.getId() != 0L);
 
 		folderSelector.setFolder(sampler.getFolder());
 		folderSelector.addFolderChangeListener(folder -> changedHandler.onChanged(null));
-		folderSelector.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
+		folderSelector.setVisibleWhen(folderCriteria);
+		documentSelector.setRequiredWhen(folderCriteria);
 
 		documentSelector.setDocument(sampler.getDocument());
 		documentSelector.addDocumentChangeListener(document -> changedHandler.onChanged(null));
-		documentSelector
-				.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.NOT_IN_SET, new String[] { METADATA, CHAIN }));
+		AdvancedCriteria documentCriteria = new AdvancedCriteria(TYPE, OperatorId.NOT_IN_SET,
+				new String[] { METADATA, CHAIN });
+		documentSelector.setVisibleWhen(documentCriteria);
+		documentSelector.setRequiredWhen(documentCriteria);
 
 		TextItem category = ItemFactory.newTextItem("category", sampler.getCategory());
 		category.addChangedHandler(changedHandler);
 		category.setHint(I18N.message("extattrname"));
 		category.setShowHintInField(true);
 		category.setIconVAlign(VerticalAlignment.CENTER);
-		category.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
+		category.setVisibleWhen(folderCriteria);
 		FormItemIcon takeAttributeForCategory = prepareTakeAttributeForCategory();
 		category.setIcons(takeAttributeForCategory);
 
@@ -169,7 +175,7 @@ private void refresh() {
 		features.setHint(I18N.message("extattrnamesseparated"));
 		features.setShowHintInField(true);
 		features.setIconVAlign(VerticalAlignment.CENTER);
-		features.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
+		features.setVisibleWhen(folderCriteria);
 		features.setIcons(prepareTakeAttributeForFeatures(category));
 
 		form.setItems(id, typeValue, type, name, label, delimiter, quote, folderSelector, documentSelector, category,
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerTypeDS.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerTypeDS.java
@@ -23,7 +23,9 @@ private void init(String url) {
 		value.setPrimaryKey(true);
 		value.setRequired(true);
 
-		setFields(value);
+		DataSourceTextField label = new DataSourceTextField("label");
+		
+		setFields(value, label);
 		setClientOnly(true);
 
 		setDataURL(url);
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplersPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplersPanel.java
@@ -82,6 +82,7 @@ public void onDraw() {
 		description.setCanSort(false);
 
 		ListGridField samplerType = new ListGridField("type", I18N.message("type"));
+		samplerType.setCellFormatter((value, record, rowNum, colNum) -> I18N.message("aisamplertype." + value));
 		samplerType.setAutoFit(AutoFitWidthApproach.BOTH);
 
 		list = new RefreshableListGrid();
@@ -139,8 +140,8 @@ public void onSuccess(GUISampler sampler) {
 				});
 		});
 
-		list.addDataArrivedHandler(event -> infoPanel
-				.setMessage(I18N.message("showsamplers", Integer.toString(list.getTotalRows()))));
+		list.addDataArrivedHandler(
+				event -> infoPanel.setMessage(I18N.message("showsamplers", Integer.toString(list.getTotalRows()))));
 
 		detailsContainer.setAlign(Alignment.CENTER);
 		detailsContainer.addMember(details);
@@ -176,11 +177,12 @@ public void onSuccess(Void result) {
 	}
 
 	protected void showSamplerDetails(GUISampler sampler) {
-		if (!(details instanceof SamplerDetailsPanel)) {
-			detailsContainer.removeMember(details);
+		detailsContainer.removeMember(details);
+		if (sampler != null)
 			details = new SamplerDetailsPanel(this);
-			detailsContainer.addMember(details);
-		}
+		else
+			details = SELECT_SAMPLER;
+		detailsContainer.addMember(details);
 		((SamplerDetailsPanel) details).setSampler(sampler);
 	}
 
diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/RetentionPolicyDetailsPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/RetentionPolicyDetailsPanel.java
@@ -90,7 +90,7 @@ public void onSuccess(GUIRetentionPolicy policy) {
 		form.setNumCols(2);
 		form.setTitleOrientation(TitleOrientation.TOP);
 
-		TextItem name = ItemFactory.newSimpleTextItem("name", policy.getName());
+		TextItem name = ItemFactory.newSimpleTextItemWithHyphen ("name", policy.getName());
 		name.addChangedHandler(changedHandler);
 		name.setWidth(200);
 		name.setRequired(true);
diff --git a/logicaldoc-i18n/src/main/resources/i18n/messages.properties b/logicaldoc-i18n/src/main/resources/i18n/messages.properties
@@ -2726,4 +2726,11 @@ graph = Graph
 stats = Stats
 totalqueries = Total queries
 currentmonthqueries = Current month queries
-aistats = AI Stats
+aistats = AI Stats
+aimodeltype.neural = Neural Network
+aimodeltype.tokens = Tokens Detector
+aimodeltype.classifier = Classifier
+aisamplertype.csv = CSV
+aisamplertype.metadata = Metadata
+aisamplertype.chain = Chain
+aisamplertype.paragraph = Paragraph
