Migrate link shares to array

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

Author: skjnldsv

apps/files_sharing/css/sharetabview.scss

@@ -194,31 +194,29 @@
 		display: flex;
 		align-items: center;
 		white-space: nowrap;
-		// can edit label
-		> .shareOption > label {
-			padding: 13px;
-			padding-right: 0;
-		}
-		// more menu
-		> .share-menu  {
-			position: relative;
+
+		// icons
+		> .icon:not(.hidden),
+		.share-menu > .icon:not(.hidden) {
+			padding: 14px;
+			height: 44px;
+			width: 44px;
+			opacity: .5;
 			display: block;
-			.icon-more {
-				padding: 14px;
-				height: 44px;
-				width: 44px;
-				opacity: .5;
-				display: block;
-				cursor: pointer;
-			}
+			cursor: pointer;
+
 			&:hover,
 			&:focus,
 			&:active {
-				.icon-more {
-					opacity: .7;;
-				}
+				opacity: .7;;
 			}
 		}
+
+		// more menu
+		> .share-menu  {
+			position: relative;
+			display: block;
+		}
 	}
 	.username {
 		padding: 0 8px;

apps/files_sharing/js/share.js

@@ -193,15 +193,15 @@
 				var $tr = fileList.findFileEl(fileInfoModel.get('name'));
 
 				// We count email shares as link share
-				var hasLinkShare = shareModel.hasLinkShare();
+				var hasLinkShares = shareModel.hasLinkShares();
 				shareModel.get('shares').forEach(function (share) {
 					if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
-						hasLinkShare = true;
+						hasLinkShares = true;
 					}
 				});
 
 				OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel);
-				if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShare)) {
+				if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShares)) {
 					// remove icon, if applicable
 					OC.Share.markFileAsShared($tr, false, false);
 				}
@@ -249,15 +249,15 @@
 		 *
 		 * @param $tr file element of the file to update
 		 * @param {boolean} hasUserShares true if a user share exists
-		 * @param {boolean} hasLinkShare true if a link share exists
+		 * @param {boolean} hasLinkShares true if a link share exists
 		 *
 		 * @return {boolean} true if the icon was set, false otherwise
 		 */
