fix: admin rpc endpoint selector bug fix (#6641)

this closes getsentry/eap-planning#103
getsentry · Dec 10, 2024 · 71cdfde · 71cdfde
1 parent 3805250
commit 71cdfde
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/snuba/admin/static/rpc_endpoints/endpoint_selector.tsx b/snuba/admin/static/rpc_endpoints/endpoint_selector.tsx
@@ -5,6 +5,7 @@ import { EndpointSelectorProps } from 'SnubaAdmin/rpc_endpoints/types';
 export const EndpointSelector = ({
   endpoints,
   selectedEndpoint,
+  selectedVersion,
   handleEndpointSelect
 }: EndpointSelectorProps) => (
   <>
@@ -13,10 +14,10 @@ export const EndpointSelector = ({
       label="Select an endpoint"
       placeholder="Choose an endpoint"
       data={endpoints.map(endpoint => ({
-        value: endpoint.name,
+        value: `${endpoint.name}_${endpoint.version}`,
         label: `${endpoint.name} (${endpoint.version})`
       }))}
-      value={selectedEndpoint}
+      value={selectedEndpoint + "_" + selectedVersion}
       onChange={handleEndpointSelect}
       style={{ width: '100%', marginBottom: '1rem' }}
     />

diff --git a/snuba/admin/static/rpc_endpoints/index.tsx b/snuba/admin/static/rpc_endpoints/index.tsx
@@ -41,9 +41,16 @@ function RpcEndpoints() {
       abortControllerRef.current.abort();
     }
 
-    setSelectedEndpoint(value);
-    const selectedEndpointData = getEndpointData(endpoints, value || '');
-    setSelectedVersion(selectedEndpointData?.version || null);
+    if (value == null) {
+      setSelectedEndpoint(null);
+      setSelectedVersion(null);
+    } else {
+      // underscore splits the key between endpointname_version
+      const split = value.lastIndexOf('_');
+      setSelectedEndpoint(value.substring(0, value.lastIndexOf('_')));
+      setSelectedVersion(value.substring(split + 1, value.length));
+    }
+
     setRequestBody('');
     setResponse(null);
     setDebugMode(false);
@@ -122,6 +129,7 @@ function RpcEndpoints() {
       <EndpointSelector
         endpoints={endpoints}
         selectedEndpoint={selectedEndpoint}
+        selectedVersion={selectedVersion}
         handleEndpointSelect={handleEndpointSelect}
       />
       <Space h="md" />

diff --git a/snuba/admin/static/rpc_endpoints/types.tsx b/snuba/admin/static/rpc_endpoints/types.tsx
@@ -62,6 +62,7 @@ interface StyledSpanProps {
 interface EndpointSelectorProps {
     endpoints: Array<{ name: string; version: string }>;
     selectedEndpoint: string | null;
+    selectedVersion: string | null;
     handleEndpointSelect: (value: string | null) => void;
 }
 

diff --git a/snuba/admin/yarn.lock b/snuba/admin/yarn.lock
@@ -4447,7 +4447,7 @@ prop-types-extra@^1.1.0:
     react-is "^16.3.2"
     warning "^4.0.0"
 
-prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.6.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -4643,13 +4643,6 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-bootstrap-icons@^1.11.5:
-  version "1.11.5"
-  resolved "https://registry.yarnpkg.com/react-bootstrap-icons/-/react-bootstrap-icons-1.11.5.tgz#9b91a0bf0d5505d92c3574f1f990bb52f36a3ec0"
-  integrity sha512-eOhtFJMUqw98IJcfKJsSMZkFHCeNPTTwXZAe9V9d4mT22ARmbrISxPO9GmtWWuf72zQctLeZMGodX/q6wrbYYg==
-  dependencies:
-    prop-types "^15.7.2"
-
 react-bootstrap@^2.10.5:
   version "2.10.5"
   resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-2.10.5.tgz#2d3416fb4178d0f460ddafbfcab0aebfbbf1cf25"