merging dev to test

.gitignore

@@ -23,3 +23,8 @@
 **/npm-debug.log*
 /.idea/
 **/package-lock.json
+
+# Cursor IDE
+.cursor/
+.cursorrules
+.cursorrules.json

DSL/Liquibase/changelog/20250127000000_add_endpoints_to_user_step_preference.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
+                        http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd">
+
+    <changeSet id="20250127000000" author="IgorKrupenja">
+        <sqlFile
+            path="changelog/migrations/20250127000000_add_endpoints_to_user_step_preference.sql" />
+        <rollback>
+            <sqlFile path="changelog/migrations/rollback/20250127000000_rollback.sql" />
+        </rollback>
+    </changeSet>
+</databaseChangeLog> 

DSL/Liquibase/changelog/migrations/20250127000000_add_endpoints_to_user_step_preference.sql

@@ -0,0 +1,4 @@
+-- liquibase formatted sql
+-- changeset IgorKrupenja:20250127000000
+
+ALTER TABLE user_step_preference ADD COLUMN endpoints UUID[] DEFAULT '{}'; 

DSL/Liquibase/changelog/migrations/rollback/20250127000000_rollback.sql

@@ -0,0 +1,4 @@
+-- liquibase formatted sql
+-- rollback
+
+ALTER TABLE user_step_preference DROP COLUMN endpoints; 

DSL/Resql/services/POST/endpoints/get_endpoints_by_service_id.sql

@@ -3,13 +3,29 @@ WITH LatestEndpoints AS (
   FROM endpoints AS e
   WHERE (e.service_id = :id::uuid OR e.is_common = true)
   ORDER BY e.endpoint_id, e.id DESC
+),
+UserPreferences AS (
+  SELECT endpoints
+  FROM user_step_preference
+  WHERE user_id_code = :user_id_code
+  ORDER BY created_at DESC
+  LIMIT 1
 )
 SELECT
-  endpoint_id,
-  name,
-  type,
-  is_common,
-  definitions
-FROM LatestEndpoints
-WHERE deleted IS FALSE
-ORDER BY id DESC;
+  le.endpoint_id,
+  le.name,
+  le.type,
+  le.is_common,
+  le.definitions
+FROM LatestEndpoints AS le
+CROSS JOIN UserPreferences AS up
+WHERE le.deleted IS FALSE
+ORDER BY 
+  CASE 
+    WHEN up.endpoints IS NULL OR array_length(up.endpoints, 1) = 0 THEN 1
+    ELSE array_position(up.endpoints, le.endpoint_id)
+  END,
+  CASE 
+    WHEN up.endpoints IS NULL OR array_length(up.endpoints, 1) = 0 THEN le.id
+    ELSE NULL
+  END DESC; 

DSL/Resql/services/POST/endpoints/remove_endpoint_from_preferences.sql

@@ -0,0 +1,15 @@
+-- Remove a specific endpoint from all user step preferences
+-- This is called when an endpoint is deleted to clean up references
+
+INSERT INTO user_step_preference (steps, endpoints, user_id_code)
+SELECT 
+    steps,
+    array_remove(endpoints, :endpoint_id::uuid) AS endpoints,
+    user_id_code
+FROM user_step_preference AS usp1
+WHERE endpoints @> ARRAY[:endpoint_id::uuid]
+  AND created_at = (
+    SELECT MAX(created_at) 
+    FROM user_step_preference AS usp2 
+    WHERE usp2.user_id_code = usp1.user_id_code
+  ); 

DSL/Resql/services/POST/endpoints/remove_service_endpoints_from_preferences.sql

@@ -0,0 +1,23 @@
+-- Remove all non-common endpoints of a deleted service from all user step preferences
+-- This is called when a service is deleted to clean up references to its endpoints
+
+INSERT INTO user_step_preference (steps, endpoints, user_id_code)
+SELECT 
+    steps,
+    array_remove(endpoints, le.endpoint_id) AS endpoints,
+    user_id_code
+FROM user_step_preference AS usp1
+CROSS JOIN (
+    SELECT DISTINCT ON (endpoint_id) endpoint_id
+    FROM endpoints
+    WHERE service_id = :serviceId::uuid
+      AND is_common = FALSE
+      AND deleted = FALSE
+    ORDER BY endpoint_id, id DESC
+) AS le
+WHERE usp1.endpoints @> ARRAY[le.endpoint_id]
+  AND usp1.created_at = (
+    SELECT MAX(created_at) 
+    FROM user_step_preference AS usp2 
+    WHERE usp2.user_id_code = usp1.user_id_code
+  ); 

DSL/Resql/services/POST/get-user-step-preferences.sql

@@ -1,4 +1,4 @@
-SELECT steps
+SELECT steps, endpoints
 FROM user_step_preference
 WHERE user_id_code = :user_id_code
 ORDER BY created_at DESC

