Merge pull request #4390 from freenas/NAS-106791-12.0

NAS-106791 / 12.0 / NAS-106791 (by lola27)

src/app/helptext/system/ca.ts

@@ -141,7 +141,6 @@ matches your certificate usage scenario.'),
  the system. This name must be unique within a\
  certificate chain.'
       ),
-      validation: [Validators.required]
     },
 
     san: {
@@ -151,7 +150,8 @@ matches your certificate usage scenario.'),
  secure. Separate domains by pressing <code>Enter</code> \
  For example, if the primary domain is <i>example.com</i>, \
  entering <i>www.example.com</i> secures both addresses."
-      )
+      ),
+      validation: [Validators.required]
     },
 
     certificate: {

src/app/helptext/system/certificates.ts

@@ -133,7 +133,6 @@ matches your certificate usage scenario.'),
  the system. This name must be unique within a\
  certificate chain.'
       ),
-      validation: [Validators.required]
     },
 
     san: {
@@ -143,7 +142,8 @@ matches your certificate usage scenario.'),
  secure. Separate domains by pressing <code>Enter</code> \
  For example, if the primary domain is <i>example.com</i>, \
  entering <i>www.example.com</i> secures both addresses."
-      )
+      ),
+      validation: [Validators.required]
     },
 
     certificate: {

src/app/pages/system/ca/ca-add/ca-add.component.ts

@@ -263,8 +263,6 @@ export class CertificateAuthorityAddComponent {
           name: 'common',
           placeholder: helptext_system_ca.add.common.placeholder,
           tooltip: helptext_system_ca.add.common.tooltip,
-          required: true,
-          validation: helptext_system_ca.add.common.validation,
           isHidden: false,
           class: 'inline',
           width: '50%',
@@ -274,6 +272,8 @@ export class CertificateAuthorityAddComponent {
           name: 'san',
           placeholder: helptext_system_ca.add.san.placeholder,
           tooltip: helptext_system_ca.add.san.tooltip,
+          required: true,
+          validation: helptext_system_ca.add.san.validation,
           isHidden: false,
           class: 'inline',
           width: '50%',

src/app/pages/system/certificates/certificate-add/certificate-add.component.ts

@@ -303,8 +303,6 @@ export class CertificateAddComponent {
           name: 'common',
           placeholder: helptext_system_certificates.add.common.placeholder,
           tooltip: helptext_system_certificates.add.common.tooltip,
-          required: true,
-          validation: helptext_system_certificates.add.common.validation,
           isHidden: false,
           class: 'inline',
           width: '50%',
@@ -314,6 +312,8 @@ export class CertificateAddComponent {
           name: 'san',
           placeholder: helptext_system_certificates.add.san.placeholder,
           tooltip: helptext_system_certificates.add.san.tooltip,
+          required: true,
+          validation: helptext_system_certificates.add.san.validation,
           isHidden: false,
           class: 'inline',
           width: '50%',