alchemy-widget 0.3.0-alpha.1 → 0.3.0

package/element/widget_toolbar_element.js

@@ -57,7 +57,7 @@ Toolbar.addElementGetter('button_save_all', 'al-button.save-all');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.3.0
  */
 Toolbar.setStatic(function show() {
 
@@ -71,6 +71,11 @@ Toolbar.setStatic(function show() {
 		return;
 	}
 
+	// Don't show if an al-editor-toolbar exists (e.g., in Chimera)
+	if (document.querySelector('al-editor-toolbar')) {
+		return;
+	}
+
 	toolbar = hawkejs.createElement('al-widget-toolbar');
 
 	hawkejs.scene.bottom_element.append(toolbar);
@@ -105,27 +110,27 @@ Toolbar.setMethod(function getAllRootWidgets() {
 	return result;
 });
 
+/**
+ * Get the target widgets (all root widgets for this toolbar)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+Toolbar.setMethod(function getTargetWidgets() {
+	return this.getAllRootWidgets();
+});
+
 /**
  * Start editing all the widgets
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.3.0
  */
 Toolbar.setMethod(function startEditing() {
-
-	let i;
-
 	Blast.editing = true;
-	document.body.classList.add('editing-blocks');
-
-	let elements = this.getAllRootWidgets();
-
-	for (i = 0; i < elements.length; i++) {
-		elements[i].startEditor();
-	}
-
-	this.setState('editing');
+	startEditing.super.call(this);
 });
 
 /**
@@ -133,7 +138,7 @@ Toolbar.setMethod(function startEditing() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.3.0
  */
 Toolbar.setMethod(function stopEditing() {
 
@@ -141,123 +146,8 @@ Toolbar.setMethod(function stopEditing() {
 		return;
 	}
 
-	let i;
-
 	Blast.editing = false;
-	document.body.classList.remove('editing-blocks');
-
-	let elements = this.getAllRootWidgets();
-
-	for (i = 0; i < elements.length; i++) {
-		elements[i].stopEditor();
-	}
-
-	this.setState('ready');
-});
-
-/**
- * Save all the widgets
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.2.0
- * @version  0.2.0
- */
-Toolbar.setMethod(async function saveAll() {
-
-	if (this._saving) {
-		try {
-			await this._saving;
-		} catch (err) {
-			// Ignore;
-		}
-	}
-
-	this._saving = null;
-
-	let elements = this.getAllRootWidgets();
-	let widget_data = [];
-	let pledge;
-
-	for (let element of elements) {
-		let entry = element.gatherSaveData();
-
-		if (entry) {
-			widget_data.push(entry);
-		}
-	}
-
-	if (widget_data.length) {
-		let config = {
-			href : alchemy.routeUrl('AlchemyWidgets#save'),
-			post : {
-				widgets: widget_data
-			}
-		};
-
-		pledge = alchemy.fetch(config);
-		this._saving = pledge;
-	}
-
-	return pledge;
-});
-
-/**
- * Save all and update the states
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {Boolean}   before_stop
- */
-Toolbar.setMethod(async function saveAllAndUpdateButtonStates(before_stop) {
-
-	let state = 'saving',
-	    button;
-
-	if (before_stop) {
-		button = this.button_stop_and_save;
-		state += '-before-stop';
-	} else {
-		button = this.button_save_all;
-	}
-
-	this.setState(state);
-	button.setState(state);
-
-	let save_error = null;
-
-	let restore_toolbar_state = this.wrapForCurrentState(() => {
-		if (save_error) {
-			this.setState('error');
-		} else {
-			this.setState('editing')
-		}
-	});
-
-	let restore_button_state = button.wrapForCurrentState(() => {
-
-		if (save_error) {
-			button.setState('error');
-		} else {
-			button.setState('saved', 2500, 'ready');
-		}
-	});
-
-	try {
-		await this.saveAll();
-	} catch (err) {
-		save_error = err;
-	}
-
-	restore_toolbar_state();
-	restore_button_state();
-
-	if (save_error) {
-		return false;
-	}
-
-	return true;
+	stopEditing.super.call(this);
 });
 
 /**
@@ -284,11 +174,6 @@ Toolbar.setMethod(function introduced() {
 
 	if (this.toolbar_manager) {
 		this.prepareToolbarManager(this.toolbar_manager);
-	} else {
-		let manager = hawkejs.scene.exposed.toolbar_manager;
-		if (manager) {
-			this.prepareToolbarManager(manager);
-		}
 	}
 
 	this.button_start.addEventListener('activate', async e => {
@@ -354,4 +239,4 @@ Toolbar.setMethod(function connected() {
 Toolbar.setMethod(function disconnected() {
 	let html = document.querySelector('html');
 	html.classList.remove('with-al-widget-toolbar');
-});
+});

package/helper/document_watcher.js

@@ -24,11 +24,9 @@ const COLOURS = [
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.7
- * @version  0.2.7
+ * @version  0.3.0
  */
-const DocumentWatcher = Function.inherits('Alchemy.Syncable', 'Alchemy.Widget', function DocumentWatcher() {
-	DocumentWatcher.super.call(this, 'document_watcher');
-});
+const DocumentWatcher = Function.inherits('Alchemy.Syncable.Specialized', 'Alchemy.Widget', 'DocumentWatcher');
 
 /**
  * Create a watcher for the given document
@@ -60,6 +58,42 @@ DocumentWatcher.setStatic(function create(model, pk) {
 
 if (Blast.isNode) {
 
+	/**
+	 * Recreate a watcher after server restart.
+	 * Called by Syncable.tryRecreate() when client reconnects.
+	 *
+	 * @author   Jelle De Loecker   <jelle@elevenways.be>
+	 * @since    0.3.0
+	 * @version  0.3.0
+	 *
+	 * @param    {Conduit}   conduit
+	 * @param    {Object}    config    Contains type, id, and version from the client
+	 *
+	 * @return   {DocumentWatcher}
+	 */
+	DocumentWatcher.setStatic(async function recreate(conduit, config) {
+
+		// The config.id follows the pattern "Model:pk"
+		let parts = config.id.split(':');
+
+		if (parts.length < 2) {
+			return null;
+		}
+
+		let model = parts[0],
+		    pk = parts.slice(1).join(':'); // Handle pks with colons
+
+		// Use the existing create method which handles caching
+		let watcher = this.create(model, pk);
+
+		if (watcher) {
+			// Re-add this conduit as a watcher
+			await watcher.addWatcher(conduit);
+		}
+
+		return watcher;
+	});
+
 	/**
 	 * Add a viewer based on the conduit
 	 *
@@ -69,12 +103,13 @@ if (Blast.isNode) {
 	 *
 	 * @param    {Alchemy.Conduit}   conduit
 	 */
-	DocumentWatcher.setTypedMethod([Types.Alchemy.Conduit], function addWatcher(conduit) {
+	DocumentWatcher.setTypedMethod([Types.Alchemy.Conduit], async function addWatcher(conduit) {
 
 		let user_id = '' + conduit.getUserId(),
 		    scene_id = conduit.scene_id;
 
-		this.addWatcher(user_id, scene_id);
+		// IMPORTANT: await the async addWatcher method!
+		await this.addWatcher(user_id, scene_id);
 
 		// Watchers should also be registered as a client
 		this.registerClient(conduit);

package/helper/editor_toolbar_manager.js

@@ -9,10 +9,64 @@ const SCENE_MAP = new Map(),
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.7
- * @version  0.2.7
+ * @version  0.3.0
+ */
+const EditorToolbarManager = Function.inherits('Alchemy.Syncable.Specialized', 'Alchemy.Widget', 'EditorToolbarManager');
+
+/**
+ * Storage for document button providers
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EditorToolbarManager.setStatic('document_button_providers', []);
+
+/**
+ * Storage for model button providers
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EditorToolbarManager.setStatic('model_button_providers', []);
+
+/**
+ * Register a callback that can add toolbar buttons when a document is set.
+ * This allows plugins to add their own buttons without modifying this file.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ *
+ * @param    {Function}   callback   Function(manager, doc, model, model_name, pk_val)
+ */
+EditorToolbarManager.setStatic(function registerDocumentButtonProvider(callback) {
+
+	if (typeof callback !== 'function') {
+		throw new Error('Button provider must be a function');
+	}
+
+	this.document_button_providers.push(callback);
+});
+
+/**
+ * Register a callback that can add toolbar buttons when a model is set.
+ * This allows plugins to add their own buttons without modifying this file.
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ *
+ * @param    {Function}   callback   Function(manager, model_name)
  */
-const EditorToolbarManager = Function.inherits('Alchemy.Syncable', 'Alchemy.Widget', function EditorToolbarManager() {
-	EditorToolbarManager.super.call(this, 'editor_toolbar_manager');
+EditorToolbarManager.setStatic(function registerModelButtonProvider(callback) {
+
+	if (typeof callback !== 'function') {
+		throw new Error('Button provider must be a function');
+	}
+
+	this.model_button_providers.push(callback);
 });
 
 if (Blast.isNode) {
@@ -61,6 +115,36 @@ if (Blast.isNode) {
 
 		return manager;
 	});
+
+	/**
+	 * Recreate a manager after server restart.
+	 * Called by Syncable.tryRecreate() when client reconnects.
+	 *
+	 * @author   Jelle De Loecker   <jelle@elevenways.be>
+	 * @since    0.3.0
+	 * @version  0.3.0
+	 *
+	 * @param    {Conduit}   conduit
+	 * @param    {Object}    config    Contains type, id, and version from the client
+	 *
+	 * @return   {EditorToolbarManager}
+	 */
+	EditorToolbarManager.setStatic(async function recreate(conduit, config) {
+
+		// The config.id is the scene_id from the client.
+		// Set it on the conduit if not already set, so create() can use it.
+		if (!conduit.scene_id) {
+			conduit.scene_id = config.id;
+		} else if (conduit.scene_id !== config.id) {
+			// Scene ID mismatch - this shouldn't happen but log if it does
+			log.warning('EditorToolbarManager recreate: scene_id mismatch', {
+				conduit_scene_id : conduit.scene_id,
+				config_id        : config.id,
+			});
+		}
+
+		return this.create(conduit);
+	});
 }
 
 /**
@@ -99,6 +183,24 @@ EditorToolbarManager.setStateProperty('title', {allow_client_set: false});
  */
 EditorToolbarManager.setStateProperty('scenario');
 
+/**
+ * Whether this is a user-specific dashboard
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EditorToolbarManager.setStateProperty('is_user_dashboard', {allow_client_set: false});
+
+/**
+ * Whether the user has an ID (is logged in)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EditorToolbarManager.setStateProperty('has_user_id', {allow_client_set: false});
+
 /**
  * Clear the model fallback
  *
@@ -162,10 +264,11 @@ EditorToolbarManager.setTypedMethod([Types.String.optional().nullable()], functi
 		this.emitPropertyChange('model_name');
 	}
 
+	// Call registered model button providers
 	if (Blast.isNode && model_name) {
-		this.addTemplateToRender('buttons', 'chimera/toolbar/create_button', {
-			model_name: Blast.parseClassPath(model_name).map(entry => entry.underscore()).join('.'),
-		});
+		for (let provider of this.constructor.model_button_providers) {
+			provider(this, model_name);
+		}
 	}
 });
 
@@ -200,20 +303,9 @@ EditorToolbarManager.setMethod(function setDocument(doc) {
 
 	this.setDocumentWatcher(document_watcher);
 
-	if (this.scenario != 'chimera') {
-		this.addTemplateToRender('buttons', 'chimera/toolbar/edit_in_chimera_button', {
-			model_name: model_name.underscore(),
-			record_pk: pk_val,
-		});
-	}
-
-	if (model.chimera.record_preview) {
-		if (this.scenario == 'chimera') {
-			this.addTemplateToRender('buttons', 'chimera/toolbar/preview_button', {
-				model_name: model_name.underscore(),
-				record_pk: pk_val,
-			});
-		}
+	// Call registered document button providers
+	for (let provider of this.constructor.document_button_providers) {
+		provider(this, doc, model, model_name, pk_val);
 	}
 
 	return document_watcher;