Migrate link shares to array

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 278 insertions, 143 deletions

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 7603b058a96..6e3fce04dfe 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -43,8 +43,6 @@
 		showPending: false,
 
 		events: {
-			// enable/disable
-			'change .linkCheckbox': 'onLinkCheckBoxChange',
 			// open menu
 			'click .share-menu .icon-more': 'onToggleMenu',
 			// hide download
@@ -67,7 +65,11 @@
 			// note
 			'click .share-add': 'showNoteForm',
 			'click .share-note-delete': 'deleteNote',
-			'click .share-note-submit': 'updateNote'
+			'click .share-note-submit': 'updateNote',
+			// remove
+			'click .unshare': 'onUnshare',
+			// new share
+			'click .new-share': 'newShare',
 		},
 
 		initialize: function(options) {
@@ -89,10 +91,6 @@
 				view.render();
 			});
 
-			this.model.on('change:linkShare', function() {
-				view.render();
-			});
-
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
@@ -102,7 +100,6 @@
 			var clipboard = new Clipboard('.clipboardButton');
 			clipboard.on('success', function(e) {
 				var $menu = $(e.trigger);
-				var $linkTextMenu = $menu.parent().next('li.linkTextMenu')
 
 				$menu.tooltip('hide')
 					.attr('data-original-title', t('core', 'Copied!'))
@@ -143,46 +140,44 @@
 			});
 		},
 
