Skip to content
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.

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

Admin ui for live view of queries #2062

Merged
merged 22 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a81fdbd
Admin UI for live view of queries
Aug 31, 2021
526f8af
Update AutoDoc
github-actions[bot] Aug 31, 2021
574b15c
Update backend/src/main/java/com/bakdata/conquery/resources/admin/res…
Njimefo Sep 1, 2021
78cc524
Merge branch 'develop' into feature/admin-queries-monitor
Sep 2, 2021
7bf0fb5
Admin UI for live view of queries adapted
Sep 2, 2021
9102f93
Update AutoDoc
github-actions[bot] Sep 2, 2021
2da1d9c
languageTag in backend removed and added in fronted
Sep 3, 2021
28180c4
Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…
Sep 3, 2021
8eac327
Update AutoDoc
github-actions[bot] Sep 3, 2021
1ae82cb
path issues resolved
Sep 3, 2021
5140d50
Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…
Sep 3, 2021
72e577a
path issues resolved
Sep 3, 2021
4d60009
Merge remote-tracking branch 'origin/develop' into feature/admin-quer…
awildturtok Sep 3, 2021
a18e986
Merge branch 'feature/admin-queries-monitor' of https://github.com/ba…
awildturtok Sep 3, 2021
83fd6f6
parameterized request of queries and reformatted html code
Sep 6, 2021
76f561b
Merge remote-tracking branch 'origin/master' into feature/admin-queri…
Sep 7, 2021
81102a2
parameterized request of queries and reformatted html code
Sep 10, 2021
36906ef
Merge remote-tracking branch 'origin/develop' into develop
Sep 10, 2021
f446429
review changes
Sep 10, 2021
0e80020
Update AutoDoc
github-actions[bot] Sep 10, 2021
3418875
updated code after code review
Sep 10, 2021
2861dec
Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…
Sep 10, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.*;

import static com.bakdata.conquery.resources.ResourceConstants.JOB_ID;
import static org.apache.shiro.util.StringUtils.hasText;
Expand Down Expand Up @@ -92,14 +90,14 @@ public ImmutableMap<String, JobManagerStatus> getJobs() {


@GET
@Path("/queries/")
public FullExecutionStatus[] getQueries(@Auth User currentUser) {
@Path("/queries")
public FullExecutionStatus[] getQueries(@Auth User currentUser, @QueryParam("limit") OptionalLong limit, @QueryParam("since") Optional<String> since) {
thoniTUB marked this conversation as resolved.
Show resolved Hide resolved
final MetaStorage storage = processor.getStorage();
final DatasetRegistry datasetRegistry = processor.getDatasetRegistry();
return storage.getAllExecutions().stream()
.map(t -> t.buildStatusFull(storage, currentUser, datasetRegistry))
.filter(t -> t.getCreatedAt().toLocalDate().equals(LocalDate.now(t.getCreatedAt().getZone())))
.limit(100)
.filter(t -> t.getCreatedAt().toLocalDate().isEqual(since.map(LocalDate::parse).orElse(LocalDate.now())))
.limit(limit.orElse(100))
.toArray(FullExecutionStatus[]::new);
}
}
}
Loading