fix: activity label zero keys (tolgee#2433)

huglx · JanCizmar · web-flow · commit 0be81c67bf44 · 2024-10-01T12:42:31.000+02:00
- do not show activities with an empty list of modified entities

---------

Co-authored-by: Jan Cizmar &lt;cizmar@chlupac.com&gt;
diff --git a/backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/ProjectActivityControllerTest.kt b/backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/ProjectActivityControllerTest.kt
@@ -2,10 +2,7 @@ package io.tolgee.api.v2.controllers
 
 import io.tolgee.ProjectAuthControllerTest
 import io.tolgee.development.testDataBuilder.data.dataImport.ImportTestData
-import io.tolgee.fixtures.andAssertThatJson
-import io.tolgee.fixtures.andIsOk
-import io.tolgee.fixtures.isValidId
-import io.tolgee.fixtures.node
+import io.tolgee.fixtures.*
 import io.tolgee.model.activity.ActivityRevision
 import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod
 import net.javacrumbs.jsonunit.assertj.JsonAssert
@@ -41,6 +38,54 @@ class ProjectActivityControllerTest : ProjectAuthControllerTest("/v2/projects/")
       }
   }
 
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `returns no activity while 0 tags are added to the key`() {
+    val keyTag = "tag"
+    val key = testData.addKeyWithTag(keyTag)
+    testDataService.saveTestData(testData.root)
+
+    performProjectAuthPost("start-batch-job/tag-keys", mapOf("keyIds" to listOf(key.id), "tags" to listOf(keyTag)))
+      .andIsOk
+
+    waitForNotThrowing(timeout = 1000) {
+      val revisionsWithTag =
+        findBatchTagKeysActivityRevisions()
+
+      assert(revisionsWithTag.isEmpty())
+    }
+  }
+
+  @Test
+  @ProjectJWTAuthTestMethod
+  fun `returns activity while 1 or more tags are added to the key`() {
+    val key = testData.addKeyWithTag("tag")
+    testDataService.saveTestData(testData.root)
+
+    performProjectAuthPost(
+      "start-batch-job/tag-keys",
+      mapOf("keyIds" to listOf(key.id), "tags" to listOf("tag1", "tag2", "tag3")),
+    )
+      .andIsOk
+
+    waitForNotThrowing(timeout = 1000) {
+      val revisionsWithTag =
+        findBatchTagKeysActivityRevisions()
+
+      assert(revisionsWithTag.isNotEmpty())
+    }
+  }
+
+  fun findBatchTagKeysActivityRevisions(): List<ActivityRevision> {
+    return entityManager.createQuery(
+      """
+      select ar from ActivityRevision ar
+      where ar.type = 'BATCH_TAG_KEYS' and ar.authorId = ${testData.userAccount.id}
+      """.trimIndent(),
+      ActivityRevision::class.java,
+    ).resultList
+  }
+
   private fun JsonAssert.assertCountsOnlyResult() {
     node("modifiedEntities").isNull()
     node("counts") {
diff --git a/backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt b/backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt
@@ -37,6 +37,10 @@ class ActivityService(
     activityRevision: ActivityRevision,
     modifiedEntities: ModifiedEntitiesType,
   ) {
+    if (!activityRevision.shouldSaveWithoutModification() && modifiedEntities.isEmpty()) {
+      return
+    }
+
     // let's keep the persistent context small
     entityManager.flushAndClear()
 
@@ -156,4 +160,9 @@ class ActivityService(
       ModificationsByRevisionsProvider(applicationContext, projectId, listOf(revisionId), pageable, filterEntityClass)
     return provider.get()
   }
+
+  private fun ActivityRevision.shouldSaveWithoutModification(): Boolean {
+    val type = this.type ?: return true
+    return type.saveWithoutModification
+  }
 }
diff --git a/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/dataImport/ImportTestData.kt b/backend/data/src/main/kotlin/io/tolgee/development/testDataBuilder/data/dataImport/ImportTestData.kt
@@ -210,6 +210,15 @@ class ImportTestData {
     return user.self
   }
 
+  fun addKeyWithTag(keyTag: String): io.tolgee.model.key.Key {
+    return this.projectBuilder.addKey {
+      name = "key with tag"
+      this.keyMeta
+    }.build {
+      addTag(keyTag)
+    }.self
+  }
+
   fun useViewEnOnlyUser(): UserAccount {
     val user =
       this.root.addUserAccount {
diff --git a/webapp/src/component/activity/ActivityTitle.tsx b/webapp/src/component/activity/ActivityTitle.tsx
@@ -33,6 +33,7 @@ export const ActivityTitle: React.FC<Props> = ({ activity }) => {
     KeyCount: 0,
     TranslationCount: 0,
     KeyMeta: 0,
+    KeyMetaCount: 0,
   };
 
   Object.entries(activity.counts || {}).forEach(([entity, value]) => {
