29.2.2 release

Author: davidjgraph

ChangeLog

@@ -1,3 +1,25 @@
+01-DEC-2025: 29.2.2
+
+- AI and licensing tuning
+
+27-NOV-2025: 29.2.1
+
+- Fixes possible NPE
+
+27-NOV-2025: 29.2.0
+
+- Enhances pagecount and pagenumber placeholders [jgraph/drawio#3378]
+- Adds support for CSV in create hash property [jgraph/drawio#5273]
+- Replaces smart template section with generate window
+
+21-NOV-2025: 29.1.1
+
+- [conf connect] License tuning
+
+19-NOV-2025: 29.1.0
+
+- Makes attribute encoding deterministic [jgraph/drawio#1556]
+
 15-NOV-2025: 29.0.3
 
 - Math base path and CSP corrections

VERSION

@@ -1 +1 @@
-29.0.3
+29.2.2

src/main/webapp/js/app.min.js

@@ -3360,12 +3360,6 @@ App.prototype.start = function()
 							null, null, null, null, null, true);
 						Editor.useLocalStorage = prev;
 					}
-					else if (urlParams['smart-template'] != null)
-					{
-						this.createFile(this.defaultFilename, null,
-							null, null, null, null, null, true);
-						this.actions.get('insertTemplate').funct();
-					}
 					else
 					{
 						var waiting = false;
@@ -3439,6 +3433,14 @@ App.prototype.start = function()
 				value = decodeURIComponent(window.location.hash.substring(8));
 			}
 
+			if (urlParams['smart-template'] != null && (window.location.hash == null ||
+				window.location.hash.length <= 1))
+			{
+				value = JSON.stringify({
+					type: 'generate', data: decodeURIComponent(urlParams['smart-template'])
+				});
+			}
+			
 			if ((window.location.hash == null || window.location.hash.length <= 1 ||
 				window.location.hash.substring(0, 8) == '#create=') &&
 				value.length > 0 && this.spinner.spin(document.body, mxResources.get('loading')))
@@ -3523,11 +3525,12 @@ App.prototype.start = function()
 						this.spinner.stop();
 						value = JSON.parse(value);
 
-						var createDiagram = mxUtils.bind(this, function(data)
+						var createDiagram = mxUtils.bind(this, function(xml)
 						{
-							this.createFile((data.filename != null) ?
-								data.filename : this.defaultFilename,
-								data, null, null, mxUtils.bind(this, function()
+							this.spinner.stop();
+							this.createFile((value.filename != null) ?
+								value.filename : this.defaultFilename,
+								xml, null, null, mxUtils.bind(this, function()
 								{
 									if (!this.editor.chromeless || this.editor.editable)
 									{
@@ -3537,7 +3540,7 @@ App.prototype.start = function()
 									window.history.replaceState(null, null,
 										window.location.pathname +
 										this.getSearch(['create']));
-									window.location.hash = 'R' + Graph.compress(data);
+									window.location.hash = 'R' + Graph.compress(xml);
 								}), true, null, true);
 						});
 
@@ -3547,35 +3550,19 @@ App.prototype.start = function()
 						{
 							data = Graph.decompress(data);
 						}
-						
-						if (value.type == 'mermaid')
+
+						if (value.type == 'mermaid' && this.spinner.spin(
+							document.body, mxResources.get('loading')))
 						{
 							if (window.isMermaidEnabled)
 							{
-								mxMermaidToDrawio.addListener(mxUtils.bind(this, function(data)
-								{
-									if (data != this.emptyDiagramXml)
-									{
-										createDiagram(data);
-									}
-								}));
-
-								this.generateMermaidImage(data, null, function()
+								this.parseMermaidDiagram(data, null, mxUtils.bind(this, function(xml)
 								{
-									// callback implemented above
-								}, mxUtils.bind(this, function(e)
+									createDiagram(xml);
+								}), mxUtils.bind(this, function(e)
 								{
-									// Removes div in document with an ID that starts with dgeMermaidOutput
-									var divs = document.querySelectorAll('div[id^="dgeMermaidOutput"]');
-									
-									for (var i = 0; i < divs.length; i++)
-									{
-										divs[i].parentNode.removeChild(divs[i]);
-									}
-
-									mxMermaidToDrawio.resetListeners();
 									this.handleError(e);
-								}));
+								}), null, true);
 							}
 							else
 							{
@@ -3588,14 +3575,30 @@ App.prototype.start = function()
 							document.body, mxResources.get('generate') +
 							' \''+ data + '\''))
 						{
-							this.generateDiagram(data, mxUtils.bind(this, function(xml)
+							this.generateOpenAiMermaidDiagram(data, function(xml)
 							{
-								this.spinner.stop();
 								createDiagram(xml);
-							}), mxUtils.bind(this, function(e)
+							}, mxUtils.bind(this, function(e)
 							{
 								this.handleError(e, mxResources.get('errorLoadingFile'));
-							}));
+							}), true, {complexity: 'high'});
+						}
+						else if (value.type == 'csv')
+						{
+							var graph = this.createTemporaryGraph(this.editor.graph.getStylesheet());
+							
+							this.importCsv(data, mxUtils.bind(this, function()
+							{
+								var codec = new mxCodec();
+								createDiagram(mxUtils.getXml(
+									codec.encode(graph.getModel())));
+							}), graph);
+						}
+						else
+						{
+							this.handleError(
+								{message: mxResources.get('invalidCallFnNotFound', [value.type])},
+								mxResources.get('errorLoadingFile'));
 						}
 					}
 					else
