Merge pull request #182 from Oloodi/175-web-vendor-role-end-to-end-flow-integration

175 web vendor role end to end flow integration
2025-12-16 09:35:44 -05:00
parent f15b946f4b ea3fe79c8e
commit 7bbc248ce1
6 changed files with 211 additions and 183 deletions
--- a/dataconnect/connector/staff/mutations.gql
+++ b/dataconnect/connector/staff/mutations.gql
@@ -1,6 +1,6 @@
 mutation CreateStaff(
  $employeeName: String!,
-  $vendorId: UUID,
+  $vendorId: String,
  $vendorName: String,
  $manager: String,
  $contactNumber: String,
@@ -10,12 +10,12 @@ mutation CreateStaff(
  $track: String,
  $position: String,
  $profileType: ProfileType,
-  $employmentType: EmploymentType!,
+  $employmentType: EmploymentType,
  $english: EnglishLevel,
  $rate: Float,
  $rating: Float,
  $reliabilityScore: Int,
-  $backgroundCheckStatus: BackgroundCheckStatus!
+  $backgroundCheckStatus: BackgroundCheckStatus,
  $notes: String
 ) @auth(level: USER) {
  staff_insert(
@@ -45,7 +45,7 @@ mutation CreateStaff(
 mutation UpdateStaff(
  $id: UUID!,
  $employeeName: String,
-  $vendorId: UUID,
+  $vendorId: String,
  $vendorName: String,
  $manager: String,
  $contactNumber: String,
@@ -60,7 +60,7 @@ mutation UpdateStaff(
  $rate: Float,
  $rating: Float,
  $reliabilityScore: Int,
-  $backgroundCheckStatus: BackgroundCheckStatus
+  $backgroundCheckStatus: BackgroundCheckStatus,
  $notes: String
 ) @auth(level: USER) {
  staff_update(
--- a/dataconnect/connector/staff/queries.gql
+++ b/dataconnect/connector/staff/queries.gql
@@ -50,7 +50,7 @@ query getStaffById(

 query filterStaff(
  $employeeName: String,
-  $vendorId: UUID,
+  $vendorId: String,
  $department: StaffDepartment,
  $employmentType: EmploymentType,
  $english: EnglishLevel,
--- a/dataconnect/schema/staff.gql
+++ b/dataconnect/schema/staff.gql
@@ -43,7 +43,7 @@ enum BackgroundCheckStatus {
 type Staff @table(name: "staffs") {
  id: UUID! @default(expr: "uuidV4()")
  employeeName: String! @col(name: "employee_name") 
-  vendorId: UUID @col(name: "vendor_id")                 # vendor_id (FK lógica a Vendor.id)
+  vendorId: String @col(name: "vendor_id")                 # vendor_id (FK lógica a Vendor.id)
  vendorName: String @col(name: "vendor_name") 
  manager: String
  contactNumber: String @col(name: "contact_number")
@@ -53,12 +53,12 @@ type Staff @table(name: "staffs") {
  track: String 
  position: String 
  profileType: ProfileType @col(name: "profile_type")
-  employmentType: EmploymentType! @col(name: "employment_type")
+  employmentType: EmploymentType @col(name: "employment_type")
  english: EnglishLevel
  rate: Float
  rating: Float
  reliabilityScore: Int @col(name: "reliability_score")
-  backgroundCheckStatus: BackgroundCheckStatus! @col(name: "background_check_status")
+  backgroundCheckStatus: BackgroundCheckStatus @col(name: "background_check_status")
  notes: String
  createdDate: Timestamp @default(expr: "request.time")
  updatedDate: Timestamp @default(expr: "request.time")
--- a/frontend-web-free/src/api/krowSDK.js
+++ b/frontend-web-free/src/api/krowSDK.js
@@ -358,6 +358,39 @@ const normalizeResultToArray = (res) => {
 // --- Entities Module ( Data Connect, without REST Base44) ---
 const entitiesModule = {};

+// --- Helper to convert snake_case to camelCase recursively ---
+const toCamel = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(toCamel);
+  }
+  if (value && typeof value === "object") {
+    return Object.entries(value).reduce((acc, [key, val]) => {
+      const camelKey = key.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+      acc[camelKey] = toCamel(val);
+      return acc;
+    }, {});
+  }
+  return value;
+};
+
+// --- Helper to convert camelCase to snake_case recursively ---
+const toSnake = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(toSnake);
+  }
+  if (value && typeof value === "object") {
+    return Object.entries(value).reduce((acc, [key, val]) => {
+      const snakeKey = key
+        .replace(/([A-Z])/g, "_$1")
+        .toLowerCase();
+      acc[snakeKey] = toSnake(val);
+      return acc;
+    }, {});
+  }
+  return value;
+};
+
+
 Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
  entitiesModule[entityName] = {
    
@@ -377,102 +410,91 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
            `Data Connect operation "${ops.list}" not found for entity "${entityName}".`
          );
        }
-        
-        //return fn(dataConnect);
-        /*let variables;
-        const maybeVars = params[0];
-      
-        if (maybeVars && typeof maybeVars === 'object' && !Array.isArray(maybeVars)) {
-          variables = maybeVars;
+
+        let sort;
+        let limit;
+        let baseVariables; // por si algún list usa variables (como Team)
+
+        if (args.length === 1) {
+          const [a0] = args;
+          if (typeof a0 === "string") {
+            // list('-created_date')
+            sort = a0;
+          } else if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
+            // list({ ...vars }) -> reservado para queries que acepten variables
+            baseVariables = a0;
+          }
+        } else if (args.length === 2) {
+          const [a0, a1] = args;
+          if (typeof a0 === "string" && typeof a1 === "number") {
+            // list('-created_date', 50)
+            sort = a0;
+            limit = a1;
+          } else if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
+            // list({ ...vars }, '-created_date')
+            baseVariables = a0;
+            if (typeof a1 === "string") sort = a1;
+          }
+        } else if (args.length >= 3) {
+          const [a0, a1, a2] = args;
+          if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
+            // list({ ...vars }, '-created_date', 50)
+            baseVariables = a0;
+            if (typeof a1 === "string") sort = a1;
+            if (typeof a2 === "number") limit = a2;
+          }
+        }
+
+        // COMMENT FIX: variables que realmente se mandan a DataConnect
+        let variables = baseVariables;
+
+        // COMMENT FIX: caso especial para Team, que SÍ tiene orderBy/limit en el query
+        if (entityName === "Team") {
+          variables = variables || {};
+          if (sort) {
+            const desc = sort.startsWith("-");
+            variables.orderByCreatedDate = desc ? "DESC" : "ASC";
+          }
+          if (typeof limit === "number") {
+            variables.limit = limit;
+          }
        }

        const res = await fn(dataConnect, variables);
-        return normalizeResultToArray(res);
-        */
+        let items = normalizeResultToArray(res);

-        let sort;
-    let limit;
-    let baseVariables; // por si algún list usa variables (como Team)
+        // COMMENT FIX: para entidades que NO tienen orderBy/limit en el query,
+        // aplicamos sort/limit en el front como fallback.
+        if (entityName !== "Team" && sort) {
+          const desc = sort.startsWith("-");
+          const field = desc ? sort.slice(1) : sort; // '-created_date' -> 'created_date'

-    if (args.length === 1) {
-      const [a0] = args;
-      if (typeof a0 === "string") {
-        // list('-created_date')
-        sort = a0;
-      } else if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
-        // list({ ...vars }) -> reservado para queries que acepten variables
-        baseVariables = a0;
-      }
-    } else if (args.length === 2) {
-      const [a0, a1] = args;
-      if (typeof a0 === "string" && typeof a1 === "number") {
-        // list('-created_date', 50)
-        sort = a0;
-        limit = a1;
-      } else if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
-        // list({ ...vars }, '-created_date')
-        baseVariables = a0;
-        if (typeof a1 === "string") sort = a1;
-      }
-    } else if (args.length >= 3) {
-      const [a0, a1, a2] = args;
-      if (a0 && typeof a0 === "object" && !Array.isArray(a0)) {
-        // list({ ...vars }, '-created_date', 50)
-        baseVariables = a0;
-        if (typeof a1 === "string") sort = a1;
-        if (typeof a2 === "number") limit = a2;
-      }
-    }
+          items = items.slice().sort((a, b) => {
+            const av = a?.[field];
+            const bv = b?.[field];

-    // COMMENT FIX: variables que realmente se mandan a DataConnect
-    let variables = baseVariables;
+            if (av == null && bv == null) return 0;
+            if (av == null) return 1;
+            if (bv == null) return -1;

-    // COMMENT FIX: caso especial para Team, que SÍ tiene orderBy/limit en el query
-    if (entityName === "Team") {
-      variables = variables || {};
-      if (sort) {
-        const desc = sort.startsWith("-");
-        variables.orderByCreatedDate = desc ? "DESC" : "ASC";
-      }
-      if (typeof limit === "number") {
-        variables.limit = limit;
-      }
-    }
+            const da = new Date(av);
+            const db = new Date(bv);
+            if (!isNaN(da) && !isNaN(db)) {
+              return desc ? db - da : da - db;
+            }

-    const res = await fn(dataConnect, variables);
-    let items = normalizeResultToArray(res);
-
-    // COMMENT FIX: para entidades que NO tienen orderBy/limit en el query,
-    // aplicamos sort/limit en el front como fallback.
-    if (entityName !== "Team" && sort) {
-      const desc = sort.startsWith("-");
-      const field = desc ? sort.slice(1) : sort; // '-created_date' -> 'created_date'
-
-      items = items.slice().sort((a, b) => {
-        const av = a?.[field];
-        const bv = b?.[field];
-
-        if (av == null && bv == null) return 0;
-        if (av == null) return 1;
-        if (bv == null) return -1;
-
-        const da = new Date(av);
-        const db = new Date(bv);
-        if (!isNaN(da) && !isNaN(db)) {
-          return desc ? db - da : da - db;
+            if (av < bv) return desc ? 1 : -1;
+            if (av > bv) return desc ? -1 : 1;
+            return 0;
+          });
        }

-        if (av < bv) return desc ? 1 : -1;
-        if (av > bv) return desc ? -1 : 1;
-        return 0;
-      });
-    }
-
-    if (entityName !== "Team" && typeof limit === "number") {
-      items = items.slice(0, limit);
-    }
-
-    return items;
+      if (entityName !== "Team" && typeof limit === "number") {
+        items = items.slice(0, limit);
+      }
+      //console.log(items)
+      //return items;
+      return items.map(toSnake);
      },
    }),

@@ -486,14 +508,6 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
          );
        }

-        /*const { data } = params ?? {};
-        if (!data) {
-          throw new Error(
-            `${entityName}.create expects a payload like { data: { ...fields } }`
-          );
-        }
-
-        return fn(dataConnect, data);*/
        if (!params || typeof params !== 'object') {
          throw new Error(
            `${entityName}.create expects an object with the fields to insert`
@@ -510,6 +524,9 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
          payload = params;
        }

+        //converting to camelCase for data connect
+        payload = toCamel(payload);
+
        return fn(dataConnect, payload);
      },
    }),
