Bug fix - Path Parameter Endpoints Fail After Save

GUI/src/services/service-builder.ts

@@ -829,47 +829,119 @@ function handleEndpointStep(
   const rawBody = endpointDefinition?.body?.rawData ?? {};
   const headersVariables = endpointDefinition?.headers?.variables;
   const methodType = endpointDefinition?.methodType?.toLowerCase();
-  const hasNonEqualOperator = paramsVariables?.some((param: any) => param.operator && param.operator !== '=');
+  const hasNonEqualOperator = Array.isArray(paramsVariables) && paramsVariables.some(hasNonEqualOperatorParam);
+
+  const baseUrl = getEndpointBaseUrl(endpointDefinition?.url, hasNonEqualOperator);
+  const { resolvedUrl, pathPlaceholderNames } = resolveUrlWithPathParams(baseUrl, paramsVariables);
 
   const stepConfig: any = {
     call: `http.${methodType ?? 'post'}`,
     args: {
-      url: hasNonEqualOperator ? (endpointDefinition?.url ?? '') : (endpointDefinition?.url?.split('?')[0] ?? ''),
+      url: resolvedUrl,
     },
     result: `${parentNode.data.endpoint?.name.replaceAll(' ', '_')}_res`,
     next: childNode ? toSnakeCase(childNode.data.label ?? 'format_messages') : 'format_messages',
   };
 
-  if (Array.isArray(paramsVariables) && paramsVariables.length > 0 && !hasNonEqualOperator) {
-    stepConfig.args.query = paramsVariables.reduce((acc: any, e: any) => {
-      acc[e.name] = e.value;
-      return acc;
-    }, {});
+  applyEndpointQuery(stepConfig, paramsVariables, pathPlaceholderNames, hasNonEqualOperator);
+  applyEndpointBody(stepConfig, isRawBodySelected, rawBody, bodyVariables);
+  applyEndpointHeaders(stepConfig, headersVariables);
+
+  finishedFlow.set(parentStepName, stepConfig);
+}
+
+function hasNonEqualOperatorParam(param: any): boolean {
+  return Boolean(param?.operator && param.operator !== '=');
+}
+
+function getEndpointBaseUrl(url: unknown, hasNonEqualOperator: boolean): string {
+  const urlString = typeof url === 'string' ? url : '';
+  // Preserve existing behavior: if a non-equal operator is used, keep the full URL
+  // (including any inline query string); otherwise strip the inline query string.
+  return hasNonEqualOperator ? urlString : (urlString.split('?')[0] ?? '');
+}
+
+function resolveUrlWithPathParams(
+  baseUrl: string,
+  paramsVariables: any[] | undefined,
+): { resolvedUrl: string; pathPlaceholderNames: Set<string> } {
+  // Resolve path param placeholders ({name}) directly into the URL so Ruuter does not
+  // attempt Spring-style URI template expansion at runtime and fail with
+  // "Not enough variable values available to expand '<name>'".
+  const urlPathPart = baseUrl.split('?')[0];
+  const pathPlaceholderNames = new Set([...urlPathPart.matchAll(/(?<!\$)\{(\w+)\}/g)].map((m) => m[1]));
+
+  let resolvedUrl = baseUrl;
+  if (!Array.isArray(paramsVariables) || pathPlaceholderNames.size === 0) {
+    return { resolvedUrl, pathPlaceholderNames };
   }
 
+  for (const param of paramsVariables) {
+    const name = String(param?.name ?? '');
+    if (!name) continue;
+    if (!pathPlaceholderNames.has(name)) continue;
+    if (param?.value == null) continue;
+    resolvedUrl = resolvedUrl.split(`{${name}}`).join(String(param.value));
+  }
+
+  return { resolvedUrl, pathPlaceholderNames };
+}
+
+function applyEndpointQuery(
+  stepConfig: any,
+  paramsVariables: any[] | undefined,
+  pathPlaceholderNames: Set<string>,
+  hasNonEqualOperator: boolean,
+) {
+  if (!Array.isArray(paramsVariables) || paramsVariables.length === 0 || hasNonEqualOperator) return;
+
+  const queryOnlyParams = paramsVariables.filter((e: any) => {
+    const name = String(e?.name ?? '');
+    return !pathPlaceholderNames.has(name);
+  });
+
+  if (queryOnlyParams.length === 0) return;
+
+  stepConfig.args.query = queryOnlyParams.reduce((acc: any, e: any) => {
+    const name = String(e?.name ?? '');
+    if (!name) return acc;
+    acc[name] = e?.value;
+    return acc;
+  }, {});
+}
+
+function applyEndpointBody(
+  stepConfig: any,
+  isRawBodySelected: boolean,
+  rawBody: any,
+  bodyVariables: any[] | undefined,
+) {
   if (isRawBodySelected) {
     try {
-      const rawJsonStr = (rawBody?.value ?? '').replace(/(?<!")(\$\{[^}]+\})(?!")/g, '"$1"');
+      const rawJsonStr = String(rawBody?.value ?? '').replace(/(?<!")(\$\{[^}]+\})(?!")/g, '"$1"');
       const rawJson = JSON.parse(rawJsonStr);
       stepConfig.args.body = rawJson;
     } catch (e: any) {
       console.log(`Unable to save JSON to Yaml. ${e.message}`);
     }
-  } else if (Array.isArray(bodyVariables) && bodyVariables.length > 0) {
+    return;
+  }
+
+  if (Array.isArray(bodyVariables) && bodyVariables.length > 0) {
     stepConfig.args.body = bodyVariables.reduce((acc: any, e: any) => {
       acc[e.name] = e.value;
       return acc;
     }, {});
   }
+}
 
+function applyEndpointHeaders(stepConfig: any, headersVariables: any[] | undefined) {
   if (Array.isArray(headersVariables) && headersVariables.length > 0) {
     stepConfig.args.headers = headersVariables.reduce((acc: any, e: any) => {
       acc[e.name] = e.value;
       return acc;
     }, {});
   }
-
-  finishedFlow.set(parentStepName, stepConfig);
 }
 
 function handleMultiChoiceQuestion(