From 1b90b78cfbac86a8bb2a53f5753af92ee0d2a3ee Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:28:08 +0300
Subject: [PATCH 01/16] Create context for selected entry state

---
 .../entry-context/EntryContext.ts              |  9 +++++++++
 .../entry-context/EntryContextProvider.tsx     | 18 ++++++++++++++++++
 .../entry-context/useEntryContext.ts           | 10 ++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 web/src/components/workday-browser/entry-context/EntryContext.ts
 create mode 100644 web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
 create mode 100644 web/src/components/workday-browser/entry-context/useEntryContext.ts

diff --git a/web/src/components/workday-browser/entry-context/EntryContext.ts b/web/src/components/workday-browser/entry-context/EntryContext.ts
new file mode 100644
index 00000000..f695a276
--- /dev/null
+++ b/web/src/components/workday-browser/entry-context/EntryContext.ts
@@ -0,0 +1,9 @@
+import { createContext } from "react";
+import { Entry } from "../../../graphql/generated/graphql";
+
+type EntryContextValue = {
+  selectedEntry: Entry | null;
+  setSelectedEntry: (entry: Entry | null) => void;
+};
+
+export const EntryContext = createContext<EntryContextValue | undefined>(undefined);
diff --git a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
new file mode 100644
index 00000000..252803d7
--- /dev/null
+++ b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
@@ -0,0 +1,18 @@
+import { ReactNode, useState } from "react";
+import { EntryContext } from "./EntryContext";
+import { Entry } from "../../../graphql/generated/graphql";
+
+type EntryContextProviderProps = {
+  children: ReactNode;
+};
+
+export const EntryContextProvider = ({ children }: EntryContextProviderProps) => {
+  const [selectedEntry, setSelected] = useState<Entry | null>(null);
+  const setSelectedEntry = (entry: Entry | null) => setSelected(entry);
+
+  return (
+    <EntryContext.Provider value={{ selectedEntry, setSelectedEntry }}>
+      {children}
+    </EntryContext.Provider>
+  );
+};
diff --git a/web/src/components/workday-browser/entry-context/useEntryContext.ts b/web/src/components/workday-browser/entry-context/useEntryContext.ts
new file mode 100644
index 00000000..fb72c419
--- /dev/null
+++ b/web/src/components/workday-browser/entry-context/useEntryContext.ts
@@ -0,0 +1,10 @@
+import { useContext } from "react";
+import { EntryContext } from "./EntryContext";
+
+export const useEntryContext = () => {
+  const entryContext = useContext(EntryContext);
+  if (entryContext === undefined) {
+    throw new Error("context must be inside a entryProvider");
+  }
+  return entryContext;
+};

From 94f33d097f3519aa2743f56e8c29eef9a7c85ab2 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:37:55 +0300
Subject: [PATCH 02/16] Use entry context provider in workday list

---
 .../workday-browser/WorkdayList.tsx           | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/web/src/components/workday-browser/WorkdayList.tsx b/web/src/components/workday-browser/WorkdayList.tsx
index 81550a56..ba8e7774 100644
--- a/web/src/components/workday-browser/WorkdayList.tsx
+++ b/web/src/components/workday-browser/WorkdayList.tsx
@@ -11,6 +11,7 @@ import { useState } from "react";
 import { isWeekend } from "../../common/workdayUtils";
 import { Dayjs } from "dayjs";
 import { t } from "i18next";
+import { EntryContextProvider } from "./entry-context/EntryContextProvider";
 
 const WorkdayList = () => {
   const dayjs = useDayjs();
@@ -61,18 +62,20 @@ const WorkdayList = () => {
       <TotalHours workdays={workdays} />
 
       <Paper>
-        {dividedWorkdays.map((wdArr) => {
-          if (isWeekend(wdArr[0].date)) {
-            return (
-              <Collapse in={checked}>
-                {wdArr.map((wd) => (
-                  <WorkdayAccordion workday={wd} key={wd.date.toString()} />
-                ))}
-              </Collapse>
-            );
-          }
-          return wdArr.map((wd) => <WorkdayAccordion workday={wd} key={wd.date.toString()} />);
-        })}
+        <EntryContextProvider>
+          {dividedWorkdays.map((wdArr) => {
+            if (isWeekend(wdArr[0].date)) {
+              return (
+                <Collapse in={checked}>
+                  {wdArr.map((wd) => (
+                    <WorkdayAccordion workday={wd} key={wd.date.toString()} />
+                  ))}
+                </Collapse>
+              );
+            }
+            return wdArr.map((wd) => <WorkdayAccordion workday={wd} key={wd.date.toString()} />);
+          })}
+        </EntryContextProvider>
       </Paper>
       <Box textAlign="left" mt="1em">
         <Button

From a5c0d4fdf0a6262dbe5477b6f36066864f62df4f Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:39:14 +0300
Subject: [PATCH 03/16] Add copy entry button

---
 .../entry-row/CopyEntryButton.tsx             |  37 +++++
 .../entry-row/DesktopEntryRow.tsx             | 138 ++++++++++--------
 .../entry-row/MobileEntryRow.tsx              |  14 +-
 3 files changed, 123 insertions(+), 66 deletions(-)
 create mode 100644 web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx

diff --git a/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
new file mode 100644
index 00000000..6f5a8620
--- /dev/null
+++ b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
@@ -0,0 +1,37 @@
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import { useTranslation } from "react-i18next";
+import { Entry } from "../../../graphql/generated/graphql";
+import LabelledIconButton from "../../LabelledIconButton";
+import { useEntryContext } from "../../workday-browser/entry-context/useEntryContext";
+
+type CopyEntryButtonProps = {
+  entry: Entry;
+};
+
+const CopyEntryButton = ({ entry }: CopyEntryButtonProps) => {
+  const { t } = useTranslation();
+  const { selectedEntry, setSelectedEntry } = useEntryContext();
+
+  return (
+    <>
+      <LabelledIconButton
+        label={t("controls.copyEntry")}
+        size="medium"
+        onClick={(e) => {
+          e.stopPropagation();
+          selectedEntry?.key !== entry.key ? setSelectedEntry(entry) : setSelectedEntry(null);
+        }}
+        sx={(theme) => ({
+          color:
+            theme.palette.mode === "dark"
+              ? theme.palette.primary.main
+              : theme.palette.secondary.dark,
+        })}
+      >
+        <ContentCopyIcon fontSize="inherit" />
+      </LabelledIconButton>
+    </>
+  );
+};
+
+export default CopyEntryButton;
diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index 8eb92096..0ead6984 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -1,5 +1,6 @@
-import { Box, ListItem, Typography } from "@mui/material";
+import { Box, ListItemButton, Typography } from "@mui/material";
 import { grey } from "@mui/material/colors";
+import { ClickAwayListener } from "@mui/base/ClickAwayListener";
 import dayjs from "dayjs";
 import { roundToFullMinutes } from "../../../common/duration";
 import { AcceptanceStatus } from "../../../graphql/generated/graphql";
@@ -11,6 +12,8 @@ import { EntryRowProps } from "./EntryRow";
 import AcceptedChip from "./status-chips/AcceptedChip";
 import OpenChip from "./status-chips/OpenChip";
 import PaidChip from "./status-chips/PaidChip";
+import { useEntryContext } from "../../workday-browser/entry-context/useEntryContext";
+import CopyEntryButton from "./CopyEntryButton";
 
 const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
   const { darkMode } = useDarkMode();
@@ -19,87 +22,96 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
   const paid = entry.acceptanceStatus === AcceptanceStatus.Paid;
   const open = entry.acceptanceStatus === AcceptanceStatus.Open;
   const roundedDuration = roundToFullMinutes(dayjs.duration(entry.duration, "hour"));
+  const { selectedEntry, setSelectedEntry } = useEntryContext();
 
   return (
-    <ListItem
-      sx={{
-        bgcolor: darkMode ? grey[800] : "primary.light",
-        borderRadius: 4,
-        pl: 1,
-        pt: 0,
-        pb: 0,
-        pr: accepted || paid || open ? 0 : 1,
-        overflow: "hidden",
-        display: "flex",
-        alignItems: "stretch",
-        justifyContent: "space-between",
-      }}
+    <ClickAwayListener
+      onClickAway={() => selectedEntry?.key === entry.key && setSelectedEntry(null)}
     >
-      <Box
+      <ListItemButton
         sx={{
+          bgcolor: darkMode ? grey[800] : "primary.light",
+          borderRadius: 4,
+          pl: 1,
+          pt: 0,
+          pb: 0,
+          pr: accepted || paid || open ? 0 : 1,
+          overflow: "hidden",
           display: "flex",
-          alignItems: "center",
-          gap: 2,
-          overflowX: { xs: "auto", md: "hidden" },
-          overflowY: "hidden",
-          whiteSpace: "nowrap",
-          mr: 1,
-          pt: 1,
-          pb: 1,
-          minHeight: 48,
+          alignItems: "stretch",
+          justifyContent: "space-between",
         }}
+        selected={selectedEntry?.key === entry.key}
       >
         <Box
           sx={{
             display: "flex",
             alignItems: "center",
-            justifyContent: "end",
-            minWidth: 60,
-            textAlign: "right",
+            gap: 2,
+            overflowX: { xs: "auto", md: "hidden" },
+            overflowY: "hidden",
+            whiteSpace: "nowrap",
             mr: 1,
+            pt: 1,
+            pb: 1,
+            minHeight: 48,
           }}
         >
-          <Typography variant="h6">{roundedDuration.format("H:mm")}</Typography>
-        </Box>
-        {product && <DimensionChip dimension="product" label={product} />}
-        {activity && <DimensionChip dimension="activity" label={activity} />}
-        {issue && <DimensionChip dimension="issue" label={issue} />}
-        {client && <DimensionChip dimension="client" label={client} />}
-        {description && (
-          <Typography
-            variant="subtitle2"
-            sx={{ overflow: { xs: "visible", md: "hidden" }, textOverflow: "ellipsis" }}
+          <Box
+            sx={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "end",
+              minWidth: 60,
+              textAlign: "right",
+              mr: 1,
+            }}
           >
-            {description}
-          </Typography>
-        )}
-      </Box>
-      <Box sx={{ display: "flex" }}>
-        {accepted ? (
-          <Box>
-            <AcceptedChip />
-          </Box>
-        ) : paid ? (
-          <Box>
-            <PaidChip />
+            <Typography variant="h6">{roundedDuration.format("H:mm")}</Typography>
           </Box>
-        ) : (
-          <Box sx={{ display: "flex", alignItems: "center" }}>
+          {product && <DimensionChip dimension="product" label={product} />}
+          {activity && <DimensionChip dimension="activity" label={activity} />}
+          {issue && <DimensionChip dimension="issue" label={issue} />}
+          {client && <DimensionChip dimension="client" label={client} />}
+          {description && (
+            <Typography
+              variant="subtitle2"
+              sx={{ overflow: { xs: "visible", md: "hidden" }, textOverflow: "ellipsis" }}
+            >
+              {description}
+            </Typography>
+          )}
+        </Box>
+        <Box sx={{ display: "flex" }}>
+          {accepted ? (
             <Box>
-              <EditEntryButton date={date} entry={entry} />
+              <AcceptedChip />
             </Box>
-            <Box sx={{ display: { xs: "none", md: "block" }, ml: -0.5 }}>
-              <DeleteEntryButton date={date} entryKey={entry.key} />
+          ) : paid ? (
+            <Box>
+              <PaidChip />
             </Box>
-          </Box>
-        )}
-        {open && (
-          <Box>
-            <OpenChip />
-          </Box>
-        )}
-      </Box>
-    </ListItem>
+          ) : (
+            <Box sx={{ display: "flex", alignItems: "center" }}>
+              <Box>
+                <CopyEntryButton entry={entry} />
+              </Box>
+              <Box>
+                <EditEntryButton date={date} entry={entry} />
+              </Box>
+              <Box sx={{ display: { xs: "none", md: "block" }, ml: -0.5 }}>
+                <DeleteEntryButton date={date} entryKey={entry.key} />
+              </Box>
+            </Box>
+          )}
+          {open && (
+            <Box>
+              <OpenChip />
+            </Box>
+          )}
+        </Box>
+      </ListItemButton>
+    </ClickAwayListener>
   );
 };
 
