diff --git a/server/router/api.go b/server/router/api.go index 29926987a..944a3cd88 100644 --- a/server/router/api.go +++ b/server/router/api.go @@ -168,10 +168,10 @@ func apiRoutes(e *gin.RouterGroup) { queue.GET("/norunningpipelines", api.BlockTilQueueHasRunningItem) } + apiBase.GET("/secrets", session.MustUser(), api.GetGlobalSecretList) // global secrets can be read without actual values by any user secrets := apiBase.Group("/secrets") { secrets.Use(session.MustAdmin()) - secrets.GET("", api.GetGlobalSecretList) secrets.POST("", api.PostGlobalSecret) secrets.GET("/:secret", api.GetGlobalSecret) secrets.PATCH("/:secret", api.PatchGlobalSecret) diff --git a/web/src/compositions/usePaginate.ts b/web/src/compositions/usePaginate.ts index 33002c09c..233066146 100644 --- a/web/src/compositions/usePaginate.ts +++ b/web/src/compositions/usePaginate.ts @@ -70,10 +70,12 @@ export function usePagination( async function resetPage() { const _page = page.value; + page.value = 1; + pageSize.value = 0; hasMore.value = true; data.value = []; + loading.value = false; each.value = (_each ?? []) as UnwrapRef; - page.value = 1; if (_page === 1) { // we need to reload manually as the page is already 1, so changing won't trigger watcher