forked from
tangled.org/core
Monorepo for Tangled
appview: allows a default knot to be configured
Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>
+154
-7
+8
appview/db/db.go
+8
appview/db/db.go
···
640
640
foreign key (repo_at) references repos(at_uri) on delete cascade
641
641
);
642
642
643
+
create table if not exists knot_preferences (
644
+
id integer primary key autoincrement,
645
+
user_did text not null unique,
646
+
default_knot text,
647
+
648
+
foreign key (user_did, default_knot) references registrations(did, domain) on delete cascade
649
+
);
650
+
643
651
create table if not exists migrations (
644
652
id integer primary key autoincrement,
645
653
name text unique
+35
appview/db/preferences.go
+35
appview/db/preferences.go
···
50
50
51
51
return nil
52
52
}
53
+
54
+
func GetKnotPreference(e Execer, did string) (*models.KnotPreference, error) {
55
+
var knotPreference models.KnotPreference
56
+
57
+
err := e.QueryRow(
58
+
`select id, user_did, default_knot from knot_preferences where user_did = ?`,
59
+
did,
60
+
).Scan(&knotPreference.ID, &knotPreference.Did, &knotPreference.DefaultKnot)
61
+
if err == sql.ErrNoRows {
62
+
return nil, nil
63
+
}
64
+
65
+
if err != nil {
66
+
return nil, err
67
+
}
68
+
69
+
return &knotPreference, nil
70
+
}
71
+
72
+
func UpsertKnotPreference(e Execer, did, defaultKnot string) error {
73
+
_, err := e.Exec(
74
+
`insert or replace into knot_preferences (
75
+
user_did,
76
+
default_knot
77
+
)
78
+
values (?, ?)`,
79
+
did,
80
+
defaultKnot,
81
+
)
82
+
if err != nil {
83
+
return err
84
+
}
85
+
86
+
return nil
87
+
}
+20
-2
appview/knots/knots.go
+20
-2
appview/knots/knots.go
···
68
68
return
69
69
}
70
70
71
+
availableKnots, err := k.Enforcer.GetKnotsForUser(user.Did())
72
+
if err != nil {
73
+
k.Logger.Error("failed to fetch available knots for user", "err", err)
74
+
w.WriteHeader(http.StatusInternalServerError)
75
+
return
76
+
}
77
+
78
+
defaultKnot := ""
79
+
knotPrefence, err := db.GetKnotPreference(k.Db, user.Did())
80
+
if err != nil {
81
+
k.Logger.Warn("gettings users knot preferences", "error", err)
82
+
}
83
+
if knotPrefence != nil {
84
+
defaultKnot = knotPrefence.DefaultKnot
85
+
}
86
+
71
87
k.Pages.Knots(w, pages.KnotsParams{
72
-
LoggedInUser: user,
73
-
Registrations: registrations,
88
+
LoggedInUser: user,
89
+
Registrations: registrations,
90
+
AvailableKnots: availableKnots,
91
+
DefaultKnot: defaultKnot,
74
92
})
75
93
}
76
94
+6
appview/models/preferences.go
+6
appview/models/preferences.go
+7
-3
appview/pages/pages.go
+7
-3
appview/pages/pages.go
···
524
524
}
525
525
526
526
type KnotsParams struct {
527
-
LoggedInUser *oauth.MultiAccountUser
528
-
Registrations []models.Registration
529
-
Tab string
527
+
LoggedInUser *oauth.MultiAccountUser
528
+
Registrations []models.Registration
529
+
Tab string
530
+
AvailableKnots []string
531
+
DefaultKnot string
530
532
}
531
533
532
534
func (p *Pages) Knots(w io.Writer, params KnotsParams) error {
···
590
592
type NewRepoParams struct {
591
593
LoggedInUser *oauth.MultiAccountUser
592
594
Knots []string
595
+
DefaultKnot string
593
596
}
594
597
595
598
func (p *Pages) NewRepo(w io.Writer, params NewRepoParams) error {
···
600
603
LoggedInUser *oauth.MultiAccountUser
601
604
Knots []string
602
605
RepoInfo repoinfo.RepoInfo
606
+
DefaultKnot string
603
607
}
604
608
605
609
func (p *Pages) ForkRepo(w io.Writer, params ForkRepoParams) error {
+28
appview/pages/templates/knots/index.html
+28
appview/pages/templates/knots/index.html
···
31
31
<div class="flex flex-col gap-6">
32
32
{{ block "list" . }} {{ end }}
33
33
{{ block "register" . }} {{ end }}
34
+
{{ block "default-knot" . }} {{ end }}
34
35
</div>
35
36
</section>
36
37
{{ end }}
···
60
61
</div>
61
62
<div id="operation-error" class="text-red-500 dark:text-red-400"></div>
62
63
</section>
64
+
{{ end }}
65
+
66
+
{{ define "default-knot" }}
67
+
<section class="rounded w-full flex flex-col gap-2">
68
+
<h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">default knot</h2>
69
+
<form hx-post="/profile/default-knot" class="col-span-1 md:col-span-1 md:justify-self-end group flex gap-2 items-stretch">
70
+
<select
71
+
id="default-knot"
72
+
name="default-knot"
73
+
required
74
+
class="p-1 max-w-64 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700">
75
+
{{/* For some reason, we can't use an empty string in a <select> in all scenarios unless it is preceded by a disabled select?? No idea, could just be a Firefox thing? */}}
76
+
<option value="[[none]]" class="py-1" {{ if not $.DefaultKnot }}selected{{ end }}>
77
+
Choose a default knot
78
+
</option>
79
+
{{ range $.AvailableKnots }}
80
+
<option value="{{ . }}" class="py-1" {{ if eq . $.DefaultKnot }}selected{{ end }}>
81
+
{{ . }}
82
+
</option>
83
+
{{ end }}
84
+
</select>
85
+
<button class="btn flex gap-2 items-center" type="submit">
86
+
{{ i "check" "size-4" }}
87
+
{{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
88
+
</button>
89
+
</form>
90
+
</section>
63
91
{{ end }}
64
92
65
93
{{ define "register" }}
+3
-1
appview/pages/templates/repo/fork.html
+3
-1
appview/pages/templates/repo/fork.html
···
25
25
value="{{ . }}"
26
26
class="mr-2"
27
27
id="domain-{{ . }}"
28
-
{{if eq (len $.Knots) 1}}checked{{end}}
28
+
{{if eq (len $.Knots) 1}}checked
29
+
{{else if eq $.DefaultKnot . }}checked
30
+
{{end}}
29
31
/>
30
32
<label for="domain-{{ . }}" class="dark:text-white">{{ . }}</label>
31
33
</div>
+3
-1
appview/pages/templates/repo/new.html
+3
-1
appview/pages/templates/repo/new.html
···
156
156
class="mr-2"
157
157
id="domain-{{ . }}"
158
158
required
159
-
{{if eq (len $.Knots) 1}}checked{{end}}
159
+
{{if eq (len $.Knots) 1}}checked
160
+
{{else if eq $.DefaultKnot . }}checked
161
+
{{end}}
160
162
/>
161
163
<label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label>
162
164
</div>
+10
appview/repo/repo.go
+10
appview/repo/repo.go
···
1016
1016
return
1017
1017
}
1018
1018
1019
+
defaultKnot := ""
1020
+
knotPrefence, err := db.GetKnotPreference(rp.db, user.Did())
1021
+
if err != nil {
1022
+
rp.logger.Warn("gettings users knot preferences", "error", err)
1023
+
}
1024
+
if knotPrefence != nil {
1025
+
defaultKnot = knotPrefence.DefaultKnot
1026
+
}
1027
+
1019
1028
rp.pages.ForkRepo(w, pages.ForkRepoParams{
1020
1029
LoggedInUser: user,
1021
1030
Knots: knots,
1022
1031
RepoInfo: rp.repoResolver.GetRepoInfo(r, user),
1032
+
DefaultKnot: defaultKnot,
1023
1033
})
1024
1034
1025
1035
case http.MethodPost:
+23
appview/state/profile.go
+23
appview/state/profile.go
···
745
745
s.updateProfile(profile, w, r)
746
746
}
747
747
748
+
func (s *State) UpdateDefaultKnotPreference(w http.ResponseWriter, r *http.Request) {
749
+
err := r.ParseForm()
750
+
if err != nil {
751
+
log.Println("invalid preference update form", err)
752
+
return
753
+
}
754
+
user := s.oauth.GetMultiAccountUser(r)
755
+
756
+
defaultKnot := r.Form.Get("default-knot")
757
+
758
+
if defaultKnot == "[[none]]" { // see pages/templates/knots/index.html for more info on why we use this value
759
+
defaultKnot = ""
760
+
}
761
+
762
+
err = db.UpsertKnotPreference(s.db, user.Did(), defaultKnot)
763
+
if err != nil {
764
+
log.Println("failed to update default knot preference", err)
765
+
return
766
+
}
767
+
768
+
s.pages.HxRefresh(w)
769
+
}
770
+
748
771
func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r *http.Request) {
749
772
l := s.logger.With("handler", "updateProfile")
750
773
user := s.oauth.GetMultiAccountUser(r)
+1
appview/state/router.go
+1
appview/state/router.go
+10
appview/state/state.go
+10
appview/state/state.go
···
405
405
return
406
406
}
407
407
408
+
defaultKnot := ""
409
+
knotPrefence, err := db.GetKnotPreference(s.db, user.Did())
410
+
if err != nil {
411
+
s.logger.Warn("gettings users knot preferences", "error", err)
412
+
}
413
+
if knotPrefence != nil {
414
+
defaultKnot = knotPrefence.DefaultKnot
415
+
}
416
+
408
417
s.pages.NewRepo(w, pages.NewRepoParams{
409
418
LoggedInUser: user,
410
419
Knots: knots,
420
+
DefaultKnot: defaultKnot,
411
421
})
412
422
413
423
case http.MethodPost: