Skip to content

feat!: Validate monotonic numbers for rich parameters #6046

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 10 commits into from
Feb 7, 2023
Merged

feat!: Validate monotonic numbers for rich parameters #6046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45d5261
Database changes
mtojek Feb 6, 2023
7d6314e
protobuf
mtojek Feb 6, 2023
88495f2
Fix: docs
mtojek Feb 6, 2023
6715d27
workspaces_test
mtojek Feb 6, 2023
c1097ee
Validation in coderd
mtojek Feb 6, 2023
8426ef2
Fix: resources
mtojek Feb 6, 2023
ef470b2
omitempty
mtojek Feb 6, 2023
2a65b72
UI changes
mtojek Feb 6, 2023
4b34d1e
UI tests
mtojek Feb 6, 2023
0c5e49a
fix
mtojek Feb 6, 2023
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
Prev Previous commit
Next Next commit
omitempty
  • Loading branch information
@mtojek
mtojek committed Feb 6, 2023
commit ef470b2cc785ae4e046017f028806dd44e7f9ee9
10 changes: 5 additions & 5 deletions codersdk/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ type TemplateVersionParameter struct {
DefaultValue string `json:"default_value"`
Icon string `json:"icon"`
Options []TemplateVersionParameterOption `json:"options"`
ValidationError string `json:"validation_error"`
ValidationRegex string `json:"validation_regex"`
ValidationMin int32 `json:"validation_min"`
ValidationMax int32 `json:"validation_max"`
ValidationMonotonic ValidationMonotonicOrder `json:"validation_monotonic" enums:"increasing,decreasing"`
ValidationError string `json:"validation_error,omitempty"`
ValidationRegex string `json:"validation_regex,omitempty"`
ValidationMin int32 `json:"validation_min,omitempty"`
ValidationMax int32 `json:"validation_max,omitempty"`
ValidationMonotonic ValidationMonotonicOrder `json:"validation_monotonic,omitempty" enums:"increasing,decreasing"`
}

// TemplateVersionParameterOption represents a selectable option for a template parameter.
Expand Down
10 changes: 5 additions & 5 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,11 +757,11 @@ export interface TemplateVersionParameter {
readonly default_value: string
readonly icon: string
readonly options: TemplateVersionParameterOption[]
readonly validation_error: string
readonly validation_regex: string
readonly validation_min: number
readonly validation_max: number
readonly validation_monotonic: ValidationMonotonicOrder
readonly validation_error?: string
readonly validation_regex?: string
readonly validation_min?: number
readonly validation_max?: number
readonly validation_monotonic?: ValidationMonotonicOrder
}

// From codersdk/templateversions.go
Expand Down
5 changes: 2 additions & 3 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,7 @@ export const ValidationSchemaForRichParameters = (
switch (templateParameter.type) {
case "number":
if (
templateParameter.validation_min === 0 &&
templateParameter.validation_max === 0
!templateParameter.validation_min || !templateParameter.validation_max
) {
return true
}
Expand All @@ -536,7 +535,7 @@ export const ValidationSchemaForRichParameters = (
break
case "string":
{
if (templateParameter.validation_regex.length === 0) {
if (!templateParameter.validation_regex || templateParameter.validation_regex.length === 0) {
return true
}

Expand Down
17 changes: 1 addition & 16 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,11 +639,6 @@ export const MockTemplateVersionParameter1: TypesGen.TemplateVersionParameter =
mutable: true,
icon: "/icon/folder.svg",
options: [],
validation_error: "",
validation_regex: "",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

export const MockTemplateVersionParameter2: TypesGen.TemplateVersionParameter =
Expand All @@ -655,11 +650,9 @@ export const MockTemplateVersionParameter2: TypesGen.TemplateVersionParameter =
mutable: true,
icon: "/icon/folder.svg",
options: [],
validation_error: "",
validation_regex: "",
validation_min: 1,
validation_max: 3,
validation_monotonic: "",
validation_monotonic: "increasing",
}

export const MockTemplateVersionParameter3: TypesGen.TemplateVersionParameter =
Expand All @@ -673,9 +666,6 @@ export const MockTemplateVersionParameter3: TypesGen.TemplateVersionParameter =
options: [],
validation_error: "No way!",
validation_regex: "^[a-z]{3}$",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

export const MockTemplateVersionParameter4: TypesGen.TemplateVersionParameter =
Expand All @@ -687,11 +677,6 @@ export const MockTemplateVersionParameter4: TypesGen.TemplateVersionParameter =
mutable: false,
icon: "/icon/database.svg",
options: [],
validation_error: "",
validation_regex: "",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

// requests the MockWorkspace
Expand Down