DSL/Resql/services/POST/update-user-step-preferences.sql

@@ -1,2 +1,2 @@
-INSERT INTO user_step_preference(steps, user_id_code)
-VALUES(:steps::step_type[], :user_id_code);
+INSERT INTO user_step_preference(steps, endpoints, user_id_code)
+VALUES(:steps::step_type[], :endpoints::uuid[], :user_id_code);

DSL/Ruuter/services/GET/service-by-id.yml

@@ -17,6 +17,26 @@ check_for_parameters:
     - condition: ${incoming.params == null || incoming.params.id == null}
       next: return_incorrect_request
 
+get_user_info:
+  call: http.post
+  args:
+    url: "[#SERVICE_TIM]/jwt/custom-jwt-userinfo"
+    contentType: plaintext
+    headers:
+      cookie: ${incoming.headers.cookie}
+    plaintext: "customJwtCookie"
+  result: res
+
+check_user_info_response:
+  switch:
+    - condition: ${200 <= res.response.statusCodeValue && res.response.statusCodeValue < 300}
+      next: assignIdCode
+  next: return_unauthorized
+
+assignIdCode:
+  assign:
+    idCode: ${res.response.body.idCode}
+
 get_service_by_id:
   call: http.post
   args:
@@ -31,6 +51,7 @@ get_endpoints_by_service_id:
     url: "[#SERVICE_RESQL]/endpoints/get_endpoints_by_service_id"
     body:
       id: ${incoming.params.id}
+      user_id_code: ${idCode}
   result: endpoints_results
 
 prepare_results:
@@ -57,3 +78,8 @@ return_incorrect_request:
   status: 400
   return: "Required parameter(s) missing"
   next: end
+
+return_unauthorized:
+  status: 401
+  return: "unauthorized"
+  next: end

DSL/Ruuter/services/GET/steps/preferences.yml

@@ -39,7 +39,7 @@ check_preferences_response:
   switch:
     - condition: ${preferences.response.body.length > 0}
       next: return_preferences
-  next: seed_default_user_preferences    
+  next: seed_default_user_preferences
 
 seed_default_user_preferences:
   call: http.post
@@ -58,11 +58,11 @@ refetch_user_step_preferences:
   result: refetched_preferences
 
 return_refetched_preferences:
-  return: ${refetched_preferences.response.body[0].steps}
+  return: ${refetched_preferences.response.body[0]}
   next: end
 
 return_preferences:
-  return: ${preferences.response.body[0].steps}
+  return: ${preferences.response.body[0]}
   next: end
 
 return_unauthorized:

DSL/Ruuter/services/POST/services/create-endpoint.yml

@@ -24,7 +24,7 @@ declaration:
         type: string
         description: "Service UUID"
       - field: definitions
-        type: json
+        type: object
         description: "Endpoint definitions"
 
 create_endpoint:

DSL/Ruuter/services/POST/services/delete-endpoint.yml

@@ -20,6 +20,14 @@ delete_endpoint:
       id: ${incoming.body.id}
   result: res
 
+remove_from_preferences:
+  call: http.post
+  args:
+    url: "[#SERVICE_RESQL]/endpoints/remove_endpoint_from_preferences"
+    body:
+      endpoint_id: ${incoming.body.id}
+  result: preferences_res
+
 return_ok:
   status: 200
   return: "Endpoint deleted"

DSL/Ruuter/services/POST/services/delete.yml

@@ -113,6 +113,15 @@ delete_endpoints_by_service_id:
     body:
       serviceId: ${id}
   result: delete_endpoint_results
+  next: remove_service_endpoints_from_preferences
+
+remove_service_endpoints_from_preferences:
+  call: http.post
+  args:
+    url: "[#SERVICE_RESQL]/endpoints/remove_service_endpoints_from_preferences"
+    body:
+      serviceId: ${id}
+  result: remove_preferences_results
   next: delete_mcq_files
 
 delete_mcq_files:

DSL/Ruuter/services/POST/services/update-endpoint.yml

@@ -21,7 +21,7 @@ declaration:
         type: string
         description: "Service UUID"
       - field: definitions
-        type: json
+        type: object
         description: "Endpoint definitions"
     params:
       - field: id

DSL/Ruuter/services/POST/steps/preferences.yml

@@ -11,10 +11,14 @@ declaration:
       - field: steps
         type: string
         description: "Body field 'steps'"
+      - field: endpoints
+        type: string
+        description: "Body field 'endpoints'"
 
 extractRequestData:
   assign:
-    steps: ${incoming.body.steps.join(",")} 
+    steps: ${incoming.body.steps.join(",")}
+    endpoints: ${incoming.body.endpoints.join(",")}
 
 get_user_info:
   call: http.post
