Admin ui for live view of queries #2062

Njimefo · 2021-08-31T16:22:27Z

No description provided.

Njimefo · 2021-08-31T16:34:38Z

Hier sind die verschiedenen Ansichten

Top-Ansicht
Ansicht laufender Queries
Ansicht fehlgeschlagener Queries und des zurückgeworfenen Fehlers

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/UIProcessor.java

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

awildturtok · 2021-09-01T08:46:12Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+			 <div class="col">
+				<div class="collapse multi-collapse" id="error${queryCounter}">
+				   <div class="card card-body">
+					  <pre>  ${(data.error ? JSON.stringify(data.error, undefined, 2) : '')}  </pre>


Ich weiß, nervig aber kannst du versuchen den Trace etwas zu rekonstruieren statt das rohe json zu printen?

Denke, die Message und dann $Datei $Klasse::$Methode#$Zeile untereinander wäre ein guter Anfang?

Ich finde das in Ordnung, wie es gerade ist, denn ein Stacktrace ist zu verbose.

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

awildturtok · 2021-09-01T08:51:42Z

Den Abstand zwischen den Queries würde ich noch halbieren, sonst sieht's echt schick aus!

thoniTUB · 2021-09-01T11:37:14Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+      <div class="row container">
+        <div class="col">
+             <div class="progress">
+                <div class="progress-bar ${(data.status === "RUNNING" ? "bg-warning" : (data.status === "FAILED" ? "bg-danger" : (data.status === "DONE" ? "bg-success" : "") ))}" role="progressbar" style="width: ${(data.progress+k)}%" aria-valuenow="${(data.progress+k)}" aria-valuemin="0" aria-valuemax="100">


Achtung progress kann null sein (und ist es normaler Weise auch).

…t/AdminResource.java Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com>

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

thoniTUB

sorry hatte mich verklickt

backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

awildturtok · 2021-09-02T14:27:56Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+			 <div class="col">
+				<div class="collapse multi-collapse" id="error${queryCounter}">
+				   <div class="card card-body">
+					  <pre>  ${(data.error ? JSON.stringify(data.error, undefined, 2) : '')}  </pre>


…nto feature/admin-queries-monitor

…ies-monitor

…kdata/conquery into feature/admin-queries-monitor

thoniTUB · 2021-09-06T07:30:40Z

backend/src/main/java/com/bakdata/conquery/apiv1/ExecutionStatus.java

 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;


Wird der Import gebraucht?

thoniTUB · 2021-09-06T07:31:18Z

backend/src/main/java/com/bakdata/conquery/apiv1/FullExecutionStatus.java

 import lombok.experimental.FieldNameConstants;
+import com.bakdata.conquery.models.i18n.I18n;
+
+import static org.apache.shiro.util.StringUtils.hasText;



Sieht so aus als ob die Imports auch weg können

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

thoniTUB · 2021-09-06T07:42:01Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/template.html.ftl

 		  </li>
+		  <li class="nav-item">
+          	<a class="nav-link" href="/admin-ui/queries">Queries</a>
+          </li>
 		  <li class="nav-item">


hier ist die Formatierung futsch

Kanns du bitte die ganze Datei mein Tab-Indent formatieren?

…es-monitor # Conflicts: # backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

thoniTUB

Es ist jetzt noch space indented

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

thoniTUB · 2021-09-10T09:06:12Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+        function handleUpdateCheck(event) {
+          if (event.checked && !canUpdate) {
+            reloader = setInterval(getQueries, 5000);
+            canUpdate = true;
+          } else if (!event.checked && canUpdate) {
+            clearInterval(reloader);
+            reloader = 0;
+            canUpdate = false;
+          }
+
+        }


brauchst du die Variable canUpdate? Das Checked reicht doch, oder?

