ryohek 5 лет назад
Родитель
Сommit
e0405802be

+ 2 - 3
src/client/js/components/Page/CopyDropdown.jsx

@@ -64,13 +64,13 @@ class CopyDropdown extends React.Component {
   }
 
   generatePermalink() {
-    const { pageId, shareLinkId, isShareLinkMode } = this.props;
+    const { pageId, isShareLinkMode } = this.props;
 
     if (pageId == null) {
       return null;
     }
     if (isShareLinkMode) {
-      return decodeURI(`${origin}/share/${shareLinkId}`);
+      return decodeURI(`${origin}/share/${pageId}`);
     }
 
     return decodeURI(`${origin}/${pageId}${this.uriParams}`);
@@ -204,7 +204,6 @@ CopyDropdown.propTypes = {
   pagePath: PropTypes.string.isRequired,
   pageId: PropTypes.string,
   buttonStyle: PropTypes.object,
-  shareLinkId: PropTypes.string,
   isShareLinkMode: PropTypes.bool,
 };
 

+ 2 - 1
src/client/js/components/ShareLinkList.jsx

@@ -20,6 +20,7 @@ const ShareLinkList = (props) => {
     props.onClickDeleteButton(shareLinkId);
   }
 
+  // TODO pagePath が null だった場合の管理画面の挙動は別途実装する
   function renderShareLinks() {
     return (
       <>
@@ -66,7 +67,7 @@ const ShareLinkListWrapper = withUnstatedContainers(ShareLinkList, [AppContainer
 ShareLinkList.propTypes = {
   t: PropTypes.func.isRequired, //  i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
-  pagePath: PropTypes.string.isRequired,
+  pagePath: PropTypes.string,
 
   shareLinks: PropTypes.array.isRequired,
   onClickDeleteButton: PropTypes.func,