@@ -3693,6 +3696,36 @@ App.prototype.start = function()
 	}
 };
 
+/**
+ * 
+ */
+App.prototype.openGenerateDialog = function(prompt)
+{
+	if (this.chatWindow == null)
+	{
+		this.chatWindow = new ChatWindow(this, 224, 104, 280, 320);
+		this.chatWindow.window.addListener('show', mxUtils.bind(this, function()
+		{
+			this.fireEvent(new mxEventObject('chat'));
+		}));
+		this.chatWindow.window.addListener('hide', function()
+		{
+			this.fireEvent(new mxEventObject('chat'));
+		});
+		this.chatWindow.window.setVisible(true);
+		this.fireEvent(new mxEventObject('chat'));
+	}
+	else
+	{
+		this.chatWindow.window.setVisible(true);
+	}
+
+	if (prompt != null)
+	{
+		this.chatWindow.generate(prompt);
+	}
+};
+
 /**
  * Generate a diagram for the given description.
  */
@@ -3727,42 +3760,6 @@ App.prototype.openTemplateDialog = function(generatePrompt)
 	}
 };
 
-/**
- * Generate a diagram for the given description.
- */
-App.prototype.generateDiagram = function(desc, success, error)
-{
-	var listenerTriggered = false;
-	var xmlResult = null;
-
-	var prompt = 'Write a detailed and complex MermaidJS declaration for ' +
-		'"' + (desc != '' ? desc : 'something random') + '" ' +
-		'using correct MermaidJS syntax and do not ' +
-		'provide additional text in your response.';
-	
-	if (typeof mxMermaidToDrawio !== 'undefined')
-	{
-		mxMermaidToDrawio.addListener(mxUtils.bind(this, function(modelXml)
-		{
-			if (modelXml != this.emptyDiagramXml)
-			{
-				listenerTriggered = true;
-				xmlResult = modelXml;
-			}
-		}));
-	}
-
-	this.generateOpenAiMermaidDiagram(prompt,
-		function(mermaidData, imageData, w, h)
-		{
-			xmlResult = (listenerTriggered) ? xmlResult :
-				this.createMermaidXml(mermaidData,
-					EditorUi.defaultMermaidConfig,
-					imageData, w, h, desc);
-			success(xmlResult, imageData);
-		}, error);
-};
-
 /**
  * Checks for orphaned drafts.
  */

src/main/webapp/js/diagramly/App.js

