Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d2bcef7
Fill in template I
AB-xdev Sep 23, 2024
8aeb88a
Fill in template II
AB-xdev Sep 23, 2024
33817de
Fix inceptionYear
AB-xdev Sep 23, 2024
be20d78
Init
AB-xdev Sep 23, 2024
80d5ebd
Cleanup
AB-xdev Sep 23, 2024
54e66c9
Reformat CSS
AB-xdev Sep 23, 2024
7884306
Cleanup
AB-xdev Sep 23, 2024
915e7a6
Fix compile
AB-xdev Sep 23, 2024
53a7f21
Create demo
AB-xdev Sep 23, 2024
6f15362
Fix some PMD warnings
AB-xdev Sep 24, 2024
40303d4
Update dependency com.mycila:license-maven-plugin to v4.6
xdev-renovate Sep 26, 2024
8903c1e
Update dependency com.mycila:license-maven-plugin to v4.6
xdev-renovate Sep 26, 2024
0bcf27f
Merge pull request #235 from xdev-software/renovate/com.mycila-licens…
AB-xdev Sep 27, 2024
f8289ae
Merge pull request #99 from xdev-software/renovate/com.mycila-license…
AB-xdev Sep 27, 2024
e8c1748
We don't use hilla -> We don't need hilla
AB-xdev Sep 27, 2024
52afc82
Update net.sourceforge.pmd to v7.6.0
xdev-renovate Sep 27, 2024
0443fe6
Merge pull request #100 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Sep 27, 2024
b60940b
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Sep 27, 2024
c0330dd
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.7
xdev-renovate Sep 28, 2024
40edee3
Update dependency com.puppycrawl.tools:checkstyle to v10.18.2
xdev-renovate Sep 30, 2024
2ce9319
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3…
xdev-renovate Oct 2, 2024
6901c1d
Update vaadin.version to v24.4.13
xdev-renovate Oct 2, 2024
2599195
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Oct 7, 2024
c6780b5
Merge pull request #103 from xdev-software/renovate/org.apache.maven.…
AB-xdev Oct 7, 2024
f4b4a6d
Merge pull request #102 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Oct 7, 2024
27ec7ab
Merge pull request #101 from xdev-software/renovate/org.apache.maven.…
AB-xdev Oct 7, 2024
93dc3f2
Merge pull request #241 from xdev-software/renovate/vaadin.version
AB-xdev Oct 7, 2024
28b9344
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Oct 7, 2024
c4de50c
Fix PMD
AB-xdev Oct 7, 2024
448bb1e
Merge pull request #8 from xdev-software/update-from-template-merged
AB-xdev Oct 7, 2024
a6cfe32
Fix CPD
AB-xdev Oct 7, 2024
2a7d96c
Merge branch 'develop' of https://github.com/xdev-software/vaadin-gri…
AB-xdev Oct 7, 2024
4557844
Prepare for initial release
AB-xdev Oct 7, 2024
e938a86
Backport upstream
AB-xdev Oct 7, 2024
aacf72a
Add desc
AB-xdev Oct 7, 2024
9c8c890
Fix codestyle
AB-xdev Oct 7, 2024
bc5abe8
Update README.md
AB-xdev Oct 7, 2024
0afe659
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Oct 7, 2024
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 .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ body:
attributes:
label: "Checklist"
options:
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/vaadin-grid-filter/releases/latest)"
required: true
- 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."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: "Checklist"
options:
- 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."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: "Checklist"
options:
- 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."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-grid-filter/issues) or [closed](https://github.com/xdev-software/vaadin-grid-filter/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .run/Run Demo.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
<module name="template-placeholder-demo" />
<module name="vaadin-grid-filter-demo" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<extension name="coverage">
<pattern>
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# 1.0.0
_Initial release_
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ Bigger changes may require a complete restart.
* [Vaadin automatically reloads the UI on each restart](https://vaadin.com/docs/latest/configuration/live-reload/spring-boot).<br/>
You can control this behavior with the ``vaadin.devmode.liveReload.enabled`` property (default: ``true``).

## 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)
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-grid-filter/release.yml?branch=master)](https://github.com/xdev-software/vaadin-grid-filter/actions/workflows/release.yml)

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

If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
Expand Down
25 changes: 16 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/template-placeholder)
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/template-placeholder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/template-placeholder)
[![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)
[![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)
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/vaadin-grid-filter)
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/vaadin-grid-filter?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/vaadin-grid-filter)
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-grid-filter/check-build.yml?branch=develop)](https://github.com/xdev-software/vaadin-grid-filter/actions/workflows/check-build.yml?query=branch%3Adevelop)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-grid-filter&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-grid-filter)
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)

# template-placeholder
A Vaadin Template Repo
# vaadin-grid-filter

A Vaadin Flow component for filtering Grids.

![demo](assets/demo.png)


## Installation
[Installation guide for the latest release](https://github.com/xdev-software/template-placeholder/releases/latest#Installation)
[Installation guide for the latest release](https://github.com/xdev-software/vaadin-grid-filter/releases/latest#Installation)

#### Compatibility with Vaadin

| Vaadin version | Grid-Filter version |
| --- | --- |
| Vaadin 24+ (latest) | ``1+`` |

## Run the Demo
* Checkout the repo
* Run ``mvn install && mvn -f template-placeholder-demo spring-boot:run``
* Run ``mvn install && mvn -f vaadin-grid-filter-demo spring-boot:run``
* Open http://localhost:8080

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

## Dependencies and Licenses
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/template-placeholder/dependencies)
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-grid-filter/dependencies)
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## Reporting a Vulnerability

Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/template-placeholder/security/advisories/new).
Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/vaadin-grid-filter/security/advisories/new).
Binary file modified assets/demo.avif
Binary file not shown.
Binary file modified assets/demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>software.xdev</groupId>
<artifactId>template-placeholder-root</artifactId>
<artifactId>vaadin-grid-filter-root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

Expand All @@ -15,8 +15,8 @@
</organization>

<modules>
<module>template-placeholder</module>
<module>template-placeholder-demo</module>
<module>vaadin-grid-filter</module>
<module>vaadin-grid-filter-demo</module>
</modules>

<properties>
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.18.1</version>
<version>10.18.2</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -82,12 +82,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.5.0</version>
<version>7.6.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.5.0</version>
<version>7.6.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packageRules": [
{
"description": "Ignore project internal dependencies",
"packagePattern": "^software.xdev:template-placeholder",
"packagePattern": "^software.xdev:vaadin-grid-filter",
"datasources": [
"maven"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

<parent>
<groupId>software.xdev</groupId>
<artifactId>template-placeholder-root</artifactId>
<artifactId>vaadin-grid-filter-root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>template-placeholder-demo</artifactId>
<artifactId>vaadin-grid-filter-demo</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

Expand All @@ -29,7 +29,7 @@
<mainClass>software.xdev.vaadin.Application</mainClass>

<!-- Dependency-Versions -->
<vaadin.version>24.4.12</vaadin.version>
<vaadin.version>24.4.13</vaadin.version>

<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
</properties>
Expand Down Expand Up @@ -61,17 +61,29 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-core</artifactId>
<exclusions>
<exclusion>
<groupId>com.vaadin</groupId>
<artifactId>hilla-dev</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.xdev</groupId>
<artifactId>template-placeholder</artifactId>
<artifactId>vaadin-grid-filter</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Spring -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>com.vaadin</groupId>
<artifactId>hilla</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package software.xdev.vaadin.model;

public enum Department
{
IT,
HR,
ACCOUNTING
}
Loading