Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1b0c5ec
[NAE-2466] Advanced search for PFQL
Retoocs Jul 15, 2026
d619953
[NAE-2466] Advanced search for PFQL
Retoocs Jul 18, 2026
9535f55
[NAE-2466] Advanced search for PFQL
Retoocs Jul 20, 2026
1a5f88e
[NAE-2466] Advanced search for PFQL
Retoocs Jul 20, 2026
574458b
[NAE-2466] Advanced search for PFQL
Retoocs Jul 21, 2026
8acab54
[NAE-2466] Advanced search for PFQL
Retoocs Jul 21, 2026
1928727
[NAE-2466] Advanced search for PFQL
Retoocs Jul 22, 2026
f1cb773
[NAE-2466] Advanced search for PFQL
Retoocs Jul 22, 2026
76d8cfd
[NAE-2466] Advanced search for PFQL
Retoocs Jul 23, 2026
df2b364
[NAE-2466] Advanced search for PFQL
Retoocs Jul 24, 2026
b1bfb54
[NAE-2466] Advanced search for PFQL
Retoocs Jul 28, 2026
7cf142e
[NAE-2466] Advanced search for PFQL
Retoocs Jul 30, 2026
dd5834c
[NAE-2466] Advanced search for PFQL
Retoocs Jul 30, 2026
e558d53
[NAE-2466] Advanced search for PFQL
Retoocs Jul 30, 2026
574ba77
[NAE-2466] Advanced search for PFQL
Retoocs Aug 3, 2026
f304143
[NAE-2466] Advanced search for PFQL
Retoocs Aug 3, 2026
1f1ad21
[NAE-2466] Advanced search for PFQL
Retoocs Aug 3, 2026
0978b8b
[NAE-2466] Advanced search for PFQL
Retoocs Aug 4, 2026
17baf36
[NAE-2466] Advanced search for PFQL
Retoocs Aug 4, 2026
0662619
[NAE-2466] Advanced search for PFQL
Retoocs Aug 5, 2026
445e722
[NAE-2466] Advanced search for PFQL
Retoocs Aug 5, 2026
3b9249c
[NAE-2466] Advanced search for PFQL
Retoocs Aug 5, 2026
a5814bc
[NAE-2466] Advanced search for PFQL
Retoocs Aug 6, 2026
a3b4a28
[NAE-2466] Advanced search for PFQL
Retoocs Aug 6, 2026
af21667
[NAE-2466] Advanced search for PFQL
Retoocs Aug 7, 2026
de1470e
[NAE-2466] Advanced search for PFQL
Retoocs Aug 7, 2026
9a04c77
[NAE-2466] Advanced search for PFQL
Retoocs Aug 10, 2026
f3b5d48
[NAE-2466] Advanced search for PFQL
Retoocs Aug 10, 2026
5e695e4
[NAE-2466] Advanced search for PFQL
Retoocs Aug 12, 2026
0588194
[NAE-2466] Advanced search for PFQL
Retoocs Aug 13, 2026
5221733
[NAE-2466] Advanced search for PFQL
Retoocs Aug 14, 2026
205be29
[NAE-2466] Advanced search for PFQL
Retoocs Aug 14, 2026
614690e
[NAE-2466] Advanced search for PFQL
Retoocs Aug 17, 2026
8c9f2d0
[NAE-2466] Advanced search for PFQL
Retoocs Aug 17, 2026
fd78c6b
[NAE-2466] Advanced search for PFQL
Retoocs Aug 17, 2026
cf73384
[NAE-2466] Advanced search for PFQL
Retoocs Aug 17, 2026
7112395
[NAE-2466] Advanced search for PFQL
Retoocs Aug 17, 2026
5bfbae2
[NAE-2466] Advanced search for PFQL
Retoocs Aug 28, 2026
7968664
[NAE-2466] Advanced search for PFQL
Retoocs Aug 28, 2026
a3ce92f
[NAE-2466] Advanced search for PFQL
Retoocs Aug 31, 2026
5ba6054
[NAE-2466] Advanced search for PFQL
Retoocs Aug 31, 2026
c485524
[NAE-2466] Advanced search for PFQL
Retoocs Sep 1, 2026
1866866
[NAE-2466] Advanced search for PFQL
Retoocs Sep 1, 2026
aa01a02
[NAE-2466] Advanced search for PFQL
Retoocs Sep 1, 2026
552eca9
Merge remote-tracking branch 'origin/release/6.6.0' into NAE-2466
Retoocs Sep 1, 2026
45efdf6
[NAE-2466] Advanced search for PFQL
Retoocs Sep 1, 2026
b8fe604
[NAE-2466] Advanced search for PFQL
Retoocs Sep 2, 2026
e304ab6
[NAE-2466] Advanced search for PFQL
Retoocs Sep 2, 2026
eebc85d
[NAE-2466] Advanced search for PFQL
Retoocs Sep 2, 2026
f4c719e
[NAE-2466] Advanced search for PFQL
Retoocs Sep 3, 2026
577db34
[NAE-2466] Advanced search for PFQL
Retoocs Sep 3, 2026
0b440a8
[NAE-2466] Advanced search for PFQL
Retoocs Sep 6, 2026
0b56fca
[NAE-2466] Advanced search for PFQL
Retoocs Sep 6, 2026
e7ca702
[NAE-2466] Advanced search for PFQL
Retoocs Sep 6, 2026
ebc1abe
[NAE-2466] Advanced search for PFQL
Retoocs Sep 10, 2026
790f1dd
[NAE-2466] Advanced search for PFQL
Retoocs Sep 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "6mb"
"maximumError": "6.5mb"
},
{
"type": "anyComponentStyle",
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"lint": "ng lint",
"e2e": "ng e2e",
"ncc:clean": "node projects/netgrif-components-core/src/scripts/delete-local-build-link.js",
"ncc:build": "npm run ncc:clean && ng build netgrif-components-core --configuration production && npm run ncc:build-schematics",
"ncc:build": "npm run ncc:clean && ng build netgrif-components-core --configuration production && npm run ncc:build-schematics && npm run pfql:build-grammar",
"ncc:local-build": "npm run ncc:build && npm i ./dist/netgrif-components-core --save-optional --legacy-peer-deps",
"ncc:build-schematics": "node projects/netgrif-components-core/src/scripts/build-schematics.js",
"ncc:lint": "ng lint netgrif-components-core",
Expand Down Expand Up @@ -65,7 +65,8 @@
"project:sonar": "node scripts/sonar-scanner-analysis.js",
"components:start": "npm run nc:local-build && ng serve",
"example:start": "ng serve",
"example:build": "ng build nae-example-app --configuration production"
"example:build": "ng build nae-example-app --configuration production",
"pfql:build-grammar": "antlr-ng -Dlanguage=TypeScript -v true -l false -o projects/netgrif-components-core/src/lib/pfql/generated projects/netgrif-components-core/src/lib/pfql/QueryLang.g4"
},
"dependencies": {
"@angular-material-components/datetime-picker": "~16.0.1",
Expand Down Expand Up @@ -138,6 +139,7 @@
"@types/node": "~12.12.29",
"@typescript-eslint/eslint-plugin": "~6.21.0",
"@typescript-eslint/parser": "~6.21.0",
"antlr-ng": "^1.0.0",
"commander": "~4.1.1",
"cspell": "~5.18.4",
"eslint": "~8.12.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<mat-card class="case-view-search-container">
<div fxLayout="row" fxLayoutAlign="space-between">
<div fxLayoutAlign="start center" fxFlex>
<nc-search class="search-width" (filterLoaded)="loadFilter($event)" (filterSaved)="saveFilter($event)"></nc-search>
<nc-search class="search-width"></nc-search>
</div>
<nc-create-case-button [newCaseCreationConfig]="newCaseCreationConfig" (caseCreatedEvent)="handleCaseClick($event)"></nc-create-case-button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
NAE_BASE_FILTER,
NAE_SEARCH_CATEGORIES,
NAE_TAB_DATA,
SavedFilterMetadata,
SearchService,
SimpleFilter,
AbstractTabbedCaseViewComponent,
Expand Down Expand Up @@ -89,21 +88,4 @@ export class DemoTitleConfigContent1CaseViewComponent extends AbstractTabbedCase
super.initializeHeader(this.caseHeaderComponent);
}

