novo-elements 11.2.1 → 11.3.0-next.2

package/fesm2022/novo-elements-elements-query-builder.mjs

@@ -6,6 +6,7 @@ import * as i1 from 'novo-elements/services';
 import { NovoLabelService } from 'novo-elements/services';
 import { Subject, Subscription, merge, interval } from 'rxjs';
 import { debounceTime, distinctUntilChanged, takeUntil, startWith, filter, debounce } from 'rxjs/operators';
+import { Helpers } from 'novo-elements/utils';
 import * as i2 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i5 from 'novo-elements/elements/common';
@@ -40,7 +41,6 @@ import * as i8$2 from 'novo-elements/elements/form';
 import { NovoFormModule, NovoFormExtrasModule } from 'novo-elements/elements/form';
 import * as i7$1 from 'novo-elements/elements/tabbed-group-picker';
 import { NovoTabbedGroupPickerElement, NovoTabbedGroupPickerModule } from 'novo-elements/elements/tabbed-group-picker';
-import { Helpers } from 'novo-elements/utils';
 import * as i5$2 from 'novo-elements/elements/button';
 import { NovoButtonModule } from 'novo-elements/elements/button';
 import * as i8$3 from 'novo-elements/elements/dropdown';
@@ -625,8 +625,11 @@ class NovoDefaultBooleanConditionDef extends AbstractConditionFieldDef {
         this.defaultOperator = Operator.include;
         this.defineOperatorEditGroup(Operator.include, Operator.exclude, Operator.isNull);
     }
