alchemy-media 0.6.4 → 0.7.1

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.7.1 (2022-12-23)
+
+* Cascade `al-svg` role attribute to child `svg` elements
+* Add `img` role fallback when using `graphics-symbol`
+* Also add default role to `al-icon` element
+* Make `al-file` catch errors and report them to a possible `al-field` parent
+* Add the `accept` attribute to `al-file`
+* Add the `accept` option to `File` fields
+* Add `width_hint` field to `image` widget. This field allows users to specify the approximate maximum width of an image in pixels or as a percentage of the total page width.
+* Add `lazy_load` field to `image` widget
+
+## 0.7.0 (2022-11-02)
+
+* Use the `al-` prefix for custom elements
+* Rename `al-ico` to `al-icon`
+* Allow selecting existing uploaded files in an `al-file` element
+
 ## 0.6.4 (2022-10-13)
 
 * Add the `Media#loadIconFont()` helper method

package/README.md

@@ -75,7 +75,7 @@ you can do so like this on Debian/Ubuntu
 
 Install the requirements of the `veronica` module:
 
-    apt-get install graphicsmagick webp libgif-dev
+    apt-get install graphicsmagick webp libgif-dev libcairo2-dev libpango1.0-dev libjpeg-dev librsvg2-dev
 
 This plugin requires exiv2
 

package/assets/stylesheets/alchemy_media.scss

@@ -0,0 +1 @@
+@import "media_elements/index.scss";

package/assets/stylesheets/{element/alchemy_file.scss → media_elements/_file.scss}

@@ -37,7 +37,7 @@ al-file {
 			visibility: hidden;
 		}
 