@@ -11,34 +11,8 @@ if (!mxIsElectron)
 	(function()
 	{
 		var hashes = 'default-src \'self\'; ' +
-			'script-src %script-src% \'self\' https://viewer.diagrams.net https://apis.google.com https://*.pusher.com ' +
-			// Below are the SHAs of the two script blocks in index.html.
-			// These must be updated here and in the CDN after changes.
-			// Note: Desktop app uses only the newest hashes (replace it in electron.js [The one in index.html needs to be changed only if the second script block changes])
-			//----------------------------------------------------------//
-			//------------- Bootstrap script in index.html -------------//
-			//----------------------------------------------------------//
-			// Version 24.4.4
-			'\'sha256-f6cHSTUnCvbQqwa6rKcbWIpgN9dLl0ROfpEKTQUQPr8=\' ' +
-			//---------------------------------------------------------//
-			//------------- App.main script in index.html -------------//
-			//---------------------------------------------------------//
-			// Version 13.8.2
-			'\'sha256-vS/MxlVD7nbY7AnV+0t1Ap338uF7vrcs7y23KjERhKc=\' ' +
-			//---------------------------------------------------------//
-			'; ';
+			'script-src %script-src% \'self\' https://viewer.diagrams.net https://apis.google.com https://*.pusher.com; ';
 
-		var styleHashes = '\'sha256-pVoUz0B9cDvBP/6KP+5uOMqPh1c14hF0KFqSELqeyNQ=\' ' + // index.html
-			'\'sha256-D9Gy46rimBnLRtBqv9U464kXQ5oT5JvkurboVMjtN0Q=\' ' + // MinimalCss/Light
-			'\'sha256-C9BzsAi3ukZpBZzbdTpUNpxHfPR/+KJbeueKj1U6QGY=\' ' + // MinimalCss/Dark
-			'\'sha256-7kY8ozVqKLIIBwZ24dhdmZkM26PsOlZmEi72RhmZKoM=\' ' + // mxTooltipHandler.js
-			'\'sha256-kuk5TvxZ/Kwuobo4g6uasb1xRQwr1+nfa1A3YGePO7U=\' ' + // MathJax
-			'\'sha256-ByOXYIXIkfNC3flUR/HoxR4Ak0pjOEF1q8XmtuIa6po=\' ' + // purify.min.js
-			'\'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=\' ' + // spin.min.js
-			'\'sha256-nzHi23DROym7G011m6y0DyDd9mvQL2hSJ0Gy3g2T/5Q=\' ' + // dropins.js
-			'\'sha256-xjAW8oXqJlP0CWqxT9s80kgOtOjvENMmfnnfulL6p1A=\' ' + // gapi
-			'\'unsafe-hashes\'; '; // Required for hashes for style attribute
-		
 		var directives = 'connect-src %connect-src% \'self\' https://*.draw.io https://*.diagrams.net ' +
 			'https://*.googleapis.com wss://app.diagrams.net wss://*.pusher.com https://*.pusher.com ' +
 			'https://api.github.com https://raw.githubusercontent.com https://gitlab.com ' +
@@ -49,11 +23,9 @@ if (!mxIsElectron)
 			// www.draw.io required for browser data migration to app.diagrams.net and
 			// viewer.diagrams.net required for iframe embed preview
 			'frame-src %frame-src% \'self\' https://viewer.diagrams.net https://www.draw.io https://*.google.com; ' +
-			'style-src %style-src% \'self\' https://fonts.googleapis.com ' +
-			// Replaces unsafe-inline style-src with hashes with safe-style-src URL parameter
-			((urlParams['safe-style-src'] == '1') ? styleHashes : '\'unsafe-inline\'; ') +
-			'base-uri \'none\';' +
-			'child-src \'self\';' +
+			'style-src %style-src% \'self\' https://fonts.googleapis.com \'unsafe-inline\'; ' +
+			'base-uri \'none\'; ' +
+			'child-src \'self\'; ' +
 			'object-src \'none\';';
 
 		var csp = hashes + directives;
@@ -85,8 +57,8 @@ if (!mxIsElectron)
 				'media-src * data:; ' +
 				'font-src * data:; ' +
 				'style-src \'self\' https://fonts.googleapis.com \'unsafe-inline\'; ' +
-				'base-uri \'none\';' +
-				'object-src \'none\';' +
+				'base-uri \'none\'; ' +
+				'object-src \'none\'; ' +
 				'worker-src https://viewer.diagrams.net/service-worker.js;'
 			console.log('viewer.diagrams.net:', viewer_diagrams_net);