thoniTUB · 2021-09-10T09:08:09Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+        var languageTag = {};
+        window.onload = (event) => {
+          languageTag = navigator.language || navigator.userLanguage;
+          reloader = setInterval(getQueries, 5000);


So ist es sauberer, denke ich

Suggested change

reloader = setInterval(getQueries, 5000);

handleUpdateCheck(document.getElementById("updateCheckBox"));

thoniTUB · 2021-09-10T09:10:40Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+        function updateQueriesTable(data) {
+          queries = data;
+
+          clearTables();
+          queryCounter = 0;
+          updateQueriesInnerCounter(data);
+          if (!data) return;
+
+          queries.sort(compareQueriesDate);
+          for (i = 0; i < queries.length; i++) {
+            queryCounter++;


Du benutzt hier zwei referenzen auf das selbe Objekt: queries und data.
Bitte nur eins von beidem

thoniTUB · 2021-09-10T09:14:31Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+                          </button>
+                        </div>
+                      </div>
+                      <div class="row container" ${(!data.progress || data.progress == null ? data.progress : "style=\"display: none;\"" )}>


Ich denke sonst ist es falsch

Suggested change

<div class="row container" ${(!data.progress || data.progress == null ? data.progress : "style=\"display: none;\"" )}>

<div class="row container" ${(data.progress && data.progress != null ? "" : "style=\"display: none;\"" )}>

thoniTUB · 2021-09-10T09:22:19Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+                      <div class="row container" ${(!data.progress || data.progress == null ? data.progress : "style=\"display: none;\"" )}>
+                      <div class="col">
+                        <div class="progress">
+                          <div class="progress-bar ${(data.status === "RUNNING" ? "bg-warning" : (data.status === "FAILED" ? "bg-danger" : (data.status === "DONE" ? "bg-success" : "") ))}" role="progressbar" style="width: ${(data.progress && data.progress != null ? data.progress : 0 )}%" aria-valuenow="${(data.progress && data.progress != null ? data.progress : 0 )}" aria-valuemin="0" aria-valuemax="100">


Der Progress ist ein Float im Interval [0-1], du müsstest ihn also vorher zu Prozent konvertieren

thoniTUB · 2021-09-10T12:23:33Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+                          Query-Type : ${data.queryType}
+                        </div>
+                        <div class="col">
+                          <button class="btn btn-primary innerBtn" type="button" data-toggle="collapse" data-target="#query${queryCounter}" aria-expanded="false" aria-controls="query${queryCounter}" ${(data.query ? '' : 'disabled')}>


queryCounter bitte noch als Parameter übergeben nicht als globale Variable

…nto feature/admin-queries-monitor

thoniTUB · 2021-09-13T12:02:04Z

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl

+
+
+          clearTables();
+          QueryCounter = 0;


Hast du den mit Absicht großgeschrieben?

Admin UI for live view of queries

a81fdbd

Njimefo requested review from awildturtok, MaxVonKnobloch and thoniTUB August 31, 2021 16:22

Update AutoDoc

526f8af

thoniTUB reviewed Sep 1, 2021

View reviewed changes

awildturtok requested changes Sep 1, 2021

View reviewed changes

thoniTUB reviewed Sep 1, 2021

View reviewed changes

Njimefo and others added 4 commits September 1, 2021 15:08

Update backend/src/main/java/com/bakdata/conquery/resources/admin/res…

574b15c

…t/AdminResource.java Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com>

Merge branch 'develop' into feature/admin-queries-monitor

78cc524

Admin UI for live view of queries adapted

7bf0fb5

Update AutoDoc

9102f93

Njimefo requested review from thoniTUB and awildturtok September 2, 2021 13:53

thoniTUB approved these changes Sep 2, 2021

View reviewed changes

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl Outdated Show resolved Hide resolved

thoniTUB requested changes Sep 2, 2021

View reviewed changes

awildturtok requested changes Sep 2, 2021

View reviewed changes

Brandon Tietse added 2 commits September 3, 2021 10:11

languageTag in backend removed and added in fronted

2da1d9c

Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…

28180c4

…nto feature/admin-queries-monitor

Njimefo requested a review from thoniTUB September 3, 2021 08:13

github-actions bot and others added 6 commits September 3, 2021 08:14

Update AutoDoc

8eac327

path issues resolved

1ae82cb

Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…

5140d50

…nto feature/admin-queries-monitor

path issues resolved

72e577a

Merge remote-tracking branch 'origin/develop' into feature/admin-quer…

4d60009

…ies-monitor

Merge branch 'feature/admin-queries-monitor' of https://github.com/ba…

a18e986

…kdata/conquery into feature/admin-queries-monitor

thoniTUB requested changes Sep 6, 2021

View reviewed changes

parameterized request of queries and reformatted html code

83fd6f6

Njimefo requested a review from thoniTUB September 6, 2021 14:16

Merge remote-tracking branch 'origin/master' into feature/admin-queri…

76f561b

…es-monitor # Conflicts: # backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java

thoniTUB previously approved these changes Sep 7, 2021

View reviewed changes

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java Show resolved Hide resolved

thoniTUB reviewed Sep 10, 2021

View reviewed changes

backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl Outdated Show resolved Hide resolved

parameterized request of queries and reformatted html code

81102a2

Njimefo dismissed thoniTUB’s stale review via 81102a2 September 10, 2021 07:14

Njimefo requested review from thoniTUB September 10, 2021 07:14

Merge remote-tracking branch 'origin/develop' into develop

36906ef

thoniTUB requested changes Sep 10, 2021

View reviewed changes

Brandon Tietse and others added 2 commits September 10, 2021 13:00

review changes

f446429

Update AutoDoc

0e80020

thoniTUB reviewed Sep 10, 2021

View reviewed changes

Brandon Tietse added 2 commits September 10, 2021 14:28

updated code after code review

3418875

Merge remote-tracking branch 'origin/feature/admin-queries-monitor' i…

2861dec

…nto feature/admin-queries-monitor

thoniTUB approved these changes Sep 13, 2021

View reviewed changes

thoniTUB merged commit c945e3c into develop Sep 13, 2021

delete-merged-branch bot deleted the feature/admin-queries-monitor branch September 13, 2021 12:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Admin ui for live view of queries #2062

Admin ui for live view of queries #2062

Njimefo commented Aug 31, 2021

Njimefo commented Aug 31, 2021

awildturtok Sep 1, 2021

awildturtok Sep 2, 2021

thoniTUB Sep 6, 2021

awildturtok commented Sep 1, 2021

thoniTUB Sep 1, 2021

thoniTUB left a comment

awildturtok Sep 2, 2021

thoniTUB Sep 6, 2021

thoniTUB Sep 6, 2021

thoniTUB Sep 6, 2021

thoniTUB Sep 6, 2021

thoniTUB left a comment

thoniTUB Sep 10, 2021

thoniTUB Sep 10, 2021

thoniTUB Sep 10, 2021

thoniTUB Sep 10, 2021

thoniTUB Sep 10, 2021

thoniTUB Sep 10, 2021

thoniTUB Sep 13, 2021

Njimefo Sep 13, 2021

	reloader = setInterval(getQueries, 5000);
	handleUpdateCheck(document.getElementById("updateCheckBox"));

	<div class="row container" ${(!data.progress \|\| data.progress == null ? data.progress : "style=\"display: none;\"" )}>
	<div class="row container" ${(data.progress && data.progress != null ? "" : "style=\"display: none;\"" )}>

Admin ui for live view of queries #2062

Admin ui for live view of queries #2062

Conversation

Njimefo commented Aug 31, 2021

Njimefo commented Aug 31, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

awildturtok commented Sep 1, 2021

Choose a reason for hiding this comment

thoniTUB left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thoniTUB left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment