feat: content delivery view published files (#2759)

tolgee · Dec 16, 2024 · fc4aa1c · fc4aa1c
1 parent 9c1de22
commit fc4aa1c
Show file tree

Hide file tree

Showing 12 changed files with 515 additions and 857 deletions.
diff --git a/backend/api/src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModel.kt b/backend/api/src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModel.kt
@@ -20,6 +20,7 @@ class ContentDeliveryConfigModel(
   val publicUrl: String?,
   val autoPublish: Boolean,
   val lastPublished: Long?,
+  val lastPublishedFiles: Collection<String>,
 ) : RepresentationModel<ContentDeliveryConfigModel>(), Serializable, IExportParams {
   override var languages: Set<String>? = null
   override var format: ExportFormat = ExportFormat.JSON

diff --git a/.../src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModelAssembler.kt b/.../src/main/kotlin/io/tolgee/hateoas/contentDelivery/ContentDeliveryConfigModelAssembler.kt
@@ -25,6 +25,7 @@ class ContentDeliveryConfigModelAssembler(
       publicUrl = getPublicUrl(entity),
       autoPublish = entity.automationActions.isNotEmpty(),
       lastPublished = entity.lastPublished?.time,
+      lastPublishedFiles = entity.lastPublishedFiles ?: listOf(),
     ).also {
       it.copyPropsFrom(entity)
     }

diff --git a/backend/data/src/main/kotlin/io/tolgee/component/contentDelivery/ContentDeliveryUploader.kt b/backend/data/src/main/kotlin/io/tolgee/component/contentDelivery/ContentDeliveryUploader.kt
@@ -29,6 +29,7 @@ class ContentDeliveryUploader(
     storeToStorage(withFullPaths, storage)
     purgeCacheIfConfigured(config, files.keys)
     config.lastPublished = currentDateProvider.date
+    config.lastPublishedFiles = files.map { it.key }.toList()
     contentDeliveryConfigService.save(config)
   }
 

diff --git a/backend/data/src/main/kotlin/io/tolgee/model/contentDelivery/ContentDeliveryConfig.kt b/backend/data/src/main/kotlin/io/tolgee/model/contentDelivery/ContentDeliveryConfig.kt
@@ -60,6 +60,11 @@ class ContentDeliveryConfig(
   @ActivityIgnoredProp
   var lastPublished: Date? = null
 
+  @Type(JsonBinaryType::class)
+  @Column(columnDefinition = "jsonb")
+  @ActivityIgnoredProp
+  var lastPublishedFiles: List<String>? = null
+
   @ColumnDefault("false")
   var pruneBeforePublish = true
 

diff --git a/backend/data/src/main/resources/db/changelog/schema.xml b/backend/data/src/main/resources/db/changelog/schema.xml
@@ -4009,4 +4009,9 @@
             <column name="deleted_at" type="timestamp(6)"/>
         </addColumn>
     </changeSet>
-</databaseChangeLog>
+    <changeSet author="stepangranat (generated)" id="1733757292979-1">
+        <addColumn tableName="content_delivery_config">
+            <column name="last_published_files" type="jsonb"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/e2e/cypress/e2e/projects/contentDelivery.cy.ts b/e2e/cypress/e2e/projects/contentDelivery.cy.ts
@@ -31,12 +31,16 @@ describe('Content delivery', () => {
     contentDeliveryTestData.clean();
   });
 
-  it('publishes content manually', () => {
+  it('publishes content manually and shows files', () => {
     gcyAdvanced({ value: 'content-delivery-list-item', name: 'Azure' })
       .findDcy('content-delivery-item-publish')
       .click();
     waitForGlobalLoading();
     assertMessage('Content published successfully!');
+    gcyAdvanced({ value: 'content-delivery-list-item', name: 'Azure' })
+      .findDcy('content-delivery-files-button')
+      .click();
+    gcy('content-delivery-published-file').should('contain', 'en.json');
   });
 
   it('creates content delivery', () => {

diff --git a/e2e/cypress/support/dataCyType.d.ts b/e2e/cypress/support/dataCyType.d.ts
@@ -140,6 +140,7 @@ declare namespace DataCy {
         "content-delivery-add-button" |
         "content-delivery-auto-publish-checkbox" |
         "content-delivery-delete-button" |
+        "content-delivery-files-button" |
         "content-delivery-form-custom-slug" |
         "content-delivery-form-name" |
         "content-delivery-form-save" |
@@ -148,6 +149,7 @@ declare namespace DataCy {
         "content-delivery-item-type" |
         "content-delivery-list-item" |
         "content-delivery-prune-before-publish-checkbox" |
+        "content-delivery-published-file" |
         "content-delivery-storage-selector" |
         "content-delivery-storage-selector-item" |
         "content-delivery-subtitle" |