resolve conflicts

khangpham2712 · Dec 10, 2023 · b0905f6 · b0905f6
2 parents 1798893 + 5aa53d4
commit b0905f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/front-end/src/page/AssetDetail/AssetDetail.test.tsx b/front-end/src/page/AssetDetail/AssetDetail.test.tsx
@@ -33,7 +33,7 @@ describe("Asset-detail-test", () => {
 
     // 2. User click view button of first asset
     render(
-      <AssetList employeeId={employeeId} />
+      <AssetList employeeId={employeeId}/>
     );
 
     const viewbtn = await screen.findAllByTestId("view-asset-detail");

diff --git a/front-end/src/page/ViewAsset/AssetList.tsx b/front-end/src/page/ViewAsset/AssetList.tsx
@@ -125,7 +125,7 @@ const AssetList: React.FC<{ employeeId: number}> = ({ employeeId }) => {
           name: item.name,
           category: item.type,
           status: item.status,
-          employeeId: employeeId,
+          employeeId: item.user_id,
           createdDay: createdDay,
           updatedDay: updatedDay,
           actions: (

diff --git a/front-end/src/page/ViewAsset/ViewAsset.tsx b/front-end/src/page/ViewAsset/ViewAsset.tsx
@@ -19,7 +19,7 @@ type EmployeeDataType = {
 
 const ViewAsset = () => {
   const role = localStorage.getItem("role");
-  const intialEmployeeId = localStorage.getItem("MYAPP_EMPLOYEEID");
+  const intialEmployeeId = localStorage.getItem("id");
 
   const [employees, setEmployees] = useState<EmployeeDataType[]>([]);
   const [employeeOption, setEmployeeOption] = useState<{ label: string; value: string, id: number }[]>([]);