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
9 changes: 9 additions & 0 deletions src/lib/modules/Loan/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const ACTION_HAS_ERROR = 'loanAction/HAS_ERROR';
export const DETAILS_IS_LOADING = 'fetchLoanDetails/IS_LOADING';
export const DETAILS_SUCCESS = 'fetchLoanDetails/SUCCESS';
export const DETAILS_HAS_ERROR = 'fetchLoanDetails/HAS_ERROR';
export const CLEAR = 'fetchLoanDetails/CLEAR';

export const fetchLoanDetails = (
loanPid,
Expand Down Expand Up @@ -62,6 +63,14 @@ export const fetchLoanDetails = (
};
};

export const clearLoanDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};

export const performLoanAction = (
actionURL,
documentPid,
Expand Down
3 changes: 3 additions & 0 deletions src/lib/modules/Loan/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
ACTION_HAS_ERROR,
ACTION_IS_LOADING,
ACTION_SUCCESS,
CLEAR,
DETAILS_HAS_ERROR,
DETAILS_IS_LOADING,
DETAILS_SUCCESS,
Expand Down Expand Up @@ -66,6 +67,8 @@ export const loanDetailsReducer = (state = initialDetailsState, action) => {
isLoading: false,
hasError: true,
};
case CLEAR:
return { ...initialDetailsState };
default:
return state;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ export default class OrderDetails extends React.Component {
}
}

componentWillUnmount() {
const { clearOrderDetails } = this.props;
clearOrderDetails();
}