diff --git a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
index 90dc1b91..e52f9611 100644
--- a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
@@ -1,4 +1,4 @@
-import { Box, ListItem, Typography } from "@mui/material";
+import { Box, ListItemButton, Typography } from "@mui/material";
 import { grey } from "@mui/material/colors";
 import dayjs from "dayjs";
 import { roundToFullMinutes } from "../../../common/duration";
@@ -10,6 +10,8 @@ import { EntryRowProps } from "./EntryRow";
 import AcceptedChip from "./status-chips/AcceptedChip";
 import OpenChip from "./status-chips/OpenChip";
 import PaidChip from "./status-chips/PaidChip";
+import CopyEntryButton from "./CopyEntryButton";
+import { useEntryContext } from "../../workday-browser/entry-context/useEntryContext";
 
 const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
   const { darkMode } = useDarkMode();
@@ -18,9 +20,10 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
   const paid = entry.acceptanceStatus === AcceptanceStatus.Paid;
   const open = entry.acceptanceStatus === AcceptanceStatus.Open;
   const roundedDuration = roundToFullMinutes(dayjs.duration(entry.duration, "hour"));
+  const { selectedEntry } = useEntryContext();
 
   return (
-    <ListItem
+    <ListItemButton
       sx={{
         bgcolor: darkMode ? grey[800] : "primary.light",
         borderRadius: 4,
@@ -32,7 +35,11 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
         display: "flex",
         flexDirection: "column",
         alignItems: "stretch",
+        ":hover": {
+          backgroundColor: darkMode ? grey[800] : "primary.light",
+        },
       }}
+      selected={selectedEntry?.key === entry.key}
     >
       <Box sx={{ display: "flex", justifyContent: "space-between", minHeight: 40 }}>
         <Box
@@ -58,6 +65,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
           ) : (
             <Box sx={{ display: "flex", alignItems: "center" }}>
               <Box>
+                <CopyEntryButton entry={entry} />
                 <EditEntryButton date={date} entry={entry} />
               </Box>
             </Box>
@@ -90,7 +98,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
           </Typography>
         )}
       </Box>
-    </ListItem>
+    </ListItemButton>
   );
 };
 

From 1c8e147725b3c3c90a193d0b47acd28ed909112d Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:39:33 +0300
Subject: [PATCH 04/16] Add paste entry button

---
 .../workday-accordion/PasteEntryButton.tsx    | 20 ++++++++
 .../workday-accordion/WorkdaySummary.tsx      | 46 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 web/src/components/workday-accordion/PasteEntryButton.tsx