loadFilter(filterData: SavedFilterMetadata) {
this._injectedTabData.tabViewRef.openTab({
label: {
text: filterData.filter.title
},
canBeClosed: true,
tabContentComponent: DemoTitleConfigContent1CaseViewComponent,
injectedObject: {...this._injectedTabData, loadFilter: filterData.filter},
order: this._injectedTabData.tabViewOrder,
parentUniqueId: this._injectedTabData.tabUniqueId
}, this._autoswitchToTaskTab, this._openExistingTab);
}

saveFilter(filterData: SavedFilterMetadata) {
console.log(filterData);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<mat-card class="case-view-search-container">
<div fxLayout="row" fxLayoutAlign="space-between">
<div fxLayoutAlign="start center" fxFlex>
<nc-search class="search-width" (filterLoaded)="loadFilter($event)" (filterSaved)="saveFilter($event)"></nc-search>
<nc-search class="search-width"></nc-search>
</div>
<nc-create-case-button [newCaseCreationConfig]="newCaseCreationConfig" (caseCreatedEvent)="handleCaseClick($event)"></nc-create-case-button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
NAE_BASE_FILTER,
NAE_SEARCH_CATEGORIES,
NAE_TAB_DATA,
SavedFilterMetadata,
SearchService,
SimpleFilter,
AbstractTabbedCaseViewComponent,
Expand Down Expand Up @@ -87,21 +86,4 @@ export class DemoTitleConfigContent2CaseViewComponent extends AbstractTabbedCase
super.initializeHeader(this.caseHeaderComponent);
}

loadFilter(filterData: SavedFilterMetadata) {
this._injectedTabData.tabViewRef.openTab({
label: {
text: filterData.filter.title
},
canBeClosed: true,
tabContentComponent: DemoTitleConfigContent2CaseViewComponent,
injectedObject: {...this._injectedTabData, loadFilter: filterData.filter},
order: this._injectedTabData.tabViewOrder,
parentUniqueId: this._injectedTabData.tabUniqueId
}, this._autoswitchToTaskTab, this._openExistingTab);
}

saveFilter(filterData: SavedFilterMetadata) {
console.log(filterData);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<mat-card class="case-view-search-container">
<div fxLayout="row" fxLayoutAlign="space-between">
<div fxLayoutAlign="start center" fxFlex>
<nc-search class="search-width" (filterLoaded)="loadFilter($event)" (filterSaved)="saveFilter($event)"></nc-search>
<nc-search class="search-width"></nc-search>
</div>
<nc-create-case-button [newCaseCreationConfig]="newCaseCreationConfig" (caseCreatedEvent)="handleCaseClick($event)"></nc-create-case-button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
Filter,
FilterType,
NAE_BASE_FILTER,
AllowedNetsServiceFactory, SavedFilterMetadata, AllowedNetsService
AllowedNetsServiceFactory, AllowedNetsService
} from '@netgrif/components-core';
import {HeaderComponent} from '@netgrif/components';
import {Subject} from 'rxjs';
Expand Down Expand Up @@ -85,21 +85,4 @@ export class DemoTitleConfigContent3CaseViewComponent extends AbstractTabbedCase
super.initializeHeader(this.caseHeaderComponent);
}

loadFilter(filterData: SavedFilterMetadata) {
this._injectedTabData.tabViewRef.openTab({
label: {
text: filterData.filter.title
},
canBeClosed: true,
tabContentComponent: DemoTitleConfigContent3CaseViewComponent,
injectedObject: {...this._injectedTabData, loadFilter: filterData.filter},
order: this._injectedTabData.tabViewOrder,
parentUniqueId: this._injectedTabData.tabUniqueId
}, this._autoswitchToTaskTab, this._openExistingTab);
}

saveFilter(filterData: SavedFilterMetadata) {
console.log(filterData);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<mat-card class="case-view-search-container">
<div fxLayout="row" fxLayoutAlign="space-between">
<div fxLayoutAlign="start center" fxFlex>
<nc-search class="search-width" (filterLoaded)="loadFilter($event)"
(filterSaved)="saveFilter($event)"></nc-search>
<nc-search class="search-width"></nc-search>
</div>
<nc-create-case-button [newCaseCreationConfig]="newCaseCreationConfig"
(caseCreatedEvent)="handleCaseClick($event)"></nc-create-case-button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
LoggerService,
NAE_TAB_DATA,
OverflowService,
SavedFilterMetadata,
SearchService,
ViewIdService
} from '@netgrif/components-core';
Expand Down Expand Up @@ -43,21 +42,4 @@ export class SingleTabbedCaseViewComponent extends AbstractTabbedCaseViewCompone
super.initializeHeader(this.caseHeaderComponent);
}

loadFilter(filterData: SavedFilterMetadata) {
this._injectedTabData.tabViewRef.openTab({
label: {
text: filterData.filter.title
},
canBeClosed: true,
tabContentComponent: SingleTabbedCaseViewComponent,
injectedObject: {...this._injectedTabData, loadFilter: filterData.filter},
order: this._injectedTabData.tabViewOrder,
parentUniqueId: this._injectedTabData.tabUniqueId
}, this._autoswitchToTaskTab, this._openExistingTab);
}

saveFilter(filterData: SavedFilterMetadata) {
console.log(filterData);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

<div fxLayout="row" class="max-height" fxLayoutAlign="space-between">
<div fxLayoutAlign="start center" fxFlex>
<nc-search class="search-width search-fix" (filterLoaded)="loadFilter($event)"
(filterSaved)="saveFilter($event)"></nc-search>
<nc-search class="search-width search-fix"></nc-search>
</div>
<nc-create-case-button fxLayoutAlign="center-center" fxLayout="row"
[newCaseCreationConfig]="newCaseCreationConfig"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
ViewIdService,
Filter,
NAE_NEW_CASE_CONFIGURATION,
NAE_BASE_FILTER, AllowedNetsServiceFactory, AllowedNetsService, SavedFilterMetadata, OverflowService
NAE_BASE_FILTER, AllowedNetsServiceFactory, AllowedNetsService, OverflowService
} from '@netgrif/components-core';
import {HeaderComponent} from '@netgrif/components';
import {Subject} from 'rxjs';
Expand Down Expand Up @@ -90,21 +90,4 @@ export class TabbedCaseViewComponent extends AbstractTabbedCaseViewComponent imp
super.initializeHeader(this.caseHeaderComponent);
}

loadFilter(filterData: SavedFilterMetadata) {
this._injectedTabData.tabViewRef.openTab({
label: {
text: filterData.filter.title
},
canBeClosed: true,
tabContentComponent: TabbedCaseViewComponent,
injectedObject: {...this._injectedTabData, loadFilter: filterData.filter},
order: this._injectedTabData.tabViewOrder,
parentUniqueId: this._injectedTabData.tabUniqueId
}, this._autoswitchToTaskTab, this._openExistingTab);
}

