Code cleanup
This commit is contained in:
@@ -30,27 +30,27 @@ const useSendMessageWizard = () => {
|
||||
case 'message':
|
||||
return state.message.trim().length > 0;
|
||||
case 'schedule':
|
||||
// TODO: Handle this
|
||||
// return state.scheduledTime != null;
|
||||
console.log('Checking to see if schedule can go to the next step');
|
||||
console.log(state.scheduledTime);
|
||||
console.log(state.message);
|
||||
// const result = state.scheduledTime instanceof Date && isNaN(state.scheduledTime.getTime());
|
||||
if (state.scheduledTime == null) {
|
||||
return false;
|
||||
}
|
||||
console.log('Scheduled time is not null');
|
||||
// const result = isNaN(state.scheduledTime.getTime());
|
||||
const result = state.scheduledTime instanceof Date && isNaN(state.scheduledTime.getTime());
|
||||
console.log(result);
|
||||
console.log(state.scheduledTime);
|
||||
const result =
|
||||
state.scheduledTime instanceof Date &&
|
||||
isNaN(state.scheduledTime.getTime());
|
||||
|
||||
return !result;
|
||||
case 'confirm':
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}, [state.step, state.selectedContacts.length, state.message, state.scheduledTime]);
|
||||
}, [
|
||||
state.step,
|
||||
state.selectedContacts.length,
|
||||
state.message,
|
||||
state.scheduledTime,
|
||||
]);
|
||||
|
||||
const canGoBack = state.step !== 'select';
|
||||
|
||||
@@ -89,17 +89,6 @@ const useSendMessageWizard = () => {
|
||||
const nextStep = () => {
|
||||
if (!canProceedToNextStep()) return;
|
||||
|
||||
console.log('Going to next step');
|
||||
console.log(state.isScheduled);
|
||||
|
||||
if (state.isScheduled) {
|
||||
console.log('Scheduled Checked');
|
||||
}
|
||||
|
||||
console.log(`Step: ${state.step}`);
|
||||
|
||||
// TODO: Handle navigation for schedule form
|
||||
|
||||
const stepOrder = ['select', 'message', 'schedule', 'confirm', 'result'];
|
||||
const currentIndex = stepOrder.indexOf(state.step);
|
||||
if (currentIndex < stepOrder.length - 1) {
|
||||
@@ -128,10 +117,8 @@ const useSendMessageWizard = () => {
|
||||
};
|
||||
|
||||
const prevStep = () => {
|
||||
// TODO: Handle navigation for schedule form
|
||||
const stepOrder = ['select', 'message', 'schedule', 'confirm', 'result'];
|
||||
const currentIndex = stepOrder.indexOf(state.step);
|
||||
console.log(`Stepping back: ${state.step} isSheduled: ${state.isScheduled}`);
|
||||
|
||||
if (currentIndex > 0) {
|
||||
if (state.step === 'confirm') {
|
||||
@@ -172,19 +159,18 @@ const useSendMessageWizard = () => {
|
||||
try {
|
||||
if (state.scheduledTime != null) {
|
||||
console.log('Going to schedule message');
|
||||
// TODO: Put code here to schedule message
|
||||
|
||||
const schMsgReq = {
|
||||
scheduled: state.scheduledTime.toISOString(),
|
||||
status: 'PENDING',
|
||||
user_id: tokenService.getUserId()
|
||||
user_id: tokenService.getUserId(),
|
||||
};
|
||||
|
||||
console.log(schMsgReq);
|
||||
|
||||
const token = tokenService.bearerToken();
|
||||
|
||||
const schMsgResponse = await scheduleApi.scheduleMessage(schMsgReq, token);
|
||||
console.log(schMsgResponse);
|
||||
const schMsgResponse = await scheduleApi.scheduleMessage(
|
||||
schMsgReq,
|
||||
token
|
||||
);
|
||||
|
||||
if (schMsgResponse) {
|
||||
console.log('Message scheduled');
|
||||
@@ -193,18 +179,18 @@ const useSendMessageWizard = () => {
|
||||
for (let contact of state.selectedContacts) {
|
||||
let schMsgEvtReq = {
|
||||
contact_id: contact,
|
||||
message_id:state.createdMessage.id,
|
||||
message_id: state.createdMessage.id,
|
||||
scheduled_message_id: scheduledMessageId,
|
||||
};
|
||||
console.log(schMsgEvtReq);
|
||||
const schMsgEvtResponse = await scheduleEventApi.scheduleMessageEvent(schMsgEvtReq, token);
|
||||
console.log(schMsgEvtResponse);
|
||||
|
||||
const schMsgEvtResponse =
|
||||
await scheduleEventApi.scheduleMessageEvent(schMsgEvtReq, token);
|
||||
}
|
||||
|
||||
console.log('Updating message status');
|
||||
const req = {
|
||||
scheduled_message_id: scheduledMessageId,
|
||||
status: 'READY'
|
||||
status: 'READY',
|
||||
};
|
||||
console.log(req);
|
||||
const response = await scheduleApi.prepareMessage(req, token);
|
||||
@@ -254,7 +240,7 @@ const useSendMessageWizard = () => {
|
||||
submissionError: error.message || 'Failed to send messages',
|
||||
isSubmitting: false,
|
||||
isScheduled: false,
|
||||
scheduledTime: null,
|
||||
scheduledTime: null,
|
||||
}));
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user