Merged in bugfix/SHIBUI-578 (pull request #113)

SHIBUI-578 Fixed validation issue Approved-by: Ryan Mathis <rmathis@unicon.net> Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
TIER · Jul 11, 2018 · 79c5163 · 79c5163
2 parents 4923326 + 5b97507
commit 79c5163
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
@@ -1,12 +1,11 @@
 import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.component';
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
-import { CustomStringComponent } from './widget/text/string.component';
+import { CustomStringComponent } from './widget/string/string.component';
 
 import { WidgetRegistry } from 'ngx-schema-form';
 
 import { ButtonWidget } from 'ngx-schema-form';
 import { FileWidget } from 'ngx-schema-form';
-import { IntegerWidget } from 'ngx-schema-form';
 import { ObjectWidget } from 'ngx-schema-form';
 import { RadioWidget } from 'ngx-schema-form';
 import { RangeWidget } from 'ngx-schema-form';

diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
@@ -6,7 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.component';
 import { SchemaService } from './service/schema.service';
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
-import { CustomStringComponent } from './widget/text/string.component';
+import { CustomStringComponent } from './widget/string/string.component';
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../shared/shared.module';
 import { CustomSelectComponent } from './widget/select/select.component';

diff --git a/ui/src/app/schema-form/service/schema.service.ts b/ui/src/app/schema-form/service/schema.service.ts
@@ -15,6 +15,9 @@ export class SchemaService {
 
     isRequired(formProperty: any): boolean {
         let required = false;
+        if (!formProperty) {
+            return false;
+        }
         let requiredFields = formProperty.parent.schema.required || [];
         let fieldPath = formProperty.path;
         let controlName = fieldPath.substr(fieldPath.lastIndexOf('/') + 1);

diff --git a/...ma-form/widget/text/string.component.html → ...-form/widget/string/string.component.html b/...ma-form/widget/text/string.component.html → ...-form/widget/string/string.component.html
@@ -28,4 +28,4 @@
     <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages && errorMessages.length) && schema.widget.help">
         {{ schema.widget.help }}
     </small>
-</div>
+</div>
diff --git a/...ma-form/widget/text/string.component.scss → ...-form/widget/string/string.component.scss b/...ma-form/widget/text/string.component.scss → ...-form/widget/string/string.component.scss
diff --git a/...hema-form/widget/text/string.component.ts → ...ma-form/widget/string/string.component.ts b/...hema-form/widget/text/string.component.ts → ...ma-form/widget/string/string.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { StringWidget } from 'ngx-schema-form';
+import { Validators } from '@angular/forms';
 import { SchemaService } from '../../service/schema.service';
 
 @Component({

diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
@@ -12,6 +12,9 @@
         "satisfyAnyPredicates"
     ],
     "required": ["id", "metadataURL"],
+    "dependencies": {
+        "initializeFromBackupFile": {"required": ["backingFile", "backupFileInitNextRefreshDelay"]}
+    },
     "anyOf": [
         {
             "properties": {