Skip to content

Commit f478695

Browse files
committed
queuetable updated
Signed-off-by: Shrutim1505 <[email protected]>
1 parent a1ea74d commit f478695

File tree

1 file changed

+1
-44
lines changed

1 file changed

+1
-44
lines changed

frontend/src/components/queues/QueueTable/QueueTable.jsx

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
<<<<<<< HEAD
21
import React, { useState, useEffect } from "react";
3-
=======
4-
import React, { useState } from "react";
5-
>>>>>>> 4f6b653 (feat: frontend create functionality)
62
import {
73
TableContainer,
84
Table,
95
TableBody,
106
Paper,
11-
<<<<<<< HEAD
127
TableRow,
138
TableCell,
14-
=======
15-
>>>>>>> 4f6b653 (feat: frontend create functionality)
169
useTheme,
1710
alpha,
1811
} from "@mui/material";
@@ -32,7 +25,6 @@ const QueueTable = ({
3225
uniqueStates,
3326
handleFilterClose,
3427
setAnchorEl,
35-
<<<<<<< HEAD
3628
onQueueUpdate,
3729
}) => {
3830
const theme = useTheme();
@@ -47,14 +39,6 @@ const QueueTable = ({
4739
const [queueToDelete, setQueueToDelete] = useState(null);
4840
const [deleteError, setDeleteError] = useState(null);
4941
const [isDeleting, setIsDeleting] = useState(false);
50-
=======
51-
handleDelete,
52-
}) => {
53-
const theme = useTheme();
54-
const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
55-
const [queueToDelete, setQueueToDelete] = useState(null);
56-
57-
>>>>>>> 4f6b653 (feat: frontend create functionality)
5842
const handleOpenDeleteDialog = (queueName) => {
5943
setQueueToDelete(queueName);
6044
setOpenDeleteDialog(true);
@@ -63,7 +47,6 @@ const QueueTable = ({
6347
const handleCloseDeleteDialog = () => {
6448
setOpenDeleteDialog(false);
6549
setQueueToDelete(null);
66-
<<<<<<< HEAD
6750
setDeleteError(null);
6851
setIsDeleting(false);
6952
};
@@ -135,15 +118,6 @@ const QueueTable = ({
135118
} finally {
136119
setIsDeleting(false);
137120
}
138-
=======
139-
};
140-
141-
const confirmDelete = () => {
142-
if (handleDelete && queueToDelete) {
143-
handleDelete(queueToDelete);
144-
}
145-
handleCloseDeleteDialog();
146-
>>>>>>> 4f6b653 (feat: frontend create functionality)
147121
};
148122

149123
return (
@@ -194,7 +168,6 @@ const QueueTable = ({
194168
setAnchorEl={setAnchorEl}
195169
/>
196170
<TableBody>
197-
<<<<<<< HEAD
198171
{queues.length === 0 ? (
199172
<TableRow>
200173
<TableCell
@@ -218,35 +191,19 @@ const QueueTable = ({
218191
/>
219192
))
220193
)}
221-
=======
222-
{sortedQueues.map((queue) => (
223-
<QueueTableRow
224-
key={queue.metadata.name}
225-
queue={queue}
226-
allocatedFields={allocatedFields}
227-
handleQueueClick={handleQueueClick}
228-
handleOpenDeleteDialog={handleOpenDeleteDialog}
229-
/>
230-
))}
231-
>>>>>>> 4f6b653 (feat: frontend create functionality)
232194
</TableBody>
233195
</Table>
234196
</TableContainer>
235197
<QueueTableDeleteDialog
236198
open={openDeleteDialog}
237199
onClose={handleCloseDeleteDialog}
238-
<<<<<<< HEAD
239200
onConfirm={handleDelete}
240201
queueToDelete={queueToDelete}
241202
error={deleteError}
242203
isDeleting={isDeleting}
243-
=======
244-
onConfirm={confirmDelete}
245-
queueToDelete={queueToDelete}
246-
>>>>>>> 4f6b653 (feat: frontend create functionality)
247204
/>
248205
</React.Fragment>
249206
);
250207
};
251208

252-
export default QueueTable;
209+
export default QueueTable;

0 commit comments

Comments
 (0)