-		_updateFileActionIcon: function($tr, hasUserShares, hasLinkShare) {
+		_updateFileActionIcon: function($tr, hasUserShares, hasLinkShares) {
 			// if the statuses are loaded already, use them for the icon
 			// (needed when scrolling to the next page)
-			if (hasUserShares || hasLinkShare || $tr.attr('data-share-recipient-data') || $tr.attr('data-share-owner')) {
-				OC.Share.markFileAsShared($tr, true, hasLinkShare);
+			if (hasUserShares || hasLinkShares || $tr.attr('data-share-recipient-data') || $tr.attr('data-share-owner')) {
+				OC.Share.markFileAsShared($tr, true, hasLinkShares);
 				return true;
 			}
 			return false;

core/js/share/sharedialoglinkshareview.handlebars

@@ -1,24 +1,29 @@
 {{#if shareAllowed}}
 <ul id="shareLink" class="shareWithList">
-	<li data-share-id="{{cid}}">
-		<div class="avatar icon-public-white"></div><span class="username" title="{{linkShareLabel}}">{{linkShareLabel}}</span>
-		<span class="sharingOptionsGroup">
-			<span class="shareOption">
-				<span class="icon-loading-small hidden"></span>
-				<input id="linkCheckbox-{{cid}}" {{#if isLinkShare}}checked="checked"{{/if}} type="checkbox" name="linkCheckbox" class="linkCheckbox permissions checkbox">
-				<label for="linkCheckbox-{{cid}}">{{linkShareEnableLabel}}</label>
+	{{#if nolinkShares}}
+		<li>
+			<div class="avatar icon-public-white"></div>
+			<span class="username">{{newShareLabel}}</span>
+			<span class="sharingOptionsGroup">
+				<span class="icon icon-add new-share" title="{{newShareTitle}}"></span>
+				<span class="icon icon-loading-small hidden"></span>
 			</span>
-			{{#if showMenu}}
+		</li>
+	{{/if}}
+	{{#each linkShares}}
+		<li data-share-id="{{cid}}">
+			<div class="avatar icon-public-white"></div><span class="username" title="{{linkShareLabel}}">{{linkShareLabel}}</span>
+			<span class="sharingOptionsGroup">
 				<div class="share-menu" tabindex="0"><span class="icon icon-more"></span>
 					{{#if showPending}}
 						{{{pendingPopoverMenu}}}
 					{{else}}
 						{{{popoverMenu}}}
 					{{/if}}
 				</div>
-			{{/if}}
-		</span>
-	</li>
+			</span>
+		</li>
+	{{/each}}
 </ul>
 {{else}}
 {{#if noSharingPlaceholder}}<input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{noSharingPlaceholder}}" disabled="disabled"/>{{/if}}

core/js/share/sharedialoglinkshareview_popover_menu.handlebars

@@ -6,6 +6,13 @@
 				<span>{{copyLabel}}</span>
 			</a>
 		</li>
+		<li>
+			<a href="#" class="new-share">
+				<span class="icon-loading-small hidden"></span>
+				<span class="icon icon-add"></span>
+				<span>{{newShareTitle}}</span>
+			</a>
+		</li>
 		<li class="hidden linkTextMenu">
 			<span class="menuitem icon-link-text">
 				<input id="linkText-{{cid}}" class="linkText" type="text" readonly="readonly" value="{{shareLinkURL}}" />
@@ -70,14 +77,15 @@
 		<li>
 			<span class="shareOption menuitem">
 				<input id="expireDate-{{cid}}" type="checkbox" name="expirationDate" class="expireDate checkbox"
-				{{#if hasExpireDate}}checked="checked"{{/if}} {{#if isExpirationEnforced}}disabled="disabled"{{/if}}" />
+				{{#if hasExpireDate}}checked="checked"{{/if}} {{#if isExpirationEnforced}}disabled="disabled"{{/if}} />
 				<label for="expireDate-{{cid}}">{{expireDateLabel}}</label>
 			</span>
 		</li>
 		<li class="{{#unless hasExpireDate}}hidden{{/unless}}">
 			<span class="menuitem icon-expiredate expirationDateContainer-{{cid}}">
 				<label for="expirationDatePicker-{{cid}}" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>
-				<input id="expirationDatePicker-{{cid}}" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{#if hasExpireDate}}{{expireDate}}{{else}}{{defaultExpireDate}}{{/if}}" />
+				<input id="expirationDatePicker-{{cid}}" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}"
+					value="{{#if hasExpireDate}}{{expireDate}}{{else}}{{defaultExpireDate}}{{/if}}" data-max-date="{{maxDate}}" />
 			</span>
 			</li>
 		<li>
@@ -88,7 +96,7 @@
 				<input type="button" class="share-note-delete icon-delete">
 			</a>
 		</li>
-		<li class="share-note-form share-note-link hidden">
+		<li class="share-note-form share-note-link {{#unless hasNote}}hidden{{/unless}}">
 			<span class="menuitem icon-note">
 				<textarea class="share-note">{{shareNote}}</textarea>
 				<input type="submit" class="icon-confirm share-note-submit" value="" id="add-note-{{shareId}}" />
@@ -102,5 +110,8 @@
 				</a>
 			</li>
 		{{/each}}
+		<li>
+			<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>
+		</li>
 	</ul>
 </div>

core/js/share/sharedialogshareelistview.handlebars

@@ -15,7 +15,7 @@
 				</div>
 			</span>
 		</li>
-		{{/each}}
+	{{/each}}
 	{{#each linkReshares}}
 		<li data-share-id="{{shareId}}" data-share-type="{{shareType}}">
 			<div class="avatar" data-username="{{shareInitiator}}"></div>