Browse Source

80481 wip clean code

Mao 4 years ago
parent
commit
6e788299c1

+ 3 - 18
packages/app/src/client/services/PageContainer.js

@@ -292,24 +292,9 @@ export default class PageContainer extends Container {
     await this.retrieveLikersAndSeenUsers();
     await this.retrieveLikersAndSeenUsers();
   }
   }
 
 
-  // async toggleLike() {
-  //   {
-  //     const toggledIsLiked = this.state.isLiked;
-  //     await this.appContainer.apiv3Put('/page/likes', { pageId: this.state.pageId, bool: toggledIsLiked });
-
-  //     await this.setState(state => ({
-  //       isLiked: !toggledIsLiked,
-  //       sumOfLikers: toggledIsLiked ? state.sumOfLikers - 1 : state.sumOfLikers + 1,
-  //       likerIds: toggledIsLiked
-  //         ? state.likerIds.filter(id => id !== this.appContainer.currentUserId)
-  //         : [...this.state.likerIds, this.appContainer.currentUserId],
-  //     }));
-  //   }
-
-  //   await this.retrieveLikersAndSeenUsers();
-  // }
-
-  async setStateAfterLike() {
+  // this method is used only when like happend in search page but not in normal page view.
+  // search page holds state that is not depending on pageContainer
+  async updateStateAfterLike() {
     const toggledIsLiked = this.state.isLiked;
     const toggledIsLiked = this.state.isLiked;
     await this.setState(state => ({
     await this.setState(state => ({
       isLiked: !toggledIsLiked,
       isLiked: !toggledIsLiked,

+ 0 - 3
packages/app/src/components/SearchPage/SearchResultSubNavButton.tsx

@@ -4,11 +4,9 @@ import React, {
 import AppContainer from '../../client/services/AppContainer';
 import AppContainer from '../../client/services/AppContainer';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 
 
-import BookmarkButton from '../BookmarkButton';
 import LikeButtons from '../LikeButtons';
 import LikeButtons from '../LikeButtons';
 import PageManagement from '../Page/PageManagement';
 import PageManagement from '../Page/PageManagement';
 import { apiv3Get, apiv3Put } from '../../client/util/apiv3-client';
 import { apiv3Get, apiv3Put } from '../../client/util/apiv3-client';
-import { toastError } from '../../client/util/apiNotification';
 
 
 
 
 type PageReactionButtonsProps = {
 type PageReactionButtonsProps = {
@@ -19,7 +17,6 @@ type PageReactionButtonsProps = {
 const PageReactionButtons : React.FC<PageReactionButtonsProps> = (props: PageReactionButtonsProps) => {
 const PageReactionButtons : React.FC<PageReactionButtonsProps> = (props: PageReactionButtonsProps) => {
   const { appContainer, pageId } = props;
   const { appContainer, pageId } = props;
   const LikeButtonsTypeAny : any = LikeButtons;
   const LikeButtonsTypeAny : any = LikeButtons;
-  const BookMarkButtonTypeAny: any = BookmarkButton;
 
 
   const [sumOflikers, setSumOfLikers] = useState(0);
   const [sumOflikers, setSumOfLikers] = useState(0);
   const [likers, setLikers] = useState<string[]>([]);
   const [likers, setLikers] = useState<string[]>([]);

+ 2 - 2
packages/app/src/server/routes/apiv3/page.js

@@ -228,10 +228,10 @@ module.exports = (crowi) => {
       }
       }
 
 
       if (isLiked) {
       if (isLiked) {
-        page = await page.unlike(req.user);
+        page = await page.like(req.user);
       }
       }
       else {
       else {
-        page = await page.like(req.user);
+        page = await page.unlike(req.user);
       }
       }
     }
     }
     catch (err) {
     catch (err) {