rename component

src/client/js/app.jsx

@@ -38,7 +38,7 @@ import GrowiSubNavigationSwitcher from './components/Navbar/GrowiSubNavigationSw
 import NavigationContainer from './services/NavigationContainer';
 import PageContainer from './services/PageContainer';
 import PageHistoryContainer from './services/PageHistoryContainer';
-import RevisionCompareContainer from './services/RevisionCompareContainer';
+import RevisionComparerContainer from './services/RevisionComparerContainer';
 import CommentContainer from './services/CommentContainer';
 import EditorContainer from './services/EditorContainer';
 import TagContainer from './services/TagContainer';
@@ -58,14 +58,14 @@ const socketIoContainer = appContainer.getContainer('SocketIoContainer');
 const navigationContainer = new NavigationContainer(appContainer);
 const pageContainer = new PageContainer(appContainer);
 const pageHistoryContainer = new PageHistoryContainer(appContainer, pageContainer);
-const revisionCompareContainer = new RevisionCompareContainer(appContainer, pageContainer);
+const revisionComparerContainer = new RevisionComparerContainer(appContainer, pageContainer);
 const commentContainer = new CommentContainer(appContainer);
 const editorContainer = new EditorContainer(appContainer, defaultEditorOptions, defaultPreviewOptions);
 const tagContainer = new TagContainer(appContainer);
 const personalContainer = new PersonalContainer(appContainer);
 const pageAccessoriesContainer = new PageAccessoriesContainer(appContainer);
 const injectableContainers = [
-  appContainer, socketIoContainer, navigationContainer, pageContainer, pageHistoryContainer, revisionCompareContainer,
+  appContainer, socketIoContainer, navigationContainer, pageContainer, pageHistoryContainer, revisionComparerContainer,
   commentContainer, editorContainer, tagContainer, personalContainer, pageAccessoriesContainer,
 ];
 
@@ -123,7 +123,7 @@ if (pageContainer.state.pageId != null) {
   });
 
   // show the Page accessory modal when query of "compare" is requested
-  if (revisionCompareContainer.revisionIDsToCompareAsParam.length > 0) {
+  if (revisionComparerContainer.revisionIDsToCompareAsParam.length > 0) {
     pageAccessoriesContainer.openPageAccessoriesModal('pageHistory');
   }
 }

src/client/js/components/PageHistory.jsx

@@ -11,7 +11,7 @@ import PageRevisionList from './PageHistory/PageRevisionList';
 import PageHistroyContainer from '../services/PageHistoryContainer';
 import PaginationWrapper from './PaginationWrapper';
 import RevisionComparer from './RevisionComparer/RevisionComparer';
-import RevisionCompareContainer from '../services/RevisionCompareContainer';
+import RevisionComparerContainer from '../services/RevisionComparerContainer';
 
 const logger = loggerFactory('growi:PageHistory');
 
