Explorar o código

Deleted latestRevision in PageHistory

Shunm634-source %!s(int64=3) %!d(string=hai) anos
pai
achega
5a84480b4c

+ 9 - 4
packages/app/src/components/PageHistory.jsx

@@ -15,14 +15,19 @@ const PageHistory = () => {
   const [activePage, setActivePage] = useState(1);
   const [activePage, setActivePage] = useState(1);
   const { data: currentPageId } = useCurrentPageId();
   const { data: currentPageId } = useCurrentPageId();
   const { data: revisionsData } = useSWRxPageRevisions(currentPageId, activePage, 10);
   const { data: revisionsData } = useSWRxPageRevisions(currentPageId, activePage, 10);
-  const [latestRevision, setLatestRevision] = useState(null);
-  const [sourceRevision, setSourceRevision] = useState(latestRevision);
-  const [targetRevision, setTargetRevision] = useState(latestRevision);
+  const [sourceRevision, setSourceRevision] = useState(null);
+  const [targetRevision, setTargetRevision] = useState(null);
 
 
   useEffect(() => {
   useEffect(() => {
-    if (revisionsData != null) setLatestRevision(revisionsData.revisions[0]);
+    if (revisionsData != null) {
+      setSourceRevision(revisionsData.revisions[0]);
+      setTargetRevision(revisionsData.revisions[0]);
+    }
   }, [revisionsData]);
   }, [revisionsData]);
 
 
+  // console.log('The source and target revisions are: ', sourceRevision, targetRevision);
+
+
   const pagingLimit = 10;
   const pagingLimit = 10;
 
 
   if (revisionsData == null) {
   if (revisionsData == null) {

+ 10 - 10
packages/app/src/components/PageHistory/PageRevisionTable.jsx

@@ -65,34 +65,34 @@ class PageRevisionTable extends React.Component {
           </div>
           </div>
         </td>
         </td>
         <td className="col-1">
         <td className="col-1">
-          {(hasDiff || revision._id === sourceRevision?._id) && (
+          {(hasDiff || revisionId === sourceRevision?._id) && (
             <div className="custom-control custom-radio custom-control-inline mr-0">
             <div className="custom-control custom-radio custom-control-inline mr-0">
               <input
               <input
                 type="radio"
                 type="radio"
                 className="custom-control-input"
                 className="custom-control-input"
-                id={`compareSource-${revision._id}`}
+                id={`compareSource-${revisionId}`}
                 name="compareSource"
                 name="compareSource"
-                value={revision._id}
-                checked={revision._id === sourceRevision?._id}
+                value={revisionId}
+                checked={revisionId === sourceRevision?._id}
                 onChange={() => changeSourceRevision(revision)}
                 onChange={() => changeSourceRevision(revision)}
               />
               />
-              <label className="custom-control-label" htmlFor={`compareSource-${revision._id}`} />
+              <label className="custom-control-label" htmlFor={`compareSource-${revisionId}`} />
             </div>
             </div>
           )}
           )}
         </td>
         </td>
         <td className="col-2">
         <td className="col-2">
-          {(hasDiff || revision._id === targetRevision?._id) && (
+          {(hasDiff || revisionId === targetRevision?._id) && (
             <div className="custom-control custom-radio custom-control-inline mr-0">
             <div className="custom-control custom-radio custom-control-inline mr-0">
               <input
               <input
                 type="radio"
                 type="radio"
                 className="custom-control-input"
                 className="custom-control-input"
-                id={`compareTarget-${revision._id}`}
+                id={`compareTarget-${revisionId}`}
                 name="compareTarget"
                 name="compareTarget"
-                value={revision._id}
-                checked={revision._id === targetRevision?._id}
+                value={revisionId}
+                checked={revisionId === targetRevision?._id}
                 onChange={() => changeTargetRevision(revision)}
                 onChange={() => changeTargetRevision(revision)}
               />
               />
-              <label className="custom-control-label" htmlFor={`compareTarget-${revision._id}`} />
+              <label className="custom-control-label" htmlFor={`compareTarget-${revisionId}`} />
             </div>
             </div>
           )}
           )}
         </td>
         </td>