Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Badge/AssignTableRow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ function AssignTableRow(props) {
setSelect(prev => (prev !== next ? next : prev));
}, [effectiveSelected, props.badge?._id]);


const badgeId = props.badge?._id;
const domId = `assign-badge-${badgeId}`;

Expand All @@ -41,7 +40,8 @@ function AssignTableRow(props) {
}, []);

const isSelected = selectedBadges.includes(badgeId);
console.log(selectedBadges,"sele",badgeId,props)
// eslint-disable-next-line no-console
console.log(selectedBadges, 'sele', badgeId, props);

const handleCheckBoxChange = e => {
if (e.target.checked) {
Expand Down
14 changes: 5 additions & 9 deletions src/components/Badge/__tests__/AssignBadge.test.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { render, screen, fireEvent, waitFor } from '@testing-library/react';
import thunk from 'redux-thunk';
import configureStore from 'redux-mock-store';
import { configureStore } from 'redux-mock-store';
import { Provider } from 'react-redux';
import { vi } from 'vitest';

Expand Down Expand Up @@ -107,10 +107,8 @@ describe('AssignBadge component', () => {
const input = screen.getByPlaceholderText('Full Name');
fireEvent.change(input, { target: { value: 'Jerry' } });

await waitFor(() => {
const userRows = screen.getAllByRole('row').slice(1); // Exclude header row
fireEvent.click(userRows[0]);
});
const userRows = (await screen.findAllByRole('row')).slice(1); // Exclude header row
fireEvent.click(userRows[0]);

const alertText = screen.getByRole('alert').textContent;
expect(alertText).toContain('1 user(s) selected');
Expand All @@ -126,10 +124,8 @@ describe('AssignBadge component', () => {
const input = screen.getByPlaceholderText('Full Name');
fireEvent.change(input, { target: { value: 'Jerry' } });

await waitFor(() => {
const userRows = screen.getAllByRole('row').slice(1); // Exclude header row
fireEvent.click(userRows[0]);
});
const userRows = (await screen.findAllByRole('row')).slice(1); // Exclude header row
fireEvent.click(userRows[0]);

expect(screen.getByText('Assign Badge')).toBeEnabled();
});
Expand Down
5 changes: 2 additions & 3 deletions src/components/Projects/WBS/SingleTask/SingleTask.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function SingleTask(props) {
<tbody className={darkMode ? 'bg-yinmn-blue' : ''}>
<tr>
<th scope="row">
<div className="d-flex flex-column">
<div className="d-flex flex-column align-items-start">
<EditTaskModal
key={`editTask_${task._id}`}
parentNum={task.num}
Expand All @@ -169,9 +169,8 @@ function SingleTask(props) {
<Button
type="button"
size="sm"
className="btn btn-danger"
className="btn btn-danger mt-1 ml-2"
onClick={() => showUpDeleteModal()}
style={darkMode ? boxStyleDark : boxStyle}
>
Delete
</Button>
Expand Down
Loading