MyCoRe-Org · yagee-de · Sep 11, 2024 · Jul 2, 2024 · Jul 30, 2024 · Jul 31, 2024
diff --git a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java
@@ -128,7 +128,7 @@ protected void assertEqualsIgnoreCase(String message, String expected, String ac
     }
 
     public void assertUserCreated(String user) {
-        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen:" + user));
+        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen: " + user));
     }
 
     public void assertValidationErrorVisible() {

diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-meta-tags.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-meta-tags.xsl
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- Overwrite stylesheet and template in your application module to add custom meta elements -->
+  <xsl:template name="mir-flatmir-layout-meta-tags"/>
+</xsl:stylesheet>
diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout.xsl
@@ -8,10 +8,10 @@
   xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
   exclude-result-prefixes="xlink i18n">
 
-  <xsl:output method="html" indent="yes" omit-xml-declaration="yes" media-type="text/html"
-    version="5" />
+  <xsl:output method="html" indent="yes" omit-xml-declaration="yes" media-type="text/html" version="5" />
   <xsl:strip-space elements="*" />
   <xsl:include href="resource:xsl/mir-flatmir-layout-utils.xsl"/>
+  <xsl:include href="resource:xsl/mir-flatmir-layout-meta-tags.xsl"/>
   <xsl:param name="MIR.DefaultLayout.CSS" />
   <xsl:param name="MIR.CustomLayout.CSS" select="''" />
   <xsl:param name="MIR.CustomLayout.JS" select="''" />
@@ -25,6 +25,7 @@
       <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+        <xsl:call-template name="mir-flatmir-layout-meta-tags"/>
         <title>
           <xsl:value-of select="$PageTitle" />
         </title>

diff --git a/mir-layout/yarn.lock b/mir-layout/yarn.lock
diff --git a/mir-module/package.json b/mir-module/package.json
@@ -19,7 +19,7 @@
         "bootstrap-datepicker": "1.9.0",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.2.0",
-        "grunt-contrib-uglify": "https://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
+        "grunt-contrib-uglify": "^5.2.2",
         "grunt-npmcopy": "^0.1.0",
         "handlebars": "4.5.3",
         "jquery.dotdotdot": "1.7.4",
@@ -28,14 +28,14 @@
         "myclabs.jquery.confirm": "2.7.0",
         "openlayers": "4.6.4",
         "popper.js": "^1.14.7",
-        "select2": "4.0.6-rc.1",
+        "select2": "^4.0.13",
         "typeahead.js": "0.11.1",
         "video.js": "7.14.3"
     },
     "dependencies": {
         "ckeditor-notification": "^4.11.2",
         "ckeditor-wordcount-plugin": "^1.17.12",
-        "ckeditor4": "^4.18.0",
+        "ckeditor4": "~4.22.0",
         "vue": "3.2.13",
         "vue3-openlayers": "^1.0.0"
     }

diff --git a/mir-module/pom.xml b/mir-module/pom.xml
@@ -196,6 +196,10 @@
       <groupId>org.mycore</groupId>
       <artifactId>mycore-classifications</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.mycore</groupId>
+      <artifactId>mycore-jobqueue</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
       <artifactId>mycore-mods</artifactId>