-		al-ico {
+		al-icon {
 			position: absolute;
 			top: 0;
 			left: 0;
@@ -94,7 +94,7 @@ al-file {
 	}
 }
 
-alchemy-field[field-view="file_preview"] {
+al-field[field-view="file_preview"] {
 	[data-he-name="field"] .field {
 		padding: 0;
 
@@ -105,9 +105,9 @@ alchemy-field[field-view="file_preview"] {
 	}
 }
 
-alchemy-field[field-view="file_preview"],
-alchemy-field[field-view="file"],
-alchemy-field[field-type="file"] {
+al-field[field-view="file_preview"],
+al-field[field-view="file"],
+al-field[field-type="file"] {
 
 	&[mode="inline"]  {
 		.field img {

package/assets/stylesheets/{alchemy_icons.scss → media_elements/_icon.scss}

@@ -1,4 +1,4 @@
-al-ico {
+al-icon {
 	// inline-flex breaks certain (duotone) icons
 	//--fa-display: inline-flex;
 	flex-flow: column;

package/assets/stylesheets/media_elements/_image.scss

@@ -0,0 +1,25 @@
+al-image {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+
+	.placeholder {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		transform: scale(1.03);
+		filter: blur(8px);
+		z-index: -1;
+		transition: 0.1s transform;
+	}
+
+	.final {
+		height: auto;
+		width: auto;
+		opacity: 0;
+		transition: 0.1s opacity, 0.1s transform;
+		transform: scale(1.03)
+	}
+}

package/assets/stylesheets/media_elements/index.scss

@@ -0,0 +1,4 @@
+@import "_file.scss";
+@import "_icon.scss";
+@import "_svg.scss";
+@import "_image.scss";

package/bootstrap.js

@@ -48,6 +48,13 @@ Router.get('Media::image', options.url + '/{id}', 'MediaFile#image');
 Router.get('MediaFile#data', '/media/data/{prefix}/{id}', 'MediaFile#data');
 Router.get('MediaFile#info', '/media/info', 'MediaFile#info');
 
+Router.add({
+	name       : 'MediaFile#recordsource',
+	methods    : ['get'],
+	paths      : '/media/recordsource',
+	permission : 'media.recordsource',
+});
+
 // Allow dummy extensions
 Router.get('Media::fileextension', '/media/file/{id}.{extension}', 'MediaFile#file');
 

package/controller/media_files_controller.js

@@ -206,7 +206,7 @@ MediaFiles.setAction(function downloadFile(conduit, id, extension) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.4.2
+ * @version  0.7.1
  *
  * @param    {Conduit}   conduit
  */
@@ -215,16 +215,16 @@ MediaFiles.setAction(function upload(conduit) {
 	var MediaFile = this.getModel('MediaFile'),
 	    files = conduit.files,
 	    tasks = [],
-	    file;
+		accept = conduit.body?.accept;
 
 	if (files && files.files && typeof files.files == 'object') {
 		files = files.files;
 	}
 
-	// Iterate over every file
-	Object.each(files, function eachFile(file, key) {
+	for (let key in files) {
+		let file = files[key];
 
-		tasks[tasks.length] = function storeFile(next) {
+		tasks.push(async next => {
 			let options = {
 				move: true,
 				filename: file.name
@@ -242,9 +242,20 @@ MediaFiles.setAction(function upload(conduit) {
 
 			options.name = name;
 
+			// @TODO: don't trust the browser to dictate the type
+			if (accept) {
+				let file_type = await file.getMimetype();
+
+				if (file_type === accept || accept.includes(file_type)) {
+					// OK!
+				} else {
+					return next(new Error('File upload failed: Expected filetype "' + accept + '", but got "' + file_type + '"'));
+				}
+			}
+
 			MediaFile.addFile(file.path, options, next);
-		};
-	});
+		});
+	}
 
 	// Store every file
 	Function.parallel(tasks, function storedFiles(err, result) {
@@ -382,4 +393,74 @@ MediaFiles.setAction(function info(conduit) {
 			conduit.end(size);
 		});
 	});
+});
+
+/**
+ * Recordsource action
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ *
+ * @param    {Conduit}   conduit
+ */
+MediaFiles.setAction(async function recordsource(conduit) {
+
+	const model = this.model;
+
+	let crit = model.find();
+
+	model.disableTranslations();
+
+	let page_size = conduit.param('page_size'),
+	    filters = conduit.param('filters'),
+	    fields = conduit.param('fields'),
+	    page = conduit.param('page'),
+	    sort = conduit.param('sort');
+	
+	if (fields) {
+
+		// @TODO: fix FieldSet being sent with regular json?
+		if (fields.fields) {
+			fields = fields.fields;
+		}
+
+		crit.select(fields);
+	}
+
+	if (page_size && !page) {
+		page = 1;
+	}
+
+	if (page) {
+		crit.page(page, page_size);
+	}
+
+	if (sort?.field && sort?.dir) {
+		crit.sort([sort.field, sort.dir]);
+	}
+
+	if (filters) {
+		let key,
+		    val;
+
+		for (key in filters) {
+			val = filters[key];
+
+			// The value should always be a string,
+			// so anything that is falsy can be ignored
+			if (!val) {
+				continue;
+			}
+
+			val = RegExp.interpretWildcard('*' + val + '*', 'i');
+			crit.where(key).equals(val);
+		}
+	}
+
+	let records = await model.find('all', crit);
+	
+	conduit.end({
+		records : records
+	});
 });

package/element/00-media_base.js

@@ -0,0 +1,17 @@
+/**
+ * The base class for all other media elements
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ */
+const Base = Function.inherits('Alchemy.Element', 'Alchemy.Element.Media', 'Base');
+
+/**
+ * The stylesheet to load for this element
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ */
+Base.setStylesheetFile('alchemy_media');

package/element/al_file.js

@@ -3,9 +3,9 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.0
- * @version  0.6.0
+ * @version  0.7.0
  */
-const AlFile = Function.inherits('Alchemy.Element.App', 'AlFile');
+const AlFile = Function.inherits('Alchemy.Element.Media.Base', 'AlFile');
 
 /**
  * The template code
@@ -16,15 +16,6 @@ const AlFile = Function.inherits('Alchemy.Element.App', 'AlFile');
  */
 AlFile.setTemplateFile('element/al_file');
 
-/**
- * The stylesheet to load for this element
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.6.0
- * @version  0.6.0
- */
-AlFile.setStylesheetFile('element/alchemy_file');
-
 /**
  * Getter for the drop target
  *
@@ -61,6 +52,15 @@ AlFile.addElementGetter('preview_element', '.al-file-preview');
  */
 AlFile.addElementGetter('remove_button', '.al-file-remove');
 
+/**
+ * Getter for the select button
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ */
+AlFile.addElementGetter('select_button', '.al-file-select');
+
 /**
  * Getter for the uploading-icon
  *
@@ -79,6 +79,15 @@ AlFile.addElementGetter('icon_uploading', '.uploading-icon');
  */
 AlFile.addElementGetter('icon_empty', '.empty-icon');
 
+/**
+ * Set the accepted types
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.1
+ * @version  0.7.1
+ */
+AlFile.setAttribute('accept');
+
 /**
  * Set the value
  *
@@ -135,7 +144,7 @@ AlFile.setMethod(function updatePreview(value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.0
- * @version  0.6.2
+ * @version  0.7.1
  */
 AlFile.setMethod(async function uploadFile(config) {
 
@@ -159,6 +168,10 @@ AlFile.setMethod(async function uploadFile(config) {
 		form_data.append('format', format);
 	}
 
+	if (this.accept) {
+		form_data.append('accept', this.accept);
+	}
+
 	let response;
 
 	try {
@@ -167,7 +180,15 @@ AlFile.setMethod(async function uploadFile(config) {
 			post : form_data,
 		});
 	} catch (err) {
-		console.error('Failed to upload file:', err);
+
+		let alchemy_field = this.queryUp('al-field');
+
+		if (alchemy_field) {
+			alchemy_field.showError(err);
+		} else {
+			console.error('Failed to upload file:', err);
+			alert('Failed to upload file: ' + err);
+		}
 	}
 
 	this.classList.remove('uploading');
@@ -245,6 +266,11 @@ AlFile.setMethod(function introduced() {
 		this.value = null;
 	});
 
+	if (this.select_button) {
+		this.select_button.addEventListener('click', e => {
+			this.showExistingFileSelection();
+		});
+	}
 });
 
 /**
@@ -265,11 +291,60 @@ AlFile.setMethod(function _getContent(callback) {
 			return callback(err);
 		}
 
-		console.log('Size:', info);
-
 		that.innerHTML = '<img class="final" src="/media/static/' + src + '?width=50%25" width=' + info.width + ' height=' + info.height +' style="width:400px">'
 		               + '<img class="placeholder" src="/media/static/' + src + '?width=20px">';
 
 		callback(null);
 	});
+});
+
+/**
+ * Select existing files
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.1
+ */
+AlFile.setMethod(async function showExistingFileSelection() {
+
+	let variables = {};
+
+	if (this.accept) {
+		let filters = {
+			type : this.accept,
+		};
+		
+		variables.filters = filters;
+	}
+
+	await hawkejs.scene.render('element/al_file_selection', variables);
+
+	let dialog_contents = document.querySelector('he-dialog [data-he-template="element/al_file_selection"]');
+
+	if (!dialog_contents) {
+		return;
+	}
+
+	let dialog = dialog_contents.queryParents('he-dialog'),
+	    button = dialog_contents.querySelector('.btn-apply');
+
+	dialog_contents.classList.add('default-form-editor');
+	hawkejs.scene.enableStyle('chimera/chimera');
+
+	button.addEventListener('click', e => {
+		e.preventDefault();
+
+		let table = dialog.querySelector('al-table');
+		
+		if (table) {
+			let row = table.active_row;
+
+			if (row && row.dataset.pk) {
+				this.value = row.dataset.pk;
+			}
+		}
+
+		dialog.remove();
+	});
+
 });

package/element/{al_ico_element.js → al_icon.js}

@@ -1,20 +1,13 @@
-/**
- * The al-ico element
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.6.0
- * @version  0.6.0
- */
-const Icon = Function.inherits('Alchemy.Element', 'AlIco');
+const BUSY = Symbol('busy');
 
 /**
- * The stylesheet to load for this element
+ * The al-icon element
  *
- * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.0
- * @version  0.6.0
+ * @version  0.7.0
  */
-Icon.setStylesheetFile('alchemy_icons');
+const Icon = Function.inherits('Alchemy.Element.Media.Base', 'AlIcon');
 
 /**
  * The source to use
@@ -45,15 +38,44 @@ Icon.setAttribute('icon-style');
  */
 Icon.setAttribute('icon-name');
 
+/**
+ * Extra options/flags
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ */
+Icon.setAttribute('icon-flags');
+
+/**
+ * Set the default role
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.7.1
+ * @version  0.7.1
+ */
+Icon.setRole('graphics-symbol');
+
+/**
+ * Refresh the icon when these attributes change
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.0
+ */
+Icon.addObservedAttribute(['icon-style', 'icon-name', 'icon-flags'], function onChange() {
+	this.refresh();
+});
+
 /**
  * The element is being retained
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.3
- * @version  0.6.3
+ * @version  0.7.0
  */
 Icon.setMethod(function retained() {
-	this.setCssClasses();
+	this.refresh(true);
 });
 
 /**
@@ -61,10 +83,44 @@ Icon.setMethod(function retained() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.3
- * @version  0.6.3
+ * @version  0.7.0
  */
 Icon.setMethod(function introduced() {
+	this.refresh();
+});
+
+/**
+ * Refresh the icon
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.0
+ * @version  0.7.1
+ *
+ * @param    {Boolean}   force
+ */
+Icon.setMethod(function refresh(force) {
+
+	if (this[BUSY] && !force) {
+		return;
+	}
+
+	if (this.role == 'graphics-symbol') {
+		this.role = 'graphics-symbol img';
+
+		if (!this.hasAttribute('aria-label')) {
+			this.setAttribute('aria-label', '');
+		}
+	}
+
+	if (!force && Blast.isNode) {
+		return;
+	}
+
+	this[BUSY] = true;
+
 	this.setCssClasses();
+
+	this[BUSY] = false;
 });
 
 /**
@@ -80,6 +136,8 @@ Icon.setMethod(function setIcon(info) {
 		return;
 	}
 
+	this[BUSY] = true;
+
 	if (typeof info == 'string') {
 		info = info.split(' ');
 
@@ -105,6 +163,8 @@ Icon.setMethod(function setIcon(info) {
 	if (!this.icon_style) {
 		this.icon_style = 'duotone';
 	}
+
+	this.refresh(true);
 });
 
 /**
@@ -143,4 +203,10 @@ Icon.setMethod(function setCssClasses() {
 
 	this.classList.add('fa-' + (this.icon_style || 'solid'));
 	this.classList.add('fa-' + this.icon_name);
+
+	let flags = (this.icon_flags || '').split(/\s+/);
+
+	for (let flag of flags) {
+		this.classList.add('fa-' + flag);
+	}
 });

package/element/al_image.js

@@ -3,11 +3,9 @@
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.4.1
- * @version  0.4.1
+ * @version  0.7.0
  */
-var AlImage = Function.inherits('Alchemy.Element.App', function AlImage() {
-	return AlImage.super.call(this);
-});
+const AlImage = Function.inherits('Alchemy.Element.Media.Base', 'AlImage');
 
 /**
  * CSS
@@ -35,7 +33,7 @@ AlImage.setMethod(function introduced() {
 
 	var placeholder = this.querySelector('.placeholder'),
 	    final = this.querySelector('.final');
-console.log('Waiting for onload');
+
 	final.onload = function() {
 		console.log('Final is loaded!');
 		final.style.opacity = 1;

package/element/al_svg.js

@@ -3,18 +3,9 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.5.1
- * @version  0.5.1
+ * @version  0.7.0
  */
-const Svg = Function.inherits('Alchemy.Element', 'AlSvg');
-
-/**
- * The stylesheet to load for this element
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.5.1
- * @version  0.5.1
- */
-Svg.setStylesheetFile('alchemy_svg');
+const Svg = Function.inherits('Alchemy.Element.Media.Base', 'AlSvg');
 
 /**
  * The location of the svg
@@ -30,7 +21,7 @@ Svg.setAttribute('src');
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.1
- * @version  0.5.1
+ * @version  0.7.1
  */
 Svg.setMethod(async function injectSvg() {
 
@@ -59,6 +50,29 @@ Svg.setMethod(async function injectSvg() {
 
 	this.innerHTML = contents;
 
+	if (this.role) {
+
+		// Do not allow `graphics-symbol` role, because it is not widely supported
+		// and google doesn't know it either
+		if (this.role == 'graphics-symbol') {
+			this.role = 'img';
+
+			if (!this.hasAttribute('aria-label')) {
+				this.setAttribute('aria-label', '');
+			}
+		}
+
+		let svg = this.querySelector('svg');
+
+		if (svg) {
+			svg.setAttribute('role', this.role);
+
+			if (this.hasAttribute('aria-label')) {
+				svg.setAttribute('aria-label', this.getAttribute('aria-label'));
+			}
+		}
+	}
+
 	if (this._resolve_me_too) {
 		this._resolve_me_too.resolve();
 	}

package/helper/media_helper.js

@@ -115,7 +115,7 @@ Media.setMethod(function loadIconFont() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.5.0
- * @version  0.6.2
+ * @version  0.7.1
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    image      The image identifier
@@ -160,6 +160,12 @@ Media.setMethod(function applyDirective(element, image, options) {
 		options.height = height;
 	}
 
+	if (options.lazy_load) {
+		if (!element.hasAttribute('loading')) {
+			element.setAttribute('loading', 'lazy');
+		}
+	}
+
 	let url = this.imageUrl(image, options),
 	    clone = url.clone();
 

package/helper/widgets/image_widget.js

@@ -16,12 +16,25 @@ const Image = Function.inherits('Alchemy.Widget', 'Image');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.0
- * @version  0.6.0
+ * @version  0.7.1
  */
 Image.constitute(function prepareSchema() {
 
 	this.schema.addField('image', 'File', {
+		description : 'Upload/select the image to display',
+		widget_config_editable: true,
+	});
+
+	this.schema.addField('width_hint', 'Number', {
+		description : 'Approximate maximum width of the image in pixels or as a percentage of the total page width.',
+		widget_config_editable: true,
+		default: '25%',
+	});
+
+	this.schema.addField('lazy_load', 'Boolean', {
+		description : 'Determines whether the image should be loaded lazily or not',
 		widget_config_editable: true,
+		default: true,
 	});
 });
 
@@ -30,7 +43,7 @@ Image.constitute(function prepareSchema() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.6.0
- * @version  0.6.4
+ * @version  0.7.1
  *
  * @param    {HTMLElement}   widget
  */
@@ -38,7 +51,18 @@ Image.setMethod(function populateWidget() {
 
 	let img = this.createElement('img');
 
-	this.hawkejs_renderer.helpers.Media.applyDirective(img, this.config.image);
+	let width_hint = this.config.width_hint,
+	    lazy_load = this.config.lazy_load;
+
+	if (width_hint === null || width_hint === '' || typeof width_hint == 'undefined') {
+		width_hint = '25%';
+	}
+
+	if (lazy_load == null) {
+		lazy_load = true;
+	}
+
+	this.hawkejs_renderer.helpers.Media.applyDirective(img, this.config.image, {width: width_hint, lazy_load});
 
 	this.widget.append(img);
 

package/helper_field/file_field_type.js

@@ -16,6 +16,48 @@ var FileField = Function.inherits('Alchemy.Field.ObjectId', 'File');
  */
 FileField.setProperty('deferCast', true);
 
+/**
+ * Get the accepted types
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.1
+ * @version  0.7.1
+ *
+ * @return   {Array|null}
+ */
+FileField.setMethod(function getAcceptedTypes() {
+
+	let accept = this.options?.accept;
+
+	if (!accept) {
+		return null;
+	}
+
+	accept = Array.cast(accept);
+
+	return accept;
+});
+
+/**
+ * Get the accepted types string, for the input element
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.7.1
+ * @version  0.7.1
+ *
+ * @return   {String|null}
+ */
+FileField.setMethod(function getAcceptedTypesString() {
+
+	let types = this.getAcceptedTypes();
+
+	if (!types?.length) {
+		return null;
+	}
+
+	return types.join(', ');
+});
+
 if (Blast.isBrowser) {
 	return;
 }

package/model/media_file_model.js

@@ -225,20 +225,33 @@ MediaFile.setMethod(function getFile(id, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.2.0
+ * @version  0.7.1
  *
  * @param    {String}   file      The path to the file, can be a URL
  * @param    {Object}   options
  * @param    {Function} callback
+ *
+ * @return   {Pledge}
  */
 MediaFile.setMethod(function addFile(file, options, callback) {
 
-	var that = this;
+	const that = this,
+	      pledge = new Pledge();
+
+	pledge.done(callback);
 
 	this.queue.add(function(done) {
 		that.getModel('MediaRaw').addFile(file, options, function(err, response) {
-			callback(err, response);
+
 			done();
+
+			if (err) {
+				pledge.reject(err);
+			} else {
+				pledge.resolve(response);
+			}
 		});
 	});
+
+	return pledge;
 });

package/model/media_raw_model.js

@@ -168,7 +168,7 @@ MediaRaw.Document.setMethod(function extraImportFromStream(input) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.4.2
+ * @version  0.7.1
  *
  * @param    {String}   file      The path to the file, can be a URL
  * @param    {Object}   options
@@ -185,6 +185,14 @@ MediaRaw.setMethod(function addFile(file, options, callback) {
 		options = {};
 	}
 
+	if (!options) {
+		options = {};
+	}
+
+	if (file && typeof file == 'object' && file instanceof Classes.Alchemy.Inode.File) {
+		file = file.path;
+	}
+
 	// If the given file is actually a url, we'll need to download it first
 	if (file.startsWith('http://') || file.startsWith('https://')) {
 

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "alchemy-media",
 	"description": "The media plugin for Alchemy",
-	"version": "0.6.4",
+	"version": "0.7.1",
 	"repository": {
 		"type" : "git",
-		"url"  : "https://github.com/skerit/alchemy-media.git"
+		"url"  : "https://github.com/11ways/alchemy-media.git"
 	},
 	"dependencies": {
 		"@11ways/exiv2" : "~0.6.4",

package/view/element/al_file.hwk

@@ -1,19 +1,52 @@
 <label class="al-file-drop-target">
 	<div class="al-file-preview"></div>
-	<al-ico class="uploading-icon fa-solid fa-spinner fa-spin-pulse"></al-ico>
-	<al-ico class="empty-icon fa-solid fa-file-arrow-up"><% if (self.value) $0.hidden = true %></al-ico>
-	<input type="file" tabindex="-1" class="al-file-input" hidden>
+
+	<al-icon
+		icon-name="spinner"
+		icon-style="duotone"
+		class="uploading-icon fa-spin-pulse"
+	></al-icon>
+
+	<al-icon
+		icon-name="cloud-arrow-up"
+		icon-style="duotone"
+		class="empty-icon"
+	><% if (self.value) $0.hidden = true %></al-icon>
+
+	<input
+		class="al-file-input"
+		type="file"
+		tabindex="-1"
+		accept={% self.accept %}
+		hidden
+	>
 </label>
 
 <div class="al-file-right">
 	<button class="al-file-choose-existing">
-		<al-ico class="fa-solid fa-file-image"></al-ico>
+		<al-icon
+			icon-name="image"
+			icon-style="duotone"
+		></al-icon>
 		{%t "select-uploaded-file" %}
 	</button>
 
 	<button class="al-file-remove">
 		<% if (!self.value) $0.hidden = true %>
-		<al-ico class="fa-solid fa-trash-can"></al-ico>
+		<al-icon
+			icon-name="trash-can"
+			icon-style="duotone"
+		></al-icon>
 		{%t "remove-current-file" %}
 	</button>
+
+	{% if Acl.hasPermission('media.recordsource') %}
+		<button class="al-file-select">
+			<al-icon
+				icon-name="gallery-thumbnails"
+				icon-style="duotone"
+			></al-icon>
+			{%t "select-existing-file" %}
+		</button>
+	{% /if %}
 </div>

package/view/element/al_file_selection.hwk

@@ -0,0 +1,36 @@
+<% makeDialog() %>
+<% addClass('alchemy-file-selection-dialog') %>
+
+<%
+
+fieldset = new Blast.Classes.Alchemy.Criteria.FieldSet('list', 'MediaFile');
+
+fieldset.addField('_id', {
+	view     : 'file_preview',
+	wrapper  : 'file_preview',
+	title    : 'Thumbnail',
+	filter   : false,
+	sortable : false,
+});
+
+fieldset.addField('filename');
+fieldset.addField('type');
+%>
+
+<div class="alchemy-file-selection-wrapper">
+
+	<al-table
+		id="al-file-selection-table"
+		purpose="view"
+		mode="inline"
+		page-size=20
+		show-filters
+		#filters={% filters %}
+		#fieldset={% fieldset %}
+		#recordsource={% {route: 'MediaFile#recordsource'} %}
+	></al-table>
+
+	<button class="btn btn-apply">
+		Apply
+	</button>
+</div>

package/view/form/inputs/edit/file.hwk

@@ -3,6 +3,7 @@ script('chimera/mediafield');
 style('chimera/mediafield');
 %>
 <al-file
-	value=<% value %>
 	class="alchemy-field-value"
+	value=<% value %>
+	accept={% alchemy_field.config.getAcceptedTypesString() %}
 ></al-file>

package/view/form/inputs/edit/file_preview.hwk

@@ -1,4 +1,4 @@
-<% style('element/alchemy_file') %>
+<% style('alchemy_media') %>
 
 <img
 	!Media={% value %}

package/view/form/inputs/view_inline/file.hwk

@@ -1,4 +1,4 @@
-<% style('element/alchemy_file') %>
+<% style('alchemy_media') %>
 
 {% if value %}
 	<img

package/view/form/inputs/view_inline/file_preview.hwk

@@ -1,4 +1,4 @@
-<% style('element/alchemy_file') %>
+<% style('alchemy_media') %>
 
 {% if value %}
 	<img

package/view/form/wrappers/edit/file_preview.hwk

@@ -1,5 +1,5 @@
 <div class="form-field-info">
-	<alchemy-label>
+	<al-label>
 		<span
 			data-he-name="field-title"
 			data-he-slot="field-title"
@@ -8,6 +8,6 @@
 			data-he-name="field-description"
 			data-he-slot="field-description"
 		><%= alchemy_field.field_description %></small>
-	</alchemy-label>
+	</al-label>
 </div>
 <div data-he-name="field"></div>

package/assets/stylesheets/alchemy_icons_fafree.scss

@@ -1,59 +0,0 @@
-@use "fontawesome6/fontawesome.scss";
-@use "fontawesome6/solid.scss";
-@use "fontawesome6/brands.scss";
-
-al-ico {
-	@extend %fa-icon;
-
-	&[type="arrow-left"] {
-		@extend .fas, .fa-angle-left;
-	}
-
-	&[type="arrow-left-double"] {
-		@extend .fas, .fa-angle-double-left;
-	}
-
-	&[type="arrow-right"] {
-		@extend .fas, .fa-angle-right;
-	}
-
-	&[type="arrow-right-double"] {
-		@extend .fas, .fa-angle-double-right;
-	}
-
-	&[type="sorting-arrow"] {
-		@extend .fas;
-
-		&.down {
-			@extend .fa-sort-alpha-up;
-		}
-
-		&.up {
-			@extend .fa-sort-alpha-down;
-		}
-	}
-
-	&[type="menu"] {
-		@extend .fas, .fa-bars;
-	}
-
-	&[type="edit"] {
-		@extend .fas, .fa-pencil-alt;
-	}
-
-	&[type="zoom-in"] {
-		@extend .fas, .fa-search-plus;
-	}
-
-	&[type="microphone"] {
-		@extend .fas, .fa-microphone-alt;
-	}
-
-	&[type="video"] {
-		@extend .fas, .fa-video;
-	}
-
-	&[type="plus"] {
-		@extend .fas, .fa-plus;
-	}
-}