GIS-1621 - Use script prompting to obtain publishing info from user

This commit is contained in:
Dan Hawkins 2019-09-15 19:23:38 +01:00
commit c2f2a01bff
2 changed files with 27 additions and 8 deletions

View file

@ -85,8 +85,12 @@ pipeline {
steps { steps {
script { script {
publishitems = load("${autobuilder.commonscripts()}/publish/publishitems.groovy") publishitems = load("${autobuilder.commonscripts()}/publish/publishitems.groovy")
ITEMSDEFAULTLIST = "sgfdfsdf,sdfsdfsdfsf" def itemsobject = publishitems.createItemSelector(
def itemsobject = publishitems.createItemSelector(releasemeta, ITEMSDEFAULTLIST, MAX_META_DEPTH) 'Select software items',
'Print Server software items',
releasemeta,
ITEMSDEFAULTLIST,
MAX_META_DEPTH)
def selecteditems = input( def selecteditems = input(
message: 'Select which items from the release are to be published', message: 'Select which items from the release are to be published',
ok: 'Ok', ok: 'Ok',

View file

@ -14,9 +14,17 @@ class PublishableItemsSelection {
menuitemsfull = new ArrayList<String>() menuitemsfull = new ArrayList<String>()
} }
def init(releasemeta, String preselectedext, String metalevelsstringext) { def init(
String name,
String description,
releasemeta,
String preselectedext,
String metalevelsstringext,
String visibleItemCountExt,
String type) {
outputSelectionfromPreselect(preselectedmenuitems, preselectedext) outputSelectionfromPreselect(preselectedmenuitems, preselectedext)
def Integer metalevelsext = metalevelsstringext.toInteger() def Integer metalevelsext = metalevelsstringext.toInteger()
def Integer visibleItemCount = visibleItemCountExt.toInteger()
def metaitems = releasemeta.releasewalkerunique(metalevelsext) def metaitems = releasemeta.releasewalkerunique(metalevelsext)
for (key in metaitems.keySet()) { for (key in metaitems.keySet()) {
def releaseinfo = metaitems[key] def releaseinfo = metaitems[key]
@ -30,7 +38,7 @@ class PublishableItemsSelection {
def seperator = "," def seperator = ","
multiselect = new ExtendedChoiceParameterDefinition( multiselect = new ExtendedChoiceParameterDefinition(
"name", // String name name, // String name
"PT_CHECKBOX", // String type "PT_CHECKBOX", // String type
menuitemsfull.join(seperator), // String value menuitemsfull.join(seperator), // String value
"project name", // String projectName "project name", // String projectName
@ -58,8 +66,8 @@ class PublishableItemsSelection {
"", // String javascript "", // String javascript
false, // boolean saveJSONParameterToFile false, // boolean saveJSONParameterToFile
false, // boolean quoteValue false, // boolean quoteValue
100, // int visibleItemCount visibleItemCount, // int visibleItemCount
"multiselect", // String description description, // String description
seperator) // String multiSelectDelimiter seperator) // String multiSelectDelimiter
} }
@ -94,10 +102,17 @@ class PublishableItemsSelection {
} }
} }
PublishableItemsSelection createItemSelector(releasemeta, String preselectedext, String metalevelsstringext) { PublishableItemsSelection createItemSelector(
String name,
String description,
releasemeta,
String preselectedext,
String metalevelsstringext,
String visibleItemCountExt = '100',
String type = 'PS_MULTI_SELECT') { // Could also be "PT_CHECKBOX"
PublishableItemsSelection pis = new PublishableItemsSelection(this) PublishableItemsSelection pis = new PublishableItemsSelection(this)
pis.init(releasemeta, preselectedext, metalevelsstringext) pis.init(String name, String description, String visibleItemCountExt, releasemeta, preselectedext, metalevelsstringext)
return pis return pis
} }