diff --git a/web/src/components/workday-accordion/PasteEntryButton.tsx b/web/src/components/workday-accordion/PasteEntryButton.tsx
new file mode 100644
index 00000000..b12d4e63
--- /dev/null
+++ b/web/src/components/workday-accordion/PasteEntryButton.tsx
@@ -0,0 +1,20 @@
+import ContentPasteGoIcon from "@mui/icons-material/ContentPasteGo";
+import { Box, IconButtonProps } from "@mui/material";
+import { useTranslation } from "react-i18next";
+import LabelledIconButton from "../LabelledIconButton";
+
+type PasteEntryButtonProps = IconButtonProps;
+
+const PasteEntryButton = ({ ...props }: PasteEntryButtonProps) => {
+  const { t } = useTranslation();
+
+  return (
+    <Box onClick={(e) => e.stopPropagation()}>
+      <LabelledIconButton size="medium" label={t("controls.pasteEntry")} {...props}>
+        <ContentPasteGoIcon fontSize="inherit" />
+      </LabelledIconButton>
+    </Box>
+  );
+};
+
+export default PasteEntryButton;
diff --git a/web/src/components/workday-accordion/WorkdaySummary.tsx b/web/src/components/workday-accordion/WorkdaySummary.tsx
index e463e728..ed789d09 100644
--- a/web/src/components/workday-accordion/WorkdaySummary.tsx
+++ b/web/src/components/workday-accordion/WorkdaySummary.tsx
@@ -1,5 +1,7 @@
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import { AccordionSummary, Box, Chip, Typography, useMediaQuery, useTheme } from "@mui/material";
+import { useMutation } from "@apollo/client";
+import { useTranslation } from "react-i18next";
 import { roundToFullMinutes, totalDurationOfEntries } from "../../common/duration";
 import useDayjs from "../../common/useDayjs";
 import {
@@ -10,7 +12,12 @@ import {
   isVacation,
   isWeekend,
 } from "../../common/workdayUtils";
-import { Workday } from "../../graphql/generated/graphql";
+import {
+  AddWorkdayEntryDocument,
+  Entry,
+  FindWorkdaysDocument,
+  Workday,
+} from "../../graphql/generated/graphql";
 import EntryDialogButton from "../entry-dialog/EntryDialogButton";
 import FlexLeaveChip from "./info-chips/FlexLeaveChip";
 import HolidayChip from "./info-chips/HolidayChip";
@@ -18,6 +25,9 @@ import NoEntriesChip from "./info-chips/NoEntriesChip";
 import SickLeaveChip from "./info-chips/SickLeaveChip";
 import VacationChip from "./info-chips/VacationChip";
 import WeekendChip from "./info-chips/WeekendChip";
+import { useEntryContext } from "../workday-browser/entry-context/useEntryContext";
+import { useNotification } from "../global-notification/useNotification";
+import PasteEntryButton from "./PasteEntryButton";
 
 type WorkdayAccordionProps = {
   workday: Workday;
@@ -39,6 +49,32 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
   const totalHoursFormatted = roundToFullMinutes(totalDuration).format("H:mm");
 
   const empty = workday.entries.length === 0;
+  const { t } = useTranslation();
+
+  const { selectedEntry, setSelectedEntry } = useEntryContext();
+  const { showSuccessNotification } = useNotification();
+  const [addWorkdayEntryMutation] = useMutation(AddWorkdayEntryDocument, {
+    refetchQueries: [FindWorkdaysDocument],
+    onCompleted: async () => {
+      showSuccessNotification(t("notifications.addEntry.success"));
+    },
+  });
+  const handlePasteEntry = async (entry: Entry) => {
+    await addWorkdayEntryMutation({
+      variables: {
+        entry: {
+          date: date.format("YYYY-MM-DD"),
+          duration: entry.duration,
+          description: entry.description,
+          product: entry.product,
+          activity: entry.activity,
+          issue: entry.issue,
+          client: entry.client,
+        },
+      },
+    });
+    setSelectedEntry(null);
+  };
 
   const InfoChip = () => {
     if (vacation) {
@@ -88,6 +124,14 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
         </Box>
         {!mobile && <InfoChip />}
         <Box sx={{ display: "flex", alignItems: "center" }}>
+          {selectedEntry ? (
+            <PasteEntryButton
+              onClick={(e) => {
+                e.stopPropagation();
+                handlePasteEntry(selectedEntry);
+              }}
+            />
+          ) : null}
           {!disabled && (
             <>
               <EntryDialogButton date={date} size="medium" />

From 02c908d51d2698d8a960b838c9d3ee28d3c3bae8 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:40:12 +0300
Subject: [PATCH 05/16] Add translations for copy and paste buttons

---
 web/src/i18n/en.ts | 2 ++
 web/src/i18n/fi.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/web/src/i18n/en.ts b/web/src/i18n/en.ts
index 63926c63..b020b2ee 100644
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -24,6 +24,8 @@ const en = {
     jiraDisconnect: "Disconnect from Jira",
     showWeekend: "Show Weekend",
     hideWeekend: "Hide Weekend",
+    copyEntry: "Copy Entry",
+    pasteEntry: "Paste Entry",
   },
   dimensionNames: {
     product: "Product",
diff --git a/web/src/i18n/fi.ts b/web/src/i18n/fi.ts
index 507265bd..fbc6c589 100644
--- a/web/src/i18n/fi.ts
+++ b/web/src/i18n/fi.ts
@@ -24,6 +24,8 @@ const fi = {
     jiraDisconnect: "Katkaise Jira-yhteys",
     showWeekend: "Näytä Viikonloppu",
     hideWeekend: "Piilota Viikonloppu",
+    copyEntry: "Kopioi työaikakirjaus",
+    pasteEntry: "Liitä työaikakirjaus",
   },
   dimensionNames: {
     product: "Tuote",

From 6e7454d26eef56e36cc5b7cb1bab2cdaaac8d7b0 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 14:50:23 +0300
Subject: [PATCH 06/16] disable touch ripple on entry row

---
 .../components/workday-accordion/entry-row/DesktopEntryRow.tsx   | 1 +
 .../components/workday-accordion/entry-row/MobileEntryRow.tsx    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index 0ead6984..83c4cd41 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -42,6 +42,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
           justifyContent: "space-between",
         }}
         selected={selectedEntry?.key === entry.key}
+        disableTouchRipple
       >
         <Box
           sx={{
diff --git a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
index e52f9611..386f0805 100644
--- a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
@@ -40,6 +40,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
         },
       }}
       selected={selectedEntry?.key === entry.key}
+      disableTouchRipple
     >
       <Box sx={{ display: "flex", justifyContent: "space-between", minHeight: 40 }}>
         <Box

From 77b9609c4a1e534ef55d5d898cee42078515aa57 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 15:17:52 +0300
Subject: [PATCH 07/16] Remove clickaway listener

---
 .../entry-row/DesktopEntryRow.tsx             | 136 +++++++++---------
 1 file changed, 66 insertions(+), 70 deletions(-)

diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index 83c4cd41..cec4fb51 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -22,97 +22,93 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
   const paid = entry.acceptanceStatus === AcceptanceStatus.Paid;
   const open = entry.acceptanceStatus === AcceptanceStatus.Open;
   const roundedDuration = roundToFullMinutes(dayjs.duration(entry.duration, "hour"));
-  const { selectedEntry, setSelectedEntry } = useEntryContext();
+  const { selectedEntry } = useEntryContext();
 
   return (
-    <ClickAwayListener
-      onClickAway={() => selectedEntry?.key === entry.key && setSelectedEntry(null)}
+    <ListItemButton
+      sx={{
+        bgcolor: darkMode ? grey[800] : "primary.light",
+        borderRadius: 4,
+        pl: 1,
+        pt: 0,
+        pb: 0,
+        pr: accepted || paid || open ? 0 : 1,
+        overflow: "hidden",
+        display: "flex",
+        alignItems: "stretch",
+        justifyContent: "space-between",
+      }}
+      selected={selectedEntry?.key === entry.key}
+      disableTouchRipple
     >
-      <ListItemButton
+      <Box
         sx={{
-          bgcolor: darkMode ? grey[800] : "primary.light",
-          borderRadius: 4,
-          pl: 1,
-          pt: 0,
-          pb: 0,
-          pr: accepted || paid || open ? 0 : 1,
-          overflow: "hidden",
           display: "flex",
-          alignItems: "stretch",
-          justifyContent: "space-between",
+          alignItems: "center",
+          gap: 2,
+          overflowX: { xs: "auto", md: "hidden" },
+          overflowY: "hidden",
+          whiteSpace: "nowrap",
+          mr: 1,
+          pt: 1,
+          pb: 1,
+          minHeight: 48,
         }}
-        selected={selectedEntry?.key === entry.key}
-        disableTouchRipple
       >
         <Box
           sx={{
             display: "flex",
             alignItems: "center",
-            gap: 2,
-            overflowX: { xs: "auto", md: "hidden" },
-            overflowY: "hidden",
-            whiteSpace: "nowrap",
+            justifyContent: "end",
+            minWidth: 60,
+            textAlign: "right",
             mr: 1,
-            pt: 1,
-            pb: 1,
-            minHeight: 48,
           }}
         >
-          <Box
-            sx={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "end",
-              minWidth: 60,
-              textAlign: "right",
-              mr: 1,
-            }}
+          <Typography variant="h6">{roundedDuration.format("H:mm")}</Typography>
+        </Box>
+        {product && <DimensionChip dimension="product" label={product} />}
+        {activity && <DimensionChip dimension="activity" label={activity} />}
+        {issue && <DimensionChip dimension="issue" label={issue} />}
+        {client && <DimensionChip dimension="client" label={client} />}
+        {description && (
+          <Typography
+            variant="subtitle2"
+            sx={{ overflow: { xs: "visible", md: "hidden" }, textOverflow: "ellipsis" }}
           >
-            <Typography variant="h6">{roundedDuration.format("H:mm")}</Typography>
+            {description}
+          </Typography>
+        )}
+      </Box>
+      <Box sx={{ display: "flex" }}>
+        {accepted ? (
+          <Box>
+            <AcceptedChip />
           </Box>
-          {product && <DimensionChip dimension="product" label={product} />}
-          {activity && <DimensionChip dimension="activity" label={activity} />}
-          {issue && <DimensionChip dimension="issue" label={issue} />}
-          {client && <DimensionChip dimension="client" label={client} />}
-          {description && (
-            <Typography
-              variant="subtitle2"
-              sx={{ overflow: { xs: "visible", md: "hidden" }, textOverflow: "ellipsis" }}
-            >
-              {description}
-            </Typography>
-          )}
-        </Box>
-        <Box sx={{ display: "flex" }}>
-          {accepted ? (
+        ) : paid ? (
+          <Box>
+            <PaidChip />
+          </Box>
+        ) : (
+          <Box sx={{ display: "flex", alignItems: "center" }}>
             <Box>
-              <AcceptedChip />
+              <CopyEntryButton entry={entry} />
             </Box>
-          ) : paid ? (
             <Box>
-              <PaidChip />
-            </Box>
-          ) : (
-            <Box sx={{ display: "flex", alignItems: "center" }}>
-              <Box>
-                <CopyEntryButton entry={entry} />
-              </Box>
-              <Box>
-                <EditEntryButton date={date} entry={entry} />
-              </Box>
-              <Box sx={{ display: { xs: "none", md: "block" }, ml: -0.5 }}>
-                <DeleteEntryButton date={date} entryKey={entry.key} />
-              </Box>
+              <EditEntryButton date={date} entry={entry} />
             </Box>
-          )}
-          {open && (
-            <Box>
-              <OpenChip />
+            <Box sx={{ display: { xs: "none", md: "block" }, ml: -0.5 }}>
+              <DeleteEntryButton date={date} entryKey={entry.key} />
             </Box>
-          )}
-        </Box>
-      </ListItemButton>
-    </ClickAwayListener>
+          </Box>
+        )}
+        {open && (
+          <Box>
+            <OpenChip />
+          </Box>
+        )}
+      </Box>
+    </ListItemButton>
   );
 };
 

From 99c8fc6db8e06888b10b3e793c136b2b2f6f695c Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 15:19:00 +0300
Subject: [PATCH 08/16] Move entry provider higher to keep state even in
 workdaylist render

---
 .../workday-browser/WorkdayBrowser.tsx        |  7 +++--
 .../workday-browser/WorkdayList.tsx           | 26 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/web/src/components/workday-browser/WorkdayBrowser.tsx b/web/src/components/workday-browser/WorkdayBrowser.tsx
index bf6d60c3..6ad5e12f 100644
--- a/web/src/components/workday-browser/WorkdayBrowser.tsx
+++ b/web/src/components/workday-browser/WorkdayBrowser.tsx
@@ -1,11 +1,14 @@
 import { Outlet } from "react-router-dom";
 import ListControls from "./ListControls";
 import WorkdayList from "./WorkdayList";
+import { EntryContextProvider } from "./entry-context/EntryContextProvider";
 
 const WorkdayBrowser = () => (
   <>
-    <ListControls />
-    <WorkdayList />
+    <EntryContextProvider>
+      <ListControls />
+      <WorkdayList />
+    </EntryContextProvider>
     <Outlet />
   </>
 );
diff --git a/web/src/components/workday-browser/WorkdayList.tsx b/web/src/components/workday-browser/WorkdayList.tsx
index ba8e7774..29fd6bd5 100644
--- a/web/src/components/workday-browser/WorkdayList.tsx
+++ b/web/src/components/workday-browser/WorkdayList.tsx
@@ -62,20 +62,18 @@ const WorkdayList = () => {
       <TotalHours workdays={workdays} />
 
       <Paper>
-        <EntryContextProvider>
-          {dividedWorkdays.map((wdArr) => {
-            if (isWeekend(wdArr[0].date)) {
-              return (
-                <Collapse in={checked}>
-                  {wdArr.map((wd) => (
-                    <WorkdayAccordion workday={wd} key={wd.date.toString()} />
-                  ))}
-                </Collapse>
-              );
-            }
-            return wdArr.map((wd) => <WorkdayAccordion workday={wd} key={wd.date.toString()} />);
-          })}
-        </EntryContextProvider>
+        {dividedWorkdays.map((wdArr) => {
+          if (isWeekend(wdArr[0].date)) {
+            return (
+              <Collapse in={checked}>
+                {wdArr.map((wd) => (
+                  <WorkdayAccordion workday={wd} key={wd.date.toString()} />
+                ))}
+              </Collapse>
+            );
+          }
+          return wdArr.map((wd) => <WorkdayAccordion workday={wd} key={wd.date.toString()} />);
+        })}
       </Paper>
       <Box textAlign="left" mt="1em">
         <Button

From eb0188a3aca1783ff4a34858ca41522fcf90d511 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Thu, 8 Aug 2024 15:32:27 +0300
Subject: [PATCH 09/16] Use listitem role in listitembutton to not break e2e
 and keep desired style

---
 .../components/workday-accordion/entry-row/DesktopEntryRow.tsx  | 2 +-
 .../components/workday-accordion/entry-row/MobileEntryRow.tsx   | 1 +
 web/src/components/workday-browser/WorkdayList.tsx              | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index cec4fb51..c0ce5bb7 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -1,6 +1,5 @@
 import { Box, ListItemButton, Typography } from "@mui/material";
 import { grey } from "@mui/material/colors";
-import { ClickAwayListener } from "@mui/base/ClickAwayListener";
 import dayjs from "dayjs";
 import { roundToFullMinutes } from "../../../common/duration";
 import { AcceptanceStatus } from "../../../graphql/generated/graphql";
@@ -38,6 +37,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
         alignItems: "stretch",
         justifyContent: "space-between",
       }}
+      role="listitem"
       selected={selectedEntry?.key === entry.key}
       disableTouchRipple
     >
diff --git a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
index 386f0805..0dc6e583 100644
--- a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
@@ -39,6 +39,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
           backgroundColor: darkMode ? grey[800] : "primary.light",
         },
       }}