@@ -528,13 +545,16 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
          throw new Error(`${entityName}.get expects an object of variables (e.g. { id })`);
        }

-        return fn(dataConnect, params);
+        //return fn(dataConnect, params);
+        const result = await fn(dataConnect, params);
+        return toSnake(result);
+
      },
    }),
    
    //update
    ...(ops.update && {
-      update: async (params) => {
+      update: async (id,params) => {
        const fn = dcSdk[ops.update];
        if (typeof fn !== 'function') {
          throw new Error(
@@ -548,7 +568,8 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
          );
        }

-        const { id, data } = params;
+        //const { id, data } = params;
+        let data = params;

        if (!id) {
          throw new Error(`${entityName}.update requires an "id" field`);
@@ -560,6 +581,9 @@ Object.entries(dataconnectEntityConfig).forEach(([entityName, ops]) => {
          );
        }
        
+        if (data && typeof data === "object") {
+          data = toCamel(data);
+        }
        const vars = { id, ...data };

        return fn(dataConnect, vars);
--- a/frontend-web-free/src/components/staff/StaffForm.jsx
+++ b/frontend-web-free/src/components/staff/StaffForm.jsx
@@ -14,35 +14,35 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
    employee_name: "",
    manager: "",
    contact_number: "",
-    phone: "",
+    //phone: "",
    email: "", // Added email field
    department: "",
    hub_location: "",
-    event_location: "",
+    //event_location: "",
    track: "",
-    address: "",
-    city: "",
+    //address: "",
+    //city: "",
    position: "",
-    position_2: "",
-    initial: "",
+    //position_2: "",
+    //initial: "",
    profile_type: "",
    employment_type: "",
    english: "",
-    english_required: false,
-    check_in: "",
-    replaced_by: "",
-    ro: "",
-    mon: "",
-    schedule_days: "",
-    invoiced: false,
-    action: "",
+    //english_required: false,
+    //check_in: "",
+    //replaced_by: "",
+    //ro: "",
+    //mon: "",
+    //schedule_days: "",
+    //invoiced: false,
+    //action: "",
    notes: "",
-    accounting_comments: "",
+    //accounting_comments: "",
    rating: 0,
-    shift_coverage_percentage: 100,
-    cancellation_count: 0,
-    no_show_count: 0, // Added no_show_count field
-    total_shifts: 0,
+    //shift_coverage_percentage: 100,
+    //cancellation_count: 0,
+    //no_show_count: 0, // Added no_show_count field
+    //total_shifts: 0,
    reliability_score: 100
  });

@@ -81,7 +81,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>
              
-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="initial" className="text-slate-700 font-medium">Initials</Label>
                <Input
                  id="initial"
@@ -90,7 +90,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  maxLength={3}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              <div className="space-y-2">
                <Label htmlFor="position" className="text-slate-700 font-medium">Primary Skill</Label>
@@ -103,7 +103,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="position_2" className="text-slate-700 font-medium">Secondary Skill</Label>
                <Input
                  id="position_2"
@@ -112,7 +112,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  placeholder="e.g., Dishwasher, Prep Cook"
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              <div className="space-y-2">
                <Label htmlFor="profile_type" className="text-slate-700 font-medium">Skill Level</Label>
@@ -121,9 +121,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    <SelectValue placeholder="Select skill level" />
                  </SelectTrigger>
                  <SelectContent>
-                    <SelectItem value="Skilled">Skilled</SelectItem>
-                    <SelectItem value="Beginner">Beginner</SelectItem>
-                    <SelectItem value="Cross-Trained">Cross-Trained</SelectItem>
+                    <SelectItem value="SKILLED">Skilled</SelectItem>
+                    <SelectItem value="BEGINNER">Beginner</SelectItem>
+                    <SelectItem value="CROSS_TRAINED">Cross-Trained</SelectItem>
                  </SelectContent>
                </Select>
              </div>
@@ -135,13 +135,13 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    <SelectValue placeholder="Select type" />
                  </SelectTrigger>
                  <SelectContent>
-                    <SelectItem value="Full Time">Full Time</SelectItem>
-                    <SelectItem value="Part Time">Part Time</SelectItem>
-                    <SelectItem value="On call">On call</SelectItem>
-                    <SelectItem value="Weekends">Weekends</SelectItem>
-                    <SelectItem value="Specific Days">Specific Days</SelectItem>
-                    <SelectItem value="Seasonal">Seasonal</SelectItem>
-                    <SelectItem value="Medical Leave">Medical Leave</SelectItem>
+                    <SelectItem value="FULL_TIME">Full Time</SelectItem>
+                    <SelectItem value="PART_TIME">Part Time</SelectItem>
+                    <SelectItem value="ON_CALL">On call</SelectItem>
+                    <SelectItem value="WEEKENDS">Weekends</SelectItem>
+                    <SelectItem value="SPECIFIC_DAYS">Specific Days</SelectItem>
+                    <SelectItem value="SEASONAL">Seasonal</SelectItem>
+                    <SelectItem value="MEDICAL_LEAVE">Medical Leave</SelectItem>
                  </SelectContent>
                </Select>
              </div>
@@ -187,7 +187,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="phone" className="text-slate-700 font-medium">Additional Phone</Label>
                <Input
                  id="phone"
@@ -196,7 +196,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('phone', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}
            </div>
          </CardContent>
        </Card>
@@ -234,7 +234,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="shift_coverage_percentage" className="text-slate-700 font-medium">Shift Coverage %</Label>
                <Input
                  id="shift_coverage_percentage"
@@ -245,9 +245,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('shift_coverage_percentage', parseInt(e.target.value) || 0)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="cancellation_count" className="text-slate-700 font-medium">Cancellation Count</Label>
                <Input
                  id="cancellation_count"
@@ -257,10 +257,10 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('cancellation_count', parseInt(e.target.value) || 0)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              {/* New No Show Count field */}
-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="no_show_count" className="text-slate-700 font-medium">No Show Count</Label>
                <Input
                  id="no_show_count"
@@ -270,10 +270,10 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('no_show_count', parseInt(e.target.value) || 0)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}
              {/* End new No Show Count field */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="total_shifts" className="text-slate-700 font-medium">Total Shifts</Label>
                <Input
                  id="total_shifts"
@@ -283,9 +283,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('total_shifts', parseInt(e.target.value) || 0)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2 flex items-end">
+              {/* <div className="space-y-2 flex items-end">
                <div className="flex items-center space-x-2">
                  <Checkbox
                    id="invoiced"
@@ -296,7 +296,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    Invoiced
                  </Label>
                </div>
-              </div>
+              </div> */}
            </div>
          </CardContent>
        </Card>
@@ -314,19 +314,19 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    <SelectValue placeholder="Select department" />
                  </SelectTrigger>
                  <SelectContent>
-                    <SelectItem value="Operations">Operations</SelectItem>
-                    <SelectItem value="Sales">Sales</SelectItem>
+                    <SelectItem value="OPERATIONS">Operations</SelectItem>
+                    <SelectItem value="SALES">Sales</SelectItem>
                    <SelectItem value="HR">HR</SelectItem>
-                    <SelectItem value="Finance">Finance</SelectItem>
+                    <SelectItem value="FINANCE">Finance</SelectItem>
                    <SelectItem value="IT">IT</SelectItem>
-                    <SelectItem value="Marketing">Marketing</SelectItem>
-                    <SelectItem value="Customer Service">Customer Service</SelectItem>
-                    <SelectItem value="Logistics">Logistics</SelectItem>
+                    <SelectItem value="MARKETING">Marketing</SelectItem>
+                    <SelectItem value="CUSTOMER_SERVICE">Customer Service</SelectItem>
+                    <SelectItem value="LOGISTICS">Logistics</SelectItem>
                  </SelectContent>
                </Select>
              </div>

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="city" className="text-slate-700 font-medium">City</Label>
                <Input
                  id="city"
@@ -335,7 +335,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  placeholder="e.g., San Francisco"
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              <div className="space-y-2">
                <Label htmlFor="hub_location" className="text-slate-700 font-medium">Hub Location</Label>
@@ -347,7 +347,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="event_location" className="text-slate-700 font-medium">Event Location</Label>
                <Input
                  id="event_location"
@@ -355,7 +355,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('event_location', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              <div className="space-y-2">
                <Label htmlFor="track" className="text-slate-700 font-medium">Track</Label>
@@ -367,7 +367,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2 md:col-span-2">
+              {/* <div className="space-y-2 md:col-span-2">
                <Label htmlFor="address" className="text-slate-700 font-medium">Address</Label>
                <Textarea
                  id="address"
@@ -376,7 +376,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  rows={2}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}
            </div>
          </CardContent>
        </Card>
@@ -394,15 +394,15 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    <SelectValue placeholder="Select level" />
                  </SelectTrigger>
                  <SelectContent>
-                    <SelectItem value="Fluent">Fluent</SelectItem>
-                    <SelectItem value="Intermediate">Intermediate</SelectItem>
-                    <SelectItem value="Basic">Basic</SelectItem>
-                    <SelectItem value="None">None</SelectItem>
+                    <SelectItem value="FLUENT">Fluent</SelectItem>
+                    <SelectItem value="INTERMEDIATE">Intermediate</SelectItem>
+                    <SelectItem value="BASIC">Basic</SelectItem>
+                    <SelectItem value="NONE">None</SelectItem>
                  </SelectContent>
                </Select>
              </div>

-              <div className="space-y-2 flex items-end">
+              {/* <div className="space-y-2 flex items-end">
                <div className="flex items-center space-x-2">
                  <Checkbox
                    id="english_required"
@@ -413,9 +413,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                    English Required
                  </Label>
                </div>
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="check_in" className="text-slate-700 font-medium">Last Check-in</Label>
                <Input
                  id="check_in"
@@ -424,9 +424,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('check_in', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="schedule_days" className="text-slate-700 font-medium">Schedule Days</Label>
                <Input
                  id="schedule_days"
@@ -435,7 +435,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  placeholder="e.g., Mon-Fri, 9AM-5PM"
                  className="border-slate-200"
                />
-              </div>
+              </div> */}
            </div>
          </CardContent>
        </Card>
@@ -446,7 +446,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
          </CardHeader>
          <CardContent className="p-6">
            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="replaced_by" className="text-slate-700 font-medium">Replaced By</Label>
                <Input
                  id="replaced_by"
@@ -454,9 +454,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('replaced_by', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="action" className="text-slate-700 font-medium">Action</Label>
                <Input
                  id="action"
@@ -464,9 +464,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('action', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="ro" className="text-slate-700 font-medium">R.O</Label>
                <Input
                  id="ro"
@@ -474,9 +474,9 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('ro', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

-              <div className="space-y-2">
+              {/* <div className="space-y-2">
                <Label htmlFor="mon" className="text-slate-700 font-medium">MON</Label>
                <Input
                  id="mon"
@@ -484,7 +484,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  onChange={(e) => handleChange('mon', e.target.value)}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}

              <div className="space-y-2 md:col-span-2">
                <Label htmlFor="notes" className="text-slate-700 font-medium">Notes</Label>
@@ -497,7 +497,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                />
              </div>

-              <div className="space-y-2 md:col-span-2">
+              {/* <div className="space-y-2 md:col-span-2">
                <Label htmlFor="accounting_comments" className="text-slate-700 font-medium">Accounting Comments</Label>
                <Textarea
                  id="accounting_comments"
@@ -506,7 +506,7 @@ export default function StaffForm({ staff, onSubmit, isSubmitting }) {
                  rows={3}
                  className="border-slate-200"
                />
-              </div>
+              </div> */}
            </div>
          </CardContent>
        </Card>
--- a/frontend-web-free/src/pages/EditStaff.jsx
+++ b/frontend-web-free/src/pages/EditStaff.jsx
@@ -27,6 +27,10 @@ export default function EditStaff() {
      queryClient.invalidateQueries({ queryKey: ['staff'] });
      navigate(createPageUrl("Dashboard"));
    },
+  onError: (error, variables) => {
+    console.log("data: ",variables);
+    console.error("Update failed", error);
+  },
  });

  const handleSubmit = (staffData) => {