mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-02-17 15:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix watchers page alignment, don't re-scan approved versions for now

Browse Source
This commit is contained in:
Nassim Jahnke 2023-03-27 14:19:19 +02:00
parent cb714c1fbe
commit 4f3ec87e78
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/papermc/hangar/db/dao/internal/versions/JarScanResultDAO.java
View File

@ -23,6 +23,7 @@ public interface JarScanResultDAO {
@SqlQuery("SELECT * FROM jar_scan_result WHERE version_id = :versionId AND platform = :platform ORDER BY created_at DESC LIMIT 1")
JarScanResultTable getLastResult(long versionId, @EnumByOrdinal final Platform platform);
//TODO Don't skip approved versions if HIGHEST severity should unlist it
@RegisterConstructorMapper(VersionToScan.class)
@SqlQuery("""
SELECT pv.id AS version_id, pv.project_id, pv.review_state, pv.version_string, array_agg(DISTINCT pvpd.platform) AS platforms
@ -34,7 +35,7 @@ public interface JarScanResultDAO {
WHERE pvd.id IS NOT NULL
ORDER BY pvpd.download_id
) pvpd ON pvpd.version_id = pv.id
WHERE pvpd.id IS NOT NULL
WHERE pv.review_state != 1 AND pvpd.id IS NOT NULL
AND NOT EXISTS (
SELECT 1
FROM jar_scan_result jsr

7
backend/src/main/java/io/papermc/hangar/service/internal/versions/JarScanningService.java
View File

@ -64,10 +64,13 @@ public class JarScanningService {
}
@EventListener(ApplicationReadyEvent.class)
@Transactional
public void rescanProjectVersions() {
public void init() {
this.jarScannerUser = this.createUser();
this.rescanProjectVersions();
}
@Transactional
void rescanProjectVersions() {
for (final VersionToScan version : this.dao.versionsRequiringScans(this.scanner.version())) {
this.scan(version, false); // TODO partial parameter
}

6
frontend/src/pages/[user]/[project]/watchers.vue
View File

@ -30,8 +30,10 @@ useHead(useSeo(i18n.t("project.watchers") + " | " + props.project.name, props.pr
<div v-if="watchers?.result?.length > 0" class="flex flex-wrap gap-4">
<div v-for="watcher in watchers?.result" :key="watcher.name">
<UserAvatar size="xs" :username="watcher.name" :avatar-url="watcher.avatarUrl" />
<Link :to="'/' + watcher.name">{{ watcher.name }}</Link>
<div class="inline-flex items-center space-x-1">
<UserAvatar size="xs" :username="watcher.name" :avatar-url="watcher.avatarUrl" />
<Link :to="'/' + watcher.name">{{ watcher.name }}</Link>
</div>
</div>
</div>
<div v-else>