Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add theme to existing and new users' metadata #1681

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Add theme to existing and new users' metadata #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/pkg/provision/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func Run(ctx context.Context, log *zap.Logger, s store.Storer, provisionOpt opti
func() error { return defaultAuthClient(ctx, log.Named("auth.clients"), s, authOpt) },
func() error { return addAuthSuperUsers(ctx, log.Named("auth.super-users"), s, authOpt) },
func() error { return invalidateDedupRules(ctx, log.Named("compose.deduplication"), s) },
func() error { return setUsersTheme(ctx, log.Named("users.theme"), s) },
func() error { return updateWebappTheme(ctx, log.Named("webapp.themes"), s) },
}

Expand Down
29 changes: 29 additions & 0 deletions server/pkg/provision/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/cortezaproject/corteza/server/pkg/filter"
"github.com/cortezaproject/corteza/server/pkg/id"
"github.com/cortezaproject/corteza/server/pkg/logger"
"github.com/cortezaproject/corteza/server/pkg/sass"
"github.com/cortezaproject/corteza/server/store"
"github.com/cortezaproject/corteza/server/system/types"
"go.uber.org/zap"
Expand Down Expand Up @@ -101,3 +102,31 @@ func loadSystemUsers(ctx context.Context, s store.Users) (m map[string]*types.Us

return
}

func setUsersTheme(ctx context.Context, log *zap.Logger, s store.Users) (err error) {
var (
f = types.UserFilter{
Deleted: filter.StateInclusive,
}

users []*types.User
)

if set, _, err := store.SearchUsers(ctx, s, f); err == nil {
for _, r := range set {
if r.Meta.Theme == "" {
r.Meta.Theme = sass.LightTheme

users = append(users, r)
}
}
}

err = store.UpdateUser(ctx, s, users...)
if err != nil {
log.Error("error provisioning users theme", zap.Error(err))
return err
}

return nil
}
4 changes: 4 additions & 0 deletions server/system/service/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/cortezaproject/corteza/server/pkg/filter"
"github.com/cortezaproject/corteza/server/pkg/handle"
"github.com/cortezaproject/corteza/server/pkg/label"
"github.com/cortezaproject/corteza/server/pkg/sass"
"github.com/cortezaproject/corteza/server/store"
"github.com/cortezaproject/corteza/server/system/service/event"
"github.com/cortezaproject/corteza/server/system/types"
Expand Down Expand Up @@ -387,6 +388,9 @@ func (svc user) Create(ctx context.Context, new *types.User) (u *types.User, err
return
}

//add default user's theme
new.Meta.Theme = sass.LightTheme

// Process avatar initials Image
if err = svc.generateUserAvatarInitial(ctx, new); err != nil {
return
Expand Down
Loading