fix: Documents in deleted collection should appear in trash (#1362)

* fix: Documents from deleted collection should show in trash

* improve messaging

* test: Add documents.move tests
feat: Add ability to restore trashed documents from deleted collection

* update store

* fix

* ui

* lint

* fix: Improve breadcrumb

app/menus/DocumentMenu.js

@@ -11,7 +11,12 @@ import Document from "models/Document";
 import DocumentDelete from "scenes/DocumentDelete";
 import DocumentShare from "scenes/DocumentShare";
 import DocumentTemplatize from "scenes/DocumentTemplatize";
-import { DropdownMenu, DropdownMenuItem } from "components/DropdownMenu";
+import CollectionIcon from "components/CollectionIcon";
+import {
+  DropdownMenu,
+  DropdownMenuItem,
+  Header,
+} from "components/DropdownMenu";
 import Modal from "components/Modal";
 import {
   documentHistoryUrl,
@@ -100,8 +105,11 @@ class DocumentMenu extends React.Component<Props> {
     this.props.ui.showToast("Document archived");
   };
 
-  handleRestore = async (ev: SyntheticEvent<>) => {
-    await this.props.document.restore();
+  handleRestore = async (
+    ev: SyntheticEvent<>,
+    options?: { collectionId: string }
+  ) => {
+    await this.props.document.restore(options);
     this.props.ui.showToast("Document restored");
   };
 
@@ -154,6 +162,7 @@ class DocumentMenu extends React.Component<Props> {
       showPrint,
       showPin,
       auth,
+      collections,
       onOpen,
       onClose,
     } = this.props;
@@ -161,6 +170,7 @@ class DocumentMenu extends React.Component<Props> {
     const can = policies.abilities(document.id);
     const canShareDocuments = can.share && auth.team && auth.team.sharing;
     const canViewHistory = can.read && !can.restore;
+    const collection = collections.get(document.collectionId);
 
     return (
       <>
@@ -170,11 +180,45 @@ class DocumentMenu extends React.Component<Props> {
           onOpen={onOpen}
           onClose={onClose}
         >
-          {(can.unarchive || can.restore) && (
+          {can.unarchive && (
             <DropdownMenuItem onClick={this.handleRestore}>
               Restore
             </DropdownMenuItem>
           )}
+          {can.restore &&
+            (collection ? (
+              <DropdownMenuItem onClick={this.handleRestore}>
+                Restore
+              </DropdownMenuItem>
+            ) : (
+              <DropdownMenu
+                label={<DropdownMenuItem>Restore…</DropdownMenuItem>}
+                style={{
+                  left: -170,
+                  position: "relative",
+                  top: -40,
+                }}
+                hover
+              >
+                <Header>Choose a collection</Header>
+                {collections.orderedData.map((collection) => {
+                  const can = policies.abilities(collection.id);
+
+                  return (
+                    <DropdownMenuItem
+                      key={collection.id}
+                      onClick={(ev) =>
+                        this.handleRestore(ev, { collectionId: collection.id })
+                      }
+                      disabled={!can.update}
+                    >
+                      <CollectionIcon collection={collection} />
+                      &nbsp;{collection.name}
+                    </DropdownMenuItem>
+                  );
+                })}
+              </DropdownMenu>
+            ))}
           {showPin &&
             (document.pinned
               ? can.unpin && (

app/menus/RevisionMenu.js

@@ -24,7 +24,7 @@ type Props = {
 class RevisionMenu extends React.Component<Props> {
   handleRestore = async (ev: SyntheticEvent<>) => {
     ev.preventDefault();
-    await this.props.document.restore(this.props.revision);
+    await this.props.document.restore({ revisionId: this.props.revision.id });
     this.props.ui.showToast("Document restored");
     this.props.history.push(this.props.document.url);
   };