feat(query-builder): select only one return field in inner query (#15051)

igdmdimitrov · ivanvpetrov · teodosiah · web-flow · commit efb074c62a51 · 2024-11-28T12:47:18.000+02:00
* feat(query-builder): select only one return field in inner query * chore(query-builder): update resource string translations * chore(*): replace *ngIf with @if/@else --------- Co-authored-by: INFRAGISTICS\IPetrov <IPetrov@infragistics.com> Co-authored-by: teodosiah <teodosiah@gmail.com>
diff --git a/projects/igniteui-angular-i18n/src/i18n/BG/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/BG/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsBG_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Търсене',
     igx_query_builder_select_all: 'Избери всички',
     igx_query_builder_select_entity: 'Избери обект',
+    igx_query_builder_select_return_field_single: 'Избери поле за връщане',
     igx_query_builder_select_return_fields: 'Избери полета за връщане',
     igx_query_builder_dialog_title: 'Потвърждение',
     igx_query_builder_dialog_message: 'С промяната на обекта ще загубите текущите си настройки. Сигурни ли сте, че искате да продължите?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/CS/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/CS/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsCS_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Vyhledávání',
     igx_query_builder_select_all: 'Vybrat vše',
     igx_query_builder_select_entity: 'Vyberte entitu',
+    igx_query_builder_select_return_field_single: 'Vyberte návratové pole',
     igx_query_builder_select_return_fields: 'Vyberte pole pro vrácení',
     igx_query_builder_dialog_title: 'Potvrzení',
     igx_query_builder_dialog_message: 'Změnou entity ztratíte svá aktuální nastavení. Opravdu to chcete udělat?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/DA/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DA/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsDA_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Søg',
     igx_query_builder_select_all: 'Vælg alle',
     igx_query_builder_select_entity: 'Vælg objekt',
+    igx_query_builder_select_return_field_single: 'Vælg returfelt',
     igx_query_builder_select_return_fields: 'Vælg returfelter',
     igx_query_builder_dialog_title: 'Bekræftelse',
     igx_query_builder_dialog_message: 'Ved at ændre objektet mister du dine nuværende indstillinger. Er du sikker på, at du vil fortsætte?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/DE/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/DE/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsDE_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Suchen',
     igx_query_builder_select_all: 'Alle auswählen',
     igx_query_builder_select_entity: 'Entität auswählen',
+    igx_query_builder_select_return_field_single: 'Rückgabefeld auswählen',
     igx_query_builder_select_return_fields: 'Rückgabefelder auswählen',
     igx_query_builder_dialog_title: 'Bestätigung',
     igx_query_builder_dialog_message: 'Durch das Ändern der Entität gehen Ihre aktuellen Einstellungen verloren.  Möchten Sie wirklich fortfahren?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ES/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ES/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsES_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Buscar',
     igx_query_builder_select_all: 'Seleccionar todo',
     igx_query_builder_select_entity: 'Seleccionar entidad',
+    igx_query_builder_select_return_field_single: 'Seleccionar campo de devolución',
     igx_query_builder_select_return_fields: 'Seleccionar campos de retorno',
     igx_query_builder_dialog_title: 'Confirmación',
     igx_query_builder_dialog_message: 'Al cambiar la entidad, se perderán las configuraciones actuales. ¿Está seguro de que desea continuar?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/FR/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/FR/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsFR_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Chercher',
     igx_query_builder_select_all: 'Sélectionner tout',
     igx_query_builder_select_entity: 'Sélectionner une entité',
+    igx_query_builder_select_return_field_single: 'Sélectionnez le champ de retour',
     igx_query_builder_select_return_fields: 'Sélectionner les champs de retour',
     igx_query_builder_dialog_title: 'Confirmation',
     igx_query_builder_dialog_message: 'En changeant l\'entité, vous perdrez vos paramètres actuels. Êtes-vous sûr de vouloir faire cela ?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/HU/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/HU/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsHU_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Keresés',
     igx_query_builder_select_all: 'Mindet kijelöli',
     igx_query_builder_select_entity: 'Entitás kiválasztása',
+    igx_query_builder_select_return_field_single: 'Válassza ki a visszatérési mezőt',
     igx_query_builder_select_return_fields: 'Visszatérő mezők kiválasztása',
     igx_query_builder_dialog_title: 'Megerősítés',
     igx_query_builder_dialog_message: 'Az entitás megváltoztatásával elveszíti jelenlegi beállításait. Biztos, hogy folytatni kívánja?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/IT/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/IT/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsIT_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Cerca',
     igx_query_builder_select_all: 'Seleziona tutto',
     igx_query_builder_select_entity: 'Seleziona entità',
+    igx_query_builder_select_return_field_single: 'Seleziona il campo di ritorno',
     igx_query_builder_select_return_fields: 'Seleziona campi di ritorno',
     igx_query_builder_dialog_title: 'Conferma',
     igx_query_builder_dialog_message: 'Modificando l\'entità, perderai le impostazioni correnti. Procedere?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/JA/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/JA/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsJA_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: '検索',
     igx_query_builder_select_all: 'すべて選択',
     igx_query_builder_select_entity: 'エンティティの選択',
+    igx_query_builder_select_return_field_single: '返却フィールドを選択',
     igx_query_builder_select_return_fields: '返却フィールドの選択',
     igx_query_builder_dialog_title: '確認',
     igx_query_builder_dialog_message: 'エンティティを変更すると、現在の設定は失われます。続行しますか？',
diff --git a/projects/igniteui-angular-i18n/src/i18n/KO/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/KO/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsKO_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: '검색',
     igx_query_builder_select_all: '모두 선택',
     igx_query_builder_select_entity: '엔터티 선택',
+    igx_query_builder_select_return_field_single: '반환 필드를 선택',
     igx_query_builder_select_return_fields: '반환 필드 선택',
     igx_query_builder_dialog_title: '반환 필드 선택',
     igx_query_builder_dialog_message: '엔터티를 변경하면 현재 설정이 손실됩니다. 계속하시겠습니까?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/NB/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NB/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsNB_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Søk',
     igx_query_builder_select_all: 'Velg alle',
     igx_query_builder_select_entity: 'Velg enhet',
+    igx_query_builder_select_return_field_single: 'Velg returfelt',
     igx_query_builder_select_return_fields: 'Velg returfelter',
     igx_query_builder_dialog_title: 'Bekreftelse',
     igx_query_builder_dialog_message: 'Ved å endre enheten vil du miste de nåværende innstillingene dine. Er du sikker på at du vil fortsette?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/NL/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/NL/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsNL_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Zoeken',
     igx_query_builder_select_all: 'Alles selecteren',
     igx_query_builder_select_entity: 'Entiteit selecteren',
+    igx_query_builder_select_return_field_single: 'Selecteer retourveld',
     igx_query_builder_select_return_fields: 'Retourvelden selecteren',
     igx_query_builder_dialog_title: 'Bevestiging',
     igx_query_builder_dialog_message: 'Door de entiteit te wijzigen, verliest u uw huidige instellingen. Weet u zeker dat u wilt doorgaan?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/PL/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PL/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsPL_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Szukaj',
     igx_query_builder_select_all: 'Zaznacz wszystko',
     igx_query_builder_select_entity: 'Wybierz encję',
+    igx_query_builder_select_return_field_single: 'Wybierz pole zwrotne',
     igx_query_builder_select_return_fields: 'Wybierz pola zwrotne',
     igx_query_builder_dialog_title: 'Potwierdzenie',
     igx_query_builder_dialog_message: 'Zmieniając encję, stracisz swoje aktualne ustawienia. Czy na pewno chcesz to zrobić?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/PT/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/PT/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsPT_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Pesquisar',
     igx_query_builder_select_all: 'Selecionar tudo',
     igx_query_builder_select_entity: 'Selecionar entidade',
+    igx_query_builder_select_return_field_single: 'Selecione o campo de retorno',
     igx_query_builder_select_return_fields: 'Selecionar campos de retorno',
     igx_query_builder_dialog_title: 'Confirmação',
     igx_query_builder_dialog_message: 'Ao alterar a entidade, você perderá suas configurações atuais. Tem a certeza que pretende continuar?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/RO/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/RO/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsRO_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Căutare',
     igx_query_builder_select_all: 'Selectează tot',
     igx_query_builder_select_entity: 'Selectează entitate',
+    igx_query_builder_select_return_field_single: 'Selectați câmpul de returnare',
     igx_query_builder_select_return_fields: 'Selectează câmpuri de returnare',
     igx_query_builder_dialog_title: 'Confirmare',
     igx_query_builder_dialog_message: 'Prin modificarea entității, veți pierde setările curente. Ești sigur că vrei să faci asta?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/SV/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/SV/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsSV_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Sök',
     igx_query_builder_select_all: 'Välj alla',
     igx_query_builder_select_entity: 'Välj enhet',
+    igx_query_builder_select_return_field_single: 'Välj returfält',
     igx_query_builder_select_return_fields: 'Välj returfält',
     igx_query_builder_dialog_title: 'Bekräftelse',
     igx_query_builder_dialog_message: 'Genom att ändra entitet förlorar du dina nuvarande inställningar. Vill du fortsätta?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/TR/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/TR/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsTR_: ExpandRequire<IQueryBuilderResourceStrings
     igx_query_builder_search: 'Arama',
     igx_query_builder_select_all: 'Tümünü seç',
     igx_query_builder_select_entity: 'Varlık seç',
+    igx_query_builder_select_return_field_single: 'Dönüş alanını seçin',
     igx_query_builder_select_return_fields: 'Dönüş alanlarını seç',
     igx_query_builder_dialog_title: 'Onay',
     igx_query_builder_dialog_message: 'Varlığı değiştirdiğinizde mevcut ayarlarınızı kaybedersiniz. Devam etmek istiyor musunuz?',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANS/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsZHHANS_: ExpandRequire<IQueryBuilderResourceStr
     igx_query_builder_search: '搜索',
     igx_query_builder_select_all: '全选',
     igx_query_builder_select_entity: '选择实体',
+    igx_query_builder_select_return_field_single: '选择返回字段',
     igx_query_builder_select_return_fields: '选择返回字段',
     igx_query_builder_dialog_title: '确认',
     igx_query_builder_dialog_message: '通过更改实体，您将丢失当前设置。确定要继续？',
diff --git a/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/query-builder-resources.ts b/projects/igniteui-angular-i18n/src/i18n/ZH-HANT/query-builder-resources.ts
@@ -60,6 +60,7 @@ const QueryBuilderResourceStringsZHHANT_: ExpandRequire<IQueryBuilderResourceStr
     igx_query_builder_search: '搜尋',
     igx_query_builder_select_all: '全選',
     igx_query_builder_select_entity: '選取實體',
+    igx_query_builder_select_return_field_single: '選擇返回欄位',
     igx_query_builder_select_return_fields: '選取返回欄位',
     igx_query_builder_dialog_title: '確認',
     igx_query_builder_dialog_message: '透過變更實體，您將遺失目前設定。確定要繼續？',
diff --git a/projects/igniteui-angular/src/lib/core/i18n/query-builder-resources.ts b/projects/igniteui-angular/src/lib/core/i18n/query-builder-resources.ts
@@ -58,6 +58,7 @@ export interface IQueryBuilderResourceStrings {
     igx_query_builder_search?: string;
     igx_query_builder_select_all?: string;
     igx_query_builder_select_entity?: string;
+    igx_query_builder_select_return_field_single?: string;
     igx_query_builder_select_return_fields?: string;
     igx_query_builder_dialog_title?: string;
     igx_query_builder_dialog_message?: string;
@@ -126,6 +127,7 @@ export const QueryBuilderResourceStringsEN: IQueryBuilderResourceStrings = {
     igx_query_builder_search: 'Search',
     igx_query_builder_select_all: 'Select All',
     igx_query_builder_select_entity: 'Select entity',
+    igx_query_builder_select_return_field_single: 'Select return field',
     igx_query_builder_select_return_fields: 'Select return fields',
     igx_query_builder_dialog_title: 'Confirmation',
     igx_query_builder_dialog_message: 'By changing the entity, you will lose your current settings. Are you sure you want to do that?',
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-functions.spec.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder-functions.spec.ts
@@ -212,8 +212,8 @@ export class QueryBuilderFunctions {
     public static getQueryBuilderEditModeContainer(fix: ComponentFixture<any>, entityContainer = true, level = 0) {
         const exprContainer = QueryBuilderFunctions.getQueryBuilderExpressionsContainer(fix, level);
         const editModeContainers = Array.from(exprContainer.querySelectorAll('.igx-filter-tree__inputs'));
-        const entityEditModeContainer = editModeContainers.find(container => container.querySelector('igx-combo'));
-        const conditionEditModeContainer = editModeContainers.find(container => container.querySelector('igx-select') && !container.querySelector('igx-combo'));
+        const entityEditModeContainer = editModeContainers.find(container => container.children.length == 2);
+        const conditionEditModeContainer = editModeContainers.find(container => container.children.length >= 4);
         return entityContainer ? entityEditModeContainer : conditionEditModeContainer;
     }
 
@@ -225,7 +225,7 @@ export class QueryBuilderFunctions {
 
     public static getQueryBuilderFieldsCombo(fix: ComponentFixture<any>, level = 0) {
         const editModeContainer = QueryBuilderFunctions.getQueryBuilderEditModeContainer(fix, true, level);
-        const fieldCombo = editModeContainer.querySelector('igx-combo');
+        const fieldCombo = level == 0 ? editModeContainer.querySelector('igx-combo') : editModeContainer.querySelectorAll('igx-select')[1];
         return fieldCombo;
     }
 
@@ -544,7 +544,7 @@ export class QueryBuilderFunctions {
         expect(!fieldInputGroup.classList.contains('igx-input-group--disabled')).toBe(fieldComboEnabled,
             'incorrect fields combo state');
 
-        if(columnSelectEnabled || operatorSelectEnabled ||  valueInputEnabled || commitButtonEnabled){
+        if (columnSelectEnabled || operatorSelectEnabled || valueInputEnabled || commitButtonEnabled) {
             QueryBuilderFunctions.verifyEditModeExpressionInputStates(fix, columnSelectEnabled, operatorSelectEnabled, valueInputEnabled, commitButtonEnabled, level);
         }
     };
@@ -592,7 +592,7 @@ export class QueryBuilderFunctions {
         expect(entityInput.value).toBe(entityText);
         expect(fieldInput.value).toBe(fieldsText);
 
-        if(columnText ||  operatorText ||  valueText){
+        if (columnText || operatorText || valueText) {
             QueryBuilderFunctions.verifyEditModeExpressionInputValues(fix, columnText, operatorText, valueText, level);
         }
     };
@@ -804,9 +804,12 @@ export class QueryBuilderFunctions {
             tick();
             fix.detectChanges();
         });
-        //close combo drop-down
-        QueryBuilderFunctions.clickQueryBuilderFieldsCombo(fix);
-        fix.detectChanges();
+
+        if (level == 0) {
+            //close combo drop-down
+            QueryBuilderFunctions.clickQueryBuilderFieldsCombo(fix);
+            fix.detectChanges();
+        }
     }
 
     public static selectColumnInEditModeExpression(fix, dropdownItemIndex: number, level = 0) {
@@ -832,12 +835,17 @@ export class QueryBuilderFunctions {
         fix.detectChanges();
     }
 
-     public static addAndValidateChildGroup(fix: ComponentFixture<any>, groupType: number, level: number) {
+    public static addAndValidateChildGroup(fix: ComponentFixture<any>, groupType: number, level: number) {
         // Enter values in the nested query
         QueryBuilderFunctions.selectEntityInEditModeExpression(fix, 0, level); // Select 'Products' entity
         tick(100);
         fix.detectChanges();
 
+        // Select return field
+        QueryBuilderFunctions.selectFieldsInEditModeExpression(fix, [0], level);
+        tick(100);
+        fix.detectChanges();
+
         // Click the initial 'Add Or Group' button.
         QueryBuilderFunctions.clickQueryBuilderInitialAddGroupButton(fix, groupType, level);
         tick(100);
@@ -863,7 +871,7 @@ export class QueryBuilderFunctions {
         // Verify all inputs
         QueryBuilderFunctions.verifyEditModeExpressionInputStates(fix, true, true, false, false, level - 1); // Parent commit button should be disabled
         QueryBuilderFunctions.verifyEditModeQueryExpressionInputStates(fix, true, true, true, true, true, true, level);
-        QueryBuilderFunctions.verifyQueryEditModeExpressionInputValues(fix, 'Products', 'Id, ProductName, OrderId, Released', 'ProductName', 'Contains', 'a', level);
+        QueryBuilderFunctions.verifyQueryEditModeExpressionInputValues(fix, 'Products', 'Id', 'ProductName', 'Contains', 'a', level);
 
         //Commit the populated expression.
         QueryBuilderFunctions.clickQueryBuilderExpressionCommitButton(fix, level);
@@ -890,7 +898,7 @@ export class QueryBuilderFunctions {
     }
 
     public static selectEntityAndClickInitialAddGroup(fix: ComponentFixture<any>, entityIndex: number, groupIndex: number) {
-        QueryBuilderFunctions.selectEntityInEditModeExpression(fix, entityIndex); 
+        QueryBuilderFunctions.selectEntityInEditModeExpression(fix, entityIndex);
         tick(100);
         fix.detectChanges();
 
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts
