Merge branch 'support/share-link-for-outside-for-merge' into support/issue-new-share-link

src/client/js/components/OutsideShareLinkModal.jsx

@@ -7,7 +7,7 @@ import {
 
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 import AppContainer from '../services/AppContainer';
 import PageContainer from '../services/PageContainer';
@@ -53,10 +53,7 @@ const OutsideShareLinkModal = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const ModalControlWrapper = (props) => {
-  return createSubscribedElement(OutsideShareLinkModal, props, [AppContainer, PageContainer]);
-};
-
+const ModalControlWrapper = withUnstatedContainers(OutsideShareLinkModal, [AppContainer, PageContainer]);
 
 OutsideShareLinkModal.propTypes = {
   t: PropTypes.func.isRequired, //  i18next

src/client/js/components/Page/PageShareManagement.jsx

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { UncontrolledTooltip } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from '../UnstatedUtils';
+
+import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
 import PageContainer from '../../services/PageContainer';
 import OutsideShareLinkModal from '../OutsideShareLinkModal';
@@ -83,9 +84,7 @@ const PageShareManagement = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const PageShareManagementWrapper = (props) => {
-  return createSubscribedElement(PageShareManagement, props, [AppContainer, PageContainer]);
-};
+const PageShareManagementWrapper = withUnstatedContainers(PageShareManagement, [AppContainer, PageContainer]);
 
 
 PageShareManagement.propTypes = {

src/client/js/components/ShareLinkForm.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import dateFnsFormat from 'date-fns/format';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 import { toastSuccess, toastError } from '../util/apiNotification';
 
@@ -198,9 +198,8 @@ class ShareLinkForm extends React.Component {
 
 }
 
-const ShareLinkFormWrapper = (props) => {
-  return createSubscribedElement(ShareLinkForm, props, [AppContainer, PageContainer]);
-};
+const ShareLinkFormWrapper = withUnstatedContainers(ShareLinkForm, [AppContainer, PageContainer]);
+
 
 ShareLinkForm.propTypes = {
   t: PropTypes.func.isRequired, // i18next

src/client/js/components/ShareLinkList.jsx

@@ -3,7 +3,7 @@ import * as toastr from 'toastr';
 
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 import AppContainer from '../services/AppContainer';
 
@@ -77,8 +77,6 @@ const ShareLinkList = (props) => {
   );
 };
 
-const ShareLinkListWrapper = (props) => {
-  return createSubscribedElement(ShareLinkList, props, [AppContainer]);
-};
+const ShareLinkListWrapper = withUnstatedContainers(ShareLinkList, [AppContainer]);
 
 export default withTranslation()(ShareLinkListWrapper);