diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js index 0602530b857ee12ba4536949c7011fe032dc4fa6..1fe0d827bf3b34fe76a26bdcacfae96f2c0b324e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js @@ -230,9 +230,7 @@ export function ProjectList(props) { */ const getSUDialogContent = () => { let changedData = []; - console.log( "getSUDialogContent",selectedRows) for (const row of selectedRows) { - console.log("Row is",row) let changedRow = {} changedRow.project_state_value = changedStatus; @@ -257,7 +255,6 @@ export function ProjectList(props) { * @returns Content to be displayed in dialog after updating the staus in backend */ const getSUResponseDialogContent = () => { - console.log ("getSUResponseDialogContent",statusChangeResponse) return ( <div style={{ marginTop: '1em' }}> <b></b> @@ -273,7 +270,7 @@ export function ProjectList(props) { } const onRowSelection = (userSelectedRows) => { - setSelectedRows(userSelectedRows); + setSelectedRows(userSelectedRows); } /** @@ -295,7 +292,6 @@ export function ProjectList(props) { * Show confirmation dialog to update status change */ const confirmStatusChange = () => { - console.log("confirmStatusChange") let newdialog = {}; newdialog.type = "confirmation"; newdialog.header = `Confirm Project(s) Status Change`; @@ -307,7 +303,6 @@ export function ProjectList(props) { }, { id: 'no', title: 'No', callback: () => { - console.log("Calling Close from confirmStatusChange") setChangedStatus(null) closeDialog() } @@ -331,11 +326,10 @@ export function ProjectList(props) { * Updating status in backend on confirmation and displaying response of the updation */ const submitStatusChange = async () => { - console.log("submitStatusChange",selectedRows) let newStatusChangeResponse = [] for (const row of selectedRows) { - row.project_state = changedStatus.url - row.project_state_value = changedStatus; + row.project_state = row.project_state.replace(row.project_state_value, changedStatus) // this is the write field + row.project_state_value = changedStatus; // for consistency, will be ignored at the server let response = await ProjectService.updateProject(row.name, row) if (response.isUpdated) { newStatusChangeResponse.push({ @@ -353,7 +347,6 @@ export function ProjectList(props) { appGrowl.show({ severity: 'error', summary: 'Failed to update project status' }); } } - console.log("newStatusChangeResponse", newStatusChangeResponse) setStatusChangeResponse(newStatusChangeResponse) @@ -362,7 +355,6 @@ export function ProjectList(props) { useEffect(()=>{ if (statusChangeResponse==null) return let newdialog = {...dialog} - console.log(newdialog) newdialog.type = "confirmation"; newdialog.header = `Project(s) Status Update Info`; newdialog.content = getSUResponseDialogContent; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/projectStatusDialog.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/projectStatusDialog.js index 3109f22be12955d8b70a3ec4473928b33d5609ea..738ef469c57bec452241bc668ff63c8b44b77b49 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/projectStatusDialog.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/projectStatusDialog.js @@ -19,11 +19,10 @@ export default function ProjectStatusDialog(props) { const Save = () => { if (!onSave) return; onSave(projectStatus); - } const footer = ( - <div > + <div> <Button label="Save" className="p-button-primary p-mr-2" icon="pi pi-check" disabled={projectStatus==''} onClick={Save} data-testid="save-btn" /> <Button label="Cancel" className="act-btn-cancel mr-0" icon="pi pi-times" onClick={onCancel} /> </div> diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/advancecopy.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/advancecopy.js index 63d04adcaf00b6a3dd841a04c409250219cf431f..ab0f006237709df3c81f6191749f30ad03902a5d 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/advancecopy.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Business/actions/advancecopy.js @@ -5,7 +5,6 @@ import { appGrowl } from "../../../../layout/components/AppGrowl"; import ScheduleService from "../../../../services/schedule.service"; import { getStatusContent } from "../contents"; import { Button } from "primereact/button"; -import { useState } from "react"; import _ from 'lodash';