81076 fb

packages/app/src/components/Page/PageManagement.jsx

@@ -29,7 +29,7 @@ const LegacyPageManagemenet = (props) => {
   const [isPageTemplateModalShown, setIsPageTempleteModalShown] = useState(false);
   const [isPageDeleteModalShown, setIsPageDeleteModalShown] = useState(false);
   const [isPagePresentationModalShown, setIsPagePresentationModalShown] = useState(false);
-  const presentationHref = new URL(urljoin(window.location.origin, path, '?presentation=1')).href;
+  const presentationHref = urljoin(window.location.origin, path, '?presentation=1');
 
   function openPageRenameModalHandler() {
     setIsPageRenameModalShown(true);

packages/app/src/components/SearchPage/SearchResultContentSubNavigation.tsx

@@ -1,4 +1,5 @@
 import React, { FC, useCallback } from 'react';
+import { pagePathUtils } from '@growi/core';
 import PagePathNav from '../PagePathNav';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import AppContainer from '../../client/services/AppContainer';
@@ -23,6 +24,8 @@ const SearchResultContentSubNavigation: FC<Props> = (props : Props) => {
     appContainer, pageId, revisionId, path, isCompactMode, isSignleLineMode,
   } = props;
 
+  const { isTrashPage } = pagePathUtils;
+
   const { data: tagInfoData, error: tagInfoError, mutate: mutateTagInfo } = useSWRTagsInfo(pageId);
 
   const tagsUpdatedHandler = useCallback(async(newTags) => {
@@ -40,9 +43,7 @@ const SearchResultContentSubNavigation: FC<Props> = (props : Props) => {
     return <></>;
   }
   const { isSharedUser } = appContainer;
-  // path : /trash/hoge. subStr(0,7) => /trash/
-  const isTrashPage = path.substr(0, 7) === '/trash/';
-  const isAbleToShowPageManagement = !isTrashPage && !isSharedUser;
+  const isAbleToShowPageManagement = !(isTrashPage(path)) && !isSharedUser;
   return (
     <div className={`grw-subnav container-fluid d-flex align-items-center justify-content-between ${isCompactMode ? 'grw-subnav-compact d-print-none' : ''}`}>
       {/* Left side */}

packages/app/src/interfaces/bookmark-info.ts

@@ -0,0 +1,4 @@
+export type IBookmarkInfo = {
+  sumOfBookmarks: number;
+  isBookmarked: boolean,
+};

packages/app/src/stores/bookmark.ts

@@ -1,9 +1,10 @@
 import useSWR, { SWRResponse } from 'swr';
 import { apiv3Get } from '../client/util/apiv3-client';
+import { IBookmarkInfo } from '../interfaces/bookmark-info';
 
 
 // TODO response type
-export const useSWRBookmarkInfo = (pageId: string) => {
+export const useSWRBookmarkInfo = (pageId: string): SWRResponse<IBookmarkInfo, Error> => {
   return useSWR(
     `/bookmarks/info?pageId=${pageId}`,
     endpoint => apiv3Get(endpoint).then((response) => {