Merge pull request #5 from 51ngul4r1ty/issue/000127/get-edit-view-but…

…ton-working

get edit/view button working in electron

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atollelectron",
   "productName": "atollelectron",
-  "version": "0.13.2",
+  "version": "0.15.0",
   "author": {
     "name": "Kevin Berry",
     "email": "[email protected]"
@@ -36,7 +36,7 @@
     "forge": "./forge.config.js"
   },
   "dependencies": {
-    "@atoll/shared": "0.13.2",
+    "@atoll/shared": "0.15.0",
     "@flopflip/memory-adapter": "1.6.0",
     "@flopflip/react-broadcast": "10.1.11",
     "axios": "0.19.2",
@@ -106,6 +106,7 @@
     "css-loader": "3.4.2",
     "dependency-cruiser": "9.7.0",
     "electron": "9.0.5",
+    "electron-devtools-installer": "3.1.1",
     "eslint": "6.8.0",
     "eslint-config-wiremore": "3.0.5",
     "file-loader": "5.1.0",

src/common/routeBuilder.tsx

@@ -4,6 +4,9 @@ import { Switch, Route } from "react-router-dom";
 import { ConfigureFlopFlip } from "@flopflip/react-broadcast";
 import adapter from "@flopflip/memory-adapter";
 
+// libraries
+import { buildFeatureTogglesList, FEATURE_TOGGLE_LIST } from "@atoll/shared";
+
 // components
 import {
     IntlProvider,
@@ -33,7 +36,8 @@ const getDefaultFlags = (windowObj: any, forSsr: boolean) => {
     if (forSsr) {
         return { showEditButton: false };
     }
-    return (windowObj as any).__TOGGLES__;
+    const toggles = (windowObj as any).__TOGGLES__ || buildFeatureTogglesList(FEATURE_TOGGLE_LIST);
+    return toggles;
 };
 
 export const buildRoutes = (windowObj: any, forSsr: boolean) => (
@@ -44,11 +48,6 @@ export const buildRoutes = (windowObj: any, forSsr: boolean) => (
             defaultFlags={getDefaultFlags(windowObj, forSsr)}
         >
             {({ isAdapterReady }) => {
-                if (isAdapterReady) {
-                    console.log("isAdapterReady = true");
-                } else {
-                    console.log("isAdapterReady = false");
-                }
                 return isAdapterReady ? appRoutes : <div>LOADING...</div>;
             }}
         </ConfigureFlopFlip>

src/main.ts

@@ -1,5 +1,7 @@
 const { app, BrowserWindow } = require("electron");
 
+import installExtension, { REDUX_DEVTOOLS } from "electron-devtools-installer";
+
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require("electron-squirrel-startup")) {
     // eslint-disable-line global-require
@@ -45,7 +47,12 @@ const createWindow = () => {
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on("ready", createWindow);
+app.on("ready", () => {
+    createWindow();
+    installExtension(REDUX_DEVTOOLS)
+        .then((name) => console.log(`Added Extension:  ${name}`))
+        .catch((err) => console.log("An error occurred: ", err));
+});
 
 // Quit when all windows are closed.
 app.on("window-all-closed", () => {

src/renderer.tsx

@@ -5,21 +5,21 @@ import { remote } from "electron";
 import { Provider } from "react-redux";
 import { ConnectedRouter } from "connected-react-router";
 
-// redux related
+// libraries
 import {
-    configureStore,
-    createElectronClientHistory,
     storeHistoryInstance,
     initConfig,
-    FeatureTogglesState,
+    createElectronClientHistory,
+    configureStore,
+    buildFeatureTogglesList,
     StateTree,
+    FeatureTogglesState,
     FEATURE_TOGGLE_LIST
 } from "@atoll/shared";
 
 // shared code
 import { buildRoutesForElectron } from "common/routeBuilder";
 import { AppState } from "@atoll/shared";
-import { layouts } from "@atoll/shared";
 
 const history = createElectronClientHistory();
 storeHistoryInstance(history);
@@ -35,7 +35,7 @@ const syncHistoryWithStore = (appStore, appHistory) => {
 initConfig({ getDocumentLocHref: () => "http://localhost:8500/" });
 
 const featureToggles: FeatureTogglesState = {
-    toggles: FEATURE_TOGGLE_LIST
+    toggles: buildFeatureTogglesList(FEATURE_TOGGLE_LIST)
 };
 const oldState: StateTree = { app: { executingOnClient: true } as AppState } as StateTree;
 const newApp = { ...oldState.app /*, locale */ };
@@ -44,7 +44,8 @@ const newState: StateTree = { ...oldState, app: newApp, featureToggles };
 const store = configureStore({
     initialState: newState, // { app: { executingOnClient: true } },
     history,
-    middleware: []
+    middleware: [],
+    windowRef: window
 });
 syncHistoryWithStore(store, history);