Skip to content

Commit 7934cbb

Browse files
jcenturionjcenturion
committed
Fix validations on load
1 parent cd26966 commit 7934cbb

File tree

5 files changed

+145
-27
lines changed

5 files changed

+145
-27
lines changed

‎dist/scripts/api-console.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,11 @@
11371137

11381138
keys.forEach(function (fieldName) {
11391139
var value = angular.copy(form.form[fieldName].$viewValue);
1140+
1141+
value = value || '';
1142+
1143+
console.log(value);
1144+
11401145
form.form[fieldName].$setViewValue(value);
11411146
});
11421147

‎dist/styles/api-console-dark-theme.css‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,15 @@ span.CodeMirror-selectedtext { background: none; }
593593
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
594594
}
595595

596-
input.ng-invalid {
596+
/*input.ng-dirty.ng-invalid {
597+
border: 1px solid red;
598+
}*/
599+
600+
input.ng-dirty.ng-invalid-required {
597601
border: 1px solid red;
598602
}
599603

600-
input.ng-invalid-required + span.raml-console-field-validation-error::after {
604+
input.ng-dirty.ng-invalid-required + span.raml-console-field-validation-error::after {
601605
content: 'Required';
602606
color: white;
603607
position: absolute;
@@ -608,6 +612,10 @@ input.ng-invalid-required + span.raml-console-field-validation-error::after {
608612
text-align: center;
609613
}
610614

615+
input.ng-dirty.ng-invalid-min-length {
616+
border: 1px solid red;
617+
}
618+
611619
input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
612620
content: 'Invalid min length';
613621
color: white;
@@ -619,7 +627,11 @@ input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
619627
text-align: center;
620628
}
621629

622-
input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
630+
input.ng-dirty.ng-invalid-max-length {
631+
border: 1px solid red;
632+
}
633+
634+
input.ng-dirty.ng-invalid-max-length + span.raml-console-field-validation-error::after {
623635
content: 'Invalid max length';
624636
color: white;
625637
position: absolute;
@@ -630,7 +642,11 @@ input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
630642
text-align: center;
631643
}
632644

633-
input.ng-invalid-enum + span.raml-console-field-validation-error::after {
645+
input.ng-dirty.ng-invalid-enum {
646+
border: 1px solid red;
647+
}
648+
649+
input.ng-dirty.ng-invalid-enum + span.raml-console-field-validation-error::after {
634650
content: 'Invalid enum value';
635651
color: white;
636652
position: absolute;
@@ -641,7 +657,11 @@ input.ng-invalid-enum + span.raml-console-field-validation-error::after {
641657
text-align: center;
642658
}
643659

644-
input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
660+
input.ng-dirty.ng-invalid-minimum {
661+
border: 1px solid red;
662+
}
663+
664+
input.ng-dirty.ng-invalid-minimum + span.raml-console-field-validation-error::after {
645665
content: 'Invalid minimum';
646666
color: white;
647667
position: absolute;
@@ -652,7 +672,11 @@ input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
652672
text-align: center;
653673
}
654674

655-
input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
675+
input.ng-dirty.ng-invalid-maximum {
676+
border: 1px solid red;
677+
}
678+
679+
input.ng-dirty.ng-invalid-maximum + span.raml-console-field-validation-error::after {
656680
content: 'Invalid maximum';
657681
color: white;
658682
position: absolute;
@@ -663,7 +687,11 @@ input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
663687
text-align: center;
664688
}
665689

666-
input.ng-invalid-type + span.raml-console-field-validation-error::after {
690+
input.ng-dirty.ng-invalid-type {
691+
border: 1px solid red;
692+
}
693+
694+
input.ng-dirty.ng-invalid-type + span.raml-console-field-validation-error::after {
667695
content: 'Invalid type';
668696
color: white;
669697
position: absolute;
@@ -674,7 +702,11 @@ input.ng-invalid-type + span.raml-console-field-validation-error::after {
674702
text-align: center;
675703
}
676704

677-
input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
705+
input.ng-dirty.ng-invalid-pattern {
706+
border: 1px solid red;
707+
}
708+
709+
input.ng-dirty.ng-invalid-pattern + span.raml-console-field-validation-error::after {
678710
content: 'Invalid pattern';
679711
color: white;
680712
position: absolute;
@@ -685,7 +717,11 @@ input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
685717
text-align: center;
686718
}
687719

688-
input.ng-invalid-repeat + span.raml-console-field-validation-error::after {
720+
input.ng-dirty.ng-invalid-repeat {
721+
border: 1px solid red;
722+
}
723+
724+
input.ng-dirty.ng-invalid-repeat + span.raml-console-field-validation-error::after {
689725
content: 'Invalid repeat';
690726
color: white;
691727
position: absolute;

‎dist/styles/api-console-light-theme.css‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,15 @@ span.CodeMirror-selectedtext { background: none; }
593593
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
594594
}
595595

596-
input.ng-invalid {
596+
/*input.ng-dirty.ng-invalid {
597+
border: 1px solid red;
598+
}*/
599+
600+
input.ng-dirty.ng-invalid-required {
597601
border: 1px solid red;
598602
}
599603

600-
input.ng-invalid-required + span.raml-console-field-validation-error::after {
604+
input.ng-dirty.ng-invalid-required + span.raml-console-field-validation-error::after {
601605
content: 'Required';
602606
color: white;
603607
position: absolute;
@@ -608,6 +612,10 @@ input.ng-invalid-required + span.raml-console-field-validation-error::after {
608612
text-align: center;
609613
}
610614

615+
input.ng-dirty.ng-invalid-min-length {
616+
border: 1px solid red;
617+
}
618+
611619
input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
612620
content: 'Invalid min length';
613621
color: white;
@@ -619,7 +627,11 @@ input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
619627
text-align: center;
620628
}
621629

622-
input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
630+
input.ng-dirty.ng-invalid-max-length {
631+
border: 1px solid red;
632+
}
633+
634+
input.ng-dirty.ng-invalid-max-length + span.raml-console-field-validation-error::after {
623635
content: 'Invalid max length';
624636
color: white;
625637
position: absolute;
@@ -630,7 +642,11 @@ input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
630642
text-align: center;
631643
}
632644

633-
input.ng-invalid-enum + span.raml-console-field-validation-error::after {
645+
input.ng-dirty.ng-invalid-enum {
646+
border: 1px solid red;
647+
}
648+
649+
input.ng-dirty.ng-invalid-enum + span.raml-console-field-validation-error::after {
634650
content: 'Invalid enum value';
635651
color: white;
636652
position: absolute;
@@ -641,7 +657,11 @@ input.ng-invalid-enum + span.raml-console-field-validation-error::after {
641657
text-align: center;
642658
}
643659

644-
input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
660+
input.ng-dirty.ng-invalid-minimum {
661+
border: 1px solid red;
662+
}
663+
664+
input.ng-dirty.ng-invalid-minimum + span.raml-console-field-validation-error::after {
645665
content: 'Invalid minimum';
646666
color: white;
647667
position: absolute;
@@ -652,7 +672,11 @@ input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
652672
text-align: center;
653673
}
654674

655-
input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
675+
input.ng-dirty.ng-invalid-maximum {
676+
border: 1px solid red;
677+
}
678+
679+
input.ng-dirty.ng-invalid-maximum + span.raml-console-field-validation-error::after {
656680
content: 'Invalid maximum';
657681
color: white;
658682
position: absolute;
@@ -663,7 +687,11 @@ input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
663687
text-align: center;
664688
}
665689

666-
input.ng-invalid-type + span.raml-console-field-validation-error::after {
690+
input.ng-dirty.ng-invalid-type {
691+
border: 1px solid red;
692+
}
693+
694+
input.ng-dirty.ng-invalid-type + span.raml-console-field-validation-error::after {
667695
content: 'Invalid type';
668696
color: white;
669697
position: absolute;
@@ -674,7 +702,11 @@ input.ng-invalid-type + span.raml-console-field-validation-error::after {
674702
text-align: center;
675703
}
676704

677-
input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
705+
input.ng-dirty.ng-invalid-pattern {
706+
border: 1px solid red;
707+
}
708+
709+
input.ng-dirty.ng-invalid-pattern + span.raml-console-field-validation-error::after {
678710
content: 'Invalid pattern';
679711
color: white;
680712
position: absolute;
@@ -685,7 +717,11 @@ input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
685717
text-align: center;
686718
}
687719

688-
input.ng-invalid-repeat + span.raml-console-field-validation-error::after {
720+
input.ng-dirty.ng-invalid-repeat {
721+
border: 1px solid red;
722+
}
723+
724+
input.ng-dirty.ng-invalid-repeat + span.raml-console-field-validation-error::after {
689725
content: 'Invalid repeat';
690726
color: white;
691727
position: absolute;

‎src/app/directives/sidebar.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@
158158

159159
keys.forEach(function (fieldName) {
160160
var value = angular.copy(form.form[fieldName].$viewValue);
161+
162+
value = value || '';
163+
164+
console.log(value);
165+
161166
form.form[fieldName].$setViewValue(value);
162167
});
163168

‎src/assets/styles/error.css‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
input.ng-invalid {
1+
/*input.ng-dirty.ng-invalid {
2+
border: 1px solid red;
3+
}*/
4+
5+
input.ng-dirty.ng-invalid-required {
26
border: 1px solid red;
37
}
48

5-
input.ng-invalid-required + span.raml-console-field-validation-error::after {
9+
input.ng-dirty.ng-invalid-required + span.raml-console-field-validation-error::after {
610
content: 'Required';
711
color: white;
812
position: absolute;
@@ -13,6 +17,10 @@ input.ng-invalid-required + span.raml-console-field-validation-error::after {
1317
text-align: center;
1418
}
1519

20+
input.ng-dirty.ng-invalid-min-length {
21+
border: 1px solid red;
22+
}
23+
1624
input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
1725
content: 'Invalid min length';
1826
color: white;
@@ -24,7 +32,11 @@ input.ng-invalid-min-length + span.raml-console-field-validation-error::after {
2432
text-align: center;
2533
}
2634

27-
input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
35+
input.ng-dirty.ng-invalid-max-length {
36+
border: 1px solid red;
37+
}
38+
39+
input.ng-dirty.ng-invalid-max-length + span.raml-console-field-validation-error::after {
2840
content: 'Invalid max length';
2941
color: white;
3042
position: absolute;
@@ -35,7 +47,11 @@ input.ng-invalid-max-length + span.raml-console-field-validation-error::after {
3547
text-align: center;
3648
}
3749

38-
input.ng-invalid-enum + span.raml-console-field-validation-error::after {
50+
input.ng-dirty.ng-invalid-enum {
51+
border: 1px solid red;
52+
}
53+
54+
input.ng-dirty.ng-invalid-enum + span.raml-console-field-validation-error::after {
3955
content: 'Invalid enum value';
4056
color: white;
4157
position: absolute;
@@ -46,7 +62,11 @@ input.ng-invalid-enum + span.raml-console-field-validation-error::after {
4662
text-align: center;
4763
}
4864

49-
input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
65+
input.ng-dirty.ng-invalid-minimum {
66+
border: 1px solid red;
67+
}
68+
69+
input.ng-dirty.ng-invalid-minimum + span.raml-console-field-validation-error::after {
5070
content: 'Invalid minimum';
5171
color: white;
5272
position: absolute;
@@ -57,7 +77,11 @@ input.ng-invalid-minimum + span.raml-console-field-validation-error::after {
5777
text-align: center;
5878
}
5979

60-
input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
80+
input.ng-dirty.ng-invalid-maximum {
81+
border: 1px solid red;
82+
}
83+
84+
input.ng-dirty.ng-invalid-maximum + span.raml-console-field-validation-error::after {
6185
content: 'Invalid maximum';
6286
color: white;
6387
position: absolute;
@@ -68,7 +92,11 @@ input.ng-invalid-maximum + span.raml-console-field-validation-error::after {
6892
text-align: center;
6993
}
7094

71-
input.ng-invalid-type + span.raml-console-field-validation-error::after {
95+
input.ng-dirty.ng-invalid-type {
96+
border: 1px solid red;
97+
}
98+
99+
input.ng-dirty.ng-invalid-type + span.raml-console-field-validation-error::after {
72100
content: 'Invalid type';
73101
color: white;
74102
position: absolute;
@@ -79,7 +107,11 @@ input.ng-invalid-type + span.raml-console-field-validation-error::after {
79107
text-align: center;
80108
}
81109

82-
input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
110+
input.ng-dirty.ng-invalid-pattern {
111+
border: 1px solid red;
112+
}
113+
114+
input.ng-dirty.ng-invalid-pattern + span.raml-console-field-validation-error::after {
83115
content: 'Invalid pattern';
84116
color: white;
85117
position: absolute;
@@ -90,7 +122,11 @@ input.ng-invalid-pattern + span.raml-console-field-validation-error::after {
90122
text-align: center;
91123
}
92124

93-
input.ng-invalid-repeat + span.raml-console-field-validation-error::after {
125+
input.ng-dirty.ng-invalid-repeat {
126+
border: 1px solid red;
127+
}
128+
129+
input.ng-dirty.ng-invalid-repeat + span.raml-console-field-validation-error::after {
94130
content: 'Invalid repeat';
95131
color: white;
96132
position: absolute;

0 commit comments

Comments
 (0)