Merge pull request #259 from jorilallo/issue-241

Added move and star to document menu

frontend/menus/DocumentMenu.js

@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react';
 import Document from 'models/Document';
 import UiStore from 'stores/UiStore';
 import Icon from 'components/Icon';
+import { documentMoveUrl } from 'utils/routeHelpers';
 import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu';
 
 @observer class DocumentMenu extends Component {
@@ -19,32 +20,45 @@ import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu';
     this.props.history.push(`${this.props.document.collection.url}/new`);
   };
 
-  onCreateChild = () => {
+  handleDelete = () => {
-    this.props.history.push(`${this.props.document.url}/new`);
-  };
-
-  onDelete = () => {
     const { document } = this.props;
     this.props.ui.setActiveModal('document-delete', { document });
   };
 
-  onExport = () => {
+  handleMove = () => {
+    this.props.history.push(documentMoveUrl(this.props.document));
+  };
+
+  handleStar = () => {
+    this.props.document.star();
+  };
+
+  handleUnstar = () => {
+    this.props.document.unstar();
+  };
+
+  handleExport = () => {
     this.props.document.download();
   };
 
   render() {
     const { document, label } = this.props;
-    const { collection, allowDelete } = document;
+    const { allowDelete } = document;
 
     return (
       <DropdownMenu label={label || <Icon type="MoreHorizontal" />}>
-        {collection &&
+        {document.starred
-          <DropdownMenuItem onClick={this.onCreateDocument}>
+          ? <DropdownMenuItem onClick={this.handleUnstar}>
-            New document
+              Unstar
-          </DropdownMenuItem>}
+            </DropdownMenuItem>
-        <DropdownMenuItem onClick={this.onExport}>Export</DropdownMenuItem>
+          : <DropdownMenuItem onClick={this.handleStar}>Star</DropdownMenuItem>}
+
+        <DropdownMenuItem onClick={this.handleMove}>Move</DropdownMenuItem>
+        <DropdownMenuItem onClick={this.handleExport}>Export</DropdownMenuItem>
         {allowDelete &&
-          <DropdownMenuItem onClick={this.onDelete}>Delete</DropdownMenuItem>}
+          <DropdownMenuItem onClick={this.handleDelete}>
+            Delete
+          </DropdownMenuItem>}
       </DropdownMenu>
     );
   }

frontend/scenes/Document/Document.js

@@ -10,7 +10,8 @@ import Flex from 'components/Flex';
 import { color, layout } from 'styles/constants';
 import {
   collectionUrl,
-  updateDocumentUrl,
+  documentUpdateUrl,
+  documentMoveUrl,
   matchDocumentEdit,
   matchDocumentMove,
 } from 'utils/routeHelpers';
@@ -78,9 +79,9 @@ type Props = {
   }
 
   @keydown('m')
-  goToMove(event) {
+  goToMove(ev) {
-    event.preventDefault();
+    ev.preventDefault();
-    if (this.document) this.props.history.push(`${this.document.url}/move`);
+    if (this.document) this.props.history.push(documentMoveUrl(this.document));
   }
 
   loadDocument = async props => {
@@ -108,7 +109,7 @@ type Props = {
 
         // Update url to match the current one
         this.props.history.replace(
-          updateDocumentUrl(this.props.match.url, document.url)
+          documentUpdateUrl(this.props.match.url, document.url)
         );
       } else {
         // Render 404 with search

frontend/utils/routeHelpers.js

@@ -26,6 +26,20 @@ export function documentEditUrl(doc: Document): string {
   return `${doc.url}/edit`;
 }
 
+export function documentMoveUrl(doc: Document): string {
+  return `${doc.url}/move`;
+}
+
+/**
+ * Replace full url's document part with the new one in case
+ * the document slug has been updated
+ */
+export function documentUpdateUrl(oldUrl: string, newUrl: string): string {
+  // Update url to match the current one
+  const urlParts = oldUrl.split('/');
+  return [newUrl, urlParts.slice(3)].join('/');
+}
+
 export function newDocumentUrl(collection: Collection): string {
   return `${collection.url}/new`;
 }
@@ -44,13 +58,3 @@ export const matchDocumentSlug =
 
 export const matchDocumentEdit = `/doc/${matchDocumentSlug}/edit`;
 export const matchDocumentMove = `/doc/${matchDocumentSlug}/move`;
-
-/**
- * Replace full url's document part with the new one in case
- * the document slug has been updated
- */
-export function updateDocumentUrl(oldUrl: string, newUrl: string): string {
-  // Update url to match the current one
-  const urlParts = oldUrl.split('/');
-  return [newUrl, urlParts.slice(3)].join('/');
-}