fix(operation) deal with query strings in operation urls WD-3656

canonical · May 15, 2023 · 6c81968 · 6c81968
1 parent ea6ccb4
commit 6c81968
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/api/operations.tsx b/src/api/operations.tsx
@@ -11,7 +11,10 @@ export const watchOperation = (
   timeout = TIMEOUT_10
 ): Promise<LxdOperation> => {
   return new Promise((resolve, reject) => {
-    fetch(`${operationUrl}/wait?timeout=${timeout}`)
+    const operationParts = operationUrl.split("?");
+    const baseUrl = operationParts[0];
+    const queryString = operationParts.length === 1 ? "" : operationParts[1];
+    fetch(`${baseUrl}/wait?timeout=${timeout}&${queryString}`)
       .then(handleResponse)
       .then((data: LxdOperation) => {
         if (data.metadata.status === "Success") {