Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@kosarko
Copy link

@kosarko kosarko commented Jun 11, 2025

port of ufal#1215

Summary by CodeRabbit

  • New Features

    • Email notifications now consistently use the repository's short name and dynamically display the helpdesk phone number from configuration where available.
    • Sample OAI identifier values are now configurable for greater flexibility.
  • Bug Fixes

    • Submission forms updated to correctly allow or restrict multiple entries for specific metadata fields.
  • Documentation

    • Deposit license agreements replaced with detailed, legally-structured versions in both English and Czech.
  • Chores

    • Improved branding consistency across all user-facing email templates.
    • Updated DSpace version display to clarify CLARIN-DSpace branding.

kosarko added 7 commits June 11, 2025 13:33
Fix test

(cherry picked from commit 6cdf2d1)
dspace.name can be a long string not fit for Email subjects nor
signatures

(cherry picked from commit 98d60dd)
(cherry picked from commit 4a2b65f)
Phone is now conditional in the templates.
Use `mail.message.helpdesk.telephone` if you want it.

The change in the *.java files is to preserve the params counts. The
relevant templates are getting the phone directly from config

(cherry picked from commit cba5695)
some validators use this value, should be a real id in prod deployments

(cherry picked from commit 912f13f)
(cherry picked from commit ba23878)
Get rid of setting the jsse.enableSNIExtension property which causes
issues with handle minting

(cherry picked from commit 7d03173)
@coderabbitai
Copy link

coderabbitai bot commented Jun 11, 2025

Walkthrough

This update modifies configuration keys and values across multiple email templates, properties, and license files, standardizing the use of dspace.shortname and updating helpdesk phone number sourcing. License texts are replaced with formal agreements in English and Czech. Submission form field repeatability and requirements are adjusted, and minor code changes update configuration key usage and string prefixes.

Changes