+      role="listitem"
       selected={selectedEntry?.key === entry.key}
       disableTouchRipple
     >
diff --git a/web/src/components/workday-browser/WorkdayList.tsx b/web/src/components/workday-browser/WorkdayList.tsx
index 29fd6bd5..81550a56 100644
--- a/web/src/components/workday-browser/WorkdayList.tsx
+++ b/web/src/components/workday-browser/WorkdayList.tsx
@@ -11,7 +11,6 @@ import { useState } from "react";
 import { isWeekend } from "../../common/workdayUtils";
 import { Dayjs } from "dayjs";
 import { t } from "i18next";
-import { EntryContextProvider } from "./entry-context/EntryContextProvider";
 
 const WorkdayList = () => {
   const dayjs = useDayjs();

From ac2e42a14ddd7602b7ea4f7bf1890224fa8df56f Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Fri, 9 Aug 2024 08:31:08 +0300
Subject: [PATCH 10/16] Use togglebutton as copy button to set it visibly
 selected

---
 .../entry-row/CopyEntryButton.tsx             | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
index 6f5a8620..de0d37c9 100644
--- a/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
+++ b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
@@ -1,7 +1,7 @@
 import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import { ToggleButton, Tooltip } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { Entry } from "../../../graphql/generated/graphql";
-import LabelledIconButton from "../../LabelledIconButton";
 import { useEntryContext } from "../../workday-browser/entry-context/useEntryContext";
 
 type CopyEntryButtonProps = {
@@ -14,22 +14,28 @@ const CopyEntryButton = ({ entry }: CopyEntryButtonProps) => {
 
   return (
     <>
-      <LabelledIconButton
-        label={t("controls.copyEntry")}
-        size="medium"
-        onClick={(e) => {
-          e.stopPropagation();
-          selectedEntry?.key !== entry.key ? setSelectedEntry(entry) : setSelectedEntry(null);
-        }}
-        sx={(theme) => ({
-          color:
-            theme.palette.mode === "dark"
-              ? theme.palette.primary.main
-              : theme.palette.secondary.dark,
-        })}
-      >
-        <ContentCopyIcon fontSize="inherit" />
-      </LabelledIconButton>
+      <Tooltip title={t("controls.copyEntry")} arrow placement="bottom">
+        <ToggleButton
+          value={t("controls.copyEntry")}
+          aria-label={t("controls.copyEntry")}
+          size="medium"
+          onClick={(e) => {
+            e.stopPropagation();
+            selectedEntry?.key !== entry.key ? setSelectedEntry(entry) : setSelectedEntry(null);
+          }}
+          sx={(theme) => ({
+            color:
+              theme.palette.mode === "dark"
+                ? theme.palette.primary.main
+                : theme.palette.secondary.dark,
+            border: "none",
+            borderRadius: "50%",
+          })}
+          selected={selectedEntry?.key === entry.key}
+        >
+          <ContentCopyIcon fontSize="small" />
+        </ToggleButton>
+      </Tooltip>
     </>
   );
 };

From b26310119c65164f727c19f6af22be28a615c840 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Fri, 9 Aug 2024 09:05:09 +0300
Subject: [PATCH 11/16] Use listitem for entryrow and change bgcolor when copy
 selected

---
 .../entry-row/DesktopEntryRow.tsx              | 15 +++++++++------
 .../entry-row/MobileEntryRow.tsx               | 18 +++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index c0ce5bb7..cc00385b 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -1,4 +1,4 @@
-import { Box, ListItemButton, Typography } from "@mui/material";
+import { Box, ListItem, Typography } from "@mui/material";
 import { grey } from "@mui/material/colors";
 import dayjs from "dayjs";
 import { roundToFullMinutes } from "../../../common/duration";
@@ -24,7 +24,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
   const { selectedEntry } = useEntryContext();
 
   return (
-    <ListItemButton
+    <ListItem
       sx={{
         bgcolor: darkMode ? grey[800] : "primary.light",
         borderRadius: 4,
@@ -36,10 +36,13 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
         display: "flex",
         alignItems: "stretch",
         justifyContent: "space-between",
+        backgroundColor: (theme) =>
+          selectedEntry?.key === entry.key
+            ? darkMode
+              ? theme.palette.grey[700]
+              : theme.palette.primary.main
+            : undefined,
       }}
-      role="listitem"
-      selected={selectedEntry?.key === entry.key}
-      disableTouchRipple
     >
       <Box
         sx={{
@@ -108,7 +111,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
           </Box>
         )}
       </Box>
-    </ListItemButton>
+    </ListItem>
   );
 };
 
diff --git a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
index 0dc6e583..40b4cf08 100644
--- a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
@@ -1,4 +1,4 @@
-import { Box, ListItemButton, Typography } from "@mui/material";
+import { Box, ListItem, Typography } from "@mui/material";
 import { grey } from "@mui/material/colors";
 import dayjs from "dayjs";
 import { roundToFullMinutes } from "../../../common/duration";
@@ -23,7 +23,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
   const { selectedEntry } = useEntryContext();
 
   return (
-    <ListItemButton
+    <ListItem
       sx={{
         bgcolor: darkMode ? grey[800] : "primary.light",
         borderRadius: 4,
@@ -35,13 +35,13 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
         display: "flex",
         flexDirection: "column",
         alignItems: "stretch",
-        ":hover": {
-          backgroundColor: darkMode ? grey[800] : "primary.light",
-        },
+        backgroundColor: (theme) =>
+          selectedEntry?.key === entry.key
+            ? darkMode
+              ? theme.palette.grey[700]
+              : theme.palette.primary.main
+            : undefined,
       }}
-      role="listitem"
-      selected={selectedEntry?.key === entry.key}
-      disableTouchRipple
     >
       <Box sx={{ display: "flex", justifyContent: "space-between", minHeight: 40 }}>
         <Box
@@ -100,7 +100,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
           </Typography>
         )}
       </Box>
