Skip to content

kie-issues#1020: Adds missing features from previous #2244 #2253

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

Merged
merged 2 commits into from
Apr 22, 2024
Merged

kie-issues#1020: Adds missing features from previous #2244 #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d544412
Enable collection constraints to boolean, context and undefined types
ljmotta Apr 19, 2024
c498c51
Fix toggle isCollection
ljmotta Apr 19, 2024
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
60 changes: 31 additions & 29 deletions packages/dmn-editor/src/dataTypes/Constraints.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { ConstraintsRange, isRange } from "./ConstraintsRange";
import { KIE__tConstraintType } from "@kie-tools/dmn-marshaller/dist/schemas/kie-1_0/ts-gen/types";
import { EditItemDefinition } from "./DataTypes";
import { ToggleGroup, ToggleGroupItem } from "@patternfly/react-core/dist/js/components/ToggleGroup";
import { canHaveConstraints, constrainableBuiltInFeelTypes } from "./DataTypeSpec";
import { constrainableBuiltInFeelTypes } from "./DataTypeSpec";
import moment from "moment";
import { TextInput } from "@patternfly/react-core/dist/js/components/TextInput";
import { ConstraintDate } from "./ConstraintComponents/ConstraintDate";
Expand Down Expand Up @@ -252,35 +252,38 @@ export const constraintTypeHelper = (typeRef: DmnBuiltInDataType): TypeHelper =>
export function useConstraint({
constraint,
itemDefinition,
isEnumDisabled,
isRangeDisabled,
isCollectionConstraintEnable,
}: {
constraint: DMN15__tUnaryTests | undefined;
itemDefinition: DMN15__tItemDefinition;
isEnumDisabled: boolean;
isRangeDisabled: boolean;
isCollectionConstraintEnable: boolean;
}) {
const constraintValue = useMemo(() => constraint?.text.__$$text, [constraint?.text.__$$text]);

const kieConstraintType = useMemo(() => constraint?.["@_kie:constraintType"], [constraint]);
const isCollection = useMemo(() => itemDefinition["@_isCollection"] ?? false, [itemDefinition]);
const itemDefinitionId = useMemo(() => itemDefinition["@_id"], [itemDefinition]);

const typeRef: DmnBuiltInDataType = useMemo(
() => (itemDefinition?.typeRef?.__$$text as DmnBuiltInDataType) ?? DmnBuiltInDataType.Undefined,
[itemDefinition?.typeRef?.__$$text]
);

const isConstraintEnum = useMemo(
() => (isEnumDisabled ? undefined : isEnum(constraintValue, constraintTypeHelper(typeRef).check)),
[constraintValue, isEnumDisabled, typeRef]
() =>
isCollection === true && isCollectionConstraintEnable === true // collection doesn't support enumeration constraint
? undefined
: isEnum(constraintValue, constraintTypeHelper(typeRef).check),
[constraintValue, isCollectionConstraintEnable, isCollection, typeRef]
);

const isConstraintRange = useMemo(
() => (isRangeDisabled ? undefined : isRange(constraintValue, constraintTypeHelper(typeRef).check)),
[constraintValue, isRangeDisabled, typeRef]
() =>
isCollection === true && isCollectionConstraintEnable === true // collection doesn't support range constraint
? undefined
: isRange(constraintValue, constraintTypeHelper(typeRef).check),
[constraintValue, isCollectionConstraintEnable, isCollection, typeRef]
);

const itemDefinitionId = useMemo(() => itemDefinition["@_id"], [itemDefinition]);

const enumToKieConstraintType: (selection: ConstraintsType) => KIE__tConstraintType | undefined = useCallback(
(selection) => {
switch (selection) {
Expand All @@ -302,11 +305,16 @@ export function useConstraint({
const enabledConstraints = constrainableBuiltInFeelTypes.get(typeRef);
return {
enumeration:
!isEnumDisabled && (enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.ENUMERATION)!),
range: !isRangeDisabled && (enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.RANGE)!),
expression: (enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.EXPRESSION)!),
!(isCollection === true && isCollectionConstraintEnable === true) &&
(enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.ENUMERATION)!),
range:
!(isCollection === true && isCollectionConstraintEnable === true) &&
(enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.RANGE)!),
expression:
(isCollection === true && isCollectionConstraintEnable === true) ||
(enabledConstraints ?? []).includes(enumToKieConstraintType(ConstraintsType.EXPRESSION)!),
};
}, [enumToKieConstraintType, isEnumDisabled, isRangeDisabled, typeRef]);
}, [typeRef, isCollection, isCollectionConstraintEnable, enumToKieConstraintType]);

