From 935a7f58a742ddebe03e962aeddca6ac8179db29 Mon Sep 17 00:00:00 2001
From: Christopher Chedeau <vjeuxx@gmail.com>
Date: Sat, 8 Feb 2020 15:05:38 -0800
Subject: [PATCH] Remove previously loaded scenes (#734)

As mentioned in #724, the current implementation is suboptimal. Let's remove it until we come back with a better design.

Fixes #724
---
 src/components/StoredScenesList.tsx | 33 ---------------------
 src/index.tsx                       | 19 ------------
 src/locales/en.json                 |  1 -
 src/locales/es.json                 |  3 +-
 src/locales/fr.json                 |  1 -
 src/locales/nb-no.json              |  1 -
 src/locales/pl.json                 |  1 -
 src/locales/pt.json                 |  1 -
 src/locales/ru.json                 |  3 +-
 src/scene/data.ts                   | 45 +----------------------------
 src/scene/index.ts                  |  2 --
 src/scene/types.ts                  |  6 ----
 src/styles.scss                     |  9 ------
 13 files changed, 3 insertions(+), 122 deletions(-)
 delete mode 100644 src/components/StoredScenesList.tsx

diff --git a/src/components/StoredScenesList.tsx b/src/components/StoredScenesList.tsx
deleted file mode 100644
index 184fb563..00000000
--- a/src/components/StoredScenesList.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from "react";
-import { PreviousScene } from "../scene/types";
-import { t } from "../i18n";
-
-interface StoredScenesListProps {
-  scenes: PreviousScene[];
-  currentId?: string;
-  onChange: (selectedId: string, k?: string) => {};
-}
-
-export function StoredScenesList({
-  scenes,
-  currentId,
-  onChange,
-}: StoredScenesListProps) {
-  return (
-    <select
-      className="stored-ids-select"
-      onChange={({ currentTarget }) => {
-        const scene = scenes[(currentTarget.value as unknown) as number];
-        onChange(scene.id, scene.k);
-      }}
-      value={currentId}
-      title={t("buttons.previouslyLoadedScenes")}
-    >
-      {scenes.map((scene, i) => (
-        <option key={i} value={i}>
-          id={scene.id}
-        </option>
-      ))}
-    </select>
-  );
-}
diff --git a/src/index.tsx b/src/index.tsx
index 7026209f..065e3d17 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -31,7 +31,6 @@ import {
   hasStroke,
   hasText,
   exportCanvas,
-  loadedScenes,
   loadScene,
   calculateScrollCenter,
   loadFromBlob,
@@ -96,7 +95,6 @@ import { ExportDialog } from "./components/ExportDialog";
 import { LanguageList } from "./components/LanguageList";
 import { Point } from "roughjs/bin/geometry";
 import { t, languages, setLanguage, getLanguage } from "./i18n";
-import { StoredScenesList } from "./components/StoredScenesList";
 import { HintViewer } from "./components/HintViewer";
 
 import { copyToAppClipboard, getClipboardContent } from "./clipboard";
@@ -318,22 +316,6 @@ const LayerUI = React.memo(
       );
     }
 
-    function renderIdsDropdown() {
-      const scenes = loadedScenes();
-      if (scenes.length === 0) {
-        return;
-      }
-      return (
-        <StoredScenesList
-          scenes={scenes}
-          currentId={appState.selectedId}
-          onChange={async (id, k) =>
-            actionManager.updater(await loadScene(id, k))
-          }
-        />
-      );
-    }
-
     return (
       <>
         <FixedSideContainer side="top">
@@ -400,7 +382,6 @@ const LayerUI = React.memo(
             languages={languages}
             currentLanguage={language}
           />
-          {renderIdsDropdown()}
           {appState.scrolledOutside && (
             <button
               className="scroll-back-to-content"
diff --git a/src/locales/en.json b/src/locales/en.json
index 7aac9b78..e684bbb8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -52,7 +52,6 @@
     "getShareableLink": "Get shareable link",
     "close": "Close",
     "selectLanguage": "Select Language",
-    "previouslyLoadedScenes": "Previously loaded scenes",
     "scrollBackToContent": "Scroll back to content"
   },
   "alerts": {
diff --git a/src/locales/es.json b/src/locales/es.json
index 0b6f91e7..5800189f 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -52,8 +52,7 @@
     "getShareableLink": "Obtener enlace para compartir",
     "showExportDialog": "Mostrar diálogo para exportar",
     "close": "Cerrar",
-    "selectLanguage": "Seleccionar idioma",
-    "previouslyLoadedScenes": "Escenas previamente cargadas"
+    "selectLanguage": "Seleccionar idioma"
   },
   "alerts": {
     "clearReset": "Esto limpiará todo el lienzo. Estás seguro?",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index f877cb4f..df501ea7 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -46,7 +46,6 @@
     "save": "Sauvegarder",
     "load": "Ouvrir",
     "getShareableLink": "Obtenir un lien de partage",
-    "previouslyLoadedScenes": "Scènes précédemment chargées",
     "scrollBackToContent": "Revenir au contenu"
   },
   "alerts": {
diff --git a/src/locales/nb-no.json b/src/locales/nb-no.json
index 36b9bf4f..1e7c2d78 100644
--- a/src/locales/nb-no.json
+++ b/src/locales/nb-no.json
@@ -52,7 +52,6 @@
     "getShareableLink": "Få delingslenke",
     "close": "Lukk",
     "selectLanguage": "Velg språk",
-    "previouslyLoadedScenes": "Tidligere åpnete scener",
     "scrollBackToContent": "Skroll tilbake til innhold"
   },
   "alerts": {
diff --git a/src/locales/pl.json b/src/locales/pl.json
index c33a7c0a..88e2dce5 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -52,7 +52,6 @@
     "getShareableLink": "Udostępnij",
     "close": "Zamknij",
     "selectLanguage": "Wybierz język",
-    "previouslyLoadedScenes": "Ostatnie dokumenty",
     "scrollBackToContent": "Wróć do obszaru roboczego"
   },
   "alerts": {
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 524ac53b..c49fb198 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -46,7 +46,6 @@
     "save": "Guardar",
     "load": "Carregar",
     "getShareableLink": "Obter um link de partilha",
-    "previouslyLoadedScenes": "Cenas carregadas anteriormente",
     "scrollBackToContent": "Voltar ao conteúdo"
   },
   "alerts": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index e20a0f0e..38d44926 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -51,8 +51,7 @@
     "load": "Загрузить",
     "getShareableLink": "Получить доступ по ссылке",
     "close": "Закрыть",
-    "selectLanguage": "Выбрать язык",
-    "previouslyLoadedScenes": "Ранее загруженные сцены"
+    "selectLanguage": "Выбрать язык"
   },
   "alerts": {
     "clearReset": "Это очистит весь холст. Вы уверены?",
diff --git a/src/scene/data.ts b/src/scene/data.ts
index a299fc97..b288107e 100644
--- a/src/scene/data.ts
+++ b/src/scene/data.ts
@@ -7,7 +7,7 @@ import {
 } from "../appState";
 
 import { AppState } from "../types";
-import { ExportType, PreviousScene } from "./types";
+import { ExportType } from "./types";
 import { exportToCanvas, exportToSvg } from "./export";
 import nanoid from "nanoid";
 import { fileOpen, fileSave } from "browser-nativefs";
@@ -18,7 +18,6 @@ import { t } from "../i18n";
 import { copyCanvasToClipboardAsPng } from "../clipboard";
 
 const LOCAL_STORAGE_KEY = "excalidraw";
-const LOCAL_STORAGE_SCENE_PREVIOUS_KEY = "excalidraw-previos-scenes";
 const LOCAL_STORAGE_KEY_STATE = "excalidraw-state";
 const BACKEND_GET = "https://json.excalidraw.com/api/v1/";
 
@@ -434,47 +433,6 @@ export function saveToLocalStorage(
   );
 }
 
-/**
- * Returns the list of ids in Local Storage
- * @returns array
- */
-export function loadedScenes(): PreviousScene[] {
-  const storedPreviousScenes = localStorage.getItem(
-    LOCAL_STORAGE_SCENE_PREVIOUS_KEY,
-  );
-  if (storedPreviousScenes) {
-    try {
-      return JSON.parse(storedPreviousScenes);
-    } catch (e) {
-      console.error("Could not parse previously stored ids");
-      return [];
-    }
-  }
-  return [];
-}
-
-/**
- * Append id to the list of Previous Scenes in Local Storage if not there yet
- * @param id string
- */
-export function addToLoadedScenes(id: string, k: string | undefined): void {
-  const scenes = [...loadedScenes()];
-  const newScene = scenes.every(scene => scene.id !== id);
-
-  if (newScene) {
-    scenes.push({
-      timestamp: Date.now(),
-      id,
-      k,
-    });
-  }
-
-  localStorage.setItem(
-    LOCAL_STORAGE_SCENE_PREVIOUS_KEY,
-    JSON.stringify(scenes),
-  );
-}
-
 export async function loadScene(id: string | null, k?: string) {
   let data;
   let selectedId;
@@ -482,7 +440,6 @@ export async function loadScene(id: string | null, k?: string) {
     // k is the private key used to decrypt the content from the server, take
     // extra care not to leak it
     data = await importFromBackend(id, k);
-    addToLoadedScenes(id, k);
     selectedId = id;
     window.history.replaceState({}, "Excalidraw", window.location.origin);
   } else {
diff --git a/src/scene/index.ts b/src/scene/index.ts
index fa6f8139..9e844855 100644
--- a/src/scene/index.ts
+++ b/src/scene/index.ts
@@ -16,8 +16,6 @@ export {
   saveToLocalStorage,
   exportToBackend,
   importFromBackend,
-  addToLoadedScenes,
-  loadedScenes,
   loadScene,
   calculateScrollCenter,
 } from "./data";
diff --git a/src/scene/types.ts b/src/scene/types.ts
index b9923abc..04b28b60 100644
--- a/src/scene/types.ts
+++ b/src/scene/types.ts
@@ -16,10 +16,4 @@ export interface Scene {
   elements: ExcalidrawTextElement[];
 }
 
-export interface PreviousScene {
-  id: string;
-  k?: string;
-  timestamp: number;
-}
-
 export type ExportType = "png" | "clipboard" | "backend" | "svg";
diff --git a/src/styles.scss b/src/styles.scss
index b0d6b6e2..d1f50c12 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -238,15 +238,6 @@ button,
   bottom: 0;
 }
 
-.stored-ids-select {
-  @extend .dropdown-select;
-  padding: 0 0.5em 0 1.7em;
-  bottom: 0;
-  left: 0;
-  background-position: left 0.7em top 50%, 0 0;
-  margin-left: 0.5em;
-}
-
 .visually-hidden {
   position: absolute !important;
   height: 1px;