From f3bc117d9e510bd7a9b76b9c51f1920095f939a5 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 29 May 2023 11:18:44 +0200
Subject: [PATCH 01/79] fix(vue): add ref to NcActions and
 this.$refs.ncAction.opened=false

This PR is intended to fix a minor bug of the UI: wWhen trying to rename a user group and there is an error message
the modal window continue to be present on the page. This is fixed with adding ref to corresponding component and then call 'this.$refs.ncAction.opened=false'.
---
 src/GroupDetails.vue | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/GroupDetails.vue b/src/GroupDetails.vue
index 6e2fcd98f..df7f21b3a 100644
--- a/src/GroupDetails.vue
+++ b/src/GroupDetails.vue
@@ -1,23 +1,23 @@
 <!--
-  @copyright Copyright (c) 2017 Arawa
+	@copyright Copyright (c) 2017 Arawa
 
-  @author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
-  @author 2021 Cyrille Bollu <cyrille@bollu.be>
+	@author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
+	@author 2021 Cyrille Bollu <cyrille@bollu.be>
 
-  @license GNU AGPL version 3 or any later version
+	@license GNU AGPL version 3 or any later version
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Affero General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 of the
+	License, or (at your option) any later version.
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Affero General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
 
-  You should have received a copy of the GNU Affero General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <template>
@@ -39,7 +39,7 @@
 						</NcActionButton>
 					</NcActions>
 				</div>
-				<NcActions>
+				<NcActions ref="ncAction">
 					<NcActionButton v-if="!$store.getters.isGEorUGroup($route.params.space, $route.params.group)"
 						v-show="!showRenameGroupInput"
 						icon="icon-rename"
