djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filter constraint fix (#4084)

Browse source
This commit is contained in:
Patryk Andrzejewski 2023-08-17 09:55:29 +02:00 committed by GitHub
parent 54ac13c0aa
commit 7c69d5bf52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/ConditionalFilter/useContainerState.ts
View file

@ -49,16 +49,20 @@ const removeElement = (container: FilterContainer, position: number) => {
return removeConstraint(newContainer);
};
const removeEmptyElements = (container: FilterContainer, provider: FilterValueProvider): FilterContainer => {
const emptyIndex = container.findIndex(el =>
FilterElement.isCompatible(el) && (!provider.isPersisted(el) || el.isEmpty())
)
const removeEmptyElements = (
container: FilterContainer,
provider: FilterValueProvider,
): FilterContainer => {
const emptyIndex = container.findIndex(
el =>
FilterElement.isCompatible(el) &&
(!provider.isPersisted(el) || el.isEmpty()),
);
if (emptyIndex < 0) return container
return removeEmptyElements(removeElement(container, emptyIndex), provider)
}
if (emptyIndex < 0) return container;
return removeEmptyElements(removeElement(container, emptyIndex), provider);
};
export const useContainerState = (valueProvider: FilterValueProvider) => {
const [value, setValue] = useState<FilterContainer>([]);
@ -91,6 +95,11 @@ export const useContainerState = (valueProvider: FilterValueProvider) => {
setValue(v => v.map(updateFilterElement(index, cb)));
};
const getAt = (position: string) => {
const index = parseInt(position, 10);
return value[index];
};
const updateBySlug = (slug: string, cb: StateCallback) => {
setValue(v =>
v.map(el => {
@ -136,18 +145,19 @@ export const useContainerState = (valueProvider: FilterValueProvider) => {
};
const clearEmpty = () => {
setValue(v => removeEmptyElements(v, valueProvider))
}
setValue(v => removeEmptyElements(v, valueProvider));
};
return {
create,
exist,
updateBySlug,
createEmpty,
getAt,
updateAt,
removeAt,
value,
clear,
clearEmpty
clearEmpty,
};
};

42
src/components/ConditionalFilter/useFilterContainer.ts
View file

@ -13,7 +13,16 @@ export const useFilterContainer = (
leftOperandsProvider: LeftOperandsProvider,
) => {
const {
containerState: { value, updateAt, removeAt, createEmpty, create, exist, updateBySlug },
containerState: {
value,
updateAt,
getAt,
removeAt,
createEmpty,
create,
exist,
updateBySlug,
},
} = useConditionalFilterContext();
const addEmpty = () => {
@ -21,22 +30,33 @@ export const useFilterContainer = (
};
const updateLeftOperator = (position: string, leftOperator: LeftOperand) => {
const current = getAt(position);
const dependency = Constraint.getDependency(leftOperator.value);
const currentDependency =
FilterElement.isCompatible(current) &&
Constraint.getDependency(current.value.value);
updateAt(position, el => el.updateLeftOperator(leftOperator));
const dependency = Constraint.getDependency(leftOperator.value)
if (currentDependency && !dependency) {
updateBySlug(currentDependency, el => {
el.clearConstraint();
});
if (!dependency) return
if (!exist(dependency)) {
create(FilterElement.createStaticBySlug(dependency))
return
return;
}
updateBySlug(dependency, (el) => {
const newConstraint = Constraint.fromSlug(dependency)
if (!dependency) return;
if (newConstraint) el.setConstraint(newConstraint)
})
if (!exist(dependency)) {
create(FilterElement.createStaticBySlug(dependency));
return;
}
updateBySlug(dependency, el => {
const newConstraint = Constraint.fromSlug(dependency);
if (newConstraint) el.setConstraint(newConstraint);
});
};
const updateLeftLoadingState = (position: string, loading: boolean) => {