Merge branch 'main' into main

Author: kmendell

.github/workflows/backend-tests.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Upload coverage artifact
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: backend-coverage
           path: backend/coverage.out
@@ -89,7 +89,7 @@ jobs:
 
       - name: Upload coverage artifact
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: cli-coverage
           path: cli/coverage.out

.github/workflows/e2e-tests.yml

@@ -53,7 +53,7 @@ jobs:
         run: docker save arcane:playwright-tests -o /tmp/arcane-image.tar
 
       - name: Upload Docker image artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: arcane-image
           path: /tmp/arcane-image.tar
@@ -110,7 +110,7 @@ jobs:
           docker network create my-test-network || true
 
       - name: Download Arcane Docker image artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: arcane-image
           path: /tmp
@@ -139,7 +139,7 @@ jobs:
 
       - name: Upload Playwright HTML report
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: playwright-report-${{ matrix.database.name }}
           path: tests/.report

.github/workflows/sync-go-workspace.yml

@@ -39,7 +39,7 @@ jobs:
                   go work sync
 
             - name: Commit changes (if any)
-              uses: stefanzweifel/git-auto-commit-action@v5
+              uses: stefanzweifel/git-auto-commit-action@v7
               with:
                   commit_message: "chore(deps): Synchronize go.mod files via go work sync"
                   branch: ${{ github.head_ref }}

backend/internal/huma/handlers/environments.go

@@ -12,6 +12,7 @@ import (
 	"github.com/getarcaneapp/arcane/backend/internal/services"
 	"github.com/getarcaneapp/arcane/backend/internal/utils"
 	"github.com/getarcaneapp/arcane/backend/internal/utils/mapper"
+	"github.com/getarcaneapp/arcane/backend/internal/utils/pagination"
 	"go.getarcane.app/types/base"
 	"go.getarcane.app/types/environment"
 )
@@ -39,10 +40,11 @@ type EnvironmentPaginatedResponse struct {
 }
 
 type ListEnvironmentsInput struct {
-	Page    int    `query:"pagination[page]" default:"1" doc:"Page number"`
-	Limit   int    `query:"pagination[limit]" default:"20" doc:"Items per page"`
-	SortCol string `query:"sort[column]" doc:"Column to sort by"`
-	SortDir string `query:"sort[direction]" default:"asc" doc:"Sort direction"`
+	Search string `query:"search" doc:"Search query for filtering by name or API URL"`
+	Sort   string `query:"sort" doc:"Column to sort by"`
+	Order  string `query:"order" default:"asc" doc:"Sort direction (asc or desc)"`
+	Start  int    `query:"start" default:"0" doc:"Start index for pagination"`
+	Limit  int    `query:"limit" default:"20" doc:"Items per page"`
 }
 
 type ListEnvironmentsOutput struct {
@@ -307,7 +309,19 @@ func (h *EnvironmentHandler) ListEnvironments(ctx context.Context, input *ListEn
 		return nil, huma.Error500InternalServerError("service not available")
 	}
 
-	params := buildPaginationParams(input.Page, input.Limit, input.SortCol, input.SortDir)
+	params := pagination.QueryParams{
+		SearchQuery: pagination.SearchQuery{
+			Search: input.Search,
+		},
+		SortParams: pagination.SortParams{
+			Sort:  input.Sort,
+			Order: pagination.SortOrder(input.Order),
+		},
+		PaginationParams: pagination.PaginationParams{
+			Start: input.Start,
+			Limit: input.Limit,
+		},
+	}
 
 	envs, paginationResp, err := h.environmentService.ListEnvironmentsPaginated(ctx, params)
 	if err != nil {