-    </ListItemButton>
+    </ListItem>
   );
 };
 

From 30928f008b7ce07530a3a738f9607470da7ddfc7 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Fri, 9 Aug 2024 10:05:12 +0300
Subject: [PATCH 12/16] Allow selecting multiple entries to copy at once

---
 .../workday-accordion/WorkdaySummary.tsx      | 34 ++++++++++---------
 .../entry-row/CopyEntryButton.tsx             |  6 ++--
 .../entry-row/DesktopEntryRow.tsx             |  4 +--
 .../entry-row/MobileEntryRow.tsx              |  4 +--
 .../entry-context/EntryContext.ts             |  8 +++--
 .../entry-context/EntryContextProvider.tsx    | 20 +++++++++--
 6 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/web/src/components/workday-accordion/WorkdaySummary.tsx b/web/src/components/workday-accordion/WorkdaySummary.tsx
index ed789d09..16276c50 100644
--- a/web/src/components/workday-accordion/WorkdaySummary.tsx
+++ b/web/src/components/workday-accordion/WorkdaySummary.tsx
@@ -51,7 +51,7 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
   const empty = workday.entries.length === 0;
   const { t } = useTranslation();
 
-  const { selectedEntry, setSelectedEntry } = useEntryContext();
+  const { selectedEntries, hasEntries, clearEntries } = useEntryContext();
   const { showSuccessNotification } = useNotification();
   const [addWorkdayEntryMutation] = useMutation(AddWorkdayEntryDocument, {
     refetchQueries: [FindWorkdaysDocument],
@@ -59,21 +59,23 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
       showSuccessNotification(t("notifications.addEntry.success"));
     },
   });