diff --git a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigrateStaticHistoryContent.java b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigrateStaticHistoryContent.java
@@ -0,0 +1,66 @@
+package org.mycore.mir.migration;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.servlet.ServletContext;
+import org.mycore.backend.jpa.MCREntityManagerProvider;
+import org.mycore.common.events.MCRStartupHandler.AutoExecutable;
+import org.mycore.services.queuedjob.MCRJob;
+import org.mycore.services.queuedjob.MCRJobQueue;
+import org.mycore.services.queuedjob.MCRJobQueueManager;
+import org.mycore.services.queuedjob.MCRJobStatus;
+import org.mycore.services.queuedjob.MCRJob_;
+import org.mycore.util.concurrent.MCRTransactionableRunnable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Class creates {@link MCRJob} in {@link MCRJobQueue} that migrates all static history content.
+ *
+ * @author shermann (Silvio Hermann)
+ * */
+public class MIRMigrateStaticHistoryContent implements AutoExecutable {
+
+    @Override
+    public String getName() {
+        return MIRMigrateStaticHistoryContent.class.getName();
+    }
+
+    @Override
+    public int getPriority() {
+        return Integer.MIN_VALUE;
+    }
+
+    @Override
+    public void startUp(ServletContext servletContext) {
+        MCRTransactionableRunnable runnable = new MCRTransactionableRunnable(() -> {
+            if (!alreadyDone()) {
+                MCRJobQueueManager
+                    .getInstance()
+                    .getJobQueue(MIRMigrateStaticHistoryContentJobAction.class)
+                    .offer(new MCRJob(MIRMigrateStaticHistoryContentJobAction.class));
+            }
+        });
+        new Thread(runnable).start();
+    }
+
+    private boolean alreadyDone() {
+        EntityManager manager = MCREntityManagerProvider.getCurrentEntityManager();
+        CriteriaBuilder builder = manager.getCriteriaBuilder();
+        CriteriaQuery<MCRJob> criteria = builder.createQuery(MCRJob.class);
+        Root<MCRJob> root = criteria.from(MCRJob.class);
+
+        List<Predicate> predicates = new ArrayList<Predicate>();
+        predicates.add(builder.equal(root.get(MCRJob_.action), MIRMigrateStaticHistoryContentJobAction.class));
+        predicates.add(builder.equal(root.get(MCRJob_.status), MCRJobStatus.FINISHED));
+
+        criteria.where(predicates.toArray(new Predicate[] {}));
+        List<MCRJob> resultList = manager.createQuery(criteria).getResultList();
+
+        return resultList.size() > 0;
+    }
+}
diff --git a/...odule/src/main/java/org/mycore/mir/migration/MIRMigrateStaticHistoryContentJobAction.java b/...odule/src/main/java/org/mycore/mir/migration/MIRMigrateStaticHistoryContentJobAction.java
@@ -0,0 +1,89 @@
+package org.mycore.mir.migration;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
+import org.mycore.common.config.MCRConfiguration2;
+import org.mycore.datamodel.metadata.MCRMetadataManager;
+import org.mycore.datamodel.metadata.MCRObjectID;
+import org.mycore.services.queuedjob.MCRJob;
+import org.mycore.services.queuedjob.MCRJobAction;
+import org.mycore.services.queuedjob.staticcontent.MCRJobStaticContentGenerator;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * Class converts all static history content on start up automatically.
+ *
+ * @author shermann (Silvio Hermann)
+ * */
+public class MIRMigrateStaticHistoryContentJobAction extends MCRJobAction {
+    private Path staticHistoryPath;
+    private Logger logger;
+
+    public MIRMigrateStaticHistoryContentJobAction(MCRJob job) {
+        super(job);
+        logger = LogManager.getLogger(MIRMigrateStaticHistoryContentJobAction.class);
+
+        staticHistoryPath = Path.of(
+            MCRConfiguration2.getStringOrThrow("MCR.Object.Static.Content.Default.Path") + File.separator
+                + "mir-history");
+    }
+
+    @Override
+    public void execute() throws ExecutionException {
+        try {
+            SAXBuilder builder = new SAXBuilder();
+            Files.walkFileTree(staticHistoryPath, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    String filename = file.getFileName().toString();
+                    String id = filename.substring(0, filename.lastIndexOf('.'));
+
+                    if (!MCRObjectID.isValid(id)) {
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    try (InputStream is = Files.newInputStream(file)) {
+                        Document history = builder.build(is);
+                        if ("table".equals(history.getRootElement().getName())) {
+                            logger.info("Migrating static history for object {}", id);
+                            MCRJobStaticContentGenerator generator = new MCRJobStaticContentGenerator(
+                                "mir-history");
+                            generator.generate(MCRMetadataManager.retrieveMCRObject(MCRObjectID.getInstance(id)));
+                        }
+                    } catch (Exception e) {
+                        logger.error("Could not migrate static mcr-history for file {}", file.getFileName(), e);
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        } catch (IOException e) {
+            logger.error("Error occurred during migration of static history content", e);
+        }
+    }
+
+    @Override
+    public boolean isActivated() {
+        return true;
+    }
+
+    @Override
+    public String name() {
+        return MIRMigrateStaticHistoryContent.class.getName();
+    }
+
+    @Override
+    public void rollback() {
+        //not implemented
+    }
+}
diff --git a/mir-module/src/main/resources/META-INF/resources/js/ckeditor-config.js b/mir-module/src/main/resources/META-INF/resources/js/ckeditor-config.js
@@ -1,5 +1,7 @@
 CKEDITOR.editorConfig = function( config ) {
 
+    config.versionCheck = false;
+
     config.extraPlugins = 'notification,wordcount';
 
     config.toolbar = JSON.parse(window["MIR.WebConfig.Editor.CKEditor.Toolbar"] || "{}");
@@ -24,4 +26,4 @@ CKEDITOR.editorConfig = function( config ) {
         pasteWarningDuration: window["MIR.WebConfig.Editor.CKEditor.Wordcount.PasteWarningDuration"] || 0
     };
 
-};
+};
diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties
@@ -180,7 +180,7 @@ mir.editor.subject.provider.variantName                     = Namensvarianten
 mir.editor.subject.provider.website                        = Webseite
 mir.editor.subject.provider.gndLink                        = GND-Link
 mir.editor.subject.provider.place.biographicalOrHistoricalInformation = Biographische oder historische Informationen
-
+mir.metaData.detailBox.by = von
 
 mir.subject.bagde.gnd = GND
 mir.subject.bagde.lcsh = LCSH

diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties
@@ -174,7 +174,7 @@ mir.editor.subject.provider.variantName                     = Variant Name
 mir.editor.subject.provider.website                        = Website
 mir.editor.subject.provider.gndLink                        = GND Link
 mir.editor.subject.provider.place.biographicalOrHistoricalInformation = Biographical or Historical Information
-
+mir.metaData.detailBox.by = by
 img.alt.search.complex = complex search
 img.alt.search.simple  = simple search
 

diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -723,12 +723,9 @@ MCR.URIResolver.xslImports.modsmeta=%MCR.URIResolver.xslImports.modsmeta%,toc/my
 # Static content                                                             #
 ##############################################################################
 MCR.ContentTransformer.mir-history.Stylesheet=xsl/metadata/static/mir-history-static.xsl
-MCR.ContentTransformer.mir-admindata-box.Stylesheet=xsl/metadata/static/mir-admindata-box-static.xsl
 
 MCR.Object.Static.Content.Generator.mir-history.Class=org.mycore.services.queuedjob.staticcontent.MCRJobStaticContentGenerator
 MCR.Object.Static.Content.Generator.mir-history.Transformer=mir-history
-MCR.Object.Static.Content.Generator.mir-admindata-box.Class=org.mycore.services.queuedjob.staticcontent.MCRJobStaticContentGenerator
-MCR.Object.Static.Content.Generator.mir-admindata-box.Transformer=mir-admindata-box
 
 ##############################################################################
 # Workflow                                                                   #
@@ -769,6 +766,11 @@ MIR.Viewer.DisableDerivateType=thumbnail
 ##############################################################################
 MIR.CanonicalBaseURL=
 
+##############################################################################
+# Files per page in metadata view                                            #
+##############################################################################
+MIR.FileBrowser.FilesPerPage=10
+
 ##############################################################################
 # Sherpa Romeo API - details see https://v2.sherpa.ac.uk/api/                #
 ##############################################################################
@@ -783,3 +785,5 @@ MIR.Response.Facet.mods.genre.ClassId=mir_genres
 
 MCR.ContentTransformer.svg-download.Class      = org.mycore.common.content.transformer.MCRXSLTransformer
 MCR.ContentTransformer.svg-download.Stylesheet = xslt/generate-svg-by-type.xsl
+
+MCR.Startup.Class = %MCR.Startup.Class%,org.mycore.mir.migration.MIRMigrateStaticHistoryContent
diff --git a/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl b/mir-module/src/main/resources/xsl/layout/mir-common-layout.xsl
@@ -18,7 +18,7 @@
   <xsl:param name="breadCrumb" />
   <xsl:param name="MCR.Metadata.Languages" select="'de'" />
   <xsl:param name="mcruser" select="document('user:current')/user"/>
-  <xsl:param name="MIR.Layout.usermenu.realname.enabled" select="false()"/>
+  <xsl:param name="MIR.Layout.usermenu.realname.enabled" select="'false'"/>
 
   <xsl:include href="layout/mir-layout-utils.xsl" />
   <xsl:include href="resource:xsl/layout/mir-navigation.xsl" />
@@ -64,7 +64,7 @@
           <a id="currentUser" class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
             <strong>
               <xsl:choose>
-                <xsl:when test="$MIR.Layout.usermenu.realname.enabled = false()">
+                <xsl:when test="$MIR.Layout.usermenu.realname.enabled != 'true'">
                   <xsl:value-of select="$mcruser/@name"/>
                 </xsl:when>
                 <xsl:otherwise>