rename variables

src/client/js/components/RevisionComparer/RevisionComparer.jsx

@@ -43,15 +43,15 @@ const RevisionComparer = (props) => {
   const pagePathUrl = () => {
     const { origin } = window.location;
     const { path } = revisionCompareContainer.pageContainer.state;
-    const { fromRevision, toRevision } = revisionCompareContainer.state;
+    const { sourceRevision, targetRevision } = revisionCompareContainer.state;
 
-    const urlParams = (fromRevision && toRevision ? `?compare=${fromRevision._id}...${toRevision._id}` : '');
+    const urlParams = (sourceRevision && targetRevision ? `?compare=${sourceRevision._id}...${targetRevision._id}` : '');
     return encodeSpaces(decodeURI(`${origin}/${path}${urlParams}`));
   };
 
-  const fromRev = revisionCompareContainer.state.fromRevision;
-  const toRev = revisionCompareContainer.state.toRevision;
-  const showDiff = (fromRev && toRev);
+  const sourceRevision = revisionCompareContainer.state.sourceRevision;
+  const targetRevision = revisionCompareContainer.state.targetRevision;
+  const showDiff = (sourceRevision && targetRevision);
 
   return (
     <div className="revision-compare">
@@ -100,8 +100,8 @@ const RevisionComparer = (props) => {
         { showDiff && (
           <RevisionDiff
             revisionDiffOpened
-            previousRevision={fromRev}
-            currentRevision={toRev}
+            previousRevision={sourceRevision}
+            currentRevision={targetRevision}
           />
         )}
       </div>

src/client/js/components/RevisionComparer/RevisionSelector.jsx

@@ -9,7 +9,7 @@ import RevisionCompareContainer from '../../services/RevisionCompareContainer';
 const RevisionSelector = (props) => {
 
   const { revision, hasDiff, revisionCompareContainer } = props;
-  const { fromRevision, toRevision } = revisionCompareContainer.state;
+  const { sourceRevision, targetRevision } = revisionCompareContainer.state;
 
   if (!hasDiff) {
     return <></>;
@@ -24,8 +24,8 @@ const RevisionSelector = (props) => {
           id={`compareSource-${revision._id}`}
           name="compareSource"
           value={revision._id}
-          checked={revision._id === fromRevision?._id}
-          onChange={() => revisionCompareContainer.setState({fromRevision: revision})}
+          checked={revision._id === sourceRevision?._id}
+          onChange={() => revisionCompareContainer.setState({sourceRevision: revision})}
         />
         <label className="custom-control-label" htmlFor={`compareSource-${revision._id}`} />
       </div>
@@ -36,8 +36,8 @@ const RevisionSelector = (props) => {
           id={`compareTarget-${revision._id}`}
           name="compareTarget"
           value={revision._id}
-          checked={revision._id === toRevision?._id}
-          onChange={() => revisionCompareContainer.setState({toRevision: revision})}
+          checked={revision._id === targetRevision?._id}
+          onChange={() => revisionCompareContainer.setState({targetRevision: revision})}
           disabled={revisionCompareContainer.state.compareWithLatest}
         />
         <label className="custom-control-label" htmlFor={`compareTarget-${revision._id}`} />

src/client/js/services/RevisionCompareContainer.js

@@ -21,8 +21,8 @@ export default class RevisionCompareContainer extends Container {
     this.state = {
       errMessage: null,
 
-      fromRevision: null,
-      toRevision: null,
+      sourceRevision: null,
+      targetRevision: null,
       latestRevision: null,
       compareWithLatest: true,
     };
@@ -44,12 +44,12 @@ export default class RevisionCompareContainer extends Container {
   async initRevisions() {
     const latestRevision = await this.fetchLatestRevision();
 
-    const [fromRevisionId, toRevisionId] = this.revisionIDsToCompareAsParam;
-    const fromRevision = fromRevisionId ? await this.fetchRevision(fromRevisionId) : latestRevision;
-    const toRevision = toRevisionId ? await this.fetchRevision(toRevisionId) : latestRevision;
-    const compareWithLatest = toRevisionId ? false : this.state.compareWithLatest;
+    const [sourceRevisionId, targetRevisionId] = this.revisionIDsToCompareAsParam;
+    const sourceRevision = sourceRevisionId ? await this.fetchRevision(sourceRevisionId) : latestRevision;
+    const targetRevision = targetRevisionId ? await this.fetchRevision(targetRevisionId) : latestRevision;
+    const compareWithLatest = targetRevisionId ? false : this.state.compareWithLatest;
 
-    this.setState({ fromRevision, toRevision, latestRevision, compareWithLatest });
+    this.setState({ sourceRevision, targetRevision, latestRevision, compareWithLatest });
   }
 
   /**
@@ -109,7 +109,7 @@ export default class RevisionCompareContainer extends Container {
   }
 
   /**
-   * toggle state "compareWithLatest", and if true, set "fromRevision" to the latest revision
+   * toggle state "compareWithLatest", and if true, set "targetRevision" to the latest revision
    */
   toggleCompareWithLatest() {
     const { compareWithLatest } = this.state;
@@ -118,7 +118,7 @@ export default class RevisionCompareContainer extends Container {
     this.setState(
       Object.assign(
         { compareWithLatest: newCompareWithLatest },
-        (newCompareWithLatest === true ? { toRevision: this.state.latestRevision } : {})
+        (newCompareWithLatest === true ? { targetRevision: this.state.latestRevision } : {})
       )
     );
   }