Continued work on the test/edit post routet

Adding license to project

Co-authored-by: Gregory Ballantine <gballantine@bitgoblin.tech>
Reviewed-on: #10

.gitignore

@@ -3,6 +3,7 @@ blt
 
 # Local data files
 data/
+tmp/
 
 # Compiled assets
 public/css/

.woodpecker.yml

@@ -0,0 +1,32 @@
+pipeline:
+  build:
+    image: golang:1.22
+    commands:
+      - go mod vendor
+      - GOOS=linux GOARCH=amd64 go build -o "dist/blt-linux-amd64-${CI_COMMIT_TAG}.bin"
+      - GOOS=windows GOARCH=amd64 go build -o "dist/blt-windows-amd64-${CI_COMMIT_TAG}.exe"
+
+  assets:
+    image: node:24
+    commands:
+      - npm install
+      - npm run grunt build
+
+  package:
+    image: alpine
+    commands:
+      - tar -cvzf "dist/blt-assets-${CI_COMMIT_TAG}.tar.gz" public/
+    when:
+      event: tag
+
+  gitea_release:
+    image: plugins/gitea-release
+    settings:
+      api_key:
+        from_secret: gitea_api_key
+      base_url: https://git.metaunix.net
+      title: "${CI_COMMIT_TAG}"
+      files:
+        - dist/blt-*
+    when:
+      event: tag

Gruntfile.js

@@ -60,6 +60,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-coffee');
 
   // CLI tasks.
-  grunt.registerTask('default', ['sass', 'coffee']);
+  grunt.registerTask('build', ['sass', 'coffee']);
+  grunt.registerTask('dev', ['watch']);
+  grunt.registerTask('default', ['build']);
 
 };

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	gotemplate "html/template"
 	"log"
 	"net/http"
 
@@ -25,7 +26,16 @@ func main() {
 	f.Use(flamego.Renderer())
 
 	// initialize templating engine
-	f.Use(template.Templater())
+	f.Use(template.Templater(template.Options{
+			FuncMaps: []gotemplate.FuncMap{
+				{
+					"contains": web.Contains,
+				},
+			},
+			Directory: "templates",
+			Extensions: []string{".tmpl", ".html"},
+		},
+	))
 
 	// inject custom middleware
 	f.Use(middleware.CustomVars)

models/benchmark.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+  "strconv"
+
   "gorm.io/gorm"
 )
 
@@ -16,3 +18,7 @@ type Benchmark struct {
   // has many results
   Results     []Result
 }
+
+func (b *Benchmark) StringID() string {
+  return strconv.Itoa(int(b.ID))
+}

models/test.go

@@ -1,6 +1,9 @@
 package models
 
 import (
+  "fmt"
+  "strconv"
+
   "gorm.io/gorm"
 )
 
@@ -19,3 +22,29 @@ type Test struct {
   // has many results
   Results       []Result
 }
+
+func (t *Test) SelectedBenchmarks() []string {
+  benchmarks := t.Benchmarks
+  ids := make([]string, len(benchmarks))
+  for i, b := range benchmarks {
+    ids[i] = strconv.Itoa(int(b.ID))
+  }
+  return ids
+}
+
+func (t *Test) IsBenchmarkSelected(benchmarkID string) bool {
+  benchmarkConv, err := strconv.ParseUint(benchmarkID, 10, 0)
+  if err != nil {
+    fmt.Println("Error parsing Uint: ", err)
+  }
+
+  benchmarkUint := uint(benchmarkConv)
+
+  for _, b := range t.Benchmarks {
+    if b.ID == benchmarkUint {
+      return true
+    }
+  }
+
+  return false
+}

package.json

