@seamly/web-ui 19.0.0-beta.2 → 19.0.0-beta.3

package/src/javascripts/lib/redux-helpers/index.js

@@ -1,3 +1,5 @@
+import { randomId } from '../id'
+
 export const SLICE_DELIMITER = '/'
 export const DOMAIN_DELIMITER = '//'
 
@@ -10,7 +12,8 @@ export function createAction(
   identityReducer = (payload) => ({ payload }),
 ) {
   const action = (...params) => ({ type, ...identityReducer(...params) })
-  action.toString = () => type.toString()
+  action.toString = () => String(type)
+  action.match = (obj) => obj?.type === String(type)
   return action
 }
 
@@ -32,14 +35,47 @@ export function createActions(baseType, ...args) {
   return handlers.map((handler) => create(...handler))
 }
 
-export function createThunk(type, thunkCreator) {
-  const fn = (...args) => {
-    const thunk = thunkCreator(...args)
-    thunk.type = type
-    return thunk
+export function createThunk(type, payloadCreator) {
+  const [pending, fulfilled, rejected] = createActions(type, {
+    pending: (arg, requestId) => ({
+      meta: { arg, requestId, status: 'pending' },
+    }),
+    fulfilled: (arg, payload, requestId) => ({
+      payload,
+      meta: { arg, requestId, status: 'fulfilled' },
+    }),
+    rejected: (arg, error, requestId) => ({
+      error,
+      meta: { arg, requestId, status: 'rejected', error: String(error) },
+    }),
+  })
+  const thunkCreator = (arg) => (dispatch, getState, extra) => {
+    const requestId = randomId()
+    const promise = (async () => {
+      let finalAction
+      try {
+        dispatch(pending(arg, requestId))
+        const prms = payloadCreator(arg, { dispatch, getState, extra })
+        const result = await prms
+        finalAction = fulfilled(arg, result, requestId)
+      } catch (error) {
+        finalAction = rejected(arg, error, requestId)
+      }
+      dispatch(finalAction)
+      return finalAction
+    })()
+    return Object.assign(promise, {
+      type,
+      arg,
+      requestId,
+    })
   }
-  fn.toString = () => type
-  return fn
+  return Object.assign(thunkCreator, {
+    type,
+    pending,
+    fulfilled,
+    rejected,
+  })
 }
 
 export function createReducer(domain, handlers = {}, defaultState) {

package/src/javascripts/lib/store/providers/session-storage.js

@@ -3,7 +3,12 @@ export default function store(key) {
 
   return {
     get() {
-      return JSON.parse(sessionStorage.getItem(KEY))
+      const candidates = [KEY, KEY.split('.').slice(0, -1).join('.')]
+      let val
+      do {
+        val = sessionStorage.getItem(candidates[0])
+      } while (candidates.shift() && !val)
+      return JSON.parse(val)
     },
 
     set(value) {

package/src/javascripts/style-guide/components/static-core.js

@@ -56,7 +56,7 @@ const SeamlyTestCore = ({ state, translations, children }) => {
       },
     })
     newStore.dispatch(ConfigActions.initialize(configSlice || {}))
-    newStore.dispatch(I18nActions.setLocaleResolve('en-GB', translations))
+    newStore.dispatch(I18nActions.setLocale.fulfilled('en-GB', translations))
     return newStore
   }, [state, translations])