-
Notifications
You must be signed in to change notification settings - Fork 20
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.
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 properties vip:dot #480
Custom properties vip:dot #480
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fine to me.
@camarasu do you want to review ?
Fine for me, too, thank you. |
verify if vip:dot values are one of the inputs
getter-setter for VipDotResultDir
intelligence to put result dir in dot or cross
parse vip:dot-result-directory
@@ -38,6 +41,8 @@ public class BoutiquesApplication implements IsSerializable { | |||
private Set<BoutiquesOutputFile> outputFiles = new HashSet<>(); | |||
private Map<String, String> tags = new HashMap<>(); | |||
private String jsonFile; | |||
private Set<String> vipDotInputIds; | |||
private String resultDirs; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename field and getter/setter with vipDotIncludesResultsDir
, and change type to boolean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed to boolean vipDotIncludesResultsDir
application.setVipContainer(vipImagePath); | ||
application.setVipContainer(getStringValue(customObject, "vip:imagepath", true)); | ||
application.setVipDotInputIds(getArrayValueAsStringSet(customObject, "vip:dot", true)); | ||
application.setVipDotResultDirs(getStringValue(customObject, "vip:dot-result-directory", true)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename to vip:dot-with-results-directory
.
Adapt to vip:dot-result-directory
being a boolean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to vip:dot-with-results-directory and adapt to the method getBooleanValue
Set<String> incorrectInputs = new HashSet<>(vipDotInputIds); | ||
incorrectInputs.removeAll(inputIds); | ||
String warningMessage = "<b>" + String.join(", ", incorrectInputs) + "</b> appears in vipDotInputIds but not in inputs. Please ensure all ids are correct."; | ||
Layout.getInstance().setWarningMessage(warningMessage); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in this case, it should be a error with an exception thrown.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
throwing ApplicationImporterException
} | ||
|
||
// Extract the IDs from inputs | ||
Set<String> inputIds = application.getInputs().stream().map(BoutiquesInput::getId).collect(Collectors.toSet()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You may add this as a BoutiquesApplication method. (optionally)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added the getinputIds method to BoutiquesApplication
<source name="$input.getId()" type="string" optional="$input.isOptional()" default="$input.getDefaultValue()" vip-type-restriction="flag" pretty-name="$input.getName()"> | ||
#else | ||
<source name="$input.getId()" type="string" optional="$input.isOptional()" default="false" vip-type-restriction="flag" pretty-name="$input.getName()"> | ||
#foreach( $input in $tool.getInputs() ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thnk VS or something else changed the indentation of velocity code and it generetad a lot of diff.
Could it be possible to keep the original indentation ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indeed, restore original indentation.
Changes in VIP-portal regarding custom properties
Custom dot inputs
Handling of Command Line Flag Inputs