From c88b6b608a7170c3c89b9b2bcdb41b69bcc3ef21 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent22@users.noreply.github.com>
Date: Tue, 18 Jul 2023 18:31:57 +0100
Subject: [PATCH] Desktop: Enable share permission handling for Joplin Cloud

---
 .../ShareFolderDialog/ShareFolderDialog.tsx   | 16 +++++++-----
 packages/app-desktop/runForTesting.sh         | 26 +++++++------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx b/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx
index 1020d1041..4e31ec9ef 100644
--- a/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx
+++ b/packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx
@@ -96,6 +96,7 @@ interface Props {
 	onClose(): void;
 	shares: StateShare[];
 	shareUsers: Record<string, StateShareUser[]>;
+	isJoplinCloud: boolean;
 }
 
 interface RecipientDeleteEvent {
@@ -111,12 +112,12 @@ enum ShareState {
 function ShareFolderDialog(props: Props) {
 	const permissionOptions: DropdownOptions = {
 		'can_read': _('Can view'),
-		'can_read_and_write': _('Can edit'),
+		'can_read_and_write': _('Can view and edit'),
 	};
 
 	const [folder, setFolder] = useState<FolderEntity>(null);
 	const [recipientEmail, setRecipientEmail] = useState<string>('');
-	const [recipientPermissions, setRecipientPermissions] = useState<string>('can_read');
+	const [recipientPermissions, setRecipientPermissions] = useState<string>('can_read_and_write');
 	const [latestError, setLatestError] = useState<Error>(null);
 	const [share, setShare] = useState<StateShare>(null);
 	const [shareUsers, setShareUsers] = useState<StateShareUser[]>([]);
@@ -148,8 +149,7 @@ function ShareFolderDialog(props: Props) {
 	useEffect(() => {
 		const s = props.shares.find(s => s.folder_id === props.folderId);
 		setShare(s);
-		// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
-	}, [props.shares]);
+	}, [props.shares, props.folderId]);
 
 	useEffect(() => {
 		if (!share) return;
@@ -261,12 +261,14 @@ function ShareFolderDialog(props: Props) {
 	function renderAddRecipient() {
 		const disabled = shareState !== ShareState.Idle;
 
+		const dropdown = !props.isJoplinCloud ? null : <Dropdown className="permission-dropdown" options={permissionOptions} value={recipientPermissions} onChange={recipientPermissions_change}/>;
+
 		return (
 			<StyledAddRecipient>
 				<StyledFormLabel>{_('Add recipient:')}</StyledFormLabel>
 				<StyledRecipientControls>
 					<StyledRecipientInput disabled={disabled} type="email" placeholder="example@domain.com" value={recipientEmail} onChange={recipientEmail_change} />
-					<Dropdown className="permission-dropdown" options={permissionOptions} value={recipientPermissions} onChange={recipientPermissions_change}/>
+					{dropdown}
 					<Button size={ButtonSize.Small} disabled={disabled} title={_('Share')} onClick={shareRecipient_click}></Button>
 				</StyledRecipientControls>
 			</StyledAddRecipient>
@@ -304,11 +306,12 @@ function ShareFolderDialog(props: Props) {
 
 		const permission = shareUser.can_write ? 'can_read_and_write' : 'can_read';
 		const enabled = !recipientsBeingUpdated[shareUser.id];
+		const dropdown = !props.isJoplinCloud ? null : <Dropdown disabled={!enabled} className="permission-dropdown" value={permission} options={permissionOptions} variant={DropdownVariant.NoBorder} onChange={event => recipient_permissionChange(shareUser.id, event.value)}/>;
 
 		return (
 			<StyledRecipient key={shareUser.user.email} index={index}>
 				<StyledRecipientName>{shareUser.user.email}</StyledRecipientName>
-				<Dropdown disabled={!enabled} className="permission-dropdown" value={permission} options={permissionOptions} variant={DropdownVariant.NoBorder} onChange={event => recipient_permissionChange(shareUser.id, event.value)}/>
+				{dropdown}
 				<StyledRecipientStatusIcon title={statusToMessage[shareUser.status]} className={statusToIcon[shareUser.status]}></StyledRecipientStatusIcon>
 				<Button disabled={!enabled} size={ButtonSize.Small} iconName="far fa-times-circle" onClick={() => recipient_delete({ shareUserId: shareUser.id })}/>
 			</StyledRecipient>
@@ -404,6 +407,7 @@ const mapStateToProps = (state: State) => {
 	return {
 		shares: state.shareService.shares,
 		shareUsers: state.shareService.shareUsers,
+		isJoplinCloud: state.settings['sync.target'] === 10,
 	};
 };
 
diff --git a/packages/app-desktop/runForTesting.sh b/packages/app-desktop/runForTesting.sh
index 7a1688007..7396869ca 100755
--- a/packages/app-desktop/runForTesting.sh
+++ b/packages/app-desktop/runForTesting.sh
@@ -56,6 +56,7 @@ fi
 
 COMMANDS=($(echo $2 | tr "," "\n"))
 PROFILE_DIR=~/.config/joplindev-desktop-$USER_PROFILE_NUM
+SYNC_TARGET=9
 
 CMD_FILE="$SCRIPT_DIR/runForTestingCommands-$USER_PROFILE_NUM.txt"
 rm -f "$CMD_FILE"
@@ -84,18 +85,16 @@ do
 		USER_EMAIL="user$USER_NUM@example.com"
 		rm -rf "$PROFILE_DIR"
 
-		# rm -rf "$HOME/Temp/SyncTestE2EE copy"
-		# rsync -a "$HOME/Temp/SyncTestE2EE/" "$HOME/Temp/SyncTestE2EE copy/"
-
-		# echo "config sync.target 2" >> "$CMD_FILE" 
-		# echo "config sync.2.path \"$HOME/Temp/SyncTestE2EE copy/\"" >> "$CMD_FILE" 
-
 		echo "config keychain.supported 0" >> "$CMD_FILE" 
-		echo "config sync.target 10" >> "$CMD_FILE" 
-		# echo "config sync.10.path http://api.joplincloud.local:22300" >> "$CMD_FILE" 
-		echo "config sync.10.username $USER_EMAIL" >> "$CMD_FILE" 
-		echo "config sync.10.password 111111" >> "$CMD_FILE"
-	
+		echo "config sync.target $SYNC_TARGET" >> "$CMD_FILE" 
+		echo "config sync.$SYNC_TARGET.username $USER_EMAIL" >> "$CMD_FILE" 
+		echo "config sync.$SYNC_TARGET.password 111111" >> "$CMD_FILE"
+
+		if [[ $SYNC_TARGET = 9 ]]; then
+			echo "config sync.$SYNC_TARGET.path http://api.joplincloud.local:22300" >> "$CMD_FILE" 
+			echo "config sync.$SYNC_TARGET.userContentPath http://joplinusercontent.local:22300" >> "$CMD_FILE" 
+		fi
+
 	elif [[ $CMD == "e2ee" ]]; then
 	
 		echo "e2ee enable --password 111111" >> "$CMD_FILE" 
@@ -104,11 +103,6 @@ do
 	
 		echo "sync --use-lock 0" >> "$CMD_FILE" 
 
-	# elif [[ $CMD == "generatePpk" ]]; then
-	
-	# 	echo "e2ee generate-ppk --password 111111" >> "$CMD_FILE" 
-	# 	echo "sync" >> "$CMD_FILE" 
-
 	else
 	
 		echo "Unknown command: $CMD"