From 4ed76959f8dede96efaee81e8caa507f7782e121 Mon Sep 17 00:00:00 2001 From: TobiasNissen Date: Thu, 4 Jun 2026 15:03:11 +0200 Subject: [PATCH 1/2] DAM-9314 Ensure thumbnails are preserved on soft-deletion in Cloud Storage. --- ...etservicesettings_formatpurposestopreserveonsoftdelete.dcl | 4 ++++ ...etservicesettings_formatpurposestopreserveonsoftdelete.dcl | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl create mode 100644 Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl diff --git a/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl b/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl new file mode 100644 index 000000000..89f7b8702 --- /dev/null +++ b/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl @@ -0,0 +1,4 @@ +resource changeable_configuration_json_array_configuration_option assetservicesettings_formatpurposestopreserveonsoftdelete { + value = '["SmallThumbnail","LargeThumbnail"]' + id = 'AssetServiceSettings:FormatPurposesToPreserveOnSoftDelete' +} \ No newline at end of file diff --git a/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl b/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl new file mode 100644 index 000000000..89f7b8702 --- /dev/null +++ b/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl @@ -0,0 +1,4 @@ +resource changeable_configuration_json_array_configuration_option assetservicesettings_formatpurposestopreserveonsoftdelete { + value = '["SmallThumbnail","LargeThumbnail"]' + id = 'AssetServiceSettings:FormatPurposesToPreserveOnSoftDelete' +} \ No newline at end of file From 6cebbf2a8ea18a18786d92900fa60494b4f30aa9 Mon Sep 17 00:00:00 2001 From: TobiasNissen Date: Mon, 8 Jun 2026 09:50:24 +0200 Subject: [PATCH 2/2] DAM-9314 Use new format setting to ensure that renditions of the thumbnail and large thumbnails formats are preserved on soft-delete. --- Cloud Storage/6.6.0/formats/large_thumbnail.dcl | 9 +++++++++ Cloud Storage/6.6.0/formats/thumbnail.dcl | 9 +++++++++ ...vicesettings_formatpurposestopreserveonsoftdelete.dcl | 4 ---- Cloud Storage/6.7.0/formats/large_thumbnail.dcl | 9 +++++++++ Cloud Storage/6.7.0/formats/thumbnail.dcl | 9 +++++++++ ...vicesettings_formatpurposestopreserveonsoftdelete.dcl | 4 ---- 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 Cloud Storage/6.6.0/formats/large_thumbnail.dcl create mode 100644 Cloud Storage/6.6.0/formats/thumbnail.dcl delete mode 100644 Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl create mode 100644 Cloud Storage/6.7.0/formats/large_thumbnail.dcl create mode 100644 Cloud Storage/6.7.0/formats/thumbnail.dcl delete mode 100644 Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl diff --git a/Cloud Storage/6.6.0/formats/large_thumbnail.dcl b/Cloud Storage/6.6.0/formats/large_thumbnail.dcl new file mode 100644 index 000000000..7ffbcbf4b --- /dev/null +++ b/Cloud Storage/6.6.0/formats/large_thumbnail.dcl @@ -0,0 +1,9 @@ +data format large_thumbnail { + name = 'Large Thumbnail' + type = 'WebPImageFormat' +} + +patch format large_thumbnail { + target = data.format.large_thumbnail + preserve_renditions_on_soft_delete = true +} diff --git a/Cloud Storage/6.6.0/formats/thumbnail.dcl b/Cloud Storage/6.6.0/formats/thumbnail.dcl new file mode 100644 index 000000000..f1274cbca --- /dev/null +++ b/Cloud Storage/6.6.0/formats/thumbnail.dcl @@ -0,0 +1,9 @@ +data format thumbnail { + name = 'Thumbnail' + type = 'WebPImageFormat' +} + +patch format thumbnail { + target = data.format.thumbnail + preserve_renditions_on_soft_delete = true +} diff --git a/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl b/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl deleted file mode 100644 index 89f7b8702..000000000 --- a/Cloud Storage/6.6.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl +++ /dev/null @@ -1,4 +0,0 @@ -resource changeable_configuration_json_array_configuration_option assetservicesettings_formatpurposestopreserveonsoftdelete { - value = '["SmallThumbnail","LargeThumbnail"]' - id = 'AssetServiceSettings:FormatPurposesToPreserveOnSoftDelete' -} \ No newline at end of file diff --git a/Cloud Storage/6.7.0/formats/large_thumbnail.dcl b/Cloud Storage/6.7.0/formats/large_thumbnail.dcl new file mode 100644 index 000000000..7ffbcbf4b --- /dev/null +++ b/Cloud Storage/6.7.0/formats/large_thumbnail.dcl @@ -0,0 +1,9 @@ +data format large_thumbnail { + name = 'Large Thumbnail' + type = 'WebPImageFormat' +} + +patch format large_thumbnail { + target = data.format.large_thumbnail + preserve_renditions_on_soft_delete = true +} diff --git a/Cloud Storage/6.7.0/formats/thumbnail.dcl b/Cloud Storage/6.7.0/formats/thumbnail.dcl new file mode 100644 index 000000000..f1274cbca --- /dev/null +++ b/Cloud Storage/6.7.0/formats/thumbnail.dcl @@ -0,0 +1,9 @@ +data format thumbnail { + name = 'Thumbnail' + type = 'WebPImageFormat' +} + +patch format thumbnail { + target = data.format.thumbnail + preserve_renditions_on_soft_delete = true +} diff --git a/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl b/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl deleted file mode 100644 index 89f7b8702..000000000 --- a/Cloud Storage/6.7.0/options/assetservicesettings_formatpurposestopreserveonsoftdelete.dcl +++ /dev/null @@ -1,4 +0,0 @@ -resource changeable_configuration_json_array_configuration_option assetservicesettings_formatpurposestopreserveonsoftdelete { - value = '["SmallThumbnail","LargeThumbnail"]' - id = 'AssetServiceSettings:FormatPurposesToPreserveOnSoftDelete' -} \ No newline at end of file