Add status to ToggleButton

husarion · Dec 23, 2024 · 1db5f9c · 1db5f9c
1 parent 4395c36
commit 1db5f9c
Show file tree

Hide file tree

Showing 7 changed files with 162 additions and 108 deletions.
diff --git a/packages/studio-base/src/panels/EStop/EStop.tsx b/packages/studio-base/src/panels/EStop/EStop.tsx
@@ -65,26 +65,6 @@ const useStyles = makeStyles<{ state?: string }>()((theme, { state }) => {
   };
 });
 
-function parseInput(value: string): { error?: string; parsedObject?: unknown } {
-  let parsedObject;
-  let error = undefined;
-  try {
-    const parsedAny: unknown = JSON.parse(value);
-    if (Array.isArray(parsedAny)) {
-      error = "Request content must be an object, not an array";
-    } else if (parsedAny == undefined) {
-      error = "Request content must be an object, not null";
-    } else if (typeof parsedAny !== "object") {
-      error = `Request content must be an object, not ‘${typeof parsedAny}’`;
-    } else {
-      parsedObject = parsedAny;
-    }
-  } catch (e) {
-    error = value.length !== 0 ? e.message : "Enter valid request content as JSON";
-  }
-  return { error, parsedObject };
-}
-
 function getSingleDataItem(results: unknown[]) {
   if (results.length <= 1) {
     return results[0];
@@ -253,11 +233,6 @@ function EStopContent(
     };
   }, [context, state.parsedPath?.topicName]);
 
-  const { error: requestParseError, parsedObject } = useMemo(
-    () => parseInput(config.requestPayload ?? ""),
-    [config.requestPayload],
-  );
-
   const settingsActionHandler = useCallback(
     (action: SettingsTreeAction) => {
       setConfig((prevConfig) => settingsActionReducer(prevConfig, action));
@@ -285,12 +260,9 @@ function EStopContent(
 
   const canEStop = Boolean(
     context.callService != undefined &&
-    config.requestPayload &&
     config.goServiceName &&
     config.stopServiceName &&
     eStopAction != undefined &&
-    parsedObject != undefined &&
-    requestParseError == undefined &&
     reqState?.status !== "requesting",
   );
 
@@ -309,7 +281,7 @@ function EStopContent(
 
     try {
       setReqState({ status: "requesting", value: `Calling ${serviceName}...` });
-      const response = await context.callService(serviceName, JSON.parse(config.requestPayload!));
+      const response = await context.callService(serviceName, {});
       setReqState({
         status: "success",
         value: JSON.stringify(response, (_key, value) => (typeof value === "bigint" ? value.toString() : value), 2) ?? "",
@@ -319,7 +291,7 @@ function EStopContent(
       setReqState({ status: "error", value: (err as Error).message });
       log.error(err);
     }
-  }, [context, eStopAction, config.goServiceName, config.stopServiceName, config.requestPayload]);
+  }, [context, eStopAction, config.goServiceName, config.stopServiceName]);
 
   // Setting eStopAction based on state.latestMatchingQueriedData
   useEffect(() => {

diff --git a/packages/studio-base/src/panels/EStop/index.stories.tsx b/packages/studio-base/src/panels/EStop/index.stories.tsx
@@ -15,12 +15,13 @@ import { Config } from "./types";
 
 const successResponseJson = JSON.stringify({ success: true }, undefined, 2);
 const baseConfig: Config = {
-  goServiceName: "/set_bool",
-  requestPayload: `{\n  "data": true\n}`,
+  goServiceName: "/trigger",
+  stopServiceName: "/reset",
+  statusTopicName: "/status",
 };
 
-const getFixture = ({ allowEStop }: { allowEStop: boolean }): Fixture => {
-  const eStop = async (service: string, _request: unknown) => {
+const getFixture = ({ allowCallService }: { allowCallService: boolean }): Fixture => {
+  const callService = async (service: string, _request: unknown) => {
     if (service !== baseConfig.goServiceName) {
       throw new Error(`Service "${service}" does not exist`);
     }
@@ -35,8 +36,8 @@ const getFixture = ({ allowEStop }: { allowEStop: boolean }): Fixture => {
       }),
     ),
     frame: {},
-    capabilities: allowEStop ? [PlayerCapabilities.eStops] : [],
-    eStop,
+    capabilities: allowCallService ? [PlayerCapabilities.callServices] : [],
+    callService,
   };
 };
 
@@ -68,7 +69,7 @@ export const EStopEnabled: StoryObj = {
     return <EStopPanel />;
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowEStop: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowCallService: true }) } },
 };
 
 export const EStopEnabledServiceName: StoryObj = {
@@ -88,7 +89,7 @@ export const EStopEnabledServiceName: StoryObj = {
     }
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowEStop: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowCallService: true }) } },
 };
 
 export const EStopEnabledWithCustomButtonSettings: StoryObj = {
@@ -107,23 +108,7 @@ export const EStopEnabledWithCustomButtonSettings: StoryObj = {
     });
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowEStop: true }) } },
-};
-
-const validJSON = `{\n  "a": 1,\n  "b": 2,\n  "c": 3\n}`;
-
-export const WithValidJSON: StoryObj = {
-  render: () => {
-    return <EStopPanel overrideConfig={{ ...baseConfig, requestPayload: validJSON }} />;
-  },
-};
-
-const invalidJSON = `{\n  "a": 1,\n  'b: 2,\n  "c": 3\n}`;
-
-export const WithInvalidJSON: StoryObj = {
-  render: () => {
-    return <EStopPanel overrideConfig={{ ...baseConfig, requestPayload: invalidJSON }} />;
-  },
+  parameters: { panelSetup: { fixture: getFixture({ allowCallService: true }) } },
 };
 
 export const CallingServiceThatDoesNotExist: StoryObj = {
@@ -150,5 +135,5 @@ export const CallingServiceThatDoesNotExist: StoryObj = {
     }
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowEStop: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowCallService: true }) } },
 };
diff --git a/packages/studio-base/src/panels/EStop/settings.ts b/packages/studio-base/src/panels/EStop/settings.ts
@@ -12,7 +12,6 @@ import { SettingsTreeAction, SettingsTreeNodes } from "@foxglove/studio";
 import { Config } from "./types";
 
 export const defaultConfig: Config = {
-  requestPayload: "{}",
   goServiceName: "",
   stopServiceName: "",
   statusTopicName: "",

diff --git a/packages/studio-base/src/panels/EStop/types.ts b/packages/studio-base/src/panels/EStop/types.ts
@@ -6,5 +6,4 @@ export type Config = {
   goServiceName: string;
   stopServiceName: string;
   statusTopicName: string;
-  requestPayload?: string;
 };