Skip to content

HTM-1751: Add time to search-index schedule configuration #1048

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: main
Choose a base branch
from
Open

HTM-1751: Add time to search-index schedule configuration #1048

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
6afcbac
Custom time for search index schedules
steinkobben Oct 30, 2025
b91fe35
Fill time field with 06:00 when choosing a schedule
steinkobben Oct 30, 2025
039b3b0
Show schedule on tasks page as readable text
steinkobben Oct 31, 2025
00544ba
Merge branch 'main' into dev/htm-1751
steinkobben Oct 31, 2025
cbd686e
Use locale to show time in tasks schedule
steinkobben Oct 31, 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
44 changes: 26 additions & 18 deletions projects/admin-core/assets/locale/messages.admin-core.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
<source>Single-layer filter</source>
<target>Einzel-Ebenen-Filter</target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.createdDate | date:&apos;medium&apos; }}"/></source>
<target>Erstellt von <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }} | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.lastModifiedDate | date:&apos;medium&apos; }}"/></source>
<target>Zuletzt aktualisiert von <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application.add-application" datatype="html">
<source>Add application</source>
<target>Anwendung hinzufügen</target>
Expand Down Expand Up @@ -2054,6 +2062,10 @@
<source>There is no schedule for this search index yet.</source>
<target>Für diesen Suchindex gibt es noch keinen Zeitplan.</target>
</trans-unit>
<trans-unit id="admin-core.search-index.pick-time" datatype="html">
<source>Pick a time</source>
<target>Wähle eine Uhrzeit</target>
</trans-unit>
<trans-unit id="admin-core.search-index.priority" datatype="html">
<source>Priority</source>
<target>Priorität</target>
Expand All @@ -2075,20 +2087,20 @@
<target>Zeitplan</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-day" datatype="html">
<source>Every day at 18:00</source>
<target>Jeden Tag um 18:00 Uhr</target>
<source>Every day</source>
<target>Jeden Tag</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-hour" datatype="html">
<source>Every hour</source>
<target>Stündlich</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-month" datatype="html">
<source>Every first day of the month at 18:00</source>
<target>Jeden ersten Tag im Monat um 18:00 Uhr</target>
<source>Every first day of the month</source>
<target>Jeden ersten Tag im Monat</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-week" datatype="html">
<source>Every week Monday at 18:00</source>
<target>Jede Woche Montag um 18:00 Uhr</target>
<source>Every week on monday</source>
<target>Jede Woche im Montag</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.no-schedule" datatype="html">
<source>No schedule</source>
Expand Down Expand Up @@ -2213,10 +2225,6 @@
<source>last execution succesful</source>
<target>letzte Ausführung erfolgreich</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.cron-expression" datatype="html">
<source>Cron expression</source>
<target>Planung (Cron expression)</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.description" datatype="html">
<source>Description</source>
<target>Beschreibung</target>
Expand Down Expand Up @@ -2249,6 +2257,10 @@
<source>Progress</source>
<target>Fortschritt</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.schedule" datatype="html">
<source>Schedule</source>
<target>Zeitplan</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.scheduling-state" datatype="html">
<source>Scheduling state</source>
<target>Planungsstatus</target>
Expand Down Expand Up @@ -2313,6 +2325,10 @@
<source>Tasks</source>
<target>Aufgaben</target>
</trans-unit>
<trans-unit id="admin-core.tasks.time" datatype="html">
<source><x id="PH" equiv-text="schedule.viewValue"/> at <x id="PH_1" equiv-text="timeString"/></source>
<target><x id="PH" equiv-text="schedule.viewValue"/> um <x id="PH_1" equiv-text="timeString"/> Uhr</target>
</trans-unit>
<trans-unit id="admin-core.upload-select.delete-file" datatype="html">
<source>Delete file?</source>
<target>Datei löschen?</target>
Expand Down Expand Up @@ -2413,14 +2429,6 @@
<source>Valid until</source>
<target>Gültig bis</target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }}"/></source>
<target>Erstellt von <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:'medium' }} | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></source>
<target>Zuletzt aktualisiert von <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></target>
</trans-unit>
</body>
</file>
</xliff>
30 changes: 18 additions & 12 deletions projects/admin-core/assets/locale/messages.admin-core.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
<trans-unit id="admin-core.application-filter-single-layer" datatype="html">
<source>Single-layer filter</source>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.createdDate | date:&apos;medium&apos; }}"/></source>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.lastModifiedDate | date:&apos;medium&apos; }}"/></source>
</trans-unit>
<trans-unit id="admin-core.application.add-application" datatype="html">
<source>Add application</source>
</trans-unit>
Expand Down Expand Up @@ -1505,6 +1511,9 @@
<trans-unit id="admin-core.search-index.no-schedule" datatype="html">
<source>There is no schedule for this search index yet.</source>
</trans-unit>
<trans-unit id="admin-core.search-index.pick-time" datatype="html">
<source>Pick a time</source>
</trans-unit>
<trans-unit id="admin-core.search-index.priority" datatype="html">
<source>Priority</source>
</trans-unit>
Expand All @@ -1521,16 +1530,16 @@
<source>Schedule</source>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-day" datatype="html">
<source>Every day at 18:00</source>
<source>Every day</source>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-hour" datatype="html">
<source>Every hour</source>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-month" datatype="html">
<source>Every first day of the month at 18:00</source>
<source>Every first day of the month</source>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-week" datatype="html">
<source>Every week Monday at 18:00</source>
<source>Every week on monday</source>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.no-schedule" datatype="html">
<source>No schedule</source>
Expand Down Expand Up @@ -1625,9 +1634,6 @@
<trans-unit id="admin-core.tasks.last-execution-successful" datatype="html">
<source>last execution succesful</source>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.cron-expression" datatype="html">
<source>Cron expression</source>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.description" datatype="html">
<source>Description</source>
</trans-unit>
Expand All @@ -1652,6 +1658,9 @@
<trans-unit id="admin-core.tasks.task-details.progress" datatype="html">
<source>Progress</source>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.schedule" datatype="html">
<source>Schedule</source>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.scheduling-state" datatype="html">
<source>Scheduling state</source>
</trans-unit>
Expand Down Expand Up @@ -1700,6 +1709,9 @@
<trans-unit id="admin-core.tasks.tasks" datatype="html">
<source>Tasks</source>
</trans-unit>
<trans-unit id="admin-core.tasks.time" datatype="html">
<source><x id="PH" equiv-text="schedule.viewValue"/> at <x id="PH_1" equiv-text="timeString"/></source>
</trans-unit>
<trans-unit id="admin-core.upload-select.delete-file" datatype="html">
<source>Delete file?</source>
</trans-unit>
Expand Down Expand Up @@ -1775,12 +1787,6 @@
<trans-unit id="admin-core.users.valid-until" datatype="html">
<source>Valid until</source>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }}"/></source>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></source>
</trans-unit>
</body>
</file>
</xliff>
44 changes: 26 additions & 18 deletions projects/admin-core/assets/locale/messages.admin-core.nl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
<source>Single-layer filter</source>
<target>Enkele laag filter</target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.createdDate | date:&apos;medium&apos; }}"/></source>
<target>Aangemaakt door <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }}"/> at <x id="INTERPOLATION_1" equiv-text="{{ application.lastModifiedDate | date:&apos;medium&apos; }}"/></source>
<target>Laatst bijgewerkt door <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application.add-application" datatype="html">
<source>Add application</source>
<target>Applicatie toevoegen</target>
Expand Down Expand Up @@ -2037,6 +2045,10 @@
<source>There is no schedule for this search index yet.</source>
<target>Er is nog geen planning voor deze zoekindex.</target>
</trans-unit>
<trans-unit id="admin-core.search-index.pick-time" datatype="html">
<source>Pick a time</source>
<target>Kies een tijd</target>
</trans-unit>
<trans-unit id="admin-core.search-index.priority" datatype="html">
<source>Priority</source>
<target>Prioriteit</target>
Expand All @@ -2058,20 +2070,20 @@
<target>Planning</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-day" datatype="html">
<source>Every day at 18:00</source>
<target>Elke dag om 18:00</target>
<source>Every day</source>
<target>Elke dag</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-hour" datatype="html">
<source>Every hour</source>
<target>Elk uur</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-month" datatype="html">
<source>Every first day of the month at 18:00</source>
<target>Elke eerste dag van de maand om 18:00</target>
<source>Every first day of the month</source>
<target>Elke eerste dag van de maand</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.every-week" datatype="html">
<source>Every week Monday at 18:00</source>
<target>Elke week maandag om 18:00</target>
<source>Every week on monday</source>
<target>Elke week op maandag</target>
</trans-unit>
<trans-unit id="admin-core.search-index.schedule.no-schedule" datatype="html">
<source>No schedule</source>
Expand Down Expand Up @@ -2197,10 +2209,6 @@
<source>last execution succesful</source>
<target>laatste uitvoering succesvol</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.cron-expression" datatype="html">
<source>Cron expression</source>
<target>Planning (Cron expression)</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.description" datatype="html">
<source>Description</source>
<target>Beschrijving</target>
Expand Down Expand Up @@ -2233,6 +2241,10 @@
<source>Progress</source>
<target>Voortgang</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.schedule" datatype="html">
<source>Schedule</source>
<target>Planning</target>
</trans-unit>
<trans-unit id="admin-core.tasks.task-details.scheduling-state" datatype="html">
<source>Scheduling state</source>
<target>Planning staat</target>
Expand Down Expand Up @@ -2297,6 +2309,10 @@
<source>Tasks</source>
<target>Taken</target>
</trans-unit>
<trans-unit id="admin-core.tasks.time" datatype="html">
<source><x id="PH" equiv-text="schedule.viewValue"/> at <x id="PH_1" equiv-text="timeString"/></source>
<target><x id="PH" equiv-text="schedule.viewValue"/> om <x id="PH_1" equiv-text="timeString"/> uur</target>
</trans-unit>
<trans-unit id="admin-core.upload-select.delete-file" datatype="html">
<source>Delete file?</source>
<target>Bestand verwijderen?</target>
Expand Down Expand Up @@ -2397,14 +2413,6 @@
<source>Valid until</source>
<target>Geldig tot</target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.created" datatype="html">
<source>Created by <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }}"/></source>
<target>Aangemaakt door <x id="INTERPOLATION" equiv-text="{{ application.createdBy }} at {{ application.createdDate | date:&apos;medium&apos; }}"/></target>
</trans-unit>
<trans-unit id="admin-core.application-metadata.updated" datatype="html">
<source>Last updated by <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></source>
<target>Laatst bijgewerkt door <x id="INTERPOLATION" equiv-text="{{ application.lastModifiedBy }} at {{ application.lastModifiedBy | date:&apos;medium&apos; }}"/></target>
</trans-unit>
</body>
</file>
</xliff>
21 changes: 17 additions & 4 deletions ...n-core/src/lib/search-index/search-index-scheduling/search-index-scheduling.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.form-control {
margin-top: 16px;
}

