Fix: Same Service Redirect

GUI/src/components/Flow/NodeTypes/StepNode.test.tsx

@@ -1,6 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import useServiceStore from 'store/new-services.store';
+import useToastStore from 'store/toasts.store';
 import { StepType } from 'types';
 import { NodeDataProps } from 'types/service-flow';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
@@ -11,6 +12,15 @@
   useTranslation: () => ({ t: (key: string) => key }),
 }));
 
+vi.mock('i18next', () => {
+  const mockI18n = {
+    use: vi.fn().mockReturnThis(),
+    init: vi.fn().mockResolvedValue(undefined),
+    t: (key: string) => key,
+  };
+  return { default: mockI18n, t: mockI18n.t };
+});
+
 const mockNavigate = vi.fn();
 vi.mock('react-router-dom', async () => {
   const actual = await vi.importActual<typeof import('react-router-dom')>('react-router-dom');
@@ -33,6 +43,27 @@
   beforeEach(() => {
     mockNavigate.mockClear();
     useServiceStore.setState({ hasUnsavedChanges: false, nextLocation: null });
+    useToastStore.setState({ toasts: [] });
+  });
+
+  it('does not navigate away and shows a toast when the node references the currently open service (self-loop)', () => {
+    useServiceStore.setState({ serviceId: 'other-service-id', hasUnsavedChanges: false, nextLocation: null });
+    const resetStateSpy = vi.spyOn(useServiceStore.getState(), 'resetState');
+
+    render(
+      <MemoryRouter>
+        <StepNode data={jumpToServiceData} />
+      </MemoryRouter>,
+    );
+
+    fireEvent.click(screen.getByText(/Other Service/));
+
+    expect(mockNavigate).not.toHaveBeenCalled();
+    expect(resetStateSpy).not.toHaveBeenCalled();
+    expect(useServiceStore.getState().nextLocation).toBeNull();
+    expect(useToastStore.getState().toasts).toHaveLength(1);
+    expect(useToastStore.getState().toasts[0].title).toBe('serviceFlow.element.jumpToService.title');
+    expect(useToastStore.getState().toasts[0].message).toBe('serviceFlow.element.jumpToService.alreadyOnService');
   });
 
   it('navigates directly to the target service when there are no unsaved changes', () => {
@@ -44,7 +75,7 @@
 
     fireEvent.click(screen.getByText(/Other Service/));
 
     expect(mockNavigate).toHaveBeenCalledWith('/edit/other-service-id');
     expect(useServiceStore.getState().nextLocation).toBeNull();
   });
 
@@ -60,6 +91,6 @@
     fireEvent.click(screen.getByText(/Other Service/));
 
     expect(mockNavigate).not.toHaveBeenCalled();
     expect(useServiceStore.getState().nextLocation).toBe('/edit/other-service-id');
   });
 });

GUI/src/i18n/en/common.json

@@ -370,7 +370,8 @@
         "selectService": "Select a service...",
         "noActiveServices": "No active services available",
         "parameters": "Parameters",
-        "navigateToService": "Open this service"
+        "navigateToService": "Open this service",
+        "alreadyOnService": "You are already viewing this service"
       }
     },
     "popup": {

GUI/src/i18n/et/common.json

@@ -370,7 +370,8 @@
         "selectService": "Vali teenus...",
         "noActiveServices": "Aktiivseid teenuseid pole saadaval",
         "parameters": "Parameetrid",
-        "navigateToService": "Ava see teenus"
+        "navigateToService": "Ava see teenus",
+        "alreadyOnService": "Sa vaatad juba seda teenust"
       }
     },
     "popup": {

GUI/src/utils/service-navigation-utils.ts

@@ -1,8 +1,18 @@
+import { t } from 'i18next';
 import { NavigateFunction } from 'react-router-dom';
 import { ROUTES } from 'resources/routes-constants';
 import useServiceStore from 'store/new-services.store';
+import useToastStore from 'store/toasts.store';
 
 export const navigateToService = (serviceId: string, navigate: NavigateFunction) => {
+  if (serviceId === useServiceStore.getState().serviceId) {
+    useToastStore.getState().info({
+      title: t('serviceFlow.element.jumpToService.title'),
+      message: t('serviceFlow.element.jumpToService.alreadyOnService'),
+    });
+    return;
+  }
+
   const target = ROUTES.replaceWithId(ROUTES.EDITSERVICE_ROUTE, serviceId);
 
   if (useServiceStore.getState().hasUnsavedChanges) {