File(s) Change Summary
dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java,
.../repository/ClarinUserMetadataRestController.java
Updated helpdesk phone config key from lr.help.phone to mail.message.helpdesk.telephone.
.../ClarinDiscoJuiceFeedsDownloadService.java Removed manipulation of jsse.enableSNIExtension system property during JSON download/processing.
.../converter/RootConverter.java,
.../converter/RootConverterTest.java
Changed DSpace version prefix from "DSpace " to "CLARIN-DSpace " in code and corresponding test.
dspace/config/clarin-dspace.cfg Removed lr.help.phone, added oai.sample.identifier property.
dspace/config/crosswalks/oai/description.xml Replaced hardcoded sample identifier with ${oai.sample.identifier} variable.
dspace/config/default.license Replaced placeholder license with detailed Deposit Licence Agreement (English).
dspace/config/default_cs.license Replaced brief license with formal deposition license agreement (Czech).
dspace/config/emails/* Standardized use of dspace.shortname over dspace.name in subjects/signatures; updated helpdesk phone sourcing to config; made phone number inclusion conditional in some templates.
dspace/config/submission-forms.xml,
dspace/config/submission-forms_cs.xml
Changed repeatability of "hidden" and "hasCMDI" fields to false, "language (iso)" to true; removed "sponsor" required tag.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant REST_Controller
    participant Config
    participant EmailTemplate

    User ->> REST_Controller: Triggers registration/download
    REST_Controller ->> Config: Fetch mail.message.helpdesk.telephone
    REST_Controller ->> EmailTemplate: Populate template with config values
    EmailTemplate -->> User: Sends email with dynamic helpdesk info
Loading

Suggested reviewers

  • vidiecan
  • milanmajchrak

Poem

In the warren, wires hum anew,
Short names and phone lines shining through.
Licenses formal, both Czech and in rhyme,
Submission forms pruned, all fields in line.
Rabbits rejoice, for clarity reigns—
With every hop, less config pain!
🐇✨

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🔭 Outside diff range comments (1)
dspace/config/clarin-dspace.cfg (1)

65-69: ⚠️ Potential issue

Missing mail.message.helpdesk.telephone configuration
Upstream code now fetches the helpdesk phone via mail.message.helpdesk.telephone, but this property isn’t defined here. Without it, phone numbers in controller emails will be blank.

Please add under the HELP DESK section, for example:

 lr.help.mail = [email protected]
+mail.message.helpdesk.telephone = +1-800-123-4567
♻️ Duplicate comments (11)
dspace/config/emails/request_item.author (3)

14-14: Replace email subject key with dspace.shortname
Consistent update from dspace.name to dspace.shortname.


18-18: Use dspace.shortname in body copy
Aligns with standardized instance naming.


32-32: Update signature to reference dspace.shortname
Maintains consistency across templates.

dspace/config/emails/submit_archive (3)

7-7: Subject line switched to dspace.shortname
Replaced full instance name with short name in the subject.


13-13: Body text now uses dspace.shortname
Correctly reflects the updated configuration property.


21-21: Signature line updated to dspace.shortname
Consistent with other email templates.

dspace/config/emails/request_item.admin (2)

11-11: Email subject updated to use dspace.shortname
Standardizes on the short name for instance identification.


20-20: Signature updated to dspace.shortname
Follows the new naming convention.

dspace/config/emails/register (3)

7-7: Subject line now uses dspace.shortname
Switches from the full name to the configured short name.


9-9: Body prompt updated to reference dspace.shortname
Ensures consistency in user-facing messages.


18-18: Signature line switched to dspace.shortname
Keeps branding uniform across emails.

🧹 Nitpick comments (11)
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java (1)

39-39: Avoid hard-coding the distribution prefix

Embedding "CLARIN-DSpace " directly in the code makes re-branding or downstream forks harder. Consider exposing the prefix via configuration (e.g. dspace.distribution.name) or at least a static final String constant so other classes/tests can reuse it without duplication.

dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsDownloadService.java (1)

116-118: Minor efficiency nitpick

shrink() is invoked on the JSONArray only to have its result immediately wrapped by toMap().
Both methods iterate over the same collection, doubling the traversal cost.
If you keep shrink(), consider moving the “shrink” logic inside downloadJSON or merging the two loops to avoid an extra pass.

dspace/config/emails/submit_task (1)

19-20: Hard-coding “My DSpace” loses branding flexibility

The previous ${config.get('dspace.shortname')} interpolation allowed “My ” to adapt automatically for branded forks (“My CLARIN”, etc.). Hard-coding "My DSpace" removes that flexibility and breaks white-labelling. Consider reverting to:

-To claim this task, please visit your "My DSpace"
+To claim this task, please visit your "My ${config.get('dspace.shortname')}"
dspace/config/emails/clarin_download_link (3)

14-16: Use idiomatic Velocity syntax when setting $phone.

The current directive nests the expression in ${…}, which is unnecessary and occasionally confuses Velocity’s parser. Prefer the direct accessor call:

-#set($phone = ${config.get('mail.message.helpdesk.telephone')})
+#set($phone = $config.get('mail.message.helpdesk.telephone'))

1-11: Header still claims phone comes from {4} parameter – update docs to avoid confusion.

Now that the phone number is sourced from configuration, {4} is unused. Update the comment block to keep implementers in sync with reality.


23-26: Minor phrasing/format duplication.

You repeat the “or call us at” block twice (body + footer). That’s fine, but consider whether both are needed; otherwise readers see identical information twice in close proximity.

Also applies to: 35-37

dspace/config/emails/clarin_autoregistration (3)

12-14: Same $phone assignment style issue as other template.

-#set($phone = ${config.get('mail.message.helpdesk.telephone')})
+#set($phone = $config.get('mail.message.helpdesk.telephone'))

4-8: Parameter list out-of-date.

The header still lists {2} as “helpdesk phone number”. Phone now comes from configuration, not params; please prune or renumber to prevent future off-by-one mistakes in callers.


18-22: DRY: consider extracting ‘contact us’ snippet.

The phone / email block is duplicated across multiple templates. A small Velocity macro (e.g. #contactBlock()) would reduce copy-paste and keep future edits consistent.

Also applies to: 30-32

dspace/config/emails/share_submission (2)

7-9: Quote style for $phone retrieval.

-#set($phone = ${config.get('mail.message.helpdesk.telephone')})
+#set($phone = $config.get('mail.message.helpdesk.telephone'))

12-16: Repeated “contact us” fragment – extract or centralise.

As with the other templates, the phone/email block is duplicated here. Consider a shared macro to enforce consistency and ease maintenance.

Also applies to: 24-26

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between db5ae18 and 0b227e0.

📒 Files selected for processing (35)
  • dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java (1 hunks)
  • dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsDownloadService.java (1 hunks)
  • dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java (1 hunks)
  • dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java (1 hunks)
  • dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/RootConverterTest.java (1 hunks)
  • dspace/config/clarin-dspace.cfg (1 hunks)
  • dspace/config/crosswalks/oai/description.xml (1 hunks)
  • dspace/config/default.license (1 hunks)
  • dspace/config/default_cs.license (1 hunks)
  • dspace/config/emails/change_password (2 hunks)
  • dspace/config/emails/clarin_autoregistration (2 hunks)
  • dspace/config/emails/clarin_download_link (2 hunks)
  • dspace/config/emails/clarin_download_link_admin (2 hunks)
  • dspace/config/emails/doi_maintenance_error (1 hunks)
  • dspace/config/emails/export_error (1 hunks)
  • dspace/config/emails/export_success (1 hunks)
  • dspace/config/emails/feedback (2 hunks)
  • dspace/config/emails/flowtask_notify (2 hunks)
  • dspace/config/emails/harvesting_error (2 hunks)
  • dspace/config/emails/healthcheck (1 hunks)
  • dspace/config/emails/internal_error (1 hunks)
  • dspace/config/emails/register (2 hunks)
  • dspace/config/emails/registration_notify (1 hunks)
  • dspace/config/emails/request_item.admin (2 hunks)
  • dspace/config/emails/request_item.author (2 hunks)
  • dspace/config/emails/request_item.granted (2 hunks)
  • dspace/config/emails/request_item.rejected (2 hunks)
  • dspace/config/emails/share_submission (1 hunks)
  • dspace/config/emails/submit_archive (1 hunks)
  • dspace/config/emails/submit_reject (2 hunks)
  • dspace/config/emails/submit_task (2 hunks)
  • dspace/config/emails/subscriptions_content (1 hunks)
  • dspace/config/emails/welcome (2 hunks)
  • dspace/config/submission-forms.xml (3 hunks)
  • dspace/config/submission-forms_cs.xml (3 hunks)
🔇 Additional comments (43)
dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/RootConverterTest.java (1)

55-55: Expectation updated correctly – LGTM
The assertion now matches the new runtime value; the test remains deterministic.

dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinDiscoJuiceFeedsDownloadService.java (1)

120-127: Thread-safety caveat

rewriteCountries is a shared HashSet that may be modified in afterPropertiesSet() but read here via a lambda on every call.
If createFeedsContent() can run concurrently with a reload of configuration (e.g. in a Spring @RefreshScope context) this could lead to a visibility issue.
Declaring rewriteCountries as volatile or wrapping it in an immutable set after initialisation would guarantee safe publication.

dspace/config/clarin-dspace.cfg (1)

321-323: Add new OAI sample identifier property
The new oai.sample.identifier setting cleanly externalizes the hardcoded sample ID. Ensure the placeholder variables (${oai.identifier.prefix} and ${handle.prefix}) are defined elsewhere in your base configuration.

dspace/config/crosswalks/oai/description.xml (1)

5-5: Use configurable OAI sample identifier
Replacing the inline ID with ${oai.sample.identifier} correctly delegates the pattern to the config.

dspace/config/emails/export_error (2)

9-9: Switch subject prefix to dspace.shortname
This aligns with other templates’ branding change from full name to short name.


16-16: Update signature to use dspace.shortname
Consistent use of the shortname property in the signature.

dspace/config/emails/healthcheck (1)

6-6: Use dspace.shortname in healthcheck subject
Subject line updated to reflect the short instance name.

dspace/config/emails/internal_error (1)

13-13: Replace dspace.name with dspace.shortname in subject
Ensures consistent shortname usage across error notifications.

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java (1)

289-291: Ensure new helpdesk phone config key is present
Updated to fetch "mail.message.helpdesk.telephone" instead of the old "lr.help.phone". Confirm this property is defined in your configuration files to avoid empty phone numbers in emails.

dspace/config/emails/submit_reject (2)

9-9: Standardize subject to use shortname
Replaced ${config.get('dspace.name')} with ${config.get('dspace.shortname')} for branding consistency in the subject line.


22-22: Standardize signature to use shortname
Updated the closing signature to ${config.get('dspace.shortname')} Team to match the new naming convention.

dspace/config/emails/doi_maintenance_error (2)

13-13: Use shortname in DOI error subject
Subject now uses ${config.get('dspace.shortname')} instead of the full name for uniform email branding.


20-20: Use shortname in DOI error signature
Signature updated to ${config.get('dspace.shortname')} Team.

dspace/config/emails/subscriptions_content (1)

5-6: Replace full name with shortname in subscription emails
Subject and opening line now reference ${config.get('dspace.shortname')} instead of ${config.get('dspace.name')} to align with other templates.

dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java (1)

90-91: Update helpdesk phone config key
Switched to "mail.message.helpdesk.telephone". Verify this property exists in your configuration to ensure the phone number is populated in the registration emails.

dspace/config/emails/harvesting_error (2)

11-11: Standardize email subject to use short name
The subject prefix now correctly uses dspace.shortname for consistent branding.


22-22: Standardize email signature to use short name
The closing line now references dspace.shortname instead of the full instance name.

dspace/config/emails/request_item.granted (2)

11-11: Standardize email subject to use short name
Subject line updated to include dspace.shortname for uniform branding across notifications.


26-26: Standardize email signature to use short name
Signature updated to use dspace.shortname for consistency.

dspace/config/emails/registration_notify (2)

11-11: Standardize email subject to use short name
Subject line now leverages dspace.shortname to align with updated branding guidelines.


19-19: Standardize email signature to use short name
Signature line updated to reference dspace.shortname consistently.

dspace/config/emails/feedback (2)

13-13: Standardize email subject to use short name
Updated subject to include dspace.shortname for consistent email branding.


27-27: Standardize email signature to use short name
Signature now references dspace.shortname to match the new naming convention.

dspace/config/emails/welcome (2)

5-5: Standardize email subject to use short name
The welcome subject now uses dspace.shortname for uniform instance identification.


14-14: Standardize email signature to use short name
Signature updated to reference dspace.shortname in alignment with other templates.

dspace/config/emails/change_password (4)

7-7: Update email subject to use dspace.shortname
Replaces the old dspace.name key with the standardized dspace.shortname.


8-8: Source helpdesk phone number from new config key
The template now pulls the helpdesk number via mail.message.helpdesk.telephone, matching the broader configuration-driven approach.


9-9: Reference account name using dspace.shortname
Body line correctly reflects the short name for the instance.


21-21: Sign-off updated to use dspace.shortname
Signature line now aligns with the new naming convention.

dspace/config/emails/submit_task (1)

9-9: Consistency check for subject prefix formatting

"${config.get('dspace.shortname')}: …" is now used in many templates; good move. Just make sure dspace.shortname always ends without trailing whitespace/punctuation, otherwise subjects like "Repo : …" will appear.

dspace/config/emails/request_item.rejected (1)

11-11: Subject prefix update looks correct

Prefixing with ${config.get('dspace.shortname')} aligns with the new branding convention.

dspace/config/emails/export_success (1)

8-8: LGTM – consistent branding applied
No functional concerns.

dspace/config/emails/flowtask_notify (1)

10-10: Branding token updated correctly

Change mirrors the rest of the email templates; looks good.

dspace/config/emails/clarin_download_link_admin (1)

13-13: ⚠️ Potential issue

Velocity syntax – missing $ before config

#set($phone = ${config.get('mail.message.helpdesk.telephone')}) relies on brace interpolation outside of a quoted string, which Velocity does not parse the same way. Use the plain reference form:

-#set($phone = ${config.get('mail.message.helpdesk.telephone')})
+#set($phone = $config.get('mail.message.helpdesk.telephone'))

Without this, $phone will be set to the literal string "${config.get('mail.message.helpdesk.telephone')}".

Likely an incorrect or invalid review comment.

dspace/config/submission-forms.xml (4)

156-162: Enforce single-value for hidden field
Changing <repeatable> to false on the local.hidden field ensures it can only be set once per submission, matching the intended admin-only toggle behavior.


173-176: Restrict hasCMDI to one choice
Setting <repeatable> to false on the local.hasCMDI field correctly enforces a single-choice checkbox for CMDI upload.


223-230: Make sponsor field optional
Removing the <required> element from the local.sponsor field allows submissions without funding info. Verify this aligns with collection policies and that downstream form-map validation won’t break.


249-253: Support multiple languages
Updating <repeatable> to true for dc.language.iso under page two correctly permits multiple language entries per item.

dspace/config/submission-forms_cs.xml (3)

149-153: Restrict 'hidden' field to single entry
The <repeatable> flag for the local:hidden field has been changed to false, ensuring only one hide-flag per submission in the Czech locale.


166-168: Make 'hasCMDI' field non-repeatable
Aligns the local:hasCMDI field with the general configuration by setting <repeatable> to false.


239-241: Enable multiple language entries
The dc.language.iso field is now repeatable (true), allowing multiple language selections. Verify that the Czech submission UI supports multi-select for this field.

dspace/config/default_cs.license (1)

1-62: Comprehensive license agreement looks well-structured.

The Czech Deposit License Agreement properly establishes the legal framework for the LINDAT/CLARIAH-CZ repository with clear sections covering the preamble, subject matter, licensor declarations, and jurisdiction. The non-exclusive, worldwide, royalty-free terms are clearly stated.

dspace/config/default.license (1)

1-61: English license agreement properly mirrors the Czech version.

The English Deposit License Agreement maintains consistency with the Czech version, using appropriate legal terminology and the same structural framework. The agreement clearly establishes Charles University as the Administrator and defines the same non-exclusive, worldwide, royalty-free license terms.

Copy link
Collaborator

@milanmajchrak milanmajchrak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kosarko
Have you tested those emails?

@milanmajchrak milanmajchrak requested review from jr-rk and vidiecan and removed request for jr-rk June 11, 2025 14:13
@kosarko
Copy link
Author

kosarko commented Jun 11, 2025

@kosarko Have you tested those emails?

@milanmajchrak Frankly, I don't remember. So let's say "no"

@milanmajchrak
Copy link
Collaborator

@kosarko Have you tested those emails?

@milanmajchrak Frankly, I don't remember. So let's say "no"

Ok, we will test it.

@milanmajchrak milanmajchrak merged commit 1136183 into dataquest-dev:dtq-dev Jun 13, 2025
11 checks passed
milanmajchrak added a commit that referenced this pull request Jun 16, 2025
* UFAL/DOI - Added type of resource to data cite (#975)

* UFAL/The process output is not displayed because of S3 direct download (#971)

* Check if type is html (#983)

* Ufal dtq sync062025 (#985)

* we should identify as clarin-dspace

* update email templates to use dspace.shortname

* match v5 submission

* get rid of lr.help.phone

* Add option to configure oai sample identifier

* NRP deposit

* UFAL/Improve file preview generating (#972)

---------

Co-authored-by: milanmajchrak <[email protected]>

* Fix the file preview integration test (#989)

* The hasPreview method has been changed, but the IT wasn't updated correctly

---------

Co-authored-by: Paurikova2 <[email protected]>
Co-authored-by: Ondřej Košarko <[email protected]>
milanmajchrak added a commit that referenced this pull request Jul 10, 2025
* UFAL/DOI - Added type of resource to data cite (#975)

* UFAL/The process output is not displayed because of S3 direct download (#971)

* The S3 direct download is provided only for the files located in the ORIGINAL bundle

* Use constant for the ORIGINAL string value

* Check if type is html (#983)

* check if type is html

* added test for html mime type

* used static string for text/html, added check

* Ufal dtq sync062025 (#985)

* we should identify as clarin-dspace

Fix test

(cherry picked from commit 6cdf2d1)

* update email templates to use dspace.shortname

dspace.name can be a long string not fit for Email subjects nor
signatures

(cherry picked from commit 98d60dd)

* match v5 submission

(cherry picked from commit 4a2b65f)

* get rid of lr.help.phone

Phone is now conditional in the templates.
Use `mail.message.helpdesk.telephone` if you want it.

The change in the *.java files is to preserve the params counts. The
relevant templates are getting the phone directly from config

(cherry picked from commit cba5695)

* Add option to configure oai sample identifier

some validators use this value, should be a real id in prod deployments

(cherry picked from commit 912f13f)

* NRP deposit license

(cherry picked from commit ba23878)

* Fix ufal#1219

Get rid of setting the jsse.enableSNIExtension property which causes
issues with handle minting

(cherry picked from commit 7d03173)

* UFAL/Improve file preview generating (#972)

* get name and size from metadata and header of file, avoid input stream using

* remove temp file, checkstyle, do not load full file

* add { } after if

* added check for max preview file

* used ZipFile and TarArchived for filepreview generating

* added removed lines

* used 7z for zip and tar files

* removed 7z and used zip and tar entry

* improved file previrew generating speed, used string builder, xml builder, authorization only if is required

* checkstyle, return boolean from haspreview and previrews from getPreview, replaced return with continue

* fix problem with hibernate session

* fix .tar.gz generating

* skip fully entry for tar

* added indexes for speed up queries

* added license header

* named constant by upper case

* inicialized fileInfo, refactorization of code based on copilot review

---------

Co-authored-by: milanmajchrak <[email protected]>

* Fix the file preview integration test (#989)

* The hasPreview method has been changed, but the IT wasn't updated correctly

* Use the correct checkbox for the input field - use repeatable (#991)

* UFAL/EU Sponsor openaire id should not be required (#1001)

* EU Sponsor openaire id should not be required

* Not required also in the czech submission forms

* Logging error message while emailing users (#1000)

* Logging error message

---------

Co-authored-by: Matus Kasak <[email protected]>
Co-authored-by: milanmajchrak <[email protected]>

* UFAL/Teaching and clariah submissions does not have clarin-license (#1005)

* UFAL/Fix logging in LogoImportController (#1003)

* fix logging

* used formatter for msg

* UFAL/Update the resource policy rights when changing submitter (#1002)

* removed res policies for submitter and created newones when item is shared

* avoid magic number, use constant

* set submitter in existing res policies

* removed not used shared link

* UFAL/Added date to title when creating new version (#984)

* added date to versioned item title

* used more modern approach for getting current time

* renamed test

* used var for reusing

* UFAL/Item handle info in email after download request (#1006)

* Added item handle to email

* Exception when item not found

* Checked grammar

* Handled multiple items found by bitstream

* Using PID instead of handle

---------

Co-authored-by: Matus Kasak <[email protected]>

---------

Co-authored-by: Paurikova2 <[email protected]>
Co-authored-by: Ondřej Košarko <[email protected]>
Co-authored-by: Kasinhou <[email protected]>
Co-authored-by: Matus Kasak <[email protected]>
Co-authored-by: jurinecko <[email protected]>
kosarko added a commit to ufal/clarin-dspace that referenced this pull request Jul 14, 2025
dataquest-dev/dtq-dev sync

Syncing dtq-dev ~lindat-2025.07.16198085191. This contains the following changes:

UFAL/DOI - Added type of resource to data cite (dataquest-dev#975)
Check if type is html (dataquest-dev#983)
UFAL/Improve file preview generating (dataquest-dev#972)
UFAL/Fix logging in LogoImportController (dataquest-dev#1003)
UFAL/Update the resource policy rights when changing submitter (dataquest-dev#1002)
UFAL/Added date to title when creating new version (dataquest-dev#984)

UFAL/The process output is not displayed because of S3 direct download (dataquest-dev#971)
Fix the file preview integration test (dataquest-dev#989)
Use the correct checkbox for the input field - use repeatable (dataquest-dev#991)
UFAL/EU Sponsor openaire id should not be required (dataquest-dev#1001)

Logging error message while emailing users (dataquest-dev#1000)
UFAL/Item handle info in email after download request (dataquest-dev#1006)                                                                                                                                                                                             
Ufal dtq sync062025 (dataquest-dev#985)
Merge commit '33d330a' into HEAD

UFAL/Teaching and clariah submissions does not have clarin-license (dataquest-dev#1005)
milanmajchrak added a commit that referenced this pull request Jul 24, 2025
* UFAL/DOI - Added type of resource to data cite (#975)

* UFAL/The process output is not displayed because of S3 direct download (#971)

* The S3 direct download is provided only for the files located in the ORIGINAL bundle

* Use constant for the ORIGINAL string value

* Check if type is html (#983)

* check if type is html

* added test for html mime type

* used static string for text/html, added check

* Ufal dtq sync062025 (#985)

* we should identify as clarin-dspace

Fix test

(cherry picked from commit 6cdf2d1)

* update email templates to use dspace.shortname

dspace.name can be a long string not fit for Email subjects nor
signatures

(cherry picked from commit 98d60dd)

* match v5 submission

(cherry picked from commit 4a2b65f)

* get rid of lr.help.phone

Phone is now conditional in the templates.
Use `mail.message.helpdesk.telephone` if you want it.

The change in the *.java files is to preserve the params counts. The
relevant templates are getting the phone directly from config

(cherry picked from commit cba5695)

* Add option to configure oai sample identifier

some validators use this value, should be a real id in prod deployments

(cherry picked from commit 912f13f)

* NRP deposit license

(cherry picked from commit ba23878)

* Fix ufal#1219

Get rid of setting the jsse.enableSNIExtension property which causes
issues with handle minting

(cherry picked from commit 7d03173)

* UFAL/Improve file preview generating (#972)

* get name and size from metadata and header of file, avoid input stream using

* remove temp file, checkstyle, do not load full file

* add { } after if

* added check for max preview file

* used ZipFile and TarArchived for filepreview generating

* added removed lines

* used 7z for zip and tar files

* removed 7z and used zip and tar entry

* improved file previrew generating speed, used string builder, xml builder, authorization only if is required

* checkstyle, return boolean from haspreview and previrews from getPreview, replaced return with continue

* fix problem with hibernate session

* fix .tar.gz generating

* skip fully entry for tar

* added indexes for speed up queries

* added license header

* named constant by upper case

* inicialized fileInfo, refactorization of code based on copilot review

---------

Co-authored-by: milanmajchrak <[email protected]>

* Fix the file preview integration test (#989)

* The hasPreview method has been changed, but the IT wasn't updated correctly

* Use the correct checkbox for the input field - use repeatable (#991)

* UFAL/EU Sponsor openaire id should not be required (#1001)

* EU Sponsor openaire id should not be required

* Not required also in the czech submission forms

* Logging error message while emailing users (#1000)

* Logging error message

---------

Co-authored-by: Matus Kasak <[email protected]>
Co-authored-by: milanmajchrak <[email protected]>

* UFAL/Teaching and clariah submissions does not have clarin-license (#1005)

* UFAL/Fix logging in LogoImportController (#1003)

* fix logging

* used formatter for msg

* UFAL/Update the resource policy rights when changing submitter (#1002)

* removed res policies for submitter and created newones when item is shared

* avoid magic number, use constant

* set submitter in existing res policies

* removed not used shared link

* UFAL/Added date to title when creating new version (#984)

* added date to versioned item title

* used more modern approach for getting current time

* renamed test

* used var for reusing

* UFAL/Item handle info in email after download request (#1006)

* Added item handle to email

* Exception when item not found

* Checked grammar

* Handled multiple items found by bitstream

* Using PID instead of handle

---------

Co-authored-by: Matus Kasak <[email protected]>

* UFAL/Incorrect password hash funct used during migration (#999)

* password in request is already hashed, used different password hash funct

* renamed password param in eperson endpoint

* [devOps] labelling reviewing process

* [devOps] labelling reviewing process

* UFAL/New version keeps the old identifier

* UFAL/Send email to editor after submitting item (#1016)

Co-authored-by: Matus Kasak <[email protected]>

* UFAL/Local file size is 0 for file with no zero size (#1017)

* update item metadata after the bitstream size has changed

* issue 1241: ItemFilesMetadataRepair script implementation (DSpace#1243) (#1021)

* issue 1241: ItemFilesMetadataRepair script implementation

* extend script to be applicabble for all items, and for items with files metadata that have missing bitstreams (files)

* implement dry-run option

* option description fix

* Improve error message

* Use "0" instead of "" + 0

* Improve error message

(cherry picked from commit 706f6f6)

Co-authored-by: kuchtiak-ufal <[email protected]>

* UFAL/Refbox upgrade (#1015)

* Created integration test

* Created an endpoint for complete ref box information like in the v5

* Added integration tests for formatting authors

* Removed double semicolon

* Fetch the metadata value following the current locale

* Updated firstMetadataValue because it did return empty string instead of null

* Use DEFAULT_LANGUAGE instead of current locale

* UFAL/Added doc - issue link (#1023)

---------

Co-authored-by: Paurikova2 <[email protected]>
Co-authored-by: Ondřej Košarko <[email protected]>
Co-authored-by: Kasinhou <[email protected]>
Co-authored-by: Matus Kasak <[email protected]>
Co-authored-by: jurinecko <[email protected]>
Co-authored-by: jm <jm@maz>
Co-authored-by: kuchtiak-ufal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants