[Closes #393, Closes #394] Allow tab into Nil? checkbox, show Nil? on…

…ly on first of repeating element, clear other values on Nil? selected (#395)
peakresponse · May 17, 2024 · 208e842 · 208e842
1 parent 9c2410a
commit 208e842
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-base.component.ts b/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-base.component.ts
@@ -504,6 +504,10 @@ export class XsdElementBaseComponent {
       this.delValue();
       this.setAttr('xsi:nil', 'true');
       this.NV = this.nilValues[0]?.['xs:restriction']?.['xs:enumeration']?._attributes?.value;
+      // if this is a repeating element, remove the other values
+      if (Array.isArray(this.data[this.name]) && this.data[this.name].length > 1) {
+        this.data[this.name].splice(1, this.data[this.name].length - 1);
+      }
     } else {
       this.delAttr('xsi:nil');
       this.delAttr('NV');

diff --git a/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-multi.component.html b/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-multi.component.html
@@ -22,7 +22,7 @@ <h5 *ngIf="isDisplayOnly" [class.text-danger]="isInvalid">
     </div>
   </div>
   <div *ngIf="!isDisplayOnly" class="form-field__content">
-    <button (click)="onAdd()" class="btn btn--sm btn--secondary" type="button">Add</button>
+    <button [disabled]="!canAdd" (click)="onAdd()" class="btn btn--sm btn--secondary" type="button">Add</button>
   </div>
 </ng-container>
 <ng-container *ngIf="!isMulti">

diff --git a/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-multi.component.ts b/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-multi.component.ts
@@ -15,6 +15,17 @@ export class XsdElementMultiComponent extends XsdElementBaseComponent {
     super(api);
   }
 
+  get canAdd() {
+    if (Array.isArray(this.data[this.name])) {
+      if (this.data[this.name].length > 0) {
+        return this.data[this.name][0]._attributes?.['xsi:nil'] !== 'true';
+      }
+    } else {
+      return this.data[this.name]?._attributes?.['xsi:nil'] !== 'true';
+    }
+    return true;
+  }
+
   onAdd() {
     this.addValue({});
     setTimeout(() => {

diff --git a/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-nillable.component.html b/angular/projects/shared/src/lib/components/xsd/elements/xsd-element-nillable.component.html
@@ -24,9 +24,9 @@
         </option>
       </select>
     </div>
-    <div *ngIf="isNillable && !isDisplayOnly" class="input-group-append">
+    <div *ngIf="isNillable && !isDisplayOnly && !index" class="input-group-append">
       <div class="form-check">
-        <input [(ngModel)]="isNil" [id]="formName + '-nil'" tabindex="-1" type="checkbox" class="form-check-input" />
+        <input [(ngModel)]="isNil" [id]="formName + '-nil'" type="checkbox" class="form-check-input" />
         <label [for]="formName + '-nil'" class="form-check-label">Nil?</label>
       </div>
     </div>