Merge pull request #1096 from arawa/backport/improve-select-users-and…

…-csv-import-users/909/stable3.3 Backport: Implement user import from CSV in Workspace
arawa · Dec 5, 2024 · d69bebf · d69bebf
2 parents e5c745c + 6dc9584
commit d69bebf
Show file tree

Hide file tree

Showing 67 changed files with 3,062 additions and 1,467 deletions.
diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml
@@ -17,8 +17,8 @@ jobs:
         uses: skjnldsv/[email protected]
         id: versions
         with:
-          fallbackNpm: '^7'
-          fallbackNode: '^14'
+          fallbackNpm: '^9'
+          fallbackNode: '^20'
 
       - name: Use Node.js ${{ steps.versions.outputs.nodeVersion }}
         uses: actions/setup-node@v2

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -21,8 +21,8 @@ jobs:
         uses: skjnldsv/[email protected]
         id: versions
         with:
-          fallbackNpm: '^7'
-          fallbackNode: '^14'
+          fallbackNpm: '^9'
+          fallbackNode: '^20'
 
       - name: Use Node.js ${{ steps.versions.outputs.nodeVersion }}
         uses: actions/setup-node@v2

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -128,6 +128,16 @@
 			'url' => '/api/group/addUser/{spaceId}',
 			'verb' => 'POST',
 		],
+		[
+			'name' => 'fileCSV#import',
+			'url' => '/space/{spaceId}/import-users/local',
+			'verb' => 'POST',
+		],
+		[
+			'name' => 'fileCSV#getFromFiles',
+			'url' => '/space/{spaceId}/import-users/files',
+			'verb' => 'POST',
+		],
 		[
 			'name' => 'space#updateColorCode',
 			'url' => '/workspaces/{spaceId}/color',