fix(context): compatible with new storage api

Alwatr · May 18, 2023 · 5251ff0 · 5251ff0
1 parent 7e7498a
commit 5251ff0
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/core/context/src/core.ts b/core/context/src/core.ts
@@ -38,6 +38,9 @@ export const serverContextFsmConstructor = finiteStateMachineProvider.defineCons
         request_failed: {
           target: 'loadingFailed',
         },
+        request_failed_404: {
+          target: 'loadingFailed',
+        },
         request_success: {
           target: 'reloading',
         },
@@ -55,6 +58,9 @@ export const serverContextFsmConstructor = finiteStateMachineProvider.defineCons
         request_failed: {
           target: 'loadingFailed',
         },
+        request_failed_404: {
+          target: 'loadingFailed',
+        },
         request_success: {
           target: 'complete',
         },
@@ -76,6 +82,9 @@ export const serverContextFsmConstructor = finiteStateMachineProvider.defineCons
         request_failed: {
           target: 'reloadingFailed',
         },
+        request_failed_404: {
+          target: 'reloadingFailed',
+        },
         request_success: {
           target: 'complete',
         },
@@ -122,12 +131,19 @@ finiteStateMachineProvider.defineActions<ServerContextFsm>(serverContextFsmConst
     try {
       const {response, options} = fsm.getContext();
       if (options == null || options.url == null) {
-        return logger.error('action_request', 'invalid_fetch_options', {id: fsm.id, options});
+        logger.error('action_request', 'invalid_fetch_options', {id: fsm.id, options});
+        return;
       }
       const newResponse = await serviceRequest<NonNullable<ServerContextFsmContext['response']>>(
         options as StringifyableFetchOptions,
       );
 
+      if (newResponse.data == null) {
+        logger.accident('requestOrderStorageContext', 'context_not_found', 'Server request 404 not found');
+        fsm.transition('request_failed_404');
+        return;
+      }
+
       if (
         response != null &&
         newResponse.meta?.lastUpdated != null &&