|
@@ -1,6 +1,4 @@
|
|
|
-import React, {
|
|
|
|
|
- useState, useEffect, useCallback,
|
|
|
|
|
-} from 'react';
|
|
|
|
|
|
|
+import React, { useState } from 'react';
|
|
|
import PropTypes from 'prop-types';
|
|
import PropTypes from 'prop-types';
|
|
|
import { withTranslation } from 'react-i18next';
|
|
import { withTranslation } from 'react-i18next';
|
|
|
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
|
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
|
@@ -10,7 +8,6 @@ import {
|
|
|
|
|
|
|
|
import { withUnstatedContainers } from './UnstatedUtils';
|
|
import { withUnstatedContainers } from './UnstatedUtils';
|
|
|
|
|
|
|
|
-import PageHistroyContainer from '../services/PageHistoryContainer';
|
|
|
|
|
import RevisionCompareContainer from '../services/RevisionCompareContainer';
|
|
import RevisionCompareContainer from '../services/RevisionCompareContainer';
|
|
|
|
|
|
|
|
import RevisionDiff from './PageHistory/RevisionDiff';
|
|
import RevisionDiff from './PageHistory/RevisionDiff';
|
|
@@ -36,18 +33,10 @@ function encodeSpaces(str) {
|
|
|
|
|
|
|
|
const PageCompare = (props) => {
|
|
const PageCompare = (props) => {
|
|
|
|
|
|
|
|
- const [dropdownOpen, setDropdownOpen] = useState(false);
|
|
|
|
|
-
|
|
|
|
|
const toggleDropdown = () => {
|
|
const toggleDropdown = () => {
|
|
|
setDropdownOpen(!dropdownOpen);
|
|
setDropdownOpen(!dropdownOpen);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- const { t, revisionCompareContainer } = props;
|
|
|
|
|
-
|
|
|
|
|
- const fromRev = revisionCompareContainer.state.fromRevision;
|
|
|
|
|
- const toRev = revisionCompareContainer.state.toRevision;
|
|
|
|
|
- const showDiff = (fromRev && toRev);
|
|
|
|
|
-
|
|
|
|
|
const pagePathUrl = () => {
|
|
const pagePathUrl = () => {
|
|
|
const { origin } = window.location;
|
|
const { origin } = window.location;
|
|
|
const { path } = revisionCompareContainer.pageContainer.state;
|
|
const { path } = revisionCompareContainer.pageContainer.state;
|
|
@@ -57,6 +46,14 @@ const PageCompare = (props) => {
|
|
|
return encodeSpaces(decodeURI(`${origin}/${path}${urlParams}`));
|
|
return encodeSpaces(decodeURI(`${origin}/${path}${urlParams}`));
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const [dropdownOpen, setDropdownOpen] = useState(false);
|
|
|
|
|
+
|
|
|
|
|
+ const { t, revisionCompareContainer } = props;
|
|
|
|
|
+
|
|
|
|
|
+ const fromRev = revisionCompareContainer.state.fromRevision;
|
|
|
|
|
+ const toRev = revisionCompareContainer.state.toRevision;
|
|
|
|
|
+ const showDiff = (fromRev && toRev);
|
|
|
|
|
+
|
|
|
return (
|
|
return (
|
|
|
<React.Fragment>
|
|
<React.Fragment>
|
|
|
<div className="float-left">{t('page_history.comparing_changes')}</div>
|
|
<div className="float-left">{t('page_history.comparing_changes')}</div>
|
|
@@ -102,11 +99,10 @@ const PageCompare = (props) => {
|
|
|
/**
|
|
/**
|
|
|
* Wrapper component for using unstated
|
|
* Wrapper component for using unstated
|
|
|
*/
|
|
*/
|
|
|
-const PageCompareWrapper = withUnstatedContainers(PageCompare, [PageHistroyContainer, RevisionCompareContainer]);
|
|
|
|
|
|
|
+const PageCompareWrapper = withUnstatedContainers(PageCompare, [RevisionCompareContainer]);
|
|
|
|
|
|
|
|
PageCompare.propTypes = {
|
|
PageCompare.propTypes = {
|
|
|
t: PropTypes.func.isRequired, // i18next
|
|
t: PropTypes.func.isRequired, // i18next
|
|
|
- pageHistoryContainer: PropTypes.instanceOf(PageHistroyContainer).isRequired,
|
|
|
|
|
revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
|
|
revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
|
|
|
};
|
|
};
|
|
|
|
|
|