-		onLinkCheckBoxChange: function() {
-			var $checkBox = this.$el.find('.linkCheckbox');
-			var $loading = $checkBox.siblings('.icon-loading-small');
+		newShare: function() {
+			var self = this;
+			var $loading = this.$el.find('.icon-loading-small').eq(0);
 			if(!$loading.hasClass('hidden')) {
+				// in process
 				return false;
 			}
-
-			if($checkBox.is(':checked')) {
-				if(this.configModel.get('enforcePasswordForPublicLink') === false) {
-					$loading.removeClass('hidden');
-					// this will create it
-					this.model.saveLinkShare();
-					$('.share-menu .icon-more').click();
-					$('.share-menu .icon-more + .popovermenu .clipboardButton').click();
-				} else {
-					// force the rendering of the menu
-					this.showPending = true;
-					this.render()
-					$('.share-menu .icon-more').click();
-					$('.share-menu .icon-more + .popovermenu input:eq(1)').focus()
-				}
-			} else {
-				if (this.model.get('linkShare').isLinkShare) {
-					$loading.removeClass('hidden');
-					this.model.removeLinkShare();
-				} else {
-					this.showPending = false;
-					this.render()
+			// hide all icons and show loading
+			this.$el.find('.icon').addClass('hidden');
+			$loading.removeClass('hidden');
+
+			this.model.saveLinkShare({}, {
+				success: function() {
+					$loading.addClass('hidden');
+					self.$el.find('.icon').removeClass('hidden');
+					self.render();
+				},
+				error: function(obj, msg) {
+					OC.Notification.showTemporary(t('core', 'Unable to create a link share'));
+					$loading.addClass('hidden');
+					self.$el.find('.icon').removeClass('hidden');
 				}
-			}
+			})
 		},
 
-		onLinkTextClick: function() {
-			var $el = this.$el.find('.linkText');
+		onLinkTextClick: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var $el = $li.find('.linkText');
 			$el.focus();
 			$el.select();
 		},
 
-		onHideDownloadChange: function() {
-			var $checkbox = this.$('.hideDownloadCheckbox');
+		onHideDownloadChange: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var shareId = $li.data('share-id');
+			var $checkbox = $li.find('.hideDownloadCheckbox');
 			$checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
 
 			var hideDownload = false;
@@ -191,41 +186,57 @@
 			}
 
 			this.model.saveLinkShare({
-				hideDownload: hideDownload
+				hideDownload: hideDownload,
+				cid: shareId
+			}, {
+				success: function() {
+					$checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+				},
+				error: function(obj, msg) {
+					OC.Notification.showTemporary(t('core', 'Unable to toggle this option'));
+					$checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+				}
 			});
 		},
 
-		onShowPasswordClick: function() {
-			this.$el.find('.linkPass').slideToggle(OC.menuSpeed);
-			this.$el.find('.linkPassMenu').toggleClass('hidden');
-			if(!this.$el.find('.showPasswordCheckbox').is(':checked')) {
+		onShowPasswordClick: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var shareId = $li.data('share-id');
+			$li.find('.linkPass').slideToggle(OC.menuSpeed);
+			$li.find('.linkPassMenu').toggleClass('hidden');
+			if(!$li.find('.showPasswordCheckbox').is(':checked')) {
 				this.model.saveLinkShare({
-					password: ''
+					password: '',
+					cid: shareId
 				});
 			} else {
 				if (!OC.Util.isIE()) {
-					this.$el.find('.linkPassText').focus();
+					$li.find('.linkPassText').focus();
 				}
 			}
 		},
 
 		onPasswordKeyUp: function(event) {
 			if(event.keyCode === 13) {
-				this.onPasswordEntered();
+				this.onPasswordEntered(event);
 			}
 		},
 
-		onPasswordEntered: function() {
-			var $loading = this.$el.find('.linkPassMenu .icon-loading-small');
+		onPasswordEntered: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var shareId = $li.data('share-id');
+			var $loading = $li.find('.linkPassMenu .icon-loading-small');
 			if (!$loading.hasClass('hidden')) {
 				// still in process
 				return;
 			}
-			var $input = this.$el.find('.linkPassText');
+			var $input = $li.find('.linkPassText');
 			$input.removeClass('error');
 			var password = $input.val();
 
-			if (this.$el.find('.linkPassText').attr('placeholder') === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
+			if ($li.find('.linkPassText').attr('placeholder') === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
 
 				// in IE9 the password might be the placeholder due to bugs in the placeholders polyfill
 				if(password === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
@@ -244,7 +255,8 @@
 				.addClass('inlineblock');
 
 			this.model.saveLinkShare({
-				password: password
+				password: password,
+				cid: shareId
 			}, {
 				complete: function(model) {
 					$loading.removeClass('inlineblock').addClass('hidden');
@@ -260,8 +272,11 @@
 			});
 		},
 
-		onAllowPublicEditingChange: function() {
-			var $checkbox = this.$('.publicEditingCheckbox');
+		onAllowPublicEditingChange: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var shareId = $li.data('share-id');
+			var $checkbox = $li.find('.publicEditingCheckbox');
 			$checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
 
 			var permissions = OC.PERMISSION_READ;
@@ -270,15 +285,28 @@
 			}
 
 			this.model.saveLinkShare({
-				permissions: permissions
+				permissions: permissions,
+				cid: shareId
+			}, {
+				success: function() {
+					$checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+				},
+				error: function(obj, msg) {
+					OC.Notification.showTemporary(t('core', 'Unable to toggle this option'));
+					$checkbox.siblings('.icon-loading-small').addClass('hidden').removeClass('inlineblock');
+				}
 			});
 		},
 
 
-		onPublicUploadChange: function(e) {
-			var permissions = e.currentTarget.value;
+		onPublicUploadChange: function(event) {
+			var $element = $(event.target);
+			var $li = $element.closest('li[data-share-id]');
+			var shareId = $li.data('share-id');
+			var permissions = event.currentTarget.value;
 			this.model.saveLinkShare({
-				permissions: permissions
+				permissions: permissions,
+				cid: shareId
 			});
 		},
 
@@ -386,46 +414,21 @@
 				&& this.model.createPermissionPossible()
 				&& this.configModel.isPublicUploadEnabled();
 
-			var publicUploadRWChecked = '';
-			var publicUploadRChecked = '';
-			var publicUploadWChecked = '';
-
-			switch (this.model.linkSharePermissions()) {
-				case OC.PERMISSION_READ:
-					publicUploadRChecked = 'checked';
-					break;
-				case OC.PERMISSION_CREATE:
-					publicUploadWChecked = 'checked';
-					break;
-				case OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE:
-					publicUploadRWChecked = 'checked';
-					break;
-			}
 
 			var publicEditingChecked = '';
 			if(this.model.isPublicEditingAllowed()) {
 				publicEditingChecked = 'checked="checked"';
 			}
 
-			var isLinkShare = this.model.get('linkShare').isLinkShare;
-			var isPasswordSet = !!this.model.get('linkShare').password;
 			var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
 			var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true;
-			var showPasswordCheckBox = isLinkShare
-				&& (   !this.configModel.get('enforcePasswordForPublicLink')
-					|| !this.model.get('linkShare').password);
 			var passwordPlaceholderInitial = this.configModel.get('enforcePasswordForPublicLink')
 				? PASSWORD_PLACEHOLDER_MESSAGE : PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL;
 
-			var showHideDownloadCheckbox = !this.model.isFolder();
-			var hideDownload = this.model.get('linkShare').hideDownload;
-
 			var publicEditable =
 				!this.model.isFolder()
-				&& isLinkShare
 				&& this.model.updatePermissionPossible();
 
-			var link = this.model.get('linkShare').link;
 			var social = [];
 			OC.Share.Social.Collection.each(function(model) {
 				var url = model.get('url');
@@ -439,60 +442,28 @@
 					newWindow: model.get('newWindow')
 				});
 			});
-
-			var defaultExpireDays = this.configModel.get('defaultExpireDate');
 			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
-			var hasExpireDate = !!this.model.get('linkShare').expiration || isExpirationEnforced;
-
-			var expireDate;
-			if (hasExpireDate) {
-				expireDate = moment(this.model.get('linkShare').expiration, 'YYYY-MM-DD').format('DD-MM-YYYY');
-			}
-
+			
 			// what if there is another date picker on that page?
 			var minDate = new Date();
-			var maxDate = null;
 			// min date should always be the next day
 			minDate.setDate(minDate.getDate()+1);
 
-			if(hasExpireDate) {
-				if(isExpirationEnforced) {
-					// TODO: hack: backend returns string instead of integer
-					var shareTime = this.model.get('linkShare').stime;
-					if (_.isNumber(shareTime)) {
-						shareTime = new Date(shareTime * 1000);
-					}
-					if (!shareTime) {
-						shareTime = new Date(); // now
-					}
-					shareTime = OC.Util.stripTime(shareTime).getTime();
-					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
-				}
-			}
 			$.datepicker.setDefaults({
-				minDate: minDate,
-				maxDate: maxDate
+				minDate: minDate
 			});
 
 			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
-			var popover = this.popoverMenuTemplate({
-				cid: this.model.get('linkShare').id,
+			var popoverBase = {
 				copyLabel: t('core', 'Copy link'),
 				social: social,
-
-				shareLinkURL: this.model.get('linkShare').link,
 				urlLabel: t('core', 'Link'),
-				showHideDownloadCheckbox: showHideDownloadCheckbox,
-				hideDownload: hideDownload,
 				hideDownloadLabel: t('core', 'Hide download'),
 				enablePasswordLabel: t('core', 'Password protect'),
 				passwordLabel: t('core', 'Password'),
-				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
 				passwordPlaceholderInitial: passwordPlaceholderInitial,
-				isPasswordSet: isPasswordSet || isPasswordEnabledByDefault || isPasswordEnforced,
-				showPasswordCheckBox: showPasswordCheckBox,
-				publicUpload: publicUpload && isLinkShare,
+				publicUpload: publicUpload,
 				publicEditing: publicEditable,
 				publicEditingChecked: publicEditingChecked,
 				publicEditingLabel: t('core', 'Allow editing'),
@@ -504,41 +475,40 @@
 				publicUploadRWValue: OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE,
 				publicUploadRValue: OC.PERMISSION_READ,
 				publicUploadWValue: OC.PERMISSION_CREATE,
-				publicUploadRWChecked: publicUploadRWChecked,
-				publicUploadRChecked: publicUploadRChecked,
-				publicUploadWChecked: publicUploadWChecked,
 				expireDateLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
-				hasExpireDate: hasExpireDate,
 				isExpirationEnforced: isExpirationEnforced,
 				isPasswordEnforced: isPasswordEnforced,
-				expireDate: expireDate,
 				defaultExpireDate: moment().add(1, 'day').format('DD-MM-YYYY'), // Can't expire today
-				shareNote: this.model.get('linkShare').note,
 				addNoteLabel: t('core', 'Note to recipient'),
-			});
+				unshareLabel: t('core', 'Unshare'),
+				newShareLabel: t('core', 'New share link'),
+			};
 
-			var pendingPopover = this.pendingPopoverMenuTemplate({
-				cid: this.model.get('linkShare').id,
+			var pendingPopoverBase = {
 				enablePasswordLabel: t('core', 'Password protect'),
 				passwordLabel: t('core', 'Password'),
-				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
 				passwordPlaceholderInitial: passwordPlaceholderInitial,
-				showPasswordCheckBox: showPasswordCheckBox,
 				isPasswordEnforced: isPasswordEnforced,
-			});
+			};
+
+			var linkShares = this.getShareeList();
+			if(_.isArray(linkShares)) {
+				for (var i = 0; i < linkShares.length; i++) {
+					var popover = this.getPopoverObject(linkShares[i])
+					var pendingPopover = this.getPendingPopoverObject(linkShares[i])
+					linkShares[i].popoverMenu = this.popoverMenuTemplate(_.extend({}, popoverBase, popover));
+					linkShares[i].pendingPopoverMenu = this.pendingPopoverMenuTemplate(_.extend({}, pendingPopoverBase, pendingPopover));
+				}
+			}
 
 			this.$el.html(linkShareTemplate({
-				cid: this.model.get('linkShare').id,
+				linkShares: linkShares,
 				shareAllowed: true,
-				isLinkShare: isLinkShare,
-				linkShareLabel: t('core', 'Share link'),
-				linkShareEnableLabel: t('core', 'Enable'),
-				popoverMenu: popover,
-				pendingPopoverMenu: pendingPopover,
-				showMenu: isLinkShare || this.showPending,
-				showPending: this.showPending && !isLinkShare
+				nolinkShares: linkShares.length === 0,
+				newShareLabel: t('core', 'Share link'),
+				newShareTitle: t('core', 'New share link'),
 			}));
 
 			this.delegateEvents();
@@ -555,9 +525,10 @@
 			var $element = $(event.target);
 			var $li = $element.closest('li[data-share-id]');
 			var $menu = $li.find('.sharingOptionsGroup .popovermenu');
+			var shareId = $li.data('share-id');
 
 			OC.showMenu(null, $menu);
-			this._menuOpen = $li.data('share-id');
+			this._menuOpen = shareId;
 		},
 
 		/**
@@ -635,24 +606,188 @@
 			var $element = $(event.target);
 			var li = $element.closest('li[data-share-id]');
 			var shareId = li.data('share-id');
+			var maxDate = $element.data('max-date');
 			var expirationDatePicker = '#expirationDatePicker-' + shareId;
 			var self = this;
 
 			$(expirationDatePicker).datepicker({
 				dateFormat : 'dd-mm-yy',
 				onSelect: function (expireDate) {
-					self.setExpirationDate(expireDate);
-				}
+					self.setExpirationDate(expireDate, shareId);
+				},
+				maxDate: maxDate
 			});
 			$(expirationDatePicker).datepicker('show');
 			$(expirationDatePicker).focus();
 
 		},
 
-		setExpirationDate: function(expireDate) {
-			this.model.saveLinkShare({expireDate: expireDate});
+		setExpirationDate: function(expireDate, shareId) {
+			this.model.saveLinkShare({expireDate: expireDate, cid: shareId});
 		},
 
+		/**
+		 * get an array of sharees' share properties
+		 *
+		 * @returns {Array}
+		 */
+		getShareeList: function() {
+			var shares = this.model.get('linkShares');
+
+			if(!this.model.hasLinkShares()) {
+				return [];
+			}
+
+			var list = [];
+			for(var index = 0; index < shares.length; index++) {
+				var share = this.getShareeObject(index);
+				// first empty {} is necessary, otherwise we get in trouble
+				// with references
+				list.push(_.extend({}, share));
+			}
+
+			return list;
+		},
+
+		/**
+		 *
+		 * @param {OC.Share.Types.ShareInfo} shareInfo
+		 * @returns {object}
+		 */
+		getShareeObject: function(shareIndex) {
+			var share = this.model.get('linkShares')[shareIndex];
+
+			return _.extend({}, share, {
+				cid: share.id,
+				shareAllowed: true,
+				linkShareLabel: share.label !== '' ? share.label : t('core', 'Share link'),
+				popoverMenu: {},
+				pendingPopoverMenu: {},
+				showPending: this.showPending
+			})
+		},
+
+		getPopoverObject: function(share) {
+			var publicUploadRWChecked = '';
+			var publicUploadRChecked = '';
+			var publicUploadWChecked = '';
+
+			switch (this.model.linkSharePermissions(share.id)) {
+				case OC.PERMISSION_READ:
+					publicUploadRChecked = 'checked';
+					break;
+				case OC.PERMISSION_CREATE:
+					publicUploadWChecked = 'checked';
+					break;
+				case OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE:
+					publicUploadRWChecked = 'checked';
+					break;
+			}
+	
+			var isPasswordSet = !!share.password;
+			var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true;
+			var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
+			var showPasswordCheckBox = !this.configModel.get('enforcePasswordForPublicLink') || !share.password;
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+			var defaultExpireDays = this.configModel.get('defaultExpireDate');
+			var hasExpireDate = !!share.expiration || isExpirationEnforced;
+			var hasExpireDate = false;
+
+			var expireDate;
+			if (hasExpireDate) {
+				expireDate = moment(share.expiration, 'YYYY-MM-DD').format('DD-MM-YYYY');
+			}
+
+			var showHideDownloadCheckbox = !this.model.isFolder();
+			var hideDownload = share.hideDownload;
+
+			var maxDate = null;
+
+			if(hasExpireDate) {
+				if(isExpirationEnforced) {
+					// TODO: hack: backend returns string instead of integer
+					var shareTime = share.stime;
+					if (_.isNumber(shareTime)) {
+						shareTime = new Date(shareTime * 1000);
+					}
+					if (!shareTime) {
+						shareTime = new Date(); // now
+					}
+					shareTime = OC.Util.stripTime(shareTime).getTime();
+					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
+				}
+			}
+
+			return {
+				cid: share.id,
+				shareLinkURL: share.url,
+				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
+				isPasswordSet: isPasswordSet || isPasswordEnabledByDefault || isPasswordEnforced,
+				showPasswordCheckBox: showPasswordCheckBox,
+				publicUploadRWChecked: publicUploadRWChecked,
+				publicUploadRChecked: publicUploadRChecked,
+				publicUploadWChecked: publicUploadWChecked,
+				hasExpireDate: hasExpireDate,
+				expireDate: expireDate,
+				shareNote: share.note,
+				hasNote: share.note !== '',
+				maxDate: maxDate,
+				showHideDownloadCheckbox: showHideDownloadCheckbox,
+				hideDownload: hideDownload,
+				newShareTitle: t('core', 'New share link'),
+			}
+		},
+
+		getPendingPopoverObject: function(share) {
+			var isPasswordSet = !!share.password;
+			var showPasswordCheckBox = !this.configModel.get('enforcePasswordForPublicLink') || !share.password;
+			var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink');
+
+			return {
+				cid: share.id,
+				enablePasswordLabel: t('core', 'Password protect'),
+				passwordLabel: t('core', 'Password'),
+				passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE,
+				showPasswordCheckBox: showPasswordCheckBox,
+				isPasswordEnforced: isPasswordEnforced,
+			}
+
+		},
+
+		onUnshare: function(event) {
+			event.preventDefault();
+			event.stopPropagation();
+			var self = this;
+			var $element = $(event.target);
+			if (!$element.is('a')) {
+				$element = $element.closest('a');
+			}
+
+			var $loading = $element.find('.icon-loading-small').eq(0);
+			if(!$loading.hasClass('hidden')) {
+				// in process
+				return false;
+			}
+			$loading.removeClass('hidden');
+
+			var $li = $element.closest('li[data-share-id]');
+
+			var shareId = $li.data('share-id');
+
+			self.model.removeShare(shareId, {
+				success: function() {
+					$li.remove();
+					self.render()
+				},
+				error: function() {
+					$loading.addClass('hidden');
+					OC.Notification.showTemporary(t('core', 'Could not unshare'));
+				}
+			});
+			return false;
+		},
+
+
 	});
 
 	OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView;