finally fix session dependant Form save redirect url

components/publisher/PublisherForm.js

@@ -15,8 +15,7 @@ import AvailabilityList from "../availability/AvailabilityList";
 import ShiftsList from "../publisher/ShiftsList.tsx";
 import ConfirmationModal from "../ConfirmationModal";
 import { UserRole } from "@prisma/client";
-
-// const { data: session } = useSession()
+import { useSession } from "next-auth/react"
 
 // import { Tabs, List } from 'tw-elements'
 
@@ -59,10 +58,13 @@ Array.prototype.groupBy = function (prop) {
 
 export default function PublisherForm({ item, me }) {
   const router = useRouter();
+  const { data: session } = useSession()
+
   const urls = {
     apiUrl: "/api/data/publishers/",
-    indexUrl: "/dash"
+    indexUrl: session?.user?.role == UserRole.ADMIN ? "/cart/publishers" : "/dash"
   }
+  console.log("urls.indexUrl: " + urls.indexUrl);
   const [helpers, setHelper] = useState(null);
   const [isModalOpen, setIsModalOpen] = useState(false);
 

pages/api/email.ts

@@ -95,7 +95,7 @@ export default async function handler(req, res) {
                     res.redirect(messagePageUrl);
                     return;
                 }
-
+                let originalPublisher = assignment.publisher;
                 let to = assignment.shift.assignments.map(a => a.publisher.email);
                 to.push(publisher.email);
 
@@ -138,7 +138,7 @@ export default async function handler(req, res) {
                         publisher: { connect: { id: publisher.id } },
                         shift: { connect: { id: assignment.shiftId } },
                         type: EventLogType.AssignmentReplacementAccepted,
-                        content: "Заявка за заместване приета от " + publisher.firstName + " " + publisher.lastName
+                        content: `Заявката за заместване на ${originalPublisher.firstName} ${originalPublisher.lastName} е приета от ${publisher.firstName} ${publisher.lastName}`
                     }
                 });
 

pages/auth/signin.tsx

@@ -3,7 +3,7 @@ import { getCsrfToken, signIn } from 'next-auth/react';
 import React, { useState } from 'react';
 import { useRouter } from 'next/router';
 import Layout from '../../components/layout';
-const { data: session } = useSession()
+import { useSession } from "next-auth/react"
 
 export default function SignIn({ csrfToken }) {
     const [email, setEmail] = useState('');
@@ -11,6 +11,7 @@ export default function SignIn({ csrfToken }) {
     const [error, setError] = useState('');
     const router = useRouter();
 
+    const { data: session } = useSession()
     //handle callbackUrl
     const { callbackUrl } = router.query;
     if (callbackUrl) {