refactor: esitmate alert.

This commit is contained in:
elforjani3
2021-01-27 13:04:32 +02:00
parent 8b7e9d7431
commit 62fcbf7c02
11 changed files with 386 additions and 158 deletions

View File

@@ -0,0 +1,78 @@
import React, { useCallback, useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import { compose } from 'utils';
/**
* Estimate Approve alert.
*/
function EstimateApproveAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { estimateId },
// #withEstimateActions
requestApproveEstimate,
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
// handle cancel approve alert.
const handleCancelApproveEstimate = () => {
closeAlert(name);
};
// Handle confirm estimate approve.
const handleConfirmEstimateApprove = useCallback(() => {
setLoading(true);
requestApproveEstimate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_approved_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {})
.finally(() => {
setLoading(false);
closeAlert(name);
});
}, [estimateId, requestApproveEstimate, formatMessage]);
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'approve'} />}
icon="trash"
intent={Intent.WARNING}
isOpen={isOpen}
loading={isLoading}
onCancel={handleCancelApproveEstimate}
onConfirm={handleConfirmEstimateApprove}
>
<p>
<T id={'are_sure_to_approve_this_estimate'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withEstimateActions,
)(EstimateApproveAlert);

View File

@@ -0,0 +1,85 @@
import React, { useCallback, useState } from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import { compose } from 'utils';
/**
* Estimate delete alert.
*/
function EstimateDeleteAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { estimateId },
// #withEstimateActions
requestDeleteEstimate,
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
// handle cancel delete alert.
const handleCancelEstimateDelete = () => {
closeAlert(name);
};
// handle confirm delete estimate
const handleConfirmEstimateDelete = useCallback(() => {
setLoading(true);
requestDeleteEstimate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_deleted_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch(({ errors }) => {})
.finally(() => {
setLoading(false);
closeAlert(name);
});
}, [requestDeleteEstimate, formatMessage, estimateId]);
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}
loading={isLoading}
onCancel={handleCancelEstimateDelete}
onConfirm={handleConfirmEstimateDelete}
>
<p>
<FormattedHTMLMessage
id={'once_delete_this_estimate_you_will_able_to_restore_it'}
/>
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withEstimateActions,
)(EstimateDeleteAlert);

View File

@@ -0,0 +1,78 @@
import React, { useCallback, useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import { compose } from 'utils';
/**
* Estimate delivered alert.
*/
function EstimateDeliveredAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { estimateId },
// #withEstimateActions
requestDeliveredEstimate,
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
// Handle cancel delivered estimate alert.
const handleCancelDeliveredEstimate = () => {
closeAlert(name);
};
// Handle confirm estimate delivered.
const handleConfirmEstimateDelivered = useCallback(() => {
setLoading(true);
requestDeliveredEstimate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_delivered_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {})
.finally(() => {
closeAlert(name);
setLoading(false);
});
}, [estimateId, requestDeliveredEstimate, formatMessage]);
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'deliver'} />}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleCancelDeliveredEstimate}
onConfirm={handleConfirmEstimateDelivered}
loading={isLoading}
>
<p>
<T id={'are_sure_to_deliver_this_estimate'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withEstimateActions,
)(EstimateDeliveredAlert);

View File

@@ -0,0 +1,77 @@
import React, { useCallback, useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import { compose } from 'utils';
/**
* Estimate reject delete alerts.
*/
function EstimateRejectAlert({
name,
// #withAlertStoreConnect
isOpen,
payload: { estimateId },
// #withEstimateActions
requestRejectEstimate,
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
// Handle cancel reject estimate alert.
const handleCancelRejectEstimate = () => {
closeAlert(name);
};
// Handle confirm estimate reject.
const handleConfirmEstimateReject = useCallback(() => {
setLoading(true);
requestRejectEstimate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_rejected_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {})
.finally(() => {
setLoading(false);
closeAlert(name);
});
}, [estimateId, requestRejectEstimate, formatMessage]);
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'reject'} />}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleCancelRejectEstimate}
onConfirm={handleConfirmEstimateReject}
loading={isLoading}
>
<p>
<T id={'are_sure_to_approve_this_estimate'} />
</p>
</Alert>
);
}
export default compose(
withAlertStoreConnect(),
withAlertActions,
withEstimateActions,
)(EstimateRejectAlert);

View File

