Skip to content

Commit 046c4bf

Browse files
committed
cleanup changes
1 parent e54cb9a commit 046c4bf

File tree

3 files changed

+9
-41
lines changed

3 files changed

+9
-41
lines changed

models/repo/release.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package repo
66

77
import (
88
"context"
9-
"errors"
109
"fmt"
1110
"html/template"
1211
"net/url"
@@ -325,10 +324,6 @@ func GetLatestReleaseByRepoID(ctx context.Context, repoID int64) (*Release, erro
325324

326325
// GetPreviousPublishedRelease returns the most recent published release created before the provided release.
327326
func GetPreviousPublishedRelease(ctx context.Context, repoID int64, current *Release) (*Release, error) {
328-
if current == nil {
329-
return nil, errors.New("current release must not be nil")
330-
}
331-
332327
cond := builder.NewCond().
333328
And(builder.Eq{"repo_id": repoID}).
334329
And(builder.Eq{"is_draft": false}).

services/release/notes_test.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func TestGenerateReleaseNotes(t *testing.T) {
2929
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
3030
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
3131
require.NoError(t, err)
32-
t.Cleanup(func() { gitRepo.Close() })
3332

3433
mergedCommit := "90c1019714259b24fb81711d4416ac0f18667dfa"
3534
pr := createMergedPullRequest(t, repo, mergedCommit, 5)
@@ -57,30 +56,14 @@ func TestGenerateReleaseNotes_NoReleaseFallsBackToTags(t *testing.T) {
5756
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
5857
gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
5958
require.NoError(t, err)
60-
t.Cleanup(func() { gitRepo.Close() })
6159

6260
mergedCommit := "90c1019714259b24fb81711d4416ac0f18667dfa"
6361
createMergedPullRequest(t, repo, mergedCommit, 5)
6462

65-
var releases []repo_model.Release
66-
err = db.GetEngine(t.Context()).
67-
Where("repo_id=?", repo.ID).
68-
Asc("id").
69-
Find(&releases)
70-
require.NoError(t, err)
71-
7263
_, err = db.GetEngine(t.Context()).
7364
Where("repo_id=?", repo.ID).
7465
Delete(new(repo_model.Release))
7566
require.NoError(t, err)
76-
t.Cleanup(func() {
77-
if len(releases) == 0 {
78-
return
79-
}
80-
ctx := context.Background()
81-
_, err := db.GetEngine(ctx).Insert(&releases)
82-
require.NoError(t, err)
83-
})
8467

8568
result, err := GenerateReleaseNotes(t.Context(), repo, gitRepo, GenerateReleaseNotesOptions{
8669
TagName: "v1.2.0",
@@ -200,10 +183,6 @@ func insertTestRelease(ctx context.Context, t *testing.T, repo *repo_model.Repos
200183

201184
_, err := db.GetEngine(ctx).Insert(release)
202185
require.NoError(t, err)
203-
t.Cleanup(func() {
204-
_, err := db.GetEngine(context.Background()).ID(release.ID).Delete(new(repo_model.Release))
205-
require.NoError(t, err)
206-
})
207186

208187
return release
209188
}

web_src/js/features/repo-release.ts

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,18 @@ function initGenerateReleaseNotes() {
6262
const generateUrl = button.getAttribute('data-generate-url');
6363

6464
button.addEventListener('click', async () => {
65-
const tagName = tagNameInput?.value.trim();
65+
const tagName = tagNameInput.value.trim();
66+
6667
if (!tagName) {
6768
showErrorToast(missingTagMessage);
6869
tagNameInput?.focus();
6970
return;
7071
}
71-
if (!generateUrl) {
72-
showErrorToast('Missing release notes endpoint');
73-
return;
74-
}
7572

7673
const form = new URLSearchParams();
7774
form.set('tag_name', tagName);
78-
form.set('tag_target', targetInput?.value || '');
79-
form.set('previous_tag', previousTagSelect?.value || '');
75+
form.set('tag_target', targetInput.value || '');
76+
form.set('previous_tag', previousTagSelect.value || '');
8077

8178
button.classList.add('loading', 'disabled');
8279
try {
@@ -85,16 +82,13 @@ function initGenerateReleaseNotes() {
8582
});
8683
const data = await resp.json();
8784
if (!resp.ok) {
88-
throw new Error(data.errorMessage || data.error || resp.statusText);
85+
throw new Error(data.errorMessage || resp.statusText);
8986
}
9087

91-
if (previousTagSelect && 'previous_tag' in data) {
92-
previousTagSelect.value = data.previous_tag || '';
93-
previousTagSelect.dispatchEvent(new Event('change', {bubbles: true}));
94-
}
95-
if (data && 'content' in data) {
96-
applyGeneratedReleaseNotes(data.content || '');
97-
}
88+
previousTagSelect.value = data.previous_tag;
89+
previousTagSelect.dispatchEvent(new Event('change', {bubbles: true}));
90+
91+
applyGeneratedReleaseNotes(data.content);
9892
} catch (error) {
9993
const message = error instanceof Error ? error.message : String(error);
10094
showErrorToast(message);

0 commit comments

Comments
 (0)