Skip to content

fix: [Model] When add two or more interceptor and remove one of them - deleted all of them #2164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PolinaGurinovich97 merged 5 commits into from
Feb 13, 2026
+15 −23
Merged

fix: [Model] When add two or more interceptor and remove one of them - deleted all of them #2164

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d51d92
fix: [Google] Handle non-JWT Google access tokens in
PolinaGurinovich97 Feb 13, 2026
42e70cd
fix: [Model] When add two or more interceptor and remove one of them …
PolinaGurinovich97 Feb 13, 2026
1611107
Merge branch 'development' into fix/logs
PolinaGurinovich97 Feb 13, 2026
619b658
fix build
PolinaGurinovich97 Feb 13, 2026
49c9152
Merge branch 'fix/logs' of https://github.com/epam/ai-dial-admin-fron…
PolinaGurinovich97 Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions apps/ai-dial-admin/src/components/EntityView/Interceptors/Interceptors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { RowDragEvent } from 'ag-grid-community';
import { getApplicationScheme } from '@/src/app/[lang]/application-runners/actions';
import { getProperties } from '@/src/app/[lang]/system-properties/actions';
import AddEntitiesGrid from '@/src/components/EntityView/AddEntitiesGrid';
import GridView from '@/src/components/Grid/GridView/GridView';
import { DEFAULT_ETAG } from '@/src/constants/api-headers';
import { DESCRIPTION_COLUMN, DISPLAY_NAME_COLUMN, NAME_COLUMN } from '@/src/constants/grid-columns/base-columns';
import { ButtonsI18nKey, EntitiesI18nKey, InterceptorsI18nKey, TabsI18nKey } from '@/src/constants/i18n';
Expand All @@ -18,7 +19,6 @@ import { AssetApp } from '@/src/models/dial/deployment-asset';
import { DialInterceptor } from '@/src/models/dial/interceptor';
import { ApplicationRoute } from '@/src/types/routes';
import { onOpenInNewTab } from '@/src/utils/open-in-new-tab';
import GridView from '@/src/components/Grid/GridView/GridView';
import CollapsableInterceptors from './CollapsableInterceptors';
import { getInterceptorsColumnDefs, getInterceptorsGridData } from './utils';

Expand Down Expand Up @@ -103,27 +103,6 @@ const EntityInterceptors = <T extends { interceptors?: string[]; 'dial:applicati
[entity, entityInterceptors, isAppRunnerView, onChangeEntity],
);

const onRemoveInterceptor = useCallback(
(_?: DialInterceptor, index?: number) => {
if (index != null) {
entityInterceptors?.splice(index, 1);

if (isAppRunnerView) {
onChangeEntity({
...entity,
'dial:applicationTypeInterceptors': entityInterceptors,
});
} else {
onChangeEntity({
...entity,
interceptors: entityInterceptors,
});
}
}
},
[entity, entityInterceptors, isAppRunnerView, onChangeEntity],
);

const onRowDragEnd = useCallback(
(event: RowDragEvent) => {
const newRowData: string[] = [];
Expand Down Expand Up @@ -153,10 +132,23 @@ const EntityInterceptors = <T extends { interceptors?: string[]; 'dial:applicati

const runnerColumns = getInterceptorsColumnDefs(onOpen, void 0, globalInterceptors?.length);

// eslint-disable-next-line react-hooks/exhaustive-deps
const onRemoveInterceptor = (_?: DialInterceptor, index?: number) => {
if (index != null) {
if (isAppRunnerView) {
entity['dial:applicationTypeInterceptors']?.splice(index, 1);
} else {
entity.interceptors?.splice(index, 1);
}

onChangeEntity({ ...entity });
}
};

const localColumns = useMemo(() => {
return getInterceptorsColumnDefs(
onOpen,
onRemoveInterceptor,
(_?: DialInterceptor, index?: number) => onRemoveInterceptor(_, index),
(globalInterceptors?.length || 0) + (runnerInterceptors?.length || 0),
);
}, [onRemoveInterceptor, globalInterceptors?.length, runnerInterceptors?.length]);
Expand Down
Loading