@things-factory/more-base 10.1.206 → 10.1.219

package/client/reducers/more.ts

@@ -1,5 +1,18 @@
+import { navigate } from '@operato/shell'
+
 import { ADD_MORENDA, ADD_MORENDA_HEAD, ADD_MORENDA_TAIL } from '../actions/more'
 
+/**
+ * A morenda that names the page it opens (`page`) and no action of its own opens that page.
+ *
+ * The page is said once, where the morenda is registered: the menu reads it to mark the row of the open page
+ * (`currentMorenda` in @operato/menu), and the action that goes there is made from it here, so the two cannot
+ * name different pages. A morenda that does something other than open a page keeps its own `action`.
+ */
+function withPageAction(morenda) {
+  return morenda?.page && !morenda.action ? { ...morenda, action: () => navigate(morenda.page) } : morenda
+}
+
 const INITIAL_STATE = {
   morendas: [],
   heads: [],
@@ -9,7 +22,7 @@ const INITIAL_STATE = {
 const more = (state = INITIAL_STATE, action) => {
   switch (action.type) {
     case ADD_MORENDA:
-      let morenda = action.morenda
+      let morenda = withPageAction(action.morenda)
       return {
         ...state,
         morendas: [...state.morendas, morenda]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/more-base",
-  "version": "10.1.206",
+  "version": "10.1.219",
   "main": "dist-server/index.js",
   "browser": "client/index.ts",
   "things-factory": true,
@@ -24,7 +24,8 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/shell": "^10.1.206"
+    "@operato/shell": "^10.29.39",
+    "@things-factory/shell": "^10.1.208"
   },
-  "gitHead": "18588a058a4a6cb21c379b2da5517e077c6442ba"
+  "gitHead": "1e96a252aafc460942bf5093b5aeed24828783d4"
 }

package/tests/more-reducer.test.ts

@@ -0,0 +1,37 @@
+jest.mock('@operato/shell', () => ({ navigate: jest.fn() }))
+
+import { navigate } from '@operato/shell'
+
+import { ADD_MORENDA } from '../client/actions/more'
+import more from '../client/reducers/more'
+
+/** The morendas the rail's 「관리」 rows and the more panel read (`more.morendas`). */
+describe('the morenda registry', () => {
+  beforeEach(() => (navigate as jest.Mock).mockClear())
+
+  it('★ a morenda that names its page opens that page', () => {
+    const state = more(undefined, { type: ADD_MORENDA, morenda: { name: 'roles', page: 'roles' } })
+
+    state.morendas[0].action()
+
+    expect(navigate).toHaveBeenCalledWith('roles')
+    expect(state.morendas[0].page).toBe('roles')
+  })
+
+  it('★ a morenda with its own action keeps it, page or not', () => {
+    const own = jest.fn()
+    const state = more(undefined, { type: ADD_MORENDA, morenda: { name: 'logs', page: 'logs', action: own } })
+
+    state.morendas[0].action()
+
+    expect(own).toHaveBeenCalled()
+    expect(navigate).not.toHaveBeenCalled()
+  })
+
+  it('a morenda with neither is kept as it came', () => {
+    const morenda = { name: 'about' }
+    const state = more(undefined, { type: ADD_MORENDA, morenda })
+
+    expect(state.morendas[0]).toBe(morenda)
+  })
+})