chore: enabled filter mapping

Author: matbmoser

ichub-backend/controllers/fastapi/routers/provider/v1/twin_management.py

@@ -80,8 +80,41 @@ async def twin_management_share_catalog_part_twin(catalog_part_twin_share: Catal
         return JSONResponse(status_code=204, content={"description":"Catalog part twin already shared"})
 
 @router.get("/serialized-part-twin", response_model=List[SerializedPartTwinRead], responses=exception_responses)
-async def twin_management_get_all_serialized_part_twins(include_data_exchange_agreements: bool = False) -> List[SerializedPartTwinRead]:
-    return twin_management_service.get_serialized_part_twins(include_data_exchange_agreements=include_data_exchange_agreements)
+async def twin_management_get_all_serialized_part_twins(
+    include_data_exchange_agreements: bool = False,
+    manufacturerId: Optional[str] = None,
+    manufacturerPartId: Optional[str] = None,
+    customerPartId: Optional[str] = None,
+    partInstanceId: Optional[str] = None,
+    van: Optional[str] = None,
+    businessPartnerNumber: Optional[str] = None
+) -> List[SerializedPartTwinRead]:
+    from models.services.provider.part_management import SerializedPartQuery
+    
+    # Create a dynamic query object using all provided filter parameters
+    query_data = {}
+    
+    # Map API parameter names to Pydantic field aliases
+    filter_mapping = {
+        "manufacturerId": manufacturerId,
+        "manufacturerPartId": manufacturerPartId,
+        "customerPartId": customerPartId,
+        "partInstanceId": partInstanceId,
+        "van": van,
+        "businessPartnerNumber": businessPartnerNumber
+    }
+    
+    # Only include non-None values in the query
+    for field_name, value in filter_mapping.items():
+        if value is not None:
+            query_data[field_name] = value
+    
+    query = SerializedPartQuery(**query_data)
+    
+    return twin_management_service.get_serialized_part_twins(
+        serialized_part_query=query,
+        include_data_exchange_agreements=include_data_exchange_agreements
+    )
 
 @router.get("/serialized-part-twin/{global_id}", response_model=Optional[SerializedPartTwinDetailsRead], responses=exception_responses)
 async def twin_management_get_serialized_part_twin(global_id: UUID) -> Optional[SerializedPartTwinDetailsRead]:

ichub-frontend/src/features/serialized-parts/api.ts

@@ -29,6 +29,14 @@ const SERIALIZED_PART_READ_BASE_PATH = '/part-management/serialized-part';
 const SERIALIZED_PART_TWIN_BASE_PATH = '/twin-management/serialized-part-twin';
 const backendUrl = getIchubBackendUrl();
 
+// Simple cache for twins to avoid redundant API calls
+const twinsCache = new Map<string, { data: SerializedPartTwinRead[]; timestamp: number }>();
+const CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
+
+const getCacheKey = (manufacturerId?: string, manufacturerPartId?: string) => {
+  return `${manufacturerId || 'all'}-${manufacturerPartId || 'all'}`;
+};
+
 export const fetchAllSerializedParts = async (): Promise<SerializedPart[]> => {
   const response = await axios.get<SerializedPart[]>(`${backendUrl}${SERIALIZED_PART_READ_BASE_PATH}`);
   return response.data;
@@ -77,20 +85,39 @@ export const fetchAllSerializedPartTwins = async (
   manufacturerId?: string,
   manufacturerPartId?: string
 ): Promise<SerializedPartTwinRead[]> => {
-  const response = await axios.get<SerializedPartTwinRead[]>(
-    `${backendUrl}${SERIALIZED_PART_TWIN_BASE_PATH}?include_data_exchange_agreements=true`
-  );
+  // Check cache first
+  const cacheKey = getCacheKey(manufacturerId, manufacturerPartId);
+  const cached = twinsCache.get(cacheKey);
+  const now = Date.now();
+  
+  if (cached && (now - cached.timestamp) < CACHE_DURATION) {
+    console.log('Returning cached twins data for:', cacheKey);
+    return cached.data;
+  }
+  
+  // Build query parameters to filter on the server side
+  const params = new URLSearchParams();
+  params.append('include_data_exchange_agreements', 'true');
 
-  // Filter twins by manufacturerId and manufacturerPartId if provided
-  let twins = response.data;
   if (manufacturerId) {
-    twins = twins.filter(twin => twin.manufacturerId === manufacturerId);
+    params.append('manufacturerId', manufacturerId);
   }
   if (manufacturerPartId) {
-    twins = twins.filter(twin => twin.manufacturerPartId === manufacturerPartId);
+    params.append('manufacturerPartId', manufacturerPartId);
   }
 
-  return twins;
+  console.log('Fetching twins from API for:', cacheKey);
+  const response = await axios.get<SerializedPartTwinRead[]>(
+    `${backendUrl}${SERIALIZED_PART_TWIN_BASE_PATH}?${params.toString()}`
+  );
+  
+  // Cache the result
+  twinsCache.set(cacheKey, {
+    data: response.data,
+    timestamp: now
+  });
+  
+  return response.data;
 };
 
 export const unshareSerializedPartTwin = async (

ichub-frontend/src/features/serialized-parts/components/SerializedPartsTable.tsx

@@ -35,7 +35,7 @@ import CloudUploadIcon from '@mui/icons-material/CloudUpload';
 import IosShare from '@mui/icons-material/IosShare';
 import LinkOffIcon from '@mui/icons-material/LinkOff';
 import DeleteIcon from '@mui/icons-material/Delete';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { SerializedPart } from '../types';
 import { SerializedPartTwinRead } from '../types/twin-types';
 import { createSerializedPartTwin, shareSerializedPartTwin, unshareSerializedPartTwin, deleteSerializedPart, fetchAllSerializedPartTwins } from '../api';
@@ -61,6 +61,23 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
   const [twinUnsharingId, setTwinUnsharingId] = useState<number | null>(null);
   const [partDeletingId, setPartDeletingId] = useState<number | null>(null);
 
+  // Helper function to fetch twins for all unique parts in the table
+  const fetchTwinsForParts = useCallback(async (): Promise<SerializedPartTwinRead[]> => {
+    const uniqueParts = Array.from(
+      new Set(parts.map(p => `${p.manufacturerId}-${p.manufacturerPartId}`))
+    ).map(key => {
+      const [manufacturerId, manufacturerPartId] = key.split('-');
+      return { manufacturerId, manufacturerPartId };
+    });
+
+    const allTwins: SerializedPartTwinRead[] = [];
+    for (const { manufacturerId, manufacturerPartId } of uniqueParts) {
+      const twins = await fetchAllSerializedPartTwins(manufacturerId, manufacturerPartId);
+      allTwins.push(...twins);
+    }
+    return allTwins;
+  }, [parts]);
+
   // Determine twin status based on twin data
   const determineTwinStatus = (serializedPart: SerializedPart, twins: SerializedPartTwinRead[]): { status: StatusVariants; globalId?: string } => {
     const twin = twins.find(
@@ -83,12 +100,12 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
   useEffect(() => {
     const loadTwinData = async () => {
       try {
-        // Fetch all twins to determine status
-        const twins = await fetchAllSerializedPartTwins();
+        // Fetch twins for the specific parts being displayed
+        const allTwins = await fetchTwinsForParts();
 
         // Merge serialized parts with twin status
         const rowsWithStatus = parts.map((serializedPart, index) => {
-          const { status, globalId } = determineTwinStatus(serializedPart, twins);
+          const { status, globalId } = determineTwinStatus(serializedPart, allTwins);
           return {
             ...serializedPart,
             id: serializedPart.id || index,
@@ -115,7 +132,7 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
     };
 
     loadTwinData();
-  }, [parts]);
+  }, [parts, fetchTwinsForParts]);
 
   const handleCreateTwin = async (row: SerializedPartWithStatus) => {
     setTwinCreatingId(row.id);
@@ -126,10 +143,11 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
         partInstanceId: row.partInstanceId,
       });
 
-      // Refresh twin data after successful creation
-      const twins = await fetchAllSerializedPartTwins();
+      // Refresh twin data after successful creation - reload all twins for this table
+      const allTwins = await fetchTwinsForParts();
+      
       const rowsWithStatus = parts.map((serializedPart, index) => {
-        const { status, globalId } = determineTwinStatus(serializedPart, twins);
+        const { status, globalId } = determineTwinStatus(serializedPart, allTwins);
         return {
           ...serializedPart,
           id: serializedPart.id || index,
@@ -159,7 +177,7 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
       });
 
       // Refresh twin data after successful share
-      const twins = await fetchAllSerializedPartTwins();
+      const twins = await fetchTwinsForParts();
       const rowsWithStatus = parts.map((serializedPart, index) => {
         const { status, globalId } = determineTwinStatus(serializedPart, twins);
         return {
@@ -185,7 +203,7 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
     setTwinUnsharingId(row.id);
     try {
       // Find the twin to get the AAS ID
-      const twins = await fetchAllSerializedPartTwins();
+      const twins = await fetchTwinsForParts();
       const twin = twins.find(
         (t) => t.manufacturerId === row.manufacturerId &&
                t.manufacturerPartId === row.manufacturerPartId &&
@@ -207,7 +225,7 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
       });
 
       // Refresh twin data after successful unshare
-      const updatedTwins = await fetchAllSerializedPartTwins();
+      const updatedTwins = await fetchTwinsForParts();
       const rowsWithStatus = parts.map((serializedPart, index) => {
         const { status, globalId } = determineTwinStatus(serializedPart, updatedTwins);
         return {
@@ -243,7 +261,7 @@ const SerializedPartsTable = ({ parts, onRefresh }: SerializedPartsTableProps) =
       console.log("Delete API call successful");
 
       // Refresh data after successful deletion
-      const twins = await fetchAllSerializedPartTwins();
+      const twins = await fetchTwinsForParts();
       const rowsWithStatus = parts.map((serializedPart, index) => {
         const { status, globalId } = determineTwinStatus(serializedPart, twins);
         return {