From 2b5f8b1e70317ef81470d3a9ab78c94f4069b0d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20M=C3=BCller?= Date: Fri, 22 Jun 2018 13:35:35 +0200 Subject: [PATCH] mgr/dashboard: Move validators into forms directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Now that 'forms' directory exists, the validators are moved to it. Angular also does this with it's validators ('@angular/forms'). Signed-off-by: Stephan Müller --- .../src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts | 2 +- .../rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts | 2 +- .../rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts | 2 +- .../src/app/shared/{validators => forms}/cd-validators.spec.ts | 0 .../src/app/shared/{validators => forms}/cd-validators.ts | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename src/pybind/mgr/dashboard/frontend/src/app/shared/{validators => forms}/cd-validators.spec.ts (100%) rename src/pybind/mgr/dashboard/frontend/src/app/shared/{validators => forms}/cd-validators.ts (100%) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts index bfed5882a32e5..fb79e8bfe7964 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts @@ -9,8 +9,8 @@ import { forkJoin as observableForkJoin, Observable } from 'rxjs'; import { RgwUserService } from '../../../shared/api/rgw-user.service'; import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { CdValidators, isEmptyInputValue } from '../../../shared/forms/cd-validators'; import { FormatterService } from '../../../shared/services/formatter.service'; -import { CdValidators, isEmptyInputValue } from '../../../shared/validators/cd-validators'; import { RgwUserCapability } from '../models/rgw-user-capability'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; import { RgwUserSubuser } from '../models/rgw-user-subuser'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts index 7514eada1e5ab..3741581973f02 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts @@ -6,7 +6,7 @@ import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/validators/cd-validators'; +import { CdValidators } from '../../../shared/forms/cd-validators'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts index 0da588a02427e..8f5b427bd78f7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts @@ -6,7 +6,7 @@ import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators, isEmptyInputValue } from '../../../shared/validators/cd-validators'; +import { CdValidators, isEmptyInputValue } from '../../../shared/forms/cd-validators'; import { RgwUserSubuser } from '../models/rgw-user-subuser'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/validators/cd-validators.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts similarity index 100% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/validators/cd-validators.spec.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/validators/cd-validators.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.ts similarity index 100% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/validators/cd-validators.ts rename to src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.ts -- 2.39.5