.schedule-title {
margin-bottom: 16px;
}
Expand Down Expand Up @@ -37,3 +33,20 @@
margin-top: 16px;
margin-bottom: 3px;
}

.schedule-frequency-and-time {
display: flex;
gap: 16px;
flex-direction: row;
margin-bottom: 16px;
}

.schedule-frequency-field {
flex: 1;
}

.time-picker-field {
margin-top: 0;
flex: 0 0 150px;
}

37 changes: 24 additions & 13 deletions ...-core/src/lib/search-index/search-index-scheduling/search-index-scheduling.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,30 @@ <h2 class="schedule-title" i18n="@@admin-core.search-index.schedule">Schedule</h
</div>

<form [formGroup]="scheduleForm">
<mat-form-field>
<mat-label>Schedule</mat-label>
<mat-select formControlName="cronExpression">
@for (option of scheduleOptions; track $index) {
<mat-option
[value]="option.cronExpression"
[disabled]="option.cronExpression === '' && taskSchedule?.uuid">
{{ option.viewValue }}
</mat-option>
}
</mat-select>
</mat-form-field>
@if (scheduleForm.value.cronExpression) {
<div class="schedule-frequency-and-time">
<mat-form-field class="schedule-frequency-field">
<mat-label i18n="@@admin-core.search-index.schedule">Schedule</mat-label>
<mat-select formControlName="partialCronExpression">
@for (option of scheduleOptions; track $index) {
<mat-option
[value]="option.cronExpression"
[disabled]="option.cronExpression === '' && taskSchedule?.uuid">
{{ option.viewValue }}
</mat-option>
}
</mat-select>
</mat-form-field>
@if (!(scheduleForm.get('partialCronExpression')?.value === hourlyCronExpression
|| scheduleForm.get('partialCronExpression')?.value === '')) {
<mat-form-field class="time-picker-field">
<mat-label i18n="@@admin-core.search-index.pick-time">Pick a time</mat-label>
<input matInput formControlName="time" [matTimepicker]="picker">
<mat-timepicker-toggle matIconSuffix [for]="picker"/>
<mat-timepicker #picker/>
</mat-form-field>
}
</div>
@if (scheduleForm.value.partialCronExpression) {
<mat-form-field>
<mat-label i18n="@@admin-core.common.description">Description</mat-label>
<input matInput
Expand Down
Loading
Loading