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.

Sign up for GitHub

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

Custom fields Related field fix #310

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Custom fields Related field fix #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
179 changes: 110 additions & 69 deletions src/components/Form/FormSelectionFields/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @license GNU General Public License version 3, see LICENSE.
*/

import { SVGComponent } from 'aesirx-uikit';
import { PAGE_STATUS, SVGComponent } from 'aesirx-uikit';
import { FORM_FIELD_TYPE } from 'constants/FormFieldType';
import { PIM_CATEGORY_DETAIL_FIELD_KEY, PIM_FIELD_DETAIL_FIELD_KEY } from 'aesirx-lib';
import React, { Component } from 'react';
Expand Down Expand Up @@ -45,20 +45,20 @@ class FormSelectionFields extends Component {
};
componentDidMount = () => {
const fetchData = async () => {
const isCategoryRelatedField =
const isCategoryRelatedField = this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
categoryListViewModel.resetItemsList();
fieldListViewModel.resetRelatedItemsList();
if (
this.state.field?.value === FORM_FIELD_TYPE.ITEM_RELATED ||
this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
const isTopCategoryField = this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
if (!categoryListViewModel?.items?.length && isCategoryRelatedField) {
isTopCategoryField &&
this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED
) {
isCategoryRelatedField &&
categoryListViewModel.handleFilter({ 'list[limit]': 9999, 'filter[maxlevel]': 2 });
await Promise.all([
isTopCategoryField
isCategoryRelatedField
? categoryListViewModel.initializeDataCustom()
: categoryListViewModel.getListByFilter('list[limit]', 9999),
fieldListViewModel.handleFilterList({ limit: 9999 }),
fieldListViewModel.handleFilter({ 'filter[fieldtypes]': 'item_related' }),
fieldListViewModel.initializeDataCustom(),
fieldListViewModel.initializeDataRelated(),
]).then(() => {
this.forceUpdate();
});
Expand All @@ -67,40 +67,37 @@ class FormSelectionFields extends Component {
fetchData();
};
componentDidUpdate = (prevProps) => {
if (prevProps.field.getValueSelected !== this.props.field.getValueSelected) {
this.setState((prevState) => {
return {
...prevState,
field: this.props.field.getValueSelected,
};
});
if (
prevProps.field.getValueSelected !==
this.props.field.viewModel.fieldDetailViewModel.formPropsData[PIM_FIELD_DETAIL_FIELD_KEY.TYPE]
) {
this.state.listOptions.length &&
this.props.field.viewModel.handleFormPropsData(
[PIM_FIELD_DETAIL_FIELD_KEY.OPTIONS],
[...this.state.listOptions]
);
const fetchData = async () => {
const isCategoryRelatedField = this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
if (
!categoryListViewModel?.items?.length &&
!fieldListViewModel?.itemsRelated?.length &&
(this.state.field?.value === FORM_FIELD_TYPE.ITEM_RELATED ||
this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED)
) {
isCategoryRelatedField &&
categoryListViewModel.handleFilter({ 'list[limit]': 9999, 'filter[maxlevel]': 2 });
await Promise.all([
isCategoryRelatedField
? categoryListViewModel.initializeDataCustom()
: categoryListViewModel.getListByFilter('list[limit]', 9999),
fieldListViewModel.initializeDataRelated(),
]).then(() => {
this.forceUpdate();
});
}
};
fetchData();
}
this.state.listOptions.length &&
this.props.field.viewModel.handleFormPropsData(
[PIM_FIELD_DETAIL_FIELD_KEY.OPTIONS],
[...this.state.listOptions]
);
const fetchData = async () => {
const isCategoryRelatedField =
this.state.field?.value === FORM_FIELD_TYPE.ITEM_RELATED ||
this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
const isTopCategoryField = this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED;
if (!categoryListViewModel?.items?.length && isCategoryRelatedField) {
isTopCategoryField &&
categoryListViewModel.handleFilter({ 'list[limit]': 9999, 'filter[maxlevel]': 2 });
await Promise.all([
isTopCategoryField
? categoryListViewModel.initializeDataCustom()
: categoryListViewModel.getListByFilter('list[limit]', 9999),
fieldListViewModel.handleFilterList({ limit: 9999 }),
fieldListViewModel.handleFilter({ 'filter[fieldtypes]': 'item_related' }),
fieldListViewModel.initializeDataCustom(),
]).then(() => {
this.forceUpdate();
});
}
};
fetchData();
};
render() {
const { t, validator } = this.props;
Expand Down Expand Up @@ -141,22 +138,47 @@ class FormSelectionFields extends Component {
};
})
: item?.attributes?.type === FORM_FIELD_TYPE.REDITEM_CUSTOMFIELD &&
fieldListViewModel?.items?.length
? fieldListViewModel?.items
.map((item) => {
return {
label: item[PIM_FIELD_DETAIL_FIELD_KEY.NAME],
value: item[PIM_FIELD_DETAIL_FIELD_KEY.ID],
};
})
?.filter((item) => {
return (
item.value !==
this.props.field.viewModel.fieldDetailViewModel.formPropsData[
PIM_FIELD_DETAIL_FIELD_KEY.ID
]
);
})
fieldListViewModel?.itemsRelated?.length
? [
{
label: 'Item Related',
options: fieldListViewModel?.itemsRelated
.find((o) => o?.key === 'item_related')
?.options?.map((item) => {
return {
label: item[PIM_FIELD_DETAIL_FIELD_KEY.NAME],
value: item[PIM_FIELD_DETAIL_FIELD_KEY.ID],
};
})
?.filter((item) => {
return (
item.value !==
this.props.field.viewModel.fieldDetailViewModel.formPropsData[
PIM_FIELD_DETAIL_FIELD_KEY.ID
]
);
}),
},
{
label: 'Category Related',
options: fieldListViewModel?.itemsRelated
.find((o) => o?.key === 'category_related')
?.options?.map((item) => {
return {
label: item[PIM_FIELD_DETAIL_FIELD_KEY.NAME],
value: item[PIM_FIELD_DETAIL_FIELD_KEY.ID],
};
})
?.filter((item) => {
return (
item.value !==
this.props.field.viewModel.fieldDetailViewModel.formPropsData[
PIM_FIELD_DETAIL_FIELD_KEY.ID
]
);
}),
},
]
: item?.options?.map((item) => {
return { label: item?.label, value: item?.value?.toString() };
}) ?? [];
Expand Down Expand Up @@ -193,13 +215,26 @@ class FormSelectionFields extends Component {
})
: [];
} else {
selectedValue = fieldValue
? {
label: selectOptions?.find((x) => x.value?.toString() === fieldValue)
?.label,
value: fieldValue,
}
: null;
if (item?.attributes?.type === FORM_FIELD_TYPE.REDITEM_CUSTOMFIELD) {
selectedValue = fieldValue
? {
label: selectOptions
?.find((x) =>
x?.options?.find((y) => y.value?.toString() === fieldValue)
)
?.options?.find((y) => y.value?.toString() === fieldValue)?.label,
value: fieldValue,
}
: null;
} else {
selectedValue = fieldValue
? {
label: selectOptions?.find((x) => x.value?.toString() === fieldValue)
?.label,
value: fieldValue,
}
: null;
}
}
} else {
selectedValue =
Expand Down Expand Up @@ -326,12 +361,12 @@ class FormSelectionFields extends Component {
item?.attributes?.name === 'both_sides_related' &&
data.target.value === '1'
) {
document.querySelector('.sub-field').classList.remove('d-none');
document.querySelector('.sub-field')?.classList.remove('d-none');
} else if (
item?.attributes?.name === 'both_sides_related' &&
data.target.value === '0'
) {
document.querySelector('.sub-field').classList.add('d-none');
document.querySelector('.sub-field')?.classList.add('d-none');
}
if (item?.attributes?.name === 'changeYear' && data.target.value === 'true') {
document.querySelectorAll('.sub-field')?.forEach((item) => {
Expand Down Expand Up @@ -360,6 +395,11 @@ class FormSelectionFields extends Component {
item?.attributes?.name === 'yearRangeMin' ||
item?.attributes?.name === 'yearRangeMax'
? 'sub-field d-none'
: this.props.field.viewModel.fieldDetailViewModel.formPropsData[
PIM_FIELD_DETAIL_FIELD_KEY.PARAMS
]['both_sides_related'] === '1' &&
item?.attributes?.type === FORM_FIELD_TYPE.REDITEM_CUSTOMFIELD
? 'sub-field'
: ''
}`,
}
Expand Down Expand Up @@ -541,7 +581,8 @@ class FormSelectionFields extends Component {
/>
</div>
)}
{!categoryListViewModel?.successResponse?.state &&
{(!categoryListViewModel?.successResponse?.state ||
fieldListViewModel?.formStatus === PAGE_STATUS.LOADING) &&
(this.state.field?.value === FORM_FIELD_TYPE.ITEM_RELATED ||
this.state.field?.value === FORM_FIELD_TYPE.CATEGORY_RELATED) && (
<Spinner className="spinner-overlay" />
Expand Down
2 changes: 1 addition & 1 deletion src/containers/CategoriesPage/CategoryViewModel/CategoryDetailViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CategoryDetailViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down
8 changes: 7 additions & 1 deletion src/containers/CategoriesPage/CategoryViewModel/CategoryListViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class CategoryListViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down Expand Up @@ -246,6 +246,12 @@ class CategoryListViewModel {
this.successResponse.state = false;
});
};

resetItemsList = () => {
runInAction(() => {
this.items = [];
});
};
}

export default CategoryListViewModel;
2 changes: 1 addition & 1 deletion src/containers/DebtorGroupPage/DebtorGroupViewModel/DebtorGroupDetailViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class DebtorGroupDetailViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down
2 changes: 1 addition & 1 deletion src/containers/DebtorGroupPage/DebtorGroupViewModel/DebtorGroupListViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class DebtorGroupListViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down
2 changes: 1 addition & 1 deletion src/containers/FieldsGroupPage/FieldGroupViewModel/FieldGroupDetailViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class FieldGroupDetailViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down
2 changes: 1 addition & 1 deletion src/containers/FieldsGroupPage/FieldGroupViewModel/FieldGroupListViewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class FieldGroupListViewModel {
};

callbackOnErrorHandler = (error) => {
error._messages[0]?.message
Array.isArray(error?._messages) && error._messages[0]?.message
? notify(error._messages[0]?.message, 'error')
: error.message && notify(error.message, 'error');
this.successResponse.state = false;
Expand Down
Loading