@smartbit4all/ng-client 3.3.219 → 3.3.220

package/fesm2020/smartbit4all-ng-client.mjs

@@ -14479,28 +14479,28 @@ class SmartFilterEditorContentComponent {
             model[index] = filterExpressionField;
             if (filterExpressionField.widgetType === 'SELECT_MULTIPLE') {
                 key = index + '.expressionData.operand2.selectedValues';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
             if (filterExpressionField.expressionData?.currentOperation === 'BETWEEN') {
                 key = index + '.expressionData.operand2.valueAsString';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? '', filterExpressionField.toolbarId));
                 key = index + '.expressionData.operand3.valueAsString';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? ''));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
             if (filterExpressionField.expressionData?.operand2) {
                 if (key !== index + '.expressionData.operand2.selectedValues') {
                     key = index + '.expressionData.operand2.valueAsString';
                 }
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
             if (filterExpressionField?.expressionData?.operand3) {
                 if (key !== index + '.selectedValues') {
                     key = index + '.expressionData.operand3.valueAsString';
                 }
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? ''));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TEXT_FIELD, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? '', filterExpressionField.toolbarId));
                 return;
             }
         });
@@ -14606,7 +14606,7 @@ class SmartFilterEditorContentComponent {
             },
         });
     }
-    constructFormWidget(key, label, widgetType, possibleValues, value) {
+    constructFormWidget(key, label, widgetType, possibleValues, value, toolbarId) {
         let type = widgetType;
         if (type === FilterExpressionFieldWidgetType.DATE) {
             type = SmartFormWidgetType.DATE_PICKER;
@@ -14629,6 +14629,7 @@ class SmartFilterEditorContentComponent {
                     value: value.objectUri ? value.objectUri : value.code,
                 };
             }),
+            toolbarId,
         };
         return widget;
     }
