From a81fdbdde9e6a3cb87af0b8a8199541455a198f0 Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Tue, 31 Aug 2021 18:20:55 +0200 Subject: [PATCH 01/14] Admin UI for live view of queries --- .../conquery/apiv1/ExecutionStatus.java | 5 + .../conquery/apiv1/QueryProcessor.java | 5 +- .../models/execution/ManagedExecution.java | 22 +- .../models/forms/managed/ManagedForm.java | 6 +- .../conquery/models/query/ManagedQuery.java | 12 +- .../conquery/resources/ResourceConstants.java | 1 + .../resources/admin/rest/AdminResource.java | 325 +++++++++++++++++- .../resources/admin/rest/UIProcessor.java | 4 + .../resources/admin/ui/AdminUIResource.java | 6 + .../resources/admin/ui/queries.html.ftl | 322 +++++++++++++++++ .../admin/ui/templates/template.html.ftl | 3 + 11 files changed, 674 insertions(+), 37 deletions(-) create mode 100644 backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java b/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java index eba51f2d30..ef08d4e746 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java @@ -1,11 +1,13 @@ package com.bakdata.conquery.apiv1; import java.net.URL; +import java.time.LocalDateTime; import java.time.ZonedDateTime; import java.util.Collections; import java.util.List; import com.bakdata.conquery.models.execution.ExecutionState; +import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId; import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; @@ -38,6 +40,9 @@ public abstract class ExecutionStatus { private Long numberOfResults; private Long requiredTime; + private LocalDateTime startTime; + private LocalDateTime finishTime; + private String queryType; private SecondaryIdDescriptionId secondaryId; diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java index 6af2e4f26c..e89c481af6 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java @@ -192,8 +192,7 @@ public Stream getQueriesFiltered(Dataset datasetId, UriBuilder .map(mq -> { OverviewExecutionStatus status = mq.buildStatusOverview( uriBuilder.clone(), - user, - datasetAbilities + user ); if (mq.isReadyToDownload(datasetAbilities)) { setDownloadUrls(status, config.getResultProviders(), mq, uriBuilder, allProviders); @@ -351,7 +350,7 @@ public FullExecutionStatus getQueryFullStatus(ManagedExecution query, User us query.initExecutable(datasetRegistry, config); Map> datasetAbilities = buildDatasetAbilityMap(user, datasetRegistry); - final FullExecutionStatus status = query.buildStatusFull(storage, url, user, datasetRegistry, datasetAbilities); + final FullExecutionStatus status = query.buildStatusFull(storage, user, datasetRegistry); if (query.isReadyToDownload(datasetAbilities)) { setDownloadUrls(status, config.getResultProviders(), query, url, allProviders); diff --git a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java index 5780e68751..33702ce615 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java +++ b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java @@ -55,11 +55,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Uninterruptibles; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.Setter; -import lombok.ToString; +import lombok.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.apache.shiro.authz.Permission; @@ -238,7 +234,7 @@ public void awaitDone(int time, TimeUnit unit) { Uninterruptibles.awaitUninterruptibly(execution, time, unit); } - protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status, UriBuilder url, Map> datasetAbilities) { + protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status) { status.setLabel(label == null ? queryId.toString() : getLabelWithoutAutoLabelSuffix()); status.setPristineLabel(label == null || queryId.toString().equals(label) || isAutoLabeled()); status.setId(getId()); @@ -247,6 +243,8 @@ protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status status.setOwn(user.isOwner(this)); status.setCreatedAt(getCreationTime().atZone(ZoneId.systemDefault())); status.setRequiredTime((startTime != null && finishTime != null) ? ChronoUnit.MILLIS.between(startTime, finishTime) : null); + status.setStartTime(startTime); + status.setFinishTime(finishTime); status.setStatus(getState()); if (owner != null) { status.setOwner(owner.getId()); @@ -257,9 +255,9 @@ protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status /** * Renders a lightweight status with meta information about this query. Computation an size should be small for this. */ - public OverviewExecutionStatus buildStatusOverview(UriBuilder url, User user, Map> datasetAbilities) { + public OverviewExecutionStatus buildStatusOverview(UriBuilder url, User user) { OverviewExecutionStatus status = new OverviewExecutionStatus(); - setStatusBase(user, status, url, datasetAbilities); + setStatusBase(user, status); return status; } @@ -268,12 +266,12 @@ public OverviewExecutionStatus buildStatusOverview(UriBuilder url, User user, Ma * Renders an extensive status of this query (see {@link FullExecutionStatus}. The rendering can be computation intensive and can produce a large * object. The use of the full status is only intended if a client requested specific information about this execution. */ - public FullExecutionStatus buildStatusFull(@NonNull MetaStorage storage, UriBuilder url, User user, DatasetRegistry datasetRegistry, Map> datasetAbilities) { + public FullExecutionStatus buildStatusFull(@NonNull MetaStorage storage, User user, DatasetRegistry datasetRegistry) { Preconditions.checkArgument(isInitialized(), "The execution must have been initialized first"); FullExecutionStatus status = new FullExecutionStatus(); - setStatusBase(user, status, url, datasetAbilities); + setStatusBase(user, status); - setAdditionalFieldsForStatusWithColumnDescription(storage, url, user, status, datasetRegistry); + setAdditionalFieldsForStatusWithColumnDescription(storage, user, status, datasetRegistry); setAdditionalFieldsForStatusWithSource(user, status); setAdditionalFieldsForStatusWithGroups(storage, status); setAvailableSecondaryIds(status); @@ -313,7 +311,7 @@ private void setAdditionalFieldsForStatusWithGroups(@NonNull MetaStorage storage status.setGroups(permittedGroups); } - protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, UriBuilder url, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { + protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { // Implementation specific } diff --git a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedForm.java b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedForm.java index fc9ba0e605..006065edfd 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedForm.java +++ b/backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedForm.java @@ -8,8 +8,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; - import com.bakdata.conquery.apiv1.FullExecutionStatus; import com.bakdata.conquery.apiv1.forms.Form; import com.bakdata.conquery.apiv1.query.QueryDescription; @@ -179,8 +177,8 @@ public QueryDescription getSubmitted() { @Override - protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, UriBuilder url, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { - super.setAdditionalFieldsForStatusWithColumnDescription(storage, url, user, status, datasetRegistry); + protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { + super.setAdditionalFieldsForStatusWithColumnDescription(storage, user, status, datasetRegistry); // Set the ColumnDescription if the Form only consits of a single subquery if (subQueries == null) { // If subqueries was not set the Execution was not initialized, do it manually diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/ManagedQuery.java b/backend/src/main/java/com/bakdata/conquery/models/query/ManagedQuery.java index fe5d8b21ae..7c0d6b87c0 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/query/ManagedQuery.java +++ b/backend/src/main/java/com/bakdata/conquery/models/query/ManagedQuery.java @@ -11,8 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.UriBuilder; - import c10n.C10N; import com.bakdata.conquery.apiv1.ExecutionStatus; import com.bakdata.conquery.apiv1.FullExecutionStatus; @@ -26,7 +24,6 @@ import com.bakdata.conquery.io.cps.CPSType; import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.User; -import com.bakdata.conquery.models.auth.permissions.Ability; import com.bakdata.conquery.models.config.ConqueryConfig; import com.bakdata.conquery.models.datasets.Dataset; import com.bakdata.conquery.models.execution.ExecutionState; @@ -34,7 +31,6 @@ import com.bakdata.conquery.models.externalservice.ResultType; import com.bakdata.conquery.models.i18n.I18n; import com.bakdata.conquery.models.identifiable.ids.NamespacedIdentifiable; -import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.models.messages.namespaces.WorkerMessage; import com.bakdata.conquery.models.messages.namespaces.specific.ExecuteQuery; import com.bakdata.conquery.models.query.resultinfo.ResultInfo; @@ -135,8 +131,8 @@ public void start() { } @Override - protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status, UriBuilder url, Map> datasetAbilities) { - super.setStatusBase(user, status, url, datasetAbilities); + protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status) { + super.setStatusBase(user, status); status.setNumberOfResults(lastResultCount); status.setQueryType(query.getClass().getAnnotation(CPSType.class).id()); @@ -147,8 +143,8 @@ protected void setStatusBase(@NonNull User user, @NonNull ExecutionStatus status } @Override - protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, UriBuilder url, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { - super.setAdditionalFieldsForStatusWithColumnDescription(storage, url, user, status, datasetRegistry); + protected void setAdditionalFieldsForStatusWithColumnDescription(@NonNull MetaStorage storage, User user, FullExecutionStatus status, DatasetRegistry datasetRegistry) { + super.setAdditionalFieldsForStatusWithColumnDescription(storage, user, status, datasetRegistry); if (columnDescriptions == null) { columnDescriptions = generateColumnDescriptions(datasetRegistry); } diff --git a/backend/src/main/java/com/bakdata/conquery/resources/ResourceConstants.java b/backend/src/main/java/com/bakdata/conquery/resources/ResourceConstants.java index 78733db5fa..a59c5f12a7 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/ResourceConstants.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/ResourceConstants.java @@ -12,6 +12,7 @@ public class ResourceConstants { public static final String TABLE = "table"; public static final String FILTER = "filter"; public static final String QUERY = "query"; + public static final String QUERIES_MONITOR_PATH_ELEMENT = "queries"; public static final String FORM_CONFIG = "form-config"; public static final String FILENAME = "filename"; public static final String API = "api"; diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index ce273bdb61..9d5aa35cc2 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -1,18 +1,24 @@ package com.bakdata.conquery.resources.admin.rest; -import com.bakdata.conquery.io.jackson.Jackson; +import com.bakdata.conquery.apiv1.FullExecutionStatus; +import com.bakdata.conquery.apiv1.query.ConceptQuery; +import com.bakdata.conquery.apiv1.query.Query; +import com.bakdata.conquery.apiv1.query.concept.specific.CQAnd; +import com.bakdata.conquery.apiv1.query.concept.specific.CQConcept; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; +import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.User; -import com.bakdata.conquery.models.common.Range; +import com.bakdata.conquery.models.error.ConqueryError; +import com.bakdata.conquery.models.execution.ExecutionState; +import com.bakdata.conquery.models.execution.ManagedExecution; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; -import com.bakdata.conquery.models.jobs.Job; +import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId; import com.bakdata.conquery.models.jobs.JobManagerStatus; import com.bakdata.conquery.models.messages.network.specific.CancelJobMessage; +import com.bakdata.conquery.models.worker.DatasetRegistry; import com.bakdata.conquery.models.worker.ShardNodeInformation; import com.bakdata.conquery.resources.admin.ui.AdminUIResource; -import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.Uninterruptibles; import io.dropwizard.auth.Auth; import javax.inject.Inject; @@ -20,11 +26,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; -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.concurrent.TimeUnit; -import java.util.stream.Stream; import static com.bakdata.conquery.resources.ResourceConstants.JOB_ID; @@ -52,7 +58,6 @@ public String executeScript(@Auth User user, String script) { * Execute script and serialize return value as Json. * Useful for configuration and verification scripts. */ - @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.TEXT_PLAIN) @POST @Path("/script") @@ -79,6 +84,306 @@ public Response cancelJob(@PathParam(JOB_ID) UUID jobId) { @GET @Path("/jobs/") public ImmutableMap getJobs() { - return processor.getJobs(); + return processor.getJobs(); } + + + + + @GET + @Path("/queries") + public FullExecutionStatus[] getQueries(@Auth User currentUser) { + final MetaStorage storage = processor.getStorage(); + final DatasetRegistry datasetRegistry = processor.getDatasetRegistry(); + return processor.getStorage().getAllExecutions().stream().map(t->t.buildStatusFull(storage, currentUser, datasetRegistry)).toArray(FullExecutionStatus[]::new); + } + + + + // For test purposes +/* + @GET + @Path("/queries") + public FullExecutionStatus[] getQueries() { + CQAnd root = new CQAnd(); + CQConcept e1 = new CQConcept(); + e1.setLabel("Concept Label"); + root.setChildren(List.of(e1)); + Query testQuery = new ConceptQuery(root); + + FullExecutionStatus[] result = new FullExecutionStatus[]{ + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); + setOwnerName("Doriane"); + setQueryType("QueryType1"); + setStatus(ExecutionState.NEW); + setLabel("dataset2Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(3)); + setFinishTime(LocalDateTime.now().plusMinutes(5)); + setRequiredTime(3400L); + setProgress(0F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); + setOwnerName("Doriane"); + setQueryType("QueryType2"); + setStatus(ExecutionState.RUNNING); + setLabel("dataset2Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(12)); + setFinishTime(LocalDateTime.now().plusMinutes(33)); + setRequiredTime(300L); + setProgress(78.9F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); + setOwnerName("Doriane"); + setQueryType("QueryType3"); + setStatus(ExecutionState.FAILED); + setLabel("dataset2Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(1)); + setFinishTime(null); + setRequiredTime(120L); + setProgress(12.6F); + setError(ConqueryError.asConqueryError(new IllegalStateException())); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); + setOwnerName("Doriane"); + setQueryType("QueryType4"); + setStatus(ExecutionState.DONE); + setLabel("dataset2Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(LocalDateTime.now().plusMinutes(3)); + setRequiredTime(200L); + setProgress(99F); + setError(null); + setQuery(testQuery); + } + }, + + + + + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); + setOwnerName("David"); + setQueryType("QueryType1"); + setStatus(ExecutionState.NEW); + setLabel("dataset3Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(LocalDateTime.now().plusMinutes(3)); + setRequiredTime(200L); + setProgress(0F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); + setOwnerName("David"); + setQueryType("QueryType2"); + setStatus(ExecutionState.RUNNING); + setLabel("dataset3Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(21)); + setFinishTime(LocalDateTime.now().plusMinutes(32)); + setRequiredTime(300L); + setProgress(43.1F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); + setOwnerName("David"); + setQueryType("QueryType3"); + setStatus(ExecutionState.FAILED); + setLabel("dataset3Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(null); + setRequiredTime(120L); + setProgress(78.3F); + setError(ConqueryError.asConqueryError(new IllegalStateException())); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); + setOwnerName("David"); + setQueryType("QueryType4"); + setStatus(ExecutionState.DONE); + setLabel("dataset3Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(3)); + setFinishTime(LocalDateTime.now().plusMinutes(9)); + setRequiredTime(200L); + setProgress(99.9F); + setError(null); + setQuery(testQuery); + } + }, + + + + + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); + setOwnerName("Meza"); + setQueryType("QueryType1"); + setStatus(ExecutionState.NEW); + setLabel("dataset4Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(9)); + setFinishTime(LocalDateTime.now().plusMinutes(13)); + setRequiredTime(2220L); + setProgress(0F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); + setOwnerName("Meza"); + setQueryType("QueryType2"); + setStatus(ExecutionState.RUNNING); + setLabel("dataset4Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(9)); + setFinishTime(LocalDateTime.now().plusMinutes(11)); + setRequiredTime(330L); + setProgress(24.9F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); + setOwnerName("Meza"); + setQueryType("QueryType3"); + setStatus(ExecutionState.FAILED); + setLabel("dataset4Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(23)); + setFinishTime(null); + setRequiredTime(120L); + setProgress(55F); + setError(ConqueryError.asConqueryError(new IllegalStateException())); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); + setOwnerName("Meza"); + setQueryType("QueryType4"); + setStatus(ExecutionState.DONE); + setLabel("dataset4Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(17)); + setFinishTime(LocalDateTime.now().plusMinutes(19)); + setRequiredTime(200L); + setProgress(99F); + setError(null); + setQuery(testQuery); + } + }, + + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); + setOwnerName("Peter"); + setQueryType("QueryType1"); + setStatus(ExecutionState.NEW); + setLabel("dataset1Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(LocalDateTime.now().plusMinutes(3)); + setRequiredTime(200L); + setProgress(0F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); + setOwnerName("Audrane"); + setQueryType("QueryType2"); + setStatus(ExecutionState.RUNNING); + setLabel("dataset1Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(LocalDateTime.now().plusMinutes(3)); + setRequiredTime(300L); + setProgress(35.45F); + setError(null); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); + setOwnerName("Audrane"); + setQueryType("QueryType3"); + setStatus(ExecutionState.FAILED); + setLabel("dataset1Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(null); + setRequiredTime(120L); + setProgress(35.45F); + setError(ConqueryError.asConqueryError(new IllegalStateException())); + setQuery(testQuery); + } + }, + new FullExecutionStatus(){ + { + setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); + setOwnerName("Audrane"); + setQueryType("QueryType4"); + setStatus(ExecutionState.DONE); + setLabel("dataset1Label"); + setCreatedAt(ZonedDateTime.now()); + setStartTime(LocalDateTime.now().plusMinutes(2)); + setFinishTime(LocalDateTime.now().plusMinutes(3)); + setRequiredTime(200L); + setProgress(99F); + setError(null); + setQuery(testQuery); + } + }, + + }; + + return result; + } +*/ + + + } diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java index 549bc7c9c3..586dbd9ac6 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java @@ -179,6 +179,10 @@ public ImportStatistics getImportStatistics(Import imp) { return new ImportStatistics(imp, cBlockSize); } + public void getAllQueries() + { + getStorage().getAllExecutions(); + } public static long calculateCBlocksSizeBytes(Import imp, Collection> concepts) { diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java index 20f457f6e2..061e288bb2 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/ui/AdminUIResource.java @@ -73,4 +73,10 @@ public View getJobs() { return new UIView<>("jobs.html.ftl", uiProcessor.getUIContext(), uiProcessor.getAdminProcessor().getJobs()); } + @GET + @Path("queries") + public View getQueries() { + return new UIView<>("queries.html.ftl", uiProcessor.getUIContext()); + } + } diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl new file mode 100644 index 0000000000..73290e1e51 --- /dev/null +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -0,0 +1,322 @@ +<#import "templates/template.html.ftl" as layout> +<@layout.layout> + + +

Queries

+ + + +
+
+
+
+ +
+
+ +
+ + +
+ + + + + +
#
+
+
+
+
+
+
+ +
+
+
+
+ + + + + +
#
+ +
+
+
+
+
+
+ +
+
+
+
+ + + + +
#
+
+
+
+
+
+
+ +
+
+
+
+ + + + +
#
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/template.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/template.html.ftl index 0bc4c3773c..24d87e961b 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/template.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/template.html.ftl @@ -49,6 +49,9 @@
  • Jobs
    • +
  • + Queries +
  • Script
  • From 526f8af2365d490d821d572b97f06afb033afd2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 31 Aug 2021 16:24:20 +0000 Subject: [PATCH 02/14] Update AutoDoc --- docs/REST API JSONs.md | 104 ++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/docs/REST API JSONs.md b/docs/REST API JSONs.md index be935d0eed..a27b2fbe09 100644 --- a/docs/REST API JSONs.md +++ b/docs/REST API JSONs.md @@ -760,7 +760,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java#L24) | thousandSeparator | `String` | `"."` | | |

    -### Type ExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L18) +### Type ExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L20)
    Details

    @@ -771,22 +771,24 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L28) | createdAt | `ZonedDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | id | ID of `ManagedExecution` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | label | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | lastUsed | `ZonedDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | numberOfResults | `long` or `null` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | own | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | owner | ID of `User` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | ownerName | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | queryType | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | requiredTime | `long` or `null` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45-L47) | resultUrls | list of `URL` | ? | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | secondaryId | ID of `SecondaryIdDescription` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | shared | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | status | one of NEW, RUNNING, FAILED, DONE | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | system | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L24) | tags | list of `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | ? | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | ? | | |

    ### Type FERoot [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FERoot.java#L11-L13) @@ -899,22 +901,24 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L28) | createdAt | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | id | ID of `ManagedExecution` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | label | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | lastUsed | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | numberOfResults | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | own | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | owner | ID of `User` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | ownerName | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | queryType | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | requiredTime | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45-L47) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | shared | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | system | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L24) | tags | list of `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L64-L66) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L44-L46) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L39-L41) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | @@ -962,22 +966,24 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L28) | createdAt | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | id | ID of `ManagedExecution` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | label | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | lastUsed | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | numberOfResults | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | own | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | owner | ID of `User` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | ownerName | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | queryType | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | requiredTime | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45-L47) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | shared | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | system | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L24) | tags | list of `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | |

    ### Type ResolvedConceptsResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L260) From 574b15ce64b18bc83ad50b61c01bae326002e1ef Mon Sep 17 00:00:00 2001 From: Njimefo <34373197+Njimefo@users.noreply.github.com> Date: Wed, 1 Sep 2021 15:08:56 +0200 Subject: [PATCH 03/14] Update backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com> --- .../bakdata/conquery/resources/admin/rest/AdminResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index 9d5aa35cc2..ffbc347394 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -95,7 +95,7 @@ public ImmutableMap getJobs() { public FullExecutionStatus[] getQueries(@Auth User currentUser) { final MetaStorage storage = processor.getStorage(); final DatasetRegistry datasetRegistry = processor.getDatasetRegistry(); - return processor.getStorage().getAllExecutions().stream().map(t->t.buildStatusFull(storage, currentUser, datasetRegistry)).toArray(FullExecutionStatus[]::new); + return storage.getAllExecutions().stream().map(t->t.buildStatusFull(storage, currentUser, datasetRegistry)).toArray(FullExecutionStatus[]::new); } From 7bf0fb5c723c49f6b7ed008dcbcc90ef50abf99e Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Thu, 2 Sep 2021 15:50:16 +0200 Subject: [PATCH 04/14] Admin UI for live view of queries adapted --- .../conquery/apiv1/FullExecutionStatus.java | 7 + .../models/execution/ManagedExecution.java | 3 + .../resources/admin/rest/AdminResource.java | 300 +----------------- .../resources/admin/rest/UIProcessor.java | 5 - .../resources/admin/ui/queries.html.ftl | 122 +++---- .../tests/endpoints/adminEndpointInfo.json | 5 + 6 files changed, 84 insertions(+), 358 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java index 2a1996d35b..85783544c8 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java @@ -16,6 +16,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.FieldNameConstants; +import com.bakdata.conquery.models.i18n.I18n; + +import static org.apache.shiro.util.StringUtils.hasText; /** * This status holds extensive information about the query description and meta data that is computational heavy @@ -28,6 +31,10 @@ @FieldNameConstants public class FullExecutionStatus extends ExecutionStatus { + /** + * Indicates the actual language of system + */ + private String languageTag; /** * The estimated progress of an running execution in the enclosing interval [0-1]. * This value does not have to be set if the state is RUNNING and it must not be set diff --git a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java index 33702ce615..03e610144a 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java +++ b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java @@ -60,6 +60,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.shiro.authz.Permission; +import static org.apache.shiro.util.StringUtils.hasText; + @Getter @Setter @ToString @@ -277,6 +279,7 @@ public FullExecutionStatus buildStatusFull(@NonNull MetaStorage storage, User us setAvailableSecondaryIds(status); status.setProgress(progress); + status.setLanguageTag(I18n.LOCALE.get().getLanguage() + (hasText(I18n.LOCALE.get().getCountry()) ? "-" + I18n.LOCALE.get().getCountry() : "")); if (getState().equals(ExecutionState.FAILED) && error != null) { // Use plain format here to have a uniform serialization. diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index ffbc347394..6577246d45 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -11,6 +11,7 @@ import com.bakdata.conquery.models.error.ConqueryError; import com.bakdata.conquery.models.execution.ExecutionState; import com.bakdata.conquery.models.execution.ManagedExecution; +import com.bakdata.conquery.models.i18n.I18n; import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId; import com.bakdata.conquery.models.jobs.JobManagerStatus; @@ -26,6 +27,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZonedDateTime; import java.util.List; @@ -33,6 +35,7 @@ import java.util.UUID; import static com.bakdata.conquery.resources.ResourceConstants.JOB_ID; +import static org.apache.shiro.util.StringUtils.hasText; @Consumes({ExtraMimeTypes.JSON_STRING, ExtraMimeTypes.SMILE_STRING}) @Produces(ExtraMimeTypes.JSON_STRING) @@ -88,302 +91,15 @@ public ImmutableMap getJobs() { } - - @GET @Path("/queries") public FullExecutionStatus[] getQueries(@Auth User currentUser) { final MetaStorage storage = processor.getStorage(); final DatasetRegistry datasetRegistry = processor.getDatasetRegistry(); - return storage.getAllExecutions().stream().map(t->t.buildStatusFull(storage, currentUser, datasetRegistry)).toArray(FullExecutionStatus[]::new); - } - - - - // For test purposes -/* - @GET - @Path("/queries") - public FullExecutionStatus[] getQueries() { - CQAnd root = new CQAnd(); - CQConcept e1 = new CQConcept(); - e1.setLabel("Concept Label"); - root.setChildren(List.of(e1)); - Query testQuery = new ConceptQuery(root); - - FullExecutionStatus[] result = new FullExecutionStatus[]{ - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); - setOwnerName("Doriane"); - setQueryType("QueryType1"); - setStatus(ExecutionState.NEW); - setLabel("dataset2Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(3)); - setFinishTime(LocalDateTime.now().plusMinutes(5)); - setRequiredTime(3400L); - setProgress(0F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); - setOwnerName("Doriane"); - setQueryType("QueryType2"); - setStatus(ExecutionState.RUNNING); - setLabel("dataset2Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(12)); - setFinishTime(LocalDateTime.now().plusMinutes(33)); - setRequiredTime(300L); - setProgress(78.9F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); - setOwnerName("Doriane"); - setQueryType("QueryType3"); - setStatus(ExecutionState.FAILED); - setLabel("dataset2Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(1)); - setFinishTime(null); - setRequiredTime(120L); - setProgress(12.6F); - setError(ConqueryError.asConqueryError(new IllegalStateException())); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset2"),UUID.randomUUID())); - setOwnerName("Doriane"); - setQueryType("QueryType4"); - setStatus(ExecutionState.DONE); - setLabel("dataset2Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(LocalDateTime.now().plusMinutes(3)); - setRequiredTime(200L); - setProgress(99F); - setError(null); - setQuery(testQuery); - } - }, - - - - - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); - setOwnerName("David"); - setQueryType("QueryType1"); - setStatus(ExecutionState.NEW); - setLabel("dataset3Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(LocalDateTime.now().plusMinutes(3)); - setRequiredTime(200L); - setProgress(0F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); - setOwnerName("David"); - setQueryType("QueryType2"); - setStatus(ExecutionState.RUNNING); - setLabel("dataset3Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(21)); - setFinishTime(LocalDateTime.now().plusMinutes(32)); - setRequiredTime(300L); - setProgress(43.1F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); - setOwnerName("David"); - setQueryType("QueryType3"); - setStatus(ExecutionState.FAILED); - setLabel("dataset3Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(null); - setRequiredTime(120L); - setProgress(78.3F); - setError(ConqueryError.asConqueryError(new IllegalStateException())); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset3"),UUID.randomUUID())); - setOwnerName("David"); - setQueryType("QueryType4"); - setStatus(ExecutionState.DONE); - setLabel("dataset3Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(3)); - setFinishTime(LocalDateTime.now().plusMinutes(9)); - setRequiredTime(200L); - setProgress(99.9F); - setError(null); - setQuery(testQuery); - } - }, - - - - - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); - setOwnerName("Meza"); - setQueryType("QueryType1"); - setStatus(ExecutionState.NEW); - setLabel("dataset4Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(9)); - setFinishTime(LocalDateTime.now().plusMinutes(13)); - setRequiredTime(2220L); - setProgress(0F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); - setOwnerName("Meza"); - setQueryType("QueryType2"); - setStatus(ExecutionState.RUNNING); - setLabel("dataset4Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(9)); - setFinishTime(LocalDateTime.now().plusMinutes(11)); - setRequiredTime(330L); - setProgress(24.9F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); - setOwnerName("Meza"); - setQueryType("QueryType3"); - setStatus(ExecutionState.FAILED); - setLabel("dataset4Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(23)); - setFinishTime(null); - setRequiredTime(120L); - setProgress(55F); - setError(ConqueryError.asConqueryError(new IllegalStateException())); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset4"),UUID.randomUUID())); - setOwnerName("Meza"); - setQueryType("QueryType4"); - setStatus(ExecutionState.DONE); - setLabel("dataset4Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(17)); - setFinishTime(LocalDateTime.now().plusMinutes(19)); - setRequiredTime(200L); - setProgress(99F); - setError(null); - setQuery(testQuery); - } - }, - - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); - setOwnerName("Peter"); - setQueryType("QueryType1"); - setStatus(ExecutionState.NEW); - setLabel("dataset1Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(LocalDateTime.now().plusMinutes(3)); - setRequiredTime(200L); - setProgress(0F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); - setOwnerName("Audrane"); - setQueryType("QueryType2"); - setStatus(ExecutionState.RUNNING); - setLabel("dataset1Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(LocalDateTime.now().plusMinutes(3)); - setRequiredTime(300L); - setProgress(35.45F); - setError(null); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); - setOwnerName("Audrane"); - setQueryType("QueryType3"); - setStatus(ExecutionState.FAILED); - setLabel("dataset1Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(null); - setRequiredTime(120L); - setProgress(35.45F); - setError(ConqueryError.asConqueryError(new IllegalStateException())); - setQuery(testQuery); - } - }, - new FullExecutionStatus(){ - { - setId(new ManagedExecutionId(new DatasetId("Dataset1"),UUID.randomUUID())); - setOwnerName("Audrane"); - setQueryType("QueryType4"); - setStatus(ExecutionState.DONE); - setLabel("dataset1Label"); - setCreatedAt(ZonedDateTime.now()); - setStartTime(LocalDateTime.now().plusMinutes(2)); - setFinishTime(LocalDateTime.now().plusMinutes(3)); - setRequiredTime(200L); - setProgress(99F); - setError(null); - setQuery(testQuery); - } - }, - - }; - - return result; + return storage.getAllExecutions().stream() + .map(t -> t.buildStatusFull(storage, currentUser, datasetRegistry)) + .filter(t -> t.getCreatedAt().toLocalDate().equals(LocalDate.now(t.getCreatedAt().getZone()))) + .limit(100) + .toArray(FullExecutionStatus[]::new); } -*/ - - - } diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java index 586dbd9ac6..37b052ea1e 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java @@ -179,11 +179,6 @@ public ImportStatistics getImportStatistics(Import imp) { return new ImportStatistics(imp, cBlockSize); } - public void getAllQueries() - { - getStorage().getAllExecutions(); - } - public static long calculateCBlocksSizeBytes(Import imp, Collection> concepts) { // CBlocks are created per (per Bucket) Import per Connector targeting this table diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index 73290e1e51..6566c8b628 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -37,7 +37,6 @@

    Queries

    - +
    @@ -247,11 +253,9 @@ function getQueries() {
    - - - - -
    #
    +
    + +
    @@ -259,18 +263,17 @@ function getQueries() {
    +
    + +
    + - - - - -
    #
    @@ -279,17 +282,16 @@ function getQueries() {
    - - - - -
    #
    +
    + +
    +
    @@ -297,17 +299,15 @@ function getQueries() {
    - - - - -
    #
    +
    + +
    diff --git a/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json b/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json index 36b33b76d8..069bfd21ec 100644 --- a/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json +++ b/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json @@ -234,6 +234,11 @@ "path": "/jobs/", "clazz": "AdminResource" }, + { + "method": "GET", + "path": "/queries/", + "clazz": "AdminResource" + }, { "method": "POST", "path": "/jobs/{jobId}/cancel", From 9102f93f4b37ab3cbd40755978b84bec5f938ef7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 13:53:13 +0000 Subject: [PATCH 05/14] Update AutoDoc --- docs/REST API JSONs.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/REST API JSONs.md b/docs/REST API JSONs.md index ec2030f48f..3000f5b0da 100644 --- a/docs/REST API JSONs.md +++ b/docs/REST API JSONs.md @@ -903,7 +903,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java#L51) | version | `String` | `"0.0.0-SNAPSHOT"` | | |

    -### Type FullExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L20-L24) +### Type FullExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L23-L27) This status holds extensive information about the query description and meta data that is computational heavy and can produce a larger payload to requests. It should only be rendered, when a client asks for a specific execution, not if a list of executions is requested.
    Details

    @@ -932,13 +932,14 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L64-L66) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L44-L46) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L39-L41) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L54-L56) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L59-L61) | groups | `Collection` | `null` | | The groups this execution is shared with. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L31-L35) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L49-L51) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L71-L73) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L51-L53) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L46-L48) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L61-L63) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L66-L68) | groups | `Collection` | `null` | | The groups this execution is shared with. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L34-L36) | languageTag | `String` | `null` | | Indicates the actual language of system | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L38-L42) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L56-L58) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. |

    ### Type IdLabel [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java#L13-L16) From 2da1d9c8fc2be6df5d5a4ddce2cac3c5be521105 Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 3 Sep 2021 10:11:30 +0200 Subject: [PATCH 06/14] languageTag in backend removed and added in fronted --- .../com/bakdata/conquery/apiv1/FullExecutionStatus.java | 4 ---- .../conquery/models/execution/ManagedExecution.java | 1 - .../bakdata/conquery/resources/admin/ui/queries.html.ftl | 9 +++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java index 85783544c8..dd3902bee8 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java @@ -31,10 +31,6 @@ @FieldNameConstants public class FullExecutionStatus extends ExecutionStatus { - /** - * Indicates the actual language of system - */ - private String languageTag; /** * The estimated progress of an running execution in the enclosing interval [0-1]. * This value does not have to be set if the state is RUNNING and it must not be set diff --git a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java index 03e610144a..a9f6e48b0c 100644 --- a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java +++ b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java @@ -279,7 +279,6 @@ public FullExecutionStatus buildStatusFull(@NonNull MetaStorage storage, User us setAvailableSecondaryIds(status); status.setProgress(progress); - status.setLanguageTag(I18n.LOCALE.get().getLanguage() + (hasText(I18n.LOCALE.get().getCountry()) ? "-" + I18n.LOCALE.get().getCountry() : "")); if (getState().equals(ExecutionState.FAILED) && error != null) { // Use plain format here to have a uniform serialization. diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index 6566c8b628..e288ba23c9 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -50,8 +50,9 @@ var failedNbrElt = {}; var succeedNbrElt = {}; var canUpdate = true; var reloader = {}; - +var languageTag = {}; window.onload = (event) => { + languageTag = navigator.language || navigator.userLanguage; reloader = setInterval(getQueries, 5000); runningQueriesTable = document.getElementById("runningQueriesTable"); notStartedQueriesTable = document.getElementById("notStartedQueriesTable"); @@ -166,13 +167,13 @@ function handleUpdateCheck(event){
    - Creation-Time : ${((new Date(data.createdAt)).toLocaleString(data.languageTag))} + Creation-Time : ${((new Date(data.createdAt)).toLocaleString(languageTag))}
    - Start-Time : ${((new Date(data.startTime)).toLocaleString(data.languageTag))} + Start-Time : ${((new Date(data.startTime)).toLocaleString(languageTag))}
    - Finish-Time : ${((new Date(data.finishTime)).toLocaleString(data.languageTag))} + Finish-Time : ${((new Date(data.finishTime)).toLocaleString(languageTag))}
    From 8eac327ffe427e44dfb637aa3c38472266c5c820 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 08:14:27 +0000 Subject: [PATCH 07/14] Update AutoDoc --- docs/REST API JSONs.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/REST API JSONs.md b/docs/REST API JSONs.md index 3000f5b0da..b8398c0334 100644 --- a/docs/REST API JSONs.md +++ b/docs/REST API JSONs.md @@ -932,14 +932,13 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L71-L73) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L51-L53) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L46-L48) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L61-L63) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L66-L68) | groups | `Collection` | `null` | | The groups this execution is shared with. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L34-L36) | languageTag | `String` | `null` | | Indicates the actual language of system | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L38-L42) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L56-L58) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L67-L69) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L47-L49) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L42-L44) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L57-L59) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L62-L64) | groups | `Collection` | `null` | | The groups this execution is shared with. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L34-L38) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L52-L54) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. |

    ### Type IdLabel [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java#L13-L16) From 1ae82cb582c289e93881b0e5587ad9b6a2bb869c Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 3 Sep 2021 10:38:07 +0200 Subject: [PATCH 08/14] path issues resolved --- .../bakdata/conquery/resources/admin/rest/AdminResource.java | 2 +- .../com/bakdata/conquery/resources/admin/ui/queries.html.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index 6577246d45..d0dc9d317a 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -92,7 +92,7 @@ public ImmutableMap getJobs() { @GET - @Path("/queries") + @Path("/queries/") public FullExecutionStatus[] getQueries(@Auth User currentUser) { final MetaStorage storage = processor.getStorage(); final DatasetRegistry datasetRegistry = processor.getDatasetRegistry(); diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index e288ba23c9..4a2dfd2dca 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -201,7 +201,7 @@ function handleUpdateCheck(event){
    -
    +
    ${(data.progress ? data.progress : 0 )} %
    From 72e577af02811d1833a9cff9dfed64d0da77936e Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 3 Sep 2021 11:33:31 +0200 Subject: [PATCH 09/14] path issues resolved --- .../test/resources/tests/endpoints/adminUIEndpointInfo.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/src/test/resources/tests/endpoints/adminUIEndpointInfo.json b/backend/src/test/resources/tests/endpoints/adminUIEndpointInfo.json index fd610ddd66..81b8b95d11 100644 --- a/backend/src/test/resources/tests/endpoints/adminUIEndpointInfo.json +++ b/backend/src/test/resources/tests/endpoints/adminUIEndpointInfo.json @@ -29,6 +29,11 @@ "path": "/", "clazz": "AdminUIResource" }, + { + "method": "GET", + "path": "/queries", + "clazz": "AdminUIResource" + }, { "method": "GET", "path": "/jobs", From 83fd6f6b4b48b7407f15778c1a1d31cf5a3a76bb Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Mon, 6 Sep 2021 16:14:55 +0200 Subject: [PATCH 10/14] parameterized request of queries and reformatted html code --- .../resources/admin/rest/AdminResource.java | 14 +- .../resources/admin/ui/queries.html.ftl | 572 ++++++++---------- .../tests/endpoints/adminEndpointInfo.json | 2 +- 3 files changed, 276 insertions(+), 312 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index d0dc9d317a..bc044091fc 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -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; @@ -92,14 +90,14 @@ public ImmutableMap 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 since) { 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); } -} +} \ No newline at end of file diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index 4a2dfd2dca..77026aa3dd 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -1,323 +1,289 @@ <#import "templates/template.html.ftl" as layout> <@layout.layout> - - + +

    Queries

    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    - -
    - - -
    - - - -
    -
    -
    -
    - ${(data.progress ? data.progress : 0 )} % -
    -
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    - - -
    -
    -
    -
    - 
     ${(data.query ? JSON.stringify(data.query, undefined, 2) : '')}
    -
    -
    -
    -
    -
    -
    - 
      ${(data.error ? JSON.stringify(data.error, undefined, 2) : '')}
    -
    -
    -
    -
    -
    -
    -
    - - - - ` - } - - -

    Queries

    - - - -
    -
    -
    -
    - -
    -
    - -
    - - -
    - -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - +
    +
    +
    + +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    -
    -
    - - - - - - +
    \ No newline at end of file diff --git a/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json b/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json index 069bfd21ec..db669a232c 100644 --- a/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json +++ b/backend/src/test/resources/tests/endpoints/adminEndpointInfo.json @@ -236,7 +236,7 @@ }, { "method": "GET", - "path": "/queries/", + "path": "/queries", "clazz": "AdminResource" }, { From 81102a2a6cbe872855e14fc0b7b84b76cea8ed02 Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 10 Sep 2021 09:13:55 +0200 Subject: [PATCH 11/14] parameterized request of queries and reformatted html code --- .../conquery/resources/admin/rest/AdminResource.java | 7 +++---- .../bakdata/conquery/resources/admin/ui/queries.html.ftl | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java index d1b3923aaf..20ac72e5cd 100644 --- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java +++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java @@ -1,7 +1,9 @@ package com.bakdata.conquery.resources.admin.rest; +import com.bakdata.conquery.apiv1.FullExecutionStatus; import com.bakdata.conquery.io.jackson.Jackson; import com.bakdata.conquery.io.jersey.ExtraMimeTypes; +import com.bakdata.conquery.io.storage.MetaStorage; import com.bakdata.conquery.models.auth.entities.User; import com.bakdata.conquery.models.error.ConqueryError; import com.bakdata.conquery.models.execution.ExecutionState; @@ -90,12 +92,9 @@ public ImmutableMap getJobs() { @GET @Path("logout") public Response logout() { - return Response.ok().cookie(AuthenticationConfig.expireAuthCookie()).build(); + return Response.ok().cookie(AuthenticationConfig.expireAuthCookie()).build(); } -} - - @GET @Path("/queries") public FullExecutionStatus[] getQueries(@Auth User currentUser, @QueryParam("limit") OptionalLong limit, @QueryParam("since") Optional since) { diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index 77026aa3dd..a5e8813216 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -191,11 +191,11 @@
    -
    +
    -
    - ${(data.progress || data.progress == null ? data.progress : 0 )} % +
    + ${(data.progress && data.progress != null ? data.progress : 0 )} %
    From f4464294a008994db038f2566e707095998e498a Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 10 Sep 2021 12:55:11 +0200 Subject: [PATCH 12/14] review changes --- .../conquery/apiv1/ExecutionStatus.java | 13 +++-- .../conquery/apiv1/FullExecutionStatus.java | 12 ++--- .../resources/admin/ui/queries.html.ftl | 48 +++++++++---------- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java b/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java index ef08d4e746..a9c674b11e 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java @@ -1,13 +1,6 @@ package com.bakdata.conquery.apiv1; -import java.net.URL; -import java.time.LocalDateTime; -import java.time.ZonedDateTime; -import java.util.Collections; -import java.util.List; - import com.bakdata.conquery.models.execution.ExecutionState; -import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId; import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId; import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId; import com.bakdata.conquery.models.identifiable.ids.specific.UserId; @@ -17,6 +10,12 @@ import lombok.ToString; import lombok.experimental.FieldNameConstants; +import java.net.URL; +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.List; + @NoArgsConstructor @ToString @Data diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java index dd3902bee8..61c5d4a917 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java @@ -1,11 +1,5 @@ package com.bakdata.conquery.apiv1; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import javax.annotation.Nullable; - import com.bakdata.conquery.apiv1.query.QueryDescription; import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection; import com.bakdata.conquery.models.datasets.SecondaryIdDescription; @@ -16,9 +10,11 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.FieldNameConstants; -import com.bakdata.conquery.models.i18n.I18n; -import static org.apache.shiro.util.StringUtils.hasText; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.List; +import java.util.Set; /** * This status holds extensive information about the query description and meta data that is computational heavy diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index a5e8813216..de5f460ccd 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -28,7 +28,6 @@ }

    Queries

    - +
    From 0e80020b4741b431c6afdc48907a201b17d7c6f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Sep 2021 11:03:06 +0000 Subject: [PATCH 13/14] Update AutoDoc --- docs/REST API JSONs.md | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/docs/REST API JSONs.md b/docs/REST API JSONs.md index c29544717b..59d55b1495 100644 --- a/docs/REST API JSONs.md +++ b/docs/REST API JSONs.md @@ -772,7 +772,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java#L198) | thousandSeparator | `String` | `"."` | | |

    -### Type ExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L20) +### Type ExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L19)
    Details

    @@ -783,24 +783,24 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | ? | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | ? | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | createdAt | `ZonedDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | finishTime | `LocalDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | id | ID of `ManagedExecution` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | label | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | lastUsed | `ZonedDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | numberOfResults | `long` or `null` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | own | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | owner | ID of `User` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | ownerName | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45) | queryType | `String` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | requiredTime | `long` or `null` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L49-L51) | resultUrls | list of `URL` | ? | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | secondaryId | ID of `SecondaryIdDescription` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | shared | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | startTime | `LocalDateTime` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | status | one of NEW, RUNNING, FAILED, DONE | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | system | `boolean` | ? | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | tags | list of `String` | ? | | |

    ### Type FERoot [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FERoot.java#L11-L13) @@ -903,7 +903,7 @@ Supported Fields: | [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/models/config/FrontendConfig.java#L51) | version | `String` | `"0.0.0-SNAPSHOT"` | | |

    -### Type FullExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L23-L27) +### Type FullExecutionStatus [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L19-L23) This status holds extensive information about the query description and meta data that is computational heavy and can produce a larger payload to requests. It should only be rendered, when a client asks for a specific execution, not if a list of executions is requested.
    Details

    @@ -914,31 +914,31 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L67-L69) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L47-L49) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L42-L44) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L57-L59) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L62-L64) | groups | `Collection` | `null` | | The groups this execution is shared with. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L34-L38) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L52-L54) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | createdAt | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | finishTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | id | ID of `ManagedExecution` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | label | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | lastUsed | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | numberOfResults | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | own | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | owner | ID of `User` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | ownerName | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45) | queryType | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | requiredTime | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L49-L51) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | shared | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | startTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | system | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | tags | list of `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L63-L65) | availableSecondaryIds | list of ID of `@NsIdRefCollection Set` | `null` | | Possible {@link SecondaryIdDescription}s available, of {@link com.bakdata.conquery.models.datasets.concepts.Concept}s used in this Query. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L43-L45) | canExpand | `boolean` | `false` | | Indicates if the concepts that are included in the query description can be accessed by the user. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L38-L40) | columnDescriptions | list of `ColumnDescriptor` | `null` | | Holds a description for each column, present in the result. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L53-L55) | error | `ConqueryErrorInfo` | `null` | | Is set when the QueryFailed | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L58-L60) | groups | `Collection` | `null` | | The groups this execution is shared with. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L30-L34) | progress | `float` or `null` | `null` | | The estimated progress of an running execution in the enclosing interval [0-1]. This value does not have to be set if the state is RUNNING and it must not be set if the state is not RUNNING. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java#L48-L50) | query | [QueryDescription](#Base-QueryDescription) | `null` | | Is set to the query description if the user can expand all included concepts. |

    ### Type IdLabel [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/IdLabel.java#L13-L16) @@ -979,24 +979,24 @@ Supported Fields: | | Field | Type | Default | Example | Description | | --- | --- | --- | --- | --- | --- | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | createdAt | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L44) | finishTime | `LocalDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | id | ID of `ManagedExecution` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L27) | label | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | lastUsed | `ZonedDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | numberOfResults | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | own | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | owner | ID of `User` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | ownerName | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | queryType | `String` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L41) | requiredTime | `long` or `null` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L50-L52) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L47) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | shared | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | startTime | `LocalDateTime` | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L36) | system | `boolean` | `false` | | | -| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | tags | list of `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L29) | createdAt | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L43) | finishTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L37) | id | ID of `ManagedExecution` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L26) | label | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L30) | lastUsed | `ZonedDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L39) | numberOfResults | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L34) | own | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L31) | owner | ID of `User` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L32) | ownerName | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L45) | queryType | `String` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L40) | requiredTime | `long` or `null` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L49-L51) | resultUrls | list of `URL` | `[]` | | The urls under from which the result of the execution can be downloaded as soon as it finished successfully. | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L46) | secondaryId | ID of `SecondaryIdDescription` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L33) | shared | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L42) | startTime | `LocalDateTime` | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L38) | status | one of NEW, RUNNING, FAILED, DONE | `null` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L35) | system | `boolean` | `false` | | | +| [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java#L25) | tags | list of `String` | `null` | | |

    ### Type ResolvedConceptsResult [✎](https://github.com/bakdata/conquery/edit/develop/backend/src/main/java/com/bakdata/conquery/resources/api/ConceptsProcessor.java#L274) From 3418875c6d3d512ea619ad60bcb96cb7bbae5491 Mon Sep 17 00:00:00 2001 From: Brandon Tietse Date: Fri, 10 Sep 2021 14:28:14 +0200 Subject: [PATCH 14/14] updated code after code review --- .../conquery/resources/admin/ui/queries.html.ftl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl index de5f460ccd..5bac320b71 100644 --- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl +++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl @@ -28,7 +28,7 @@ }