From 8c54f6330f8bca117f09c9c5ec3b182a2618b1af Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 2 Jan 2023 10:39:49 -0500
Subject: [PATCH] chore: Clarify import/export options

---
 app/hooks/useSettingsConfig.ts                         | 8 ++++----
 app/scenes/Settings/Import.tsx                         | 8 ++++----
 app/scenes/Settings/components/ImportNotionDialog.tsx  | 3 +--
 app/scenes/Settings/components/ImportOutlineDialog.tsx | 7 +++----
 shared/i18n/locales/en_US/translation.json             | 4 ++--
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/hooks/useSettingsConfig.ts b/app/hooks/useSettingsConfig.ts
index 6b99b03cd..6fdbc739a 100644
--- a/app/hooks/useSettingsConfig.ts
+++ b/app/hooks/useSettingsConfig.ts
@@ -1,5 +1,4 @@
 import {
-  NewDocumentIcon,
   EmailIcon,
   ProfileIcon,
   PadlockIcon,
@@ -10,9 +9,10 @@ import {
   TeamIcon,
   BeakerIcon,
   BuildingBlocksIcon,
-  DownloadIcon,
   WebhooksIcon,
   SettingsIcon,
+  ExportIcon,
+  ImportIcon,
 } from "outline-icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -167,7 +167,7 @@ const useSettingsConfig = () => {
         component: Import,
         enabled: can.createImport,
         group: t("Team"),
-        icon: NewDocumentIcon,
+        icon: ImportIcon,
       },
       Export: {
         name: t("Export"),
@@ -175,7 +175,7 @@ const useSettingsConfig = () => {
         component: Export,
         enabled: can.createExport,
         group: t("Team"),
-        icon: DownloadIcon,
+        icon: ExportIcon,
       },
       // Integrations
       Webhooks: {
diff --git a/app/scenes/Settings/Import.tsx b/app/scenes/Settings/Import.tsx
index f73891bba..c7af91c1a 100644
--- a/app/scenes/Settings/Import.tsx
+++ b/app/scenes/Settings/Import.tsx
@@ -7,7 +7,7 @@ import { cdnPath } from "@shared/utils/urls";
 import FileOperation from "~/models/FileOperation";
 import Button from "~/components/Button";
 import Heading from "~/components/Heading";
-import OutlineIcon from "~/components/Icons/OutlineIcon";
+import MarkdownIcon from "~/components/Icons/MarkdownIcon";
 import Item from "~/components/List/Item";
 import PaginatedList from "~/components/PaginatedList";
 import Scene from "~/components/Scene";
@@ -35,10 +35,10 @@ function Import() {
       <div>
         <Item
           border={false}
-          image={<OutlineIcon size={28} cover />}
-          title="Outline"
+          image={<MarkdownIcon size={28} />}
+          title={t("Markdown")}
           subtitle={t(
-            "Import a backup file that was previously exported from Outline"
+            "Import a zip file of Markdown documents (exported from Outline 0.67.0 or earlier)"
           )}
           actions={
             <Button
diff --git a/app/scenes/Settings/components/ImportNotionDialog.tsx b/app/scenes/Settings/components/ImportNotionDialog.tsx
index 478aa8a75..0a9b1adb0 100644
--- a/app/scenes/Settings/components/ImportNotionDialog.tsx
+++ b/app/scenes/Settings/components/ImportNotionDialog.tsx
@@ -1,4 +1,3 @@
-import { observer } from "mobx-react";
 import * as React from "react";
 import { Trans } from "react-i18next";
 import Flex from "~/components/Flex";
@@ -32,4 +31,4 @@ function ImportNotionDialog() {
   );
 }
 
-export default observer(ImportNotionDialog);
+export default ImportNotionDialog;
diff --git a/app/scenes/Settings/components/ImportOutlineDialog.tsx b/app/scenes/Settings/components/ImportOutlineDialog.tsx
index 1d328e8c2..b9e6e7bb4 100644
--- a/app/scenes/Settings/components/ImportOutlineDialog.tsx
+++ b/app/scenes/Settings/components/ImportOutlineDialog.tsx
@@ -1,4 +1,3 @@
-import { observer } from "mobx-react";
 import * as React from "react";
 import { Trans } from "react-i18next";
 import Flex from "~/components/Flex";
@@ -18,8 +17,8 @@ function ImportOutlineDialog() {
           format="outline-markdown"
         >
           <Trans>
-            Drag and drop the zip file from Outline's export option, or click to
-            upload
+            Drag and drop the zip file from Outline's Markdown export option, or
+            click to upload
           </Trans>
         </DropToImport>
       </Text>
@@ -35,4 +34,4 @@ function ImportOutlineDialog() {
   );
 }
 
-export default observer(ImportOutlineDialog);
+export default ImportOutlineDialog;
diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json
index db97ec019..c254509bd 100644
--- a/shared/i18n/locales/en_US/translation.json
+++ b/shared/i18n/locales/en_US/translation.json
@@ -640,7 +640,7 @@
   "Drag and drop the zip file from Notion's HTML export option, or click to upload": "Drag and drop the zip file from Notion's HTML export option, or click to upload",
   "Where do I find the file?": "Where do I find the file?",
   "In Notion, click <em>Settings & Members</em> in the left sidebar and open Settings. Look for the Export section, and click <em>Export all workspace content</em>. Choose <em>HTML</em> as the format for the best data compatability.": "In Notion, click <em>Settings & Members</em> in the left sidebar and open Settings. Look for the Export section, and click <em>Export all workspace content</em>. Choose <em>HTML</em> as the format for the best data compatability.",
-  "Drag and drop the zip file from Outline's export option, or click to upload": "Drag and drop the zip file from Outline's export option, or click to upload",
+  "Drag and drop the zip file from Outline's Markdown export option, or click to upload": "Drag and drop the zip file from Outline's Markdown export option, or click to upload",
   "How does this work?": "How does this work?",
   "You can import a zip file that was previously exported from an Outline installation – collections, documents, and images will be imported. In Outline, open <em>Export</em> in the Settings sidebar and click on <em>Export Data</em>.": "You can import a zip file that was previously exported from an Outline installation – collections, documents, and images will be imported. In Outline, open <em>Export</em> in the Settings sidebar and click on <em>Export Data</em>.",
   "Last active": "Last active",
@@ -711,7 +711,7 @@
   "All groups": "All groups",
   "No groups have been created yet": "No groups have been created yet",
   "Quickly transfer your existing documents, pages, and files from other tools and services into Outline. You can also drag and drop any HTML, Markdown, and text documents directly into Collections in the app.": "Quickly transfer your existing documents, pages, and files from other tools and services into Outline. You can also drag and drop any HTML, Markdown, and text documents directly into Collections in the app.",
-  "Import a backup file that was previously exported from Outline": "Import a backup file that was previously exported from Outline",
+  "Import a zip file of Markdown documents (exported from Outline 0.67.0 or earlier)": "Import a zip file of Markdown documents (exported from Outline 0.67.0 or earlier)",
   "Import data": "Import data",
   "Import pages exported from Notion": "Import pages exported from Notion",
   "Import pages from a Confluence instance": "Import pages from a Confluence instance",