@@ -23,7 +23,7 @@ function EstimateFormPage({
requestFetchItems, requestFetchItems,
// #withEstimateActions // #withEstimateActions
requsetFetchEstimate, requestFetchEstimate,
// #withSettingsActions // #withSettingsActions
requestFetchOptions, requestFetchOptions,
@@ -52,7 +52,7 @@ function EstimateFormPage({
const fetchEstimate = useQuery( const fetchEstimate = useQuery(
['estimate', id], ['estimate', id],
(key, _id) => requsetFetchEstimate(_id), (key, _id) => requestFetchEstimate(_id),
{ enabled: !!id }, { enabled: !!id },
); );

View File

@@ -0,0 +1,19 @@
import React from 'react';
import EstimateDeleteAlert from 'containers/Alerts/Estimates/EstimateDeleteAlert';
import EstimateDeliveredAlert from 'containers/Alerts/Estimates/EstimateDeliveredAlert';
import EstimateApproveAlert from 'containers/Alerts/Estimates/EstimateApproveAlert';
import EstimateRejectAlert from 'containers/Alerts/Estimates/EstimateRejectAlert';
/**
* Estimates alert.
*/
export default function EstimatesAlerts() {
return (
<div>
<EstimateDeleteAlert name={'estimate-delete'} />
<EstimateDeliveredAlert name={'estimate-deliver'} />
<EstimateApproveAlert name={'estimate-Approve'} />
<EstimateRejectAlert name={'estimate-reject'} />
</div>
);
}

View File

@@ -8,6 +8,7 @@ import { FormattedMessage as T, useIntl } from 'react-intl';
import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import DashboardInsider from 'components/Dashboard/DashboardInsider'; import DashboardInsider from 'components/Dashboard/DashboardInsider';
import EstimatesAlerts from './EstimatesAlerts';
import EstimatesDataTable from './EstimatesDataTable'; import EstimatesDataTable from './EstimatesDataTable';
import EstimateActionsBar from './EstimateActionsBar'; import EstimateActionsBar from './EstimateActionsBar';
import EstimateViewTabs from './EstimateViewTabs'; import EstimateViewTabs from './EstimateViewTabs';
@@ -15,8 +16,9 @@ import EstimateViewTabs from './EstimateViewTabs';
import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withResourceActions from 'containers/Resources/withResourcesActions'; import withResourceActions from 'containers/Resources/withResourcesActions';
import withEstimates from './withEstimates'; import withEstimates from './withEstimates';
import withEstimateActions from './withEstimateActions'; import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import withViewsActions from 'containers/Views/withViewsActions'; import withViewsActions from 'containers/Views/withViewsActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -32,9 +34,11 @@ function EstimatesList({
estimatesTableQuery, estimatesTableQuery,
estimateViews, estimateViews,
// #withAlertsActions.
openAlert,
//#withEistimateActions //#withEistimateActions
requestFetchEstimatesTable, requestFetchEstimatesTable,
requestDeleteEstimate,
requestDeliverdEstimate, requestDeliverdEstimate,
requestApproveEstimate, requestApproveEstimate,
requestRejectEstimate, requestRejectEstimate,
@@ -42,7 +46,6 @@ function EstimatesList({
}) { }) {
const history = useHistory(); const history = useHistory();
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const [deleteEstimate, setDeleteEstimate] = useState(false);
const [deliverEstimate, setDeliverEstimate] = useState(false); const [deliverEstimate, setDeliverEstimate] = useState(false);
const [approveEstimate, setApproveEstimate] = useState(false); const [approveEstimate, setApproveEstimate] = useState(false);
const [rejectEstimate, setRejectEstimate] = useState(false); const [rejectEstimate, setRejectEstimate] = useState(false);
@@ -70,111 +73,35 @@ function EstimatesList({
// handle delete estimate click // handle delete estimate click
const handleDeleteEstimate = useCallback( const handleDeleteEstimate = useCallback(
(estimate) => { ({ id }) => {
setDeleteEstimate(estimate); openAlert('estimate-delete', { estimateId: id });
}, },
[setDeleteEstimate], [openAlert],
); );
// handle cancel estimate
const handleCancelEstimateDelete = useCallback(() => {
setDeleteEstimate(false);
}, [setDeleteEstimate]);
// handle confirm delete estimate
const handleConfirmEstimateDelete = useCallback(() => {
requestDeleteEstimate(deleteEstimate.id).then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_deleted_successfully',
}),
intent: Intent.SUCCESS,
});
setDeleteEstimate(false);
});
}, [deleteEstimate, requestDeleteEstimate, formatMessage]);
// Handle cancel/confirm estimate deliver. // Handle cancel/confirm estimate deliver.
const handleDeliverEstimate = useCallback((estimate) => { const handleDeliverEstimate = useCallback(
setDeliverEstimate(estimate); ({ id }) => {
}, []); openAlert('estimate-deliver', { estimateId: id });
},
// Handle cancel deliver estimate alert. [openAlert],
const handleCancelDeliverEstimate = useCallback(() => { );
setDeliverEstimate(false);
}, []);
// Handle confirm estimate deliver.
const handleConfirmEstimateDeliver = useCallback(() => {
requestDeliverdEstimate(deliverEstimate.id)
.then(() => {
setDeliverEstimate(false);
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_delivered_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {
setDeliverEstimate(false);
});
}, [deliverEstimate, requestDeliverdEstimate, formatMessage]);
// Handle cancel/confirm estimate approve. // Handle cancel/confirm estimate approve.
const handleApproveEstimate = useCallback((estimate) => { const handleApproveEstimate = useCallback(
setApproveEstimate(estimate); ({ id }) => {
}, []); openAlert('estimate-Approve', { estimateId: id });
},
// Handle cancel approve estimate alert. [openAlert],
const handleCancelApproveEstimate = useCallback(() => { );
setApproveEstimate(false);
}, []);
// Handle confirm estimate approve.
const handleConfirmEstimateApprove = useCallback(() => {
requestApproveEstimate(approveEstimate.id)
.then(() => {
setApproveEstimate(false);
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_approved_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {
setApproveEstimate(false);
});
}, [approveEstimate, requestApproveEstimate, formatMessage]);
// Handle cancel/confirm estimate reject. // Handle cancel/confirm estimate reject.
const handleRejectEstimate = useCallback((estimate) => { const handleRejectEstimate = useCallback(
setRejectEstimate(estimate); ({ id }) => {
}, []); openAlert('estimate-reject', { estimateId: id });
},
// Handle cancel reject estimate alert. [openAlert],
const handleCancelRejectEstimate = useCallback(() => { );
setRejectEstimate(false);
}, []);
// Handle confirm estimate reject.
const handleConfirmEstimateReject = useCallback(() => {
requestRejectEstimate(rejectEstimate.id)
.then(() => {
setRejectEstimate(false);
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_rejected_successfully',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
})
.catch((error) => {});
}, [rejectEstimate, requestRejectEstimate, formatMessage]);
// Handle filter change to re-fetch data-table. // Handle filter change to re-fetch data-table.
const handleFilterChanged = useCallback(() => {}, []); const handleFilterChanged = useCallback(() => {}, []);
@@ -224,56 +151,7 @@ function EstimatesList({
/> />
</Route> </Route>
</Switch> </Switch>
<EstimatesAlerts />
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />}
icon={'trash'}
intent={Intent.DANGER}
isOpen={deleteEstimate}
onCancel={handleCancelEstimateDelete}
onConfirm={handleConfirmEstimateDelete}
>
<p>
<T id={'once_delete_this_estimate_you_will_able_to_restore_it'} />
</p>
</Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'deliver'} />}
intent={Intent.WARNING}
isOpen={deliverEstimate}
onCancel={handleCancelDeliverEstimate}
onConfirm={handleConfirmEstimateDeliver}
>
<p>
<T id={'are_sure_to_deliver_this_estimate'} />
</p>
</Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'approve'} />}
intent={Intent.WARNING}
isOpen={approveEstimate}
onCancel={handleCancelApproveEstimate}
onConfirm={handleConfirmEstimateApprove}
>
<p>
<T id={'are_sure_to_approve_this_estimate'} />
</p>
</Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'reject'} />}
intent={Intent.WARNING}
isOpen={rejectEstimate}
onCancel={handleCancelRejectEstimate}
onConfirm={handleConfirmEstimateReject}
>
<p>
<T id={'are_sure_to_approve_this_estimate'} />
</p>
</Alert>
</DashboardPageContent> </DashboardPageContent>
</DashboardInsider> </DashboardInsider>
); );
@@ -288,4 +166,5 @@ export default compose(
estimatesTableQuery, estimatesTableQuery,
estimateViews, estimateViews,
})), })),
withAlertsActions,
)(EstimatesList); )(EstimatesList);

