feat: delete appInstanceResource and related file

Author: pyphilia

public/app/config/channels.js

@@ -72,4 +72,5 @@ module.exports = {
   LOAD_SPACE_IN_CLASSROOM_CHANNEL: 'classroom:space:load',
   GET_SPACE_TO_LOAD_IN_CLASSROOM_CHANNEL: 'classroom:space:load:get-space',
   POST_FILE_CHANNEL: 'file:post',
+  DELETE_FILE_CHANNEL: 'file:delete',
 };

public/app/config/messages.js

@@ -103,6 +103,7 @@ const ERROR_SETTING_ACTION_ACCESSIBILITY =
   'There was an error setting the action accessibility';
 const ERROR_SETTING_ACTIONS_AS_ENABLED = 'There was an error enabling actions';
 const ERROR_POSTING_FILE_MESSAGE = 'There was an error uploading the file';
+const ERROR_DELETING_FILE_MESSAGE = 'There was an error deleting the file';
 
 module.exports = {
   ERROR_GETTING_DEVELOPER_MODE,
@@ -174,4 +175,5 @@ module.exports = {
   ERROR_SETTING_ACTION_ACCESSIBILITY,
   ERROR_SETTING_ACTIONS_AS_ENABLED,
   ERROR_POSTING_FILE_MESSAGE,
+  ERROR_DELETING_FILE_MESSAGE,
 };

public/app/listeners/deleteAppInstanceResource.js

@@ -0,0 +1,19 @@
+const { DELETE_APP_INSTANCE_RESOURCE_CHANNEL } = require('../config/channels');
+const { APP_INSTANCE_RESOURCES_COLLECTION } = require('../db');
+
+const deleteAppInstanceResource = (mainWindow, db) => (event, payload = {}) => {
+  try {
+    const { appInstanceId: appInstance, id } = payload;
+
+    db.get(APP_INSTANCE_RESOURCES_COLLECTION)
+      .remove({ appInstance, id })
+      .write();
+
+    mainWindow.webContents.send(DELETE_APP_INSTANCE_RESOURCE_CHANNEL, payload);
+  } catch (e) {
+    console.error(e);
+    mainWindow.webContents.send(DELETE_APP_INSTANCE_RESOURCE_CHANNEL, null);
+  }
+};
+
+module.exports = deleteAppInstanceResource;

public/app/listeners/deleteFile.js

@@ -0,0 +1,27 @@
+const fs = require('fs');
+const logger = require('../logger');
+const { DELETE_FILE_CHANNEL } = require('../config/channels');
+const { ERROR_GENERAL } = require('../config/errors');
+
+const deleteFile = mainWindow => (event, payload = {}) => {
+  try {
+    const {
+      data: { uri },
+    } = payload;
+
+    if (uri) {
+      const filepath = uri.substr('file://'.length);
+      fs.unlinkSync(filepath);
+      logger.debug(`${uri} was deleted`);
+    } else {
+      logger.error('no uri specified');
+    }
+
+    mainWindow.webContents.send(DELETE_FILE_CHANNEL, payload);
+  } catch (e) {
+    console.error(e);
+    mainWindow.webContents.send(DELETE_FILE_CHANNEL, ERROR_GENERAL);
+  }
+};
+
+module.exports = deleteFile;

public/app/listeners/index.js

@@ -31,6 +31,7 @@ const signOut = require('./signOut');
 const isAuthenticated = require('./isAuthenticated');
 const getAppInstanceResources = require('./getAppInstanceResources');
 const postAppInstanceResource = require('./postAppInstanceResource');
+const deleteAppInstanceResource = require('./deleteAppInstanceResource');
 const patchAppInstanceResource = require('./patchAppInstanceResource');
 const getAppInstance = require('./getAppInstance');
 const setSpaceAsFavorite = require('./setSpaceAsFavorite');
@@ -51,6 +52,7 @@ const setActionAccessibility = require('./setActionAccessibility');
 const setActionsAsEnabled = require('./setActionsAsEnabled');
 const windowAllClosed = require('./windowAllClosed');
 const postFile = require('./postFile');
+const deleteFile = require('./deleteFile');
 
 module.exports = {
   loadSpace,
@@ -83,6 +85,7 @@ module.exports = {
   isAuthenticated,
   getAppInstanceResources,
   postAppInstanceResource,
+  deleteAppInstanceResource,
   patchAppInstanceResource,
   getAppInstance,
   getUserMode,
@@ -105,4 +108,5 @@ module.exports = {
   setActionsAsEnabled,
   windowAllClosed,
   postFile,
+  deleteFile,
 };

public/electron.js

@@ -37,6 +37,7 @@ const {
   SET_LANGUAGE_CHANNEL,
   GET_APP_INSTANCE_RESOURCES_CHANNEL,
   POST_APP_INSTANCE_RESOURCE_CHANNEL,
+  DELETE_APP_INSTANCE_RESOURCE_CHANNEL,
   PATCH_APP_INSTANCE_RESOURCE_CHANNEL,
   GET_APP_INSTANCE_CHANNEL,
   GET_DEVELOPER_MODE_CHANNEL,
@@ -75,6 +76,7 @@ const {
   SET_ACTION_ACCESSIBILITY_CHANNEL,
   SET_ACTIONS_AS_ENABLED_CHANNEL,
   POST_FILE_CHANNEL,
+  DELETE_FILE_CHANNEL,
 } = require('./app/config/channels');
 const env = require('./env.json');
 const {
@@ -104,6 +106,7 @@ const {
   getAppInstanceResources,
   postAppInstanceResource,
   patchAppInstanceResource,
+  deleteAppInstanceResource,
   getAppInstance,
   setSyncMode,
   getSyncMode,
@@ -129,6 +132,7 @@ const {
   setActionsAsEnabled,
   windowAllClosed,
   postFile,
+  deleteFile,
 } = require('./app/listeners');
 const isMac = require('./app/utils/isMac');
 
@@ -494,6 +498,9 @@ app.on('ready', async () => {
   // called when creating a file
   ipcMain.on(POST_FILE_CHANNEL, postFile(mainWindow, db));
 
+  // called when creating a file
+  ipcMain.on(DELETE_FILE_CHANNEL, deleteFile(mainWindow, db));
+
   // called when logging in a user
   ipcMain.on(SIGN_IN_CHANNEL, signIn(mainWindow, db));
 
@@ -521,6 +528,12 @@ app.on('ready', async () => {
     patchAppInstanceResource(mainWindow, db)
   );
 
+  // called when deleting an AppInstanceResource
+  ipcMain.on(
+    DELETE_APP_INSTANCE_RESOURCE_CHANNEL,
+    deleteAppInstanceResource(mainWindow, db)
+  );
+
   // called when getting an AppInstance
   ipcMain.on(GET_APP_INSTANCE_CHANNEL, getAppInstance(mainWindow, db));
 

src/actions/appInstanceResource.js

@@ -2,11 +2,13 @@ import {
   GET_APP_INSTANCE_RESOURCES_CHANNEL,
   PATCH_APP_INSTANCE_RESOURCE_CHANNEL,
   POST_APP_INSTANCE_RESOURCE_CHANNEL,
+  DELETE_APP_INSTANCE_RESOURCE_CHANNEL,
 } from '../config/channels';
 import {
   GET_APP_INSTANCE_RESOURCES_SUCCEEDED,
   PATCH_APP_INSTANCE_RESOURCE_SUCCEEDED,
   POST_APP_INSTANCE_RESOURCE_SUCCEEDED,
+  DELETE_APP_INSTANCE_RESOURCE_SUCCEEDED,
 } from '../types';
 
 const getAppInstanceResources = async (
@@ -100,8 +102,38 @@ const patchAppInstanceResource = async (
   }
 };
 
+const deleteAppInstanceResource = async (
+  { id, data, appInstanceId, spaceId, subSpaceId, type } = {},
+  callback
+) => {
+  try {
+    window.ipcRenderer.send(DELETE_APP_INSTANCE_RESOURCE_CHANNEL, {
+      id,
+      data,
+      appInstanceId,
+      spaceId,
+      subSpaceId,
+      type,
+    });
+
+    window.ipcRenderer.once(
+      DELETE_APP_INSTANCE_RESOURCE_CHANNEL,
+      async (event, response) => {
+        callback({
+          appInstanceId,
+          type: DELETE_APP_INSTANCE_RESOURCE_SUCCEEDED,
+          payload: response,
+        });
+      }
+    );
+  } catch (err) {
+    console.error(err);
+  }
+};
+
 export {
   getAppInstanceResources,
   postAppInstanceResource,
   patchAppInstanceResource,
+  deleteAppInstanceResource,
 };

src/actions/file.js

@@ -1,9 +1,16 @@
-import { POST_FILE_CHANNEL } from '../config/channels';
-import { POST_FILE_SUCCEEDED, POST_FILE_FAILED } from '../types';
+import { POST_FILE_CHANNEL, DELETE_FILE_CHANNEL } from '../config/channels';
+import {
+  POST_FILE_SUCCEEDED,
+  POST_FILE_FAILED,
+  DELETE_FILE_FAILED,
+  DELETE_FILE_SUCCEEDED,
+} from '../types';
 import { ERROR_GENERAL } from '../config/errors';
-import { ERROR_POSTING_FILE_MESSAGE } from '../config/messages';
+import {
+  ERROR_POSTING_FILE_MESSAGE,
+  ERROR_DELETING_FILE_MESSAGE,
+} from '../config/messages';
 
-// eslint-disable-next-line import/prefer-default-export
 export const postFile = async (
   { userId, appInstanceId, spaceId, subSpaceId, format, data, type } = {},
   callback
@@ -43,3 +50,28 @@ export const postFile = async (
     });
   }
 };
+
+export const deleteFile = async (payload = {}, callback) => {
+  try {
+    window.ipcRenderer.send(DELETE_FILE_CHANNEL, payload);
+    const { appInstanceId } = payload;
+    window.ipcRenderer.once(DELETE_FILE_CHANNEL, async (event, response) => {
+      if (response === ERROR_GENERAL) {
+        callback({
+          appInstanceId,
+          type: DELETE_FILE_FAILED,
+          payload: ERROR_DELETING_FILE_MESSAGE,
+        });
+      } else {
+        callback({
+          // have to include the appInstanceId to avoid broadcasting
+          appInstanceId,
+          type: DELETE_FILE_SUCCEEDED,
+          payload: response,
+        });
+      }
+    });
+  } catch (err) {
+    console.error(err);
+  }
+};

src/components/phase/PhaseApp.js

@@ -12,19 +12,23 @@ import {
   PATCH_APP_INSTANCE_RESOURCE,
   GET_APP_INSTANCE,
   POST_APP_INSTANCE_RESOURCE,
+  DELETE_APP_INSTANCE_RESOURCE,
   APP_INSTANCE_RESOURCE_TYPES,
   POST_ACTION,
   ACTION_TYPES,
   POST_FILE,
   FILE_TYPES,
+  DELETE_FILE,
 } from '../../types';
 import {
   getAppInstanceResources,
   patchAppInstanceResource,
   postAppInstanceResource,
+  deleteAppInstanceResource,
   getAppInstance,
   postAction,
   postFile,
+  deleteFile,
 } from '../../actions';
 import {
   DEFAULT_LANGUAGE,
@@ -156,6 +160,11 @@ class PhaseApp extends Component {
               return patchAppInstanceResource(payload, this.postMessage);
             }
             break;
+          case DELETE_APP_INSTANCE_RESOURCE:
+            if (isSpaceSaved) {
+              return deleteAppInstanceResource(payload, this.postMessage);
+            }
+            break;
           case POST_ACTION: {
             if (isSpaceSaved) {
               return dispatchPostAction(payload, user, this.postMessage);
@@ -168,6 +177,12 @@ class PhaseApp extends Component {
             }
             break;
           }
+          case DELETE_FILE: {
+            if (isSpaceSaved) {
+              return deleteFile(payload, this.postMessage);
+            }
+            break;
+          }
           default:
             return false;
         }

src/config/channels.js

@@ -72,4 +72,5 @@ module.exports = {
   LOAD_SPACE_IN_CLASSROOM_CHANNEL: 'classroom:space:load',
   GET_SPACE_TO_LOAD_IN_CLASSROOM_CHANNEL: 'classroom:space:load:get-space',
   POST_FILE_CHANNEL: 'file:post',
+  DELETE_FILE_CHANNEL: 'file:delete',
 };

src/config/messages.js

@@ -103,6 +103,7 @@ const ERROR_SETTING_ACTION_ACCESSIBILITY =
   'There was an error setting the action accessibility';
 const ERROR_SETTING_ACTIONS_AS_ENABLED = 'There was an error enabling actions';
 const ERROR_POSTING_FILE_MESSAGE = 'There was an error uploading the file';
+const ERROR_DELETING_FILE_MESSAGE = 'There was an error deleting the file';
 
 module.exports = {
   ERROR_GETTING_DEVELOPER_MODE,
@@ -174,4 +175,5 @@ module.exports = {
   ERROR_SETTING_ACTION_ACCESSIBILITY,
   ERROR_SETTING_ACTIONS_AS_ENABLED,
   ERROR_POSTING_FILE_MESSAGE,
+  ERROR_DELETING_FILE_MESSAGE,
 };

src/types/file.js

@@ -1,5 +1,15 @@
 export const POST_FILE = 'POST_FILE';
 export const POST_FILE_SUCCEEDED = 'POST_FILE_SUCCEEDED';
 export const POST_FILE_FAILED = 'POST_FILE_FAILED';
+export const DELETE_FILE_SUCCEEDED = 'DELETE_FILE_SUCCEEDED';
+export const DELETE_FILE_FAILED = 'DELETE_FILE_FAILED';
+export const DELETE_FILE = 'DELETE_FILE';
 
-export const FILE_TYPES = [POST_FILE, POST_FILE_SUCCEEDED, POST_FILE_FAILED];
+export const FILE_TYPES = [
+  POST_FILE,
+  POST_FILE_SUCCEEDED,
+  POST_FILE_FAILED,
+  DELETE_FILE_SUCCEEDED,
+  DELETE_FILE_FAILED,
+  DELETE_FILE,
+];