simplify shared state action creator and reducer, separate imnternal platform shared reducer into its own reducer

Author: jancajthaml

bootstrap/src/store/index.js

@@ -6,6 +6,7 @@ import { all, fork } from "redux-saga/effects";
 import {
   setStore,
   sharedReducer,
+  envReducer,
   modulesReducer,
   createLoaderMiddleware,
   createDynamicMiddleware,
@@ -44,6 +45,7 @@ export default (router, fetchContext, bootstrapMiddlewares) => {
   const reducer = combineReducers({
     runtime: runtimeReducer,
     shared: sharedReducer,
+    env: envReducer,
     modules: modulesReducer,
   });
 

jest/__mocks__/platform.js

@@ -25,18 +25,10 @@ module.exports = {
     refresh: () => ({
       type: constants.REFRESH,
     }),
-    setGlobalShared: (data) => ({
+    setShared: (data) => ({
       type: constants.SET_SHARED,
       payload: {
         data,
-        module: false,
-      },
-    }),
-    setLocalShared: (data) => ({
-      type: constants.SET_SHARED,
-      payload: {
-        data,
-        module: true,
       },
     }),
   },
@@ -70,5 +62,6 @@ module.exports = {
   manualCleanup: () => {},
   getStore: () => store,
   sharedReducer: (state = {}, action) => state,
+  envReducer: (state = {}, action) => state,
   modulesReducer: (state = {}, action) => state,
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lastui/rocker",
-  "version": "0.19.21",
+  "version": "0.19.22",
   "license": "Apache-2.0",
   "author": "[email protected]",
   "homepage": "https://github.com/lastui/rocker#readme",

platform/src/__tests__/index.test.js

@@ -15,8 +15,7 @@ describe("safe module exports", () => {
     it("exposes expected", () => {
       expect(Object.keys(all.actions).length).toEqual(4);
       expect(all.actions.setLanguage).toBeDefined();
-      expect(all.actions.setGlobalShared).toBeDefined();
-      expect(all.actions.setLocalShared).toBeDefined();
+      expect(all.actions.setShared).toBeDefined();
       expect(all.actions.refresh).toBeDefined();
     });
 
@@ -29,27 +28,21 @@ describe("safe module exports", () => {
       });
     });
 
-    it(".setGlobalShared", () => {
-      expect(all.actions.setGlobalShared({ foo: "bar" })).toEqual({
-        type: "@@shared/SET_SHARED",
+    it(".setShared", () => {
+      expect(all.actions.setShared({ foo: "bar" })).toEqual({
+        type: "@@shared/SET",
         payload: {
           data: {
             foo: "bar",
           },
-          module: false,
         },
       });
     });
 
-    it(".setLocalShared", () => {
-      expect(all.actions.setLocalShared({ foo: "bar" })).toEqual({
-        type: "@@shared/SET_SHARED",
-        payload: {
-          data: {
-            foo: "bar",
-          },
-          module: true,
-        },
+    it(".clearShared", () => {
+      expect(all.actions.clearShared()).toEqual({
+        type: "@@shared/CLEAR",
+        payload: {},
       });
     });
 

platform/src/component/Module.jsx

@@ -6,9 +6,9 @@ import moduleLoader from "../kernel/registry/loader";
 import Fallback from "./Fallback";
 
 const Module = forwardRef((props, ref) => {
-  const isReady = useSelector((state) => Boolean(state.shared.readyModules[props.name]));
+  const isReady = useSelector((state) => Boolean(state.env.readyModules[props.name]));
 
-  const lastUpdate = useSelector((state) => state.shared.lastUpdate);
+  const lastUpdate = useSelector((state) => state.env.lastUpdate);
 
   const [lastLocalUpdate, setLastLocalUpdate] = useState(0);
 

platform/src/component/__tests__/Module.test.jsx

@@ -56,7 +56,7 @@ describe("<Module />", () => {
 
   it("renders loaded module component", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {
           "my-feature": true,
         },
@@ -72,7 +72,7 @@ describe("<Module />", () => {
 
   it("renders children of loaded module", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {
           "my-feature": true,
         },
@@ -96,7 +96,7 @@ describe("<Module />", () => {
 
   it("renders nothing if module not ready", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {
           "my-feature": false,
         },
@@ -119,7 +119,7 @@ describe("<Module />", () => {
 
   it("renders nothing if there is no view", async () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {
           "my-feature-without-view": true,
         },
@@ -142,7 +142,7 @@ describe("<Module />", () => {
 
   it("renders fallback while loading", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {
           "my-loading-feature": false,
         },
@@ -166,7 +166,7 @@ describe("<Module />", () => {
 
   it("renders nothing if there is no module name provided", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {},
       },
     });
@@ -187,7 +187,7 @@ describe("<Module />", () => {
 
   it("renders nothing if module is not available", () => {
     const store = configureStore([])({
-      shared: {
+      env: {
         readyModules: {},
       },
     });

platform/src/constants.js

@@ -14,4 +14,5 @@ export const MODULE_UNLOADED = "@@modules/UNLOADED";
 
 export const I18N_MESSAGES_BATCH = "@@shared/I18N_MESSAGES_BATCH";
 
-export const SET_SHARED = "@@shared/SET_SHARED";
+export const SET_SHARED = "@@shared/SET";
+export const CLEAR_SHARED = "@@shared/CLEAR";

platform/src/index.js

@@ -1,7 +1,7 @@
 import "regenerator-runtime/runtime";
 
 import Module from "./component/Module";
-import { SET_LANGUAGE, REFRESH, SET_SHARED } from "./constants";
+import { SET_LANGUAGE, REFRESH, SET_SHARED, CLEAR_SHARED } from "./constants";
 import registerModule from "./register";
 
 function setLanguage(language) {
@@ -19,30 +19,26 @@ function refresh() {
   };
 }
 
-function setGlobalShared(data) {
+function setShared(data) {
   return {
     type: SET_SHARED,
     payload: {
       data,
-      module: false,
     },
   };
 }
 
-function setLocalShared(data) {
+function clearShared() {
   return {
-    type: SET_SHARED,
-    payload: {
-      data,
-      module: true,
-    },
+    type: CLEAR_SHARED,
+    payload: {},
   };
 }
 
 const actions = {
   setLanguage,
-  setGlobalShared,
-  setLocalShared,
+  setShared,
+  clearShared,
   refresh,
 };
 

platform/src/kernel/__tests__/index.test.js

@@ -2,7 +2,7 @@ import * as all from "..";
 
 describe("kernel module exports", () => {
   it("should expose fixed number of things", () => {
-    expect(Object.keys(all).length).toEqual(12);
+    expect(Object.keys(all).length).toEqual(13);
   });
 
   describe("setStore", () => {
@@ -31,7 +31,7 @@ describe("kernel module exports", () => {
 
   describe("constants", () => {
     it("exposes expected", () => {
-      expect(Object.keys(all.constants).length).toEqual(13);
+      expect(Object.keys(all.constants).length).toEqual(14);
     });
   });
 

platform/src/kernel/index.js

@@ -8,6 +8,7 @@ import registerModule from "../register";
 import createDynamicMiddleware from "./middleware/dynamic";
 import createLoaderMiddleware from "./middleware/loader";
 import createSagaMiddleware from "./middleware/saga";
+import envReducer from "./reducer/env";
 import modulesReducer from "./reducer/modules";
 import sharedReducer from "./reducer/shared";
 import { manualCleanup } from "./registry/loader";
@@ -18,6 +19,7 @@ export {
   constants,
   createLoaderMiddleware,
   sharedReducer,
+  envReducer,
   modulesReducer,
   createDynamicMiddleware,
   createSagaMiddleware,
@@ -32,6 +34,7 @@ export default {
   constants,
   createLoaderMiddleware,
   sharedReducer,
+  envReducer,
   modulesReducer,
   createDynamicMiddleware,
   createSagaMiddleware,