Imports

.github/workflows/pull-request-checks.yml

@@ -12,16 +12,16 @@ on:
 
 jobs:
   # nixos/web.nix uses buildGoModule which compiles the Go binary (no separate build job needed)
-  # and runs `go test -short` via doCheck = true (no separate test job needed). 
+  # and runs `go test -short` via doCheck = true (no separate test job needed).
   # nixos/web.docker.nix builds the Docker image which includes the compiled binary.
-  build:
+  build-amd64:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     permissions:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install Nix
         uses: cachix/install-nix-action@v31
@@ -39,9 +39,34 @@ jobs:
       - name: Build binary
         run: nix build .#default
 
-      - name: Build Docker image
+      - name: Build Docker image (amd64)
         run: nix build .#docker-amd64
-
-      - name: Build Docker image
+
+  build-arm64:
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 15
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+
+      - name: Cache Nix store
+        uses: nix-community/cache-nix-action@v7
+        with:
+          primary-key: nix-${{ runner.os }}-arm64-${{ hashFiles('flake.lock', '**/*.nix', '**/*.go') }}
+          restore-prefixes-first-match: nix-${{ runner.os }}-arm64-
+          gc-max-store-size-linux: 5368709120  # 5 GB
+
+      - name: Build binary
+        run: nix build .#default
+
+      - name: Build Docker image (arm64)
         run: nix build .#docker-arm64
 

cmd/web/handlers:equipment.go

@@ -71,16 +71,17 @@ func (app *application) getEquipmentPartOfFragment(w http.ResponseWriter, r *htt
 }
 
 type equipmentData struct {
-	OrgID       string
-	Categories  []categories.Category
-	Inventories []equipment.Equipment
-	Filtered    bool
-	Query       string
-	Category    string
-	Sort        string
-	PageBaseURL template.URL
-	PrintURL    template.URL
-	Pagination  pagination.Metadata
+	OrgID           string
+	Categories      []categories.Category
+	Inventories     []equipment.Equipment
+	Filtered        bool
+	Query           string
+	Category        string
+	Sort            string
+	PageBaseURL     template.URL
+	PrintURL        template.URL
+	Pagination      pagination.Metadata
+	ImportSessionID string
 }
 
 func (app *application) getEquipment(w http.ResponseWriter, r *http.Request) *httperr.Error {
@@ -117,18 +118,24 @@ func (app *application) getEquipment(w http.ResponseWriter, r *http.Request) *ht
 		return httperr.InternalServerError(err)
 	}
 
+	var importSessionID string
+	if session, err := app.services.equipmentImports.GetStagedSession(ctx, id); err == nil {
+		importSessionID = session.ID
+	}
+
 	tmpl := app.html.TemplateData(r)
 	tmpl.Data = equipmentData{
-		OrgID:       id,
-		Categories:  cats,
-		Inventories: items,
-		Filtered:    query != "" || category != "",
-		Query:       query,
-		Category:    category,
-		Sort:        sort,
-		PageBaseURL: template.URL(equipmentPageURL(id, query, category, sort)),  // #nosec G203
-		PrintURL:    template.URL(equipmentPrintURL(id, query, category, sort)), // #nosec G203
-		Pagination:  meta,
+		OrgID:           id,
+		Categories:      cats,
+		Inventories:     items,
+		Filtered:        query != "" || category != "",
+		Query:           query,
+		Category:        category,
+		Sort:            sort,
+		PageBaseURL:     template.URL(equipmentPageURL(id, query, category, sort)),  // #nosec G203
+		PrintURL:        template.URL(equipmentPrintURL(id, query, category, sort)), // #nosec G203
+		Pagination:      meta,
+		ImportSessionID: importSessionID,
 	}
 
 	// HTMX live-search: return only the results fragment so the page URL