Skip to content

Improved validation #47

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
ellizio merged 1 commit into from
Aug 22, 2025
Merged

Improved validation #47

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
2 changes: 2 additions & 0 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/dialogs/CliDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ class CliDialog(private val model: CliDialogModel) : BaseDialog(false) {
.emptyText(UiBundle.text("cli.filename.empty-text"))
.comment(UiBundle.text("cli.filename.comment"))
.bindText(model.fileName)
.validationOnInput(CliDialogValidators.fileNameValidator())
.validationOnApply(CliDialogValidators.fileNameValidator())
}
row("--namespace-prefix") {
textField()
Expand Down
2 changes: 1 addition & 1 deletion src/rider/main/kotlin/ru/ellizio/odatacliui/models/CliDialogModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CliDialogModel(project: Project, private val actionMetadata: ActionMetadat
fun buildODataCliCommand(): GeneralCommandLine = CommandLineBuilder(DotnetToolsUtils.getToolDefaultPath("odata-cli"), "generate")
.withParameter("--metadata-uri", metadataUri.get())
.withParameter("--service-name", serviceName.get(), atLeast031)
.withParameter("--file-name", fileName.get())
.withParameter("--file-name", fileName.get().removeSuffix(".cs"))
.withParameter("--custom-headers", customHeaders.get())
.withParameter("--proxy", proxy.get())
.withParameter("--namespace-prefix", namespacePrefix.get())
Expand Down
7 changes: 7 additions & 0 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/models/validators/CliDialogValidators.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ object CliDialogValidators {
null
}

fun fileNameValidator(): ValidationInfoBuilder.(JTextField) -> ValidationInfo? = {
if (it.text.isNotEmpty() && it.text.isBlank())
error("File name must not be entirely whitespace")
else
null
}

fun namespacePrefixValidator(): ValidationInfoBuilder.(JTextField) -> ValidationInfo? = {
if (it.text.isNotEmpty() && !namespacePrefixRegex.matches(it.text))
error("Namespace prefix must be in a valid format")
Expand Down
1 change: 1 addition & 0 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class CliToolWindowManager(private val project: Project) {
fun instantiateConsole(): ConsoleView {
val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
val content = toolWindow.contentManager.factory.createContent(consoleView.component, UiBundle.text("cli.tab.generate"), true)
content.setDisposer(consoleView);
toolWindow.contentManager.addContent(content)
toolWindow.activate {
toolWindow.contentManager.setSelectedContent(content)
Expand Down