Skip to content

"Show Next Dates" fixes #23

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

"Show Next Dates" fixes #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b164848
refactor: update calculation of next dates to parse date only one time
paodb Nov 5, 2025
c5b9fde
fix: update next dates calculations
paodb Nov 5, 2025
ac152ac
fix: update height of show next date grid
paodb Nov 6, 2025
3db69e3
fix: remove tertiary variant from show next dates button
paodb Nov 6, 2025
3f4196a
fix: remove unnecessary sytle rule for grid
paodb Nov 6, 2025
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
23 changes: 10 additions & 13 deletions src/main/java/com/flowingcode/vaadin/addons/cronexpressionfield/CronExpressionField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Stream;
import com.flowingcode.vaadin.addons.dayofweekselector.DayOfWeekSelector;
Expand All @@ -52,17 +53,14 @@
import com.vaadin.flow.component.textfield.IntegerField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.component.timepicker.TimePicker;
import com.vaadin.flow.data.provider.DataProvider;
import com.vaadin.flow.function.SerializableConsumer;
import com.vaadin.flow.internal.JsonSerializer;

import elemental.json.JsonObject;
import org.springframework.scheduling.support.CronExpression;
import it.burning.cron.CronExpressionDescriptor;
import it.burning.cron.CronExpressionParser.CronExpressionParseException;
import it.burning.cron.CronExpressionParser.Options;


/**
* UI component for building cron expressions.
*
Expand Down Expand Up @@ -210,7 +208,6 @@ private void configureLayout() {

nextDatesBtn.setText(i18n.getShowNextDatesBtn());
nextDatesBtn.addClickListener(e -> showNextDates());
nextDatesBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
nextDatesBtn.setVisible(false);

add(topLayout, mainLayout, new Span(i18n.getDescriptionLabel()), cronDescriptionDiv, nextDatesBtn);
Expand Down Expand Up @@ -438,20 +435,20 @@ private void showNextDates() {
if (!inputExpressionTf.getValue().isEmpty()) {
grid.removeAllColumns();
grid.addColumn(date -> formatDate(date));
grid.setHeight("30%");
grid.setItems(DataProvider.fromCallbacks(q -> generateNextDate(LocalDateTime.now(), q.getOffset(), q.getLimit()),
q -> Integer.MAX_VALUE));
grid.setHeight("108px");
grid.setItems(q -> generateNextDate(LocalDateTime.now(), q.getOffset(), q.getLimit()));
add(grid);
}
}

private LocalDateTime calculateNextDate(LocalDateTime date) {
return CronExpression.parse(inputExpressionTf.getValue()).next(date);
}

private Stream<LocalDateTime> generateNextDate(LocalDateTime start, int offset, int limit) {
Stream<LocalDateTime> nextDates = Stream.iterate(calculateNextDate(start), this::calculateNextDate);
return nextDates.skip(offset).limit(limit);
CronExpression parsedExpression = CronExpression.parse(inputExpressionTf.getValue());
LocalDateTime firstNext = parsedExpression.next(start);
if (firstNext == null) {
return Stream.empty();
}
return Stream.iterate(firstNext, Objects::nonNull, parsedExpression::next).skip(offset)
.limit(limit);
}

private String formatDate(LocalDateTime date) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/META-INF/frontend/styles/cron-expression-field-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
margin: 0;
}

vaadin-grid::part(header) {
display: none;
}

.description-div {
padding: 0;
margin: 0;
Expand Down