feat: make edit visibility a toggle (#277)

* feat: make edit visibility a toggle

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Tweak SVG dropdown icon size & color

---------

Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: Thomas Miceli <tho.miceli@gmail.com>

internal/web/test/gist_test.go

@@ -1,10 +1,11 @@
 package test
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/require"
 	"github.com/thomiceli/opengist/internal/db"
 	"github.com/thomiceli/opengist/internal/git"
-	"testing"
 )
 
 func TestGists(t *testing.T) {
@@ -28,9 +29,11 @@ func TestGists(t *testing.T) {
 	gist1 := db.GistDTO{
 		Title:       "gist1",
 		Description: "my first gist",
-		Private:     0,
-		Name:        []string{"gist1.txt", "gist2.txt", "gist3.txt"},
-		Content:     []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 0,
+		},
+		Name:    []string{"gist1.txt", "gist2.txt", "gist3.txt"},
+		Content: []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
 	}
 	err = s.request("POST", "/", gist1, 302)
 	require.NoError(t, err)
@@ -57,9 +60,11 @@ func TestGists(t *testing.T) {
 	gist2 := db.GistDTO{
 		Title:       "gist2",
 		Description: "my second gist",
-		Private:     0,
-		Name:        []string{"", "gist2.txt", "gist3.txt"},
-		Content:     []string{"", "yeah\ncool", "yeah\ncool gist actually"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 0,
+		},
+		Name:    []string{"", "gist2.txt", "gist3.txt"},
+		Content: []string{"", "yeah\ncool", "yeah\ncool gist actually"},
 	}
 	err = s.request("POST", "/", gist2, 200)
 	require.NoError(t, err)
@@ -67,9 +72,11 @@ func TestGists(t *testing.T) {
 	gist3 := db.GistDTO{
 		Title:       "gist3",
 		Description: "my third gist",
-		Private:     0,
-		Name:        []string{""},
-		Content:     []string{"yeah"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 0,
+		},
+		Name:    []string{""},
+		Content: []string{"yeah"},
 	}
 	err = s.request("POST", "/", gist3, 302)
 	require.NoError(t, err)
@@ -110,9 +117,11 @@ func TestVisibility(t *testing.T) {
 	gist1 := db.GistDTO{
 		Title:       "gist1",
 		Description: "my first gist",
-		Private:     db.UnlistedVisibility,
-		Name:        []string{""},
-		Content:     []string{"yeah"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: db.UnlistedVisibility,
+		},
+		Name:    []string{""},
+		Content: []string{"yeah"},
 	}
 	err = s.request("POST", "/", gist1, 302)
 	require.NoError(t, err)
@@ -121,19 +130,19 @@ func TestVisibility(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, db.UnlistedVisibility, gist1db.Private)
 
-	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", nil, 302)
+	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", db.VisibilityDTO{Private: db.PrivateVisibility}, 302)
 	require.NoError(t, err)
 	gist1db, err = db.GetGistByID("1")
 	require.NoError(t, err)
 	require.Equal(t, db.PrivateVisibility, gist1db.Private)
 
-	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", nil, 302)
+	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", db.VisibilityDTO{Private: db.PublicVisibility}, 302)
 	require.NoError(t, err)
 	gist1db, err = db.GetGistByID("1")
 	require.NoError(t, err)
 	require.Equal(t, db.PublicVisibility, gist1db.Private)
 
-	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", nil, 302)
+	err = s.request("POST", "/"+gist1db.User.Username+"/"+gist1db.Uuid+"/visibility", db.VisibilityDTO{Private: db.UnlistedVisibility}, 302)
 	require.NoError(t, err)
 	gist1db, err = db.GetGistByID("1")
 	require.NoError(t, err)
@@ -152,9 +161,11 @@ func TestLikeFork(t *testing.T) {
 	gist1 := db.GistDTO{
 		Title:       "gist1",
 		Description: "my first gist",
-		Private:     1,
-		Name:        []string{""},
-		Content:     []string{"yeah"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 1,
+		},
+		Name:    []string{""},
+		Content: []string{"yeah"},
 	}
 	err = s.request("POST", "/", gist1, 302)
 	require.NoError(t, err)
@@ -212,9 +223,11 @@ func TestCustomUrl(t *testing.T) {
 		Title:       "gist1",
 		URL:         "my-gist",
 		Description: "my first gist",
-		Private:     0,
-		Name:        []string{"gist1.txt", "gist2.txt", "gist3.txt"},
-		Content:     []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 0,
+		},
+		Name:    []string{"gist1.txt", "gist2.txt", "gist3.txt"},
+		Content: []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
 	}
 	err = s.request("POST", "/", gist1, 302)
 	require.NoError(t, err)
@@ -241,9 +254,11 @@ func TestCustomUrl(t *testing.T) {
 	gist2 := db.GistDTO{
 		Title:       "gist2",
 		Description: "my second gist",
-		Private:     0,
-		Name:        []string{"gist1.txt", "gist2.txt", "gist3.txt"},
-		Content:     []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
+		VisibilityDTO: db.VisibilityDTO{
+			Private: 0,
+		},
+		Name:    []string{"gist1.txt", "gist2.txt", "gist3.txt"},
+		Content: []string{"yeah", "yeah\ncool", "yeah\ncool gist actually"},
 	}
 	err = s.request("POST", "/", gist2, 302)
 	require.NoError(t, err)

internal/web/test/server.go

@@ -3,13 +3,6 @@ package test
 import (
 	"errors"
 	"fmt"
-	"github.com/rs/zerolog/log"
-	"github.com/stretchr/testify/require"
-	"github.com/thomiceli/opengist/internal/config"
-	"github.com/thomiceli/opengist/internal/db"
-	"github.com/thomiceli/opengist/internal/git"
-	"github.com/thomiceli/opengist/internal/memdb"
-	"github.com/thomiceli/opengist/internal/web"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -21,6 +14,14 @@ import (
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/rs/zerolog/log"
+	"github.com/stretchr/testify/require"
+	"github.com/thomiceli/opengist/internal/config"
+	"github.com/thomiceli/opengist/internal/db"
+	"github.com/thomiceli/opengist/internal/git"
+	"github.com/thomiceli/opengist/internal/memdb"
+	"github.com/thomiceli/opengist/internal/web"
 )
 
 type testServer struct {
@@ -106,7 +107,7 @@ func structToURLValues(s interface{}) url.Values {
 	for i := 0; i < rValue.NumField(); i++ {
 		field := rValue.Type().Field(i)
 		tag := field.Tag.Get("form")
-		if tag != "" {
+		if tag != "" || field.Anonymous {
 			if field.Type.Kind() == reflect.Int {
 				fieldValue := rValue.Field(i).Int()
 				v.Add(tag, strconv.FormatInt(fieldValue, 10))
@@ -115,6 +116,12 @@ func structToURLValues(s interface{}) url.Values {
 				for _, va := range fieldValue {
 					v.Add(tag, va)
 				}
+			} else if field.Type.Kind() == reflect.Struct {
+				for key, val := range structToURLValues(rValue.Field(i).Interface()) {
+					for _, vv := range val {
+						v.Add(key, vv)
+					}
+				}
 			} else {
 				fieldValue := rValue.Field(i).String()
 				v.Add(tag, fieldValue)