Merge pull request #88 from AI-Tournaments/Sync-arena

Sync arena

Author: ChrisAcrobat

Arena

@@ -6,10 +6,9 @@
 		<script async src="https://www.googletagmanager.com/gtag/js?id=G-TJFMG29186"></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-TJFMG29186');</script>
 		<meta content="width=device-width, initial-scale=1.0" name="viewport">
 		<meta content="yes" name="mobile-web-app-capable">
-		<script src="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.0/dist/jsoneditor.min.js"></script>
-		<script src="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.0/dist/jsoneditor.min.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/jsoneditor@9.10.2/dist/jsoneditor.min.js"></script>
+		<link href="https://cdn.jsdelivr.net/npm/jsoneditor@9.10.2/dist/jsoneditor.min.css" rel="stylesheet">
 		<script src="../GitHubApi.js"></script>
-		<link href="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.0/dist/jsoneditor.min.css" rel="stylesheet">
 		<link rel="stylesheet" href="../defaults.css">
 		<style>
 			html, body, #editor {

Dev/index.html

@@ -6,7 +6,7 @@ function a(){
 		if(GitHubApi.getSessionStorage().acceptedDev){
 			acceptedDev = true;
 		}
-		let defaultSetup = {
+		const defaultSetup = {
 			active: false,
 			comment: '',
 			autoStart: false,
@@ -21,7 +21,7 @@ function a(){
 		};
 		_editor = new JSONEditor(document.getElementById('editor'), {
 			'modes': ['tree', 'code'],
-			'name': 'Setups',
+			'name': 'Test setups',
 			'onChange': ()=>{
 				_editor.validate().then(errors => {
 					if(!errors.length){
@@ -92,7 +92,7 @@ function a(){
 										if(url && (url[0] === '?' || url[0] === '!')){
 											if(acceptedDev === undefined){
 												let session = GitHubApi.getSessionStorage();
-												acceptedDev = 'i accept unsandboxed sources' === (prompt('By having exclamation (!) and question (?) marks first in the URL you side steps all security features and you do so at your own risk. Only do this to URLs for code that you trust.\n\nWrite "I accept unsandboxed sources" to allow unsandboxed sources.')??'').toLowerCase();
+												acceptedDev = 'I accept unsandboxed sources' === (prompt('By having exclamation (!) and question (?) marks first in the URL you side steps all security features and you do so at your own risk. Only do this to URLs for code that you trust.\n\nWrite "I accept unsandboxed sources" to allow unsandboxed sources.')??'').toLowerCase();
 												session.acceptedDev = acceptedDev;
 												GitHubApi.setSessionStorage(session);
 											}
@@ -159,7 +159,7 @@ function a(){
 			}
 		}, schemaDefs);
 	});
-	let mode = localStorage.getItem('LocalDevelopment.Mode');
+	const mode = localStorage.getItem('LocalDevelopment.Mode');
 	if(mode){
 		_editor.setMode(mode);
 	}

Dev/index.js

@@ -6,8 +6,8 @@
 		<script async src="https://www.googletagmanager.com/gtag/js?id=G-TJFMG29186"></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-TJFMG29186');</script>
 		<meta content="width=device-width, initial-scale=1.0" name="viewport">
 		<meta content="yes" name="mobile-web-app-capable">
-		<script src="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.0/dist/jsoneditor.min.js"></script>
-		<link href="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.0/dist/jsoneditor.min.css" rel="stylesheet">
+		<script src="https://cdn.jsdelivr.net/npm/jsoneditor@9.10.2/dist/jsoneditor.js"></script>
+		<link href="https://cdn.jsdelivr.net/npm/jsoneditor@9.10.2/dist/jsoneditor.min.css" rel="stylesheet">
 		<link rel="stylesheet" href="../defaults.css">
 		<style>
 			html {

Replay/index.html

@@ -20,7 +20,7 @@ function a(){
 	let _replayData;
 	let _previousOption;
 	let _autoStart = false;
-	fetch('/schemaDefs.json').then(response => response.json()).then(schemaDefs => {
+	const schemaDefsPromise = fetch('/schemaDefs.json').then(response => response.json()).then(schemaDefs => {
 		_editor.setSchema({
 			type: 'object',
 			required: ['header', 'body'],
@@ -62,15 +62,15 @@ function a(){
 											type: 'object',
 											required: ['score', 'members', 'team'],
 											properties: {
-												score: {type: 'number'},
+												score: {type: ['number', 'null']},
 												members: {
 													type: 'array',
 													items: {
 														type: 'object',
 														required: ['name', 'bonus'],
 														properties: {
 															name: {type: 'string'},
-															bonus: {type: 'number'}
+															bonus: {type: ['number', 'null']}
 														}
 													}
 												},
@@ -213,7 +213,7 @@ function a(){
 		return errors;
 	}
 	function onChange(){
-		_editor.validate().then(errors => {
+		schemaDefsPromise.then(()=>_editor.validate().then(errors => {
 			let containsError = 0 < errors.length;
 			_element_btnLock.disabled = containsError;
 			document.getElementById('invalid-input').classList[containsError ? 'remove' : 'add']('hidden');
@@ -224,11 +224,13 @@ function a(){
 			}
 			if(_autoStart){
 				_autoStart = false;
-				if(!containsError){
+				if(containsError){
+					console.error('Replay error', errors);
+				}else{
 					_element_btnLock.onclick();
 				}
 			}
-		});
+		}));
 	}
 	function refreshStoredReplays(){
 		while(0 < _element_previousReplayOptions.childElementCount){

Replay/index.js

@@ -12,7 +12,7 @@
 		"type": "object",
 		"required": ["score", "bonusPoints"],
 		"properties": {
-			"score": {"type": "number"},
+			"score": {"type": ["number", "null"]},
 			"bonusPoints": {
 				"type": "array",
 				"items": {
@@ -21,7 +21,7 @@
 					"properties": {
 						"participant": {"type": "string"},
 						"team": {"type": "number"},
-						"bonus": {"type": "number"}
+						"bonus": {"type": ["number", "null"]}
 					}
 				}
 			}