Skip to content

Some UI improvements around current profile #1273

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

Merged
merged 1 commit into from
May 26, 2023
Merged

Some UI improvements around current profile #1273

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
48 changes: 39 additions & 9 deletions cmd/profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ User profiles can be configured with a "config.yml" file in the profile director
}

if fromName == "" {
fmt.Printf("Created profile %s.\n", newProfileName)
fmt.Printf("Created profile %q.\n", newProfileName)
} else {
fmt.Printf("Created profile %s from %s.\n", newProfileName, fromName)
fmt.Printf("Created profile %q from %q.\n", newProfileName, fromName)
}

return nil
Expand All @@ -82,12 +82,32 @@ User profiles can be configured with a "config.yml" file in the profile director
}
profileName := args[0]

err := profile.DeleteProfile(profileName)
config, err := install.Configuration()
if err != nil {
return fmt.Errorf("failed to load current configuration: %w", err)
}

err = profile.DeleteProfile(profileName)
if err != nil {
return errors.Wrap(err, "error deleting profile")
}

fmt.Printf("Deleted profile %s\n", profileName)
if currentProfile := config.CurrentProfile(); currentProfile == profileName {
config.SetCurrentProfile(profile.DefaultProfile)

location, err := locations.NewLocationManager()
if err != nil {
return fmt.Errorf("error fetching profile: %w", err)
}
err = install.WriteConfigFile(location, config)
if err != nil {
return fmt.Errorf("failed to store configuration: %w", err)
}

cmd.Printf("%q was the current profile. Default profile will be used now.\n", profileName)
}

fmt.Printf("Deleted profile %q.\n", profileName)

return nil
},
Expand Down Expand Up @@ -117,7 +137,11 @@ User profiles can be configured with a "config.yml" file in the profile director

switch format {
case tableFormat:
return formatTable(profileList)
config, err := install.Configuration()
if err != nil {
return fmt.Errorf("failed to load current configuration: %w", err)
}
return formatTable(profileList, config.CurrentProfile())
case jsonFormat:
return formatJSON(profileList)
default:
Expand Down Expand Up @@ -156,6 +180,8 @@ User profiles can be configured with a "config.yml" file in the profile director
if err != nil {
return fmt.Errorf("failed to store configuration: %w", err)
}

cmd.Printf("Current profile set to %q.\n", profileName)
return nil
},
}
Expand All @@ -181,9 +207,9 @@ func formatJSON(profileList []profile.Metadata) error {
return nil
}

func formatTable(profileList []profile.Metadata) error {
func formatTable(profileList []profile.Metadata, currentProfile string) error {
table := tablewriter.NewWriter(os.Stdout)
var profilesTable = profileToList(profileList)
var profilesTable = profileToList(profileList, currentProfile)

table.SetHeader([]string{"Name", "Date Created", "User", "Version", "Path"})
table.SetHeaderColor(
Expand All @@ -209,10 +235,14 @@ func formatTable(profileList []profile.Metadata) error {
return nil
}

func profileToList(profiles []profile.Metadata) [][]string {
func profileToList(profiles []profile.Metadata, currentProfile string) [][]string {
var profileList [][]string
for _, profile := range profiles {
profileList = append(profileList, []string{profile.Name, profile.DateCreated.Format(time.RFC3339), profile.User, profile.Version, profile.Path})
name := profile.Name
if name == currentProfile {
name = name + " (current)"
}
profileList = append(profileList, []string{name, profile.DateCreated.Format(time.RFC3339), profile.User, profile.Version, profile.Path})
}

return profileList
Expand Down