Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3

* main: #4232 - Drop evaluation page #4230 - Upgrade dependencies No issue: Update system requirements and improve pointers to Docker-based deployment No issue: Call out to admins to look at the admin guide when reaching the installation section in the users guide. #4215 - Ability to specify GID and UID for the user used inside the Docker image [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release inception-29.4 #4226 - Display logout button on annotation page if dashboard access is disabled #4215 - Ability to specify GID and UID for the user used inside the Docker image #4226 - Display logout button on annotation page if dashboard access is disabled #4150 - Upgrade dependencies #4223 - Covered text should show in popover #4215 - Ability to specify GID and UID for the user used inside the Docker image % Conflicts: % inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/logout/LogoutPanel.java
inception-project · Oct 8, 2023 · 778c7ba · 778c7ba
2 parents 8faf5f9 + 82fe61f
commit 778c7ba
Show file tree

Hide file tree

Showing 112 changed files with 6,928 additions and 8,252 deletions.
diff --git a/...n/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/ActionBar.html b/...n/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/actionbar/ActionBar.html
@@ -19,9 +19,9 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
   <wicket:panel>
-    <div wicket:id="items">
+    <wicket:container wicket:id="items">
       <wicket:container wicket:id="item"/>
-    </div>
+    </wicket:container>
   </wicket:panel>
 </body>
 </html>
diff --git a/...tation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java b/...tation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/SpanRenderer.java
@@ -22,8 +22,10 @@
 import static de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil.selectFsByAddr;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang3.StringUtils.abbreviate;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,9 +42,12 @@
 
 import de.tudarmstadt.ukp.clarin.webanno.api.annotation.rendering.Renderer_ImplBase;
 import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature;
+import de.tudarmstadt.ukp.clarin.webanno.support.uima.ICasUtil;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VArc;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VDocument;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VID;
+import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetail;
+import de.tudarmstadt.ukp.inception.rendering.vmodel.VLazyDetailGroup;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VObject;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VRange;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VSpan;
@@ -56,6 +61,8 @@
 public class SpanRenderer
     extends Renderer_ImplBase<SpanAdapter>
 {
+    private static final int MAX_HOVER_TEXT_LENGTH = 1000;
+
     private final List<SpanLayerBehavior> behaviors;
 
     private Type type;
@@ -130,6 +137,27 @@ public List<AnnotationFS> selectAnnotationsInWindow(CAS aCas, int aWindowBegin,
                 .collect(toList());
     }
 
+    @Override
+    public List<VLazyDetailGroup> lookupLazyDetails(CAS aCas, VID aVid, int aWindowBeginOffset,
+            int aWindowEndOffset)
+    {
+        if (!checkTypeSystem(aCas)) {
+            return Collections.emptyList();
+        }
+
+        var fs = ICasUtil.selectByAddr(aCas, AnnotationFS.class, aVid.getId());
+
+        var group = new VLazyDetailGroup();
+        group.addDetail(
+                new VLazyDetail("Text", abbreviate(fs.getCoveredText(), MAX_HOVER_TEXT_LENGTH)));
+
+        var details = super.lookupLazyDetails(aCas, aVid, aWindowBeginOffset, aWindowEndOffset);
+        if (!group.getDetails().isEmpty()) {
+            details.add(0, group);
+        }
+        return details;
+    }
+
     @Override
     public void render(CAS aCas, List<AnnotationFeature> aFeatures, VDocument aResponse,
             int aWindowBegin, int aWindowEnd)

diff --git a/inception/inception-bootstrap/src/main/ts/.eslintrc.yml b/inception/inception-bootstrap/src/main/ts/.eslintrc.yml
@@ -4,11 +4,21 @@ env:
   mocha: true
 extends:
   - standard
+  - plugin:svelte/recommended
 parser: '@typescript-eslint/parser'
 parserOptions:
   ecmaVersion: latest
   sourceType: module
+  extraFileExtensions: ['.svelte']
 plugins:
   - '@typescript-eslint'
+  - 'chai-friendly'
+overrides:
+  - files: ['*.svelte']
+    parser: svelte-eslint-parser
+    parserOptions:
+      parser: '@typescript-eslint/parser'
 rules: {
+  "no-unused-expressions": 0,
+  "chai-friendly/no-unused-expressions": 2
 }
diff --git a/inception/inception-bootstrap/src/main/ts/bootstrap/inception-actionbar.scss b/inception/inception-bootstrap/src/main/ts/bootstrap/inception-actionbar.scss
@@ -26,7 +26,7 @@
   align-items: center;
 
   @include media-breakpoint-down(xl) {
-    font-size: 1vw !important;
+    font-size: 1.3vw !important;
   }
 
   @include media-breakpoint-down(xl) {
@@ -36,25 +36,6 @@
       font-size: inherit !important;
     }
   }
-
-  @include media-breakpoint-down(lg) {
-    .btn {
-      padding-left: calc($input-btn-padding-x / 2);
-      padding-right: calc($input-btn-padding-x / 2);
-    }
-  }
-
-  > * {
-    padding-left: calc($grid-gutter-width / 4);
-    padding-right: calc($grid-gutter-width / 4);
-  }
-
-  @include media-breakpoint-down(xl) {
-    > * {
-      padding-left: calc($grid-gutter-width / 8);
-      padding-right: calc($grid-gutter-width / 8);
-    }
-  }
 
   .btn-group, .input-group {
     @extend .bg-body;
@@ -65,32 +46,23 @@
 
   .btn-action-bar {
     @extend .btn-outline-secondary;
+
+    @include media-breakpoint-down(xl) {
+      --bs-btn-padding-x: 1vw !important;
+      --bs-btn-padding-y: 0.55vw !important;
+    }
   }
 
   .action-bar-group {
-    padding: 2px;
+    margin-left: 0.25rem;
+    margin-right: 0.25rem;
+    padding-top: 0.25rem;
+    padding-bottom: 0.25rem;
     background-color: var(--bs-light-border-subtle);
-    border-radius: 5px;
+    border-radius: var(--bs-border-radius);
     display: flex;
     flex-direction: row;
     align-items: center;
     flex: 0;
-
-    > * {
-      padding-left: calc($grid-gutter-width / 8);
-      padding-right: calc($grid-gutter-width / 8);
-    }
-
-    @include media-breakpoint-down(xl) {
-      > * {
-        padding-left: calc($grid-gutter-width / 16);
-        padding-right: calc($grid-gutter-width / 16);
-      }
-    }
-  }
-
-  .action-bar-group-title {
-    padding-left: calc($grid-gutter-width / 2);
-    padding-right: calc($grid-gutter-width / 2);
   }
 }