@@ -112,6 +112,7 @@ export default {
 		onRenameGroup(e) {
 			// Hides NcActionInput
 			this.toggleShowRenameGroupInput()
+			this.$refs.ncAction.opened = false
 
 			// Don't accept empty names
 			const group = e.target[0].value

From 419ed93cded540950d3e2917ac3692ab11e5db37 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 29 May 2023 15:54:20 +0200
Subject: [PATCH 02/79] doc(md): add lines in the Unreleased - Added section of
 CHANGELOG.md files

---
 CHANGELOG.md          | 4 ++++
 docs/dev/CHANGELOG.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3733cb428..43271e47a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Close menu on group rename error message ([#839](https://github.com/arawa/workspace/pull/839))
+
 ## [3.0.0] - 2023-05-25
 
 ### Added
diff --git a/docs/dev/CHANGELOG.md b/docs/dev/CHANGELOG.md
index 3bed49741..a1b6ca253 100644
--- a/docs/dev/CHANGELOG.md
+++ b/docs/dev/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Close menu on group rename error message ([#839](https://github.com/arawa/workspace/pull/839))
+
 ## [3.0.0] - 2023-05-25
 
 ### Added

From 4690bbf0c0bbb70b1df9484382a8dc70b77eb121 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Fri, 16 Jun 2023 09:48:54 +0200
Subject: [PATCH 03/79] feat(vue): add upload file button

added button and styles to upload csv file
---
 src/SelectUsers.vue | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index b8a5d1a31..ab00bb8dd 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -83,6 +83,12 @@
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
 		<div class="select-users-actions">
+      <!-- UPLOAD FILE BUTTON -->
+		<!-- <div class="upload-file-btn"> -->
+			<button class="icon-upload">
+				<span>{{ t('workspace', 'Add users from csv file') }}</span>
+			</button>
+
 			<button @click="addUsersToWorkspaceOrGroup()">
 				{{ t('workspace', 'Add users') }}
 			</button>
@@ -296,8 +302,14 @@ export default {
 
 .select-users-actions {
 	display: flex;
-	flex-flow: row-reverse;
+	/* flex-flow: row-reverse; */
 	margin-top: 10px;
+  width: 80%;
+  justify-content: space-around;
+}
+.select-users-actions button {
+  width: 40%;
+  flex-grow: 1;
 }
 
 .header-modal {
@@ -373,4 +385,19 @@ export default {
 .role-toggle {
 	cursor: pointer !important;
 }
+
+/* .upload-file-btn {
+	display: flex;
+} */
+.icon-upload {
+  background-position: 16px center;
+	/* flex-grow: 1; */
+	/* height: 44px; */
+	/* margin-top: 12px; */
+	text-align: left;
+  /* width: auto; */
+}
+.icon-upload span {
+  padding-left: 28px;
+}
 </style>

From 86460de66ea3bdf77fb424b070c115c2948fe8e5 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Fri, 16 Jun 2023 10:45:26 +0200
Subject: [PATCH 04/79] feat(vue): add input type=file for files upload

---
 src/SelectUsers.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index ab00bb8dd..d3ccf999c 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -83,11 +83,15 @@
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
 		<div class="select-users-actions">
-      <!-- UPLOAD FILE BUTTON -->
-		<!-- <div class="upload-file-btn"> -->
-			<button class="icon-upload">
+			<!-- UPLOAD FILE BUTTON -->
+			<button class="icon-upload" @click="uploadNewFile()">
 				<span>{{ t('workspace', 'Add users from csv file') }}</span>
 			</button>
+			<input ref="filesAttachment"
+				type="file"
+				style="display: none;"
+				multiple
+				@change="handleUploadFile">
 
 			<button @click="addUsersToWorkspaceOrGroup()">
 				{{ t('workspace', 'Add users') }}
@@ -262,6 +266,12 @@ export default {
 				}
 			})
 		},
+		handleUploadFile(event) {
+			console.debug('handleUploadFile ', event.target.files)
+		},
+		uploadNewFile() {
+			this.$refs.filesAttachment.click()
+		},
 	},
 }
 </script>

From 371bab7533a03e3d4601694f6a964077f0182a60 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 19 Jun 2023 09:46:54 +0200
Subject: [PATCH 05/79] feat(vue): add handleUploadFile function

added function calls addUsersFromCSV function from store.actions
---
 src/SelectUsers.vue | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index d3ccf999c..2184fa8cf 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -266,8 +266,23 @@ export default {
 				}
 			})
 		},
-		handleUploadFile(event) {
-			console.debug('handleUploadFile ', event.target.files)
+		async handleUploadFile(event) {
+			if (event.target.files[0]) {
+				const bodyFormData = new FormData()
+				console.debug('handleUploadFile files[0] ', event.target.files[0])
+				const files = event.target.files
+				for (const file of files) {
+					bodyFormData.append('file', file)
+					const space = this.$store.state.spaces[this.$route.params.space]
+					await this.$store.dispatch('addUsersFromCSV', {
+						formData: bodyFormData,
+						gid: ManagerGroup.getGid(space),
+					})
+
+				}
+				console.debug('handleUploadFile ', event.target.files)
+				event.target.value = ''
+			}
 		},
 		uploadNewFile() {
 			this.$refs.filesAttachment.click()
@@ -314,12 +329,12 @@ export default {
 	display: flex;
 	/* flex-flow: row-reverse; */
 	margin-top: 10px;
-  width: 80%;
-  justify-content: space-around;
+	width: 80%;
+	justify-content: space-around;
 }
 .select-users-actions button {
-  width: 40%;
-  flex-grow: 1;
+	width: 40%;
+	flex-grow: 1;
 }
 
 .header-modal {
@@ -400,14 +415,14 @@ export default {
 	display: flex;
 } */
 .icon-upload {
-  background-position: 16px center;
+	background-position: 16px center;
 	/* flex-grow: 1; */
 	/* height: 44px; */
 	/* margin-top: 12px; */
 	text-align: left;
-  /* width: auto; */
+	/* width: auto; */
 }
 .icon-upload span {
-  padding-left: 28px;
+	padding-left: 28px;
 }
 </style>

From a486d42e9c8930393e3151c14a256d3a7deb9651 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 26 Jun 2023 17:05:34 +0200
Subject: [PATCH 06/79] feat(vue): add space object into formData

formData contains file object and space object and is sent to the controller by axios.post method
---
 src/SelectUsers.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 2184fa8cf..fd2945256 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -193,6 +193,7 @@ export default {
 		},
 		// Adds user to the batch when user selects user in the MultiSelect
 		addUserToBatch(user) {
+			console.debug('addUserToBatch user', user.name, user.uid)
 			this.allSelectedUsers.push(user)
 		},
 		// Lookups users in NC directory when user types text in the MultiSelect
@@ -203,6 +204,7 @@ export default {
 			}
 
 			const space = this.$store.state.spaces[this.$route.params.space]
+			console.debug('lookupUsers space', typeof space, space)
 			const spaceId = space.id
 			// TODO: limit max results?
 			this.isLookingUpUsers = true
@@ -269,17 +271,17 @@ export default {
 		async handleUploadFile(event) {
 			if (event.target.files[0]) {
 				const bodyFormData = new FormData()
-				console.debug('handleUploadFile files[0] ', event.target.files[0])
-				const files = event.target.files
-				for (const file of files) {
-					bodyFormData.append('file', file)
-					const space = this.$store.state.spaces[this.$route.params.space]
-					await this.$store.dispatch('addUsersFromCSV', {
-						formData: bodyFormData,
-						gid: ManagerGroup.getGid(space),
-					})
-
-				}
+				const file = event.target.files[0]
+				const space = this.$store.state.spaces[this.$route.params.space]
+				const spaceObj = JSON.stringify(space)
+				console.debug('handleUploadFile space ', typeof space, space)
+				bodyFormData.append('file', file)
+				bodyFormData.append('gid', ManagerGroup.getGid(space))
+				bodyFormData.append('space', spaceObj)
+				await this.$store.dispatch('addUsersFromCSV', {
+					formData: bodyFormData,
+					// gid: ManagerGroup.getGid(space),
+				})
 				console.debug('handleUploadFile ', event.target.files)
 				event.target.value = ''
 			}

From 18fdff09d83f61c6f9f977b3ec0d7e541bb822eb Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 26 Jun 2023 17:38:09 +0200
Subject: [PATCH 07/79] refactor(vue): replace code inside lookupUsers 'then'
 block in the filterAndFormatUsers

added filterAndFormatUsers and place inside it the code from lookupUsers function
---
 src/SelectUsers.vue | 58 +++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index fd2945256..602c073e2 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -202,9 +202,7 @@ export default {
 			if (term === undefined || term === '') {
 				return
 			}
-
 			const space = this.$store.state.spaces[this.$route.params.space]
-			console.debug('lookupUsers space', typeof space, space)
 			const spaceId = space.id
 			// TODO: limit max results?
 			this.isLookingUpUsers = true
@@ -213,32 +211,9 @@ export default {
 					space,
 				})
 				.then((resp) => {
-					let users = []
+					// let users = []
 					if (resp.status === 200) {
-						// When adding users to a space, show only those users who are not already member of the space
-						if (this.$route.params.group === undefined) {
-							const space = this.$store.state.spaces[this.$route.params.space]
-							users = resp.data.filter(user => {
-								return (!(user.uid in space.users))
-							}, space)
-						} else {
-							users = resp.data.filter(user => {
-								return (!(user.groups.includes(this.$route.params.group)))
-							})
-						}
-						// Filters user that are already selected
-						users = users.filter(newUser => {
-							return this.allSelectedUsers.every(user => {
-								return newUser.uid !== user.uid
-							})
-						})
-						// subtitle may not be null
-						this.selectableUsers = users.map(user => {
-							return {
-								...user,
-								subtitle: user.subtitle ?? '',
-							}
-						})
+						this.selectableUsers = this.filterAndFormatUsers(resp.data)
 					} else {
 						const text = t('workspace', 'An error occured while trying to lookup users.<br>The error is: {error}', { error: resp.statusText })
 						showNotificationError('Error', text, 3000)
@@ -268,6 +243,33 @@ export default {
 				}
 			})
 		},
+		filterAndFormatUsers(recvUsers) {
+			let users = []
+			// When adding users to a space, show only those users who are not already member of the space
+			if (this.$route.params.group === undefined) {
+				const space = this.$store.state.spaces[this.$route.params.space]
+				users = recvUsers.filter(user => {
+					return (!(user.uid in space.users))
+				}, space)
+			} else {
+				users = recvUsers.filter(user => {
+					return (!(user.groups.includes(this.$route.params.group)))
+				})
+			}
+			// Filters user that are already selected
+			users = users.filter(newUser => {
+				return this.allSelectedUsers.every(user => {
+					return newUser.uid !== user.uid
+				})
+			})
+			return users.map(user => {
+				return {
+					...user,
+					subtitle: user.subtitle ?? '',
+				}
+			})
+
+		},
 		async handleUploadFile(event) {
 			if (event.target.files[0]) {
 				const bodyFormData = new FormData()
@@ -278,7 +280,7 @@ export default {
 				bodyFormData.append('file', file)
 				bodyFormData.append('gid', ManagerGroup.getGid(space))
 				bodyFormData.append('space', spaceObj)
-				await this.$store.dispatch('addUsersFromCSV', {
+				const users = await this.$store.dispatch('addUsersFromCSV', {
 					formData: bodyFormData,
 					// gid: ManagerGroup.getGid(space),
 				})

From 2a61a10c944c64da11fc95f555a8849adbf3e118 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 14:58:39 +0200
Subject: [PATCH 08/79] feat(vue): add error notification when the file format
 is not csv

added showNotificationError in the handleUploadFile function in the catch block
---
 src/SelectUsers.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 602c073e2..697d99897 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -193,7 +193,7 @@ export default {
 		},
 		// Adds user to the batch when user selects user in the MultiSelect
 		addUserToBatch(user) {
-			console.debug('addUserToBatch user', user.name, user.uid)
+			// console.debug('addUserToBatch user', user.name, user.uid)
 			this.allSelectedUsers.push(user)
 		},
 		// Lookups users in NC directory when user types text in the MultiSelect
@@ -272,19 +272,25 @@ export default {
 		},
 		async handleUploadFile(event) {
 			if (event.target.files[0]) {
+				this.isLookingUpUsers = true
 				const bodyFormData = new FormData()
 				const file = event.target.files[0]
 				const space = this.$store.state.spaces[this.$route.params.space]
 				const spaceObj = JSON.stringify(space)
-				console.debug('handleUploadFile space ', typeof space, space)
 				bodyFormData.append('file', file)
 				bodyFormData.append('gid', ManagerGroup.getGid(space))
 				bodyFormData.append('space', spaceObj)
-				const users = await this.$store.dispatch('addUsersFromCSV', {
-					formData: bodyFormData,
-					// gid: ManagerGroup.getGid(space),
-				})
-				console.debug('handleUploadFile ', event.target.files)
+				try {
+					const users = await this.$store.dispatch('addUsersFromCSV', {
+						formData: bodyFormData,
+					})
+					this.allSelectedUsers = this.filterAndFormatUsers(users)
+				} catch (err) {
+					console.debug(err)
+					const text = t('workspace', 'Wrong format of the file. Must be \'.csv\'.')
+					showNotificationError('Error', text, 3000)
+				}
+				this.isLookingUpUsers = false
 				event.target.value = ''
 			}
 		},

From 60cb29f1cda71d1bbee32284cfdb58b8cb31091c Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 15:01:27 +0200
Subject: [PATCH 09/79] feat(js): add addUsersFromCSV function in the
 actions.js

added function that does axios.post request with csv file and space object in the request body
---
 src/store/actions.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/store/actions.js b/src/store/actions.js
index edfd4f20f..e490e342a 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -309,4 +309,20 @@ export default {
 	updateGroupfolders(context, { groupfolder }) {
 		context.commit('UPDATE_GROUPFOLDERS', { groupfolder })
 	},
+	async addUsersFromCSV(context, { formData }) {
+		// console.debug('store.actions.addUsersFromCSV formData', formData)
+		const url = generateUrl('/apps/workspace/file/csv/import-data')
+		try {
+			const resp = await axios({
+				method: 'POST',
+				url,
+				data: formData,
+			 })
+			 if (resp.status === 200) {
+					 return resp.data
+				 }
+		} catch (error) {
+			console.debug('addUsersFromCSV error ', error)
+		}
+	},
 }

From f64c3ecbee0dd83d76d0b8fbcf822eba2e5e5715 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 15:04:09 +0200
Subject: [PATCH 10/79] feat(php): add Csv class and parser method that parses
 csv files and returns an array with usernames

---
 lib/Files/Csv.php | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 lib/Files/Csv.php

diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
new file mode 100644
index 000000000..453714cdf
--- /dev/null
+++ b/lib/Files/Csv.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @copyright Copyright (c) 2017 Arawa
+ *
+ * @author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
+ * @author 2021 Cyrille Bollu <cyrille@bollu.be>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Workspace\Files;
+
+class Csv {
+    public function parser(array $file): array {
+        $users = [];
+        if (($handle = fopen($file['tmp_name'], "r")) !== FALSE) {
+    		while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
+				$users[] = ['name'=> $data[0]];
+    		}
+    		fclose($handle);
+		}
+        return $users;
+    }
+}

From 80726b6312dc2f16e9ccfd78594e823262ee733e Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 15:14:15 +0200
Subject: [PATCH 11/79] feat(php): add FileCSVController

added controller that calls parser method of the Csv class, and then formats received users and sends JSONResponse back to the client
---
 lib/Controller/FileCSVController.php | 86 ++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 lib/Controller/FileCSVController.php

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
new file mode 100644
index 000000000..e7bcdbe69
--- /dev/null
+++ b/lib/Controller/FileCSVController.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @copyright Copyright (c) 2017 Arawa
+ *
+ * @author 2021 Baptiste Fotia <baptiste.fotia@arawa.fr>
+ * @author 2021 Cyrille Bollu <cyrille@bollu.be>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Workspace\Controller;
+
+use OCA\Workspace\Files\Csv;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\AppFramework\Http;
+use OCP\IUserManager;
+use OCA\Workspace\Service\WorkspaceService;
+use OCA\Workspace\Service\UserService;
+
+class FileCSVController extends Controller {
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IUserManager $userManager,
+        private WorkspaceService $workspaceService,
+        private UserService $userService,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @SpaceAdminRequired
+     * Gets list of users from csv file.
+     * @param string $gid
+     * @param array|string $space
+     * 
+     * @return JSONResponse
+	 *
+	 */
+    public function import(): JSONResponse {
+        $params = $this->request->getParams();
+        $parser = new Csv();
+        $spaceObj = $params['space'];
+        $space = json_decode($spaceObj, true);
+        $file = $this->request->getUploadedFile('file');
+        // verify that file has csv format
+        if ($file['type'] !== 'text/csv') {
+            return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
+        }
+        $names = $parser->parser($file);
+        // filter array to leave only existing users
+        $existingNames = array_filter($names, function($user) {
+            return $this->userManager->userExists($user['name']);
+            
+        });
+        // get list of IUser objects
+        $users = [];
+        foreach( $existingNames as $user) {
+            $users[] = $this->userManager->get($user['name']);
+        }
+        $data = [];
+        foreach ($users as $user) {
+            $data[] = $this->userService->formatUser($user, $space, 'user');
+        }
+        return new JSONResponse($data);
+    }
+}

From fca733dc8907de448330caa1971615f538d9285d Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 15:22:07 +0200
Subject: [PATCH 12/79] refactor(vue): remove not-used gid parameter from the
 body of axios.post request

---
 src/SelectUsers.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 697d99897..8a48af45d 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -278,7 +278,6 @@ export default {
 				const space = this.$store.state.spaces[this.$route.params.space]
 				const spaceObj = JSON.stringify(space)
 				bodyFormData.append('file', file)
-				bodyFormData.append('gid', ManagerGroup.getGid(space))
 				bodyFormData.append('space', spaceObj)
 				try {
 					const users = await this.$store.dispatch('addUsersFromCSV', {

From f50de0daca9156012dec15c36e1c805b6165c088 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 27 Jun 2023 15:23:04 +0200
Subject: [PATCH 13/79] feat(php): add /file/csv/import-data route that calls
 FileCSVController import method

---
 appinfo/routes.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index ecda4bfc0..eecc497df 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -123,6 +123,11 @@
 			'url' => '/api/group/addUser/{spaceId}',
 			'verb' => 'POST',
 		],
+		[
+			'name' => 'fileCSV#import',
+			'url' => '/file/csv/import-data',
+			'verb' => 'POST',
+		],
 		[
 			'name' => 'space#updateColorCode',
 			'url' => '/workspaces/{spaceId}/color',

From 9887919897094de852b57afba459c562840d3274 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 09:27:26 +0200
Subject: [PATCH 14/79] refactor(vue): improve indentations with composer
 cs:fix command

---
 lib/Controller/FileCSVController.php | 94 ++++++++++++++--------------
 lib/Files/Csv.php                    | 18 +++---
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index e7bcdbe69..03033ffa8 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -26,61 +26,61 @@
 namespace OCA\Workspace\Controller;
 
 use OCA\Workspace\Files\Csv;
+use OCA\Workspace\Service\UserService;
+use OCA\Workspace\Service\WorkspaceService;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
-use OCP\AppFramework\Http;
 use OCP\IUserManager;
-use OCA\Workspace\Service\WorkspaceService;
-use OCA\Workspace\Service\UserService;
 
 class FileCSVController extends Controller {
 
-    public function __construct(
-        string $appName,
-        IRequest $request,
-        private IUserManager $userManager,
-        private WorkspaceService $workspaceService,
-        private UserService $userService,
-    ) {
-        parent::__construct($appName, $request);
-    }
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private IUserManager $userManager,
+		private WorkspaceService $workspaceService,
+		private UserService $userService,
+	) {
+		parent::__construct($appName, $request);
+	}
 
-    /**
-     * @NoAdminRequired
-     * @SpaceAdminRequired
-     * Gets list of users from csv file.
-     * @param string $gid
-     * @param array|string $space
-     * 
-     * @return JSONResponse
+	/**
+	 * @NoAdminRequired
+	 * @SpaceAdminRequired
+	 * Gets list of users from csv file.
+	 * @param string $gid
+	 * @param array|string $space
+	 *
+	 * @return JSONResponse
 	 *
 	 */
-    public function import(): JSONResponse {
-        $params = $this->request->getParams();
-        $parser = new Csv();
-        $spaceObj = $params['space'];
-        $space = json_decode($spaceObj, true);
-        $file = $this->request->getUploadedFile('file');
-        // verify that file has csv format
-        if ($file['type'] !== 'text/csv') {
-            return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
-        }
-        $names = $parser->parser($file);
-        // filter array to leave only existing users
-        $existingNames = array_filter($names, function($user) {
-            return $this->userManager->userExists($user['name']);
-            
-        });
-        // get list of IUser objects
-        $users = [];
-        foreach( $existingNames as $user) {
-            $users[] = $this->userManager->get($user['name']);
-        }
-        $data = [];
-        foreach ($users as $user) {
-            $data[] = $this->userService->formatUser($user, $space, 'user');
-        }
-        return new JSONResponse($data);
-    }
+	public function import(): JSONResponse {
+		$params = $this->request->getParams();
+		$parser = new Csv();
+		$spaceObj = $params['space'];
+		$space = json_decode($spaceObj, true);
+		$file = $this->request->getUploadedFile('file');
+		// verify that file has csv format
+		if ($file['type'] !== 'text/csv') {
+			return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
+		}
+		$names = $parser->parser($file);
+		// filter array to leave only existing users
+		$existingNames = array_filter($names, function ($user) {
+			return $this->userManager->userExists($user['name']);
+			
+		});
+		// get list of IUser objects
+		$users = [];
+		foreach($existingNames as $user) {
+			$users[] = $this->userManager->get($user['name']);
+		}
+		$data = [];
+		foreach ($users as $user) {
+			$data[] = $this->userService->formatUser($user, $space, 'user');
+		}
+		return new JSONResponse($data);
+	}
 }
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index 453714cdf..b38648a21 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -26,14 +26,14 @@
 namespace OCA\Workspace\Files;
 
 class Csv {
-    public function parser(array $file): array {
-        $users = [];
-        if (($handle = fopen($file['tmp_name'], "r")) !== FALSE) {
-    		while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
-				$users[] = ['name'=> $data[0]];
-    		}
-    		fclose($handle);
+	public function parser(array $file): array {
+		$users = [];
+		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
+			while (($data = fgetcsv($handle, 1000, ",")) !== false) {
+				$users[] = ['name' => $data[0]];
+			}
+			fclose($handle);
 		}
-        return $users;
-    }
+		return $users;
+	}
 }

From 132c70a18b9c6502f25d1bf57104d4f412e01fb1 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 09:45:16 +0200
Subject: [PATCH 15/79] chore(vue): remove commented lines

---
 src/SelectUsers.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 8a48af45d..1377e5dd6 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -193,7 +193,6 @@ export default {
 		},
 		// Adds user to the batch when user selects user in the MultiSelect
 		addUserToBatch(user) {
-			// console.debug('addUserToBatch user', user.name, user.uid)
 			this.allSelectedUsers.push(user)
 		},
 		// Lookups users in NC directory when user types text in the MultiSelect
@@ -211,7 +210,6 @@ export default {
 					space,
 				})
 				.then((resp) => {
-					// let users = []
 					if (resp.status === 200) {
 						this.selectableUsers = this.filterAndFormatUsers(resp.data)
 					} else {
@@ -285,8 +283,7 @@ export default {
 					})
 					this.allSelectedUsers = this.filterAndFormatUsers(users)
 				} catch (err) {
-					console.debug(err)
-					const text = t('workspace', 'Wrong format of the file. Must be \'.csv\'.')
+					const text = t('workspace', 'Wrong file format. Must be \'.csv\'.')
 					showNotificationError('Error', text, 3000)
 				}
 				this.isLookingUpUsers = false
@@ -336,7 +333,6 @@ export default {
 
 .select-users-actions {
 	display: flex;
-	/* flex-flow: row-reverse; */
 	margin-top: 10px;
 	width: 80%;
 	justify-content: space-around;

From 56cc9eecd39e664011fe9c14cc74362ca1481be4 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 10:25:57 +0200
Subject: [PATCH 16/79] chore(php): remove redundant PHPDoc lines

---
 lib/Controller/FileCSVController.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index 03033ffa8..708eba545 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -49,11 +49,7 @@ public function __construct(
 	/**
 	 * @NoAdminRequired
 	 * @SpaceAdminRequired
-	 * Gets list of users from csv file.
-	 * @param string $gid
-	 * @param array|string $space
-	 *
-	 * @return JSONResponse
+	 * Returns formatted list of existing users of the instance.
 	 *
 	 */
 	public function import(): JSONResponse {

From 2bdda3cb76e8c8cbad138d6b793fcce6ae1c251a Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 10:27:11 +0200
Subject: [PATCH 17/79] chore(vue): remove commented lines

---
 src/SelectUsers.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 1377e5dd6..e9efdb914 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -83,7 +83,6 @@
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
 		<div class="select-users-actions">
-			<!-- UPLOAD FILE BUTTON -->
 			<button class="icon-upload" @click="uploadNewFile()">
 				<span>{{ t('workspace', 'Add users from csv file') }}</span>
 			</button>

From 837cd9e396d9420afba9e475152b9d6767cd0a01 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 10:57:53 +0200
Subject: [PATCH 18/79] refactor(js): remove catch block from addUsersFromCSV
 function

---
 src/store/actions.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/store/actions.js b/src/store/actions.js
index e490e342a..7bcd5c0c5 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -310,19 +310,12 @@ export default {
 		context.commit('UPDATE_GROUPFOLDERS', { groupfolder })
 	},
 	async addUsersFromCSV(context, { formData }) {
-		// console.debug('store.actions.addUsersFromCSV formData', formData)
 		const url = generateUrl('/apps/workspace/file/csv/import-data')
-		try {
-			const resp = await axios({
-				method: 'POST',
-				url,
-				data: formData,
-			 })
-			 if (resp.status === 200) {
-					 return resp.data
-				 }
-		} catch (error) {
-			console.debug('addUsersFromCSV error ', error)
-		}
+		const resp = await axios({
+			method: 'POST',
+			url,
+			data: formData,
+		})
+		return resp.data
 	},
 }

From ac3c0ac0eb69d33126936f8103aeb720fafe28a8 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 28 Jun 2023 16:14:42 +0200
Subject: [PATCH 19/79] chore(js,json): add translation for error message

added translation for error message indicating wron file format
---
 l10n/en.js   | 2 ++
 l10n/fr.js   | 3 ++-
 l10n/fr.json | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/l10n/en.js b/l10n/en.js
index bf0f2ac8c..df4a6b456 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -77,5 +77,7 @@ OC.L10N.register(
 		'Network error occured while trying to change the role of user {user}.<br>The error is: {error}': 'Network error occured while trying to change the role of user {user}.<br>The error is: {error}',
 		'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
 		'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
+		'Wrong file format. Must be <b>.csv</b>.': 'Wrong file format. Must be <b>.csv</b>.',
+
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.js b/l10n/fr.js
index 65fe8fdaf..9c9386da4 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -78,6 +78,7 @@ OC.L10N.register(
 		'You have not yet created any workspace': 'Vous n\'avez pas encore créé d\'espace de travail',
 		'unlimited': 'illimité',
 		'You may only specify "unlimited" or a number followed by "TB", "GB", "MB", or "KB" (eg: "5GB") as quota': 'Vous devez spécifier le terme "unlimited" ou un nombre suivi de "TB", "GB", "MB" ou "KB" (exemple: "5GB") comme quota.',
-		'This space or groupfolder already exist. Please, input another space.\nIf "toto" space exist, you cannot create the "tOTo" space.\nMake sure you the groupfolder doesn\'t exist.': 'Cet espace projet ou le dossier du groupe (groupfolder) existe déjà. Saisissez un autre espace, s\'il vous plaît.\nPar exemple, si l\'espace "toto" existe, vous ne pouvez pas créer l\'espace "tOTo".\nAssurez-vous que le groupfolder n\'existe pas.'
+		'This space or groupfolder already exist. Please, input another space.\nIf "toto" space exist, you cannot create the "tOTo" space.\nMake sure you the groupfolder doesn\'t exist.': 'Cet espace projet ou le dossier du groupe (groupfolder) existe déjà. Saisissez un autre espace, s\'il vous plaît.\nPar exemple, si l\'espace "toto" existe, vous ne pouvez pas créer l\'espace "tOTo".\nAssurez-vous que le groupfolder n\'existe pas.',
+		'Wrong file format. Must be <b>.csv</b>.': 'Mauvais format de fichier. Doit être <b>.csv</b>.',
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.json b/l10n/fr.json
index f06691f0a..5cf721649 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -72,8 +72,8 @@
 	"You may only specify \"unlimited\" or a number followed by \"TB\", \"GB\", \"MB\", or \"KB\" (eg: \"5GB\") as quota": "Vous devez spécifier le terme \"unlimited\" ou un nombre suivi de \"TB\", \"GB\", \"MB\" ou \"KB\" (exemple: \"5GB\") comme quota.",
 	"There are no users in this space/group yet": "Il n'y a pas encore d'utilisateur dans cet espace de travail",
 	"Start typing to lookup users": "Commencez à saisir du texte pour rechercher des utilisateurs",
-	"remove users from selection": "retirer l'utilisateur de la sélection"
-
+	"remove users from selection": "retirer l'utilisateur de la sélection",
+	"Wrong file format. Must be <b>.csv</b>.": "Mauvais format de fichier. Doit être <b>.csv</b>."
 },
 "pluralForm" : "nplurals=2; plural=(n > 1);"
 }

From 388f9337595c92be289db4a20e23e235c7e1af6d Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 29 Jun 2023 11:32:28 +0200
Subject: [PATCH 20/79] refactor(vue): divide filterAndFormat function into two
 functions: filterAlreadyPresentUsers, addSubtitleToUsers

---
 src/SelectUsers.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index e9efdb914..6ab822313 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -210,7 +210,8 @@ export default {
 				})
 				.then((resp) => {
 					if (resp.status === 200) {
-						this.selectableUsers = this.filterAndFormatUsers(resp.data)
+						const usersToDisplay = this.filterAlreadyPresentUsers(resp.data)
+						this.selectableUsers = this.addSubtitleToUsers(usersToDisplay)
 					} else {
 						const text = t('workspace', 'An error occured while trying to lookup users.<br>The error is: {error}', { error: resp.statusText })
 						showNotificationError('Error', text, 3000)
@@ -240,7 +241,7 @@ export default {
 				}
 			})
 		},
-		filterAndFormatUsers(recvUsers) {
+		filterAlreadyPresentUsers(recvUsers) {
 			let users = []
 			// When adding users to a space, show only those users who are not already member of the space
 			if (this.$route.params.group === undefined) {
@@ -254,18 +255,19 @@ export default {
 				})
 			}
 			// Filters user that are already selected
-			users = users.filter(newUser => {
+			return users.filter(newUser => {
 				return this.allSelectedUsers.every(user => {
 					return newUser.uid !== user.uid
 				})
 			})
+		},
+		addSubtitleToUsers(users) {
 			return users.map(user => {
 				return {
 					...user,
 					subtitle: user.subtitle ?? '',
 				}
 			})
-
 		},
 		async handleUploadFile(event) {
 			if (event.target.files[0]) {
@@ -280,9 +282,10 @@ export default {
 					const users = await this.$store.dispatch('addUsersFromCSV', {
 						formData: bodyFormData,
 					})
-					this.allSelectedUsers = this.filterAndFormatUsers(users)
+					const usersToDisplay = this.filterAlreadyPresentUsers(users)
+					this.allSelectedUsers = this.addSubtitleToUsers(usersToDisplay)
 				} catch (err) {
-					const text = t('workspace', 'Wrong file format. Must be \'.csv\'.')
+					const text = t('workspace', 'Wrong file format. Must be <b>.csv</b>.')
 					showNotificationError('Error', text, 3000)
 				}
 				this.isLookingUpUsers = false

From db3c849450ed7ba0e6c02820d8ad6846f592b2d2 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Fri, 30 Jun 2023 14:21:15 +0200
Subject: [PATCH 21/79] fix(vue): fix the issue when added users from csv are
 not properly filtered

---
 src/SelectUsers.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 6ab822313..b2b5c4724 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -282,8 +282,11 @@ export default {
 					const users = await this.$store.dispatch('addUsersFromCSV', {
 						formData: bodyFormData,
 					})
-					const usersToDisplay = this.filterAlreadyPresentUsers(users)
-					this.allSelectedUsers = this.addSubtitleToUsers(usersToDisplay)
+					let usersToDisplay = this.filterAlreadyPresentUsers(users)
+					usersToDisplay = this.addSubtitleToUsers(usersToDisplay)
+					console.debug('usersToDisplay ', usersToDisplay)
+					console.debug('allSelectedUsers ', this.allSelectedUsers)
+					this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
 				} catch (err) {
 					const text = t('workspace', 'Wrong file format. Must be <b>.csv</b>.')
 					showNotificationError('Error', text, 3000)

From 3794926384ceed6efbbd2dccede7b629682225f1 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Fri, 30 Jun 2023 14:24:54 +0200
Subject: [PATCH 22/79] feat(php): add user.role in the final JSONResponse

---
 lib/Controller/FileCSVController.php | 8 ++++----
 lib/Files/Csv.php                    | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index 708eba545..fe43fc896 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -65,17 +65,17 @@ public function import(): JSONResponse {
 		$names = $parser->parser($file);
 		// filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
-			return $this->userManager->userExists($user['name']);
-			
+			return $this->userManager->userExists($user['name']);	
 		});
 		// get list of IUser objects
 		$users = [];
 		foreach($existingNames as $user) {
-			$users[] = $this->userManager->get($user['name']);
+            $users[] = [$this->userManager->get($user['name']), $user['role']];
 		}
 		$data = [];
 		foreach ($users as $user) {
-			$data[] = $this->userService->formatUser($user, $space, 'user');
+            $role = $user[1] == "admin" ? "admin" : "user";
+			$data[] = $this->userService->formatUser($user[0], $space, $role);
 		}
 		return new JSONResponse($data);
 	}
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index b38648a21..093c4bbc1 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -29,8 +29,11 @@ class Csv {
 	public function parser(array $file): array {
 		$users = [];
 		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
+            $tableHeader = fgetcsv($handle, 1000, ",");
+            $nameIndex = array_search('displayName', $tableHeader);
+            $roleIndex = array_search('role', $tableHeader);
 			while (($data = fgetcsv($handle, 1000, ",")) !== false) {
-				$users[] = ['name' => $data[0]];
+				$users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
 			}
 			fclose($handle);
 		}

From 181bcb77ae36e3c907f50ffd2e2a3b799df7f700 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 10:51:58 +0200
Subject: [PATCH 23/79] feat(php): add hasProperHeader function in Csv and call
 this function in FileCSVController

added hasProperHeader function that verifies that provided csv file contains
---
 lib/Controller/FileCSVController.php | 9 ++++++---
 lib/Files/Csv.php                    | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index fe43fc896..d32acf327 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -54,15 +54,18 @@ public function __construct(
 	 */
 	public function import(): JSONResponse {
 		$params = $this->request->getParams();
-		$parser = new Csv();
 		$spaceObj = $params['space'];
 		$space = json_decode($spaceObj, true);
 		$file = $this->request->getUploadedFile('file');
 		// verify that file has csv format
 		if ($file['type'] !== 'text/csv') {
-			return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
+            return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
 		}
-		$names = $parser->parser($file);
+        $csv = new Csv();
+        if (!$csv->hasProperHeader($file)) {
+            return new JSONResponse(['Invalid file format. Doesn\'t contain "displayName" or "role" columns'], Http::STATUS_FORBIDDEN);
+        }
+		$names = $csv->parser($file);
 		// filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index 093c4bbc1..8db1aee33 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -39,4 +39,13 @@ public function parser(array $file): array {
 		}
 		return $users;
 	}
+
+    public function hasProperHeader(array $file): bool {
+        if (($handle = fopen($file['tmp_name'], "r")) !== false) {
+            $tableHeader = fgetcsv($handle, 1000, ",");
+            return in_array('displayName', $tableHeader) && in_array('role', $tableHeader);
+        }
+        return false;
+    }
+    
 }

From 55d6c1df1a5e19fba26b50168ab948e37bd298db Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 12:06:23 +0200
Subject: [PATCH 24/79] refactor(vue): change error message from hardcoded
 value to the err.response.data[0]

---
 src/SelectUsers.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index b2b5c4724..3fa17dc7a 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -288,7 +288,7 @@ export default {
 					console.debug('allSelectedUsers ', this.allSelectedUsers)
 					this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
 				} catch (err) {
-					const text = t('workspace', 'Wrong file format. Must be <b>.csv</b>.')
+					const text = t('workspace', err.response.data[0])
 					showNotificationError('Error', text, 3000)
 				}
 				this.isLookingUpUsers = false

From 63705863e749eba8c771f81efcd4f01da4f6992c Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 16:15:48 +0200
Subject: [PATCH 25/79] feat(php): add class constants in Csv class

added class constants and case-insensitive search of the values in the head of csv file
---
 lib/Files/Csv.php | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index 8db1aee33..769959a65 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -26,12 +26,25 @@
 namespace OCA\Workspace\Files;
 
 class Csv {
+
+    const DISPLAY_NAME = ["username", "displayname", "name"];
+    const ROLE = ["role", "status", "userrole"];
+
 	public function parser(array $file): array {
 		$users = [];
 		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
             $tableHeader = fgetcsv($handle, 1000, ",");
-            $nameIndex = array_search('displayName', $tableHeader);
-            $roleIndex = array_search('role', $tableHeader);
+            $tableHeader = array_map('strtolower', $tableHeader);
+            $nameIndex = false;
+            $roleIndex = false;
+            foreach($this::DISPLAY_NAME as $key=>$value) {
+                $nameIndex = array_search($value, $tableHeader);
+                if ($nameIndex !== false) break;
+            }
+            foreach($this::ROLE as $key=>$value) {
+                $roleIndex = array_search($value, $tableHeader);
+                if ($roleIndex !== false) break;
+            }
 			while (($data = fgetcsv($handle, 1000, ",")) !== false) {
 				$users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
 			}
@@ -43,7 +56,18 @@ public function parser(array $file): array {
     public function hasProperHeader(array $file): bool {
         if (($handle = fopen($file['tmp_name'], "r")) !== false) {
             $tableHeader = fgetcsv($handle, 1000, ",");
-            return in_array('displayName', $tableHeader) && in_array('role', $tableHeader);
+            $tableHeader = array_map('strtolower', $tableHeader);
+            $nameIndex = false;
+            $roleIndex = false;
+            foreach($this::DISPLAY_NAME as $key=>$value) {
+                $nameIndex = array_search($value, $tableHeader);
+                if ($nameIndex !== false) break;
+            }
+            foreach($this::ROLE as $key=>$value) {
+                $roleIndex = array_search($value, $tableHeader);
+                if ($roleIndex !== false) break;
+            }
+            return ($nameIndex !== false) && ($roleIndex !== false);
         }
         return false;
     }

From c64137718315df02fd3a4db3c026d1b801553168 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 16:21:26 +0200
Subject: [PATCH 26/79] chore(vue): move comment line before
 filterAlreadyPresentUsers function

---
 src/SelectUsers.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 3fa17dc7a..ff3ebc062 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -241,9 +241,9 @@ export default {
 				}
 			})
 		},
+		// When adding users to a space, show only those users who are not already member of the space
 		filterAlreadyPresentUsers(recvUsers) {
 			let users = []
-			// When adding users to a space, show only those users who are not already member of the space
 			if (this.$route.params.group === undefined) {
 				const space = this.$store.state.spaces[this.$route.params.space]
 				users = recvUsers.filter(user => {

From b506323e05aa670964b4ec0548cd70f77a90197a Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 17:11:53 +0200
Subject: [PATCH 27/79] feat(vue,js,php): add formatted error messages

error messages are sent in the response from the php backend and translated with t function
---
 l10n/cs.json                         | 4 ++--
 l10n/en.js                           | 4 ++--
 l10n/fr.js                           | 3 ++-
 l10n/fr.json                         | 3 ++-
 lib/Controller/FileCSVController.php | 4 ++--
 src/SelectUsers.vue                  | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/l10n/cs.json b/l10n/cs.json
index 0d88fa77f..b8f986728 100644
--- a/l10n/cs.json
+++ b/l10n/cs.json
@@ -56,7 +56,7 @@
 		"You have not yet created any workspace": "Zatím jste nevytvořili žádný prac. prostor",
 		"unlimited": "neomezené",
 		"You may only specify \"unlimited\" or a number followed by \"TB\", \"GB\", \"MB\", or \"KB\" (eg: \"5GB\") as quota": "Jako kvótu je možné zadat pouze „neomezené“ nebo číslo následované „TB“, „GB“, „MB“ nebo „KB“ (příklad: „5GB“).",
-		"This space or groupfolder already exist. Please, input another space.\nIf \"toto\" space exist, you cannot create the \"tOTo\" space.\nMake sure you the groupfolder doesn\"t exist.": "Tento prostor nebo skupinová složka už existuje. Zadejte jiný prostor.\nPokud exituje např. prostor „toto“, není možné vytvořit prostor „tOTo“.\nOvěřte, že skupinová složka neexistuje.",
+		"This space or groupfolder already exist. Please, input another space.\nIf \"toto\" space exist, you cannot create the \"tOTo\" space.\nMake sure you the groupfolder doesn\"t exist.": "Tento prostor nebo skupinová složka už existuje. Zadejte jiný prostor.\nPokud exituje např. prostor „toto“, není možné vytvořit prostor „tOTo“.\nOvěřte, že skupinová složka neexistuje."
 	},
-,"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
+"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
diff --git a/l10n/en.js b/l10n/en.js
index df4a6b456..35978c8f1 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -77,7 +77,7 @@ OC.L10N.register(
 		'Network error occured while trying to change the role of user {user}.<br>The error is: {error}': 'Network error occured while trying to change the role of user {user}.<br>The error is: {error}',
 		'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
 		'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
-		'Wrong file format. Must be <b>.csv</b>.': 'Wrong file format. Must be <b>.csv</b>.',
-
+		'Wrong file extension. Must be <b>.csv</b>.': 'Wrong file extension. Must be <b>.csv</b>.',
+		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}'
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.js b/l10n/fr.js
index 9c9386da4..f96e5b2d0 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -79,6 +79,7 @@ OC.L10N.register(
 		'unlimited': 'illimité',
 		'You may only specify "unlimited" or a number followed by "TB", "GB", "MB", or "KB" (eg: "5GB") as quota': 'Vous devez spécifier le terme "unlimited" ou un nombre suivi de "TB", "GB", "MB" ou "KB" (exemple: "5GB") comme quota.',
 		'This space or groupfolder already exist. Please, input another space.\nIf "toto" space exist, you cannot create the "tOTo" space.\nMake sure you the groupfolder doesn\'t exist.': 'Cet espace projet ou le dossier du groupe (groupfolder) existe déjà. Saisissez un autre espace, s\'il vous plaît.\nPar exemple, si l\'espace "toto" existe, vous ne pouvez pas créer l\'espace "tOTo".\nAssurez-vous que le groupfolder n\'existe pas.',
-		'Wrong file format. Must be <b>.csv</b>.': 'Mauvais format de fichier. Doit être <b>.csv</b>.',
+		'Wrong file extension. Must be <b>.csv</b>.': 'Mauvais format de fichier. Doit être <b>.csv</b>.',
+		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Format de fichier est invalide. L\'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}'
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.json b/l10n/fr.json
index 5cf721649..48346d364 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -73,7 +73,8 @@
 	"There are no users in this space/group yet": "Il n'y a pas encore d'utilisateur dans cet espace de travail",
 	"Start typing to lookup users": "Commencez à saisir du texte pour rechercher des utilisateurs",
 	"remove users from selection": "retirer l'utilisateur de la sélection",
-	"Wrong file format. Must be <b>.csv</b>.": "Mauvais format de fichier. Doit être <b>.csv</b>."
+	"Wrong file extension. Must be <b>.csv</b>.": "Mauvais format de fichier. Doit être <b>.csv</b>.",
+	"Invalid file format. Table header doesn't contain any of the following values:<br> {values}": "Format de fichier est invalide. L'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}"
 },
 "pluralForm" : "nplurals=2; plural=(n > 1);"
 }
diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index d32acf327..525ee4885 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -59,11 +59,11 @@ public function import(): JSONResponse {
 		$file = $this->request->getUploadedFile('file');
 		// verify that file has csv format
 		if ($file['type'] !== 'text/csv') {
-            return new JSONResponse(['Invalid file extension - ' . $file['type']], Http::STATUS_FORBIDDEN);
+            return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
 		}
         $csv = new Csv();
         if (!$csv->hasProperHeader($file)) {
-            return new JSONResponse(['Invalid file format. Doesn\'t contain "displayName" or "role" columns'], Http::STATUS_FORBIDDEN);
+            return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
         }
 		$names = $csv->parser($file);
 		// filter array to leave only existing users
diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index ff3ebc062..e13ab18f0 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -284,11 +284,11 @@ export default {
 					})
 					let usersToDisplay = this.filterAlreadyPresentUsers(users)
 					usersToDisplay = this.addSubtitleToUsers(usersToDisplay)
-					console.debug('usersToDisplay ', usersToDisplay)
-					console.debug('allSelectedUsers ', this.allSelectedUsers)
 					this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
 				} catch (err) {
-					const text = t('workspace', err.response.data[0])
+					const text = err.response.data.length === 1
+						? t('workspace', err.response.data[0])
+						: t('workspace', `${err.response.data[0]} {values}`, { values: err.response.data[1] })
 					showNotificationError('Error', text, 3000)
 				}
 				this.isLookingUpUsers = false

From ef30c158bda6987125501cfcdfcf9447791258f6 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 6 Jul 2023 17:44:32 +0200
Subject: [PATCH 28/79] fix(vue): replace array by string in the t function
 parameter

---
 src/SelectUsers.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index e13ab18f0..461a6e867 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -286,10 +286,14 @@ export default {
 					usersToDisplay = this.addSubtitleToUsers(usersToDisplay)
 					this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
 				} catch (err) {
-					const text = err.response.data.length === 1
-						? t('workspace', err.response.data[0])
-						: t('workspace', `${err.response.data[0]} {values}`, { values: err.response.data[1] })
-					showNotificationError('Error', text, 3000)
+					if (err.response.data.length === 1) {
+						const text = t('workspace', err.response.data[0])
+						showNotificationError('Error', text, 3000)
+					} else {
+						const values = err.response.data[1].join()
+						const text = t('workspace', `${err.response.data[0]} {values}`, { values })
+						showNotificationError('Error', text, 5000)
+					}
 				}
 				this.isLookingUpUsers = false
 				event.target.value = ''

From 72ae647c546bb908c04e5e3c308a5605d6a8d87b Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 10 Jul 2023 14:37:32 +0200
Subject: [PATCH 29/79] feat(vue): add 'Import csv from files' button

---
 src/SelectUsers.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 461a6e867..e24f29e40 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -91,7 +91,9 @@
 				style="display: none;"
 				multiple
 				@change="handleUploadFile">
-
+			<button class="icon-folder" @click="shareFromFiles()">
+				<span>{{ t('deck', 'Import csv from Files') }}</span>
+			</button>
 			<button @click="addUsersToWorkspaceOrGroup()">
 				{{ t('workspace', 'Add users') }}
 			</button>
@@ -333,6 +335,7 @@ export default {
 	display: flex !important;
 	min-height: 520px !important;
 	max-height: 520px !important;
+	width: 38vw !important;
 }
 
 .multiselect__tags {
@@ -343,12 +346,15 @@ export default {
 .select-users-actions {
 	display: flex;
 	margin-top: 10px;
-	width: 80%;
+	width: 93%;
 	justify-content: space-around;
 }
 .select-users-actions button {
-	width: 40%;
+	width: 30%;
 	flex-grow: 1;
+	display: flex;
+	flex-direction: column;
+	background-position: 10px center;
 }
 
 .header-modal {
@@ -395,9 +401,9 @@ export default {
 	flex-grow: 1;
 	flex-direction: column;
 	align-items: center;
-	margin: 10px;
+	margin: 10px auto;
 	min-width: 600px;
-	max-width: 600px;
+	/* max-width: 600px; */
 }
 
 .user-entry {
@@ -425,16 +431,9 @@ export default {
 	cursor: pointer !important;
 }
 
-/* .upload-file-btn {
-	display: flex;
-} */
 .icon-upload {
 	background-position: 16px center;
-	/* flex-grow: 1; */
-	/* height: 44px; */
-	/* margin-top: 12px; */
 	text-align: left;
-	/* width: auto; */
 }
 .icon-upload span {
 	padding-left: 28px;

From 5baa345076806926fc810eec9ad709da7f8513ed Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 18 Jul 2023 18:23:10 +0200
Subject: [PATCH 30/79] refactor(php): change parameter type of the parser and
 hasProperHeader functions

changed type of the parameters from array to resource so that funcions accept handlers and not file
---
 lib/Files/Csv.php | 66 ++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index 769959a65..a046a8d9a 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -30,46 +30,42 @@ class Csv {
     const DISPLAY_NAME = ["username", "displayname", "name"];
     const ROLE = ["role", "status", "userrole"];
 
-	public function parser(array $file): array {
+    public function parser($handle) {
 		$users = [];
-		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
-            $tableHeader = fgetcsv($handle, 1000, ",");
-            $tableHeader = array_map('strtolower', $tableHeader);
-            $nameIndex = false;
-            $roleIndex = false;
-            foreach($this::DISPLAY_NAME as $key=>$value) {
-                $nameIndex = array_search($value, $tableHeader);
-                if ($nameIndex !== false) break;
-            }
-            foreach($this::ROLE as $key=>$value) {
-                $roleIndex = array_search($value, $tableHeader);
-                if ($roleIndex !== false) break;
-            }
-			while (($data = fgetcsv($handle, 1000, ",")) !== false) {
-				$users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
-			}
-			fclose($handle);
-		}
+        $tableHeader = fgetcsv($handle, 1000, ",");
+        $tableHeader = array_map('strtolower', $tableHeader);
+        $nameIndex = false;
+        $roleIndex = false;
+        foreach($this::DISPLAY_NAME as $key=>$value) {
+            $nameIndex = array_search($value, $tableHeader);
+            if ($nameIndex !== false) break;
+        }
+        foreach($this::ROLE as $key=>$value) {
+            $roleIndex = array_search($value, $tableHeader);
+            if ($roleIndex !== false) break;
+        }
+        while (($data = fgetcsv($handle, 1000, ",")) !== false) {
+            $users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
+        }
+        fclose($handle);
 		return $users;
 	}
 
-    public function hasProperHeader(array $file): bool {
-        if (($handle = fopen($file['tmp_name'], "r")) !== false) {
-            $tableHeader = fgetcsv($handle, 1000, ",");
-            $tableHeader = array_map('strtolower', $tableHeader);
-            $nameIndex = false;
-            $roleIndex = false;
-            foreach($this::DISPLAY_NAME as $key=>$value) {
-                $nameIndex = array_search($value, $tableHeader);
-                if ($nameIndex !== false) break;
-            }
-            foreach($this::ROLE as $key=>$value) {
-                $roleIndex = array_search($value, $tableHeader);
-                if ($roleIndex !== false) break;
-            }
-            return ($nameIndex !== false) && ($roleIndex !== false);
+    public function hasProperHeader($handle): bool {
+        $tableHeader = fgetcsv($handle, 1000, ",");
+        $tableHeader = array_map('strtolower', $tableHeader);
+        $nameIndex = false;
+        $roleIndex = false;
+        foreach($this::DISPLAY_NAME as $key=>$value) {
+            $nameIndex = array_search($value, $tableHeader);
+            if ($nameIndex !== false) break;
+        }
+        foreach($this::ROLE as $key=>$value) {
+            $roleIndex = array_search($value, $tableHeader);
+            if ($roleIndex !== false) break;
         }
-        return false;
+        fclose($handle);
+        return ($nameIndex !== false) && ($roleIndex !== false);
     }
     
 }

From e8c0859d7d1253cfdaab8f12e0153602e069f1b7 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 18 Jul 2023 18:27:05 +0200
Subject: [PATCH 31/79] chore(php): refactor import function and add
 getFromFiles function

changed import function to call Csv methods with handler as parameter, added getFromFiles function that gets file from NC Files and calls Csv methods with the file handlers
---
 lib/Controller/FileCSVController.php | 80 ++++++++++++++++++++++++----
 1 file changed, 71 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index 525ee4885..209dff898 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -25,25 +25,40 @@
 
 namespace OCA\Workspace\Controller;
 
+use Exception;
 use OCA\Workspace\Files\Csv;
 use OCA\Workspace\Service\UserService;
 use OCA\Workspace\Service\WorkspaceService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use OCP\IUserManager;
+use OCP\Files\Folder;
+use OCP\Files\Node;
+use OCP\IUser;
+use OCP\Files\Storage\IStorage;
+use OCP\IUserSession;
 
 class FileCSVController extends Controller {
-
+	private $currentUser;
+	private IStorage $storage;
+	
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		private IUserManager $userManager,
 		private WorkspaceService $workspaceService,
 		private UserService $userService,
+		// private FileInfo $file,
+		private IUserSession $userSession,
+		private IRootFolder $rootFolder,
+		
+	
 	) {
 		parent::__construct($appName, $request);
+		$this->currentUser = $userSession->getUser();
 	}
 
 	/**
@@ -57,15 +72,62 @@ public function import(): JSONResponse {
 		$spaceObj = $params['space'];
 		$space = json_decode($spaceObj, true);
 		$file = $this->request->getUploadedFile('file');
-		// verify that file has csv format
 		if ($file['type'] !== 'text/csv') {
-            return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
+			return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
+		}
+		$csv = new Csv();
+		if (($handler = fopen($file['tmp_name'], "r")) !== false) {
+		    if (!$csv->hasProperHeader($handler)) {
+		        return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
+		    }
+		} else {
+		    return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
 		}
-        $csv = new Csv();
-        if (!$csv->hasProperHeader($file)) {
-            return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
+		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
+			$names = $csv->parser($handle);
+		} 
+		$existingNames = array_filter($names, function ($user) {
+			return $this->userManager->userExists($user['name']);	
+		});
+		// get list of IUser objects
+		$users = [];
+		foreach($existingNames as $user) {
+			$users[] = [$this->userManager->get($user['name']), $user['role']];
+		}
+		$data = [];
+		foreach ($users as $user) {
+			$role = $user[1] == "admin" ? "admin" : "user";
+			$data[] = $this->userService->formatUser($user[0], $space, $role);
+		}
+		return new JSONResponse($data);
+	}
+
+	public function getFromFiles():JSONResponse {
+		$params = $this->request->getParams();
+		$path = $params['path'];
+		$spaceObj = $params['space'];
+		$space = json_decode($spaceObj, true);
+		$uid = $this->currentUser->getUID();
+		$folder = $this->rootFolder->getUserFolder($uid);
+		// $fullPath = $folder->getPath($path);
+		$file = $folder->get($path);
+		if ($file->getMimetype() !== 'text/csv') {
+			return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
+		}
+		$fullPath = $file->getInternalPath();
+		$store = $file->getStorage();
+		$csv = new Csv();
+        if (($handle = $store->fopen($fullPath , "r")) !== false) {
+			if (!$csv->hasProperHeader($handle)) {
+				return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
+			}
+		} else {
+            return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
         }
-		$names = $csv->parser($file);
+		$handler = $store->fopen($fullPath, "r");
+		if ($handler) {
+			$names = $csv->parser($handler);
+		}
 		// filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
@@ -73,11 +135,11 @@ public function import(): JSONResponse {
 		// get list of IUser objects
 		$users = [];
 		foreach($existingNames as $user) {
-            $users[] = [$this->userManager->get($user['name']), $user['role']];
+			$users[] = [$this->userManager->get($user['name']), $user['role']];
 		}
 		$data = [];
 		foreach ($users as $user) {
-            $role = $user[1] == "admin" ? "admin" : "user";
+			$role = $user[1] == "admin" ? "admin" : "user";
 			$data[] = $this->userService->formatUser($user[0], $space, $role);
 		}
 		return new JSONResponse($data);

From ca9349fb164bd50b08f5fe1c66440d7f00176dbe Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 18 Jul 2023 18:30:24 +0200
Subject: [PATCH 32/79] chore(js, vue): change shareCsvFromFiles and
 actions.importCsvFromFiles functions

changed shareCsvFromFiles function to send formData with path and space to the actions.importCsvFromFiles function
---
 src/SelectUsers.vue  | 31 +++++++++++++++++++++++++++++--
 src/store/actions.js |  9 +++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index e24f29e40..ed52e16f7 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -91,7 +91,7 @@
 				style="display: none;"
 				multiple
 				@change="handleUploadFile">
-			<button class="icon-folder" @click="shareFromFiles()">
+			<button class="icon-folder" @click="shareCsvFromFiles()">
 				<span>{{ t('deck', 'Import csv from Files') }}</span>
 			</button>
 			<button @click="addUsersToWorkspaceOrGroup()">
@@ -109,8 +109,16 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
 import ManagerGroup from './services/Groups/ManagerGroup.js'
 import UserGroup from './services/Groups/UserGroup.js'
-import { generateUrl } from '@nextcloud/router'
+import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import showNotificationError from './services/Notifications/NotificationError.js'
+import { getFilePickerBuilder } from '@nextcloud/dialogs'
+
+const picker = getFilePickerBuilder(t('deck', 'File to share'))
+	.setMultiSelect(false)
+	.setModal(true)
+	.setType(1)
+	.allowDirectories()
+	.build()
 
 export default {
 	name: 'SelectUsers',
@@ -304,6 +312,25 @@ export default {
 		uploadNewFile() {
 			this.$refs.filesAttachment.click()
 		},
+		shareCsvFromFiles() {
+			picker.pick()
+				.then(async (path, title) => {
+					console.debug(`path ${path} selected for sharing, title ${title}`)
+					const space = this.$store.state.spaces[this.$route.params.space]
+					const spaceString = JSON.stringify(space)
+					const bodyFormData = new FormData()
+					bodyFormData.append('path', path)
+					bodyFormData.append('space', spaceString)
+					try {
+						const users = await this.$store.dispatch('importCsvFromFiles', { formData: bodyFormData })
+						let usersToDisplay = this.filterAlreadyPresentUsers(users)
+						usersToDisplay = this.addSubtitleToUsers(usersToDisplay)
+						this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
+					} catch (err) {
+						showNotificationError('Error', err, 3000)
+					}
+				})
+		},
 	},
 }
 </script>
diff --git a/src/store/actions.js b/src/store/actions.js
index 7bcd5c0c5..16aa9f92d 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -318,4 +318,13 @@ export default {
 		})
 		return resp.data
 	},
+	async importCsvFromFiles(context, { formData }) {
+		const url = generateUrl('/apps/workspace/file/csv/import-from-files')
+		const resp = await axios({
+			method: 'POST',
+			url,
+			data: formData,
+		})
+		return resp.data
+	},
 }

From 0c0f692d976ccc31fa52e4833c423c524d76a022 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 18 Jul 2023 18:34:37 +0200
Subject: [PATCH 33/79] feat(php): add import-from-files route that calls
 FileCSVController->getFromFiles function

---
 appinfo/routes.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index eecc497df..6d5c178c3 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -128,6 +128,11 @@
 			'url' => '/file/csv/import-data',
 			'verb' => 'POST',
 		],
+		[
+			'name' => 'fileCSV#getFromFiles',
+			'url' => '/file/csv/import-from-files',
+			'verb' => 'POST',
+		],
 		[
 			'name' => 'space#updateColorCode',
 			'url' => '/workspaces/{spaceId}/color',

From a005cf3d29617958a66877dc3a921e0a20fc2856 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 19 Jul 2023 15:36:52 +0200
Subject: [PATCH 34/79] feat(vue): add showNotificationError in
 shareCsvFromFiles function

---
 src/SelectUsers.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index ed52e16f7..afbe56874 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -327,7 +327,14 @@ export default {
 						usersToDisplay = this.addSubtitleToUsers(usersToDisplay)
 						this.allSelectedUsers = [...this.allSelectedUsers, ...usersToDisplay]
 					} catch (err) {
-						showNotificationError('Error', err, 3000)
+						if (err.response.data.length === 1) {
+							const text = t('workspace', err.response.data[0])
+							showNotificationError('Error', text, 3000)
+						} else {
+							const values = err.response.data[1].join()
+							const text = t('workspace', `${err.response.data[0]} {values}`, { values })
+							showNotificationError('Error', text, 5000)
+						}
 					}
 				})
 		},

From b86afee8a924095a7a4e5ca251684395d3d73895 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Wed, 19 Jul 2023 18:01:51 +0200
Subject: [PATCH 35/79] chore(php): add rewind() in Csv methods

added rewind function allows to call Csv methods with the same handler (resource)
added refactorings in FileCsvController to open csv file one time and call Csv functions with returned handler (not open csv several times)
---
 lib/Controller/FileCSVController.php | 13 +++++--------
 lib/Files/Csv.php                    |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index 209dff898..f2298b9af 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -80,12 +80,12 @@ public function import(): JSONResponse {
 		    if (!$csv->hasProperHeader($handler)) {
 		        return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
 		    }
+            $names = $csv->parser($handler);
+            fclose($handler);
+
 		} else {
 		    return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
 		}
-		if (($handle = fopen($file['tmp_name'], "r")) !== false) {
-			$names = $csv->parser($handle);
-		} 
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
 		});
@@ -109,7 +109,6 @@ public function getFromFiles():JSONResponse {
 		$space = json_decode($spaceObj, true);
 		$uid = $this->currentUser->getUID();
 		$folder = $this->rootFolder->getUserFolder($uid);
-		// $fullPath = $folder->getPath($path);
 		$file = $folder->get($path);
 		if ($file->getMimetype() !== 'text/csv') {
 			return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
@@ -121,13 +120,11 @@ public function getFromFiles():JSONResponse {
 			if (!$csv->hasProperHeader($handle)) {
 				return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
 			}
+            $names = $csv->parser($handle);
+            fclose($handle);
 		} else {
             return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
         }
-		$handler = $store->fopen($fullPath, "r");
-		if ($handler) {
-			$names = $csv->parser($handler);
-		}
 		// filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index a046a8d9a..0a0b3bd7a 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -32,6 +32,7 @@ class Csv {
 
     public function parser($handle) {
 		$users = [];
+        rewind($handle);
         $tableHeader = fgetcsv($handle, 1000, ",");
         $tableHeader = array_map('strtolower', $tableHeader);
         $nameIndex = false;
@@ -47,7 +48,6 @@ public function parser($handle) {
         while (($data = fgetcsv($handle, 1000, ",")) !== false) {
             $users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
         }
-        fclose($handle);
 		return $users;
 	}
 
@@ -64,7 +64,6 @@ public function hasProperHeader($handle): bool {
             $roleIndex = array_search($value, $tableHeader);
             if ($roleIndex !== false) break;
         }
-        fclose($handle);
         return ($nameIndex !== false) && ($roleIndex !== false);
     }
     

From 57484012083266d9ba2cbda78ab358948e719beb Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 20 Jul 2023 16:05:36 +0200
Subject: [PATCH 36/79] refactor(): First refactor code for Andrei

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Controller/FileCSVController.php         | 158 ++++++++++++-------
 lib/Files/Csv.php                            |  74 +++++----
 lib/Files/InternalFile.php                   |  32 ++++
 lib/Files/LocalFile.php                      |  30 ++++
 lib/Files/ManagerConnectionFileInterface.php |   9 ++
 5 files changed, 216 insertions(+), 87 deletions(-)
 create mode 100644 lib/Files/InternalFile.php
 create mode 100644 lib/Files/LocalFile.php
 create mode 100644 lib/Files/ManagerConnectionFileInterface.php

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index f2298b9af..d109ad198 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -25,25 +25,23 @@
 
 namespace OCA\Workspace\Controller;
 
-use Exception;
-use OCA\Workspace\Files\Csv;
-use OCA\Workspace\Service\UserService;
-use OCA\Workspace\Service\WorkspaceService;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\Files\IRootFolder;
 use OCP\IRequest;
-use OCP\IUserManager;
-use OCP\Files\Folder;
 use OCP\Files\Node;
-use OCP\IUser;
-use OCP\Files\Storage\IStorage;
+use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\AppFramework\Http;
+use OCP\Files\IRootFolder;
+use OCA\Workspace\Files\Csv;
+use OCP\Files\Storage\IStorage;
+use OCP\AppFramework\Controller;
+use OCA\Workspace\Files\LocalFile;
+use OCA\Workspace\Files\InternalFile;
+use OCA\Workspace\Service\UserService;
+use OCP\AppFramework\Http\JSONResponse;
+use OCA\Workspace\Service\WorkspaceService;
 
 class FileCSVController extends Controller {
 	private $currentUser;
-	private IStorage $storage;
 	
 	public function __construct(
 		string $appName,
@@ -54,8 +52,6 @@ public function __construct(
 		// private FileInfo $file,
 		private IUserSession $userSession,
 		private IRootFolder $rootFolder,
-		
-	
 	) {
 		parent::__construct($appName, $request);
 		$this->currentUser = $userSession->getUser();
@@ -72,37 +68,55 @@ public function import(): JSONResponse {
 		$spaceObj = $params['space'];
 		$space = json_decode($spaceObj, true);
 		$file = $this->request->getUploadedFile('file');
-		if ($file['type'] !== 'text/csv') {
-			return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
-		}
-		$csv = new Csv();
-		if (($handler = fopen($file['tmp_name'], "r")) !== false) {
-		    if (!$csv->hasProperHeader($handler)) {
-		        return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
-		    }
-            $names = $csv->parser($handler);
-            fclose($handler);
-
-		} else {
-		    return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
+
+		if ($this->isCSVMimeType($file)) {
+			return new JSONResponse(
+                [
+                    'Wrong file extension. Must be <b>.csv</b>.'
+                ],
+                Http::STATUS_FORBIDDEN
+            );
 		}
+
+        $csv = new Csv();
+
+        $localFile = new LocalFile($file['tmp_name']);
+
+        if (!$csv->hasProperHeader($localFile)) {
+            return new JSONResponse(
+                [
+                    'Invalid file format. Table header doesn\'t contain any of the following values:<br>',
+                    [
+                        ...$csv::DISPLAY_NAME,
+                        ...$csv::ROLE
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        } else {
+            new JSONResponse(
+                [
+                    'Something went wrong. Couldn\'t open a file.'
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        $names = $csv->parser($localFile);
+        
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
 		});
+        
 		// get list of IUser objects
-		$users = [];
-		foreach($existingNames as $user) {
-			$users[] = [$this->userManager->get($user['name']), $user['role']];
-		}
-		$data = [];
-		foreach ($users as $user) {
-			$role = $user[1] == "admin" ? "admin" : "user";
-			$data[] = $this->userService->formatUser($user[0], $space, $role);
-		}
+		$users = $this->formatUsers($existingNames);
+
+		$data = $this->formatData($users, $space);
+
 		return new JSONResponse($data);
 	}
 
-	public function getFromFiles():JSONResponse {
+	public function getFromFiles(): JSONResponse {
 		$params = $this->request->getParams();
 		$path = $params['path'];
 		$spaceObj = $params['space'];
@@ -110,35 +124,59 @@ public function getFromFiles():JSONResponse {
 		$uid = $this->currentUser->getUID();
 		$folder = $this->rootFolder->getUserFolder($uid);
 		$file = $folder->get($path);
-		if ($file->getMimetype() !== 'text/csv') {
+
+		if ($this->isCSVMimeType($file)) {
 			return new JSONResponse(['Wrong file extension. Must be <b>.csv</b>.'], Http::STATUS_FORBIDDEN);
 		}
+
 		$fullPath = $file->getInternalPath();
-		$store = $file->getStorage();
-		$csv = new Csv();
-        if (($handle = $store->fopen($fullPath , "r")) !== false) {
-			if (!$csv->hasProperHeader($handle)) {
-				return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
-			}
-            $names = $csv->parser($handle);
-            fclose($handle);
-		} else {
-            return new JSONResponse(['Something went wrong. Couldn\'t open a file.'], Http::STATUS_FORBIDDEN);
+        $csv = new Csv();
+        $internalFile = new InternalFile($fullPath, $file->getStorage());
+
+        if (!$csv->hasProperHeader($internalFile)) {
+            return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
         }
-		// filter array to leave only existing users
+
+        $names = $csv->parser($internalFile);
+
+        // filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
 			return $this->userManager->userExists($user['name']);	
 		});
-		// get list of IUser objects
-		$users = [];
-		foreach($existingNames as $user) {
-			$users[] = [$this->userManager->get($user['name']), $user['role']];
-		}
-		$data = [];
-		foreach ($users as $user) {
-			$role = $user[1] == "admin" ? "admin" : "user";
-			$data[] = $this->userService->formatUser($user[0], $space, $role);
-		}
+
+        $users = $this->formatUsers($existingNames);
+
+		$data = $this->formatData($users, $space);
+
 		return new JSONResponse($data);
 	}
+
+    private function formatData(array $users, array $space): array {
+        $data = [];
+		foreach ($users as $user) {
+			$role = $user['role'] == "admin" ? "admin" : "user";
+			$data[] = $this->userService->formatUser($user['user'], $space, $role);
+		}
+
+        return $data;
+    }
+
+    private function formatUsers(array $data): array {
+        $users = [];
+        foreach($data as $user) {
+			$users[] = [
+                'user' => $this->userManager->get($user['name']),
+                'role' => $user['role']
+            ];
+		}
+        return $users;
+    }
+
+    private function isCSVMimeType(Node|array $file): bool {
+        if($file instanceof Node) {
+            return $file->getMimetype() !== 'text/csv';
+        }
+
+        return $file['type'] !== 'text/csv';
+    }
 }
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index 0a0b3bd7a..aa759eee8 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -25,46 +25,66 @@
 
 namespace OCA\Workspace\Files;
 
+use Exception;
+use OCP\AppFramework\Http\JSONResponse;
+
 class Csv {
 
     const DISPLAY_NAME = ["username", "displayname", "name"];
     const ROLE = ["role", "status", "userrole"];
 
-    public function parser($handle) {
-		$users = [];
-        rewind($handle);
-        $tableHeader = fgetcsv($handle, 1000, ",");
-        $tableHeader = array_map('strtolower', $tableHeader);
-        $nameIndex = false;
-        $roleIndex = false;
-        foreach($this::DISPLAY_NAME as $key=>$value) {
-            $nameIndex = array_search($value, $tableHeader);
-            if ($nameIndex !== false) break;
+    private function getIndex(array $haystack, array $needles): int|bool {
+        $index = null;
+        foreach($haystack as $key=>$value) {
+            $index = array_search($value, $needles);
+            if ($index !== false) {
+                return $index;
+            }
         }
-        foreach($this::ROLE as $key=>$value) {
-            $roleIndex = array_search($value, $tableHeader);
-            if ($roleIndex !== false) break;
+        return false;
+    }
+    
+    public function parser(ManagerConnectionFileInterface $file) {
+        $handle = $file->open();
+        
+        if ($handle === false) {
+            throw new Exception("Imposible to open the $file->getPath() file.");
         }
+
+		$users = [];
+        // rewind($handle);
+        $tableHeader = fgetcsv($handle, 1000, ","); // ignore the first line
+        $tableHeader = array_map('strtolower', $tableHeader);
+
+        $nameIndex = $this->getIndex($this::DISPLAY_NAME, $tableHeader);
+        $roleIndex = $this->getIndex($this::ROLE, $tableHeader);
+
         while (($data = fgetcsv($handle, 1000, ",")) !== false) {
             $users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
         }
+        $file->close();
+
 		return $users;
 	}
 
-    public function hasProperHeader($handle): bool {
-        $tableHeader = fgetcsv($handle, 1000, ",");
-        $tableHeader = array_map('strtolower', $tableHeader);
-        $nameIndex = false;
-        $roleIndex = false;
-        foreach($this::DISPLAY_NAME as $key=>$value) {
-            $nameIndex = array_search($value, $tableHeader);
-            if ($nameIndex !== false) break;
-        }
-        foreach($this::ROLE as $key=>$value) {
-            $roleIndex = array_search($value, $tableHeader);
-            if ($roleIndex !== false) break;
+    public function hasProperHeader(ManagerConnectionFileInterface $file): bool {
+        // var_dump($path);
+        // die();
+        $res = false;
+        if (($handle = $file->open()) !== false) {
+            $tableHeader = fgetcsv($handle, 1000, ",");
+            $tableHeader = array_map('strtolower', $tableHeader);
+            // var_dump($tableHeader);
+            // die();
+
+            $nameIndex = $this->getIndex(self::DISPLAY_NAME, $tableHeader);
+            $roleIndex = $this->getIndex(self::ROLE, $tableHeader);
+
+            $res = ($nameIndex !== false) && ($roleIndex !== false);
         }
-        return ($nameIndex !== false) && ($roleIndex !== false);
+        
+        $file->close();
+
+        return $res;
     }
-    
 }
diff --git a/lib/Files/InternalFile.php b/lib/Files/InternalFile.php
new file mode 100644
index 000000000..a8542b375
--- /dev/null
+++ b/lib/Files/InternalFile.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace OCA\Workspace\Files;
+
+use OCP\Files\Storage\IStorage;
+
+class InternalFile implements ManagerConnectionFileInterface
+{
+    private $resource;
+        
+    public function __construct(private string $path, private IStorage $store)
+    {
+    }
+
+    /**
+     * @return resource|false
+     */
+    public function open()
+    {
+        $this->resource =  $this->store->fopen($this->path, "r");
+        return $this->resource;
+    }
+
+    public function close(): bool
+    {
+        return fclose($this->resource);
+    }
+
+    public function getPath(): string {
+        return $this->path;
+    }
+}
diff --git a/lib/Files/LocalFile.php b/lib/Files/LocalFile.php
new file mode 100644
index 000000000..aa2044f23
--- /dev/null
+++ b/lib/Files/LocalFile.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace OCA\Workspace\Files;
+
+class LocalFile implements ManagerConnectionFileInterface
+{
+    private $resource;
+
+    public function __construct(private string $path)
+    {
+    }
+
+    /**
+     * @return resource|false
+     */
+    public function open()
+    {
+        $this->resource = fopen($this->path, "r");
+        return $this->resource;
+    }
+
+    public function close(): bool
+    {
+        return fclose($this->resource);
+    }
+
+    public function getPath(): string {
+        return $this->path;
+    }
+}
diff --git a/lib/Files/ManagerConnectionFileInterface.php b/lib/Files/ManagerConnectionFileInterface.php
new file mode 100644
index 000000000..3c3f5db27
--- /dev/null
+++ b/lib/Files/ManagerConnectionFileInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\Workspace\Files;
+
+interface ManagerConnectionFileInterface
+{
+    public function open();
+    public function close();
+}

From 4808ef0bdd1547f4a79ce9e35063be09ce8c1ba5 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 26 May 2023 16:57:52 +0200
Subject: [PATCH 37/79] chore(): Update the changelog and release 3.0.1

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md     | 9 +++++----
 appinfo/info.xml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7d2ba47c..11b338b11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [3.0.1] - 2023-05-26
+
 ### Fixed
 
-- Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
-- fix(php): Move the V300 constant ( [#841](https://github.com/arawa/workspace/pull/841) )
-- Ignore guest virtual group ( [#847](https://github.com/arawa/workspace/pull/847) )
+-  Hotfix/update change groupsname/834/stable3.0 ( [#835](https://github.com/arawa/workspace/pull/835) )
 
 ## [3.0.0] - 2023-05-25
 
@@ -177,7 +177,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Define users' roles (GeneralManager and WorkspacesManager)
 
 
-[Unreleased]: https://github.com/arawa/workspace/compare/v3.0.0...main
+[Unreleased]: https://github.com/arawa/workspace/compare/v3.0.1...main
+[3.0.1]: https://github.com/arawa/workspace/compare/v3.0.0...3.0.1
 [3.0.0]: https://github.com/arawa/workspace/compare/v2.0.1...3.0.0
 [2.0.1]: https://github.com/arawa/workspace/compare/v2.0.0...2.0.1
 [2.0.0]: https://github.com/arawa/workspace/compare/v1.3.1...2.0.0
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7885718e1..adb5ffe60 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 
     <name>Workspace</name>
 
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 
     <licence>agpl</licence>
 

From 433b67b4f85b96e728c25e1d90994fa6eba1a30f Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 29 May 2023 15:19:17 +0200
Subject: [PATCH 38/79] doc(md): add lines in the Unreleased -> Fixed section
 of the CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b338b11..f19adcb95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 -  Hotfix/update change groupsname/834/stable3.0 ( [#835](https://github.com/arawa/workspace/pull/835) )
+- Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
 
 ## [3.0.0] - 2023-05-25
 

From 31da2d300feed1603e938d183416e6f0fa616aab Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 31 May 2023 18:08:57 +0200
Subject: [PATCH 39/79] fix(php): Move the V300 constant

I moved the V300 constant to changeGroupnamesv300.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 471f72086..1946da17b 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -53,7 +53,7 @@ public function register(IRegistrationContext $context): void {
 				$c->query(IControllerMethodReflector::class),
 				$c->query(IRequest::class),
 				$c->query(UserService::class),
-				$c->query(SpaceService::class)
+                $c->query(SpaceService::class)
 			);
 		});
 

From 593f778011c0e0474d92eb260e652eec74aecd5f Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 31 May 2023 18:11:11 +0200
Subject: [PATCH 40/79] chore(): Update the changelog

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f19adcb95..ecbc16e15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -  Hotfix/update change groupsname/834/stable3.0 ( [#835](https://github.com/arawa/workspace/pull/835) )
 - Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
+- fix(php): Move the V300 constant ( [#841](https://github.com/arawa/workspace/pull/841) )
 
 ## [3.0.0] - 2023-05-25
 

From 7aacd79471469f621ddc31b820805bef65b605cc Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 31 May 2023 18:11:56 +0200
Subject: [PATCH 41/79] build(): Apply the composer run cs:fix

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/AppInfo/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 1946da17b..471f72086 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -53,7 +53,7 @@ public function register(IRegistrationContext $context): void {
 				$c->query(IControllerMethodReflector::class),
 				$c->query(IRequest::class),
 				$c->query(UserService::class),
-                $c->query(SpaceService::class)
+				$c->query(SpaceService::class)
 			);
 		});
 

From 06a731021cc4d999c77ac3df830b92e4a953cb77 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 2 Jun 2023 16:17:39 +0200
Subject: [PATCH 42/79] chore(): Update the changelog

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecbc16e15..2dc22716c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix/move v300 constant/stable3.0 ( [#845](https://github.com/arawa/workspace/pull/845) )
+
 # [3.0.1] - 2023-05-26
 
 ### Fixed

From d26aa8aad7d26fceb2252ec9ae11bcc789a2ed58 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Tue, 6 Jun 2023 09:32:47 +0200
Subject: [PATCH 43/79] hotfix(php): Ignore guest virtual group

When we run the update of Workspace to 3.0.X, the migration is stopped
and the program doesn't change the display name of Workspace's groups.

Why ? Because, when we use the "search" function from "IGroupManager",
by default, in addition to groups beginning with "SPACE-GE" or
"SPACE-U", we get the guest virtual group.

So, the solution is to use the "array_filter" to ignore the
"OCA\\Guests\\GroupBackend" backendname.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Upgrade/UpgradeV300.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/Upgrade/UpgradeV300.php b/lib/Upgrade/UpgradeV300.php
index ef77726ff..b84cb561e 100644
--- a/lib/Upgrade/UpgradeV300.php
+++ b/lib/Upgrade/UpgradeV300.php
@@ -28,6 +28,7 @@
 use OCA\Workspace\Db\SpaceMapper;
 use OCA\Workspace\Service\Group\UserGroup;
 use OCA\Workspace\Service\Group\WorkspaceManagerGroup;
+use OCA\Workspace\Upgrade\Upgrade;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\IGroupManager;
 
@@ -73,9 +74,9 @@ private function changeConventionForSubgroups(): void {
 
 	private function changePrefixForWorkspaceManagerGroups(): void {
 		$workspaceManagerGroups = $this->groupManager->search(WorkspaceManagerGroup::getPrefix());
-		$workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
-			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
-		});
+        $workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
+            return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
+        });
 		foreach ($workspaceManagerGroups as $group) {
 			$groupname = $group->getGID();
 			$groupnameSplitted = explode('-', $groupname);
@@ -89,9 +90,15 @@ private function changePrefixForWorkspaceManagerGroups(): void {
 
 	private function changePrefixForWorkspaceUserGroups(): void {
 		$userGroups = $this->groupManager->search(UserGroup::getPrefix());
+<<<<<<< HEAD
 		$userGroups = array_filter($userGroups, function ($group) {
 			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
 		});
+=======
+        $userGroups = array_filter($userGroups, function ($group) {
+            return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
+        });
+>>>>>>> 906ac13 (hotfix(php): Ignore guest virtual group)
 		foreach ($userGroups as $group) {
 			$groupname = $group->getGID();
 			$groupnameSplitted = explode('-', $groupname);

From 2e1c29ef54946c7da82d63c303c40c7a0cff2804 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Tue, 6 Jun 2023 09:41:41 +0200
Subject: [PATCH 44/79] chore(): Update the CHANGELOG

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dc22716c..e9ae3fcb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -  Hotfix/update change groupsname/834/stable3.0 ( [#835](https://github.com/arawa/workspace/pull/835) )
 - Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
 - fix(php): Move the V300 constant ( [#841](https://github.com/arawa/workspace/pull/841) )
+- Ignore guest virtual group ( [#847](https://github.com/arawa/workspace/pull/847) )
 
 ## [3.0.0] - 2023-05-25
 

From 80027ccdef910df58292db3fb0d541ae5ca9591e Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Tue, 6 Jun 2023 09:42:37 +0200
Subject: [PATCH 45/79] build(): Run the composer run cs:fix

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Upgrade/UpgradeV300.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/Upgrade/UpgradeV300.php b/lib/Upgrade/UpgradeV300.php
index b84cb561e..ef77726ff 100644
--- a/lib/Upgrade/UpgradeV300.php
+++ b/lib/Upgrade/UpgradeV300.php
@@ -28,7 +28,6 @@
 use OCA\Workspace\Db\SpaceMapper;
 use OCA\Workspace\Service\Group\UserGroup;
 use OCA\Workspace\Service\Group\WorkspaceManagerGroup;
-use OCA\Workspace\Upgrade\Upgrade;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\IGroupManager;
 
@@ -74,9 +73,9 @@ private function changeConventionForSubgroups(): void {
 
 	private function changePrefixForWorkspaceManagerGroups(): void {
 		$workspaceManagerGroups = $this->groupManager->search(WorkspaceManagerGroup::getPrefix());
-        $workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
-            return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
-        });
+		$workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
+			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
+		});
 		foreach ($workspaceManagerGroups as $group) {
 			$groupname = $group->getGID();
 			$groupnameSplitted = explode('-', $groupname);
@@ -90,15 +89,9 @@ private function changePrefixForWorkspaceManagerGroups(): void {
 
 	private function changePrefixForWorkspaceUserGroups(): void {
 		$userGroups = $this->groupManager->search(UserGroup::getPrefix());
-<<<<<<< HEAD
 		$userGroups = array_filter($userGroups, function ($group) {
 			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
 		});
-=======
-        $userGroups = array_filter($userGroups, function ($group) {
-            return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
-        });
->>>>>>> 906ac13 (hotfix(php): Ignore guest virtual group)
 		foreach ($userGroups as $group) {
 			$groupname = $group->getGID();
 			$groupnameSplitted = explode('-', $groupname);

From 7230f2872474ebe2848cb1c1a722a3b4b3ad200e Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 1 Jun 2023 16:13:30 +0200
Subject: [PATCH 46/79] fix(php): Repair the migration v3.0.0 and v3.0.1

This commit could repair the migration when someone updated workspace to v3.0.0 or v3.0.1.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 appinfo/info.xml                     |  1 +
 lib/Migration/FixMigrationToV300.php | 52 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 lib/Migration/FixMigrationToV300.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index adb5ffe60..0f6d4f2ea 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -77,6 +77,7 @@ For more details, please go to the [admin documentation](https://github.com/araw
         </pre-migration>
 	    <install>
 		    <step>OCA\Workspace\Migration\RegisterWorkspaceUsersGroup</step>
+            <step>OCA\Workspace\Migration\FixMigrationToV300</step>
 	    </install>
     </repair-steps>
 
diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
new file mode 100644
index 000000000..80618cc60
--- /dev/null
+++ b/lib/Migration/FixMigrationToV300.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace OCA\Workspace\Migration;
+
+use OCP\IAppConfig;
+use OCP\Migration\IOutput;
+use Psr\Log\LoggerInterface;
+use OCP\Migration\IRepairStep;
+use OCA\Workspace\Upgrade\Upgrade;
+use OCA\Workspace\AppInfo\Application;
+use OCA\Workspace\Upgrade\UpgradeV300;
+use OCP\AppFramework\Services\IAppConfig as ServiceIAppConfig;
+
+class FixMigrationToV300 implements IRepairStep
+{
+
+    public function __construct(private ServiceIAppConfig $appConfig,
+        private UpgradeV300 $upgrade,
+        private IAppConfig $appConfigManager,
+        private LoggerInterface $logger)
+    {
+		$this->logger->debug('FixMigrationToV300 repair step initialised');
+
+    }
+    public function getName(): string
+    {
+        return 'Try to fix one problem to trigger the migration to v3.0.0 or 3.0.1';
+    }
+
+    public function run(IOutput $output): void
+    {
+        $versionString = $this->appConfig->getAppValue('installed_version');
+		$versionSplitted = explode('.', $versionString);
+		$version = intval(implode('', $versionSplitted));
+
+        if (!($version >= 300 || $version < 302)) {
+            return;
+        }
+
+        if (!$this->appConfigManager->hasKey(Application::APP_ID, Upgrade::CONTROL_MIGRATION_V3)) {
+            $this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '0');
+        }
+
+		if (!$this->appConfigManager->hasKey(Application::APP_ID, 'DISPLAY_PREFIX_MANAGER_GROUP')
+			&& !$this->appConfigManager->hasKey(Application::APP_ID, 'DISPLAY_PREFIX_USER_GROUP')) {
+			$this->appConfig->setAppValue('DISPLAY_PREFIX_MANAGER_GROUP', 'WM-');
+			$this->appConfig->setAppValue('DISPLAY_PREFIX_USER_GROUP', 'U-');
+		}
+
+        $this->upgrade->upgrade();
+    }
+}

From 04b706b9e2e6de5c90d25ad450beb3f7d57a5842 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 1 Jun 2023 16:33:59 +0200
Subject: [PATCH 47/79] fix(php): change the operator to replace by an &&

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 80618cc60..9f6e63fea 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -33,7 +33,7 @@ public function run(IOutput $output): void
 		$versionSplitted = explode('.', $versionString);
 		$version = intval(implode('', $versionSplitted));
 
-        if (!($version >= 300 || $version < 302)) {
+        if (!($version >= 300 && $version < 302)) {
             return;
         }
 

From de434c327a69529e503afeb889e26c23c44aa6f1 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 1 Jun 2023 17:43:40 +0200
Subject: [PATCH 48/79] fix(php): Fix the conditionnal to compare versions

I added the "=== false" in the condionnal to skip the algorithm if the
workspace's version is between 3.0.0 and 3.0.1.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 9f6e63fea..c636a92a8 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -33,7 +33,8 @@ public function run(IOutput $output): void
 		$versionSplitted = explode('.', $versionString);
 		$version = intval(implode('', $versionSplitted));
 
-        if (!($version >= 300 && $version < 302)) {
+        if (!($version >= 300 && $version < 302) === false) {
+            $this->appConfig->setAppValue('test', 'ça marche ! :)');
             return;
         }
 

From 1f803d94f6a296ab6d51412ba73d5d8e6574eb66 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 1 Jun 2023 18:29:11 +0200
Subject: [PATCH 49/79] refactor(php): New test between 2 versions

I used the version_compare function to compare 2 differents versions.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index c636a92a8..19c787d8e 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -29,11 +29,9 @@ public function getName(): string
 
     public function run(IOutput $output): void
     {
-        $versionString = $this->appConfig->getAppValue('installed_version');
-		$versionSplitted = explode('.', $versionString);
-		$version = intval(implode('', $versionSplitted));
+        $version = $this->appConfig->getAppValue('installed_version');
 
-        if (!($version >= 300 && $version < 302) === false) {
+        if ((version_compare($version, '3.0.0', '>=') && version_compare($version, '3.0.2', '<')) === false) {
             $this->appConfig->setAppValue('test', 'ça marche ! :)');
             return;
         }

From e2e3d22218418e3d9eca31b1443ebbbbb1bb0533 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Tue, 6 Jun 2023 12:06:06 +0200
Subject: [PATCH 50/79] refactor(php): Improving version checking

I improve the checking of version with the "version_compare" function
internal to PHP.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 19c787d8e..b9e2d3c05 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -29,10 +29,9 @@ public function getName(): string
 
     public function run(IOutput $output): void
     {
-        $version = $this->appConfig->getAppValue('installed_version');
-
-        if ((version_compare($version, '3.0.0', '>=') && version_compare($version, '3.0.2', '<')) === false) {
-            $this->appConfig->setAppValue('test', 'ça marche ! :)');
+        $versionInstalled = $this->appConfig->getAppValue('installed_version');
+        $isBetween300And301 = version_compare($versionInstalled, '3.0.0', '>=') && version_compare($versionInstalled, '3.0.2', '<');
+        if ( !$isBetween300And301 === false) {
             return;
         }
 

From a06eaf173061b414248a0c2c750adf379564ee9f Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 7 Jun 2023 17:23:06 +0200
Subject: [PATCH 51/79] refactor(php): Change the conditionnal

I changed the conditionnal to stop the migration.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index b9e2d3c05..43475f00e 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -31,7 +31,8 @@ public function run(IOutput $output): void
     {
         $versionInstalled = $this->appConfig->getAppValue('installed_version');
         $isBetween300And301 = version_compare($versionInstalled, '3.0.0', '>=') && version_compare($versionInstalled, '3.0.2', '<');
-        if ( !$isBetween300And301 === false) {
+        if (!$isBetween300And301) {
+            $this->appConfig->setAppValue('test', 'restopped');
             return;
         }
 

From 021563f9ba97ecd15e563e8cd2602ed5754cb6f3 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 7 Jun 2023 17:29:24 +0200
Subject: [PATCH 52/79] chore(php): Remove a print test

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 43475f00e..3504058b9 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -32,7 +32,6 @@ public function run(IOutput $output): void
         $versionInstalled = $this->appConfig->getAppValue('installed_version');
         $isBetween300And301 = version_compare($versionInstalled, '3.0.0', '>=') && version_compare($versionInstalled, '3.0.2', '<');
         if (!$isBetween300And301) {
-            $this->appConfig->setAppValue('test', 'restopped');
             return;
         }
 

From aa9f627f712a55991927c3fa968134e9e13e8c2a Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 22 Jun 2023 14:57:30 +0200
Subject: [PATCH 53/79] fix(PHP): Check if the version installed is less than
 3.0.0

We check if the version installed is less than 3.0.0 to avoid 2
upgrades.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/ChangeGroupnamesV300.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Migration/ChangeGroupnamesV300.php b/lib/Migration/ChangeGroupnamesV300.php
index 28d832023..2d6b1bd2c 100644
--- a/lib/Migration/ChangeGroupnamesV300.php
+++ b/lib/Migration/ChangeGroupnamesV300.php
@@ -66,7 +66,7 @@ public function run(IOutput $output): void {
 		$controlMigration = boolval($this->appConfig->getAppValue(Upgrade::CONTROL_MIGRATION_V3));
 
 
-		if ($version <= self::V300 && $controlMigration === false) {
+		if ($version < self::V300 && $controlMigration === false) {
 			$this->upgradeV300->upgrade();
 		}
 	}

From 02051305c9f7e0fb922a7604a834d9b2977ece99 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 22 Jun 2023 15:01:09 +0200
Subject: [PATCH 54/79] fix(PHP): Fix workspaces 3.0.0 and 3.0.1

Now, we can fix all the display names from the groups.
It works for the Workspace updated to 3.0.0 or 3.0.1.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Migration/FixMigrationToV300.php |  4 +-
 lib/Upgrade/UpgradeFixV300V301.php   | 74 ++++++++++++++++++++++++++++
 lib/Upgrade/UpgradeV300.php          |  6 +--
 3 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 lib/Upgrade/UpgradeFixV300V301.php

diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 3504058b9..720ddfcae 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -8,14 +8,14 @@
 use OCP\Migration\IRepairStep;
 use OCA\Workspace\Upgrade\Upgrade;
 use OCA\Workspace\AppInfo\Application;
-use OCA\Workspace\Upgrade\UpgradeV300;
+use OCA\Workspace\Upgrade\UpgradeFixV300V301;
 use OCP\AppFramework\Services\IAppConfig as ServiceIAppConfig;
 
 class FixMigrationToV300 implements IRepairStep
 {
 
     public function __construct(private ServiceIAppConfig $appConfig,
-        private UpgradeV300 $upgrade,
+        private UpgradeFixV300V301 $upgrade,
         private IAppConfig $appConfigManager,
         private LoggerInterface $logger)
     {
diff --git a/lib/Upgrade/UpgradeFixV300V301.php b/lib/Upgrade/UpgradeFixV300V301.php
new file mode 100644
index 000000000..4b44aaa61
--- /dev/null
+++ b/lib/Upgrade/UpgradeFixV300V301.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @copyright Copyright (c) 2017 Arawa
+ *
+ * @author 2023 Baptiste Fotia <baptiste.fotia@arawa.fr>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Workspace\Upgrade;
+
+use OCP\IGroupManager;
+use OCA\Workspace\Db\SpaceMapper;
+use OCP\AppFramework\Services\IAppConfig;
+use OCA\Workspace\Db\GroupFoldersGroupsMapper;
+
+class UpgradeFixV300V301 extends UpgradeV300
+{
+    public function __construct(
+		private GroupFoldersGroupsMapper $groupfoldersGroupsMapper,
+		private IAppConfig $appConfig,
+		private IGroupManager $groupManager,
+		private SpaceMapper $spaceMapper
+    )
+    {
+        parent::__construct(
+            $groupfoldersGroupsMapper,
+            $appConfig,
+            $groupManager,
+            $spaceMapper
+        );
+    }
+
+    public function upgrade(): void {
+        parent::changePrefixForWorkspaceManagerGroups();
+        parent::changePrefixForWorkspaceUserGroups();
+        $this->changeConventionForSubgroups();
+        $this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '1');
+    }
+
+    protected function changeConventionForSubgroups(): void {
+		$subgroups = $this->groupfoldersGroupsMapper->getSpacenamesGroupIds();
+        $subgroups = array_filter($subgroups, function($subgroup) {
+            return !str_starts_with($subgroup['group_id'], 'SPACE-G');
+        });
+		foreach ($subgroups as $subgroup) {
+			$group = $this->groupManager->get($subgroup['group_id']);
+			if (is_null($group)) {
+				throw new \Exception('Group not found for the migration of workspace to version 3.0.0');
+			}
+			$oldSubgroup = $subgroup['group_id'];
+			$subgroupExploded = explode('-', $oldSubgroup);
+			$subgroupSliced = array_slice($subgroupExploded, 0, -1);
+			$groupname = implode('-', $subgroupSliced);
+			$groupname = 'G-' . $groupname . '-' . $subgroup['space_name'];
+			$group->setDisplayName($groupname);
+		}
+	}
+}
diff --git a/lib/Upgrade/UpgradeV300.php b/lib/Upgrade/UpgradeV300.php
index ef77726ff..24e232a07 100644
--- a/lib/Upgrade/UpgradeV300.php
+++ b/lib/Upgrade/UpgradeV300.php
@@ -55,7 +55,7 @@ public function upgrade(): void {
 		$this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '1');
 	}
 
-	private function changeConventionForSubgroups(): void {
+	protected function changeConventionForSubgroups(): void {
 		$subgroups = $this->groupfoldersGroupsMapper->getSpacenamesGroupIds();
 		foreach ($subgroups as $subgroup) {
 			$group = $this->groupManager->get($subgroup['group_id']);
@@ -71,7 +71,7 @@ private function changeConventionForSubgroups(): void {
 		}
 	}
 
-	private function changePrefixForWorkspaceManagerGroups(): void {
+	protected function changePrefixForWorkspaceManagerGroups(): void {
 		$workspaceManagerGroups = $this->groupManager->search(WorkspaceManagerGroup::getPrefix());
 		$workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
 			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
@@ -87,7 +87,7 @@ private function changePrefixForWorkspaceManagerGroups(): void {
 		}
 	}
 
-	private function changePrefixForWorkspaceUserGroups(): void {
+	protected function changePrefixForWorkspaceUserGroups(): void {
 		$userGroups = $this->groupManager->search(UserGroup::getPrefix());
 		$userGroups = array_filter($userGroups, function ($group) {
 			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());

From 97d4497c7dfa839080a105e6103fa71c2092abb9 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Thu, 22 Jun 2023 16:03:08 +0200
Subject: [PATCH 55/79] fix(xml): Move the FixMigrationToV300 to pre-migration

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0f6d4f2ea..66f1a0be4 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -74,10 +74,10 @@ For more details, please go to the [admin documentation](https://github.com/araw
     <repair-steps>
         <pre-migration>
             <step>OCA\Workspace\Migration\ChangeGroupnamesV300</step>
+            <step>OCA\Workspace\Migration\FixMigrationToV300</step>
         </pre-migration>
 	    <install>
 		    <step>OCA\Workspace\Migration\RegisterWorkspaceUsersGroup</step>
-            <step>OCA\Workspace\Migration\FixMigrationToV300</step>
 	    </install>
     </repair-steps>
 

From 7e29e440e8827dbd938c42be860b7eededb0a7a6 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Wed, 14 Jun 2023 16:08:35 +0200
Subject: [PATCH 56/79] fix(php): Get SPACE-GE and SPACE-U groups only

Instead of sorting by virtual groups, I sorted by the group that
interested me.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Upgrade/UpgradeV300.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Upgrade/UpgradeV300.php b/lib/Upgrade/UpgradeV300.php
index 24e232a07..943f74eb4 100644
--- a/lib/Upgrade/UpgradeV300.php
+++ b/lib/Upgrade/UpgradeV300.php
@@ -74,7 +74,7 @@ protected function changeConventionForSubgroups(): void {
 	protected function changePrefixForWorkspaceManagerGroups(): void {
 		$workspaceManagerGroups = $this->groupManager->search(WorkspaceManagerGroup::getPrefix());
 		$workspaceManagerGroups = array_filter($workspaceManagerGroups, function ($group) {
-			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
+			return str_starts_with($group->getGID(), 'SPACE-GE');
 		});
 		foreach ($workspaceManagerGroups as $group) {
 			$groupname = $group->getGID();
@@ -90,7 +90,7 @@ protected function changePrefixForWorkspaceManagerGroups(): void {
 	protected function changePrefixForWorkspaceUserGroups(): void {
 		$userGroups = $this->groupManager->search(UserGroup::getPrefix());
 		$userGroups = array_filter($userGroups, function ($group) {
-			return !in_array('OCA\\Guests\\GroupBackend', $group->getBackendNames());
+			return str_starts_with($group->getGID(), 'SPACE-U');
 		});
 		foreach ($userGroups as $group) {
 			$groupname = $group->getGID();

From c455b15d8ec6e7049e5d6ff12584f90dba97c00d Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 23 Jun 2023 11:43:33 +0200
Subject: [PATCH 57/79] chore(): Update the CHANGELOG.md

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9ae3fcb7..220584a49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
 - fix(php): Move the V300 constant ( [#841](https://github.com/arawa/workspace/pull/841) )
 - Ignore guest virtual group ( [#847](https://github.com/arawa/workspace/pull/847) )
+- Get SPACE-GE and SPACE-U groups only ( [#858](https://github.com/arawa/workspace/pull/858) )
 
 ## [3.0.0] - 2023-05-25
 

From e96d307c84fa9d86e6b34f198c18326441704b7c Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 16 Jun 2023 10:43:39 +0200
Subject: [PATCH 58/79] fix(Vue,Php): Rename the groups with the spacename

Now, when we will rename one space, all groups (even WM- and U-) will
be changed with the new space name.

If one group is renamed, it will be suffixed and prefixed with G- and
the space name.

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Controller/GroupController.php | 25 ++++++++-----------------
 src/GroupDetails.vue               |  6 +++++-
 src/SpaceDetails.vue               | 17 +++++++++++++++++
 src/store/actions.js               |  3 ---
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/lib/Controller/GroupController.php b/lib/Controller/GroupController.php
index 51bd7f3a4..140b484e5 100644
--- a/lib/Controller/GroupController.php
+++ b/lib/Controller/GroupController.php
@@ -145,29 +145,20 @@ public function delete(string $gid, int $spaceId): JSONResponse {
 	public function rename(string $newGroupName,
 		string $gid,
 		int $spaceId): JSONResponse {
-
-		if (!empty($this->groupManager->search($newGroupName))) {
+        $groups = $this->groupManager->search($newGroupName);
+        $groups = array_filter($groups, function($group) {
+            return str_starts_with($group->getGID(), 'SPACE-GE-') 
+                || str_starts_with($group->getGID(), 'SPACE-U-') 
+                || str_starts_with($group->getGID(), 'SPACE-G-');
+        });
+
+		if (!empty($groups)) {
 			return new JSONResponse(
 				'This group already exists. Please, change the name',
 				Http::STATUS_CONFLICT
 			);
 		}
 		
-		// TODO Use groupfolder api to retrieve workspace group.
-		if (substr($gid, -strlen($spaceId)) != $spaceId) {
-			return new JSONResponse(
-				['You may only rename workspace groups of this space (ie: group\'s name does not end by the workspace\'s ID)'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if (substr($newGroupName, -strlen($spaceId)) != $spaceId) {
-			return new JSONResponse(
-				['Workspace groups must ends with the ID of the space they belong to'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
 		// Rename group
 		$NCGroup = $this->groupManager->get($gid);
 		if (is_null($NCGroup)) {
diff --git a/src/GroupDetails.vue b/src/GroupDetails.vue
index 6e2fcd98f..38e1ba72f 100644
--- a/src/GroupDetails.vue
+++ b/src/GroupDetails.vue
@@ -114,13 +114,17 @@ export default {
 			this.toggleShowRenameGroupInput()
 
 			// Don't accept empty names
-			const group = e.target[0].value
+			let group = e.target[0].value
 			if (!group) {
 				// TODO Inform user
 				return
 			}
 
 			const space = this.$store.state.spaces[this.$route.params.space]
+			const groupSpace = space.groups[this.$route.params.group]
+
+			group = ''.concat('G-', group, '-', space.name)
+			group = groupSpace.displayName.replace(groupSpace.displayName, group)
 
 			// Prevents renaming SPACE-GE- and SPACE-U- groups
 			if (group === PREFIX_MANAGER + space.id
diff --git a/src/SpaceDetails.vue b/src/SpaceDetails.vue
index b22dabbc7..0f3e71487 100644
--- a/src/SpaceDetails.vue
+++ b/src/SpaceDetails.vue
@@ -109,6 +109,8 @@ import RemoveSpace from './RemoveSpace.vue'
 import UserTable from './UserTable.vue'
 import { destroy, rename, checkGroupfolderNameExist } from './services/groupfoldersService.js'
 import showNotificationError from './services/Notifications/NotificationError.js'
+import ManagerGroup from './services/Groups/ManagerGroup'
+import UserGroup from './services/Groups/UserGroup'
 
 export default {
 	name: 'SpaceDetails',
@@ -203,6 +205,21 @@ export default {
 				this.$store.dispatch('removeSpace', {
 					space: this.$store.state.spaces[oldSpaceName],
 				})
+
+				const groupKeys = Object.keys(space.groups)
+
+				groupKeys.forEach(key => {
+					const group = space.groups[key]
+					const newDisplayName = group.displayName.replace(oldSpaceName, newSpaceName)
+
+					// Renames group
+					this.$store.dispatch('renameGroup', {
+					  name: newSpaceName,
+					  gid: group.gid,
+					  newGroupName: newDisplayName,
+					})
+				})
+
 				this.$router.push({
 					path: `/workspace/${space.name}`,
 				})
diff --git a/src/store/actions.js b/src/store/actions.js
index 16aa9f92d..17d3954eb 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -192,9 +192,6 @@ export default {
 	renameGroup(context, { name, gid, newGroupName }) {
 		const space = context.state.spaces[name]
 
-		// Groups must be postfixed with the ID of the space they belong
-		newGroupName = `${PREFIX_DISPLAYNAME_SUBGROUP_SPACE}${newGroupName}-${space.name}`
-
 		// Creates group in backend
 		axios.patch(generateUrl(`/apps/workspace/api/group/${gid}`), { spaceId: space.id, newGroupName })
 			.then((resp) => {

From f66b22d93f0da890f6ff69cb5169472a90e59246 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 16 Jun 2023 14:38:17 +0200
Subject: [PATCH 59/79] chore(): Run composer run cs:fix

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Controller/GroupController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/GroupController.php b/lib/Controller/GroupController.php
index 140b484e5..feef2997e 100644
--- a/lib/Controller/GroupController.php
+++ b/lib/Controller/GroupController.php
@@ -145,12 +145,12 @@ public function delete(string $gid, int $spaceId): JSONResponse {
 	public function rename(string $newGroupName,
 		string $gid,
 		int $spaceId): JSONResponse {
-        $groups = $this->groupManager->search($newGroupName);
-        $groups = array_filter($groups, function($group) {
-            return str_starts_with($group->getGID(), 'SPACE-GE-') 
-                || str_starts_with($group->getGID(), 'SPACE-U-') 
-                || str_starts_with($group->getGID(), 'SPACE-G-');
-        });
+		$groups = $this->groupManager->search($newGroupName);
+		$groups = array_filter($groups, function ($group) {
+			return str_starts_with($group->getGID(), 'SPACE-GE-')
+				|| str_starts_with($group->getGID(), 'SPACE-U-')
+				|| str_starts_with($group->getGID(), 'SPACE-G-');
+		});
 
 		if (!empty($groups)) {
 			return new JSONResponse(

From 5dc75609ff506ff78665ce1adac0c4f268abd46f Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 16 Jun 2023 14:39:53 +0200
Subject: [PATCH 60/79] chore(vue): Apply a fix for the linter javascript

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 src/SpaceDetails.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/SpaceDetails.vue b/src/SpaceDetails.vue
index 0f3e71487..7ce36d158 100644
--- a/src/SpaceDetails.vue
+++ b/src/SpaceDetails.vue
@@ -109,8 +109,6 @@ import RemoveSpace from './RemoveSpace.vue'
 import UserTable from './UserTable.vue'
 import { destroy, rename, checkGroupfolderNameExist } from './services/groupfoldersService.js'
 import showNotificationError from './services/Notifications/NotificationError.js'
-import ManagerGroup from './services/Groups/ManagerGroup'
-import UserGroup from './services/Groups/UserGroup'
 
 export default {
 	name: 'SpaceDetails',

From 94565dd760d551c41985254d8837141e117f4b45 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 23 Jun 2023 11:28:11 +0200
Subject: [PATCH 61/79] chore(): Update the CHANGELOG

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220584a49..5ed2d8331 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix workspace removal issue ( [#838](https://github.com/arawa/workspace/pull/838))
 - fix(php): Move the V300 constant ( [#841](https://github.com/arawa/workspace/pull/841) )
 - Ignore guest virtual group ( [#847](https://github.com/arawa/workspace/pull/847) )
-- Get SPACE-GE and SPACE-U groups only ( [#858](https://github.com/arawa/workspace/pull/858) )
+- fix(Vue,Php): Rename the groups with the spacename ( [#860](https://github.com/arawa/workspace/pull/860) )
 
 ## [3.0.0] - 2023-05-25
 

From 27fd21b9891eba2b84cbaf133eb0c7d6472ccb76 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 23 Jun 2023 12:22:57 +0200
Subject: [PATCH 62/79] chore(): Run composer run cs:fix

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 lib/Controller/WorkspaceController.php      | 18 +++----
 lib/Migration/FixMigrationToV300.php        | 54 ++++++++++-----------
 lib/Service/Group/WorkspaceManagerGroup.php | 28 +++++------
 lib/Upgrade/UpgradeFixV300V301.php          | 46 +++++++++---------
 4 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
index 4f0519f18..bf8171949 100644
--- a/lib/Controller/WorkspaceController.php
+++ b/lib/Controller/WorkspaceController.php
@@ -124,15 +124,15 @@ public function createWorkspace(string $spaceName,
 		]);
 	}
 
-  /**
-   *
-   * Deletes the workspace, and the corresponding groupfolder and groups
-   *
-   * @NoAdminRequired
-   * @SpaceAdminRequired
-   * @param array $workspace
-   *
-   */
+	/**
+	 *
+	 * Deletes the workspace, and the corresponding groupfolder and groups
+	 *
+	 * @NoAdminRequired
+	 * @SpaceAdminRequired
+	 * @param array $workspace
+	 *
+	 */
 	public function destroy(array $workspace): JSONResponse {
 		$this->logger->debug('Removing GE users from the WorkspacesManagers group if needed.');
 		$GEGroup = $this->groupManager->get(WorkspaceManagerGroup::get($workspace['id']));
diff --git a/lib/Migration/FixMigrationToV300.php b/lib/Migration/FixMigrationToV300.php
index 720ddfcae..7ebc6b607 100644
--- a/lib/Migration/FixMigrationToV300.php
+++ b/lib/Migration/FixMigrationToV300.php
@@ -2,42 +2,38 @@
 
 namespace OCA\Workspace\Migration;
 
-use OCP\IAppConfig;
-use OCP\Migration\IOutput;
-use Psr\Log\LoggerInterface;
-use OCP\Migration\IRepairStep;
-use OCA\Workspace\Upgrade\Upgrade;
 use OCA\Workspace\AppInfo\Application;
+use OCA\Workspace\Upgrade\Upgrade;
 use OCA\Workspace\Upgrade\UpgradeFixV300V301;
 use OCP\AppFramework\Services\IAppConfig as ServiceIAppConfig;
+use OCP\IAppConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use Psr\Log\LoggerInterface;
 
-class FixMigrationToV300 implements IRepairStep
-{
+class FixMigrationToV300 implements IRepairStep {
 
-    public function __construct(private ServiceIAppConfig $appConfig,
-        private UpgradeFixV300V301 $upgrade,
-        private IAppConfig $appConfigManager,
-        private LoggerInterface $logger)
-    {
+	public function __construct(private ServiceIAppConfig $appConfig,
+		private UpgradeFixV300V301 $upgrade,
+		private IAppConfig $appConfigManager,
+		private LoggerInterface $logger) {
 		$this->logger->debug('FixMigrationToV300 repair step initialised');
 
-    }
-    public function getName(): string
-    {
-        return 'Try to fix one problem to trigger the migration to v3.0.0 or 3.0.1';
-    }
+	}
+	public function getName(): string {
+		return 'Try to fix one problem to trigger the migration to v3.0.0 or 3.0.1';
+	}
 
-    public function run(IOutput $output): void
-    {
-        $versionInstalled = $this->appConfig->getAppValue('installed_version');
-        $isBetween300And301 = version_compare($versionInstalled, '3.0.0', '>=') && version_compare($versionInstalled, '3.0.2', '<');
-        if (!$isBetween300And301) {
-            return;
-        }
+	public function run(IOutput $output): void {
+		$versionInstalled = $this->appConfig->getAppValue('installed_version');
+		$isBetween300And301 = version_compare($versionInstalled, '3.0.0', '>=') && version_compare($versionInstalled, '3.0.2', '<');
+		if (!$isBetween300And301) {
+			return;
+		}
 
-        if (!$this->appConfigManager->hasKey(Application::APP_ID, Upgrade::CONTROL_MIGRATION_V3)) {
-            $this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '0');
-        }
+		if (!$this->appConfigManager->hasKey(Application::APP_ID, Upgrade::CONTROL_MIGRATION_V3)) {
+			$this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '0');
+		}
 
 		if (!$this->appConfigManager->hasKey(Application::APP_ID, 'DISPLAY_PREFIX_MANAGER_GROUP')
 			&& !$this->appConfigManager->hasKey(Application::APP_ID, 'DISPLAY_PREFIX_USER_GROUP')) {
@@ -45,6 +41,6 @@ public function run(IOutput $output): void
 			$this->appConfig->setAppValue('DISPLAY_PREFIX_USER_GROUP', 'U-');
 		}
 
-        $this->upgrade->upgrade();
-    }
+		$this->upgrade->upgrade();
+	}
 }
diff --git a/lib/Service/Group/WorkspaceManagerGroup.php b/lib/Service/Group/WorkspaceManagerGroup.php
index 6baf744c1..5fd6db3d3 100644
--- a/lib/Service/Group/WorkspaceManagerGroup.php
+++ b/lib/Service/Group/WorkspaceManagerGroup.php
@@ -38,23 +38,23 @@ public function __construct(IGroupManager $groupManager, IAppConfig $appConfig)
 		$this->groupManager = $groupManager;
 	}
 
-		public static function get(int $spaceId): string {
-			return self::PREFIX_GID_MANAGERS . $spaceId;
-		}
+	public static function get(int $spaceId): string {
+		return self::PREFIX_GID_MANAGERS . $spaceId;
+	}
 
-		public static function getPrefix(): string {
-			return self::PREFIX_GID_MANAGERS;
-		}
+	public static function getPrefix(): string {
+		return self::PREFIX_GID_MANAGERS;
+	}
 
-		public function create(Space $space): IGroup {
-			$group = $this->groupManager->createGroup(self::PREFIX_GID_MANAGERS . $space->getId());
+	public function create(Space $space): IGroup {
+		$group = $this->groupManager->createGroup(self::PREFIX_GID_MANAGERS . $space->getId());
 
-			if (is_null($group)) {
-				throw new CreateGroupException('Error to create a Space Manager group.', Http::STATUS_CONFLICT);
-			}
+		if (is_null($group)) {
+			throw new CreateGroupException('Error to create a Space Manager group.', Http::STATUS_CONFLICT);
+		}
 
-			$group->setDisplayName(self::getDisplayPrefixManagerGroup() . $space->getSpaceName());
+		$group->setDisplayName(self::getDisplayPrefixManagerGroup() . $space->getSpaceName());
 
-			return $group;
-		}
+		return $group;
+	}
 }
diff --git a/lib/Upgrade/UpgradeFixV300V301.php b/lib/Upgrade/UpgradeFixV300V301.php
index 4b44aaa61..256d5c56d 100644
--- a/lib/Upgrade/UpgradeFixV300V301.php
+++ b/lib/Upgrade/UpgradeFixV300V301.php
@@ -24,40 +24,38 @@
 
 namespace OCA\Workspace\Upgrade;
 
-use OCP\IGroupManager;
+use OCA\Workspace\Db\GroupFoldersGroupsMapper;
 use OCA\Workspace\Db\SpaceMapper;
 use OCP\AppFramework\Services\IAppConfig;
-use OCA\Workspace\Db\GroupFoldersGroupsMapper;
+use OCP\IGroupManager;
 
-class UpgradeFixV300V301 extends UpgradeV300
-{
-    public function __construct(
+class UpgradeFixV300V301 extends UpgradeV300 {
+	public function __construct(
 		private GroupFoldersGroupsMapper $groupfoldersGroupsMapper,
 		private IAppConfig $appConfig,
 		private IGroupManager $groupManager,
 		private SpaceMapper $spaceMapper
-    )
-    {
-        parent::__construct(
-            $groupfoldersGroupsMapper,
-            $appConfig,
-            $groupManager,
-            $spaceMapper
-        );
-    }
+	) {
+		parent::__construct(
+			$groupfoldersGroupsMapper,
+			$appConfig,
+			$groupManager,
+			$spaceMapper
+		);
+	}
 
-    public function upgrade(): void {
-        parent::changePrefixForWorkspaceManagerGroups();
-        parent::changePrefixForWorkspaceUserGroups();
-        $this->changeConventionForSubgroups();
-        $this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '1');
-    }
+	public function upgrade(): void {
+		parent::changePrefixForWorkspaceManagerGroups();
+		parent::changePrefixForWorkspaceUserGroups();
+		$this->changeConventionForSubgroups();
+		$this->appConfig->setAppValue(Upgrade::CONTROL_MIGRATION_V3, '1');
+	}
 
-    protected function changeConventionForSubgroups(): void {
+	protected function changeConventionForSubgroups(): void {
 		$subgroups = $this->groupfoldersGroupsMapper->getSpacenamesGroupIds();
-        $subgroups = array_filter($subgroups, function($subgroup) {
-            return !str_starts_with($subgroup['group_id'], 'SPACE-G');
-        });
+		$subgroups = array_filter($subgroups, function ($subgroup) {
+			return !str_starts_with($subgroup['group_id'], 'SPACE-G');
+		});
 		foreach ($subgroups as $subgroup) {
 			$group = $this->groupManager->get($subgroup['group_id']);
 			if (is_null($group)) {

From 797beae8fd546e1a272ae1a648a9ac7634c2cae5 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <fotia.baptiste@hotmail.com>
Date: Fri, 23 Jun 2023 12:52:50 +0200
Subject: [PATCH 63/79] chore(): update the changelog

Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ed2d8331..fdd467b8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix/move v300 constant/stable3.0 ( [#845](https://github.com/arawa/workspace/pull/845) )
+- Repair the migration v3.0.0 and v3.0.1 ( [#843](https://github.com/arawa/workspace/pull/843/files) )
 
 # [3.0.1] - 2023-05-26
 

From bd0f253d13e8fc54d970c1223998673031a59935 Mon Sep 17 00:00:00 2001
From: Sebastien Marinier <sebastien.marinier@arawa.fr>
Date: Thu, 22 Jun 2023 15:29:02 +0200
Subject: [PATCH 64/79] Change Exceptions path, changing namespace

---
 lib/Controller/WorkspaceController.php          | 6 +++---
 lib/Exceptions/BadRequestException.php          | 2 +-
 lib/Exceptions/CreateGroupException.php         | 2 +-
 lib/Exceptions/CreateWorkspaceException.php     | 2 +-
 lib/Exceptions/WorkspaceNameExistException.php  | 2 +-
 lib/Service/Workspace/WorkspaceCheckService.php | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
index bf8171949..78a87976a 100644
--- a/lib/Controller/WorkspaceController.php
+++ b/lib/Controller/WorkspaceController.php
@@ -25,9 +25,9 @@
 
 namespace OCA\Workspace\Controller;
 
-use OCA\Workspace\BadRequestException;
-use OCA\Workspace\CreateGroupException;
-use OCA\Workspace\CreateWorkspaceException;
+use OCA\Workspace\Exceptions\BadRequestException;
+use OCA\Workspace\Exceptions\CreateGroupException;
+use OCA\Workspace\Exceptions\CreateWorkspaceException;
 use OCA\Workspace\Db\Space;
 use OCA\Workspace\Db\SpaceMapper;
 use OCA\Workspace\Service\Group\GroupFormatter;
diff --git a/lib/Exceptions/BadRequestException.php b/lib/Exceptions/BadRequestException.php
index 5888e4dfe..c40d0ca09 100644
--- a/lib/Exceptions/BadRequestException.php
+++ b/lib/Exceptions/BadRequestException.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Workspace;
+namespace OCA\Workspace\Exceptions;
 
 use OCP\AppFramework\Http;
 
diff --git a/lib/Exceptions/CreateGroupException.php b/lib/Exceptions/CreateGroupException.php
index 3e641f2bf..6abbc011f 100644
--- a/lib/Exceptions/CreateGroupException.php
+++ b/lib/Exceptions/CreateGroupException.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Workspace;
+namespace OCA\Workspace\Exceptions;
 
 class CreateGroupException extends \Exception {
 	public function __construct($message, $code = 0) {
diff --git a/lib/Exceptions/CreateWorkspaceException.php b/lib/Exceptions/CreateWorkspaceException.php
index b59d35880..1d684c4ed 100644
--- a/lib/Exceptions/CreateWorkspaceException.php
+++ b/lib/Exceptions/CreateWorkspaceException.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Workspace;
+namespace OCA\Workspace\Exceptions;
 
 class CreateWorkspaceException extends \Exception {
 	public function __construct($message, $code = 0) {
diff --git a/lib/Exceptions/WorkspaceNameExistException.php b/lib/Exceptions/WorkspaceNameExistException.php
index 00c61ea6e..b56ad93f7 100644
--- a/lib/Exceptions/WorkspaceNameExistException.php
+++ b/lib/Exceptions/WorkspaceNameExistException.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Workspace;
+namespace OCA\Workspace\Exceptions;
 
 class WorkspaceNameExistException extends \Exception {
 	public function __construct($message, $code = 0) {
diff --git a/lib/Service/Workspace/WorkspaceCheckService.php b/lib/Service/Workspace/WorkspaceCheckService.php
index 3c3f995db..c90237b99 100644
--- a/lib/Service/Workspace/WorkspaceCheckService.php
+++ b/lib/Service/Workspace/WorkspaceCheckService.php
@@ -24,9 +24,9 @@
 
 namespace OCA\Workspace\Service\Workspace;
 
-use OCA\Workspace\BadRequestException;
+use OCA\Workspace\Exceptions\BadRequestException;
 use OCA\Workspace\Service\SpaceService;
-use OCA\Workspace\WorkspaceNameExistException;
+use OCA\Workspace\Exceptions\WorkspaceNameExistException;
 use OCP\AppFramework\Http;
 
 class WorkspaceCheckService {

From 2edbd5822df63f6170e2501b344fcb229f2751c4 Mon Sep 17 00:00:00 2001
From: Sebastien Marinier <sebastien.marinier@arawa.fr>
Date: Thu, 22 Jun 2023 18:55:28 +0200
Subject: [PATCH 65/79] cs:fix : reorder "use"

---
 lib/Controller/WorkspaceController.php          | 4 ++--
 lib/Service/Workspace/WorkspaceCheckService.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/WorkspaceController.php b/lib/Controller/WorkspaceController.php
index 78a87976a..4fb6b1ee0 100644
--- a/lib/Controller/WorkspaceController.php
+++ b/lib/Controller/WorkspaceController.php
@@ -25,11 +25,11 @@
 
 namespace OCA\Workspace\Controller;
 
+use OCA\Workspace\Db\Space;
+use OCA\Workspace\Db\SpaceMapper;
 use OCA\Workspace\Exceptions\BadRequestException;
 use OCA\Workspace\Exceptions\CreateGroupException;
 use OCA\Workspace\Exceptions\CreateWorkspaceException;
-use OCA\Workspace\Db\Space;
-use OCA\Workspace\Db\SpaceMapper;
 use OCA\Workspace\Service\Group\GroupFormatter;
 use OCA\Workspace\Service\Group\ManagersWorkspace;
 use OCA\Workspace\Service\Group\UserGroup;
diff --git a/lib/Service/Workspace/WorkspaceCheckService.php b/lib/Service/Workspace/WorkspaceCheckService.php
index c90237b99..b570010ee 100644
--- a/lib/Service/Workspace/WorkspaceCheckService.php
+++ b/lib/Service/Workspace/WorkspaceCheckService.php
@@ -25,8 +25,8 @@
 namespace OCA\Workspace\Service\Workspace;
 
 use OCA\Workspace\Exceptions\BadRequestException;
-use OCA\Workspace\Service\SpaceService;
 use OCA\Workspace\Exceptions\WorkspaceNameExistException;
+use OCA\Workspace\Service\SpaceService;
 use OCP\AppFramework\Http;
 
 class WorkspaceCheckService {

From a4badbc8db1590a889bd37ea7b966e10afc9bed4 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 20 Jul 2023 14:11:42 +0200
Subject: [PATCH 66/79] feat(php): add NoAdminRequired and SpaceAdminRequired
 in the annotation to controller

---
 lib/Controller/FileCSVController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index d109ad198..4cd1ad3d8 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -116,7 +116,13 @@ public function import(): JSONResponse {
 		return new JSONResponse($data);
 	}
 
-	public function getFromFiles(): JSONResponse {
+	/**
+	 * @NoAdminRequired
+	 * @SpaceAdminRequired
+	 * Returns formatted list of existing users of the instance.
+	 *
+	 */
+	public function getFromFiles():JSONResponse {
 		$params = $this->request->getParams();
 		$path = $params['path'];
 		$spaceObj = $params['space'];

From 77074a1a165bfab00ee26d3092c76ac0ef4c6e83 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 20 Jul 2023 14:26:49 +0200
Subject: [PATCH 67/79] feat(l10n): add translation for error message from
 FileCsvController functions

---
 l10n/en.js   | 3 ++-
 l10n/fr.js   | 3 ++-
 l10n/fr.json | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/l10n/en.js b/l10n/en.js
index 35978c8f1..52e2323ea 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -78,6 +78,7 @@ OC.L10N.register(
 		'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'An error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
 		'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}': 'Network error occured while trying to update the workspace\'s quota.<br>The error is: {error}',
 		'Wrong file extension. Must be <b>.csv</b>.': 'Wrong file extension. Must be <b>.csv</b>.',
-		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}'
+		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}',
+		'Something went wrong. Couldn\'t open a file.': 'Quelque chose s\'est mal passé. Impossible d\'ouvrir un fichier.',
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.js b/l10n/fr.js
index f96e5b2d0..3f34f7f9b 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -80,6 +80,7 @@ OC.L10N.register(
 		'You may only specify "unlimited" or a number followed by "TB", "GB", "MB", or "KB" (eg: "5GB") as quota': 'Vous devez spécifier le terme "unlimited" ou un nombre suivi de "TB", "GB", "MB" ou "KB" (exemple: "5GB") comme quota.',
 		'This space or groupfolder already exist. Please, input another space.\nIf "toto" space exist, you cannot create the "tOTo" space.\nMake sure you the groupfolder doesn\'t exist.': 'Cet espace projet ou le dossier du groupe (groupfolder) existe déjà. Saisissez un autre espace, s\'il vous plaît.\nPar exemple, si l\'espace "toto" existe, vous ne pouvez pas créer l\'espace "tOTo".\nAssurez-vous que le groupfolder n\'existe pas.',
 		'Wrong file extension. Must be <b>.csv</b>.': 'Mauvais format de fichier. Doit être <b>.csv</b>.',
-		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Format de fichier est invalide. L\'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}'
+		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Format de fichier est invalide. L\'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}',
+		'Something went wrong. Couldn\'t open a file.': 'Quelque chose s\'est mal passé. Impossible d\'ouvrir un fichier.',
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.json b/l10n/fr.json
index 48346d364..89da9779f 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -74,7 +74,8 @@
 	"Start typing to lookup users": "Commencez à saisir du texte pour rechercher des utilisateurs",
 	"remove users from selection": "retirer l'utilisateur de la sélection",
 	"Wrong file extension. Must be <b>.csv</b>.": "Mauvais format de fichier. Doit être <b>.csv</b>.",
-	"Invalid file format. Table header doesn't contain any of the following values:<br> {values}": "Format de fichier est invalide. L'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}"
+	"Invalid file format. Table header doesn't contain any of the following values:<br> {values}": "Format de fichier est invalide. L'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}",
+	"Something went wrong. Couldn't open a file.": "Quelque chose s'est mal passé. Impossible d'ouvrir un fichier."
 },
 "pluralForm" : "nplurals=2; plural=(n > 1);"
 }

From 408ffec67dfbda5ccf9a485ecad555842f7b34b3 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 11:30:07 +0200
Subject: [PATCH 68/79] style(vue, css): change classes for table elements to
 fix picker behaviour (hover effect)

---
 css/workspace-style.css | 45 ++++++++++++++++++++++-------------------
 src/SpaceTable.vue      | 19 ++++++++---------
 src/UserTable.vue       | 29 +++++++++++---------------
 3 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/css/workspace-style.css b/css/workspace-style.css
index 61b593a40..be47df666 100644
--- a/css/workspace-style.css
+++ b/css/workspace-style.css
@@ -20,27 +20,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-th {
-	color: grey;
-	padding: 5px;
-	border-bottom: 1px solid lightgray;
-}
-
-td {
-	padding: 5px;
-	border-bottom: 1px solid lightgray;
-}
-
-tr {
-	height: 50px;
-	padding: 5px;
-}
-
-tr:hover {
-	background-color: var(--color-backgroud-hover) !important;
-}
-
 .header {
 	height: 0px;
 	display: flex;
@@ -69,7 +48,31 @@ tr:hover {
 	font-size: 20px;
 	margin-top: 10px;
 }
+<<<<<<< HEAD
 
 .user-counter {
 	margin-right: 5px;
+=======
+.table-space-detail {
+	width: 100%;
+	margin-top: -25px;
+}
+.workspace-th {
+	color: grey;
+	padding: 5px;
+	border-bottom: 1px solid lightgray;
+}
+
+.workspace-td {
+	padding: 5px;
+	border-bottom: 1px solid lightgray;
+}
+
+.workspace-tr {
+	height: 50px;
+	padding: 5px;
+}
+.workspace-tr:hover {
+	background-color: var(--color-backgroud-hover) !important;
+>>>>>>> 1b7d897 (style(vue, css): change classes for table elements to fix picker behaviour (hover effect))
 }
diff --git a/src/SpaceTable.vue b/src/SpaceTable.vue
index ccc4eb7ac..b07544f34 100644
--- a/src/SpaceTable.vue
+++ b/src/SpaceTable.vue
@@ -25,22 +25,23 @@
 		<div class="header" />
 		<table v-if="Object.keys($store.state.spaces).length" class="table-spaces">
 			<thead>
-				<tr>
-					<th />
-					<th>{{ t('workspace', 'Workspace name') }}</th>
-					<th>{{ t('workspace', 'Quota') }}</th>
-					<th>{{ t('workspace', 'Space administrators') }}</th>
+				<tr class="workspace-tr">
+					<th class="workspace-th" />
+					<th class="workspace-th">{{ t('workspace', 'Workspace name') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Quota') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Space administrators') }}</th>
 				</tr>
 			</thead>
 			<tr v-for="(space,name) in $store.state.spaces"
 				:key="name"
+        class="workspace-tr"
 				@click="openSpace(name)">
-				<td style="width: 50px;">
+				<td style="width: 50px;" class="workspace-td">
 					<span class="color-dot-home" :style="{background: space.color}" />
 				</td>
-				<td> {{ name }} </td>
-				<td> {{ space.quota }} </td>
-				<td>
+				<td class="workspace-td"> {{ name }} </td>
+				<td class="workspace-td"> {{ space.quota }} </td>
+				<td class="avatar workspace-td">
 					<div class="admin-avatars">
 						<NcAvatar v-for="user in workspaceManagers(space)"
 							:key="user.uid"
diff --git a/src/UserTable.vue b/src/UserTable.vue
index ddb1e2040..7bff83b94 100644
--- a/src/UserTable.vue
+++ b/src/UserTable.vue
@@ -24,24 +24,24 @@
 	<div>
 		<table v-if="users.length" class="table-space-detail">
 			<thead>
-				<tr>
-					<th />
-					<th style="padding-left: 15px; width: 30%;">
+				<tr class="workspace-tr">
+					<th class="workspace-th" />
+					<th class="workspace-th" style="padding-left: 15px; width: 30%;">
 						{{ t('workspace', 'Users') }}
 					</th>
-					<th>{{ t('workspace', 'Role') }}</th>
-					<th>{{ t('workspace', 'Groups') }}</th>
-					<th />
+					<th class="workspace-th">{{ t('workspace', 'Role') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Groups') }}</th>
+					<th class="workspace-th" />
 				</tr>
 			</thead>
 			<tbody>
 				<tr v-for="user in users"
 					:key="user.uid"
-					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin' : 'list user-simple'">
-					<td class="avatar">
+					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin workspace-tr' : 'list user-simple workspace-tr'">
+					<td class="avatar workspace-td">
 						<NcAvatar :display-name="user.name" :user="user.uid" />
 					</td>
-					<td style="width: 30%;">
+					<td style="width: 30%;" class="workspace-td">
 						<div class="user-name">
 							{{ user.name }}
 						</div>
@@ -49,9 +49,9 @@
 							{{ user.email }}
 						</div>
 					</td>
-					<td> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
-					<td> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
-					<td>
+					<td class="workspace-td"> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
+					<td class="workspace-td"> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
+					<td class="workspace-td">
 						<div class="user-actions">
 							<NcActions>
 								<NcActionButton v-if="$route.params.group === undefined"
@@ -202,9 +202,4 @@ export default {
 	color: gray;
 	padding-left: 10px;
 }
-
-.table-space-detail {
-	width: 100%;
-	margin-top: -25px;
-}
 </style>

From 3ad57433106e34d5630a62ff6cbcac6b96d7d04f Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 15:04:23 +0200
Subject: [PATCH 69/79] style(vue): add styles to the modal-container buttons

---
 src/SelectUsers.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index afbe56874..d59bd4ec4 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -82,6 +82,11 @@
 		<p v-if="$route.params.group && addingUsersToWorkspace" class="caution">
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
+		<div class="add-users-wrapper">
+			<button @click="addUsersToWorkspaceOrGroup()">
+				{{ t('workspace', 'Add users') }}
+			</button>
+		</div>
 		<div class="select-users-actions">
 			<button class="icon-upload" @click="uploadNewFile()">
 				<span>{{ t('workspace', 'Add users from csv file') }}</span>
@@ -94,9 +99,6 @@
 			<button class="icon-folder" @click="shareCsvFromFiles()">
 				<span>{{ t('deck', 'Import csv from Files') }}</span>
 			</button>
-			<button @click="addUsersToWorkspaceOrGroup()">
-				{{ t('workspace', 'Add users') }}
-			</button>
 		</div>
 	</div>
 </template>
@@ -369,7 +371,7 @@ export default {
 	display: flex !important;
 	min-height: 520px !important;
 	max-height: 520px !important;
-	width: 38vw !important;
+	width: 640px !important;
 }
 
 .multiselect__tags {
@@ -384,12 +386,13 @@ export default {
 	justify-content: space-around;
 }
 .select-users-actions button {
-	width: 30%;
-	flex-grow: 1;
 	display: flex;
 	flex-direction: column;
 	background-position: 10px center;
 }
+.select-users-actions button, .add-users-wrapper button {
+	width: 14rem;
+}
 
 .header-modal {
 	display: flex;

From 46aeaf71b38a3cc3ad6783b19e4cfc3fc3e2f830 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 15:32:05 +0200
Subject: [PATCH 70/79] Revert "style(vue): add styles to the modal-container
 buttons"

This reverts commit 3ad57433106e34d5630a62ff6cbcac6b96d7d04f.
---
 src/SelectUsers.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index d59bd4ec4..afbe56874 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -82,11 +82,6 @@
 		<p v-if="$route.params.group && addingUsersToWorkspace" class="caution">
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
-		<div class="add-users-wrapper">
-			<button @click="addUsersToWorkspaceOrGroup()">
-				{{ t('workspace', 'Add users') }}
-			</button>
-		</div>
 		<div class="select-users-actions">
 			<button class="icon-upload" @click="uploadNewFile()">
 				<span>{{ t('workspace', 'Add users from csv file') }}</span>
@@ -99,6 +94,9 @@
 			<button class="icon-folder" @click="shareCsvFromFiles()">
 				<span>{{ t('deck', 'Import csv from Files') }}</span>
 			</button>
+			<button @click="addUsersToWorkspaceOrGroup()">
+				{{ t('workspace', 'Add users') }}
+			</button>
 		</div>
 	</div>
 </template>
@@ -371,7 +369,7 @@ export default {
 	display: flex !important;
 	min-height: 520px !important;
 	max-height: 520px !important;
-	width: 640px !important;
+	width: 38vw !important;
 }
 
 .multiselect__tags {
@@ -386,13 +384,12 @@ export default {
 	justify-content: space-around;
 }
 .select-users-actions button {
+	width: 30%;
+	flex-grow: 1;
 	display: flex;
 	flex-direction: column;
 	background-position: 10px center;
 }
-.select-users-actions button, .add-users-wrapper button {
-	width: 14rem;
-}
 
 .header-modal {
 	display: flex;

From 318fec9ee3335453ecc7885549e8dbe29d4a363a Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 16:06:59 +0200
Subject: [PATCH 71/79] Revert "style(vue, css): change classes for table
 elements to fix picker behaviour (hover effect)"

This reverts commit 408ffec67dfbda5ccf9a485ecad555842f7b34b3.
---
 css/workspace-style.css | 45 +++++++++++++++++++----------------------
 src/SpaceTable.vue      | 19 +++++++++--------
 src/UserTable.vue       | 29 +++++++++++++++-----------
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/css/workspace-style.css b/css/workspace-style.css
index be47df666..61b593a40 100644
--- a/css/workspace-style.css
+++ b/css/workspace-style.css
@@ -20,6 +20,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+th {
+	color: grey;
+	padding: 5px;
+	border-bottom: 1px solid lightgray;
+}
+
+td {
+	padding: 5px;
+	border-bottom: 1px solid lightgray;
+}
+
+tr {
+	height: 50px;
+	padding: 5px;
+}
+
+tr:hover {
+	background-color: var(--color-backgroud-hover) !important;
+}
+
 .header {
 	height: 0px;
 	display: flex;
@@ -48,31 +69,7 @@
 	font-size: 20px;
 	margin-top: 10px;
 }
-<<<<<<< HEAD
 
 .user-counter {
 	margin-right: 5px;
-=======
-.table-space-detail {
-	width: 100%;
-	margin-top: -25px;
-}
-.workspace-th {
-	color: grey;
-	padding: 5px;
-	border-bottom: 1px solid lightgray;
-}
-
-.workspace-td {
-	padding: 5px;
-	border-bottom: 1px solid lightgray;
-}
-
-.workspace-tr {
-	height: 50px;
-	padding: 5px;
-}
-.workspace-tr:hover {
-	background-color: var(--color-backgroud-hover) !important;
->>>>>>> 1b7d897 (style(vue, css): change classes for table elements to fix picker behaviour (hover effect))
 }
diff --git a/src/SpaceTable.vue b/src/SpaceTable.vue
index b07544f34..ccc4eb7ac 100644
--- a/src/SpaceTable.vue
+++ b/src/SpaceTable.vue
@@ -25,23 +25,22 @@
 		<div class="header" />
 		<table v-if="Object.keys($store.state.spaces).length" class="table-spaces">
 			<thead>
-				<tr class="workspace-tr">
-					<th class="workspace-th" />
-					<th class="workspace-th">{{ t('workspace', 'Workspace name') }}</th>
-					<th class="workspace-th">{{ t('workspace', 'Quota') }}</th>
-					<th class="workspace-th">{{ t('workspace', 'Space administrators') }}</th>
+				<tr>
+					<th />
+					<th>{{ t('workspace', 'Workspace name') }}</th>
+					<th>{{ t('workspace', 'Quota') }}</th>
+					<th>{{ t('workspace', 'Space administrators') }}</th>
 				</tr>
 			</thead>
 			<tr v-for="(space,name) in $store.state.spaces"
 				:key="name"
-        class="workspace-tr"
 				@click="openSpace(name)">
-				<td style="width: 50px;" class="workspace-td">
+				<td style="width: 50px;">
 					<span class="color-dot-home" :style="{background: space.color}" />
 				</td>
-				<td class="workspace-td"> {{ name }} </td>
-				<td class="workspace-td"> {{ space.quota }} </td>
-				<td class="avatar workspace-td">
+				<td> {{ name }} </td>
+				<td> {{ space.quota }} </td>
+				<td>
 					<div class="admin-avatars">
 						<NcAvatar v-for="user in workspaceManagers(space)"
 							:key="user.uid"
diff --git a/src/UserTable.vue b/src/UserTable.vue
index 7bff83b94..ddb1e2040 100644
--- a/src/UserTable.vue
+++ b/src/UserTable.vue
@@ -24,24 +24,24 @@
 	<div>
 		<table v-if="users.length" class="table-space-detail">
 			<thead>
-				<tr class="workspace-tr">
-					<th class="workspace-th" />
-					<th class="workspace-th" style="padding-left: 15px; width: 30%;">
+				<tr>
+					<th />
+					<th style="padding-left: 15px; width: 30%;">
 						{{ t('workspace', 'Users') }}
 					</th>
-					<th class="workspace-th">{{ t('workspace', 'Role') }}</th>
-					<th class="workspace-th">{{ t('workspace', 'Groups') }}</th>
-					<th class="workspace-th" />
+					<th>{{ t('workspace', 'Role') }}</th>
+					<th>{{ t('workspace', 'Groups') }}</th>
+					<th />
 				</tr>
 			</thead>
 			<tbody>
 				<tr v-for="user in users"
 					:key="user.uid"
-					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin workspace-tr' : 'list user-simple workspace-tr'">
-					<td class="avatar workspace-td">
+					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin' : 'list user-simple'">
+					<td class="avatar">
 						<NcAvatar :display-name="user.name" :user="user.uid" />
 					</td>
-					<td style="width: 30%;" class="workspace-td">
+					<td style="width: 30%;">
 						<div class="user-name">
 							{{ user.name }}
 						</div>
@@ -49,9 +49,9 @@
 							{{ user.email }}
 						</div>
 					</td>
-					<td class="workspace-td"> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
-					<td class="workspace-td"> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
-					<td class="workspace-td">
+					<td> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
+					<td> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
+					<td>
 						<div class="user-actions">
 							<NcActions>
 								<NcActionButton v-if="$route.params.group === undefined"
@@ -202,4 +202,9 @@ export default {
 	color: gray;
 	padding-left: 10px;
 }
+
+.table-space-detail {
+	width: 100%;
+	margin-top: -25px;
+}
 </style>

From 2480621f3d7796de4b325d0eb31f7caf9eed6369 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 17:19:07 +0200
Subject: [PATCH 72/79] style(css,vue): fix styles for user and space tables

---
 css/workspace-style.css | 13 ++++++++-----
 src/SpaceTable.vue      | 17 +++++++++--------
 src/UserTable.vue       | 24 ++++++++++++------------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/css/workspace-style.css b/css/workspace-style.css
index 61b593a40..88047ae82 100644
--- a/css/workspace-style.css
+++ b/css/workspace-style.css
@@ -21,23 +21,26 @@
  *
  */
 
-th {
+ table-space-detail {
+	width: 100%;
+	margin-top: -25px;
+}
+.workspace-th {
 	color: grey;
 	padding: 5px;
 	border-bottom: 1px solid lightgray;
 }
 
-td {
+.workspace-td {
 	padding: 5px;
 	border-bottom: 1px solid lightgray;
 }
 
-tr {
+.workspace-tr {
 	height: 50px;
 	padding: 5px;
 }
-
-tr:hover {
+.workspace-tr:hover {
 	background-color: var(--color-backgroud-hover) !important;
 }
 
diff --git a/src/SpaceTable.vue b/src/SpaceTable.vue
index ccc4eb7ac..3add9060e 100644
--- a/src/SpaceTable.vue
+++ b/src/SpaceTable.vue
@@ -25,22 +25,23 @@
 		<div class="header" />
 		<table v-if="Object.keys($store.state.spaces).length" class="table-spaces">
 			<thead>
-				<tr>
+				<tr class="workspace-tr">
 					<th />
-					<th>{{ t('workspace', 'Workspace name') }}</th>
-					<th>{{ t('workspace', 'Quota') }}</th>
-					<th>{{ t('workspace', 'Space administrators') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Workspace name') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Quota') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Space administrators') }}</th>
 				</tr>
 			</thead>
 			<tr v-for="(space,name) in $store.state.spaces"
 				:key="name"
+        class="workspace-tr"
 				@click="openSpace(name)">
-				<td style="width: 50px;">
+				<td style="width: 50px;" class="workspace-td">
 					<span class="color-dot-home" :style="{background: space.color}" />
 				</td>
-				<td> {{ name }} </td>
-				<td> {{ space.quota }} </td>
-				<td>
+				<td class="workspace-td"> {{ name }} </td>
+				<td class="workspace-td"> {{ space.quota }} </td>
+				<td class="workspace-td">
 					<div class="admin-avatars">
 						<NcAvatar v-for="user in workspaceManagers(space)"
 							:key="user.uid"
diff --git a/src/UserTable.vue b/src/UserTable.vue
index ddb1e2040..3f76c469e 100644
--- a/src/UserTable.vue
+++ b/src/UserTable.vue
@@ -24,24 +24,24 @@
 	<div>
 		<table v-if="users.length" class="table-space-detail">
 			<thead>
-				<tr>
-					<th />
-					<th style="padding-left: 15px; width: 30%;">
+				<tr class="workspace-tr">
+					<th class="workspace-th" />
+					<th class="workspace-th" style="padding-left: 15px; width: 30%;">
 						{{ t('workspace', 'Users') }}
 					</th>
-					<th>{{ t('workspace', 'Role') }}</th>
-					<th>{{ t('workspace', 'Groups') }}</th>
-					<th />
+					<th class="workspace-th">{{ t('workspace', 'Role') }}</th>
+					<th class="workspace-th">{{ t('workspace', 'Groups') }}</th>
+					<th class="workspace-th" />
 				</tr>
 			</thead>
 			<tbody>
 				<tr v-for="user in users"
 					:key="user.uid"
-					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin' : 'list user-simple'">
-					<td class="avatar">
+					:class="$store.getters.isSpaceAdmin(user, $route.params.space) ? 'list user-admin workspace-tr' : 'list user-simple workspace-tr'">
+					<td class="avatar workspace-td">
 						<NcAvatar :display-name="user.name" :user="user.uid" />
 					</td>
-					<td style="width: 30%;">
+					<td style="width: 30%;" class="workspace-td">
 						<div class="user-name">
 							{{ user.name }}
 						</div>
@@ -49,9 +49,9 @@
 							{{ user.email }}
 						</div>
 					</td>
-					<td> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
-					<td> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
-					<td>
+					<td class="workspace-td"> {{ t('workspace', $store.getters.isSpaceAdmin(user, $route.params.space) ? 'admin' : 'user') }} </td>
+					<td class="workspace-td"> {{ user.groups.map(group => $store.getters.groupName($route.params.space, group)).join(', ') }} </td>
+					<td class="workspace-td">
 						<div class="user-actions">
 							<NcActions>
 								<NcActionButton v-if="$route.params.group === undefined"

From 24c5aba41653b987769de16f4fd9d48d6a0c4fb4 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Mon, 24 Jul 2023 17:29:01 +0200
Subject: [PATCH 73/79] style(vue): add width to the modal container buttons

---
 src/SelectUsers.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index afbe56874..42dfb3d77 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -82,6 +82,11 @@
 		<p v-if="$route.params.group && addingUsersToWorkspace" class="caution">
 			{{ t('workspace', 'Caution, users highlighted in red are not yet member of this workspace. They will be automaticaly added.') }}
 		</p>
+    <div class="add-users-wrapper">
+      <button @click="addUsersToWorkspaceOrGroup()">
+        {{ t('workspace', 'Add users') }}
+      </button>
+    </div>
 		<div class="select-users-actions">
 			<button class="icon-upload" @click="uploadNewFile()">
 				<span>{{ t('workspace', 'Add users from csv file') }}</span>
@@ -94,9 +99,6 @@
 			<button class="icon-folder" @click="shareCsvFromFiles()">
 				<span>{{ t('deck', 'Import csv from Files') }}</span>
 			</button>
-			<button @click="addUsersToWorkspaceOrGroup()">
-				{{ t('workspace', 'Add users') }}
-			</button>
 		</div>
 	</div>
 </template>
@@ -369,7 +371,7 @@ export default {
 	display: flex !important;
 	min-height: 520px !important;
 	max-height: 520px !important;
-	width: 38vw !important;
+	width: 640px !important;
 }
 
 .multiselect__tags {
@@ -384,12 +386,13 @@ export default {
 	justify-content: space-around;
 }
 .select-users-actions button {
-	width: 30%;
-	flex-grow: 1;
-	display: flex;
+  display: flex;
 	flex-direction: column;
 	background-position: 10px center;
 }
+.select-users-actions button, .add-users-wrapper button {
+  width: 230px;
+}
 
 .header-modal {
 	display: flex;

From 7f545c337c3407630aa306838abcaaae0b34c78e Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Tue, 25 Jul 2023 17:06:35 +0200
Subject: [PATCH 74/79] style(vue): replace css spinner by a built-in spinner
 of Nextcloud

removed lds-ring class and corresponding styles and added NcLoadingIcon
---
 src/WorkspaceContent.vue | 50 ++++------------------------------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/src/WorkspaceContent.vue b/src/WorkspaceContent.vue
index 728e426b3..3c874e2d1 100644
--- a/src/WorkspaceContent.vue
+++ b/src/WorkspaceContent.vue
@@ -23,9 +23,8 @@
 	<NcAppContent>
 		<NcAppContentDetails>
 			<div
-				v-if="$store.state.loading"
-				class="lds-ring">
-				<div /><div /><div /><div />
+				v-if="$store.state.loading">
+				<NcLoadingIcon :size="64" appearance="dark" name="Loading on light background" />
 			</div>
 			<div v-else class="workspace-content">
 				<router-view />
@@ -36,7 +35,7 @@
 			v-if="showSelectGroupfoldersModal"
 			@close="toggleShowSelectGroupfoldersModal">
 			<SelectGroupfolders @close="toggleShowSelectGroupfoldersModal" />
-  </NcModal> -->
+	</NcModal> -->
 </template>
 
 <script>
@@ -46,11 +45,13 @@ import showNotificationError from './services/Notifications/NotificationError.js
 import { get, formatGroups, formatUsers } from './services/groupfoldersService.js'
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import NcAppContentDetails from '@nextcloud/vue/dist/Components/NcAppContentDetails.js'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon'
 export default {
 	name: 'WorkspaceContent',
 	components: {
 		NcAppContent,
 		NcAppContentDetails,
+		NcLoadingIcon,
 	},
 	created() {
 		if (Object.entries(this.$store.state.spaces).length === 0) {
@@ -176,47 +177,6 @@ export default {
 	Code for the loading.
 	Source code: https://loading.io/css/
 */
-.lds-ring {
-	display: inline-block;
-	position: relative;
-	width: 80px;
-	height: 80px;
-}
-
-.lds-ring div {
-	box-sizing: border-box;
-	display: block;
-	position: absolute;
-	width: 64px;
-	height: 64px;
-	margin: 8px;
-	border: 8px solid var(--color-primary-element);
-	border-radius: 50%;
-	animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
-	border-color: var(--color-primary-element) transparent transparent transparent;
-}
-
-.lds-ring div:nth-child(1) {
-	animation-delay: -0.45s;
-}
-
-.lds-ring div:nth-child(2) {
-	animation-delay: -0.3s;
-}
-
-.lds-ring div:nth-child(3) {
-	animation-delay: -0.15s;
-}
-
-@keyframes lds-ring {
-	0% {
-		transform: rotate(0deg);
-	}
-	100% {
-		transform: rotate(360deg);
-	}
-}
-
 .workspace-content {
 	height: 100%;
 	width: 100%;

From 1c95723c2a4b325c3ef81611bb0983796f107d11 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 27 Jul 2023 14:50:00 +0200
Subject: [PATCH 75/79] chore(vue): add .js to the dependency to fix eslint
 error

---
 src/WorkspaceContent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WorkspaceContent.vue b/src/WorkspaceContent.vue
index 3c874e2d1..09e0d5ce9 100644
--- a/src/WorkspaceContent.vue
+++ b/src/WorkspaceContent.vue
@@ -45,7 +45,7 @@ import showNotificationError from './services/Notifications/NotificationError.js
 import { get, formatGroups, formatUsers } from './services/groupfoldersService.js'
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import NcAppContentDetails from '@nextcloud/vue/dist/Components/NcAppContentDetails.js'
-import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon'
+import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 export default {
 	name: 'WorkspaceContent',
 	components: {

From a6ef3af290d4ddf712350eb758bf8de3856912d8 Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 27 Jul 2023 17:52:45 +0200
Subject: [PATCH 76/79] chore(vue): add improvements in buttons styles and
 change parameter of t function

changed parameter from 'deck' to 'workspace'
---
 src/SelectUsers.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/SelectUsers.vue b/src/SelectUsers.vue
index 42dfb3d77..1a4eb7c06 100644
--- a/src/SelectUsers.vue
+++ b/src/SelectUsers.vue
@@ -96,8 +96,8 @@
 				style="display: none;"
 				multiple
 				@change="handleUploadFile">
-			<button class="icon-folder" @click="shareCsvFromFiles()">
-				<span>{{ t('deck', 'Import csv from Files') }}</span>
+			<button class="icon-folder" style="padding: 8px 32px;" @click="shareCsvFromFiles()">
+				<span>{{ t('workspace', 'Import csv from Files') }}</span>
 			</button>
 		</div>
 	</div>
@@ -111,7 +111,7 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
 import ManagerGroup from './services/Groups/ManagerGroup.js'
 import UserGroup from './services/Groups/UserGroup.js'
-import { generateUrl, generateOcsUrl } from '@nextcloud/router'
+import { generateUrl } from '@nextcloud/router'
 import showNotificationError from './services/Notifications/NotificationError.js'
 import { getFilePickerBuilder } from '@nextcloud/dialogs'
 
@@ -391,7 +391,7 @@ export default {
 	background-position: 10px center;
 }
 .select-users-actions button, .add-users-wrapper button {
-  width: 230px;
+  width: fit-content;
 }
 
 .header-modal {

From e1a3172bea5176efc8d9ec29d85a838a333d4eaf Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Thu, 27 Jul 2023 17:54:04 +0200
Subject: [PATCH 77/79] chore(js,json): add translations for buttons

---
 l10n/en.js   | 2 ++
 l10n/fr.js   | 2 ++
 l10n/fr.json | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/l10n/en.js b/l10n/en.js
index 52e2323ea..a08431b6b 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -80,5 +80,7 @@ OC.L10N.register(
 		'Wrong file extension. Must be <b>.csv</b>.': 'Wrong file extension. Must be <b>.csv</b>.',
 		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}',
 		'Something went wrong. Couldn\'t open a file.': 'Quelque chose s\'est mal passé. Impossible d\'ouvrir un fichier.',
+		'Add users from csv file': 'Ajouter à partir du fichier csv',
+		'Import csv from Files': 'Importer csv à partir de Files'
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.js b/l10n/fr.js
index 3f34f7f9b..090058aad 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -82,5 +82,7 @@ OC.L10N.register(
 		'Wrong file extension. Must be <b>.csv</b>.': 'Mauvais format de fichier. Doit être <b>.csv</b>.',
 		'Invalid file format. Table header doesn\'t contain any of the following values:<br> {values}': 'Format de fichier est invalide. L\'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}',
 		'Something went wrong. Couldn\'t open a file.': 'Quelque chose s\'est mal passé. Impossible d\'ouvrir un fichier.',
+		'Add users from csv file': 'Ajouter à partir du fichier csv',
+		'Import csv from Files': 'Importer csv à partir de Files'
 	},
 "nplurals=2; plural=(n > 1)");
diff --git a/l10n/fr.json b/l10n/fr.json
index 89da9779f..5bbdbcdea 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -75,7 +75,9 @@
 	"remove users from selection": "retirer l'utilisateur de la sélection",
 	"Wrong file extension. Must be <b>.csv</b>.": "Mauvais format de fichier. Doit être <b>.csv</b>.",
 	"Invalid file format. Table header doesn't contain any of the following values:<br> {values}": "Format de fichier est invalide. L'en-tête du tableau ne contient aucune des valeurs suivantes :<br> {values}",
-	"Something went wrong. Couldn't open a file.": "Quelque chose s'est mal passé. Impossible d'ouvrir un fichier."
+	"Something went wrong. Couldn't open a file.": "Quelque chose s'est mal passé. Impossible d'ouvrir un fichier.",
+	"Add users from csv file": "Ajouter à partir du fichier csv",
+	"Import csv from Files": "Importer csv à partir de Files"
 },
 "pluralForm" : "nplurals=2; plural=(n > 1);"
 }

From 7e015d4688dcf1b5f3e792d3d1d3e096cc72a1ff Mon Sep 17 00:00:00 2001
From: acdmft <crankyfox@protonmail>
Date: Fri, 28 Jul 2023 09:44:28 +0200
Subject: [PATCH 78/79] style(php): fix issues of the CI with 'composer cs:fix'
 command

---
 lib/Controller/FileCSVController.php         | 139 +++++++++----------
 lib/Files/Csv.php                            |  91 ++++++------
 lib/Files/InternalFile.php                   |  40 +++---
 lib/Files/LocalFile.php                      |  38 +++--
 lib/Files/ManagerConnectionFileInterface.php |   7 +-
 5 files changed, 152 insertions(+), 163 deletions(-)

diff --git a/lib/Controller/FileCSVController.php b/lib/Controller/FileCSVController.php
index 4cd1ad3d8..2dce3ea4e 100644
--- a/lib/Controller/FileCSVController.php
+++ b/lib/Controller/FileCSVController.php
@@ -25,20 +25,19 @@
 
 namespace OCA\Workspace\Controller;
 
-use OCP\IRequest;
-use OCP\Files\Node;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\AppFramework\Http;
-use OCP\Files\IRootFolder;
 use OCA\Workspace\Files\Csv;
-use OCP\Files\Storage\IStorage;
-use OCP\AppFramework\Controller;
-use OCA\Workspace\Files\LocalFile;
 use OCA\Workspace\Files\InternalFile;
+use OCA\Workspace\Files\LocalFile;
 use OCA\Workspace\Service\UserService;
-use OCP\AppFramework\Http\JSONResponse;
 use OCA\Workspace\Service\WorkspaceService;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\Files\IRootFolder;
+use OCP\Files\Node;
+use OCP\IRequest;
+use OCP\IUserManager;
+use OCP\IUserSession;
 
 class FileCSVController extends Controller {
 	private $currentUser;
@@ -71,43 +70,43 @@ public function import(): JSONResponse {
 
 		if ($this->isCSVMimeType($file)) {
 			return new JSONResponse(
-                [
-                    'Wrong file extension. Must be <b>.csv</b>.'
-                ],
-                Http::STATUS_FORBIDDEN
-            );
+				[
+					'Wrong file extension. Must be <b>.csv</b>.'
+				],
+				Http::STATUS_FORBIDDEN
+			);
+		}
+
+		$csv = new Csv();
+
+		$localFile = new LocalFile($file['tmp_name']);
+
+		if (!$csv->hasProperHeader($localFile)) {
+			return new JSONResponse(
+				[
+					'Invalid file format. Table header doesn\'t contain any of the following values:<br>',
+					[
+						...$csv::DISPLAY_NAME,
+						...$csv::ROLE
+					]
+				],
+				Http::STATUS_FORBIDDEN
+			);
+		} else {
+			new JSONResponse(
+				[
+					'Something went wrong. Couldn\'t open a file.'
+				],
+				Http::STATUS_FORBIDDEN
+			);
 		}
 
-        $csv = new Csv();
-
-        $localFile = new LocalFile($file['tmp_name']);
-
-        if (!$csv->hasProperHeader($localFile)) {
-            return new JSONResponse(
-                [
-                    'Invalid file format. Table header doesn\'t contain any of the following values:<br>',
-                    [
-                        ...$csv::DISPLAY_NAME,
-                        ...$csv::ROLE
-                    ]
-                ],
-                Http::STATUS_FORBIDDEN
-            );
-        } else {
-            new JSONResponse(
-                [
-                    'Something went wrong. Couldn\'t open a file.'
-                ],
-                Http::STATUS_FORBIDDEN
-            );
-        }
-
-        $names = $csv->parser($localFile);
-        
+		$names = $csv->parser($localFile);
+		
 		$existingNames = array_filter($names, function ($user) {
-			return $this->userManager->userExists($user['name']);	
+			return $this->userManager->userExists($user['name']);
 		});
-        
+		
 		// get list of IUser objects
 		$users = $this->formatUsers($existingNames);
 
@@ -136,53 +135,53 @@ public function getFromFiles():JSONResponse {
 		}
 
 		$fullPath = $file->getInternalPath();
-        $csv = new Csv();
-        $internalFile = new InternalFile($fullPath, $file->getStorage());
+		$csv = new Csv();
+		$internalFile = new InternalFile($fullPath, $file->getStorage());
 
-        if (!$csv->hasProperHeader($internalFile)) {
-            return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
-        }
+		if (!$csv->hasProperHeader($internalFile)) {
+			return new JSONResponse(['Invalid file format. Table header doesn\'t contain any of the following values:<br>', [...$csv::DISPLAY_NAME, ...$csv::ROLE]], Http::STATUS_FORBIDDEN);
+		}
 
-        $names = $csv->parser($internalFile);
+		$names = $csv->parser($internalFile);
 
-        // filter array to leave only existing users
+		// filter array to leave only existing users
 		$existingNames = array_filter($names, function ($user) {
-			return $this->userManager->userExists($user['name']);	
+			return $this->userManager->userExists($user['name']);
 		});
 
-        $users = $this->formatUsers($existingNames);
+		$users = $this->formatUsers($existingNames);
 
 		$data = $this->formatData($users, $space);
 
 		return new JSONResponse($data);
 	}
 
-    private function formatData(array $users, array $space): array {
-        $data = [];
+	private function formatData(array $users, array $space): array {
+		$data = [];
 		foreach ($users as $user) {
 			$role = $user['role'] == "admin" ? "admin" : "user";
 			$data[] = $this->userService->formatUser($user['user'], $space, $role);
 		}
 
-        return $data;
-    }
+		return $data;
+	}
 
-    private function formatUsers(array $data): array {
-        $users = [];
-        foreach($data as $user) {
+	private function formatUsers(array $data): array {
+		$users = [];
+		foreach($data as $user) {
 			$users[] = [
-                'user' => $this->userManager->get($user['name']),
-                'role' => $user['role']
-            ];
+				'user' => $this->userManager->get($user['name']),
+				'role' => $user['role']
+			];
 		}
-        return $users;
-    }
+		return $users;
+	}
 
-    private function isCSVMimeType(Node|array $file): bool {
-        if($file instanceof Node) {
-            return $file->getMimetype() !== 'text/csv';
-        }
+	private function isCSVMimeType(Node|array $file): bool {
+		if($file instanceof Node) {
+			return $file->getMimetype() !== 'text/csv';
+		}
 
-        return $file['type'] !== 'text/csv';
-    }
+		return $file['type'] !== 'text/csv';
+	}
 }
diff --git a/lib/Files/Csv.php b/lib/Files/Csv.php
index aa759eee8..8dfd7b90f 100644
--- a/lib/Files/Csv.php
+++ b/lib/Files/Csv.php
@@ -26,65 +26,64 @@
 namespace OCA\Workspace\Files;
 
 use Exception;
-use OCP\AppFramework\Http\JSONResponse;
 
 class Csv {
 
-    const DISPLAY_NAME = ["username", "displayname", "name"];
-    const ROLE = ["role", "status", "userrole"];
+	public const DISPLAY_NAME = ["username", "displayname", "name"];
+	public const ROLE = ["role", "status", "userrole"];
 
-    private function getIndex(array $haystack, array $needles): int|bool {
-        $index = null;
-        foreach($haystack as $key=>$value) {
-            $index = array_search($value, $needles);
-            if ($index !== false) {
-                return $index;
-            }
-        }
-        return false;
-    }
-    
-    public function parser(ManagerConnectionFileInterface $file) {
-        $handle = $file->open();
-        
-        if ($handle === false) {
-            throw new Exception("Imposible to open the $file->getPath() file.");
-        }
+	private function getIndex(array $haystack, array $needles): int|bool {
+		$index = null;
+		foreach($haystack as $key => $value) {
+			$index = array_search($value, $needles);
+			if ($index !== false) {
+				return $index;
+			}
+		}
+		return false;
+	}
+	
+	public function parser(ManagerConnectionFileInterface $file) {
+		$handle = $file->open();
+		
+		if ($handle === false) {
+			throw new Exception("Imposible to open the $file->getPath() file.");
+		}
 
 		$users = [];
-        // rewind($handle);
-        $tableHeader = fgetcsv($handle, 1000, ","); // ignore the first line
-        $tableHeader = array_map('strtolower', $tableHeader);
+		// rewind($handle);
+		$tableHeader = fgetcsv($handle, 1000, ","); // ignore the first line
+		$tableHeader = array_map('strtolower', $tableHeader);
 
-        $nameIndex = $this->getIndex($this::DISPLAY_NAME, $tableHeader);
-        $roleIndex = $this->getIndex($this::ROLE, $tableHeader);
+		$nameIndex = $this->getIndex($this::DISPLAY_NAME, $tableHeader);
+		$roleIndex = $this->getIndex($this::ROLE, $tableHeader);
 
-        while (($data = fgetcsv($handle, 1000, ",")) !== false) {
-            $users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
-        }
-        $file->close();
+		while (($data = fgetcsv($handle, 1000, ",")) !== false) {
+			$users[] = ['name' => $data[$nameIndex], 'role' => $data[$roleIndex]];
+		}
+		$file->close();
 
 		return $users;
 	}
 
-    public function hasProperHeader(ManagerConnectionFileInterface $file): bool {
-        // var_dump($path);
-        // die();
-        $res = false;
-        if (($handle = $file->open()) !== false) {
-            $tableHeader = fgetcsv($handle, 1000, ",");
-            $tableHeader = array_map('strtolower', $tableHeader);
-            // var_dump($tableHeader);
-            // die();
+	public function hasProperHeader(ManagerConnectionFileInterface $file): bool {
+		// var_dump($path);
+		// die();
+		$res = false;
+		if (($handle = $file->open()) !== false) {
+			$tableHeader = fgetcsv($handle, 1000, ",");
+			$tableHeader = array_map('strtolower', $tableHeader);
+			// var_dump($tableHeader);
+			// die();
 
-            $nameIndex = $this->getIndex(self::DISPLAY_NAME, $tableHeader);
-            $roleIndex = $this->getIndex(self::ROLE, $tableHeader);
+			$nameIndex = $this->getIndex(self::DISPLAY_NAME, $tableHeader);
+			$roleIndex = $this->getIndex(self::ROLE, $tableHeader);
 
-            $res = ($nameIndex !== false) && ($roleIndex !== false);
-        }
-        
-        $file->close();
+			$res = ($nameIndex !== false) && ($roleIndex !== false);
+		}
+		
+		$file->close();
 
-        return $res;
-    }
+		return $res;
+	}
 }
diff --git a/lib/Files/InternalFile.php b/lib/Files/InternalFile.php
index a8542b375..13cf5eb40 100644
--- a/lib/Files/InternalFile.php
+++ b/lib/Files/InternalFile.php
@@ -4,29 +4,25 @@
 
 use OCP\Files\Storage\IStorage;
 
-class InternalFile implements ManagerConnectionFileInterface
-{
-    private $resource;
-        
-    public function __construct(private string $path, private IStorage $store)
-    {
-    }
+class InternalFile implements ManagerConnectionFileInterface {
+	private $resource;
+		
+	public function __construct(private string $path, private IStorage $store) {
+	}
 
-    /**
-     * @return resource|false
-     */
-    public function open()
-    {
-        $this->resource =  $this->store->fopen($this->path, "r");
-        return $this->resource;
-    }
+	/**
+	 * @return resource|false
+	 */
+	public function open() {
+		$this->resource = $this->store->fopen($this->path, "r");
+		return $this->resource;
+	}
 
-    public function close(): bool
-    {
-        return fclose($this->resource);
-    }
+	public function close(): bool {
+		return fclose($this->resource);
+	}
 
-    public function getPath(): string {
-        return $this->path;
-    }
+	public function getPath(): string {
+		return $this->path;
+	}
 }
diff --git a/lib/Files/LocalFile.php b/lib/Files/LocalFile.php
index aa2044f23..0f9d4f42f 100644
--- a/lib/Files/LocalFile.php
+++ b/lib/Files/LocalFile.php
@@ -2,29 +2,25 @@
 
 namespace OCA\Workspace\Files;
 
-class LocalFile implements ManagerConnectionFileInterface
-{
-    private $resource;
+class LocalFile implements ManagerConnectionFileInterface {
+	private $resource;
 
-    public function __construct(private string $path)
-    {
-    }
+	public function __construct(private string $path) {
+	}
 
-    /**
-     * @return resource|false
-     */
-    public function open()
-    {
-        $this->resource = fopen($this->path, "r");
-        return $this->resource;
-    }
+	/**
+	 * @return resource|false
+	 */
+	public function open() {
+		$this->resource = fopen($this->path, "r");
+		return $this->resource;
+	}
 
-    public function close(): bool
-    {
-        return fclose($this->resource);
-    }
+	public function close(): bool {
+		return fclose($this->resource);
+	}
 
-    public function getPath(): string {
-        return $this->path;
-    }
+	public function getPath(): string {
+		return $this->path;
+	}
 }
diff --git a/lib/Files/ManagerConnectionFileInterface.php b/lib/Files/ManagerConnectionFileInterface.php
index 3c3f5db27..c35bbdcc8 100644
--- a/lib/Files/ManagerConnectionFileInterface.php
+++ b/lib/Files/ManagerConnectionFileInterface.php
@@ -2,8 +2,7 @@
 
 namespace OCA\Workspace\Files;
 
-interface ManagerConnectionFileInterface
-{
-    public function open();
-    public function close();
+interface ManagerConnectionFileInterface {
+	public function open();
+	public function close();
 }

From 45cfe288508c9dde66328b743e28b52bcf8953a2 Mon Sep 17 00:00:00 2001
From: Baptiste Fotia <baptiste.fotia@arawa.fr>
Date: Wed, 23 Aug 2023 15:04:22 +0200
Subject: [PATCH 79/79] fix(php): Prevent a duplicate users_oidc (#892)

This commit prevent a duplicate users when we search them with the `apps/workspace/api/autoComplete/:term/:spaceId` api/rest.
---
 lib/Service/WorkspaceService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Service/WorkspaceService.php b/lib/Service/WorkspaceService.php
index fe1071cf0..f54da3958 100644
--- a/lib/Service/WorkspaceService.php
+++ b/lib/Service/WorkspaceService.php
@@ -65,6 +65,8 @@ private function searchUsersByDisplayName(string $term): array {
 		$term = $term === '*' ? '' : $term;
 		$users = $this->userManager->searchDisplayName($term, 50);
 
+		$users = array_unique($users, SORT_REGULAR);
+
 		return $users;
 	}