const selectedConstraint = useMemo<ConstraintsType>(() => {
if (isConstraintEnabled.enumeration && kieConstraintType === "enumeration") {
Expand Down Expand Up @@ -365,8 +373,6 @@ export function ConstraintsFromAllowedValuesAttribute({
isReadonly,
itemDefinition,
editItemDefinition,
isEnumDisabled,
isRangeDisabled,
}: {
isReadonly: boolean;
itemDefinition: DMN15__tItemDefinition;
Expand All @@ -388,8 +394,7 @@ export function ConstraintsFromAllowedValuesAttribute({
} = useConstraint({
constraint: allowedValues,
itemDefinition,
isEnumDisabled: isEnumDisabled ?? false,
isRangeDisabled: isRangeDisabled ?? false,
isCollectionConstraintEnable: false, // allowedValues doesn't support constraint to the collection itself
});

const onConstraintChange = useCallback(
Expand Down Expand Up @@ -480,15 +485,11 @@ export function ConstraintsFromTypeConstraintAttribute({
itemDefinition,
editItemDefinition,
defaultsToAllowedValues,
isEnumDisabled,
isRangeDisabled,
}: {
isReadonly: boolean;
itemDefinition: DMN15__tItemDefinition;
editItemDefinition: EditItemDefinition;
defaultsToAllowedValues: boolean;
isEnumDisabled?: boolean;
isRangeDisabled?: boolean;
}) {
const typeConstraint = useMemo(
() =>
Expand All @@ -510,8 +511,7 @@ export function ConstraintsFromTypeConstraintAttribute({
} = useConstraint({
constraint: typeConstraint,
itemDefinition,
isEnumDisabled: isEnumDisabled ?? false,
isRangeDisabled: isRangeDisabled ?? false,
isCollectionConstraintEnable: true, // typeConstraint enables to add a constraint to the collection itself
});

const onConstraintChange = useCallback(
Expand Down Expand Up @@ -627,7 +627,9 @@ export function Constraints({
}) {
return (
<>
{!canHaveConstraints(itemDefinition) ? (
{isConstraintEnabled.expression === false &&
isConstraintEnabled.enumeration === false &&
isConstraintEnabled.range === false ? (
<p
style={{
padding: "10px",
Expand All @@ -654,7 +656,7 @@ export function Constraints({
buttonId={ConstraintsType.EXPRESSION}
isSelected={selectedConstraint === ConstraintsType.EXPRESSION}
onChange={onToggleGroupChange}
isDisabled={isReadonly}
isDisabled={isReadonly || !isConstraintEnabled.expression}
/>
<ToggleGroupItem
text={ConstraintsType.ENUMERATION}
Expand Down Expand Up @@ -703,7 +705,7 @@ export function Constraints({
value={constraintValue}
savedValue={constraintValue}
onSave={onConstraintChange}
isDisabled={false}
isDisabled={!isConstraintEnabled.expression}
/>
)}
{selectedConstraint === ConstraintsType.NONE && (
Expand Down
5 changes: 1 addition & 4 deletions packages/dmn-editor/src/dataTypes/DataTypePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export function DataTypePanel({
...itemDefinition.allowedValues,
}
: undefined;
itemDefinition.allowedValues = undefined;
}
});
},
Expand Down Expand Up @@ -357,10 +358,8 @@ export function DataTypePanel({
typeRef={resolvedTypeRef}
onChange={changeTypeRef}
/>

<br />
<br />

{dataType.itemDefinition["@_isCollection"] === true ? (
<>
<Title size={"md"} headingLevel="h4">
Expand All @@ -371,8 +370,6 @@ export function DataTypePanel({
itemDefinition={dataType.itemDefinition}
editItemDefinition={editItemDefinition}
defaultsToAllowedValues={false}
isEnumDisabled={true}
isRangeDisabled={true}
/>
<br />
<br />
Expand Down
9 changes: 7 additions & 2 deletions packages/dmn-editor/src/dataTypes/DataTypeSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ export function getNewItemDefinition(partial?: Partial<DMN15__tItemDefinition>)
};
}

export function isCollection(itemDefinition: DMN15__tItemDefinition) {
return itemDefinition["@_isCollection"] ?? false;
}

export function isStruct(itemDefinition: DMN15__tItemDefinition) {
return !itemDefinition.typeRef && !!itemDefinition.itemComponent;
}
Expand All @@ -94,8 +98,9 @@ export const constrainableBuiltInFeelTypes = new Map<DmnBuiltInDataType, KIE__tC

export function canHaveConstraints(itemDefinition: DMN15__tItemDefinition) {
return (
!isStruct(itemDefinition) &&
(constrainableBuiltInFeelTypes.get(itemDefinition.typeRef?.__$$text as DmnBuiltInDataType)?.length ?? 0) > 0
isCollection(itemDefinition) ||
(!isStruct(itemDefinition) &&
(constrainableBuiltInFeelTypes.get(itemDefinition.typeRef?.__$$text as DmnBuiltInDataType)?.length ?? 0) > 0)
);
}

Expand Down