render() {
const { isLoading, error, data } = this.props;
const metadata = data.metadata || {};
Expand Down Expand Up @@ -243,6 +248,7 @@ export default class OrderDetails extends React.Component {
OrderDetails.propTypes = {
data: PropTypes.object.isRequired,
fetchOrderDetails: PropTypes.func.isRequired,
clearOrderDetails: PropTypes.func.isRequired,
isLoading: PropTypes.bool,
error: PropTypes.object,
match: PropTypes.shape({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { connect } from 'react-redux';

import { fetchOrderDetails } from './state/actions';
import { fetchOrderDetails, clearOrderDetails } from './state/actions';
import OrderDetailsComponent from './OrderDetails';

const mapStateToProps = (state) => ({
Expand All @@ -12,6 +12,7 @@ const mapStateToProps = (state) => ({

const mapDispatchToProps = (dispatch) => ({
fetchOrderDetails: (orderPid) => dispatch(fetchOrderDetails(orderPid)),
clearOrderDetails: () => dispatch(clearOrderDetails()),
});

export const OrderDetails = connect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ import { sendErrorNotification } from '@components/Notifications';
export const IS_LOADING = 'fetchOrderDetails/IS_LOADING';
export const SUCCESS = 'fetchOrderDetails/SUCCESS';
export const HAS_ERROR = 'fetchOrderDetails/HAS_ERROR';
export const CLEAR = 'fetchOrderDetails/CLEAR';

export const clearOrderDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};

export const fetchOrderDetails = (pid) => {
return async (dispatch) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IS_LOADING, SUCCESS, HAS_ERROR } from './actions';
import { IS_LOADING, SUCCESS, HAS_ERROR, CLEAR } from './actions';

export const initialState = {
isLoading: true,
Expand Down Expand Up @@ -26,6 +26,8 @@ export default (state = initialState, action) => {
error: action.payload,
hasError: true,
};
case CLEAR:
return { ...initialState };
default:
return state;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ export default class DocumentDetails extends Component {
}
}

componentWillUnmount() {
const { clearDocumentDetails } = this.props;
clearDocumentDetails();
}

render() {
const { isLoading, error, data } = this.props;
return (
Expand Down Expand Up @@ -99,6 +104,7 @@ DocumentDetails.propTypes = {
error: PropTypes.object,
data: PropTypes.object.isRequired,
fetchDocumentDetails: PropTypes.func.isRequired,
clearDocumentDetails: PropTypes.func.isRequired,
match: PropTypes.shape({
params: PropTypes.shape({
documentPid: PropTypes.string,
Expand Down
3 changes: 2 additions & 1 deletion src/lib/pages/backoffice/Document/DocumentDetails/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { connect } from 'react-redux';

import { fetchDocumentDetails } from './state/actions';
import { fetchDocumentDetails, clearDocumentDetails } from './state/actions';
import DocumentDetailsComponent from './DocumentDetails';

const mapStateToProps = (state) => ({
Expand All @@ -13,6 +13,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
fetchDocumentDetails: (documentPid) =>
dispatch(fetchDocumentDetails(documentPid)),
clearDocumentDetails: () => dispatch(clearDocumentDetails()),
});

export const DocumentDetails = connect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,20 @@ import { Icon } from 'semantic-ui-react';
export const IS_LOADING = 'fetchDocumentDetails/IS_LOADING';
export const SUCCESS = 'fetchDocumentDetails/SUCCESS';
export const HAS_ERROR = 'fetchDocumentDetails/HAS_ERROR';
export const CLEAR = 'fetchDocumentDetails/CLEAR';

export const DELETE_IS_LOADING = 'deleteDocument/DELETE_IS_LOADING';
export const DELETE_SUCCESS = 'deleteDocument/DELETE_SUCCESS';
export const DELETE_HAS_ERROR = 'deleteDocument/DELETE_HAS_ERROR';

export const clearDocumentDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};

export const fetchDocumentDetails = (documentPid) => {
return async (dispatch) => {
dispatch({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
IS_LOADING,
SUCCESS,
HAS_ERROR,
CLEAR,
} from './actions';

export const initialState = {
Expand Down Expand Up @@ -48,6 +49,8 @@ export default (state = initialState, action) => {
error: action.payload,
hasError: true,
};
case CLEAR:
return { ...initialState };
default:
return state;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ export default class DocumentRequestDetails extends Component {
}
}

componentWillUnmount() {
const { clearDocumentRequestDetails } = this.props;
clearDocumentRequestDetails();
}

render() {
const { data, isLoading, error } = this.props;
return (
Expand Down Expand Up @@ -72,6 +77,7 @@ export default class DocumentRequestDetails extends Component {

DocumentRequestDetails.propTypes = {
fetchDocumentRequestDetails: PropTypes.func.isRequired,
clearDocumentRequestDetails: PropTypes.func.isRequired,
data: PropTypes.object.isRequired,
isLoading: PropTypes.bool,
error: PropTypes.object,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { connect } from 'react-redux';
import DocumentRequestDetailsComponent from './DocumentRequestDetails';
import { fetchDocumentRequestDetails } from './state/actions';
import {
fetchDocumentRequestDetails,
clearDocumentRequestDetails,
} from './state/actions';

const mapStateToProps = (state) => ({
data: state.documentRequestDetails.data,
Expand All @@ -11,6 +14,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
fetchDocumentRequestDetails: (documentRequestPid) =>
dispatch(fetchDocumentRequestDetails(documentRequestPid)),
clearDocumentRequestDetails: () => dispatch(clearDocumentRequestDetails()),
});

export const DocumentRequestDetails = connect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,20 @@ import { BackOfficeRoutes } from '@routes/urls';
export const IS_LOADING = 'fetchDocumentRequestDetails/IS_LOADING';
export const SUCCESS = 'fetchDocumentRequestDetails/SUCCESS';
export const HAS_ERROR = 'fetchDocumentRequestDetails/HAS_ERROR';
export const CLEAR = 'fetchDocumentRequestDetails/CLEAR';

export const DELETE_IS_LOADING = 'deleteDocumentRequest/DELETE_IS_LOADING';
export const DELETE_SUCCESS = 'deleteDocumentRequest/DELETE_SUCCESS';
export const DELETE_HAS_ERROR = 'deleteDocumentRequest/DELETE_HAS_ERROR';

export const clearDocumentRequestDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};

export const fetchDocumentRequestDetails = (documentRequestPid) => {
return async (dispatch) => {
dispatch({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
HAS_ERROR,
IS_LOADING,
SUCCESS,
CLEAR,
} from './actions';

export const initialState = {
Expand Down Expand Up @@ -34,6 +35,8 @@ export default (state = initialState, action) => {
isLoading: false,
hasError: true,
};
case CLEAR:
return { ...initialState };
default:
return state;
}
Expand Down
6 changes: 6 additions & 0 deletions src/lib/pages/backoffice/EItem/EItemDetails/EItemDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ export default class EItemDetails extends Component {
}
}

componentWillUnmount() {
const { clearEItemDetails } = this.props;
clearEItemDetails();
}

render() {
const { isLoading, error, data } = this.props;
return (
Expand Down Expand Up @@ -69,6 +74,7 @@ export default class EItemDetails extends Component {

EItemDetails.propTypes = {
fetchEItemDetails: PropTypes.func.isRequired,
clearEItemDetails: PropTypes.func.isRequired,
isLoading: PropTypes.bool.isRequired,
data: PropTypes.object.isRequired,
error: PropTypes.object,
Expand Down
3 changes: 2 additions & 1 deletion src/lib/pages/backoffice/EItem/EItemDetails/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { connect } from 'react-redux';
import { fetchEItemDetails } from './state/actions';
import { fetchEItemDetails, clearEItemDetails } from './state/actions';
import EItemDetailsComponent from './EItemDetails';

const mapStateToProps = (state) => ({
Expand All @@ -10,6 +10,7 @@ const mapStateToProps = (state) => ({

const mapDispatchToProps = (dispatch) => ({
fetchEItemDetails: (eitemPid) => dispatch(fetchEItemDetails(eitemPid)),
clearEItemDetails: () => dispatch(clearEItemDetails()),
});

export const EItemDetails = connect(
Expand Down
10 changes: 10 additions & 0 deletions src/lib/pages/backoffice/EItem/EItemDetails/state/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { BackOfficeRoutes } from '@routes/urls';
export const IS_LOADING = 'fetchEItemDetails/IS_LOADING';
export const SUCCESS = 'fetchEItemDetails/SUCCESS';
export const HAS_ERROR = 'fetchEItemDetails/HAS_ERROR';
export const CLEAR = 'fetchEItemDetails/CLEAR';

export const DELETE_IS_LOADING = 'fetchEItemDetails/DELETE_IS_LOADING';
export const DELETE_SUCCESS = 'fetchEItemDetails/DELETE_SUCCESS';
Expand All @@ -18,6 +19,15 @@ export const DELETE_HAS_ERROR = 'fetchEItemDetails/DELETE_HAS_ERROR';
export const ADD_FILE = 'fetchEItemDetails/ADD_FILE';
export const DELETE_FILE = 'fetchEItemDetails/DELETE_FILE';
export const UPLOAD_IS_LOADING = 'fetchEItemDetails/UPLOAD_IS_LOADING';

export const clearEItemDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};

export const deleteEItem = (eitemPid) => {
return async (dispatch) => {
dispatch({
Expand Down
3 changes: 3 additions & 0 deletions src/lib/pages/backoffice/EItem/EItemDetails/state/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
HAS_ERROR,
ADD_FILE,
DELETE_FILE,
CLEAR,
} from './actions';
import get from 'lodash/get';

Expand Down Expand Up @@ -81,6 +82,8 @@ export default (state = initialState, action) => {
error: action.payload,
hasError: true,
};
case CLEAR:
return { ...initialState };
default:
return state;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ export default class BorrowingRequestDetails extends Component {
}
}

componentWillUnmount() {
const { clearBorrowingRequestDetails } = this.props;
clearBorrowingRequestDetails();
}

render() {
const { isLoading, error, data } = this.props;
const metadata = data.metadata || {};
Expand Down Expand Up @@ -219,6 +224,7 @@ BorrowingRequestDetails.propTypes = {
error: PropTypes.object,
isLoading: PropTypes.bool.isRequired,
fetchBorrowingRequestDetails: PropTypes.func.isRequired,
clearBorrowingRequestDetails: PropTypes.func.isRequired,
match: PropTypes.shape({
params: PropTypes.shape({
borrowingRequestPid: PropTypes.string,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { connect } from 'react-redux';

import { fetchBorrowingRequestDetails } from './state/actions';
import {
clearBorrowingRequestDetails,
fetchBorrowingRequestDetails,
} from './state/actions';
import BorrowingRequestDetailsComponent from './BorrowingRequestDetails';

const mapStateToProps = (state) => ({
Expand All @@ -12,6 +15,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
fetchBorrowingRequestDetails: (brwReqPid) =>
dispatch(fetchBorrowingRequestDetails(brwReqPid)),
clearBorrowingRequestDetails: () => dispatch(clearBorrowingRequestDetails()),
});

export const BorrowingRequestDetails = connect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { borrowingRequestApi } from '@api/ill';
export const IS_LOADING = 'fetchBorrowingRequestDetails/IS_LOADING';
export const SUCCESS = 'fetchBorrowingRequestDetails/SUCCESS';
export const HAS_ERROR = 'fetchBorrowingRequestDetails/HAS_ERROR';
export const CLEAR = 'fetchBorrowingRequestDetails/CLEAR';

export const fetchBorrowingRequestDetails = (borrowingRequestPid) => {
return async (dispatch) => {
Expand All @@ -24,3 +25,11 @@ export const fetchBorrowingRequestDetails = (borrowingRequestPid) => {
}
};
};

export const clearBorrowingRequestDetails = () => {
return (dispatch) => {
dispatch({
type: CLEAR,
});
};
};
Loading
Loading