@@ -45,7 +45,7 @@ function PageHistory(props) {
     throw new Promise(async() => {
       try {
         await props.pageHistoryContainer.retrieveRevisions(1);
-        await props.revisionCompareContainer.initRevisions();
+        await props.revisionComparerContainer.initRevisions();
       }
       catch (err) {
         toastError(err);
@@ -83,11 +83,11 @@ function PageHistory(props) {
 
 }
 
-const RenderPageHistoryWrapper = withUnstatedContainers(withLoadingSppiner(PageHistory), [PageHistroyContainer, RevisionCompareContainer]);
+const RenderPageHistoryWrapper = withUnstatedContainers(withLoadingSppiner(PageHistory), [PageHistroyContainer, RevisionComparerContainer]);
 
 PageHistory.propTypes = {
   pageHistoryContainer: PropTypes.instanceOf(PageHistroyContainer).isRequired,
-  revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
+  revisionComparerContainer: PropTypes.instanceOf(RevisionComparerContainer).isRequired,
 };
 
 export default RenderPageHistoryWrapper;

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

@@ -8,7 +8,7 @@ import {
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 
-import RevisionCompareContainer from '../../services/RevisionCompareContainer';
+import RevisionComparerContainer from '../../services/RevisionComparerContainer';
 
 import RevisionDiff from '../PageHistory/RevisionDiff';
 
@@ -34,7 +34,7 @@ const RevisionComparer = (props) => {
 
   const [dropdownOpen, setDropdownOpen] = useState(false);
 
-  const { t, revisionCompareContainer } = props;
+  const { t, revisionComparerContainer } = props;
 
   function toggleDropdown() {
     setDropdownOpen(!dropdownOpen);
@@ -42,14 +42,14 @@ const RevisionComparer = (props) => {
 
   const pagePathUrl = () => {
     const { origin } = window.location;
-    const { path } = revisionCompareContainer.pageContainer.state;
-    const { sourceRevision, targetRevision } = revisionCompareContainer.state;
+    const { path } = revisionComparerContainer.pageContainer.state;
+    const { sourceRevision, targetRevision } = revisionComparerContainer.state;
 
     const urlParams = (sourceRevision && targetRevision ? `?compare=${sourceRevision._id}...${targetRevision._id}` : '');
     return encodeSpaces(decodeURI(`${origin}/${path}${urlParams}`));
   };
 
-  const { sourceRevision, targetRevision } = revisionCompareContainer.state;
+  const { sourceRevision, targetRevision } = revisionComparerContainer.state;
   const showDiff = (sourceRevision && targetRevision);
 
   return (
@@ -62,8 +62,8 @@ const RevisionComparer = (props) => {
               type="checkbox"
               className="custom-control-input"
               id="comparingWithLatest"
-              checked={revisionCompareContainer.state.compareWithLatest}
-              onChange={() => revisionCompareContainer.toggleCompareWithLatest()}
+              checked={revisionComparerContainer.state.compareWithLatest}
+              onChange={() => revisionComparerContainer.toggleCompareWithLatest()}
             />
             <label className="custom-control-label" htmlFor="comparingWithLatest">
               { t('page_history.comparing_with_latest') }
@@ -111,11 +111,11 @@ const RevisionComparer = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const RevisionComparerWrapper = withUnstatedContainers(RevisionComparer, [RevisionCompareContainer]);
+const RevisionComparerWrapper = withUnstatedContainers(RevisionComparer, [RevisionComparerContainer]);
 
 RevisionComparer.propTypes = {
   t: PropTypes.func.isRequired, // i18next
-  revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
+  revisionComparerContainer: PropTypes.instanceOf(RevisionComparerContainer).isRequired,
 
   revisions: PropTypes.array,
 };

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

@@ -4,12 +4,12 @@ import PropTypes from 'prop-types';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withLoadingSppiner } from '../SuspenseUtils';
 
-import RevisionCompareContainer from '../../services/RevisionCompareContainer';
+import RevisionComparerContainer from '../../services/RevisionComparerContainer';
 
 const RevisionSelector = (props) => {
 
-  const { revision, hasDiff, revisionCompareContainer } = props;
-  const { sourceRevision, targetRevision } = revisionCompareContainer.state;
+  const { revision, hasDiff, revisionComparerContainer } = props;
+  const { sourceRevision, targetRevision } = revisionComparerContainer.state;
 
   if (!hasDiff) {
     return <></>;
@@ -25,7 +25,7 @@ const RevisionSelector = (props) => {
           name="compareSource"
           value={revision._id}
           checked={revision._id === sourceRevision?._id}
-          onChange={() => revisionCompareContainer.setState({sourceRevision: revision})}
+          onChange={() => revisionComparerContainer.setState({sourceRevision: revision})}
         />
         <label className="custom-control-label" htmlFor={`compareSource-${revision._id}`} />
       </div>
@@ -37,8 +37,8 @@ const RevisionSelector = (props) => {
           name="compareTarget"
           value={revision._id}
           checked={revision._id === targetRevision?._id}
-          onChange={() => revisionCompareContainer.setState({targetRevision: revision})}
-          disabled={revisionCompareContainer.state.compareWithLatest}
+          onChange={() => revisionComparerContainer.setState({targetRevision: revision})}
+          disabled={revisionComparerContainer.state.compareWithLatest}
         />
         <label className="custom-control-label" htmlFor={`compareTarget-${revision._id}`} />
       </div>
@@ -47,10 +47,10 @@ const RevisionSelector = (props) => {
 
 }
 
-const RevisionSelectorWrapper = withUnstatedContainers(withLoadingSppiner(RevisionSelector), [RevisionCompareContainer]);
+const RevisionSelectorWrapper = withUnstatedContainers(withLoadingSppiner(RevisionSelector), [RevisionComparerContainer]);
 
 RevisionSelector.propTypes = {
-  revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
+  revisionComparerContainer: PropTypes.instanceOf(RevisionComparerContainer).isRequired,
 
   revision: PropTypes.object,
   hasDiff: PropTypes.bool.isRequired,

src/client/js/services/RevisionCompareContainer.js → src/client/js/services/RevisionComparerContainer.js

@@ -10,7 +10,7 @@ const logger = loggerFactory('growi:PageHistoryContainer');
  * Service container for personal settings page (RevisionCompare.jsx)
  * @extends {Container} unstated Container
  */
-export default class RevisionCompareContainer extends Container {
+export default class RevisionComparerContainer extends Container {
 
   constructor(appContainer, pageContainer) {
     super();
@@ -35,7 +35,7 @@ export default class RevisionCompareContainer extends Container {
    * Workaround for the mangling in production build to break constructor.name
    */
   static getClassName() {
-    return 'RevisionCompareContainer';
+    return 'RevisionComparerContainer';
   }
 
   /**