fix invitation edit

petio-team · Mar 24, 2024 · a779941 · a779941
1 parent 01f055b
commit a779941
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 deletions.
diff --git a/admin/src/data/Api/actions.js b/admin/src/data/Api/actions.js
@@ -724,7 +724,7 @@ export async function deleteInvitation(id) {
   return api.deleteInvitation(id);
 }
 export async function updateInvitation(invitation) {
-  return api.deleteInvitation(invitation);
+  return api.updateInvitation(invitation);
 }
 export async function acceptInvitation(acceptedBy, invitCode) {
   return api.deleteInvitation(acceptedBy, invitCode);

diff --git a/admin/src/page/Invitation.js b/admin/src/page/Invitation.js
@@ -34,57 +34,12 @@ class Invitation extends React.Component {
     this.updateUrlRedirection = this.updateUrlRedirection.bind(this);
   }
 
-  openModal(id, invitation) {
-    if (invitation) {
-      this.setState({
-        invForm: {
-          _id: invitation._id,
-          code: invitation.invitCode || this.generateInvitationCode(),
-          email: invitation.email || "",
-          expireOn: invitation.expireOn || "",
-          maxUses: invitation.maxUses || "",
-          libraries: invitation.libraries.map((l) => l.uuid),
-          downloadPermitted: !!invitation.downloadPermitted,
-        },
-      });
-    }
-
-    this.setState({
-      [`${id}Open`]: true,
-    });
-  }
-
-  closeModal(id) {
-    this.setState({
-      [`${id}Open`]: false,
-    });
-  }
-
   componentDidMount() {
     this.getPlexLibraries();
     this.getInvitations();
     this.getUrlRedirection();
   }
 
-  getInvitationExpireOnDate(expireOn) {
-    switch (expireOn) {
-      case "expire1Day":
-        return new Date(new Date().getTime() + 24 * 60 * 60 * 1000);
-      case "expire1Week":
-        return new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000);
-      case "expire1Month":
-        return new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000);
-      case "expire6Months":
-        return new Date(new Date().getTime() + 6 * 30 * 24 * 60 * 60 * 1000);
-      case "expire1Year":
-        return new Date(new Date().getTime() + 365 * 24 * 60 * 60 * 1000);
-      case "expireNever":
-        return null;
-      default:
-        return null;
-    }
-  }
-
   async getPlexLibraries() {
     const libraries = await Api.getPlexLibraries();
 
@@ -180,6 +135,32 @@ class Invitation extends React.Component {
     }
   }
 
+  openModal(id, invitation) {
+    if (invitation) {
+      this.setState({
+        invForm: {
+          _id: invitation._id,
+          code: invitation.invitCode || this.generateInvitationCode(),
+          email: invitation.email || "",
+          expireOn: invitation.expireOn || "",
+          maxUses: invitation.maxUses || "",
+          libraries: invitation.libraries.map((l) => l.uuid),
+          downloadPermitted: !!invitation.downloadPermitted,
+        },
+      });
+    }
+
+    this.setState({
+      [`${id}Open`]: true,
+    });
+  }
+
+  closeModal(id) {
+    this.setState({
+      [`${id}Open`]: false,
+    });
+  }
+
   generateInvitationCode() {
     let code = "";
     const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -193,6 +174,25 @@ class Invitation extends React.Component {
     return code;
   }
 
+  getInvitationExpireOnDate(expireOn) {
+    switch (expireOn) {
+      case "expire1Day":
+        return new Date(new Date().getTime() + 24 * 60 * 60 * 1000);
+      case "expire1Week":
+        return new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000);
+      case "expire1Month":
+        return new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000);
+      case "expire6Months":
+        return new Date(new Date().getTime() + 6 * 30 * 24 * 60 * 60 * 1000);
+      case "expire1Year":
+        return new Date(new Date().getTime() + 365 * 24 * 60 * 60 * 1000);
+      case "expireNever":
+        return null;
+      default:
+        return null;
+    }
+  }
+
   inputChange(field, value) {
     this.setState((state) => ({
       invForm: { ...state.invForm, [field]: value },

diff --git a/api/routes/invitation.js b/api/routes/invitation.js
@@ -114,7 +114,7 @@ adminInvitationRouter.post("/", async (req, res) => {
         libraries: invitation.libraries,
         downloadPermitted: invitation.downloadPermitted,
       },
-      { new: true }
+      { useFindAndModify: false, new: true }
     );
 
     res.status(200).json(await formatInvitation(updatedInvitation));