Skip to content

MCR-3551 Allow hiding of publicly available derivates #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
toKrause wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

MCR-3551 Allow hiding of publicly available derivates #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion mir-module/src/main/java/org/mycore/mir/authorization/MIRStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jdom2.filter.Filters;
import org.jdom2.xpath.XPathExpression;
import org.jdom2.xpath.XPathFactory;
import org.mycore.access.MCRAccessInterface;
import org.mycore.access.MCRAccessManager;
import org.mycore.access.strategies.MCRAccessCheckStrategy;
Expand All @@ -24,8 +27,10 @@
import org.mycore.backend.jpa.access.MCRACCESSPK_;
import org.mycore.backend.jpa.access.MCRACCESS_;
import org.mycore.common.MCRCache;
import org.mycore.common.MCRConstants;
import org.mycore.common.MCRException;
import org.mycore.common.config.MCRConfiguration2;
import org.mycore.common.xml.MCRURIResolver;
import org.mycore.datamodel.classifications2.MCRCategLinkReference;
import org.mycore.datamodel.classifications2.MCRCategLinkService;
import org.mycore.datamodel.classifications2.MCRCategLinkServiceFactory;
Expand Down Expand Up @@ -167,7 +172,28 @@ private boolean checkDerivatePermission(MCRObjectID derivateId, String permissio
MCRAccessManager.PERMISSION_DELETE.equalsIgnoreCase(permission)) {
final boolean hasRegisteredPI = hasRegisteredPI(objectId);
if (hasRegisteredPI && !canEditPI()) {
return false;

XPathFactory xpathFactory = XPathFactory.instance();
XPathExpression<Boolean> exportedXpath = xpathFactory
.compile(".//category/label[lang('x-export')]/@text='false'",
Filters.fboolean(), null, MCRConstants.XML_NAMESPACE);

// allow modification of hidden derivates even after a PI has been registered
boolean hidden = MCRMetadataManager.retrieveMCRDerivate(derivateId)
.getDerivate()
.getClassifications()
.stream()
.filter(classification -> classification.getClassId().equals("derivate_types"))
.map(classification -> MCRURIResolver.obtainInstance()
.resolve("classification:metadata:0:children:derivate_types:" + classification.getCategId()))
.map(derivateTypeElement -> exportedXpath.evaluate(derivateTypeElement).get(0))
.findAny()
.orElse(false);

if (!hidden) {
return false;
}

}
}

Expand Down
122 changes: 63 additions & 59 deletions mir-module/src/main/resources/xsl/metadata/mir-collapse-files.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,71 +59,75 @@
<xsl:variable name="derId" select="@xlink:href" />
<xsl:variable name="derivateXML" select="document(concat('mcrobject:',$derId))" />
<xsl:variable name="derivateType" select="$derivateXML/mycorederivate/derivate/classifications/classification[@classid='derivate_types']/@categid" />
<div id="files{@xlink:href}" class="file_box">
<div class="row header">
<div class="col-12">
<div class="headline">
<div class="title">
<a class="btn btn-primary btn-sm file_toggle dropdown-toggle" data-bs-toggle="collapse" href="#collapse{@xlink:href}" aria-expanded="false" aria-controls="collapse{@xlink:href}">
<span>
<xsl:choose>
<xsl:when test="$derivateXML//titles/title[@xml:lang=$CurrentLang]">
<xsl:value-of select="$derivateXML//titles/title[@xml:lang=$CurrentLang]" />
</xsl:when>
<xsl:when test="string-length($derivateType)!=0">
<xsl:value-of select="mcr:getDisplayName('derivate_types',$derivateType)" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="i18n:translate('metadata.files.file')" />
</xsl:otherwise>
</xsl:choose>
</span>
<xsl:if test="position() > 1">
<span class="set_number">
<xsl:value-of select="position()" />
<xsl:variable name="derivateDisplayed" select="not(document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-display')]/@text='false')" />