View File

@@ -7,18 +7,18 @@ import {
fetchEstimatesTable, fetchEstimatesTable,
deliverEstimate, deliverEstimate,
approveEstimate, approveEstimate,
rejectEstimate rejectEstimate,
} from 'store/Estimate/estimates.actions'; } from 'store/Estimate/estimates.actions';
import t from 'store/types'; import t from 'store/types';
const mapDipatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
requestSubmitEstimate: (form) => dispatch(submitEstimate({ form })), requestSubmitEstimate: (form) => dispatch(submitEstimate({ form })),
requsetFetchEstimate: (id) => dispatch(fetchEstimate({ id })), requestFetchEstimate: (id) => dispatch(fetchEstimate({ id })),
requestEditEstimate: (id, form) => dispatch(editEstimate(id, form)), requestEditEstimate: (id, form) => dispatch(editEstimate(id, form)),
requestFetchEstimatesTable: (query = {}) => requestFetchEstimatesTable: (query = {}) =>
dispatch(fetchEstimatesTable({ query: { ...query } })), dispatch(fetchEstimatesTable({ query: { ...query } })),
requestDeleteEstimate: (id) => dispatch(deleteEstimate({ id })), requestDeleteEstimate: (id) => dispatch(deleteEstimate({ id })),
requestDeliverdEstimate: (id) => dispatch(deliverEstimate({ id })), requestDeliveredEstimate: (id) => dispatch(deliverEstimate({ id })),
requestApproveEstimate: (id) => dispatch(approveEstimate({ id })), requestApproveEstimate: (id) => dispatch(approveEstimate({ id })),
requestRejectEstimate: (id) => dispatch(rejectEstimate({ id })), requestRejectEstimate: (id) => dispatch(rejectEstimate({ id })),
@@ -38,6 +38,11 @@ const mapDipatchToProps = (dispatch) => ({
type: t.ESTIMATE_NUMBER_CHANGED, type: t.ESTIMATE_NUMBER_CHANGED,
payload: { isChanged }, payload: { isChanged },
}), }),
setSelectedRowsEstimates: (selectedRows) =>
dispatch({
type: t.ESTIMATES_SELECTED_ROWS_SET,
payload: { selectedRows },
}),
}); });
export default connect(null, mapDipatchToProps); export default connect(null, mapDispatchToProps);

