attempting to fix missing production dialogs

jflamy · Sep 12, 2023 · 4257eb5 · 4257eb5
1 parent e8e5e5c
commit 4257eb5
Show file tree

Hide file tree

Showing 17 changed files with 168 additions and 102 deletions.
diff --git a/launch/owlcms h2 no reset.launch b/launch/owlcms h2 no reset.launch
@@ -41,5 +41,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="owlcms"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="owlcms"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dvaadin.frontend.hotdeploy=false -Dlogback.configurationFile=logback-console.xml -Dvaadin.devmode.devTools.enabled=true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dvaadin.frontend.hotdeploy=true &#13;&#10; -Dvaadin.devmode.devTools.enabled=true&#13;&#10; -Dlogback.configurationFile=logback-console.xml"/>
 </launchConfiguration>
diff --git a/owlcms/frontend/components/AttemptBoard.js b/owlcms/frontend/components/AttemptBoard.js
@@ -108,6 +108,7 @@ class CurrentAttempt extends LitElement {
 
   firstUpdated(_changedProperties) {
     super.firstUpdated(_changedProperties);
+    this.$server.openDialog();
   }
 
   isBreak() {

diff --git a/owlcms/frontend/components/DecisionBoard.js b/owlcms/frontend/components/DecisionBoard.js
@@ -82,6 +82,7 @@ class DecisionBoard extends LitElement {
 
   firstUpdated(_changedProperties) {
     super.firstUpdated(_changedProperties);
+    this.$server.openDialog();
   }
 
   isBreak() {

diff --git a/owlcms/frontend/components/Results.js b/owlcms/frontend/components/Results.js
@@ -314,6 +314,7 @@ class Results extends LitElement {
     console.debug("ready");
     super.firstUpdated(_changedProperties);
     document.body.setAttribute("theme", "dark");
+    this.$server.openDialog();
   }
 
   start() {

diff --git a/owlcms/frontend/components/ResultsLeadersRanks.js b/owlcms/frontend/components/ResultsLeadersRanks.js
@@ -380,6 +380,7 @@ class ResultsFull extends LitElement {
     console.debug("ready");
     super.firstUpdated(_changedProperties);
     document.body.setAttribute("theme", "dark");
+    this.$server.openDialog();
   }
 
   start() {

diff --git a/owlcms/frontend/components/ResultsMedals.js b/owlcms/frontend/components/ResultsMedals.js
@@ -206,6 +206,7 @@ class ResultsMedals extends LitElement {
     console.debug("ready");
     super.firstUpdated(_changedProperties);
     document.body.setAttribute("theme", "dark");
+    this.$server.openDialog();
   }
 
   start() {

diff --git a/owlcms/frontend/components/TimerElement.js b/owlcms/frontend/components/TimerElement.js
@@ -134,6 +134,7 @@ class TimerElement extends LitElement {
 
   updateTime(time) {
     var newTime = this._formatTime(time);
+    if (newTime == "NaN:NaN") return;
     if (newTime != this.lastTime) {
       var s = this.renderRoot.querySelector('#timer');
       if (s) {

diff --git a/owlcms/src/main/java/app/owlcms/apputils/queryparameters/DisplayParameters.java b/owlcms/src/main/java/app/owlcms/apputils/queryparameters/DisplayParameters.java
@@ -172,7 +172,7 @@ public default boolean isSwitchableDisplay() {
 	}
 
 	public default void openDialog(Dialog dialog) {
-		// logger.debug("openDialog {} {}", dialog, dialog.isOpened());
+		logger.warn("openDialog {} {}", dialog, (dialog != null ? dialog.isOpened() : "-"));
 		if (dialog == null) {
 			buildDialog((Component)this);
 			dialog = this.getDialog();

diff --git a/owlcms/src/main/java/app/owlcms/displays/attemptboard/AthleteFacingDecisionBoard.java b/owlcms/src/main/java/app/owlcms/displays/attemptboard/AthleteFacingDecisionBoard.java
@@ -7,8 +7,10 @@
 package app.owlcms.displays.attemptboard;
 
 import com.vaadin.flow.component.AttachEvent;
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Route;
 
 import app.owlcms.init.OwlcmsSession;
@@ -59,4 +61,11 @@ protected void onAttach(AttachEvent attachEvent) {
 		super.onAttach(attachEvent);
 		decisions.setPublicFacing(false);
 	}
+
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
+	}
 }
diff --git a/owlcms/src/main/java/app/owlcms/displays/attemptboard/AttemptBoard.java b/owlcms/src/main/java/app/owlcms/displays/attemptboard/AttemptBoard.java
@@ -26,6 +26,7 @@
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dialog.Dialog;
 import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.component.littemplate.LitTemplate;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.notification.Notification.Position;
@@ -298,9 +299,11 @@ public boolean isVideo() {
 		return video;
 	}
 
+	@AllowInert
 	@ClientCallable
 	@Override
 	public void openDialog() {
+		logger.warn("openDialog called");
 		DisplayParameters.super.openDialog(getDialog());
 	}
 
@@ -789,7 +792,6 @@ protected void onAttach(AttachEvent attachEvent) {
 			syncWithFOP(fop);
 			// we send on fopEventBus, listen on uiEventBus.
 			uiEventBus = uiEventBusRegister(this, fop);
-			openDialog();
 		});
 	}
 

diff --git a/owlcms/src/main/java/app/owlcms/displays/attemptboard/PublicFacingDecisionBoard.java b/owlcms/src/main/java/app/owlcms/displays/attemptboard/PublicFacingDecisionBoard.java
@@ -8,8 +8,10 @@
 
 import com.google.common.eventbus.Subscribe;
 import com.vaadin.flow.component.AttachEvent;
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Route;
 
 import app.owlcms.data.config.Config;
@@ -95,4 +97,12 @@ protected void onAttach(AttachEvent attachEvent) {
 		decisions.setDontReset(true);
 		setSilenced(isSilencedByDefault());
 	}
+
+
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
+	}
 }
diff --git a/owlcms/src/main/java/app/owlcms/displays/scoreboard/Results.java b/owlcms/src/main/java/app/owlcms/displays/scoreboard/Results.java
@@ -1090,7 +1090,6 @@ protected void onAttach(AttachEvent attachEvent) {
 		getElement().setProperty("showLiftRanks",
 		        Competition.getCurrent().isSnatchCJTotalMedals() && !Competition.getCurrent().isSinclair());
 		SoundUtils.enableAudioContextNotification(this.getElement());
-		openDialog();
 	}
 
 	protected void setAbbreviateName(boolean abbreviateNames) {

diff --git a/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsLeadersRanks.java b/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsLeadersRanks.java
@@ -11,8 +11,10 @@
 
 import org.slf4j.LoggerFactory;
 
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Route;
 
 import app.owlcms.data.agegroup.AgeGroup;
@@ -58,34 +60,14 @@ public String getPageTitle() {
 		return getTranslation("ScoreboardMultiRanksTitle") + OwlcmsSession.getFopNameIfMultiple();
 	}
 
-	private JsonValue getRanksJson(Athlete a, Ranking r, LinkedHashMap<String, Participation> ageGroupMap2) {
-		JsonArray ranks = Json.createArray();
-		int i = 0;
-		for (Entry<String, Participation> e : ageGroupMap.entrySet()) {
-			Participation p = e.getValue();
-			// logger,debug("a {} k {} v {}", a.getShortName(), e.getKey(), p);
-			if (p == null) {
-				ranks.set(i, formatRank(null));
-			} else {
-				switch (r) {
-				case CLEANJERK:
-					ranks.set(i, formatRank(p.getCleanJerkRank()));
-					break;
-				case SNATCH:
-					ranks.set(i, formatRank(p.getSnatchRank()));
-					break;
-				case TOTAL:
-					ranks.set(i, formatRank(p.getTotalRank()));
-					break;
-				default:
-					break;
-				}
-			}
-			i++;
-		}
-		return ranks;
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
 	}
 
+	@Override
 	protected String formatRank(Integer total) {
 		if (total == null) {
 			return "&nbsp;";
@@ -98,29 +80,6 @@ protected String formatRank(Integer total) {
 		}
 	}
 
-	private void setCurrentAthleteParticipations(Athlete a) {
-		OwlcmsSession.withFop(fop -> {
-			ageGroupMap = new LinkedHashMap<>(fop.getAgeGroupMap());
-			for (Entry<String, Participation> cape : ageGroupMap.entrySet()) {
-				cape.setValue(null);
-			}
-			if (a != null) {
-				// logger,debug(">>>setCurrentAthleteParticipations begin");
-				// logger,debug("setting {}", a.getShortName());
-				for (Participation p : a.getParticipations()) {
-					AgeGroup ag = p.getCategory() != null ? p.getCategory().getAgeGroup() : null;
-					if (ag != null) {
-						// logger,debug("athlete {} curRankings {} {}", a, ag.getCode(), p);
-						ageGroupMap.put(ag.getCode(), p);
-					}
-				}
-				// logger,debug("<<<setCurrentAthleteParticipations end");
-			} else {
-				// logger,debug("+++ cleared");
-			}
-		});
-	}
-
 	@Override
 	protected JsonArray getAgeGroupNamesJson(LinkedHashMap<String, Participation> currentAthleteParticipations) {
 		JsonArray ageGroups = Json.createArray();
@@ -182,7 +141,58 @@ protected void getAthleteJson(Athlete a, JsonObject ja, Category curCat, int lif
 		}
 		// logger.debug("{} {} {}", a.getShortName(), fop.getState(), highlight);
 		ja.put("classname", highlight);
-		
+
 		setTeamFlag(a, ja);
 	}
+
+	private JsonValue getRanksJson(Athlete a, Ranking r, LinkedHashMap<String, Participation> ageGroupMap2) {
+		JsonArray ranks = Json.createArray();
+		int i = 0;
+		for (Entry<String, Participation> e : ageGroupMap.entrySet()) {
+			Participation p = e.getValue();
+			// logger,debug("a {} k {} v {}", a.getShortName(), e.getKey(), p);
+			if (p == null) {
+				ranks.set(i, formatRank(null));
+			} else {
+				switch (r) {
+				case CLEANJERK:
+					ranks.set(i, formatRank(p.getCleanJerkRank()));
+					break;
+				case SNATCH:
+					ranks.set(i, formatRank(p.getSnatchRank()));
+					break;
+				case TOTAL:
+					ranks.set(i, formatRank(p.getTotalRank()));
+					break;
+				default:
+					break;
+				}
+			}
+			i++;
+		}
+		return ranks;
+	}
+
+	private void setCurrentAthleteParticipations(Athlete a) {
+		OwlcmsSession.withFop(fop -> {
+			ageGroupMap = new LinkedHashMap<>(fop.getAgeGroupMap());
+			for (Entry<String, Participation> cape : ageGroupMap.entrySet()) {
+				cape.setValue(null);
+			}
+			if (a != null) {
+				// logger,debug(">>>setCurrentAthleteParticipations begin");
+				// logger,debug("setting {}", a.getShortName());
+				for (Participation p : a.getParticipations()) {
+					AgeGroup ag = p.getCategory() != null ? p.getCategory().getAgeGroup() : null;
+					if (ag != null) {
+						// logger,debug("athlete {} curRankings {} {}", a, ag.getCode(), p);
+						ageGroupMap.put(ag.getCode(), p);
+					}
+				}
+				// logger,debug("<<<setCurrentAthleteParticipations end");
+			} else {
+				// logger,debug("+++ cleared");
+			}
+		});
+	}
 }
diff --git a/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsLiftingOrder.java b/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsLiftingOrder.java
@@ -3,8 +3,10 @@
 import java.util.List;
 import java.util.function.BiPredicate;
 
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Route;
 
 import app.owlcms.data.athlete.Athlete;
@@ -31,6 +33,13 @@ public String getPageTitle() {
 		return getTranslation("Scoreboard.LiftingOrder") + OwlcmsSession.getFopNameIfMultiple();
 	}
 
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
+	}
+
 	@Override
 	protected int countSubsets(List<Athlete> athlete) {
 		boolean snatchPresent = (athlete.get(0).getActuallyAttemptedLifts() < 3);

diff --git a/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsNoLeaders.java b/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsNoLeaders.java
@@ -12,8 +12,10 @@
 
 import org.slf4j.LoggerFactory;
 
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Location;
 import com.vaadin.flow.router.Route;
 
@@ -34,7 +36,7 @@
 @Route("displays/results")
 
 public class ResultsNoLeaders extends Results {
-	
+
 	Logger logger = (Logger) LoggerFactory.getLogger(ResultsNoLeaders.class);
 
 	/**
@@ -54,9 +56,17 @@ public ResultsNoLeaders() {
 	public String getPageTitle() {
 		return getTranslation("Scoreboard") + OwlcmsSession.getFopNameIfMultiple();
 	}
-
+
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
+	}
+
 	/**
-	 * @see app.owlcms.apputils.queryparameters.DisplayParameters#readParams(com.vaadin.flow.router.Location, java.util.Map)
+	 * @see app.owlcms.apputils.queryparameters.DisplayParameters#readParams(com.vaadin.flow.router.Location,
+	 *      java.util.Map)
 	 */
 	@Override
 	public HashMap<String, List<String>> readParams(Location location, Map<String, List<String>> parametersMap) {

diff --git a/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsRankingOrder.java b/owlcms/src/main/java/app/owlcms/displays/scoreboard/ResultsRankingOrder.java
@@ -2,8 +2,10 @@
 
 import java.util.List;
 
+import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.internal.AllowInert;
 import com.vaadin.flow.router.Route;
 
 import app.owlcms.data.athlete.Athlete;
@@ -30,6 +32,13 @@ public String getPageTitle() {
 		return getTranslation("Scoreboard.RankingOrder") + OwlcmsSession.getFopNameIfMultiple();
 	}
 
+	@AllowInert
+	@ClientCallable
+	@Override
+	public void openDialog() {
+		super.openDialog(getDialog());
+	}
+
 	@Override
 	protected List<Athlete> getOrder(FieldOfPlay fop) {
 		return fop.getResultsOrder();