Skip to content

[NAB-399] Add new filter data types #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Retoocs wants to merge 6 commits into
base: next
Choose a base branch
from
Open

[NAB-399] Add new filter data types #32

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71a3a66
Merge pull request #14 from netgrif/next
mazarijuraj Nov 11, 2024
d9feda5
Merge pull request #30 from netgrif/next
mazarijuraj May 18, 2026
5a9e5ce
[NAB-399] Add new filter data types
Retoocs Jun 9, 2026
b7cd8a5
[NAB-399] Add new filter data types
Retoocs Jun 9, 2026
0c51366
[NAB-399] Add new filter data types
mazarijuraj Jun 10, 2026
d76d814
[NAB-399] Add new filter data types
mazarijuraj Jun 10, 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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netgrif/application-builder",
"version": "2.1.0",
"version": "2.1.1",
"description": "Netgrif Application Builder for building, configuring and modeling applications for Application Engine.",
"homepage": "https://builder.netgrif.com",
"license": "SEE LICENSE IN LICENSE FILE",
Expand Down Expand Up @@ -59,7 +59,7 @@
"@netgrif/components": "7.0.0-beta.1",
"@netgrif/components-core": "7.0.0-beta.1",
"@netgrif/petri.svg": "1.1.1",
"@netgrif/petriflow": "2.2.2",
"@netgrif/petriflow": "2.2.3",
"@netgrif/petriflow.svg": "1.1.1",
"@ngbracket/ngx-layout": "^17.0.1",
"@ngx-translate/core": "~15.0.0",
Expand Down
16 changes: 13 additions & 3 deletions src/app/form-builder/field-list/field-list.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,21 @@ export class FieldListService {
]
},
{
type: DataType.FILTER,
showPlaceholder: true,
type: DataType.CASE_FILTER,
components: [
{title: 'Simple'},
]
},
{
type: DataType.TASK_FILTER,
components: [
{title: 'Simple'},
]
},
{
type: DataType.PROCESS_FILTER,
components: [
{title: 'Simple'},
{title: 'Tab view', name: 'filter-tab-view'}
]
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
{
Expand Down
5 changes: 4 additions & 1 deletion src/app/modeler/data-mode/data-detail/data-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ export class DataDetailComponent implements OnDestroy {
{viewValue: 'Enumeration Map', value: DataType.ENUMERATION_MAP},
{viewValue: 'File', value: DataType.FILE},
{viewValue: 'File List', value: DataType.FILE_LIST},
{viewValue: 'Filter', value: DataType.FILTER},
{viewValue: 'Filter (deprecated)', value: DataType.FILTER},
{viewValue: 'Case Filter', value: DataType.CASE_FILTER},
{viewValue: 'Task Filter', value: DataType.TASK_FILTER},
{viewValue: 'Process Filter', value: DataType.PROCESS_FILTER},
{viewValue: 'I18n', value: DataType.I18N},
{viewValue: 'Multichoice', value: DataType.MULTICHOICE},
{viewValue: 'Multichoice Map', value: DataType.MULTICHOICE_MAP},
Expand Down
11 changes: 6 additions & 5 deletions src/app/modeler/gridster-field-to-engine-field.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ export class GridsterFieldToEngineFieldService {
return this.toFileListField(dataField);
case DataType.TASK_REF:
return this.toTaskRefField(dataField);
case DataType.FILTER:
case DataType.CASE_FILTER:
case DataType.TASK_FILTER:
case DataType.PROCESS_FILTER:
return this.toFilterField(dataField);
case DataType.TEXT:
default:
Expand Down Expand Up @@ -297,13 +299,12 @@ export class GridsterFieldToEngineFieldService {
);
}

private toFilterField(dataField: GridsterDataField): FilterField {
return new FilterField(
private toFilterField(dataField: GridsterDataField): TextField {
// todo filter field string component
return new TextField(
dataField.dataVariable.id,
dataField.dataVariable.title?.value,
dataField.dataVariable.init?.value,
undefined,
undefined,
this.buildBehavior(dataField),
dataField.dataVariable.placeholder?.value,
dataField.dataVariable.desc?.value,
Expand Down
Loading