Merge pull request #2565 from scott-ray-wilson/add-project-users-mult…

…i-select Feature: Multi-Select Component and Improve Adding Users to Project
Infisical · Oct 9, 2024 · 2ae91db · 2ae91db
2 parents b482a9c + 529328f
commit 2ae91db
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 211 deletions.
diff --git a/backend/src/services/org/org-dal.ts b/backend/src/services/org/org-dal.ts
@@ -108,7 +108,9 @@ export const orgDALFactory = (db: TDbClient) => {
           db.ref("id").withSchema(TableName.Users).as("userId"),
           db.ref("publicKey").withSchema(TableName.UserEncryptionKey)
         )
-        .where({ isGhost: false }); // MAKE SURE USER IS NOT A GHOST USER
+        .where({ isGhost: false }) // MAKE SURE USER IS NOT A GHOST USER
+        .orderBy("firstName")
+        .orderBy("lastName");
 
       return members.map(({ email, isEmailVerified, username, firstName, lastName, userId, publicKey, ...data }) => ({
         ...data,

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -101,6 +101,7 @@
     "react-mailchimp-subscribe": "^2.1.3",
     "react-markdown": "^8.0.3",
     "react-redux": "^8.0.2",
+    "react-select": "^5.8.1",
     "react-table": "^7.8.0",
     "react-toastify": "^9.1.3",
     "sanitize-html": "^2.12.1",