@@ -4,7 +4,8 @@
   "description": "Self-hosted PC hardware benchmark logging tool",
   "main": "index.js",
   "scripts": {
-    "grunt": "grunt"
+    "grunt": "grunt",
+    "nodemon": "nodemon"
   },
   "repository": {
     "type": "git",
@@ -27,8 +28,8 @@
   "devDependencies": {
     "grunt": "^1.5.3",
     "grunt-cli": "^1.4.3",
-    "grunt-contrib-sass": "^2.0.0",
     "grunt-contrib-coffee": "^2.1.0",
+    "grunt-contrib-sass": "^2.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "sass": "^1.55.0"
   }

templates/test/edit.tmpl

@@ -0,0 +1,53 @@
+{{ template "header" . }}
+
+<div class="row">
+  <h2>{{ .title }}</h2>
+
+  <form class="twelve columns" action="/test/{{ .test.ID }}/edit" method="POST">
+    <div class="row">
+      <div class="columns four">
+        <label for="test_hardware">
+          Hardware Component:
+          <select id="test_hardware" class="u-full-width" name="test_hardware">
+            {{ $testHardwareID := .test.Hardware.ID }}
+            {{ range $hw := .hardware }}
+              <option value="{{ $hw.ID }}" {{ if eq $testHardwareID $hw.ID }}selected{{ end }}>{{ $hw.Name }}</option>
+            {{ end }}
+          </select>
+        </label>
+      </div>
+
+      <div class="columns eight">
+        <label for="test_name">
+          Test name:
+          <input id="test_name" class="u-full-width" type="text" name="test_name" placeholder="My hardware benchmarking test" value="{{ .test.Name }}">
+        </label>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="columns twelve">
+        <label for="test_benchmarks">
+          Benchmarks to Test:
+          <select id="test_benchmarks" class="u-full-width" name="test_benchmarks" multiple>
+            {{ $selectedBenchmarks := .selectedBenchmarks }}
+            {{ range $bm := .benchmarks }}
+              <option value="{{ $bm.ID }}" {{ if contains $selectedBenchmarks $bm.StringID }}selected{{ end }}>{{ $bm.Name }}</option>
+            {{ end }}
+          </select>
+        </label>
+      </div>
+    </div>
+
+    <div class="row">
+      <label for="test_description">
+        Test description:
+        <textarea id="test_description" class="twelve columns" cols="30" rows="10" name="test_description"></textarea>
+      </label>
+    </div>
+
+    <input class="button-primary u-full-width" type="submit" value="Submit">
+  </form>
+</div>
+
+{{ template "footer" . }}

web/helpers.go

@@ -0,0 +1,10 @@
+package web
+
+func Contains(slice []string, val string) bool {
+	for _, v := range slice {
+		if v == val {
+			return true
+		}
+	}
+	return false
+}

web/routes.go

@@ -51,7 +51,10 @@ func RegisterRoutes(f *flamego.Flame) {
     f.Get("/create", routes.TestGetCreate)
     f.Post("/create", binding.Form(forms.TestForm{}), routes.TestPostCreate)
 
-    f.Get("/{test_id}", routes.TestGetView)
+    f.Group("/{test_id}", func() {
+      f.Get("", routes.TestGetView)
+      f.Get("/edit", routes.TestGetEdit)
+    })
   })
 
   // result routes

web/routes/test.go

@@ -81,3 +81,68 @@ func TestPostCreate(c flamego.Context, form forms.TestForm, errs binding.Errors)
 
   c.Redirect(fmt.Sprintf("/test/%d", test.ID))
 }
+
+func TestGetEdit(c flamego.Context, t template.Template, data template.Data) {
+  // find test in DB
+  testID := c.Param("test_id")
+  var test models.Test
+  models.DB.Preload("Hardware").Preload("Benchmarks").First(&test, testID)
+  data["test"] = test
+
+  // add hardware components to template
+  var hardware []models.Hardware
+  models.DB.Find(&hardware)
+  data["hardware"] = hardware
+
+  // add benchmarks to template
+  var benchmarks []models.Benchmark
+  models.DB.Find(&benchmarks)
+  data["benchmarks"] = benchmarks
+
+  // determine which benchmarks are selected in a test
+  selectedBenchmarks := test.SelectedBenchmarks()
+  data["selectedBenchmarks"] = selectedBenchmarks
+
+  data["title"] = fmt.Sprintf("Editing Test: %s", test.Name)
+  t.HTML(http.StatusOK, "test/edit")
+}
+
+func TestPostEdit(c flamego.Context, form forms.TestForm, errs binding.Errors) {
+  if len(errs) > 0 {
+    var err error
+    switch errs[0].Category {
+    case binding.ErrorCategoryValidation:
+      err = errs[0].Err.(validator.ValidationErrors)[0]
+    default:
+      err = errs[0].Err
+    }
+    log.Fatal(err)
+  }
+
+  // find test ID from request
+  testID := c.Param("test_id")
+
+  // find hardware from DB
+  var test models.Test
+  models.DB.Preload("Hardware").Preload("Benchmarks").First(&test, testID)
+
+  test.Name = form.Name
+  test.Description = form.Description
+  test.HardwareID = form.Hardware
+
+  // bind benchmarks to test that aren't already associated
+  for _, b := range form.Benchmarks {
+    if ! test.IsBenchmarkSelected(b) {
+      var benchmark models.Benchmark
+      models.DB.First(&benchmark, b) // find benchmark
+      models.DB.Model(&test).Association("Benchmarks").Append(&benchmark)
+    }
+  }
+
+  // removed associated benchmarks that weren't in the form
+  for _, b := range test.Benchmarks {
+
+  }
+
+  c.Redirect(fmt.Sprintf("/test/%d", test.ID))
+}