omitempty

mtojek · mtojek · commit ef470b2cc785 · 2023-02-06T14:55:28.000+01:00
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -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.
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -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
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -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
                   }
@@ -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
                     }
 
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -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 =
@@ -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 =
@@ -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 =
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -515,8 +515,7 @@ export const ValidationSchemaForRichParameters = (`
`515`	`515`	`switch (templateParameter.type) {`
`516`	`516`	`case "number":`
`517`	`517`	`if (`
`518`		`- templateParameter.validation_min === 0 &&`
`519`		`- templateParameter.validation_max === 0`
	`518`	`+ !templateParameter.validation_min \|\| !templateParameter.validation_max`
`520`	`519`	`) {`
`521`	`520`	`return true`
`522`	`521`	`}`
`@@ -536,7 +535,7 @@ export const ValidationSchemaForRichParameters = (`
`536`	`535`	`break`
`537`	`536`	`case "string":`
`538`	`537`	`{`
`539`		`- if (templateParameter.validation_regex.length === 0) {`
	`538`	`+ if (!templateParameter.validation_regex \|\| templateParameter.validation_regex.length === 0) {`
`540`	`539`	`return true`
`541`	`540`	`}`
`542`	`541`