View File

@@ -22,7 +22,8 @@ export default (mapState) => {
estimateViews: getResourceViews(state, props, 'sale_estimate'), estimateViews: getResourceViews(state, props, 'sale_estimate'),
estimateItems: state.salesEstimates.items, estimateItems: state.salesEstimates.items,
estimateSelectedRows: state.salesEstimates.selectedRows,
estimatesTableQuery: query, estimatesTableQuery: query,
estimatesPageination: getEstimatesPaginationMeta(state, props, query), estimatesPageination: getEstimatesPaginationMeta(state, props, query),
estimatesLoading: state.salesEstimates.loading, estimatesLoading: state.salesEstimates.loading,

View File

@@ -15,6 +15,7 @@ const initialState = {
page: 1, page: 1,
}, },
currentViewId: -1, currentViewId: -1,
selectedRows: [],
}; };
const defaultEstimate = { const defaultEstimate = {
@@ -101,6 +102,10 @@ export default createReducer(initialState, {
}, },
}; };
}, },
[t.ESTIMATES_SELECTED_ROWS_SET]: (state, action) => {
const { selectedRows } = action.payload;
state.selectedRows = selectedRows;
},
...journalNumberChangedReducer(t.ESTIMATE_NUMBER_CHANGED), ...journalNumberChangedReducer(t.ESTIMATE_NUMBER_CHANGED),
...createTableQueryReducers('ESTIMATES'), ...createTableQueryReducers('ESTIMATES'),

View File

@@ -10,4 +10,5 @@ export default {
ESTIMATES_PAGE_SET: 'ESTIMATES_PAGE_SET', ESTIMATES_PAGE_SET: 'ESTIMATES_PAGE_SET',
ESTIMATES_ITEMS_SET: 'ESTIMATES_ITEMS_SET', ESTIMATES_ITEMS_SET: 'ESTIMATES_ITEMS_SET',
ESTIMATE_NUMBER_CHANGED: 'ESTIMATE_NUMBER_CHANGED', ESTIMATE_NUMBER_CHANGED: 'ESTIMATE_NUMBER_CHANGED',
ESTIMATES_SELECTED_ROWS_SET: 'ESTIMATES_SELECTED_ROWS_SET',
}; };