Skip to content

Commit bd65bd9

Browse files
committed
changes
1 parent 58b1740 commit bd65bd9

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/frontend/src/pages/CalendarPage/Components/CalendarCreateTaskModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ interface CalendarCreateTaskModalProps {
4444

4545
const CalendarCreateTaskModal: React.FC<CalendarCreateTaskModalProps> = ({ open, onClose, defaultDeadline }) => {
4646
const toast = useToast();
47-
const { mutateAsync: createTask } = useCreateTask();
47+
const { mutateAsync: createTask, isLoading } = useCreateTask();
4848
const { data: users, isLoading: usersLoading, isError: usersError, error: usersErr } = useAllMembers();
4949
const { data: projects, isLoading: projectsLoading, isError: projectsError, error: projectsErr } = useAllProjects();
5050

@@ -111,6 +111,7 @@ const CalendarCreateTaskModal: React.FC<CalendarCreateTaskModalProps> = ({ open,
111111
onFormSubmit={onSubmit}
112112
submitText="Create"
113113
showCloseButton
114+
disabled={isLoading}
114115
>
115116
<Grid container spacing={2} sx={{ minWidth: 450 }}>
116117
<Grid item xs={12}>

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/TaskFormModal.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ interface TaskFormModalProps {
2828
onHide: () => void;
2929
onSubmit: (data: EditTaskFormInput) => Promise<void>;
3030
onReset?: () => void;
31+
isLoading?: boolean;
3132
}
3233

33-
const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, status, onSubmit, modalShow, onHide, onReset }) => {
34+
const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, status, onSubmit, modalShow, onHide, onReset, isLoading }) => {
3435
let schema;
3536

3637
if (status === TaskStatus.IN_PROGRESS) {
@@ -71,7 +72,7 @@ const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, status, onSubmit, m
7172

7273
const user = useCurrentUser();
7374

74-
const { data: users, isLoading, isError, error } = useAllMembers();
75+
const { data: users, isLoading: usersLoading, isError, error } = useAllMembers();
7576

7677
const {
7778
handleSubmit,
@@ -92,7 +93,7 @@ const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, status, onSubmit, m
9293
});
9394

9495
if (isError) return <ErrorPage error={error} />;
95-
if (isLoading || !users) return <LoadingIndicator />;
96+
if (usersLoading || !users) return <LoadingIndicator />;
9697

9798
const options: { label: string; id: string }[] = users.map(taskUserToAutocompleteOption);
9899

@@ -111,6 +112,7 @@ const TaskFormModal: React.FC<TaskFormModalProps> = ({ task, status, onSubmit, m
111112
handleUseFormSubmit={handleSubmit}
112113
onFormSubmit={onSubmit}
113114
submitText="Save"
115+
disabled={isLoading}
114116
>
115117
<form
116118
onSubmit={(e) => {

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskColumn.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const TaskColumn = ({
3030
onAddTask: (task: Task) => void;
3131
onHeightChange: (status: TaskStatus, height: number) => void;
3232
}) => {
33-
const { mutateAsync: createTask } = useCreateTask();
33+
const { mutateAsync: createTask, isLoading } = useCreateTask();
3434
const [showCreateTaskModal, setShowCreateTaskModal] = useState(false);
3535
const toast = useToast();
3636
const theme = useTheme();
@@ -76,6 +76,7 @@ export const TaskColumn = ({
7676
onHide={() => setShowCreateTaskModal(false)}
7777
modalShow={showCreateTaskModal}
7878
teams={project.teams}
79+
isLoading={isLoading}
7980
/>
8081
<Box
8182
sx={{

0 commit comments

Comments
 (0)