From 839364f26b84e0ceb70d444b5a3f8cfdc2f96874 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 17 Nov 2025 16:08:47 -0500 Subject: [PATCH 1/8] change language for deaccession not valid reason --- doc/release-notes/360-modify-notvalid-deaccession-reason.md | 2 ++ src/main/java/propertyFiles/Bundle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/360-modify-notvalid-deaccession-reason.md diff --git a/doc/release-notes/360-modify-notvalid-deaccession-reason.md b/doc/release-notes/360-modify-notvalid-deaccession-reason.md new file mode 100644 index 00000000000..7e7868e499e --- /dev/null +++ b/doc/release-notes/360-modify-notvalid-deaccession-reason.md @@ -0,0 +1,2 @@ +Language change for file.deaccessionDialog.reason.selectItem.notValid +"Not a valid dataset." has been changed to "Not valid. The dataset does not comply with repository policies." diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 3254c26ed22..016b55fcd99 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -2172,7 +2172,7 @@ file.deaccessionDialog.reason.selectItem.beRetracted=The research article has be file.deaccessionDialog.reason.selectItem.beTransferred=The dataset has been transferred to another repository. file.deaccessionDialog.reason.selectItem.IRB=IRB request. file.deaccessionDialog.reason.selectItem.legalIssue=Legal issue or Data Usage Agreement. -file.deaccessionDialog.reason.selectItem.notValid=Not a valid dataset. +file.deaccessionDialog.reason.selectItem.notValid=Not valid. The dataset does not comply with repository policies. file.deaccessionDialog.reason.selectItem.other=Other (Please type reason in space provided below) file.deaccessionDialog.enterInfo=Please enter additional information about the reason for deaccession. file.deaccessionDialog.leaveURL=If applicable, please leave a URL where this dataset can be accessed after deaccessioning. From 0f5806e8daf61573aef6f64f9c27292d90e6fc30 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 17 Nov 2025 16:29:15 -0500 Subject: [PATCH 2/8] change 'The' to 'This' --- doc/release-notes/360-modify-notvalid-deaccession-reason.md | 2 +- src/main/java/propertyFiles/Bundle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/360-modify-notvalid-deaccession-reason.md b/doc/release-notes/360-modify-notvalid-deaccession-reason.md index 7e7868e499e..5d323ab2da8 100644 --- a/doc/release-notes/360-modify-notvalid-deaccession-reason.md +++ b/doc/release-notes/360-modify-notvalid-deaccession-reason.md @@ -1,2 +1,2 @@ Language change for file.deaccessionDialog.reason.selectItem.notValid -"Not a valid dataset." has been changed to "Not valid. The dataset does not comply with repository policies." +"Not a valid dataset." has been changed to "Not valid. This dataset does not comply with repository policies." diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 016b55fcd99..72b055cb45a 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -2172,7 +2172,7 @@ file.deaccessionDialog.reason.selectItem.beRetracted=The research article has be file.deaccessionDialog.reason.selectItem.beTransferred=The dataset has been transferred to another repository. file.deaccessionDialog.reason.selectItem.IRB=IRB request. file.deaccessionDialog.reason.selectItem.legalIssue=Legal issue or Data Usage Agreement. -file.deaccessionDialog.reason.selectItem.notValid=Not valid. The dataset does not comply with repository policies. +file.deaccessionDialog.reason.selectItem.notValid=Not valid. This dataset does not comply with repository policies. file.deaccessionDialog.reason.selectItem.other=Other (Please type reason in space provided below) file.deaccessionDialog.enterInfo=Please enter additional information about the reason for deaccession. file.deaccessionDialog.leaveURL=If applicable, please leave a URL where this dataset can be accessed after deaccessioning. From 5c0113b18df2dff2b07bf173f95d28958c3ff41b Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 17 Nov 2025 16:37:51 -0500 Subject: [PATCH 3/8] typo --- src/main/java/propertyFiles/Bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 72b055cb45a..c4d2bd52e16 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -2178,7 +2178,7 @@ file.deaccessionDialog.enterInfo=Please enter additional information about the r file.deaccessionDialog.leaveURL=If applicable, please leave a URL where this dataset can be accessed after deaccessioning. file.deaccessionDialog.leaveURL.watermark=Optional dataset site, http://... file.deaccessionDialog.deaccession.tip=Are you sure you want to deaccession? This is permanent and the selected version(s) will no longer be viewable by the public. -file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? This is permanent an it will no longer be viewable by the public. +file.deaccessionDialog.deaccessionDataset.tip=Are you sure you want to deaccession this dataset? This is permanent, and it will no longer be viewable by the public. file.deaccessionDialog.dialog.selectVersion.error=Please select version(s) for deaccessioning. file.deaccessionDialog.dialog.reason.error=Please select reason for deaccessioning. file.deaccessionDialog.dialog.url.error=Please enter valid forwarding URL. From 9428336628099af0f3356f58e439fbaea8be5413 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 18 Nov 2025 15:17:39 -0500 Subject: [PATCH 4/8] flyway script and documentation --- .../360-modify-notvalid-deaccession-reason.md | 14 ++++++++++++-- src/main/resources/db/migration/V6.8.0.1.sql | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/db/migration/V6.8.0.1.sql diff --git a/doc/release-notes/360-modify-notvalid-deaccession-reason.md b/doc/release-notes/360-modify-notvalid-deaccession-reason.md index 5d323ab2da8..ee640aea79b 100644 --- a/doc/release-notes/360-modify-notvalid-deaccession-reason.md +++ b/doc/release-notes/360-modify-notvalid-deaccession-reason.md @@ -1,2 +1,12 @@ -Language change for file.deaccessionDialog.reason.selectItem.notValid -"Not a valid dataset." has been changed to "Not valid. This dataset does not comply with repository policies." +# Language change for file.deaccessionDialog.reason.selectItem.notValid + +"Not a valid dataset." is being changed to "Not valid. This dataset does not comply with repository policies." +This is the default English language version. For installations using customized languages, replacing the Bundle.properties file, please follow these manual instructions to make this modification, if desired. + +The SQL statements to modify the datasets is: +UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.'); +UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.'; + +Once the database is updated the Solr indexes need to be rebuilt using the following Admin API: + +curl http://localhost:8080/api/admin/index/continue diff --git a/src/main/resources/db/migration/V6.8.0.1.sql b/src/main/resources/db/migration/V6.8.0.1.sql new file mode 100644 index 00000000000..a0fcf62abaa --- /dev/null +++ b/src/main/resources/db/migration/V6.8.0.1.sql @@ -0,0 +1,3 @@ +-- modify datasetversion.deaccessionnote entries with new Bundle string 'file.deaccessionDialog.reason.selectItem.notValid' +UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.'); +UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.'; From c82156f1dc4a4e8147284eee53e58d30b3c7ae63 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 18 Nov 2025 15:50:23 -0500 Subject: [PATCH 5/8] doc change --- .../360-modify-notvalid-deaccession-reason.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/360-modify-notvalid-deaccession-reason.md b/doc/release-notes/360-modify-notvalid-deaccession-reason.md index ee640aea79b..152b3b777f4 100644 --- a/doc/release-notes/360-modify-notvalid-deaccession-reason.md +++ b/doc/release-notes/360-modify-notvalid-deaccession-reason.md @@ -3,10 +3,14 @@ "Not a valid dataset." is being changed to "Not valid. This dataset does not comply with repository policies." This is the default English language version. For installations using customized languages, replacing the Bundle.properties file, please follow these manual instructions to make this modification, if desired. +Make the change to the Bundle_##.properties file with the new verbiage. Either locally or as an update to [dataverse-language-packs Repo](https://github.com/GlobalDataverseCommunityConsortium/dataverse-language-packs/tree/develop) + The SQL statements to modify the datasets is: -UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.'); -UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.'; + +- `UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.');` + +- `UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.';` Once the database is updated the Solr indexes need to be rebuilt using the following Admin API: -curl http://localhost:8080/api/admin/index/continue +- `curl http://localhost:8080/api/admin/index/continue` From ff4c9d46217c9cab19be963d42a52110be867c4e Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Thu, 20 Nov 2025 11:10:20 -0500 Subject: [PATCH 6/8] sql conflict --- src/main/resources/db/migration/V6.8.0.3.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/resources/db/migration/V6.8.0.3.sql diff --git a/src/main/resources/db/migration/V6.8.0.3.sql b/src/main/resources/db/migration/V6.8.0.3.sql new file mode 100644 index 00000000000..7c5df131e72 --- /dev/null +++ b/src/main/resources/db/migration/V6.8.0.3.sql @@ -0,0 +1,3 @@ +modify datasetversion.deaccessionnote entries with new Bundle string 'file.deaccessionDialog.reason.selectItem.notValid' +UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.'); +UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.'; From d66d08d9eceea3436c7ac062e2c044a78574bebf Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 3 Dec 2025 09:57:12 -0500 Subject: [PATCH 7/8] fix bad merge --- src/main/resources/db/migration/V6.8.0.4.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/db/migration/V6.8.0.4.sql b/src/main/resources/db/migration/V6.8.0.4.sql index e69de29bb2d..095ab0d1d25 100644 --- a/src/main/resources/db/migration/V6.8.0.4.sql +++ b/src/main/resources/db/migration/V6.8.0.4.sql @@ -0,0 +1,3 @@ +- modify datasetversion.deaccessionnote entries with new Bundle string 'file.deaccessionDialog.reason.selectItem.notValid' +UPDATE dvobject SET indextime=null WHERE id in (SELECT dataset_id FROM datasetversion WHERE deaccessionnote='Not a valid dataset.'); +UPDATE datasetversion SET deaccessionnote='Not valid. This dataset does not comply with repository policies.' WHERE deaccessionnote='Not a valid dataset.'; From e5dd123d10c48522480b1d890de72311a07ae41a Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 15 Dec 2025 09:16:17 -0500 Subject: [PATCH 8/8] change flyway script to 6.9 for next release --- src/main/resources/db/migration/{V6.8.0.4.sql => V6.9.0.1.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/{V6.8.0.4.sql => V6.9.0.1.sql} (100%) diff --git a/src/main/resources/db/migration/V6.8.0.4.sql b/src/main/resources/db/migration/V6.9.0.1.sql similarity index 100% rename from src/main/resources/db/migration/V6.8.0.4.sql rename to src/main/resources/db/migration/V6.9.0.1.sql