From 2f8f3d21effe390f9410ae06901bebe328721d78 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 11 Jan 2026 09:04:33 +0000 Subject: [PATCH 1/4] chore: Default branches config for semrel --- .releaserc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.releaserc.yaml b/.releaserc.yaml index 7a7ec23..125c177 100644 --- a/.releaserc.yaml +++ b/.releaserc.yaml @@ -1,6 +1,6 @@ --- -branches: - - name: main +#branches: +# - name: main # range: '3000.x.x' # - name: release/2k From 7945897f247c2ebe553d9783684e0104d32169b1 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 11 Jan 2026 09:15:25 +0000 Subject: [PATCH 2/4] fix: Build beta releases pipeline enabled --- .github/workflows/build-and-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index e16546d..ba3362f 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -10,6 +10,7 @@ on: branches: - main - next + - beta jobs: build: From 242149f5a4a3ea6e9d9e12f6794c75a54abc4ed0 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 11 Jan 2026 09:20:50 +0000 Subject: [PATCH 3/4] chore: reduce cyclo --- service/internal/executor/executor.go | 70 +++++++++++++++++---------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/service/internal/executor/executor.go b/service/internal/executor/executor.go index 2673e7b..e032408 100644 --- a/service/internal/executor/executor.go +++ b/service/internal/executor/executor.go @@ -234,41 +234,59 @@ func isLogEntryAllowedByACL(cfg *config.Config, user *authpublic.AuthenticatedUs return acl.IsAllowedLogs(cfg, user, entry.Binding.Action) } +// parseDateFilter parses a date filter string and returns the parsed date and validity. +func parseDateFilter(dateFilter string) (time.Time, bool) { + if dateFilter == "" { + return time.Time{}, false + } + + parsedDate, err := time.Parse("2006-01-02", dateFilter) + if err != nil { + log.WithFields(log.Fields{ + "dateFilter": dateFilter, + "error": err, + }).Errorf("Failed to parse date filter, expected format YYYY-MM-DD") + return time.Time{}, false + } + + return parsedDate, true +} + +// matchesDateFilter checks if an entry matches the date filter criteria. +func matchesDateFilter(entry *InternalLogEntry, filterDate time.Time, hasDateFilter bool) bool { + if !hasDateFilter { + return true + } + + entryDate := entry.DatetimeStarted.UTC().Truncate(24 * time.Hour) + filterDateUTC := filterDate.UTC().Truncate(24 * time.Hour) + return entryDate.Equal(filterDateUTC) +} + +// shouldIncludeLogEntry determines if a log entry should be included in filtered results. +func shouldIncludeLogEntry(cfg *config.Config, user *authpublic.AuthenticatedUser, entry *InternalLogEntry, filterDate time.Time, hasDateFilter bool) bool { + if !isValidLogEntryForACL(entry) { + return false + } + + if !isLogEntryAllowedByACL(cfg, user, entry) { + return false + } + + return matchesDateFilter(entry, filterDate, hasDateFilter) +} + func (e *Executor) filterLogsByACL(cfg *config.Config, user *authpublic.AuthenticatedUser, dateFilter string) []*InternalLogEntry { e.logmutex.RLock() defer e.logmutex.RUnlock() filtered := make([]*InternalLogEntry, 0, len(e.logsTrackingIdsByDate)) - - var filterDate time.Time - var hasDateFilter bool - if dateFilter != "" { - parsedDate, err := time.Parse("2006-01-02", dateFilter) - if err != nil { - log.WithFields(log.Fields{ - "dateFilter": dateFilter, - "error": err, - }).Errorf("Failed to parse date filter, expected format YYYY-MM-DD") - } else { - filterDate = parsedDate - hasDateFilter = true - } - } + filterDate, hasDateFilter := parseDateFilter(dateFilter) for _, trackingId := range e.logsTrackingIdsByDate { entry := e.logs[trackingId] - if !isValidLogEntryForACL(entry) { - continue - } - if isLogEntryAllowedByACL(cfg, user, entry) { - if hasDateFilter { - entryDate := entry.DatetimeStarted.UTC().Truncate(24 * time.Hour) - filterDateUTC := filterDate.UTC().Truncate(24 * time.Hour) - if !entryDate.Equal(filterDateUTC) { - continue - } - } + if shouldIncludeLogEntry(cfg, user, entry, filterDate, hasDateFilter) { filtered = append(filtered, entry) } } From ebb415f9cb922b1236252fbdbdce6a27ce2c8a5a Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 11 Jan 2026 09:50:57 +0000 Subject: [PATCH 4/4] fix: Dirty package-lock --- frontend/package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 07c58e3..8c12759 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -21,6 +21,7 @@ "standard": "^17.1.2", "unplugin-vue-components": "^30.0.0", "vite": "^7.3.1", + "vue": "^3.5.26", "vue-i18n": "^11.2.8", "vue-router": "^4.6.4" },