-  const handlePasteEntry = async (entry: Entry) => {
-    await addWorkdayEntryMutation({
-      variables: {
-        entry: {
-          date: date.format("YYYY-MM-DD"),
-          duration: entry.duration,
-          description: entry.description,
-          product: entry.product,
-          activity: entry.activity,
-          issue: entry.issue,
-          client: entry.client,
+  const handlePasteEntries = (entries: Entry[]) => {
+    entries.forEach((entry) => {
+      addWorkdayEntryMutation({
+        variables: {
+          entry: {
+            date: date.format("YYYY-MM-DD"),
+            duration: entry.duration,
+            description: entry.description,
+            product: entry.product,
+            activity: entry.activity,
+            issue: entry.issue,
+            client: entry.client,
+          },
         },
-      },
+      });
     });
-    setSelectedEntry(null);
+    clearEntries();
   };
 
   const InfoChip = () => {
@@ -124,11 +126,11 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
         </Box>
         {!mobile && <InfoChip />}
         <Box sx={{ display: "flex", alignItems: "center" }}>
-          {selectedEntry ? (
+          {hasEntries ? (
             <PasteEntryButton
               onClick={(e) => {
                 e.stopPropagation();
-                handlePasteEntry(selectedEntry);
+                handlePasteEntries(selectedEntries);
               }}
             />
           ) : null}
diff --git a/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
index de0d37c9..7e4daaee 100644
--- a/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
+++ b/web/src/components/workday-accordion/entry-row/CopyEntryButton.tsx
@@ -10,7 +10,7 @@ type CopyEntryButtonProps = {
 
 const CopyEntryButton = ({ entry }: CopyEntryButtonProps) => {
   const { t } = useTranslation();
-  const { selectedEntry, setSelectedEntry } = useEntryContext();
+  const { hasEntry, addSelectedEntry, removeSelectedEntry } = useEntryContext();
 
   return (
     <>
@@ -21,7 +21,7 @@ const CopyEntryButton = ({ entry }: CopyEntryButtonProps) => {
           size="medium"
           onClick={(e) => {
             e.stopPropagation();
-            selectedEntry?.key !== entry.key ? setSelectedEntry(entry) : setSelectedEntry(null);
+            !hasEntry(entry) ? addSelectedEntry(entry) : removeSelectedEntry(entry);
           }}
           sx={(theme) => ({
             color:
@@ -31,7 +31,7 @@ const CopyEntryButton = ({ entry }: CopyEntryButtonProps) => {
             border: "none",
             borderRadius: "50%",
           })}
-          selected={selectedEntry?.key === entry.key}
+          selected={hasEntry(entry)}
         >
           <ContentCopyIcon fontSize="small" />
         </ToggleButton>
diff --git a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
index cc00385b..db38fbc1 100644
--- a/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/DesktopEntryRow.tsx
@@ -21,7 +21,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
   const paid = entry.acceptanceStatus === AcceptanceStatus.Paid;
   const open = entry.acceptanceStatus === AcceptanceStatus.Open;
   const roundedDuration = roundToFullMinutes(dayjs.duration(entry.duration, "hour"));
-  const { selectedEntry } = useEntryContext();
+  const { hasEntry } = useEntryContext();
 
   return (
     <ListItem
@@ -37,7 +37,7 @@ const DesktopEntryRow = ({ entry, date }: EntryRowProps) => {
         alignItems: "stretch",
         justifyContent: "space-between",
         backgroundColor: (theme) =>
-          selectedEntry?.key === entry.key
+          hasEntry(entry)
             ? darkMode
               ? theme.palette.grey[700]
               : theme.palette.primary.main
diff --git a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
index 40b4cf08..f050cb5f 100644
--- a/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
+++ b/web/src/components/workday-accordion/entry-row/MobileEntryRow.tsx
@@ -20,7 +20,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
   const paid = entry.acceptanceStatus === AcceptanceStatus.Paid;
   const open = entry.acceptanceStatus === AcceptanceStatus.Open;
   const roundedDuration = roundToFullMinutes(dayjs.duration(entry.duration, "hour"));
-  const { selectedEntry } = useEntryContext();
+  const { hasEntry } = useEntryContext();
 
   return (
     <ListItem
@@ -36,7 +36,7 @@ const MobileEntryRow = ({ entry, date }: EntryRowProps) => {
         flexDirection: "column",
         alignItems: "stretch",
         backgroundColor: (theme) =>
-          selectedEntry?.key === entry.key
+          hasEntry(entry)
             ? darkMode
               ? theme.palette.grey[700]
               : theme.palette.primary.main
diff --git a/web/src/components/workday-browser/entry-context/EntryContext.ts b/web/src/components/workday-browser/entry-context/EntryContext.ts
index f695a276..de14f88b 100644
--- a/web/src/components/workday-browser/entry-context/EntryContext.ts
+++ b/web/src/components/workday-browser/entry-context/EntryContext.ts
@@ -2,8 +2,12 @@ import { createContext } from "react";
 import { Entry } from "../../../graphql/generated/graphql";
 
 type EntryContextValue = {
-  selectedEntry: Entry | null;
-  setSelectedEntry: (entry: Entry | null) => void;
+  selectedEntries: Entry[];
+  addSelectedEntry: (entry: Entry) => void;
+  removeSelectedEntry: (entry: Entry) => void;
+  clearEntries: () => void;
+  hasEntry: (entry: Entry) => boolean;
+  hasEntries: boolean;
 };
 
 export const EntryContext = createContext<EntryContextValue | undefined>(undefined);
diff --git a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
index 252803d7..52e8dba5 100644
--- a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
+++ b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
@@ -7,11 +7,25 @@ type EntryContextProviderProps = {
 };
 
 export const EntryContextProvider = ({ children }: EntryContextProviderProps) => {
-  const [selectedEntry, setSelected] = useState<Entry | null>(null);
-  const setSelectedEntry = (entry: Entry | null) => setSelected(entry);
+  const [selectedEntries, setSelected] = useState<Entry[]>([]);
+  const addSelectedEntry = (entry: Entry) => setSelected((prev) => [...prev, entry]);
+  const removeSelectedEntry = (entry: Entry) =>
+    setSelected((prev) => prev.filter((prevEntry) => prevEntry.key !== entry.key));
+  const hasEntry = (entry: Entry) =>
+    !!selectedEntries.find((prevEntry) => prevEntry.key === entry.key);
+  const clearEntries = () => setSelected([]);
 
   return (
-    <EntryContext.Provider value={{ selectedEntry, setSelectedEntry }}>
+    <EntryContext.Provider
+      value={{
+        selectedEntries,
+        addSelectedEntry,
+        removeSelectedEntry,
+        clearEntries,
+        hasEntry,
+        hasEntries: selectedEntries.length > 0,
+      }}
+    >
       {children}
     </EntryContext.Provider>
   );

From 5aa64b47a1cee8f1c002fae7d6d4beffa6457059 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Fri, 9 Aug 2024 15:16:05 +0300
Subject: [PATCH 13/16] possibility to edit copied entries before sending

---
 web/src/components/entry-dialog/EntryForm.tsx | 14 +++++---
 .../components/entry-dialog/useEntryForm.tsx  | 22 +++++++-----
 .../PasteEditEntryButton.tsx                  | 35 +++++++++++++++++++
 .../workday-accordion/WorkdaySummary.tsx      | 16 +++++----
 .../entry-context/EntryContext.ts             |  2 ++
 .../entry-context/EntryContextProvider.tsx    |  6 ++++
 6 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 web/src/components/workday-accordion/PasteEditEntryButton.tsx

diff --git a/web/src/components/entry-dialog/EntryForm.tsx b/web/src/components/entry-dialog/EntryForm.tsx
index 643edb1e..25cfe98e 100644
--- a/web/src/components/entry-dialog/EntryForm.tsx
+++ b/web/src/components/entry-dialog/EntryForm.tsx
@@ -44,14 +44,20 @@ export type EntryFormProps = {
 type LocationState = {
   date?: string;
   editEntry?: Entry;
+  template?: Entry;
 };
 
 const EntryForm = () => {
   const { state } = useLocation();
   const dayjs = useDayjs();
   // state is possibly null
-  const { date: originalDate, editEntry }: LocationState = state || {};
-  const { form, onSubmit, loading } = useEntryForm({ editEntry, date: dayjs(originalDate) });
+  const { date: originalDate, editEntry, template }: LocationState = state || {};
+
+  const { form, onSubmit, loading } = useEntryForm({
+    editEntry,
+    date: dayjs(originalDate),
+    template: template,
+  });
   const navigate = useNavigate();
 
   const {
@@ -197,7 +203,7 @@ const EntryForm = () => {
               )}
             </Grid>
             <Grid item xs={12}>
-              {!editEntry && (
+              {!editEntry && !template && (
                 <FormGroup>
                   <FormControlLabel
                     control={
@@ -217,7 +223,7 @@ const EntryForm = () => {
           <>
             <Grid item xs={4} sx={{ mt: 2 }}>
               <Box sx={{ display: "flex", justifyContent: "start", gap: 2 }}>
-                {!editEntry && (
+                {!editEntry && !template && (
                   <FormGroup>
                     <FormControlLabel
                       control={
diff --git a/web/src/components/entry-dialog/useEntryForm.tsx b/web/src/components/entry-dialog/useEntryForm.tsx
index 698f3a05..f3065c9e 100644
--- a/web/src/components/entry-dialog/useEntryForm.tsx
+++ b/web/src/components/entry-dialog/useEntryForm.tsx
@@ -26,6 +26,7 @@ export type EntryFormSchema = {
 export type useEntryProps = {
   editEntry?: Entry;
   date?: Dayjs;
+  template?: Entry;
 };
 
 /**
@@ -34,7 +35,7 @@ export type useEntryProps = {
  * Note that calling this hook will create a new RHF form instance, i.e., you must pass down
  * the actual instance from parent components rather than call this hook again in child components.
  */
-const useEntryForm = ({ editEntry, date }: useEntryProps) => {
+const useEntryForm = ({ editEntry, date, template }: useEntryProps) => {
   const { t } = useTranslation();
   const { showSuccessNotification } = useNotification();
   const dayjs = useDayjs();
@@ -68,12 +69,17 @@ const useEntryForm = ({ editEntry, date }: useEntryProps) => {
 
     return {
       date: date ? dayjs(date) : dayjs(),
-      duration: editEntry?.duration.toString() || "",
-      description: editEntry?.description || "",
-      product: editEntry?.product || settingsData?.getMySettings.productPreset || "",
-      activity: editEntry?.activity || settingsData?.getMySettings.activityPreset || "",
-      issue: editEntry?.issue || null,
-      client: editEntry?.client || "",
+      duration: editEntry?.duration.toString() || template?.duration.toString() || "",
+      description: editEntry?.description || template?.description || "",
+      product:
+        editEntry?.product || template?.product || settingsData?.getMySettings.productPreset || "",
+      activity:
+        editEntry?.activity ||
+        template?.activity ||
+        settingsData?.getMySettings.activityPreset ||
+        "",
+      issue: editEntry?.issue || template?.issue || null,
+      client: editEntry?.client || template?.client || "",
     };
   };
 
@@ -83,7 +89,7 @@ const useEntryForm = ({ editEntry, date }: useEntryProps) => {
 
   const { loading: hoursLoading } = useFormSetRemainingHours({
     form,
-    isEnabled: editEntry === undefined && !form.formState.isLoading,
+    isEnabled: editEntry === undefined && template === undefined && !form.formState.isLoading,
   });
 
   const addWorkday: SubmitHandler<EntryFormSchema> = async (formValues) => {
diff --git a/web/src/components/workday-accordion/PasteEditEntryButton.tsx b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
new file mode 100644
index 00000000..75a6a99a
--- /dev/null
+++ b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
@@ -0,0 +1,35 @@
+import SaveAsIcon from "@mui/icons-material/SaveAs";
+import { Box, IconButtonProps } from "@mui/material";
+import { useTranslation } from "react-i18next";
+import LabelledIconButton from "../LabelledIconButton";
+import { useLocation, useNavigate } from "react-router-dom";
+import { Dayjs } from "dayjs";
+import { useEntryContext } from "../workday-browser/entry-context/useEntryContext";
+
+type PasteEntryButtonProps = { date: Dayjs } & IconButtonProps;
+
+const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const location = useLocation();
+  const { selectedEntries } = useEntryContext();
+
+  return (
+    <Box onClick={(e) => e.stopPropagation()}>
+      <LabelledIconButton
+        size="medium"
+        label={t("controls.pasteEntry")}
+        onClick={() => {
+          navigate(`${location.pathname}/create`, {
+            state: { date: date.format("YYYY-MM-DD"), template: selectedEntries[0] },
+          });
+        }}
+        {...props}
+      >
+        <SaveAsIcon fontSize="inherit" />
+      </LabelledIconButton>
+    </Box>
+  );
+};
+
+export default PasteEditEntryButton;
diff --git a/web/src/components/workday-accordion/WorkdaySummary.tsx b/web/src/components/workday-accordion/WorkdaySummary.tsx
index 16276c50..ce2f6e0f 100644
--- a/web/src/components/workday-accordion/WorkdaySummary.tsx
+++ b/web/src/components/workday-accordion/WorkdaySummary.tsx
@@ -28,6 +28,7 @@ import WeekendChip from "./info-chips/WeekendChip";
 import { useEntryContext } from "../workday-browser/entry-context/useEntryContext";
 import { useNotification } from "../global-notification/useNotification";
 import PasteEntryButton from "./PasteEntryButton";
+import PasteEditEntryButton from "./PasteEditEntryButton";
 
 type WorkdayAccordionProps = {
   workday: Workday;
@@ -127,12 +128,15 @@ const WorkdaySummary = ({ workday }: WorkdayAccordionProps) => {
         {!mobile && <InfoChip />}
         <Box sx={{ display: "flex", alignItems: "center" }}>
           {hasEntries ? (
-            <PasteEntryButton
-              onClick={(e) => {
-                e.stopPropagation();
-                handlePasteEntries(selectedEntries);
-              }}
-            />
+            <>
+              <PasteEditEntryButton date={date} />
+              <PasteEntryButton
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handlePasteEntries(selectedEntries);
+                }}
+              />
+            </>
           ) : null}
           {!disabled && (
             <>
diff --git a/web/src/components/workday-browser/entry-context/EntryContext.ts b/web/src/components/workday-browser/entry-context/EntryContext.ts
index de14f88b..e74f825c 100644
--- a/web/src/components/workday-browser/entry-context/EntryContext.ts
+++ b/web/src/components/workday-browser/entry-context/EntryContext.ts
@@ -8,6 +8,8 @@ type EntryContextValue = {
   clearEntries: () => void;
   hasEntry: (entry: Entry) => boolean;
   hasEntries: boolean;
+  toggleEditing: () => void;
+  isEditing: boolean;
 };
 
 export const EntryContext = createContext<EntryContextValue | undefined>(undefined);
diff --git a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
index 52e8dba5..0f687ad3 100644
--- a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
+++ b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
@@ -8,6 +8,10 @@ type EntryContextProviderProps = {
 
 export const EntryContextProvider = ({ children }: EntryContextProviderProps) => {
   const [selectedEntries, setSelected] = useState<Entry[]>([]);
+  const [isEditing, setEditing] = useState(false);
+
+  const toggleEditing = () => setEditing((prev) => !prev);
+
   const addSelectedEntry = (entry: Entry) => setSelected((prev) => [...prev, entry]);
   const removeSelectedEntry = (entry: Entry) =>
     setSelected((prev) => prev.filter((prevEntry) => prevEntry.key !== entry.key));
@@ -24,6 +28,8 @@ export const EntryContextProvider = ({ children }: EntryContextProviderProps) =>
         clearEntries,
         hasEntry,
         hasEntries: selectedEntries.length > 0,
+        isEditing,
+        toggleEditing,
       }}
     >
       {children}

From aaa039b3b2cbf5eb94f006d4d2735f3ae02e6d30 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Mon, 12 Aug 2024 11:12:03 +0300
Subject: [PATCH 14/16] Paste and edit multiple entries

---
 .../PasteEditEntryButton.tsx                  |  9 +++-
 .../entry-context/EntryContext.ts             |  5 +-
 .../entry-context/EntryContextProvider.tsx    | 49 +++++++++++++++----
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/web/src/components/workday-accordion/PasteEditEntryButton.tsx b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
index 75a6a99a..cca954f0 100644
--- a/web/src/components/workday-accordion/PasteEditEntryButton.tsx
+++ b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
@@ -12,7 +12,7 @@ const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const location = useLocation();
-  const { selectedEntries } = useEntryContext();
+  const { selectedEntries, setEditDate, hasEntries, removeSelectedEntry } = useEntryContext();
 
   return (
     <Box onClick={(e) => e.stopPropagation()}>
@@ -20,8 +20,13 @@ const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
         size="medium"
         label={t("controls.pasteEntry")}
         onClick={() => {
+          setEditDate(date);
+          const entry = selectedEntries[0];
+          if (hasEntries) {
+            removeSelectedEntry(entry);
+          }
           navigate(`${location.pathname}/create`, {
-            state: { date: date.format("YYYY-MM-DD"), template: selectedEntries[0] },
+            state: { date: date.format("YYYY-MM-DD"), template: entry },
           });
         }}
         {...props}
diff --git a/web/src/components/workday-browser/entry-context/EntryContext.ts b/web/src/components/workday-browser/entry-context/EntryContext.ts
index e74f825c..7b848b10 100644
--- a/web/src/components/workday-browser/entry-context/EntryContext.ts
+++ b/web/src/components/workday-browser/entry-context/EntryContext.ts
@@ -1,5 +1,6 @@
 import { createContext } from "react";
 import { Entry } from "../../../graphql/generated/graphql";
+import { Dayjs } from "dayjs";
 
 type EntryContextValue = {
   selectedEntries: Entry[];
@@ -8,8 +9,8 @@ type EntryContextValue = {
   clearEntries: () => void;
   hasEntry: (entry: Entry) => boolean;
   hasEntries: boolean;
-  toggleEditing: () => void;
-  isEditing: boolean;
+  editDate: Dayjs | null;
+  setEditDate: (date: Dayjs | null) => void;
 };
 
 export const EntryContext = createContext<EntryContextValue | undefined>(undefined);
diff --git a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
index 0f687ad3..4c85dc89 100644
--- a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
+++ b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
@@ -1,6 +1,8 @@
-import { ReactNode, useState } from "react";
+import { ReactNode, useCallback, useEffect, useState } from "react";
 import { EntryContext } from "./EntryContext";
 import { Entry } from "../../../graphql/generated/graphql";
+import { Dayjs } from "dayjs";
+import { useLocation, useNavigate } from "react-router-dom";
 
 type EntryContextProviderProps = {
   children: ReactNode;
@@ -8,17 +10,46 @@ type EntryContextProviderProps = {
 
 export const EntryContextProvider = ({ children }: EntryContextProviderProps) => {
   const [selectedEntries, setSelected] = useState<Entry[]>([]);
-  const [isEditing, setEditing] = useState(false);
-
-  const toggleEditing = () => setEditing((prev) => !prev);
+  const [editDate, setDate] = useState<Dayjs | null>(null);
 
   const addSelectedEntry = (entry: Entry) => setSelected((prev) => [...prev, entry]);
-  const removeSelectedEntry = (entry: Entry) =>
-    setSelected((prev) => prev.filter((prevEntry) => prevEntry.key !== entry.key));
+  const removeSelectedEntry = useCallback(
+    (entry: Entry) =>
+      setSelected((prev) => prev.filter((prevEntry) => prevEntry.key !== entry.key)),
+    [],
+  );
   const hasEntry = (entry: Entry) =>
     !!selectedEntries.find((prevEntry) => prevEntry.key === entry.key);
   const clearEntries = () => setSelected([]);
 
+  const setEditDate = useCallback((date: Dayjs | null) => {
+    setDate(date);
+  }, []);
+  const hasEntries = selectedEntries.length > 0;
+
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  useEffect(() => {
+    if (editDate !== null && hasEntries && !location.pathname.match(/\/create\/?$/)) {
+      const entry = selectedEntries[0];
+      removeSelectedEntry(entry);
+      navigate(`${location.pathname}/create`, {
+        state: { date: editDate.format("YYYY-MM-DD"), template: entry },
+      });
+    } else if (!hasEntries) {
+      setEditDate(null);
+    }
+  }, [
+    editDate,
+    hasEntries,
+    location.pathname,
+    navigate,
+    removeSelectedEntry,
+    selectedEntries,
+    setEditDate,
+  ]);
+
   return (
     <EntryContext.Provider
       value={{
@@ -27,9 +58,9 @@ export const EntryContextProvider = ({ children }: EntryContextProviderProps) =>
         removeSelectedEntry,
         clearEntries,
         hasEntry,
-        hasEntries: selectedEntries.length > 0,
-        isEditing,
-        toggleEditing,
+        hasEntries,
+        editDate,
+        setEditDate,
       }}
     >
       {children}

From a0fd6099667321dee6496bcc8ef3f6bf28a8e3a6 Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Mon, 12 Aug 2024 11:14:36 +0300
Subject: [PATCH 15/16] Add translations for paste and edit

---
 web/src/components/workday-accordion/PasteEditEntryButton.tsx | 2 +-
 web/src/i18n/en.ts                                            | 1 +
 web/src/i18n/fi.ts                                            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/components/workday-accordion/PasteEditEntryButton.tsx b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
index cca954f0..6f593e49 100644
--- a/web/src/components/workday-accordion/PasteEditEntryButton.tsx
+++ b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
@@ -18,7 +18,7 @@ const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
     <Box onClick={(e) => e.stopPropagation()}>
       <LabelledIconButton
         size="medium"
-        label={t("controls.pasteEntry")}
+        label={t("controls.pasteAndEditEntry")}
         onClick={() => {
           setEditDate(date);
           const entry = selectedEntries[0];
diff --git a/web/src/i18n/en.ts b/web/src/i18n/en.ts
index b020b2ee..4d895d92 100644
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -26,6 +26,7 @@ const en = {
     hideWeekend: "Hide Weekend",
     copyEntry: "Copy Entry",
     pasteEntry: "Paste Entry",
+    pasteAndEditEntry: "Paste and Edit Entry",
   },
   dimensionNames: {
     product: "Product",
diff --git a/web/src/i18n/fi.ts b/web/src/i18n/fi.ts
index fbc6c589..f3d6d4f0 100644
--- a/web/src/i18n/fi.ts
+++ b/web/src/i18n/fi.ts
@@ -26,6 +26,7 @@ const fi = {
     hideWeekend: "Piilota Viikonloppu",
     copyEntry: "Kopioi työaikakirjaus",
     pasteEntry: "Liitä työaikakirjaus",
+    pasteAndEditEntry: "Liitä ja muokkaa kirjausta",
   },
   dimensionNames: {
     product: "Tuote",

From 56be0860122799c794176c9ab4bbf22818ff432f Mon Sep 17 00:00:00 2001
From: Kimi Kuru <kimi.kuru@funidata.fi>
Date: Wed, 14 Aug 2024 10:12:50 +0300
Subject: [PATCH 16/16] Pass template entries to entryform

---
 web/src/components/entry-dialog/EntryForm.tsx | 30 ++++++++++++++-----
 .../PasteEditEntryButton.tsx                  | 11 +++----
 .../entry-context/EntryContextProvider.tsx    | 26 +---------------
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/web/src/components/entry-dialog/EntryForm.tsx b/web/src/components/entry-dialog/EntryForm.tsx
index 25cfe98e..32bef0d2 100644
--- a/web/src/components/entry-dialog/EntryForm.tsx
+++ b/web/src/components/entry-dialog/EntryForm.tsx
@@ -45,18 +45,19 @@ type LocationState = {
   date?: string;
   editEntry?: Entry;
   template?: Entry;
+  templateEntries?: Entry[];
 };
 
 const EntryForm = () => {
   const { state } = useLocation();
   const dayjs = useDayjs();
   // state is possibly null
-  const { date: originalDate, editEntry, template }: LocationState = state || {};
+  const { date: originalDate, editEntry, templateEntries }: LocationState = state || {};
 
   const { form, onSubmit, loading } = useEntryForm({
     editEntry,
     date: dayjs(originalDate),
-    template: template,
+    template: templateEntries && templateEntries[0],
   });
   const navigate = useNavigate();
 
@@ -68,10 +69,25 @@ const EntryForm = () => {
 
   useEffect(() => {
     if (isSubmitSuccessful) {
-      reset();
-      navigate("..");
+      const remainingEntries = templateEntries && templateEntries.slice(1);
+      if (remainingEntries && remainingEntries.length > 0) {
+        const nextEntry = remainingEntries[0];
+        reset({
+          date: dayjs(originalDate),
+          duration: nextEntry.duration.toString(),
+          description: nextEntry.description || "",
+          product: nextEntry.product || "",
+          activity: nextEntry.activity || "",
+          issue: nextEntry.issue || null,
+          client: nextEntry.client || "",
+        });
+        navigate(".", { state: { date: originalDate, templateEntries: remainingEntries } });
+      } else {
+        reset();
+        navigate("..");
+      }
     }
-  }, [isSubmitSuccessful, navigate, reset]);
+  }, [dayjs, isSubmitSuccessful, navigate, originalDate, reset, templateEntries]);
 
   const { t } = useTranslation();
   const theme = useTheme();
@@ -203,7 +219,7 @@ const EntryForm = () => {
               )}
             </Grid>
             <Grid item xs={12}>
-              {!editEntry && !template && (
+              {!editEntry && !templateEntries && (
                 <FormGroup>
                   <FormControlLabel
                     control={
@@ -223,7 +239,7 @@ const EntryForm = () => {
           <>
             <Grid item xs={4} sx={{ mt: 2 }}>
               <Box sx={{ display: "flex", justifyContent: "start", gap: 2 }}>
-                {!editEntry && !template && (
+                {!editEntry && !templateEntries && (
                   <FormGroup>
                     <FormControlLabel
                       control={
diff --git a/web/src/components/workday-accordion/PasteEditEntryButton.tsx b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
index 6f593e49..49f49f32 100644
--- a/web/src/components/workday-accordion/PasteEditEntryButton.tsx
+++ b/web/src/components/workday-accordion/PasteEditEntryButton.tsx
@@ -12,7 +12,7 @@ const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const location = useLocation();
-  const { selectedEntries, setEditDate, hasEntries, removeSelectedEntry } = useEntryContext();
+  const { selectedEntries, clearEntries } = useEntryContext();
 
   return (
     <Box onClick={(e) => e.stopPropagation()}>
@@ -20,13 +20,10 @@ const PasteEditEntryButton = ({ date, ...props }: PasteEntryButtonProps) => {
         size="medium"
         label={t("controls.pasteAndEditEntry")}
         onClick={() => {
-          setEditDate(date);
-          const entry = selectedEntries[0];
-          if (hasEntries) {
-            removeSelectedEntry(entry);
-          }
+          const templateEntries = selectedEntries;
+          clearEntries();
           navigate(`${location.pathname}/create`, {
-            state: { date: date.format("YYYY-MM-DD"), template: entry },
+            state: { date: date.format("YYYY-MM-DD"), templateEntries },
           });
         }}
         {...props}
diff --git a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
index 4c85dc89..975e0c4b 100644
--- a/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
+++ b/web/src/components/workday-browser/entry-context/EntryContextProvider.tsx
@@ -1,8 +1,7 @@
-import { ReactNode, useCallback, useEffect, useState } from "react";
+import { ReactNode, useCallback, useState } from "react";
 import { EntryContext } from "./EntryContext";
 import { Entry } from "../../../graphql/generated/graphql";
 import { Dayjs } from "dayjs";
-import { useLocation, useNavigate } from "react-router-dom";
 
 type EntryContextProviderProps = {
   children: ReactNode;
@@ -27,29 +26,6 @@ export const EntryContextProvider = ({ children }: EntryContextProviderProps) =>
   }, []);
   const hasEntries = selectedEntries.length > 0;
 
-  const navigate = useNavigate();
-  const location = useLocation();
-
-  useEffect(() => {
-    if (editDate !== null && hasEntries && !location.pathname.match(/\/create\/?$/)) {
-      const entry = selectedEntries[0];
-      removeSelectedEntry(entry);
-      navigate(`${location.pathname}/create`, {
-        state: { date: editDate.format("YYYY-MM-DD"), template: entry },
-      });
-    } else if (!hasEntries) {
-      setEditDate(null);
-    }
-  }, [
-    editDate,
-    hasEntries,
-    location.pathname,
-    navigate,
-    removeSelectedEntry,
-    selectedEntries,
-    setEditDate,
-  ]);
-
   return (
     <EntryContext.Provider
       value={{