+    optIdentify(option) {
+        return option.label;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: NovoDefaultBooleanConditionDef, deps: [{ token: i1.NovoLabelService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: NovoDefaultBooleanConditionDef, isStandalone: false, selector: "novo-boolean-condition-def", usesInheritance: true, ngImport: i0, template: `
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.15", type: NovoDefaultBooleanConditionDef, isStandalone: false, selector: "novo-boolean-condition-def", usesInheritance: true, ngImport: i0, template: `
     <ng-container novoConditionFieldDef>
       <novo-field *novoConditionOperatorsDef="let formGroup; fieldMeta as meta" [formGroup]="formGroup">
         <novo-select [placeholder]="labels.operator" formControlName="operator" (onSelect)="onOperatorSelect(formGroup)">
@@ -635,14 +638,23 @@ class NovoDefaultBooleanConditionDef extends AbstractConditionFieldDef {
           <novo-option value="isNull" *ngIf="!meta?.removeIsEmpty">{{ labels.isEmpty }}</novo-option>
         </novo-select>
       </novo-field>
-      <novo-field *novoConditionInputDef="let formGroup" [style.width.px]="125" [formGroup]="formGroup">
-        <novo-radio-group formControlName="value">
-          <novo-radio [value]="true">{{ formGroup.value.operator === 'isNull' ? labels.yes : labels.true }}</novo-radio>
-          <novo-radio [value]="false">{{ formGroup.value.operator === 'isNull' ? labels.no : labels.false }}</novo-radio>
-        </novo-radio-group>
+      <novo-field *novoConditionInputDef="let formGroup; fieldMeta as meta" [style.maxWidth.px]="250" [formGroup]="formGroup">
+        @let isNull = formGroup.value.operator === 'isNull';
+        @let useYesNo = isNull || meta.dataType === 'Boolean';
+        @let customOptions = !isNull && meta.options?.length === 2;
+        @if (customOptions) {
+          <novo-radio-group formControlName="value">
+            <novo-radio *ngFor="let opt of meta.options; trackBy: optIdentify" [value]="opt.value">{{ opt.label }}</novo-radio>
+          </novo-radio-group>
+        } @else {
+          <novo-radio-group formControlName="value">
+            <novo-radio [value]="true">{{ useYesNo ? labels.yes : labels.true }}</novo-radio>
+            <novo-radio [value]="false">{{ useYesNo ? labels.no : labels.false }}</novo-radio>
+          </novo-radio-group>
+        }
       </novo-field>
     </ng-container>
-  `, isInline: true, dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i3.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i3.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i3.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "component", type: i5$1.NovoSelectElement, selector: "novo-select", inputs: ["disabled", "required", "tabIndex", "id", "name", "placeholder", "readonly", "headerConfig", "position", "overlayWidth", "overlayHeight", "displayIcon", "displayWith", "compareWith", "hideLegacyOptions", "value", "multiple", "options"], outputs: ["onSelect", "selectionChange", "valueChange", "openedChange", "opened", "closed"] }, { kind: "component", type: i6.NovoFieldElement, selector: "novo-field", inputs: ["layout", "appearance", "customOverlayOrigin", "width"], outputs: ["valueChanges", "stateChanges"] }, { kind: "component", type: i5.NovoOption, selector: "novo-option", inputs: ["selected", "keepOpen", "novoInert", "value", "disabled"], exportAs: ["novoOption"] }, { kind: "component", type: i9$1.NovoRadioElement, selector: "novo-radio", inputs: ["id", "name", "tabindex", "vertical", "label", "button", "theme", "size", "icon", "color", "disabled", "checked", "value"], outputs: ["change", "blur", "focus"] }, { kind: "component", type: i9$1.NovoRadioGroup, selector: "novo-radio-group", inputs: ["id", "tabindex", "errorStateMatcher", "appearance", "value", "name", "disabled", "required", "placeholder"], outputs: ["change", "blur"] }, { kind: "directive", type: NovoConditionOperatorsDef, selector: "[novoConditionOperatorsDef]" }, { kind: "directive", type: NovoConditionInputDef, selector: "[novoConditionInputDef]" }, { kind: "directive", type: NovoConditionFieldDef, selector: "[novoConditionFieldDef]" }], changeDetection: i0.ChangeDetectionStrategy.Default, encapsulation: i0.ViewEncapsulation.None }); }
+  `, isInline: true, dependencies: [{ kind: "directive", type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i3.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i3.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i3.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "component", type: i5$1.NovoSelectElement, selector: "novo-select", inputs: ["disabled", "required", "tabIndex", "id", "name", "placeholder", "readonly", "headerConfig", "position", "overlayWidth", "overlayHeight", "displayIcon", "displayWith", "compareWith", "hideLegacyOptions", "value", "multiple", "options"], outputs: ["onSelect", "selectionChange", "valueChange", "openedChange", "opened", "closed"] }, { kind: "component", type: i6.NovoFieldElement, selector: "novo-field", inputs: ["layout", "appearance", "customOverlayOrigin", "width"], outputs: ["valueChanges", "stateChanges"] }, { kind: "component", type: i5.NovoOption, selector: "novo-option", inputs: ["selected", "keepOpen", "novoInert", "value", "disabled"], exportAs: ["novoOption"] }, { kind: "component", type: i9$1.NovoRadioElement, selector: "novo-radio", inputs: ["id", "name", "tabindex", "vertical", "label", "button", "theme", "size", "icon", "color", "disabled", "checked", "value"], outputs: ["change", "blur", "focus"] }, { kind: "component", type: i9$1.NovoRadioGroup, selector: "novo-radio-group", inputs: ["id", "tabindex", "errorStateMatcher", "appearance", "value", "name", "disabled", "required", "placeholder"], outputs: ["change", "blur"] }, { kind: "directive", type: NovoConditionOperatorsDef, selector: "[novoConditionOperatorsDef]" }, { kind: "directive", type: NovoConditionInputDef, selector: "[novoConditionInputDef]" }, { kind: "directive", type: NovoConditionFieldDef, selector: "[novoConditionFieldDef]" }], changeDetection: i0.ChangeDetectionStrategy.Default, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: NovoDefaultBooleanConditionDef, decorators: [{
             type: Component,
@@ -657,11 +669,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
           <novo-option value="isNull" *ngIf="!meta?.removeIsEmpty">{{ labels.isEmpty }}</novo-option>
         </novo-select>
       </novo-field>
-      <novo-field *novoConditionInputDef="let formGroup" [style.width.px]="125" [formGroup]="formGroup">
-        <novo-radio-group formControlName="value">
-          <novo-radio [value]="true">{{ formGroup.value.operator === 'isNull' ? labels.yes : labels.true }}</novo-radio>
-          <novo-radio [value]="false">{{ formGroup.value.operator === 'isNull' ? labels.no : labels.false }}</novo-radio>
-        </novo-radio-group>
+      <novo-field *novoConditionInputDef="let formGroup; fieldMeta as meta" [style.maxWidth.px]="250" [formGroup]="formGroup">
+        @let isNull = formGroup.value.operator === 'isNull';
+        @let useYesNo = isNull || meta.dataType === 'Boolean';
+        @let customOptions = !isNull && meta.options?.length === 2;
+        @if (customOptions) {
+          <novo-radio-group formControlName="value">
+            <novo-radio *ngFor="let opt of meta.options; trackBy: optIdentify" [value]="opt.value">{{ opt.label }}</novo-radio>
+          </novo-radio-group>
+        } @else {
+          <novo-radio-group formControlName="value">
+            <novo-radio [value]="true">{{ useYesNo ? labels.yes : labels.true }}</novo-radio>
+            <novo-radio [value]="false">{{ useYesNo ? labels.no : labels.false }}</novo-radio>
+          </novo-radio-group>
+        }
       </novo-field>
     </ng-container>
   `,
@@ -1515,7 +1536,7 @@ class ConditionBuilderComponent {
         }
     }
     ngOnDestroy() {
-        this.searches.unsubscribe();
+        this.searches?.unsubscribe();
         // Clear all outlets and Maps
         [this._operatorOutlet.viewContainer, this._inputOutlet.viewContainer].forEach((def) => {
             def.clear();
@@ -1591,14 +1612,29 @@ class ConditionBuilderComponent {
         if (!field) {
             return;
         }
-        const editType = this.editTypeFn()(field);
+        let editType = this.editTypeFn()(field);
         // Don't look at dataSpecialization it is no good, this misses currency, and percent
         const { name } = field;
+        if (editType.toUpperCase() === 'RADIO') {
+            editType = this.doesFieldQualifyAsBinary(field) ? 'BOOLEAN' : 'SELECT';
+        }
         const fieldDefsByName = this.queryBuilderService.getFieldDefsByName();
         // Check Fields by priority for match Field Definition
         const key = [name, editType?.toUpperCase(), 'DEFAULT'].find((it) => fieldDefsByName.has(it));
         return fieldDefsByName.get(key);
     }
+    doesFieldQualifyAsBinary(field) {
+        if (field.dataType === 'Boolean') {
+            return true;
+        }
+        // If no options are presented, use True/False options.
+        const optionCount = field.options?.length;
+        if (!Helpers.isNumber(optionCount) || optionCount === 0) {
+            return true;
+        }
+        // If the field uses 2 options, we can show 2 radio values for that. 1 is an invalid state, but better displayed with a Select picker.
+        return field.options.length === 2;
+    }
     createFieldTemplates() {
         const definition = this.findDefinitionForField(this.getField());
         if (!this.parentForm.get('operator').value) {