Merge pull request #438 from quicujo/master

Widgets condition for nullable schema.title, remove unused import in example
guillotinaweb · Jun 22, 2022 · 7451141 · 7451141
2 parents f28b338 + d236d67
commit 7451141
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 18 deletions.
diff --git a/projects/schema-form/src/lib/defaultwidgets/array/array.widget.ts b/projects/schema-form/src/lib/defaultwidgets/array/array.widget.ts
@@ -6,7 +6,7 @@ import { FormProperty } from '../../model';
 @Component({
   selector: 'sf-array-widget',
   template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
 	<span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>

diff --git a/projects/schema-form/src/lib/defaultwidgets/checkbox/checkbox.widget.ts b/projects/schema-form/src/lib/defaultwidgets/checkbox/checkbox.widget.ts
@@ -5,7 +5,7 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-checkbox-widget',
   template: `<div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label">
+    <label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
         {{ schema.title }}
     </label>
 	<div *ngIf="schema.type!='array'" class="checkbox">

diff --git a/projects/schema-form/src/lib/defaultwidgets/file/file.widget.ts b/projects/schema-form/src/lib/defaultwidgets/file/file.widget.ts
@@ -5,10 +5,10 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-file-widget',
   template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
-    <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
+  <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
   <input [name]="name" class="text-widget file-widget" [attr.id]="id"
     [formControl]="control" type="file" [attr.disabled]="schema.readOnly?true:null"
     (change)="onFileChange($event)">

diff --git a/projects/schema-form/src/lib/defaultwidgets/integer/integer.widget.ts b/projects/schema-form/src/lib/defaultwidgets/integer/integer.widget.ts
@@ -7,7 +7,7 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-integer-widget',
   template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
   <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>

diff --git a/projects/schema-form/src/lib/defaultwidgets/radio/radio.widget.ts b/projects/schema-form/src/lib/defaultwidgets/radio/radio.widget.ts
@@ -5,8 +5,8 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-radio-widget',
   template: `<div class="widget form-group">
-	<label>{{schema.title}}</label>
-    <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
+	<label *ngIf="schema.title">{{schema.title}}</label>
+  <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
 	<div *ngFor="let option of schema.oneOf" class="radio">
 		<label class="horizontal control-label">
 			<input [formControl]="control" [attr.name]="name" [attr.id]="id + '.' + option.enum[0]" value="{{option.enum[0]}}" type="radio"  [disabled]="schema.readOnly||option.readOnly">

diff --git a/projects/schema-form/src/lib/defaultwidgets/range/range.widget.ts b/projects/schema-form/src/lib/defaultwidgets/range/range.widget.ts
@@ -5,7 +5,7 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-range-widget',
   template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
     <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>	

diff --git a/projects/schema-form/src/lib/defaultwidgets/select/select.widget.ts b/projects/schema-form/src/lib/defaultwidgets/select/select.widget.ts
@@ -5,7 +5,7 @@ import { ControlWidget } from '../../widget';
 @Component({
 	selector: 'sf-select-widget',
 	template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
 

diff --git a/projects/schema-form/src/lib/defaultwidgets/string/string.widget.ts b/projects/schema-form/src/lib/defaultwidgets/string/string.widget.ts
@@ -8,7 +8,7 @@ import { ControlWidget } from '../../widget';
   [attr.name]="name" type="hidden" [formControl]="control">
 <ng-template #notHiddenFieldBlock>
 <div class="widget form-group">
-    <label [attr.for]="id" class="horizontal control-label">
+    <label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
     	{{ schema.title }}
     </label>
     <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>

diff --git a/projects/schema-form/src/lib/defaultwidgets/textarea/textarea.widget.ts b/projects/schema-form/src/lib/defaultwidgets/textarea/textarea.widget.ts
@@ -5,10 +5,10 @@ import { ControlWidget } from '../../widget';
 @Component({
   selector: 'sf-textarea-widget',
   template: `<div class="widget form-group">
-	<label [attr.for]="id" class="horizontal control-label">
+	<label *ngIf="schema.title" [attr.for]="id" class="horizontal control-label">
 		{{ schema.title }}
 	</label>
-    <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
+  <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
 	<textarea [readonly]="schema.readOnly" [name]="name"
 		[attr.id]="id"
 		class="text-widget textarea-widget form-control"

diff --git a/src/app/json-schema-example/json-schema-example.component.ts b/src/app/json-schema-example/json-schema-example.component.ts
@@ -4,11 +4,10 @@ import {
   OnInit,
   OnDestroy
 } from '@angular/core';
-import {WidgetRegistry, Validator, Binding, FormProperty, PropertyGroup} from 'ngx-schema-form';
+import {Validator, Binding, FormProperty, PropertyGroup} from 'ngx-schema-form';
 import {Subscription} from 'rxjs';
 
 import sampleSchema1 from './sampleschema.json';
-import sampleSchema2 from './otherschema.json';
 import sampleModel from './samplemodel.json';
 import binding_sample_schema from './binding_sample_schema.json';
 import binding_sample_model from './binding_sample_model.json';
@@ -46,7 +45,6 @@ export class JsonSchemaExampleComponent implements OnInit, OnDestroy {
   ];
 
   constructor(
-    registry: WidgetRegistry,
     private appService: AppService
   ) {
 
@@ -181,9 +179,6 @@ export class JsonSchemaExampleComponent implements OnInit, OnDestroy {
     this.actions['reset'] = (form, options) => {
       form.reset();
     };
-    this.actions['reset'] = (form, options) => {
-      form.reset();
-    };
     this.actions['disable'] = this.disableAll.bind(this);
 
     this.actions['toggle_title'] = (formProperty: FormProperty, form: PropertyGroup, params: any) => {