Skip to content

Commit ab9b134

Browse files
committed
Merge branch 'develop' into update-from-template-merged
2 parents 46b25b9 + afdb0a7 commit ab9b134

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4322
-35
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/vaadin-simple-grid-filter/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-simple-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-simple-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

.github/ISSUE_TEMPLATE/enhancement.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-simple-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-simple-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

.github/ISSUE_TEMPLATE/question.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-simple-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-simple-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

.run/Run Demo.run.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
33
<option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
4-
<module name="template-placeholder-demo" />
4+
<module name="vaadin-simple-grid-filter-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# 1.0.1
2+
* Added customization degree
3+
* Makes it possible that certain filters or parts of them are read-only
4+
* Correctly set url when handling query parameters
5+
* Fix faulty reset-button-behaviour
6+
* Fix error when URL is disabled and fields are edited
7+
* Updated Vaadin to v24.6.0 and XDEV Date range picker to v4.2.0
8+
9+
# 1.0.0
10+
_Initial release_

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Bigger changes may require a complete restart.
4747
* [Vaadin automatically reloads the UI on each restart](https://vaadin.com/docs/latest/configuration/live-reload/spring-boot).<br/>
4848
You can control this behavior with the ``vaadin.devmode.liveReload.enabled`` property (default: ``true``).
4949

50-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
50+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-simple-grid-filter/release.yml?branch=master)](https://github.com/xdev-software/vaadin-simple-grid-filter/actions/workflows/release.yml)
5151

5252
Before releasing:
53-
* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
53+
* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-simple-grid-filter/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
5454
* Check the [changelog](CHANGELOG.md)
5555

5656
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

README.md

+39-9
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,54 @@
1-
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/template-placeholder)
2-
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/template-placeholder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/template-placeholder)
3-
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/check-build.yml?branch=develop)](https://github.com/xdev-software/template-placeholder/actions/workflows/check-build.yml?query=branch%3Adevelop)
4-
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_template-placeholder&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_template-placeholder)
1+
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/simple-grid-filter-for-vaadin)
2+
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/vaadin-simple-grid-filter?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/vaadin-simple-grid-filter)
3+
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-simple-grid-filter/check-build.yml?branch=develop)](https://github.com/xdev-software/vaadin-simple-grid-filter/actions/workflows/check-build.yml?query=branch%3Adevelop)
4+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-simple-grid-filter&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-simple-grid-filter)
55
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)
66

7-
# template-placeholder
8-
A Vaadin Template Repo
7+
# vaadin-simple-grid-filter
8+
9+
A simple Vaadin Flow component for filtering Grids.
910

1011
![demo](assets/demo.png)
1112

13+
> [!NOTE]
14+
> If you are looking for a more advanced component you may check out our [grid-filter](https://github.com/xdev-software/vaadin-grid-filter).
15+
16+
## Usage
17+
18+
Here is a very simple example how the FilterComponent can be used:
19+
```java
20+
Grid<Person> grid = createGrid();
21+
22+
FilterComponent<Person> filter = new FilterComponent<>(grid)
23+
.withFilter(new SimpleFilterField<>(Person::getLastName, "Lastname"));
24+
25+
this.add(filter, grid);
26+
```
27+
28+
To get started further it's recommended to have a look at the [demo](./vaadin-simple-grid-filter-demo).<br/>
29+
A description how to get it running can be found [below](#run-the-demo).
30+
31+
> [!IMPORTANT]
32+
> This component is designed for "in memory" filtering of small to medium sized amounts of data.
33+
34+
> [!NOTE]
35+
> Filtering multiple thousand items with complex filtering conditions can drastically impact performance and make the UI unresponsive!<br/> In these cases it's recommended to use backend filtering solutions like database queries or search engines like [ElasticSearch](https://en.wikipedia.org/wiki/Elasticsearch) in combination with a customized UI search framework. If you need help in implementing these feel free to [contact us](https://xdev.software/en/services/support).
1236
1337
## Installation
14-
[Installation guide for the latest release](https://github.com/xdev-software/template-placeholder/releases/latest#Installation)
38+
[Installation guide for the latest release](https://github.com/xdev-software/vaadin-simple-grid-filter/releases/latest#Installation)
39+
40+
#### Compatibility with Vaadin
41+
42+
| Vaadin version | Grid-Filter version |
43+
| --- | --- |
44+
| Vaadin 24+ (latest) | ``1+`` |
1545

1646
### Spring-Boot
1747
* You may have to include ``software/xdev`` inside [``vaadin.allowed-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages)
1848

1949
## Run the Demo
2050
* Checkout the repo
21-
* Run ``mvn install && mvn -f template-placeholder-demo spring-boot:run``
51+
* Run ``mvn install && mvn -f vaadin-simple-grid-filter-demo spring-boot:run``
2252
* Open http://localhost:8080
2353

2454
<details>
@@ -34,4 +64,4 @@ If you need support as soon as possible and you can't wait for any pull request,
3464
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
3565

3666
## Dependencies and Licenses
37-
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/template-placeholder/dependencies)
67+
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-simple-grid-filter/dependencies)

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Reporting a Vulnerability
44

5-
Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/template-placeholder/security/advisories/new).
5+
Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/vaadin-simple-grid-filter/security/advisories/new).

assets/demo.avif

69.1 KB
Binary file not shown.

assets/demo.png

-10.3 KB
Loading

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>software.xdev</groupId>
8-
<artifactId>template-placeholder-root</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
8+
<artifactId>vaadin-simple-grid-filter-root</artifactId>
9+
<version>1.0.2-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -15,8 +15,8 @@
1515
</organization>
1616

1717
<modules>
18-
<module>template-placeholder</module>
19-
<module>template-placeholder-demo</module>
18+
<module>vaadin-simple-grid-filter</module>
19+
<module>vaadin-simple-grid-filter-demo</module>
2020
</modules>
2121

2222
<properties>

renovate.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packageRules": [
55
{
66
"description": "Ignore project internal dependencies",
7-
"packagePattern": "^software.xdev:template-placeholder",
7+
"packagePattern": "^software.xdev:vaadin-simple-grid-filter",
88
"datasources": [
99
"maven"
1010
],

template-placeholder-demo/pom.xml renamed to vaadin-simple-grid-filter-demo/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>software.xdev</groupId>
9-
<artifactId>template-placeholder-root</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
9+
<artifactId>vaadin-simple-grid-filter-root</artifactId>
10+
<version>1.0.2-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>template-placeholder-demo</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
13+
<artifactId>vaadin-simple-grid-filter-demo</artifactId>
14+
<version>1.0.2-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>
@@ -70,7 +70,7 @@
7070
</dependency>
7171
<dependency>
7272
<groupId>software.xdev</groupId>
73-
<artifactId>template-placeholder</artifactId>
73+
<artifactId>vaadin-simple-grid-filter</artifactId>
7474
<version>${project.version}</version>
7575
</dependency>
7676

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package software.xdev.vaadin.model;
2+
3+
public enum Department
4+
{
5+
IT,
6+
HR,
7+
ACCOUNTING
8+
}

0 commit comments

Comments
 (0)