Nmc/optimized sharing

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>MagentaCLOUD sharing</name>
     <summary>Customisation of sharing.</summary>
     <description><![CDATA[MagentaCLOUD sharing handling with changed sidebars and views.]]></description>
-    <version>2.0.1</version>
+    <version>3.0.1</version>
     <licence>agpl</licence>
     <author mail="aleksei.efremov@t-systems.com">Aleksei Efremov</author>
     <namespace>Nmcsharing</namespace>

l10n/de.js

@@ -1,20 +1,33 @@
 OC.L10N.register(
 	'nmcsharing',
 	{
-		Sharing: 'Teilen',
+		'Sharing': 'Teilen',
 		'Add link': 'Link erstellen',
+		'Add new link': 'Neuen Link erstellen',
 		'Read only': 'Nur lesen',
 		'Can edit': 'Kann bearbeiten',
 		'File drop': 'Sammelbox',
-		User: 'Benutzer',
-		Permissions: 'Berechtigungen',
+		'User': 'Benutzer',
+		'Permissions': 'Berechtigungen',
 		'Read, write and upload': 'Kann bearbeiten',
 		'Read and write': 'Kann bearbeiten',
 		'File drop (upload only)': 'Sammelbox',
 		'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.': 'Bei der Sammelbox ist nur das Hochladen erlaubt. Nur Sie sehen Dateien und Ordner die hochgeladen worden sind.',
-		Advanced: 'Erweiterte',
+		'Advanced': 'Erweiterte',
 		'Set password': 'Passwortschutz',
 		'Your shares': 'Ihre Freigaben',
+		'Manage access': 'Zugriff verwalten',
+		'Send': 'Send',
+		'Send link via E-Mail': 'Link per E-Mail senden',
+		'Links sent via E-Mail': 'Links per E-Mail versandt',
+		'Accept settings': 'Übernehmen',
+		'Or': 'Oder',
+		'Links to Copy': 'Links zum Kopieren',
+		'Anyone with the link can edit': 'Jeder mit dem Link kann bearbeiten',
+		'Anyone with the link can only view': 'Jeder mit dem Link kann nur anzeigen',
+		'Anyone with the link can file drop': 'Jeder mit dem Link kann Dateien hinzufügen',
+		'Create new link': 'Neuen Link erstellen',
+		'Shares': 'Geteilte Inhalte',
 		'No shares created yet.': 'Noch keine Freigaben erstellt.',
 		'Advanced permissions': 'Erweiterte Berechtigungen',
 		'Allow resharing': 'Weiterteilen erlauben',

l10n/de.json

@@ -1,27 +1,56 @@
 {
 	"translations": {
 		"Sharing": "Teilen",
+		"Manage shares": "Freigaben verwalten",
 		"Add link": "Link erstellen",
+		"Add new link": "Neuen Link erstellen",
 		"Read only": "Nur lesen",
 		"Can edit": "Kann bearbeiten",
 		"File drop": "Sammelbox",
 		"User": "Benutzer",
 		"Permissions": "Berechtigungen",
+		"Shared with me": "Mit mir geteilt",
 		"Read, write and upload": "Kann bearbeiten",
 		"Read and write": "Kann bearbeiten",
 		"File drop (upload only)": "Sammelbox",
 		"With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.": "Bei der Sammelbox ist nur das Hochladen erlaubt. Nur Sie sehen Dateien und Ordner die hochgeladen worden sind.",
-		"Advanced": "Erweiterte",
-		"Set password": "Passwortschutz",
+		"Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass beim internen teilen, also dem Teilen an andere MagentaCLOUD Nutzer, die Sammelbox nicht verfügbar ist.",
+		"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass das Weiterteilen, nur beim internen Teilen, also dem Teilen an andere MagentaCLOUD Nutzer, verfügbar ist.",
+		"Advanced settings": "Erweiterte Einstellungen",
+		"Set password": "Passwort setzen",
 		"Your shares": "Ihre Freigaben",
+		"Manage access": "Zugriff verwalten",
+		"Here you can see who has access to your file/folder.": "Hier sehen Sie wer Zugriff auf Ihre Datei/Ihren Ordner hat.",
+		"You haven't shared your file/folder yet. Share to give others access.": "Sie haben Ihre Datei/Ihren Ordner noch nicht geteilt. Teilen Sie um Anderen Zugriff zu geben.",
+		"Send": "Senden",
+		"Send link via E-Mail": "Link per E-Mail senden",
+		"Links sent via E-Mail": "Links per E-Mail versandt",
+		"Accept settings": "Übernehmen",
+		"or": "oder",
+		"Link to \"{fileName}\" was sent.": "Link zu \"{fileName}\" gesendet.",
+		"To": "An",
+		"Link to copy": "Link zum Kopieren",
+		"Copy": "Kopieren",
+		"Copied": "Kopiert",
+		"Anyone with the link can": "Jeder mit dem Link kann",
+		"only view": "nur anzeigen",
+		"edit": "bearbeiten",
+		"Anyone with the link can edit": "Jeder mit dem Link kann bearbeiten",
+		"Anyone with the link can only view": "Jeder mit dem Link kann nur anzeigen",
+		"Anyone with the link can file drop": "Jeder mit dem Link kann Dateien hinzufügen",
+		"Create new link": "Neuen Link erstellen",
+		"Shares": "Geteilte Inhalte",
 		"No shares created yet.": "Noch keine Freigaben erstellt.",
 		"Advanced permissions": "Erweiterte Berechtigungen",
 		"Allow resharing": "Weiterteilen erlauben",
 		"Set download limit": "Downloads begrenzen",
 		"Resharing is allowed": "Weiterteilen ist erlaubt",
 		"You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.": "Sie können Links erstellen oder Freigaben per Mail versenden. Wenn Sie MagentaCLOUD Nutzer einladen, bieten sich Ihnen mehr Möglichkeiten der Zusammenarbeit.",
 		"Share updated": "Freigabe aktualisiert",
-		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "Diese Freigabe ist auf {limit} Downloads beschränkt. Es sind noch {downloadsLeft} Downloads zugelassen."
+		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "Diese Freigabe ist auf {limit} Downloads beschränkt. Es sind noch {downloadsLeft} Downloads zugelassen.",
+		"Deny download": "Download verhindern",
+		"Name, email": "Name, E-Mail-Adresse",
+		"Password must be at least 6 characters long": "Passwort muss mindestens 6 Zeichen lang sein"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }

l10n/de_DE.json

@@ -1,27 +1,56 @@
 {
 	"translations": {
 		"Sharing": "Teilen",
+		"Manage shares": "Zugriff verwalten",
 		"Add link": "Link erstellen",
+		"Add new link": "Neuen Link erstellen",
 		"Read only": "Nur lesen",
 		"Can edit": "Kann bearbeiten",
 		"File drop": "Sammelbox",
 		"User": "Benutzer",
 		"Permissions": "Berechtigungen",
+		"Shared with me": "Mit mir geteilt",
 		"Read, write and upload": "Kann bearbeiten",
 		"Read and write": "Kann bearbeiten",
 		"File drop (upload only)": "Sammelbox",
 		"With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.": "Bei der Sammelbox ist nur das Hochladen erlaubt. Nur Sie sehen Dateien und Ordner die hochgeladen worden sind.",
-		"Advanced": "Erweiterte",
-		"Set password": "Passwortschutz",
+		"Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass beim internen teilen, also dem Teilen an andere MagentaCLOUD Nutzer, die Sammelbox nicht verfügbar ist.",
+		"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Bitte beachten sie, dass das Weiterteilen, nur beim internen Teilen, also dem Teilen an andere MagentaCLOUD Nutzer, verfügbar ist.",
+		"Advanced settings": "Erweiterte Einstellungen",
+		"Set password": "Passwort setzen",
 		"Your shares": "Ihre Freigaben",
+		"Manage access": "Zugriff verwalten",
+		"Here you can see who has access to your file/folder.": "Hier sehen Sie wer Zugriff auf Ihre Datei/Ihren Ordner hat.",
+		"You haven't shared your file/folder yet. Share to give others access.": "Sie haben Ihre Datei/Ihren Ordner noch nicht geteilt. Teilen Sie um Anderen Zugriff zu geben.",
+		"Send": "Senden",
+		"Send link via E-Mail": "Link per E-Mail senden",
+		"Links sent via E-Mail": "Links per E-Mail versandt",
+		"Accept settings": "Übernehmen",
+		"or": "oder",
+		"Link to \"{fileName}\" was sent.": "Link zu \"{fileName}\" gesendet.",
+		"To": "An",
+		"Link to copy": "Link zum Kopieren",
+		"Copy": "Kopieren",
+		"Copied": "Kopiert",
+		"Anyone with the link can": "Jeder mit dem Link kann",
+		"only view": "nur anzeigen",
+		"edit": "bearbeiten",
+		"Anyone with the link can edit": "Jeder mit dem Link kann bearbeiten",
+		"Anyone with the link can only view": "Jeder mit dem Link kann nur anzeigen",
+		"Anyone with the link can file drop": "Jeder mit dem Link kann Dateien hinzufügen",
+		"Create new link": "Neuen Link erstellen",
+		"Shares": "Geteilte Inhalte",
 		"No shares created yet.": "Noch keine Freigaben erstellt.",
 		"Advanced permissions": "Erweiterte Berechtigungen",
 		"Allow resharing": "Weiterteilen erlauben",
 		"Set download limit": "Downloads begrenzen",
 		"Resharing is allowed": "Weiterteilen ist erlaubt",
 		"You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.": "Sie können Links erstellen oder Freigaben per Mail versenden. Wenn Sie MagentaCLOUD Nutzer einladen, bieten sich Ihnen mehr Möglichkeiten der Zusammenarbeit.",
 		"Share updated": "Freigabe aktualisiert",
-		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "Diese Freigabe ist auf {limit} Downloads beschränkt. Es sind noch {downloadsLeft} Downloads zugelassen."
+		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "Diese Freigabe ist auf {limit} Downloads beschränkt. Es sind noch {downloadsLeft} Downloads zugelassen.",
+		"Deny download": "Download verhindern",
+		"Name, email": "Name, E-Mail-Adresse",
+		"Password must be at least 6 characters long": "Passwort muss mindestens 6 Zeichen lang sein"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }

l10n/en.json

@@ -1,27 +1,56 @@
 {
 	"translations": {
 		"Sharing": "Sharing",
+		"Manage shares": "Manage shares",
 		"Add link": "Add link",
+		"Add new link": "Add new link",
 		"Read only": "Read only",
 		"Can edit": "Can edit",
 		"File drop": "File drop",
 		"User": "User",
 		"Permissions": "Permissions",
+		"Shared with me": "Shared with me",
 		"Read, write and upload": "Read, write and upload",
 		"Read and write": "Read and write",
 		"File drop (upload only)": "File drop (upload only)",
 		"With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.": "With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.",
-		"Advanced": "Advanced",
+		"Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
+		"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
+		"Advanced settings": "Advanced settings",
 		"Set password": "Set password",
 		"Your shares": "Your shares",
+		"Manage access": "Manage Access",
+		"Here you can see who has access to your file/folder.": "Here you can see who has access to your file/folder.",
+		"You haven't shared your file/folder yet. Share to give others access.": "You haven't shared your file/folder yet. Share to give others access.",
+		"Send": "Send",
+		"Send link via E-Mail": "Send link via E-Mail",
+		"Links sent via E-Mail": "Links sent via E-Mail",
+		"Accept settings": "Accept settings",
+		"or": "or",
+		"Link to \"{fileName}\" was sent.": "Link to \"{fileName}\" was sent.",
+		"To": "To",
+		"Link to copy": "Link to Copy",
+		"Copy": "Copy",
+		"Copied": "Copied",
+		"Anyone with the link can": "Anyone with the link can",
+		"only view": "only view",
+		"edit": "edit",
+		"Anyone with the link can edit": "Anyone with the link can edit",
+		"Anyone with the link can only view": "Anyone with the link can only view",
+		"Anyone with the link can file drop": "Anyone with the link can file drop",
+		"Create new link": "Create new link",
+		"Shares": "Shares",
 		"No shares created yet.": "No shares created yet.",
 		"Advanced permissions": "Advanced permissions",
 		"Allow resharing": "Allow resharing",
 		"Set download limit": "Set download limit",
 		"Resharing is allowed": "Resharing is allowed",
 		"You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.": "You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.",
 		"Share updated": "Share updated",
-		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed."
+		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.",
+		"Deny download": "Deny download",
+		"Name, email": "Name, email",
+		"Password must be at least 6 characters long": "Password must be at least 6 characters long"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }

l10n/en_GB.js

@@ -1,20 +1,33 @@
 OC.L10N.register(
 	'nmcsharing',
 	{
-		Sharing: 'Sharing',
+		'Sharing': 'Sharing',
 		'Add link': 'Add link',
+		'Add new link': 'Add new link',
 		'Read only': 'Read only',
 		'Can edit': 'Can edit',
 		'File drop': 'File drop',
-		User: 'User',
-		Permissions: 'Permissions',
+		'User': 'User',
+		'Permissions': 'Permissions',
 		'Read, write and upload': 'Read, write and upload',
 		'Read and write': 'Read and write',
 		'File drop (upload only)': 'File drop (upload only)',
 		'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.': 'With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.',
-		Advanced: 'Advanced',
+		'Advanced': 'Advanced',
 		'Set password': 'Set password',
 		'Your shares': 'Your shares',
+		'Manage access': 'Manage Access',
+		'Send': 'Send',
+		'Send link via E-Mail': 'Send link via E-Mail',
+		'Links sent via E-Mail': 'Links sent via E-Mail',
+		'Accept settings': 'Accept settings',
+		'Or': 'Or',
+		'Links to Copy': 'Links to Copy',
+		'Anyone with the link can edit': 'Anyone with the link can edit',
+		'Anyone with the link can only view': 'Anyone with the link can only view',
+		'Anyone with the link can file drop': 'Anyone with the link can file drop',
+		'Create new link': 'Create new link',
+		'Shares': 'Shares',
 		'No shares created yet.': 'No shares created yet.',
 		'Advanced permissions': 'Advanced permissions',
 		'Allow resharing': 'Allow resharing',

l10n/en_GB.json

@@ -1,27 +1,56 @@
 {
 	"translations": {
 		"Sharing": "Sharing",
+		"Manage shares": "Manage shares",
 		"Add link": "Add link",
+		"Add new link": "Add new link",
 		"Read only": "Read only",
 		"Can edit": "Can edit",
 		"File drop": "File drop",
 		"User": "User",
 		"Permissions": "Permissions",
+		"Shared with me": "Shared with me",
 		"Read, write and upload": "Read, write and upload",
 		"Read and write": "Read and write",
 		"File drop (upload only)": "File drop (upload only)",
 		"With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.": "With File drop, only uploading is allowed. Only you can see files and folders that have been uploaded.",
-		"Advanced": "Advanced",
+		"Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that file drop is not available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
+		"Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.": "Please note that resharing is only available for internal sharing, i.e. sharing with other MagentaCLOUD users.",
+		"Advanced settings": "Advanced settings",
 		"Set password": "Set password",
 		"Your shares": "Your shares",
+		"Manage access": "Manage Access",
+		"Here you can see who has access to your file/folder.": "Here you can see who has access to your file/folder.",
+		"You haven't shared your file/folder yet. Share to give others access.": "You haven't shared your file/folder yet. Share to give others access.",
+		"Send": "Send",
+		"Send link via E-Mail": "Send link via E-Mail",
+		"Links sent via E-Mail": "Links sent via E-Mail",
+		"Accept settings": "Accept settings",
+		"or": "or",
+		"Link to \"{fileName}\" was sent.": "Link to \"{fileName}\" was sent.",
+		"To": "To",
+		"Link to copy": "Link to Copy",
+		"Copy": "Copy",
+		"Copied": "Copied",
+		"Anyone with the link can": "Anyone with the link can",
+		"only view": "only view",
+		"edit": "edit",
+		"Anyone with the link can edit": "Anyone with the link can edit",
+		"Anyone with the link can only view": "Anyone with the link can only view",
+		"Anyone with the link can file drop": "Anyone with the link can file drop",
+		"Create new link": "Create new link",
+		"Shares": "Shares",
 		"No shares created yet.": "No shares created yet.",
 		"Advanced permissions": "Advanced permissions",
 		"Allow resharing": "Allow resharing",
 		"Set download limit": "Set download limit",
 		"Resharing is allowed": "Resharing is allowed",
 		"You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.": "You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.",
 		"Share updated": "Share updated",
-		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed."
+		"This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.": "This share was limited to {limit} downloads. There is still {downloadsLeft} left allowed.",
+		"Deny download": "Deny download",
+		"Name, email": "Name, email",
+		"Password must be at least 6 characters long": "Password must be at least 6 characters long"
 	},
 	"pluralForm": "nplurals=2; plural=(n != 1);"
 }

lib/Listener/BeforeTemplateRenderedListener.php

@@ -41,7 +41,8 @@ public function handle(Event $event): void {
 
 		// you can add additional styles, links and scripts before rendering
 		// keep src for future use:   \OCP\Util::addScript("nmctheme", "../dist/l10nappender");
-		\OCP\Util::addScript("nmcsharing", "nmcsharing-sharing");
+		\OCP\Util::addScript("nmcsharing", "nmcsharing-tab");
+		\OCP\Util::addScript("nmcsharing", "nmcsharing-popup");
 		\OCP\Util::addScript("nmcsharing", "nmcsharing-action");
 	}
 }

src/action.ts

@@ -1,4 +1,8 @@
 import { registerFileAction } from '@nextcloud/files'
-import { action } from './actions/sharingStatusAction'
+import { action as statusAtion } from './actions/sharingStatusAction'
+import { action as popupAction } from './actions/sharingPopupAction'
+import { action as popupMenuAction } from './actions/sharingPopupMenuAction'
 
-registerFileAction(action)
+registerFileAction(statusAtion)
+registerFileAction(popupAction)
+registerFileAction(popupMenuAction)

src/actions/popupAction.js

@@ -0,0 +1,45 @@
+import { Permission, FileAction } from '@nextcloud/files'
+import { translate as t } from '@nextcloud/l10n'
+
+export const ACTION_DETAILS = 'details'
+
+export const action = new FileAction({
+	id: ACTION_DETAILS,
+	displayName: () => t('files', 'Open details'),
+	iconSvgInline: () => '',
+
+	// Sidebar currently supports user folder only, /files/USER
+	enabled: (nodes) => {
+		// Only works on single node
+		if (nodes.length !== 1) {
+			return false
+		}
+
+		if (!nodes[0]) {
+			return false
+		}
+
+		return (nodes[0].root?.startsWith('/files/') && nodes[0].permissions !== Permission.NONE) ?? false
+	},
+
+	async exec(node, view, dir) {
+		try {
+			// TODO: migrate Sidebar to use a Node instead
+			await window.OCA.Files.Sidebar.open(node.path)
+
+			// Silently update current fileid
+			window.OCP.Files.Router.goToRoute(
+				null,
+				{ view: view.id, fileid: node.fileid },
+				{ dir },
+				true,
+			)
+
+			return null
+		} catch (error) {
+			return false
+		}
+	},
+
+	order: -50,
+})