Merge branch 'chore/list-view' of https://github.com/epam/ai-dial-admin-frontend into chore/list-view

Author: PolinaGurinovich97

apps/ai-dial-admin/src/components/Grid/AgGridWrapper.tsx

@@ -43,7 +43,7 @@ import { getColumnsStateFromStorage, GridModel, saveColumnsStateToStorage } from
 export interface AgGridProps<T> {
   columnDefs?: ColDef[];
   rowData?: T[] | null;
-  additionalGridOptions?: GridOptions;
+  additionalGridOptions?: Omit<GridOptions, 'columnDefs' | 'rowData' | 'onGridReady'>;
   storageKey?: string;
   onGridReady?: (gridApi: GridReadyEvent) => void;
 }

apps/ai-dial-admin/src/components/SourceField/Template/SelectRunnerModal.tsx

@@ -1,5 +1,5 @@
 import { DialFormPopup, PopupSize } from '@epam/ai-dial-ui-kit';
-import { FC, useState } from 'react';
+import { FC, useCallback, useState } from 'react';
 
 import { SINGLE_ROW_SELECTION } from '@/src/constants/ag-grid';
 import { BASE_COLUMNS } from '@/src/constants/grid-columns/grid-columns';
@@ -8,7 +8,7 @@ import { useI18n } from '@/src/locales/client';
 import { InterceptorTemplate } from '@/src/models/interceptor-template';
 
 import RadioButtonRenderer from '@/src/components/Grid/CellRenderers/RadioButtonRenderer';
-import { GridOptions } from 'ag-grid-community';
+import { GridOptions, GridReadyEvent } from 'ag-grid-community';
 import GridView from '@/src/components/Grid/GridView/GridView';
 
 interface Props {
@@ -37,15 +37,22 @@ const SelectRunnerModal: FC<Props> = ({ selected, runners, isModalOpen, onClose,
         setSelectedRunner(event.data.name);
       }
     },
-    onGridReady: (event) => {
+  };
+
+  const onGridReady = useCallback(
+    (event: GridReadyEvent) => {
+      event.api?.updateGridOptions({
+        columnDefs: BASE_COLUMNS,
+        rowData: runners,
+      });
       event.api.forEachNode((node) => {
         if (node.data.name === selectedRunner) {
           node.setSelected(true);
         }
       });
     },
-  };
-
+    [runners, selectedRunner],
+  );
   return (
     <DialFormPopup
       onClose={onClose}
@@ -63,9 +70,8 @@ const SelectRunnerModal: FC<Props> = ({ selected, runners, isModalOpen, onClose,
       <div className="flex flex-col px-6 py-4 h-full">
         <GridView
           emptyDataProps={{ title: t(EntitiesI18nKey.NoTemplates) }}
-          columnDefs={BASE_COLUMNS}
-          rowData={runners}
           additionalGridOptions={options}
+          onGridReady={onGridReady}
         />
       </div>
     </DialFormPopup>

apps/ai-dial-admin/src/utils/deployments/containers.ts

@@ -37,7 +37,6 @@ export const getContainerRedeploySnapshot = (container: Container): ContainerRed
     containerGrpcPort: container.containerGrpcPort,
     envs: normalizeEnvironmentVariables(container.metadata?.envs),
     resources: normalizeResources(container.resources),
-    allowedDomains: container.allowedDomains,
   };
 };
 

apps/ai-dial-admin/src/utils/deployments/entity.ts

@@ -72,12 +72,12 @@ export const getIdFormat = (name: string) => {
   return name.toLowerCase().replace(/\s+/g, '_');
 };
 
-export const getEntityId = (container: Container, route: ApplicationRoute, t: (key: string) => string) => {
-  return getIdFormat(getEntityName(container, route, t));
+export const getEntityId = (container: Container) => {
+  return getIdFormat(getEntityName(container));
 };
 
-export const getEntityName = (container: Container, route: ApplicationRoute, t: (key: string) => string) => {
-  return `${container.displayName} ${getTranslatedEntity(route, t)}`;
+export const getEntityName = (container: Container) => {
+  return `${container.displayName}`;
 };
 
 export const getEntityTemplate = (
@@ -87,8 +87,8 @@ export const getEntityTemplate = (
   transport?: CONTAINER_TRANSPORT,
 ): DialModel | Toolset | DialInterceptor => {
   const template: DialModel | Toolset | DialInterceptor = {
-    name: getEntityId(container, route, t),
-    displayName: getEntityName(container, route, t),
+    name: getEntityId(container),
+    displayName: getEntityName(container),
     description: '',
     source: { $type: SOURCE_TYPE.CONTAINER, containerId: container.name },
   };
@@ -119,8 +119,8 @@ export const getAssetTemplate = (
   transport: CONTAINER_TRANSPORT,
 ): Partial<AssetToolset> => {
   return {
-    name: getEntityId(container, route, t),
-    displayName: getEntityName(container, route, t),
+    name: getEntityId(container),
+    displayName: getEntityName(container),
     endpoint: container.url,
     transport: ENTITY_TRANSPORT[transport],
   };

apps/ai-dial-admin/src/utils/deployments/tests/entity.spec.ts

@@ -96,22 +96,22 @@ describe('entity utils', () => {
   describe('getEntityId', () => {
     test('generates id based on container name and route', () => {
       const container = { displayName: 'MyContainer' } as any;
-      expect(getEntityId(container, ApplicationRoute.ModelServings, t)).toBe('mycontainer_entities.model');
+      expect(getEntityId(container)).toBe('mycontainer');
     });
   });
 
   describe('getEntityName', () => {
     test('generates name based on container name and route', () => {
       const container = { displayName: 'MyContainer' } as any;
-      expect(getEntityName(container, ApplicationRoute.ModelServings, t)).toBe(`MyContainer ${EntitiesI18nKey.Model}`);
+      expect(getEntityName(container)).toBe(`MyContainer`);
     });
   });
 
   describe('getEntityTemplate', () => {
     test('returns basic template', () => {
       const container = { displayName: 'MyContainer', name: '123' } as any;
       const template = getEntityTemplate(ApplicationRoute.InterceptorContainers, container, t);
-      expect(template.name).toBe('mycontainer_entities.interceptor');
+      expect(template.name).toBe('mycontainer');
       expect(template.source?.containerId).toBe('123');
     });
 
@@ -134,7 +134,7 @@ describe('entity utils', () => {
     test('returns asset template', () => {
       const container = { displayName: 'MyContainer', url: 'http://url' } as any;
       const template = getAssetTemplate(ApplicationRoute.McpContainers, container, t, CONTAINER_TRANSPORT.SSE);
-      expect(template.name).toBe('mycontainer_entities.toolset');
+      expect(template.name).toBe('mycontainer');
       expect(template.endpoint).toBe('http://url');
       expect(template.transport).toBe(CONTAINER_TRANSPORT.SSE);
     });