Skip to content

fix(effects): Condition of 0 was displaying as [Not Set] (#3086) #3087

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
ebiggz merged 2 commits into from
Apr 7, 2025
Merged

fix(effects): Condition of 0 was displaying as [Not Set] (#3086) #3087

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddbfca3
fix(effects): Condition of 0 was [Not Set] (#3086)
phroggster Apr 6, 2025
132bbf8
Merge branch 'v5' into fix/3086
ebiggz Apr 7, 2025
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
12 changes: 6 additions & 6 deletions src/gui/app/directives/conditional-effect/conditionDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

function getRightSideValueDisplay() {
return $q(async (resolve) => {
if ($ctrl.condition == null || $ctrl.condition.rightSideValue == null || $ctrl.condition.rightSideValue === "") {
if ($ctrl.condition == null || $ctrl.condition.rightSideValue === null || $ctrl.condition.rightSideValue === undefined || $ctrl.condition.rightSideValue === "") {
resolve("[Not Set]");
} else {
const value = await $injector.invoke($ctrl.conditionType.getRightSideValueDisplay, {}, {
Expand All @@ -60,7 +60,7 @@

function getLeftSideValueDisplay() {
return $q(async (resolve) => {
if ($ctrl.condition == null || $ctrl.condition.leftSideValue == null || $ctrl.condition.leftSideValue === "") {
if ($ctrl.condition == null || $ctrl.condition.leftSideValue === null || $ctrl.condition.leftSideValue === undefined || $ctrl.condition.leftSideValue === "") {
resolve("[Not Set]");
} else {
const value = await $injector.invoke($ctrl.conditionType.getLeftSideValueDisplay, {}, {
Expand All @@ -73,19 +73,19 @@

$ctrl.$onInit = function() {
getRightSideValueDisplay().then((value) => {
$ctrl.rightSideValueDisplay = value || "[Not Set]";
$ctrl.rightSideValueDisplay = value !== null && value !== undefined ? value : "[Not Set]";
Copy link
Member

@ebiggz ebiggz Apr 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works just fine. But note that a single value != null check would be sufficient as it only checks null and undefined, it's not a full falsey check (that would catch 0).

});
getLeftSideValueDisplay().then((value) => {
$ctrl.leftSideValueDisplay = value || "[Not Set]";
$ctrl.leftSideValueDisplay = value !== null && value !== undefined ? value : "[Not Set]";
});
};

$ctrl.$onChanges = function() {
getRightSideValueDisplay().then((value) => {
$ctrl.rightSideValueDisplay = value || "[Not Set]";
$ctrl.rightSideValueDisplay = value !== null && value !== undefined ? value : "[Not Set]";
});
getLeftSideValueDisplay().then((value) => {
$ctrl.leftSideValueDisplay = value || "[Not Set]";
$ctrl.leftSideValueDisplay = value !== null && value !== undefined ? value : "[Not Set]";
});
};
}
Expand Down