From: Stephan Müller <smueller@suse.com>
Date: Thu, 26 Apr 2018 13:24:15 +0000 (+0200)
Subject: mgr/dashboard: Fixes type error in RBD form
X-Git-Tag: v13.1.0~70^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d06a04f72e89c88da0c67e0ffcc0383dc1d6d7f;p=ceph.git

mgr/dashboard: Fixes type error in RBD form

The form validation function wasn't a 'ValidatorFn' because it didn't
return something, now it's returning null in order to be valid for
type checking engines that also type check functions that are returned
by other functions.

Signed-off-by: Stephan Müller <smueller@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
index d4c315c36cc34..5228063ddc304 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import * as _ from 'lodash';
@@ -293,7 +293,7 @@ export class RbdFormComponent implements OnInit {
     this.pools = newPools;
   }
 
-  validateRbdForm(formatter: FormatterService) {
+  validateRbdForm(formatter: FormatterService): ValidatorFn {
     return (formGroup: FormGroup) => {
       // Data Pool
       const useDataPoolControl = formGroup.get('useDataPool');
@@ -340,6 +340,7 @@ export class RbdFormComponent implements OnInit {
         stripingCountControlErrors = {'min': true};
       }
       stripingCountControl.setErrors(stripingCountControlErrors);
+      return null;
     };
   }