Resolve #825

plugins/nextcloud/index.php

@@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Nextcloud',
-		VERSION = '2.13',
+		VERSION = '2.14',
-		RELEASE  = '2022-12-16',
+		RELEASE  = '2023-01-04',
 		CATEGORY = 'Integrations',
 		DESCRIPTION = 'Integrate with Nextcloud v20+',
 		REQUIRED = '2.23.0';

plugins/nextcloud/js/message.js

@@ -120,6 +120,7 @@
 			view.message.subscribe(msg => {
 				view.nextcloudICS(null);
 				if (msg && cfg.CalDAV) {
+//					let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType);
 					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
 					if (ics && ics.download) {
 						// fetch it and parse the VEVENT

plugins/nextcloud/js/webdav.js

@@ -149,31 +149,14 @@ const
 				items.forEach(item => {
 					if (item.isFile) {
 						let li = document.createElement('li'),
-							btn = document.createElement('button');
+							cb = document.createElement('input');
 
 						li.item = item;
 						li.textContent = item.name.replace(/^.*\/([^/]+)$/, '$1');
 						li.dataset.icon = '🗎';
 
-						btn.name = 'select';
+						cb.type = 'checkbox';
-						btn.dataset.icon = '📎';
+						li.append(cb);
-						btn.textContent = 'attach';
-						btn.className = 'button-vue';
-						li.append(btn);
-
-						btn = document.createElement('button');
-						btn.name = 'share-internal';
-						btn.dataset.icon = '🔗';
-						btn.textContent = 'internal';
-						btn.className = 'button-vue';
-						li.append(btn);
-
-						btn = document.createElement('button');
-						btn.name = 'share-public';
-						btn.dataset.icon = '🔗';
-						btn.textContent = 'public';
-						btn.className = 'button-vue';
-						li.append(btn);
 
 						parent.append(li);
 					}
@@ -203,28 +186,42 @@ class NextcloudFilesPopupView extends rl.pluginPopupView {
 		});
 	}
 
-	onBuild(dom) {
+	attach() {
-		this.tree = dom.querySelector('#sm-nc-files-tree');
+		this.select = [];
-		this.tree.addEventListener('click', event => {
+		this.tree.querySelectorAll('input').forEach(input =>
-			let el = event.target;
+			input.checked && this.select.push(input.parentNode.item)
-			if (el.matches('button')) {
+		);
-				let parent = el.parentNode,
+		this.close();
-					item = parent.item;
+	}
-				if ('select' == el.name) {
+
-					this.select = this.files() ? [item] : parent.item_name;
+	shareInternal() {
+		this.select = [];
+		this.tree.querySelectorAll('input').forEach(input =>
+			input.checked && this.select.push({url:generateRemoteUrl(`/f/${input.parentNode.item.id}`)})
+		);
+		this.close();
+	}
+
+	sharePublic() {
+		const inputs = [...this.tree.querySelectorAll('input')],
+			loop = () => {
+				if (!inputs.length) {
 					this.close();
-				} else if ('share-internal' == el.name) {
+					return;
-					this.select = [{url:generateRemoteUrl(`/f/${item.id}`)}];
+				}
-					this.close();
+				const input = inputs.pop();
-				} else if ('share-public' == el.name) {
+				if (!input.checked) {
+					loop();
+				} else {
+					const item = input.parentNode.item;
 					if (item.shared) {
 						ncFetch(
 							shareUrl() + `?format=json&path=${encodeURIComponent(item.name)}&reshares=true`
 						)
 						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
 						.then(json => {
-							this.select = [{url:json.ocs.data[0].url}];
+							this.select.push({url:json.ocs.data[0].url});
-							this.close();
+							loop();
 //							json.data[0].password
 						});
 					} else {
@@ -246,10 +243,26 @@ class NextcloudFilesPopupView extends rl.pluginPopupView {
 						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
 						.then(json => {
 //							PUT /ocs/v2.php/apps/files_sharing/api/v1/shares/2 {"password":"ABC09"}
-							this.select = [{url:json.ocs.data.url}];
+							this.select.push({url:json.ocs.data.url});
-							this.close();
+							loop();
 						});
 					}
+				}
+			};
+
+		this.select = [];
+		loop();
+	}
+
+	onBuild(dom) {
+		this.tree = dom.querySelector('#sm-nc-files-tree');
+		this.tree.addEventListener('click', event => {
+			let el = event.target;
+			if (el.matches('button')) {
+				let parent = el.parentNode;
+				if ('select' == el.name) {
+					this.select = parent.item_name;
+					this.close();
 				} else if ('create' == el.name) {
 					let name = el.input.value.replace(/[|\\?*<":>+[]\/&\s]/g, '');
 					if (name.length) {

plugins/nextcloud/style.css

@@ -5,6 +5,7 @@
 	clear: right;
 	line-height: 2.5em;
 }
+#V-PopupsNextcloudFiles li input,
 #V-PopupsNextcloudFiles li button {
 	cursor: pointer;
 	float: right;

plugins/nextcloud/templates/PopupsNextcloudFiles.html

@@ -11,3 +11,8 @@
 -->
 	<ul id="sm-nc-files-tree"></ul>
 </div>
+<footer data-bind="visible:files">
+	<button data-bind="click:attach" name="select" data-icon="📎" class="button-vue">attach</button>
+	<button data-bind="click:shareInternal" name="share-internal" data-icon="🔗" class="button-vue">internal</button>
+	<button data-bind="click:sharePublic" name="share-public" data-icon="🔗" class="button-vue">public</button>
+</footer>