Merge branch 'develop' of [email protected]:goobi-viewer/goobi-v…

…iewer-core.git into develop
intranda · Jan 22, 2025 · ddf61a7 · ddf61a7
2 parents 4634cb4 + b68ae0a
commit ddf61a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
@@ -70,7 +70,7 @@
 		<sonar.java.target>21</sonar.java.target>
 
 		<!-- Checkstyle -->
-		<checkstyle.max.violations>50</checkstyle.max.violations>
+		<checkstyle.max.violations>40</checkstyle.max.violations>
 		<skipCheckstyle>true</skipCheckstyle>
 
 		<!-- Manifest information -->
@@ -882,6 +882,7 @@
 						<id>analyze</id>
 						<goals>
 							<goal>analyze-only</goal>
+							<goal>properties</goal>
 						</goals>
 						<configuration>
 							<failOnWarning>true</failOnWarning>
@@ -893,9 +894,6 @@
 								<ignoredUsedUndeclaredDependency>io.swagger.core.v3:swagger-annotations</ignoredUsedUndeclaredDependency>
 								<ignoredUsedUndeclaredDependency>io.swagger.core.v3:swagger-models</ignoredUsedUndeclaredDependency>
 
-								<!-- Used by iiif-api-model -->
-								<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
-
 								<ignoredUsedUndeclaredDependency>org.glassfish.hk2.external:jakarta.inject</ignoredUsedUndeclaredDependency>
 							</ignoredUsedUndeclaredDependencies>
 
@@ -930,9 +928,6 @@
 								<ignoredUnusedDeclaredDependency>jakarta.enterprise:jakarta.enterprise.cdi-api</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>jakarta.enterprise:jakarta.enterprise.cdi-el-api</ignoredUnusedDeclaredDependency>
 
-								<!-- bind-api is required for Jersey -->
-								<ignoredUnusedDeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUnusedDeclaredDependency>
-
 								<!-- org.citationstyles.* are runtime resources for citeproc -->
 								<ignoredUnusedDeclaredDependency>org.citationstyles:locales</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>org.citationstyles:styles</ignoredUnusedDeclaredDependency>
@@ -1017,7 +1012,8 @@
 					</excludes>
 					<systemPropertyVariables>
 						<java.util.logging.config.file>src/test/resources/log4j2.test.xml</java.util.logging.config.file>
-					</systemPropertyVariables>
+                    </systemPropertyVariables>
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/...-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml b/...-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml
@@ -78,6 +78,7 @@
 
 
 							<ui:fragment rendered="#{messageQueueBean.queueContent.size() > 0}">
+							    <!-- Use <button> instead of <a> here to avoid error with OmniFaces -->
 							    <button class="admin__tasks-icon-wrapper"
 							        title="#{msg.admin__tasks__clear_all_button_tooltip}"
 							        data-toggle="tooltip" data-placement="top" data-trigger="hover"
@@ -94,22 +95,6 @@
                                     </div>
                                     <f:ajax execute="@form" render="@form" />
 							    </button>
-<!-- 								<a class="admin__tasks-icon-wrapper" -->
-<!-- 									title="#{msg.admin__tasks__clear_all_button_tooltip}" -->
-<!-- 									data-toggle="tooltip" data-placement="top" data-trigger="hover" -->
-<!-- 									jsf:action="#{messageQueueBean.clearQueue}" jsf:id="clearButton" -->
-<!-- 									data-require-confirmation="true" -->
-<!-- 									data-confirmation-text="#{msg.admin__tasks__clear_all_button_confirmation}" -->
-<!-- 									aria-label="#{msg.admin__tasks__clear_all_button_confirmation}"> -->
-<!-- 									<div class="admin__tasks-clear-all"></div> -->
-<!-- 									<div class="admin__tasks-icon"> -->
-<!-- 										<div -->
-<!-- 											class="admin__tasks-button-trash #{messageQueueBean.paused ? '-hidden' : '-active'}"> -->
-<!-- 											<i class="fa fa-times"></i> -->
-<!-- 										</div> -->
-<!-- 									</div> -->
-<!-- 									<f:ajax execute="@form" render="@form" /> -->
-<!-- 								</a> -->
 							</ui:fragment>
 
 

diff --git a/...resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml b/...resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml
@@ -141,8 +141,8 @@
 
                                     <!-- ACTIVE FACETS -->
                                     <c:forEach items="#{searchBean.facets.getActiveFacetsForField(field.key)}" var="facet">
-                                        <li class="active">
-                                            <h:commandLink action="#{searchBean.removeFacetAction(facet.link)}" title="#{msg.removeFacet}">
+                                        <li class="widget-search-facets__list-item active">
+                                            <h:commandLink styleClass="widget-search-facets__list-item-link" action="#{searchBean.removeFacetAction(facet.link)}" title="#{msg.removeFacet}">
                                                 <div class="row">
                                                     <div class="col-11">#{facet.translatedLabel}</div>
                                                     <div class="col-1">
@@ -158,10 +158,10 @@
 
                                     <!-- AVAILABLE FACETS -->
                                     <ui:repeat value="#{searchBean.facets.getLimitedFacetListForField(field.key)}" var="facet">
-                                        <li>
-                                            <h:outputLink
+                                        <li class="widget-search-facets__list-item">
+                                            <h:outputLink styleClass="widget-search-facets__list-item-link"
                                                 value="#{navigationHelper.getSearchUrl(searchBean.activeSearchType, cc.attrs.cmsPage)}/#{searchBean.activeResultGroupName}/#{searchBean.exactSearchString}/1/#{searchBean.sortString}/#{searchBean.facets.activeFacetStringPrefix}#{facet.urlEscapedLink}/">
-                                                #{facet.translatedLabel} (#{facet.count})
+                                                <span class="widget-search-facets__list-item-label">#{facet.translatedLabel}</span>  <span class="widget-search-facets__list-item-count">(#{facet.count})</span>
                                                 <f:passThroughAttribute name="aria-label" value="#{msg[field.key.concat('_DD')]}: #{facet.translatedLabel}" />
                                             </h:outputLink>
                                         </li>