Merge pull request #8 from sinchiw/terms

Added more reducer logic. Will pull it and merge our end.

main.js

@@ -2,11 +2,9 @@
 const electron = require("electron");
 const { app, BrowserWindow } = electron;
 
-
 let mainWindow;
 
 app.on("ready", () => {
-
   mainWindow = new BrowserWindow({
     webPreferences: {
       nodeIntegration: true,
@@ -18,7 +16,7 @@ app.on("ready", () => {
 
   mainWindow.webContents.openDevTools();
 
-  mainWindow.on('closed', function () {
+  mainWindow.on("closed", function () {
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
@@ -30,18 +28,18 @@ app.on("ready", () => {
 });
 
 // Quit when all windows are closed.
-app.on('window-all-closed', function () {
+app.on("window-all-closed", function () {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-      app.quit();
+  if (process.platform !== "darwin") {
+    app.quit();
   }
 });
 
-app.on('activate', function () {
+app.on("activate", function () {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (mainWindow === null) {
-      createWindow();
+    createWindow();
   }
-});
+});

src/actions/actions.js

@@ -1,7 +1,7 @@
 import * as types from "../constants/actionTypes";
 
-export const addContainer = (data) => ({
-  type: types.ADD_CONTAINER,
+export const addRunningContainer = (data) => ({
+  type: types.ADD_RUNNING_CONTAINER,
   payload: data,
 });
 
@@ -19,3 +19,13 @@ export const stopContainer = (id) => ({
   type: types.STOP_RUNNING_CONTAINERS,
   payload: id,
 });
+
+export const addStoppedContainer = () => ({
+  type: types.ADD_STOPPED_CONTAINER,
+  payload: data,
+});
+
+export const runStoppedContainer = () => ({
+  type: types.RUN_STOPPED_CONTAINER,
+  payload: id,
+});

src/components/App.js

@@ -12,17 +12,21 @@ import { stderr } from "process";
 
 const App = (props) => {
   const dispatch = useDispatch();
-  const addContainer = (data) => dispatch(actions.addContainer(data));
+  const addRunningContainer = (data) =>
+    dispatch(actions.addRunningContainer(data));
   const removeContainer = (id) => dispatch(actions.removeContainer(id));
   const stopContainer = (id) => dispatch(actions.stopContainer(id));
+  const addStoppedContainer = (data) =>
+    dispatch(actions.addStoppedContainer(data));
+  const runStoppedContainer = (id) => dispatch(actions.runStoppedContainer(id));
 
   // const getRunningContainers = (data) => dispatch(actions.getRunningContainers(data))
 
   // useSelector Allows you to extract data from the Redux store state, using a selector function.
   const data = useSelector((state) => state.containers.containerList);
 
   // on app start-up, get the containers that are already running by calling initialAdd
-  const initialAdd = () => {
+  const initialRunning = () => {
     exec("docker stats --no-stream", (error, stdout, stderr) => {
       if (error) {
         console.log(`error: ${error.message}`);
@@ -35,7 +39,7 @@ const App = (props) => {
       console.log(stdout);
       // do some operations here to create a container with the information retrieved from stdout
       // then, for each container created, call addContainer by passing in the created container as argument
-      return addContainer(stdout.split("\n")[1]);
+      return addRunningContainer(stdout.split("\n")[1]);
     });
   };
 
@@ -67,10 +71,40 @@ const App = (props) => {
     });
   };
 
-  //CREATE
+  const initialStopped = () => {
+    exec('docker ps -f "status=exited"', (error, stdout, stderr) => {
+      if (error) {
+        console.log(`error: ${error.message}`);
+        return;
+      }
+      if (stderr) {
+        console.log(`stderr: ${stderr}`);
+        return;
+      }
+      console.log(stdout);
+      // do some operations here to create a container with the information retrieved from stdout
+      // then, for each container created, call StopContainer by passing in the created container as argument
+      addStoppedContainer(stdout);
+    });
+  };
+
+  const runStopped = (id) => {
+    exec(`docker start ${id}`, (error, stdout, stderr) => {
+      if (error) {
+        console.log(`error: ${error.message}`);
+        return;
+      }
+      if (stderr) {
+        console.log(`stderr: ${stderr}`);
+        return;
+      }
+      runStoppedContainer(id);
+    });
+  };
 
   useEffect(() => {
-    initialAdd();
+    initialRunning();
+    initialStopped();
   }, []);
 
   // useEffect(() => {

src/constants/actionTypes.js

@@ -1,4 +1,6 @@
-export const ADD_CONTAINER = "ADD_CONTAINER";
+export const ADD_RUNNING_CONTAINER = "ADD_RUNNING_CONTAINER";
 export const REMOVE_CONTAINER = "REMOVE_CONTAINER";
 export const GET_RUNNING_CONTAINERS = "GET_RUNNING_CONTAINERS";
 export const STOP_CONTAINER = `STOP_CONTAINER`;
+export const ADD_STOPPED_CONTAINER = `ADD_STOPPED_CONTAINER`;
+export const RUN_STOPPED_CONTAINER = `RUN_STOPPED_CONTAINER`;

src/reducers/ContainersReducer.js

@@ -9,7 +9,7 @@ const initialState = {
 
 const containersReducer = (state = initialState, action) => {
   switch (action.type) {
-    case types.ADD_CONTAINER:
+    case types.ADD_RUNNING_CONTAINER:
       const newRunningList = state.runningList.slice();
       newRunningList.push(action.payload);
       return { ...state, runningList: newRunningList };
@@ -40,6 +40,27 @@ const containersReducer = (state = initialState, action) => {
         stoppedList: newStoppedList,
       };
 
+    case types.ADD_STOPPED_CONTAINER:
+      const newerStoppedList = state.stoppedList.slice();
+      newerStoppedList.push(action.payload);
+      return { ...state, stoppedList: newerStoppedList };
+
+    case types.RUN_STOPPED_CONTAINER:
+      const runningListCopy = state.stoppedList.slice();
+      const newerStoppedContainer = [];
+      for (let container of state.stoppedList) {
+        if (container.id === action.payload) {
+          runningListCopy.push(container);
+        } else {
+          newerStoppedContainer.push(container);
+        }
+      }
+      return {
+        ...state,
+        runningList: runningListCopy,
+        stoppedList: newerStoppedContainer,
+      };
+
     default:
       return state;
   }