Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix withRouter #287

Merged
merged 1 commit into from
Jun 13, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const CategoryInformation = observer(
render() {
this.viewModel = this.context.categoryDetailViewModel;
const { t, validator, isEdit } = this.props;
const filteredCategoryList = this.context.categoryListViewModel.items.filter((category) => {
const filteredCategoryList = this.context.categoryListViewModel.items?.filter((category) => {
return (
category.id !==
this.viewModel.categoryDetailViewModel.formPropsData[PIM_CATEGORY_DETAIL_FIELD_KEY.ID]
Expand Down
3 changes: 2 additions & 1 deletion src/containers/DebtorGroupPage/DebtorGroupEdit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import Input from 'components/Form/Input';
import SimpleReactValidator from 'simple-react-validator';
import DebtorGroupInformation from './Component/DebtorGroupInformation';
import EditHeader from 'components/EditHeader';
import { withRouter } from 'react-router-dom';

const EditDebtorGroup = observer(
class EditDebtorGroup extends Component {
Expand Down Expand Up @@ -173,4 +174,4 @@ const EditDebtorGroup = observer(
}
);

export default withTranslation()(withDebtorGroupViewModel(EditDebtorGroup));
export default withTranslation()(withRouter(withDebtorGroupViewModel(EditDebtorGroup)));
3 changes: 2 additions & 1 deletion src/containers/FieldsGroupPage/FieldGroupEdit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import SimpleReactValidator from 'simple-react-validator';
import FieldGroupInformation from './Component/FieldGroupInformation';
import _ from 'lodash';
import EditHeader from 'components/EditHeader';
import { withRouter } from 'react-router-dom';

const EditFieldGroup = observer(
class EditFieldGroup extends Component {
Expand Down Expand Up @@ -206,4 +207,4 @@ const EditFieldGroup = observer(
}
);

export default withTranslation()(withFieldGroupViewModel(EditFieldGroup));
export default withTranslation()(withRouter(withFieldGroupViewModel(EditFieldGroup)));
5 changes: 3 additions & 2 deletions src/containers/FieldsPage/FieldEdit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React, { Component } from 'react';
import { Spinner, historyPush } from 'aesirx-uikit';
import { Spinner, historyPush } from 'aesirx-uikit';

import { withTranslation } from 'react-i18next';
import { observer } from 'mobx-react';
Expand All @@ -19,6 +19,7 @@ import Input from 'components/Form/Input';
import SimpleReactValidator from 'simple-react-validator';
import FieldInformation from './Component/FieldInformation';
import EditHeader from 'components/EditHeader';
import { withRouter } from 'react-router-dom';

const EditField = observer(
class EditField extends Component {
Expand Down Expand Up @@ -179,4 +180,4 @@ const EditField = observer(
}
);

export default withTranslation()(withFieldViewModel(EditField));
export default withTranslation()(withRouter(withFieldViewModel(EditField)));
3 changes: 2 additions & 1 deletion src/containers/ProductPricesPage/ProductPriceEdit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { PIM_PRICES_DETAIL_FIELD_KEY } from 'aesirx-lib';
import SimpleReactValidator from 'simple-react-validator';
import ProductPriceInformation from './Component/ProductPriceInformation';
import EditHeader from 'components/EditHeader';
import { withRouter } from 'react-router-dom';

const EditProductPrice = observer(
class EditProductPrice extends Component {
Expand Down Expand Up @@ -139,4 +140,4 @@ const EditProductPrice = observer(
}
);

export default withTranslation()(withProductPriceViewModel(EditProductPrice));
export default withTranslation()(withRouter(withProductPriceViewModel(EditProductPrice)));