<xsl:if test="$derivateDisplayed or key('rights', $derId)/@write">
<div id="files{@xlink:href}" class="file_box">
<div class="row header">
<div class="col-12">
<div class="headline">
<div class="title">
<a class="btn btn-primary btn-sm file_toggle dropdown-toggle" data-bs-toggle="collapse" href="#collapse{@xlink:href}" aria-expanded="false" aria-controls="collapse{@xlink:href}">
<span>
<xsl:choose>
<xsl:when test="$derivateXML//titles/title[@xml:lang=$CurrentLang]">
<xsl:value-of select="$derivateXML//titles/title[@xml:lang=$CurrentLang]" />
</xsl:when>
<xsl:when test="string-length($derivateType)!=0">
<xsl:value-of select="mcr:getDisplayName('derivate_types',$derivateType)" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="i18n:translate('metadata.files.file')" />
</xsl:otherwise>
</xsl:choose>
</span>
</xsl:if>
</a>
<xsl:if test="position() > 1">
<span class="set_number">
<xsl:value-of select="position()" />
</span>
</xsl:if>
</a>
</div>
<xsl:apply-templates select="." mode="derivateActions">
<xsl:with-param name="deriv" select="@xlink:href" />
<xsl:with-param name="parentObjID" select="$objID" />
</xsl:apply-templates>
<div class="clearfix" />
</div>
<xsl:apply-templates select="." mode="derivateActions">
<xsl:with-param name="deriv" select="@xlink:href" />
<xsl:with-param name="parentObjID" select="$objID" />
</xsl:apply-templates>
<div class="clearfix" />
</div>
</div>
</div>
<xsl:choose>
<xsl:when test="key('rights', @xlink:href)/@read">
<xsl:variable name="maindoc" select="$derivateXML/mycorederivate/derivate/internals/internal/@maindoc" />
<div class="file_box_files" data-objID="{$objID}" data-deriID="{$derId}" data-mainDoc="{$maindoc}" data-writedb="{acl:checkPermission($derId,'writedb')}" data-deletedb="{acl:checkPermission($derId,'deletedb')}" data-numperpage="{$MIR.FileBrowser.FilesPerPage}">
<xsl:if test="acl:checkPermission($derId,'read')">
<xsl:attribute name="data-jwt">
<xsl:value-of select="'required'" />
</xsl:attribute>
</xsl:if>
<div class="filelist-loading">
<div class="bounce1"></div>
<div class="bounce2"></div>
<div class="bounce3"></div>
<xsl:choose>
<xsl:when test="key('rights', @xlink:href)/@read">
<xsl:variable name="maindoc" select="$derivateXML/mycorederivate/derivate/internals/internal/@maindoc" />
<div class="file_box_files" data-objID="{$objID}" data-deriID="{$derId}" data-mainDoc="{$maindoc}" data-writedb="{acl:checkPermission($derId,'writedb')}" data-deletedb="{acl:checkPermission($derId,'deletedb')}" data-numperpage="{$MIR.FileBrowser.FilesPerPage}">
<xsl:if test="acl:checkPermission($derId,'read')">
<xsl:attribute name="data-jwt">
<xsl:value-of select="'required'" />
</xsl:attribute>
</xsl:if>
<div class="filelist-loading">
<div class="bounce1"></div>
<div class="bounce2"></div>
<div class="bounce3"></div>
</div>
</div>
</div>
<noscript>
<br />
<a href="{$ServletsBaseURL}MCRFileNodeServlet/{$derId}/">
<xsl:value-of select="i18n:translate('metadata.files.toDerivate')" />
</a>
</noscript>
</xsl:when>
<xsl:otherwise>
<div id="collapse{@xlink:href}" class="row body collapse in show">
<div class="col-12">
<xsl:value-of select="i18n:translate('mir.derivate.no_access')" />
<noscript>
<br />
<a href="{$ServletsBaseURL}MCRFileNodeServlet/{$derId}/">
<xsl:value-of select="i18n:translate('metadata.files.toDerivate')" />
</a>
</noscript>
</xsl:when>
<xsl:otherwise>
<div id="collapse{@xlink:href}" class="row body collapse in show">
<div class="col-12">
<xsl:value-of select="i18n:translate('mir.derivate.no_access')" />
</div>
</div>
</div>
</xsl:otherwise>
</xsl:choose>
</div>
</xsl:otherwise>
</xsl:choose>
</div>
</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
Expand Down
10 changes: 7 additions & 3 deletions mir-module/src/main/resources/xsl/mods2epicur.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@

<xsl:variable name="ifsTemp" xmlns="">
<xsl:for-each select="mycoreobject/structure/derobjects/derobject[acl:checkDerivateContentPermission(@xlink:href, 'read')]">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
<xsl:variable name="derivateType" select="classification[@classid='derivate_types']/@categid" />
<xsl:variable name="derivateExported" select="not(document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-export')]/@text='false')" />
<xsl:if test="$derivateExported">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="ifs" select="xalan:nodeset($ifsTemp)" />
Expand Down
10 changes: 7 additions & 3 deletions mir-module/src/main/resources/xsl/mods2oai_dc.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@

<xsl:variable name="ifsTemp">
<xsl:for-each select="structure/derobjects/derobject[acl:checkDerivateContentPermission(@xlink:href, 'read')]">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
<xsl:variable name="derivateType" select="classification[@classid='derivate_types']/@categid" />
<xsl:variable name="derivateExported" select="not(document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-export')]/@text='false')" />
<xsl:if test="$derivateExported">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="ifs" select="xalan:nodeset($ifsTemp)" />
Expand Down
10 changes: 7 additions & 3 deletions mir-module/src/main/resources/xsl/mods2xMetaDissPlus.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,13 @@

<xsl:variable name="ifsTemp">
<xsl:for-each select="mycoreobject/structure/derobjects/derobject[acl:checkDerivateContentPermission(@xlink:href, 'read')]">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
<xsl:variable name="derivateType" select="classification[@classid='derivate_types']/@categid" />
<xsl:variable name="derivateHidden" select="document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-hidden')]/@text='true'" />
<xsl:if test="not($derivateHidden)">
<der id="{@xlink:href}">
<xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
</der>
</xsl:if>
</xsl:for-each>
</xsl:variable>
<xsl:variable name="ifs" select="xalan:nodeset($ifsTemp)" />
Expand Down