Fix issue with revert module

Author: christianalfoni

packages/app/src/app/overmind/effects/live/index.ts

@@ -11,7 +11,6 @@ import { TextOperation } from 'ot';
 import { Socket } from 'phoenix';
 import uuid from 'uuid';
 
-import eventToTransform from '../../utils/event-to-transform';
 import { SandboxAPIResponse } from '../api/types';
 import { transformSandbox } from '../utils/sandbox';
 import clientsFactory from './clients';
@@ -184,9 +183,7 @@ export default {
       module: directory,
     });
   },
-  sendCodeUpdate(moduleShortid: string, currentCode: string, event: any) {
-    const { operation } = eventToTransform(event, currentCode);
-
+  sendCodeUpdate(moduleShortid: string, operation: any) {
     if (!operation) {
       return;
     }

packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts

@@ -93,6 +93,17 @@ export class ModelsHandler {
     return null;
   }
 
+  public async revertModule(module: Module) {
+    const fileModel = this.editorApi.textFileService
+      .getFileModels()
+      .find(
+        fileModelItem =>
+          fileModelItem.resource.path === '/sandbox' + module.path
+      );
+
+    fileModel.revert();
+  }
+
   public changeModule = async (module: Module) => {
     const moduleModel = this.getModuleModel(module);
 

packages/app/src/app/overmind/effects/vscode/index.ts

@@ -205,6 +205,10 @@ export class VSCodeEffect {
     }
   }
 
+  public revertModule(module: Module) {
+    this.modelsHandler.revertModule(module);
+  }
+
   public async applyOperation(
     moduleShortid: string,
     operation: (string | number)[]

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -7,6 +7,7 @@ import {
   ModuleTab,
   WindowOrientation,
 } from '@codesandbox/common/lib/types';
+import { getTextOperation } from '@codesandbox/common/lib/utils/diff';
 import { Action, AsyncAction } from 'app/overmind';
 import { withLoadApp, withOwnedSandbox } from 'app/overmind/factories';
 import {
@@ -17,6 +18,7 @@ import {
 import { clearCorrectionsFromAction } from 'app/utils/corrections';
 import { json } from 'overmind';
 
+import eventToTransform from '../../utils/event-to-transform';
 import * as internalActions from './internalActions';
 
 export const internal = internalActions;
@@ -198,7 +200,11 @@ export const codeChanged: Action<{
   }
 
   if (state.live.isLive) {
-    effects.live.sendCodeUpdate(moduleShortid, module.code, event);
+    const operation = event
+      ? eventToTransform(event, module.code).operation
+      : getTextOperation(module.code, code);
+
+    effects.live.sendCodeUpdate(moduleShortid, operation);
   }
 
   actions.editor.internal.setModuleCode({
@@ -493,6 +499,8 @@ export const discardModuleChanges: Action<{
 
   module.updatedAt = new Date().toString();
 
+  effects.vscode.revertModule(module);
+
   state.editor.changedModuleShortids.splice(
     state.editor.changedModuleShortids.indexOf(moduleShortid),
     1

packages/app/src/sandbox/status-screen/overlay-manager.ts

@@ -9,14 +9,12 @@ export function resetOverlay() {
     const delay = Date.now() - iframeRenderedAt > 1000 ? 0 : 1000;
 
     setTimeout(() => {
-      if (iframeReference) {
-        iframeReference.style.opacity = '0';
-        setTimeout(() => {
-          if (iframeReference) {
-            document.body.removeChild(iframeReference);
-          }
-        }, 500);
-      }
+      iframeReference.style.opacity = '0';
+      setTimeout(() => {
+        if (iframeReference.parentNode) {
+          document.body.removeChild(iframeReference);
+        }
+      }, 500);
     }, delay);
   } catch (e) {
     /* nothing */