Merge pull request #4489 from inception-project/feature/4379-Suppress…

…-or-mark-concepts-in-the-search-that-are-marked-as-owl-deprecated #4379 - Suppress or mark concepts in the search that are marked as owl:deprecated
inception-project · Jan 30, 2024 · c0bedde · c0bedde
2 parents cbe6f8f + 75911ff
commit c0bedde
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html b/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html
@@ -31,19 +31,23 @@
       </span>
     </label>
     <div class="feature-editor-value">
-      <div class="input-group">
-        <div class="input-group-text">
-          <span wicket:id="iriInfoBadge"/>
-        </div>
-        <button wicket:id="openBrowseDialog" class="btn btn-outline-secondary" type="button">
-          <i class="fas fa-sitemap"/>
-        </button>
-        <input class="flex-content" wicket:id="value" type="text"/>
-      </div>
-      <div wicket:id="descriptionContainer" class="border border-top-0 rounded-bottom overflow-hidden" readonly>
-        <div class="scrolling p-1 text-muted small" style="max-height: 4.5rem; word-wrap: break-word;">
-          <span wicket:id="description"/>
-        </div>
+      <div class="list-group">
+        <ul class="list-group-item p-0 m-0">
+          <div class="input-group">
+            <div class="input-group-text border-0">
+              <span wicket:id="iriInfoBadge"/>
+            </div>
+            <button wicket:id="openBrowseDialog" class="btn btn-outline-secondary border-secondary-subtle border-top-0 border-bottom-0" type="button">
+              <i class="fas fa-sitemap"/>
+            </button>
+            <input class="flex-content border-0" wicket:id="value" type="text"/>
+          </div>
+        </ul>
+        <ul wicket:id="descriptionContainer" class="list-group-item p-0 m-0 overflow-hidden" readonly>
+          <div class="scrolling p-1 text-muted small" style="max-height: 4.5rem; word-wrap: break-word;">
+            <span wicket:id="description"/>
+          </div>
+        </ul>
       </div>
       <div wicket:id="keyBindings" class="col-sm-12"/>
     </div>

diff --git a/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java b/...-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java
@@ -117,7 +117,6 @@ public ConceptFeatureEditor(String aId, MarkupContainer aItem, IModel<FeatureSta
         add(deprecationMarker);
 
         descriptionContainer = new WebMarkupContainer("descriptionContainer");
-        descriptionContainer.setOutputMarkupPlaceholderTag(true);
         descriptionContainer.add(visibleWhen(
                 () -> getLabelComponent().isVisible() && getModelObject().getValue() != null));
         add(descriptionContainer);
@@ -200,7 +199,7 @@ private String iriTooltipValue()
     @OnEvent
     public void onFeatureEditorValueChanged(FeatureEditorValueChangedEvent aEvent)
     {
-        aEvent.getTarget().add(descriptionContainer, iriBadge, openIriLink, deprecationMarker);
+        aEvent.getTarget().add(this);
     }
 
     @OnEvent
@@ -219,7 +218,6 @@ private void selectItem(AjaxRequestTarget aTarget, KBObject aKBObject)
     {
         getModelObject().value = aKBObject;
         dialog.close(aTarget);
-        aTarget.add(focusComponent, descriptionContainer, iriBadge, openIriLink);
         send(focusComponent, BUBBLE,
                 new FeatureEditorValueChangedEvent(ConceptFeatureEditor.this, aTarget));
     }