-
Notifications
You must be signed in to change notification settings - Fork 127
App-14418: add more direction for module and model name #5629
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.
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
Changes from 4 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -224,6 +224,15 @@ func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModule | |
| return nil | ||
| } | ||
|
|
||
| // returns model name based on chosen resource | ||
| func modelName(module *modulegen.ModuleInputs) string { | ||
| resourceName := strings.Fields(module.Resource)[0] | ||
| if resourceName == "generic" { | ||
| resourceName = resourceName + "_" + strings.Fields(module.Resource)[1] | ||
| } | ||
| return resourceName | ||
| } | ||
|
|
||
| // Prompt the user for information regarding the module they want to create | ||
| // returns the modulegen.ModuleInputs struct that contains the information the user entered. | ||
| func promptUser(module *modulegen.ModuleInputs) error { | ||
|
|
@@ -283,7 +292,9 @@ func promptUser(module *modulegen.ModuleInputs) error { | |
| Description("For more details about modular resources, view the documentation at \nhttps://docs.viam.com/registry/"), | ||
| huh.NewInput(). | ||
| Title("Set a module name:"). | ||
| Description("The module name can contain only alphanumeric characters, dashes, and underscores."). | ||
| Description("This can be the name of the piece of hardware, the challenge you are trying to\n"+ | ||
| "solve, the name of the project, etc. The module name can contain only alphanumeric\n"+ | ||
| "characters, dashes, and underscores."). | ||
| Value(&module.ModuleName). | ||
| Placeholder("my-module"). | ||
| Suggestions([]string{"my-module"}). | ||
|
|
@@ -333,7 +344,12 @@ func promptUser(module *modulegen.ModuleInputs) error { | |
| Title("Set a model name of the resource:"). | ||
| Description("This is the name of the new resource model that your module will provide.\n"+ | ||
| "The model name can contain only alphanumeric characters, dashes, and underscores."). | ||
| Placeholder("my-model"). | ||
| PlaceholderFunc(func() string { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the ticket calls to pre-populate text rather than have the background gray placeholder, but the huh package doesn't have the ValueFunc() implemented yet to dynamically change it I tried:
Didn't think it was worth it to split the form into two (ask resource name first and then prepopulate on another loaded form), switch packages, or make an open source contribution to huh package |
||
| return modelName(module) | ||
| }, &module.Resource). | ||
| SuggestionsFunc(func() []string { | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the only suggestion that makes sense to make is the model name we recommend |
||
| return []string{modelName(module)} | ||
| }, &module.Resource). | ||
| Value(&module.ModelName). | ||
| Validate(func(s string) error { | ||
| if s == "" { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
took wording from ticket but lmk if you want to change the verbage or wording!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls add a new line before
The module name can contain only...