Skip to content

Add validation mode to UiUtil.DialogSaveCancel #6

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

Open
devin-ai-integration wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add validation mode to UiUtil.DialogSaveCancel #6

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
57 changes: 55 additions & 2 deletions lib/UiUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,61 @@ UiUtil.DialogAnswerOk = function(value) {

return result;
};
UiUtil.DialogSaveCancel = function(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc) {
UiUtil.DialogTwoButton(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc, "Save", "Cancel");
UiUtil.DialogSaveCancel = function(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc, aValidationOption) {
if (UiUtil.NotUndefineNotNullNotBlank(aValidationOption)) {
// Validation mode: requires jsonObject, divBodyName, createBody, and onValidate
var aOnValidate = aValidationOption.onValidate;
var aBodyName = aValidationOption.divBodyName;
var aJsonObject = aValidationOption.jsonObject;
var aCreateBody = aValidationOption.createBody;
var aOnFailValidation = aValidationOption.onFailValidation;

if (!aValidationOption.cloneObject) { // will not clone for recursive calls
aValidationOption.cloneObject = JSON.parse(JSON.stringify(aJsonObject));
}

var divBody = document.createElement('div');
divBody.setAttribute('id', aBodyName);
divBody.setAttribute('style', 'text-align:left;margin-top:15px');
var bodyContent = divBody;

var jsFunc = function() {
if (UiUtil.NotUndefineNotNullNotBlank(onOpenFunc)) {
onOpenFunc();
}
if (UiUtil.NotUndefineNotNullNotBlank(aCreateBody)) {
aCreateBody(aValidationOption.cloneObject);
}
};

UiUtil.DialogTwoButton(titleHtml, bodyContent, aIcon, function() {
UiUtil.PopulateJsonFromDialog(aBodyName, aValidationOption.cloneObject, function() {
if (UiUtil.NotUndefineNotNullNotBlank(aOnValidate)) {
aOnValidate(aValidationOption.cloneObject, function(aFailMsg) {
if (UiUtil.NotUndefineNotNullNotBlank(aFailMsg)) {
if (UiUtil.NotUndefineNotNullNotBlank(aOnFailValidation)) {
aOnFailValidation();
}
UiUtil.DialogError("Error", aFailMsg, function() {
UiUtil.DialogSaveCancel(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc, aValidationOption);
});
} else {
if (UiUtil.NotUndefineNotNullNotBlank(jsOk)) {
jsOk(aValidationOption.cloneObject);
}
}
});
} else {
if (UiUtil.NotUndefineNotNullNotBlank(jsOk)) {
jsOk(aValidationOption.cloneObject);
}
}
});
}, jsCancel, jsFunc, "Save", "Cancel");
} else {
// Original behavior: no validation, simple pass-through
UiUtil.DialogTwoButton(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc, "Save", "Cancel");
}
};
UiUtil.DialogOkCancel = function(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc) {
UiUtil.DialogTwoButton(titleHtml, msgHtml, aIcon, jsOk, jsCancel, onOpenFunc, "Ok", "Cancel");
Expand Down