From 6ea3b880f93e1d0dda2896aa441cdd1efa227a25 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sun, 18 Oct 2020 12:45:42 +0300
Subject: [PATCH] Fix being able to access the changelog of deleted items.

---
 src/Calendars/Main.tsx        | 28 +++++++++++++++-------------
 src/Contacts/Main.tsx         | 28 +++++++++++++++-------------
 src/Pim/ItemChangeHistory.tsx |  5 +++++
 src/Tasks/Main.tsx            | 28 +++++++++++++++-------------
 4 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/src/Calendars/Main.tsx b/src/Calendars/Main.tsx
index 66755a1..280c3ed 100644
--- a/src/Calendars/Main.tsx
+++ b/src/Calendars/Main.tsx
@@ -134,6 +134,21 @@ export default function CalendarsMain() {
           history={history}
         />
       </Route>
+      <Route
+        path={routeResolver.getRoute("pim.events._id.log")}
+        render={({ match }) => {
+          // We have this path outside because we don't want the item existing check
+          const [colUid, itemUid] = match.params.itemUid.split("|");
+          const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
+          if (!cachedCollection) {
+            return (<PageNotFound />);
+          }
+
+          return (
+            <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
+          );
+        }}
+      />
       <Route
         path={routeResolver.getRoute("pim.events._id")}
         render={({ match }) => {
@@ -179,19 +194,6 @@ export default function CalendarsMain() {
                   duplicate
                 />
               </Route>
-              <Route
-                path={routeResolver.getRoute("pim.events._id.log")}
-                render={() => {
-                  const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
-                  if (!cachedCollection) {
-                    return (<PageNotFound />);
-                  }
-
-                  return (
-                    <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
-                  );
-                }}
-              />
               <Route
                 path={routeResolver.getRoute("pim.events._id")}
                 exact
diff --git a/src/Contacts/Main.tsx b/src/Contacts/Main.tsx
index 1f92786..8e528e5 100644
--- a/src/Contacts/Main.tsx
+++ b/src/Contacts/Main.tsx
@@ -118,6 +118,21 @@ export default function ContactsMain() {
           history={history}
         />
       </Route>
+      <Route
+        path={routeResolver.getRoute("pim.contacts._id.log")}
+        render={({ match }) => {
+          // We have this path outside because we don't want the item existing check
+          const [colUid, itemUid] = match.params.itemUid.split("|");
+          const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
+          if (!cachedCollection) {
+            return (<PageNotFound />);
+          }
+
+          return (
+            <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
+          );
+        }}
+      />
       <Route
         path={routeResolver.getRoute("pim.contacts._id")}
         render={({ match }) => {
@@ -147,19 +162,6 @@ export default function ContactsMain() {
                   history={history}
                 />
               </Route>
-              <Route
-                path={routeResolver.getRoute("pim.contacts._id.log")}
-                render={() => {
-                  const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
-                  if (!cachedCollection) {
-                    return (<PageNotFound />);
-                  }
-
-                  return (
-                    <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
-                  );
-                }}
-              />
               <Route
                 path={routeResolver.getRoute("pim.contacts._id")}
                 exact
diff --git a/src/Pim/ItemChangeHistory.tsx b/src/Pim/ItemChangeHistory.tsx
index 2e3f92d..a317e4d 100644
--- a/src/Pim/ItemChangeHistory.tsx
+++ b/src/Pim/ItemChangeHistory.tsx
@@ -16,6 +16,7 @@ import LoadingIndicator from "../widgets/LoadingIndicator";
 import GenericChangeHistory from "../components/GenericChangeHistory";
 import { useItems } from "../etebase-helpers";
 import { CachedCollection } from "./helpers";
+import PageNotFound from "../PageNotFound";
 
 export interface CachedItem {
   item: Etebase.Item;
@@ -68,6 +69,10 @@ export default function ItemChangeHistory(props: PropsType) {
     }
   }, [etebase, collection, item]);
 
+  if (!item) {
+    return (<PageNotFound />);
+  }
+
   if (!entries) {
     return (
       <LoadingIndicator />
diff --git a/src/Tasks/Main.tsx b/src/Tasks/Main.tsx
index 8c76e58..e8d973e 100644
--- a/src/Tasks/Main.tsx
+++ b/src/Tasks/Main.tsx
@@ -120,6 +120,21 @@ export default function TasksMain() {
           history={history}
         />
       </Route>
+      <Route
+        path={routeResolver.getRoute("pim.tasks._id.log")}
+        render={({ match }) => {
+          // We have this path outside because we don't want the item existing check
+          const [colUid, itemUid] = match.params.itemUid.split("|");
+          const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
+          if (!cachedCollection) {
+            return (<PageNotFound />);
+          }
+
+          return (
+            <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
+          );
+        }}
+      />
       <Route
         path={routeResolver.getRoute("pim.tasks._id")}
         render={({ match }) => {
@@ -149,19 +164,6 @@ export default function TasksMain() {
                   history={history}
                 />
               </Route>
-              <Route
-                path={routeResolver.getRoute("pim.tasks._id.log")}
-                render={() => {
-                  const cachedCollection = cachedCollections!.find((x) => x.collection.uid === colUid)!;
-                  if (!cachedCollection) {
-                    return (<PageNotFound />);
-                  }
-
-                  return (
-                    <ItemChangeHistory collection={cachedCollection} itemUid={itemUid} />
-                  );
-                }}
-              />
               <Route
                 path={routeResolver.getRoute("pim.tasks._id")}
                 exact