@@ -15583,8 +15584,8 @@ class SmartComponentApiClient {
             if (ref instanceof SmartGridComponent) {
                 ref.uuid = this.componentModelLoaded ? uuid : undefined;
             }
-            else if (ref instanceof SmartFilterEditorService) {
-                ref.config.uuid = this.componentModelLoaded ? uuid : undefined;
+            else if (ref instanceof SmartFilterEditorContentComponent) {
+                ref.service.config.uuid = this.componentModelLoaded ? uuid : undefined;
             }
             else if (!ref && !firstUuid) {
                 console.error(`Provided reference for ${key} is undefined on uuid change.`);
@@ -15718,9 +15719,9 @@ class SmartComponentApiClient {
             this.getAllSmartTreeComponents()
                 .filter((tree) => (tree?.smartTreeModel?.identifier ? true : false))
                 .forEach((tree) => widgets.set(tree.smartTreeModel.identifier, tree));
-            this.getAllSmartFilterEditorServices()
-                .filter((filter) => (filter.config.identifier ? true : false))
-                .forEach((filter) => widgets.set(filter.config.identifier, filter));
+            this.getAllSmartFilterEditorContentComponents()
+                .filter((filter) => (filter.service.config.identifier ? true : false))
+                .forEach((filter) => widgets.set(filter.service.config.identifier, filter));
             return widgets;
         }
         return this.widgets;
@@ -15763,8 +15764,8 @@ class SmartComponentApiClient {
         });
         return trees;
     }
-    getAllSmartFilterEditorServices() {
-        let filters = this.getSmartFilterServicesQL()?.toArray() ?? [];
+    getAllSmartFilterEditorContentComponents() {
+        let filters = this.getSmartFilterEditorContentComponentsQL()?.toArray() ?? [];
         return filters;
     }
     getAllSmartUiActionToolbars() {
@@ -15781,6 +15782,11 @@ class SmartComponentApiClient {
             ?.flatMap((form) => form.getToolbars())
             .filter((toolbar) => toolbar !== undefined || toolbar !== null)
             .forEach((toolbar) => toolbars.push(toolbar));
+        this.getAllSmartFilterEditorContentComponents()
+            ?.filter((filter) => filter.formCompRef?.instance !== undefined)
+            .flatMap((filter) => filter.formCompRef?.instance.getToolbars())
+            .filter((toolbar) => toolbar !== undefined || toolbar !== null)
+            .forEach((toolbar) => toolbars.push(toolbar));
         return toolbars;
     }
     initData() {
@@ -16162,9 +16168,9 @@ class SmartComponentApiClient {
                     reference.initialize();
                 }
             }
-            else if (reference instanceof SmartFilterEditorService) {
+            else if (reference instanceof SmartFilterEditorContentComponent) {
                 if (!skipLoad) {
-                    reference.load();
+                    reference.service.load();
                 }
             }
             else if (!skipLoad && reference === undefined) {
@@ -16257,15 +16263,15 @@ class SmartComponent extends SmartComponentApiClient {
     getSmartComponentLayoutsQL() {
         return this.smartComponentLayoutsQL;
     }
-    getSmartFilterServicesQL() {
-        return this.smartFilterEditorServicesQL;
+    getSmartFilterEditorContentComponentsQL() {
+        return this.smartFilterEditorContentComponentsQL;
     }
     getSmartUiActionToolbarsQL() {
         return this.smartUiActionToolbarsQL;
     }
 }
 SmartComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartComponent, deps: [{ token: i0.Injector }, { token: 'SmartAuthService' }, { token: 'pageName' }, { token: 'componentName' }, { token: i0.ElementRef }, { token: i0.Renderer2 }], target: i0.ɵɵFactoryTarget.Component });
-SmartComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartComponent, selector: "ng-component", viewQueries: [{ propertyName: "smartFormsQL", predicate: SmartformComponent, descendants: true }, { propertyName: "smartGridsQL", predicate: SmartGridComponent, descendants: true }, { propertyName: "smartTreesQL", predicate: SmarttreeGenericService, descendants: true }, { propertyName: "smartComponentLayoutsQL", predicate: SmartComponentLayoutComponent, descendants: true }, { propertyName: "smartFilterEditorServicesQL", predicate: SmartFilterEditorService, descendants: true }, { propertyName: "smartUiActionToolbarsQL", predicate: UiActionToolbarComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: '', isInline: true });
+SmartComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartComponent, selector: "ng-component", viewQueries: [{ propertyName: "smartFormsQL", predicate: SmartformComponent, descendants: true }, { propertyName: "smartGridsQL", predicate: SmartGridComponent, descendants: true }, { propertyName: "smartTreesQL", predicate: SmarttreeGenericService, descendants: true }, { propertyName: "smartComponentLayoutsQL", predicate: SmartComponentLayoutComponent, descendants: true }, { propertyName: "smartFilterEditorContentComponentsQL", predicate: SmartFilterEditorContentComponent, descendants: true }, { propertyName: "smartUiActionToolbarsQL", predicate: UiActionToolbarComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: '', isInline: true });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartComponent, decorators: [{
             type: Component,
             args: [{
@@ -16292,9 +16298,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
             }], smartComponentLayoutsQL: [{
                 type: ViewChildren,
                 args: [SmartComponentLayoutComponent]
-            }], smartFilterEditorServicesQL: [{
+            }], smartFilterEditorContentComponentsQL: [{
                 type: ViewChildren,
-                args: [SmartFilterEditorService]
+                args: [SmartFilterEditorContentComponent]
             }], smartUiActionToolbarsQL: [{
                 type: ViewChildren,
                 args: [UiActionToolbarComponent]
@@ -16325,8 +16331,8 @@ class SmartService extends SmartComponentApiClient {
     getSmartComponentLayoutsQL() {
         return this.smartComponentLayoutsQL;
     }
-    getSmartFilterServicesQL() {
-        return this.smartFilterEditorServicesQL;
+    getSmartFilterEditorContentComponentsQL() {
+        return this.smartFilterEditorContentComponentsQL;
     }
     getSmartUiActionToolbarsQL() {
         return this.smartUiActionToolbarsQL;
@@ -16357,9 +16363,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
             }], smartComponentLayoutsQL: [{
                 type: ViewChildren,
                 args: [SmartComponentLayoutComponent]
-            }], smartFilterEditorServicesQL: [{
+            }], smartFilterEditorContentComponentsQL: [{
                 type: ViewChildren,
-                args: [SmartFilterEditorService]
+                args: [SmartFilterEditorContentComponent]
             }], smartUiActionToolbarsQL: [{
                 type: ViewChildren,
                 args: [UiActionToolbarComponent]