Improve state matching

elastic · Dec 1, 2023 · 9b47545 · 9b47545
1 parent a693196
commit 9b47545
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/x-pack/plugins/observability_log_explorer/public/components/discover_link.tsx b/x-pack/plugins/observability_log_explorer/public/components/discover_link.tsx
@@ -28,7 +28,7 @@ export const ConnectedDiscoverLink = React.memo(() => {
 
   const [pageState] = useActor(useObservabilityLogExplorerPageStateContext());
 
-  if (pageState.matches('initialized.validLogExplorerState')) {
+  if (pageState.matches({ initialized: 'validLogExplorerState' })) {
     return <DiscoverLinkForValidState discover={discover} pageState={pageState} />;
   } else {
     return <DiscoverLinkForUnknownState />;
@@ -37,7 +37,7 @@ export const ConnectedDiscoverLink = React.memo(() => {
 
 type InitializedPageState = MatchedStateFromActor<
   ObservabilityLogExplorerService,
-  'initialized.validLogExplorerState'
+  { initialized: 'validLogExplorerState' }
 >;
 
 export const DiscoverLinkForValidState = React.memo(

diff --git a/x-pack/plugins/observability_log_explorer/public/routes/main/main_route.tsx b/x-pack/plugins/observability_log_explorer/public/routes/main/main_route.tsx
@@ -63,9 +63,7 @@ const ConnectedContent = React.memo(() => {
 
   const [state] = useActor(useObservabilityLogExplorerPageStateContext());
 
-  if (state.matches('uninitialized')) {
-    return <InitializingContent />;
-  } else if (state.matches('initialized')) {
+  if (state.matches('initialized')) {
     return (
       <InitializedContent
         logExplorerController={state.context.controller}
@@ -74,7 +72,7 @@ const ConnectedContent = React.memo(() => {
       />
     );
   } else {
-    return null;
+    return <InitializingContent />;
   }
 });
 

diff --git a/...bility_log_explorer/public/state_machines/observability_log_explorer/src/state_machine.ts b/...bility_log_explorer/public/state_machines/observability_log_explorer/src/state_machine.ts
@@ -23,7 +23,7 @@ import { initializeFromTimeFilterService } from './time_filter_service';
 export const createPureObservabilityLogExplorerStateMachine = (
   initialContext: ObservabilityLogExplorerContext
 ) =>
-  /** @xstate-layout N4IgpgJg5mDOIC5QHkBGswCcBuBDVAlgDYEAuAngDID2UAogB4AOR1mWAdAK4B2BfpArhIAvSAGIA2gAYAuolBNqsMgWo8FIBogDMOjgFYAbAEZpAdgCcRgwBYAHAcsGANCHK7bHWztsGTRjomevbmRpYAvhFuaBg4+MRkVLSMLGyc-KrCBCL8UABimNQAtgAqBMVg+cSkWADKWNgEAMZg4gCSAHLtpe0AgpTtAFp0ACIA+vkASsgAsuO9s3ST7ZSldFPjdRsAau0AwnQy8kggSiqC6praCAC0ZvrhRua24Tp2jiZuHggATEb2Dj-aQ2PQmcEGSFRGLoRoJEgUGj0ZisdiYDiZQTZXI8ApFYoAVUwRA63V6A2GY0mM3mBKmlGOmnOqiupxutx0Rg49ksv2kBl+9hMQp0oV+30QBnsXgsAX8lhevx0lki0RAsThhARyWRaTRHGa7Fwglx+3UpCKRCIWHE+2QnVKM0olA2432UzofXWo0Zp2Zlw0bMQHMB9h05k5zwFYWkJlc7kQoUsHCM0ns4RenPMsfM0PVsPiWqSSNSqIyAiEokgHDwJAgJZR6UwdVIxralGQAHFxnQABoABQ7Hs2dVKXuW+wAEn1Op2xr7FMoWYHQDdjCZDEnbAEFb8TJZbBKECZBeYgc845Z7MDr7Y8xrC4lESlG-rMZWctXeABrHjUADuPANnq9StrU4gdt2faDsgw5bGO6xutOs7znITJLgG1yIEqBgcCY25GL8UqihYV72EeELSHhtj8umJ6mOmBhRGqf4QHAmgPngRbPrqZaYOhFxqCuWjBnGG5PC8bwfP4R73OGHDSIp0hBD4REOM494FlxT46qWTbcHwFbYpAAnLlhCBnm89jWcKvK2M4IKyfZhhKSeQSkemGlqpx8LFi+IHou+2J5IUJTlJU1RELUzaNC0YCmZhQZ3PYVE8nytj2aC+EvBR-zeBGgoCgKJ7Wb8mlxNp2rAXxGJGaIIX4kSRAJUJ5kcly7y-AqV5GM8Ph+Eeth7hw5j-AYyrgtZtgRuVmo6dV+mGmAxp5GaPAWtQVpYC1rKrsGnIcNYSr2ZYZixgeOhHi8G4mBGvi3V1ilOLNj5Vf5NVBVWEA7cJ7LXt4KWfHovKOOY5EJsesZckYNGmACabptuL2VX5vH6Z9n4QAZv4AUB71Ni2bY-W1vgA2m-jA4VYMUcKXLSJYWanuNsY6Mjvk8Xpb51ZjNbZPW+NooTtTE0lqbJnG0jbvZT1WJYNPpgpDPPEzOixkxzFAA */
+  /** @xstate-layout N4IgpgJg5mDOIC5QHkBGswCcBuBDVAlgDYEAuAngDID2UAogB4AOR1mWAdAK4B2BfpArhIAvSAGIA2gAYAuolBNqsMgWo8FIBogDMOjgFYAbAEZpAdgCcRgwBYAHAcsGANCHK7bHWztsGTRjomevbmRpYAvhFuaBg4+MRkVLSMLGyc-KrCBCL8UABimNQAtgAqBMVg+cSkWADKWNgEAMZg4gCSAHLtpe0AgpTtAFp0ACIA+vkASsgAsuO9s3ST7ZSldFPjdRsAau0AwnQy8kggSiqC6praCAC0ZvrhRua24Tp2jiZuHggATEb2Dj-aQ2PQmcEGSFRGLoRoJEgUGj0ZisdiYDiZQTZXI8ApFYoAVUwRA63V6A2GY0mM3mBKmlGOmnOqiupxutx0Rg49ksv2kBl+9hMQp0oV+30QBnsXgsAX8lhevx0lki0RAsThhARyWRaTRHGa7Fwglx+3UpCKRCIWHE+2QnVKM0olA2432UzofXWo0Zp2Zlw0bMQt0FHCMAN85jC9k5tl+cYlCFCJg4QRMxnM0lsZkcRmh6th8S1SSRqVRGQEQlEkG4PAA1jxqAB3HillHpTB1UjGtqUZAAcXGdAAGgAFPsezZ1Upe5b7AASfU6-bGvsUyhZgdANyVBg4JmzRl+UtFFks9nsiYh0n3tn59lM-2FNnzGqLiURKXb+sxVZyNbwEgIDbPV6m7WpxD7QcR3HZBJy2Gd1jdRdl1XOQmQ3ANrklUxDFCSxDwVX4TAIq9BXMIFnnTc9gXseMojVRsIDgTQ3zwYtP11ctMAwi41C3LRg3TFMnheN4Pn8RN7h0CjpDk6QDyFcxiOkX5VRhOJ2I-HUyw7Wtf2xSBeM3bCEAot4LyFHl42cEEpNsSxDHkkwlTMKwH2cV9Cy07UQO4jFK2xPJChKcpKmqIhak7RoWjAYysKDO57Bvayswc0EDxeMiuVscwdEFAUBRci9fi8zT4RLL9QPRAzRGC-EiSIeL+NMjkuXeNT3PDF5fFcdxEDjFNlNBSxwQvXKdDKzVtL8vTDTAY08jNHgLWoK0sGa1lt2DTkOGsJUHNGuSSJ8RMXhTEw8t8S61LkpwpvfXyqv82r-wgTaBPZOjvGSz49F5RxzEvfqEDMdMwzvBwAnMAwoxIh6fMqri9NesQIFrBtm1bZ6Oy7HsPta3wfukP7lQKoGr2fDhpEsTllNCAwdAUya1TYirON0n9AurdHAIIYCcbRPHagJxKjBp-cDCzA9LDuqxLEph9qdp55yMZhSDAYiIgA */
   createMachine<
     ObservabilityLogExplorerContext,
     ObservabilityLogExplorerEvent,

diff --git a/.../observability_log_explorer/public/state_machines/observability_log_explorer/src/types.ts b/.../observability_log_explorer/public/state_machines/observability_log_explorer/src/types.ts
@@ -55,10 +55,10 @@ export type ObservabilityLogExplorerTypeState =
       context: CommonObservabilityLogExplorerContext;
     }
   | {
-      value: 'initialized.unknownLogExplorerState';
+      value: 'initialized' | { initialized: 'unknownLogExplorerState' };
       context: CommonObservabilityLogExplorerContext & WithController;
     }
   | {
-      value: 'initialized.validLogExplorerState';
+      value: { initialized: 'validLogExplorerState' };
       context: CommonObservabilityLogExplorerContext & WithLogExplorerState & WithController;
     };