@@ -42,6 +46,7 @@ update_user_step_preferences:
     url: "[#SERVICE_RESQL]/update-user-step-preferences"
     body:
       steps: "{${steps}}"
+      endpoints: "{${endpoints}}"
       user_id_code: ${idCode}
   result: update_preferences_res
 
@@ -54,7 +59,7 @@ get_user_step_preferences:
   result: preferences
 
 return_preferences:
-  return: ${preferences.response.body[0].steps}
+  return: ${preferences.response.body[0]}
   next: end
 
 return_unauthorized:

GUI/src/components/ApiEndpoint/ApiEndpoint.module.scss

@@ -17,13 +17,32 @@
     align-items: center;
     width: 100%;
     min-width: 0;
+    gap: 8px;
 
     .label {
-      padding-left: 8px;
       overflow: hidden;
       text-overflow: ellipsis;
       min-width: 0;
     }
+
+    .apiBadge,
+    .publicBadge {
+      color: white;
+      font-size: 10px;
+      font-weight: bold;
+      padding: 2px 6px;
+      border-radius: 2px;
+      white-space: nowrap;
+      text-transform: uppercase;
+    }
+
+    .apiBadge {
+      background-color: #8bb4d5;
+    }
+
+    .publicBadge {
+      background-color: #6b9bc5;
+    }
   }
 
   .loader {

GUI/src/components/ApiEndpoint/index.tsx

@@ -4,20 +4,22 @@ import Icon from "components/Icon";
 import Track from "components/Track";
 import { FC, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { MdDeleteOutline, MdOutlineEdit } from "react-icons/md";
+import { MdDeleteOutline, MdOutlineEdit, MdDragIndicator } from "react-icons/md";
 import { Link } from "react-router-dom";
 import { deleteEndpoint } from "resources/api-constants";
 import useServiceStore from "store/new-services.store";
 import useToastStore from "store/toasts.store";
 import { Step, StepType } from "types";
 import { EndpointData } from "types/endpoint";
-import apiIconTag from "../../assets/images/api-icon-tag.svg";
+
 import styles from "./ApiEndpoint.module.scss";
 import api from "../../services/api-dev";
 import Modal from "components/Modal";
 import ApiEndpointCard from "components/ApiEndpointCard";
 import { saveEndpoints } from "services/service-builder";
 import { removeTrailingUnderscores } from "utils/string-util";
+import { useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
 
 interface RelatedService {
   serviceId: string;
@@ -32,6 +34,14 @@ interface ApiEndpointProps {
 const ApiEndpoint: FC<ApiEndpointProps> = ({ step, onClick }) => {
   const { t } = useTranslation();
 
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id: step.id });
+
+  const style = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+  };
+
   const [relatedServices, setRelatedServices] = useState<RelatedService[]>([]);
   const [showEditModal, setShowEditModal] = useState(false);
   const [showDeleteModal, setShowDeleteModal] = useState(false);
@@ -182,18 +192,24 @@ const ApiEndpoint: FC<ApiEndpointProps> = ({ step, onClick }) => {
       )}
 
       <Box
+        ref={setNodeRef}
+        style={style}
         className={styles.box}
         key={step.id}
-        style={{ cursor: "pointer" }}
         color={[StepType.FinishingStepEnd, StepType.FinishingStepRedirect].includes(step.type) ? "red" : "blue"}
         onClick={() => onClick(step)}
-        draggable={false}
       >
         <Track gap={8} style={{ justifyContent: "space-between", overflow: "hidden" }}>
-          <div className={styles.labelContainer}>
-            {step.type === "user-defined" && <img alt="" src={apiIconTag} />}
-            <span className={styles.label}>{step.label}</span>
-          </div>
+          <Track gap={8} style={{ alignItems: "center" }}>
+            <div {...attributes} {...listeners} style={{ cursor: "grab", display: "flex", alignItems: "center" }}>
+              <Icon icon={<MdDragIndicator size={16} />} size="small" />
+            </div>
+            <div className={styles.labelContainer}>
+              {step.type === "user-defined" && <span className={styles.apiBadge}>API</span>}
+              {step.data?.isCommon && <span className={styles.publicBadge}>{t("serviceFlow.apiElements.public")}</span>}
+              <span className={styles.label}>{step.label}</span>
+            </div>
+          </Track>
           <Track gap={12}>
             <button
               className={styles.deleteButton}

GUI/src/components/ApiEndpointCard/Endpoints/Custom/index.tsx

@@ -142,7 +142,7 @@ const EndpointCustom: React.FC<EndpointCustomProps> = ({
         key={key}
         requestValues={requestValues}
         isLive={isLive}
-        endpointData={endpoint.definitions[0]}
+        endpoint={endpoint}
         requestTab={requestTab}
         setRequestTab={setRequestTab}
         parentEndpointId={endpoint.endpointId}