Skip to content

Commit 2bf2545

Browse files
committed
fix: fix test assertions for span-based replacements, add qaIssueCount to KeyCreateDialog, fix n+1 in language delete
1 parent b7ed1f2 commit 2bf2545

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

backend/data/src/main/kotlin/io/tolgee/service/language/LanguageHardDeleter.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class LanguageHardDeleter(
4949
left join fetch k.branch
5050
left join fetch t.comments
5151
left join fetch t.labels
52+
left join fetch t.qaIssues
5253
where t.id in :ids""",
5354
Translation::class.java,
5455
).setParameter("ids", it.map { it.id })

ee/backend/tests/src/test/kotlin/io/tolgee/ee/service/qa/checks/PunctuationMismatchCheckTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class PunctuationMismatchCheckTest {
5656
assertThat(results).hasSize(1)
5757
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_PUNCTUATION_ADD)
5858
assertThat(results[0].params).containsEntry("punctuation", ".")
59-
assertThat(results[0].replacement).isEqualTo("Bonjour.")
59+
assertThat(results[0].replacement).isEqualTo(".")
6060
}
6161

6262
@Test
@@ -65,7 +65,7 @@ class PunctuationMismatchCheckTest {
6565
assertThat(results).hasSize(1)
6666
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_PUNCTUATION_REMOVE)
6767
assertThat(results[0].params).containsEntry("punctuation", "!")
68-
assertThat(results[0].replacement).isEqualTo("Bonjour")
68+
assertThat(results[0].replacement).isEqualTo("")
6969
}
7070

7171
@Test
@@ -75,7 +75,7 @@ class PunctuationMismatchCheckTest {
7575
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_PUNCTUATION_REPLACE)
7676
assertThat(results[0].params).containsEntry("punctuation", "!")
7777
assertThat(results[0].params).containsEntry("expected", ".")
78-
assertThat(results[0].replacement).isEqualTo("Bonjour.")
78+
assertThat(results[0].replacement).isEqualTo(".")
7979
}
8080

8181
@Test

ee/backend/tests/src/test/kotlin/io/tolgee/ee/service/qa/checks/SpacesMismatchCheckTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ class SpacesMismatchCheckTest {
4545
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_SPACES_LEADING_ADDED)
4646
assertThat(results[0].positionStart).isEqualTo(0)
4747
assertThat(results[0].positionEnd).isEqualTo(2)
48-
assertThat(results[0].replacement).isEqualTo("Hello")
48+
assertThat(results[0].replacement).isEqualTo("")
4949
}
5050

5151
@Test
5252
fun `detects missing leading spaces`() {
5353
val results = check.check(params("Hello", " Hello"))
5454
assertThat(results).hasSize(1)
5555
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_SPACES_LEADING_REMOVED)
56-
assertThat(results[0].replacement).isEqualTo(" Hello")
56+
assertThat(results[0].replacement).isEqualTo(" ")
5757
}
5858

5959
@Test
@@ -63,25 +63,25 @@ class SpacesMismatchCheckTest {
6363
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_SPACES_TRAILING_ADDED)
6464
assertThat(results[0].positionStart).isEqualTo(5)
6565
assertThat(results[0].positionEnd).isEqualTo(7)
66-
assertThat(results[0].replacement).isEqualTo("Hello")
66+
assertThat(results[0].replacement).isEqualTo("")
6767
}
6868

6969
@Test
7070
fun `detects missing trailing spaces`() {
7171
val results = check.check(params("Hello", "Hello "))
7272
assertThat(results).hasSize(1)
7373
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_SPACES_TRAILING_REMOVED)
74-
assertThat(results[0].replacement).isEqualTo("Hello ")
74+
assertThat(results[0].replacement).isEqualTo(" ")
7575
}
7676

7777
@Test
7878
fun `detects doubled spaces`() {
7979
val results = check.check(params("Hello world", "Hello world"))
8080
assertThat(results).hasSize(1)
8181
assertThat(results[0].message).isEqualTo(QaIssueMessage.QA_SPACES_DOUBLED)
82-
assertThat(results[0].positionStart).isEqualTo(5)
82+
assertThat(results[0].positionStart).isEqualTo(6)
8383
assertThat(results[0].positionEnd).isEqualTo(7)
84-
assertThat(results[0].replacement).isEqualTo(" ")
84+
assertThat(results[0].replacement).isEqualTo("")
8585
}
8686

8787
@Test

webapp/src/views/projects/translations/TranslationHeader/KeyCreateDialog.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export const KeyCreateDialog: React.FC<Props> = ({
4343
unresolvedCommentCount: 0,
4444
activeSuggestionCount: 0,
4545
totalSuggestionCount: 0,
46+
qaIssueCount: 0,
4647
fromTranslationMemory: false,
4748
labels: [],
4849
};

0 commit comments

Comments
 (0)