1006724-Nextjs-sample-update

Author: AishwaryaRameshbabu-SF3446

Binding_Next_JS_Server/angular_client/src/app/doctors/doctors.ts

@@ -9,6 +9,7 @@ import {
   GridComponent,
   GridModule,
   ToolbarService,
+  RowInfo,
 } from '@syncfusion/ej2-angular-grids';
 import {
   PageService,
@@ -95,7 +96,7 @@ export class Doctors {
       search: [],
     };
     this.fetchData(initialState).then((res) => {
-      this.data = res;
+      this.gridInstance.dataSource  = res;
     });
   }
 
@@ -133,7 +134,7 @@ export class Doctors {
       (args as any).dataSource(res.result);
     } else {
       // For paging, sorting and other data actions
-      this.data = res;
+      this.gridInstance.dataSource  = res;
     }
   }
 
@@ -169,9 +170,9 @@ export class Doctors {
   }
 
   // Navigate to patients for the selected doctor
-  btnClick(event: any) {
-    const rowData: any = this.gridInstance.getRowInfo(event.target).rowData;
-    const doctorID = rowData.DoctorId;
+  btnClick(event: MouseEvent) {
+    const currentRowInfo: RowInfo = this.gridInstance.getRowInfo(event.target as HTMLElement);
+    const doctorID = (currentRowInfo.rowData as any).DoctorId;
     this.router.navigate(['patients'], {
       queryParams: { doctorID },
     });

Binding_Next_JS_Server/next_js_server/app/api/health_care/route.ts

@@ -1,109 +1,67 @@
 import { Predicate } from '@syncfusion/ej2-data';
 import { NextResponse, NextRequest } from "next/server";
 import { DataManager, Query } from '@syncfusion/ej2-data';
-import { doctorDetails } from '../../../data/health_care_Entities'; 
+import { doctorDetails } from '../../../data/health_care_Entities';
 
 // CORS headers configuration
 const CORS_HEADERS = {
-  'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
-  'Access-Control-Allow-Headers': 'Content-Type',
+    'Access-Control-Allow-Origin': '*',
+    'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+    'Access-Control-Allow-Headers': 'Content-Type',
 };
 
 // Create a method to send responses with CORS headers
 const corsResponse = (body: any, status = 200) => {
-  return new NextResponse(JSON.stringify(body), {
-    status,
-    headers: { 'Content-Type': 'application/json', ...CORS_HEADERS },
-  });
+    return new NextResponse(JSON.stringify(body), {
+        status,
+        headers: { 'Content-Type': 'application/json', ...CORS_HEADERS },
+    });
 };
 
 // Handle the preflight request for CORS
 export async function OPTIONS(request: NextRequest) {
-  return new NextResponse(null, { headers: CORS_HEADERS });
+    return new NextResponse(null, { headers: CORS_HEADERS });
 }
-
-// Helper function: Apply filtering based on predicates
-const performFiltering = (filterArray: any[], query: any) => {
-    const predicateCollection = Array.isArray(filterArray) ? filterArray[0] : filterArray;
-
-    if (!predicateCollection || !Array.isArray(predicateCollection.predicates) || predicateCollection.predicates.length === 0) {
-        return;
-    }
-
-    const condition = (predicateCollection.condition || 'and').toLowerCase();
-    const ignoreCase = predicateCollection.ignoreCase !== undefined ? !!predicateCollection.ignoreCase : true;
-
-    let combinedPredicate: any = null;
-
-    predicateCollection.predicates.forEach((p: any) => {
-        if (p.isComplex && Array.isArray(p.predicates)) {
-            const nested = buildNestedPredicate(p, ignoreCase);
-            if (nested) {
-                combinedPredicate = combinedPredicate
-                    ? (condition === 'or' ? combinedPredicate.or(nested) : combinedPredicate.and(nested))
-                    : nested;
-            }
-            return;
-        }
-
-        const singlePredicate: any = new Predicate(p.field, p.operator, p.value, true);
-        combinedPredicate = combinedPredicate
-            ? (condition === 'or' ? combinedPredicate.or(singlePredicate) : combinedPredicate.and(singlePredicate))
-            : singlePredicate;
-    });
-
-    if (combinedPredicate) {
-        query.where(combinedPredicate);
-    }
+// Normalize condition string (default to 'and')
+const normalize = (condition?: string) => (condition || 'and').toLowerCase();
+
+// Recursively build predicate tree
+const buildPredicate = (node: any, ignoreCase: boolean): any =>
+    node?.isComplex && node.predicates?.length
+        ? node.predicates
+            .map((p: Predicate) => buildPredicate(p, ignoreCase))
+            .filter(Boolean)
+            .reduce((acc: any, cur: any) =>
+                acc ? (normalize(node.condition) === 'or' ? acc.or(cur) : acc.and(cur)) : cur, null)
+        : (node?.field && node?.operator ? new Predicate(node.field, node.operator, node.value, ignoreCase) : null);
+
+// Apply filtering based on predicates
+const performFiltering = (input: any, query: Query) => {
+    const filter = Array.isArray(input) ? input[0] : input;
+    if (!filter?.predicates?.length) return;
+    const ignoreCase = filter.ignoreCase !== undefined ? !!filter.ignoreCase : true;
+    const condition = normalize(filter.condition);
+    const combined = filter.predicates
+        .map((p: Predicate) => buildPredicate(p, ignoreCase))
+        .filter(Boolean)
+        .reduce((acc: any, cur: any) => acc ? (condition === 'or' ? acc.or(cur) : acc.and(cur)) : cur, null);
+    if (combined) query.where(combined);
 };
 
-// Helper function: Build nested predicates for complex filtering
-function buildNestedPredicate(block: any, ignoreCase: boolean) {
-    const condition = (block.condition || 'and').toLowerCase();
-    let mergedPredicate: any | null = null;
-
-    block.predicates.forEach((p: any) => {
-        let node;
-        if (p.isComplex && Array.isArray(p.predicates)) {
-            node = buildNestedPredicate(p, ignoreCase);
-        } else {
-            node = new Predicate(p.field, p.operator, p.value, ignoreCase);
-        }
-        if (node) {
-            mergedPredicate = mergedPredicate
-                ? (condition === 'or' ? mergedPredicate.or(node) : mergedPredicate.and(node))
-                : node;
-        }
-    });
-
-    return mergedPredicate;
-}
-
 // Helper function: Apply search functionality
 const performSearching = (searchParam: any, query: any) => {
     const { fields, key, operator, ignoreCase } = searchParam[0];
     query.search(key, fields, operator, ignoreCase);
 };
 
 // Helper function: Apply sorting
-const performSorting = (sortArray: any[], query: any) => {
+const performSorting = (sortArray: any[], query: Query) => {
     for (let i = 0; i < sortArray.length; i++) {
         const { name, direction } = sortArray[i];
         query.sortBy(name, direction);
     }
 };
 
-// Helper function: Apply paging
-const performPaging = (data: any[], gridState: any) => {
-    if (!gridState.take || gridState.take <= 0) {
-        return data;
-    }
-    const pageSkip = gridState.skip || 0;
-    const pageSize = gridState.take;
-    return data.slice(pageSkip, pageSkip + pageSize);
-};
-
 // GET - Retrieve all data
 export async function GET(request: NextRequest) {
 
@@ -134,13 +92,16 @@ export async function GET(request: NextRequest) {
         performSorting(gridState.sorted, query);
     }
 
-    // Execute query on data
-    const resultantData = new DataManager(doctorDetails).executeLocal(query);
-    const count: any = resultantData.length;
-    let result: any = resultantData;
-    
     // Paging
-    result = performPaging(result, gridState);
+    if (gridState.take && gridState.take > 0) {
+        const skip = gridState.skip || 0;
+        const take = gridState.take;
+        query.page(skip / take + 1, take);
+    }
+
+    // Execute query on data
+    const result: object[] = new DataManager(doctorDetails).executeLocal(query);
+    const count: number = result.length;
 
     return corsResponse({ result, count });
 }
@@ -183,7 +144,7 @@ export async function DELETE(request: NextRequest) {
         }
         const deletedDoctor = doctorDetails[doctorIndex];
         doctorDetails.splice(doctorIndex, 1);
-       return corsResponse({ message: "Doctor deleted" });
+        return corsResponse({ message: "Doctor deleted" });
     }
 }