Removed uploadProject from Storage interface.

Removed uploadProject from client_side_storage.

In project.ts:
Added uploadProject function.
Modified processUploadedBlob to return just classNameToModuleContentText.
Moved code from processUploadedModule to processUploadedBlob.

In Menu.tsx, call storageProject.uploadProject instead of storage.uploadProject.

Author: lizlooney

src/reactComponents/Menu.tsx

@@ -389,7 +389,7 @@ export function Component(props: MenuProps): React.JSX.Element {
           const file = options.file as RcFile;
           const uploadProjectName = storageProject.makeUploadProjectName(file.name, existingProjectNames);
           if (props.storage) {
-            props.storage.uploadProject(uploadProjectName, dataUrl);
+            storageProject.uploadProject(props.storage, uploadProjectName, dataUrl);
           }
         };
         reader.onerror = (_error) => {

src/storage/client_side_storage.ts

@@ -21,8 +21,6 @@
 
 import * as commonStorage from './common_storage';
 import * as storageModuleContent from './module_content';
-import * as storageNames from './names';
-import * as storageProject from './project';
 
 // Functions for saving blocks modules to client side storage.
 
@@ -259,61 +257,4 @@ class ClientSideStorage implements commonStorage.Storage {
       };
     });
   }
-
-  async uploadProject(projectName: string, blobUrl: string): Promise<void> {
-    return new Promise(async (resolve, reject) => {
-      // Process the uploaded blob to get the module types and contents.
-      let classNameToModuleType: {[className: string]: string}; // key is class name, value is module type
-      let classNameToModuleContentText: {[className: string]: string}; // key is class name, value is module content
-      try {
-        [classNameToModuleType, classNameToModuleContentText] = await storageProject.processUploadedBlob(
-            blobUrl);
-      } catch (e) {
-        console.log('storageProject.processUploadedBlob failed.');
-        reject(new Error('storageProject.processUploadedBlob failed.'));
-        return;
-      }
-
-      // Save each module.
-      const transaction = this.db.transaction([MODULES_STORE_NAME], 'readwrite');
-      transaction.oncomplete = () => {
-        resolve();
-      };
-      transaction.onabort = () => {
-        console.log('IndexedDB transaction aborted.');
-        reject(new Error('IndexedDB transaction aborted.'));
-      };
-      const modulesObjectStore = transaction.objectStore(MODULES_STORE_NAME);
-
-      for (const className in classNameToModuleType) {
-        const moduleType = classNameToModuleType[className];
-        const moduleContentText = classNameToModuleContentText[className];
-        const modulePath = storageNames.makeModulePath(projectName, className);
-        const getRequest = modulesObjectStore.get(modulePath);
-        getRequest.onerror = () => {
-          console.log('IndexedDB get request failed. getRequest.error is...');
-          console.log(getRequest.error);
-          throw new Error('IndexedDB get request failed.');
-        };
-        getRequest.onsuccess = () => {
-          if (getRequest.result !== undefined) {
-            // The module already exists. That is not expected!
-            console.log('IndexedDB get request succeeded, but the module already exists.');
-            throw new Error('IndexedDB get request succeeded, but the module already exists.');
-          }
-          const value = Object.create(null);
-          value.path = modulePath;
-          value.type = moduleType;
-          value.content = moduleContentText;
-          value.dateModifiedMillis = Date.now();
-          const putRequest = modulesObjectStore.put(value);
-          putRequest.onerror = () => {
-            console.log('IndexedDB put request failed. putRequest.error is...');
-            console.log(putRequest.error);
-            throw new Error('IndexedDB put request failed.');
-          };
-        };
-      }
-    });
-  }
 }

src/storage/common_storage.ts

@@ -31,5 +31,4 @@ export interface Storage {
   fetchModuleContentText(modulePath: string): Promise<string>;
   saveModule(modulePath: string, moduleContentText: string): Promise<void>;
   deleteModule(modulePath: string): Promise<void>;
-  uploadProject(projectName: string, blobUrl: string): Promise<void>;
 }

src/storage/project.ts

@@ -435,13 +435,23 @@ export function makeUploadProjectName(
   return storageNames.makeUniqueName(preferredName, existingProjectNames);
 }
 
+export async function uploadProject(
+    storage: commonStorage.Storage, projectName: string, blobUrl: string): Promise<void> {
+  // Process the uploaded blob to get the module types and contents.
+  const classNameToModuleContentText = await processUploadedBlob(blobUrl);
+
+  // Save each module.
+  for (const className in classNameToModuleContentText) {
+    const moduleContentText = classNameToModuleContentText[className];
+    const modulePath = storageNames.makeModulePath(projectName, className);
+    await storage.saveModule(modulePath, moduleContentText);
+  }
+}
+
 /**
- * Process the uploaded blob to get the module types and contents.
- * Returns a promise of classNameToModuleType and classNameToModuleContentText.
+ * Process the uploaded blob to get the module class names and contents.
  */
-export async function processUploadedBlob(
-    blobUrl: string)
-    : Promise<[{ [className: string]: string }, { [className: string]: string }]> {
+async function processUploadedBlob(blobUrl: string): Promise<{ [className: string]: string }> {
 
   const prefix = 'data:application/octet-stream;base64,';
   if (!blobUrl.startsWith(prefix)) {
@@ -467,28 +477,21 @@ export async function processUploadedBlob(
   );
 
   // Process each module's content.
-  const classNameToModuleType: { [className: string]: string } = {}; // key is class name, value is module type
-  const classNameToModuleContentText: { [className: string]: string } = {}; // key is class name, value is module content text
+  let foundRobot = false;
+  const classNameToModuleContentText: { [className: string]: string } = {}; // value is module content text
   for (const filename in files) {
-    const uploadedContent = files[filename];
-    const [className, moduleType, moduleContent] = processUploadedModule(
-        filename, uploadedContent);
-    classNameToModuleType[className] = moduleType;
-    classNameToModuleContentText[className] = moduleContent;
+    const className = filename;
+    if (className === storageNames.CLASS_NAME_ROBOT) {
+      foundRobot = true;
+    }
+    // Make sure we can parse the content.
+    const moduleContent = storageModuleContent.parseModuleContentText(files[filename]);
+    classNameToModuleContentText[className] = moduleContent.getModuleContentText();
   }
 
-  return [classNameToModuleType, classNameToModuleContentText];
-}
+  if (!foundRobot) {
+    throw new Error('Uploaded file did not contain a Robot.');
+  }
 
-/**
- * Processes an uploaded module to get the class name, type, and content text.
- */
-function processUploadedModule(
-    filename: string, uploadedContent: string): [string, string, string] {
-
-  const moduleContent = storageModuleContent.parseModuleContentText(uploadedContent);
-  const moduleType = moduleContent.getModuleType();
-  const className = filename;
-  const moduleContentText = moduleContent.getModuleContentText();
-  return [className, moduleType, moduleContentText];
+  return classNameToModuleContentText;
 }