saveFilter(filterData: SavedFilterMetadata) {
console.log(filterData);
}

}
3 changes: 2 additions & 1 deletion projects/netgrif-components-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"moment": "~2.29.4",
"natural-orderby": "~2.0.3",
"rxjs": "~6.6.7",
"zone.js": "~0.14.0"
"zone.js": "~0.14.0",
"antlr4ng": "^3.0.16"
}
}
19 changes: 6 additions & 13 deletions projects/netgrif-components-core/src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@
"name": "Fallname",
"placeholder": "Geben Sie den Fallnamen ein"
},
"visualId": {
"name": "Visuelle ID",
"placeholder": "Geben Sie die visuelle ID ein"
},
"stringId": {
"name": "Fall ID",
"placeholder": "Geben Sie die Fall ID ein"
Expand All @@ -143,10 +139,6 @@
"name": "Prozess",
"placeholder": "Wählen Sie den Prozess aus"
},
"role": {
"name": "Prozessrolle",
"placeholder": "Wählen Sie die Prozessrolle aus"
},
"task": {
"name": "Fallaufgabe",
"placeholder": "Wählen Sie die Fallaufgabe aus"
Expand All @@ -163,6 +155,7 @@
"name": "Falldatei",
"placeholder": {
"field": "Wählen Sie das Datenfeld aus",
"plainField": "Eingeben data field",
"value": "Geben Sie den Wert des Datenfeldes ein"
}
}
Expand All @@ -176,15 +169,15 @@
"name": "Prozess",
"placeholder": "Wählen Sie den Prozess aus"
},
"role": {
"name": "Aufgabenprocessrolle",
"placeholder": "Wählen Sie die Prozessrolle der Aufgabe aus"
},
"task": {
"name": "Aufgabe",
"placeholder": "Wählen Sie die Aufgabe aus"
}
},
"plainText": {
"name": "Klartext",
"placeholder": "Schreiben Sie eine gültige PFQL-Abfrage auf."
},
"select": "Suchkategorie",
"userMe": "ICH"
},
Expand Down Expand Up @@ -213,7 +206,7 @@
},
"help": {
"title": "Hilfe für den erweiterten Suchmodus",
"text": "Man kann den erweiterten Suchmodus verwenden, um komplexere Suchanfragen zu erstellen. Beginnen Sie mit der Auswahl einer Suchkategorie. Die Suchkategorie definiert, wonach Sie suchen. Manche Suchkategorien benötigen zusätzliche Konfiguration (z.B. die Falldatei Suchkategorie). Nachdem Sie die Suchkategorie auswählen, mussen Sie den Operator auswählen. Der Operator stellt fest, wie die Daten mit der Suchanfrage übereinstimmen müssen. Mit verschiedenen Operatoren kann man nach einer genauen Übereinstimmung oder nach Werten aus einem Bereich suchen. Nach der Operatorasuwahl muss man das gesuchte Wert eingeben. Die Suchanfragen können mit den Stichwörtern UND oder ODER verbunden werden. Das ODER Stichwort findet Einträge, die mindestens eines der kombinierten Suchanfragen erfühlen. Das UND Stichwort findet Einträge, die alle der kombinierten Suchanfragen, erfühlen."
"text": "Man kann den erweiterten Suchmodus verwenden, um komplexere Suchanfragen zu erstellen. Beginnen Sie mit der Auswahl einer Suchkategorie. Die Suchkategorie definiert, wonach Sie suchen. Manche Suchkategorien benötigen zusätzliche Konfiguration (z.B. die Falldatei Suchkategorie). Nachdem Sie die Suchkategorie auswählen, mussen Sie den Operator auswählen. Der Operator stellt fest, wie die Daten mit der Suchanfrage übereinstimmen müssen. Mit verschiedenen Operatoren kann man nach einer genauen Übereinstimmung oder nach Werten aus einem Bereich suchen. Nach der Operatorasuwahl muss man das gesuchte Wert eingeben. Die Suchanfragen können mit den Stichwörtern UND verbunden werden. Das UND Stichwort findet Einträge, die alle der kombinierten Suchanfragen, erfühlen. Wenn Sie komplexere Suchanfragen eingeben möchten, können Sie die Kategorie „Einfache Abfrage“ auswählen und eine beliebige gültige PFQL-Abfrage eingeben."
},
"fullText": "Geben Sie den gesuchten Text ein",
"and": "und",
Expand Down
19 changes: 6 additions & 13 deletions projects/netgrif-components-core/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@
"name": "Case title",
"placeholder": "Enter case title"
},
"visualId": {
"name": "Case visual ID",
"placeholder": "Enter case visual ID"
},
"stringId": {
"name": "Case ID",
"placeholder": "Enter case ID"
Expand All @@ -143,10 +139,6 @@
"name": "Case process",
"placeholder": "Select case process"
},
"role": {
"name": "Process role",
"placeholder": "Select process role"
},
"task": {
"name": "Case task",
"placeholder": "Select case task"
Expand All @@ -163,6 +155,7 @@
"name": "Case data",
"placeholder": {
"field": "Select data field",
"plainField": "Enter data field",
"value": "Enter data field value"
}
}
Expand All @@ -176,15 +169,15 @@
"name": "Task process",
"placeholder": "Select task process"
},
"role": {
"name": "Task process role",
"placeholder": "Select task process role"
},
"task": {
"name": "Task",
"placeholder": "Select task"
}
},
"plainText": {
"name": "Plain query",
"placeholder": "Write down valid PFQL query"
},
"select": "Search category",
"userMe": "ME"
},
Expand Down Expand Up @@ -213,7 +206,7 @@
},
"help": {
"title": "Advanced search help",
"text": "Advanced search can be used to create more complex search queries. Start by selecting a search category. Search category determines, what you want your query to look for. Some categories (like searching in case data) require further configuration. Afterwards you have to select a search operator. The operator determines how the query attempts to match your data. Are you looking for numbers from a specific range? Are you looking for an exact match? Finally you have to enter the searched value. You can combine simpler queries into more complicated ones by binding them with an OR or an AND keyword. Queries combined with OR find results that match at least one sub-query. Queries combined with AND find results that match all sub-queries."
"text": "Advanced search can be used to create more complex search queries. Start by selecting a search category. Search category determines, what you want your query to look for. Some categories (like searching in case data) require further configuration. Afterwards you have to select a search operator. The operator determines how the query attempts to match your data. Are you looking for numbers from a specific range? Are you looking for an exact match? Finally you have to enter the searched value. You can combine queries with AND keyword. Queries combined with AND find results that match all sub-queries. If you wish to enter more complex queries you can select plain query category and enter any valid PFQL query."
},
"fullText": "Enter searched phrase",
"and": "and",
Expand Down
Loading
Loading