|
@ -9,7 +9,7 @@ |
|
|
<b-container fluid class="bv-example-row"> |
|
|
<b-container fluid class="bv-example-row"> |
|
|
<div class="row text-center"> |
|
|
<div class="row text-center"> |
|
|
<div class="col-12"> |
|
|
<div class="col-12"> |
|
|
<b>View and <span class="text-info">Manage your builds</span></b> |
|
|
<b>View and <span class="text-info">Manage your build</span></b> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
@ -125,6 +125,9 @@ |
|
|
round |
|
|
round |
|
|
@click="onAction('form_version')"> |
|
|
@click="onAction('form_version')"> |
|
|
</button> |
|
|
</button> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
@ -133,7 +136,7 @@ |
|
|
</ValidationProvider> |
|
|
</ValidationProvider> |
|
|
|
|
|
|
|
|
<ValidationProvider |
|
|
<ValidationProvider |
|
|
ref="hybrid_stackversion" |
|
|
ref="hybrid_stackgitrepo" |
|
|
name="myGitrepo" |
|
|
name="myGitrepo" |
|
|
rules="required|alpha_num_url" |
|
|
rules="required|alpha_num_url" |
|
|
v-slot="{ errors, ariaMsg, ariaInput, valid, invalid }" |
|
|
v-slot="{ errors, ariaMsg, ariaInput, valid, invalid }" |
|
@ -171,6 +174,56 @@ |
|
|
<span class="hybrid-field-error">{{ errors[0] }}</span> |
|
|
<span class="hybrid-field-error">{{ errors[0] }}</span> |
|
|
</ValidationProvider> |
|
|
</ValidationProvider> |
|
|
|
|
|
|
|
|
|
|
|
<div class="row"> |
|
|
|
|
|
<div class="col-sm-12 sm-12"> |
|
|
|
|
|
|
|
|
|
|
|
<div class="input-group" |
|
|
|
|
|
v-if="form_visibility == 'Public'" |
|
|
|
|
|
> |
|
|
|
|
|
<button |
|
|
|
|
|
class="btn btn-success btn-sm" |
|
|
|
|
|
type="radio" |
|
|
|
|
|
name="options" |
|
|
|
|
|
v-model="form_visibility" |
|
|
|
|
|
> |
|
|
|
|
|
<span class="text-light">Public</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
<button |
|
|
|
|
|
class="btn btn-outline-secondary btn-sm" |
|
|
|
|
|
type="radio" |
|
|
|
|
|
name="options" |
|
|
|
|
|
v-model="form_visibility" |
|
|
|
|
|
@click="onSwitch('Private')" |
|
|
|
|
|
> |
|
|
|
|
|
<span class="text-muted">Private</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<div class="input-group" |
|
|
|
|
|
v-if="form_visibility == 'Private'" |
|
|
|
|
|
> |
|
|
|
|
|
<button |
|
|
|
|
|
class="btn btn-outline-secondary btn-sm" |
|
|
|
|
|
type="radio" |
|
|
|
|
|
name="options" |
|
|
|
|
|
v-model="form_visibility" |
|
|
|
|
|
@click="onSwitch('Public')" |
|
|
|
|
|
> |
|
|
|
|
|
<span class="text-muted">Public</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
<button |
|
|
|
|
|
class="btn btn-success btn-sm" |
|
|
|
|
|
type="radio" |
|
|
|
|
|
name="options" |
|
|
|
|
|
v-model="form_visibility" |
|
|
|
|
|
> |
|
|
|
|
|
<span class="text-light">Private</span> |
|
|
|
|
|
</button> |
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="row" |
|
|
<div class="row" |
|
|
<b-col class="text-center" cols="12" sm="12" md="12"> |
|
|
<b-col class="text-center" cols="12" sm="12" md="12"> |
|
@ -506,6 +559,7 @@ export default { |
|
|
'form_port3':'', |
|
|
'form_port3':'', |
|
|
'form_name3':'', |
|
|
'form_name3':'', |
|
|
'form_gitrepo':'', |
|
|
'form_gitrepo':'', |
|
|
|
|
|
'form_visibility':'Public', |
|
|
customservice: { |
|
|
customservice: { |
|
|
'myservicename':'', |
|
|
'myservicename':'', |
|
|
'os':'', |
|
|
'os':'', |
|
@ -549,7 +603,7 @@ export default { |
|
|
//console.log('false') |
|
|
//console.log('false') |
|
|
}) |
|
|
}) |
|
|
this.$root.$on('hybrid_build_micro_service', (service) => { |
|
|
this.$root.$on('hybrid_build_micro_service', (service) => { |
|
|
//console.log(service); |
|
|
console.log(service) |
|
|
this.setserviceform2null() |
|
|
this.setserviceform2null() |
|
|
this.menou = true |
|
|
this.menou = true |
|
|
this.myservicename = {} |
|
|
this.myservicename = {} |
|
@ -559,7 +613,8 @@ export default { |
|
|
this.menouselect = false |
|
|
this.menouselect = false |
|
|
this.customservice.microservice = service.data.swarmlabname |
|
|
this.customservice.microservice = service.data.swarmlabname |
|
|
this.form_baseservice = service.data.swarmlabname |
|
|
this.form_baseservice = service.data.swarmlabname |
|
|
|
|
|
this.form_visibility = 'Public' |
|
|
|
|
|
/* |
|
|
if( service.log.hasOwnProperty('data')){ |
|
|
if( service.log.hasOwnProperty('data')){ |
|
|
if( service.log.data.hasOwnProperty('data')){ |
|
|
if( service.log.data.hasOwnProperty('data')){ |
|
|
if(service.log.data.data){ |
|
|
if(service.log.data.data){ |
|
@ -574,6 +629,7 @@ export default { |
|
|
//console.log(cc) |
|
|
//console.log(cc) |
|
|
this.customservice.myservicename = service.log.data.data[cc].service |
|
|
this.customservice.myservicename = service.log.data.data[cc].service |
|
|
this.customservice.baseservice = service.log.data.data[cc].baseservice |
|
|
this.customservice.baseservice = service.log.data.data[cc].baseservice |
|
|
|
|
|
this.customservice.visibility = 'Public' |
|
|
this.customservice.sh = service.log.data.data[cc].sh |
|
|
this.customservice.sh = service.log.data.data[cc].sh |
|
|
this.customservice.os = service.log.data.data[cc].packages |
|
|
this.customservice.os = service.log.data.data[cc].packages |
|
|
this.customservice.readme = service.log.data.data[cc].readme |
|
|
this.customservice.readme = service.log.data.data[cc].readme |
|
@ -611,10 +667,12 @@ export default { |
|
|
var vtmp1 = {"value":this.selected,"text":"Please select an option"} |
|
|
var vtmp1 = {"value":this.selected,"text":"Please select an option"} |
|
|
Vue.set(this.options, this.selected, vtmp1) |
|
|
Vue.set(this.options, this.selected, vtmp1) |
|
|
//console.log('options '+ JSON.stringify(this.options)) |
|
|
//console.log('options '+ JSON.stringify(this.options)) |
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
this.$root.$on('hybrid_build_micro_myservice', (service) => { |
|
|
this.$root.$on('hybrid_build_micro_myservice', (service) => { |
|
|
|
|
|
console.log(service) |
|
|
this.menou = true |
|
|
this.menou = true |
|
|
this.myservicename = {} |
|
|
this.myservicename = {} |
|
|
this.customserviceall = [] |
|
|
this.customserviceall = [] |
|
@ -627,6 +685,7 @@ export default { |
|
|
if(service.log.data.data){ |
|
|
if(service.log.data.data){ |
|
|
this.customservice.myservicename = service.log.data.data.service |
|
|
this.customservice.myservicename = service.log.data.data.service |
|
|
this.customservice.baseservice = service.log.data.data.baseservice |
|
|
this.customservice.baseservice = service.log.data.data.baseservice |
|
|
|
|
|
this.customservice.visibility = service.log.data.data.visibility |
|
|
this.customservice.sh = service.log.data.data.sh |
|
|
this.customservice.sh = service.log.data.data.sh |
|
|
this.customservice.os = service.log.data.data.packages |
|
|
this.customservice.os = service.log.data.data.packages |
|
|
this.customservice.readme = service.log.data.data.readme |
|
|
this.customservice.readme = service.log.data.data.readme |
|
@ -674,6 +733,10 @@ export default { |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
async onSwitch(value) { |
|
|
|
|
|
console.log(value) |
|
|
|
|
|
this.form_visibility = value |
|
|
|
|
|
}, |
|
|
async onAction(value) { |
|
|
async onAction(value) { |
|
|
//console.log(value) |
|
|
//console.log(value) |
|
|
var infotxt = '' |
|
|
var infotxt = '' |
|
@ -764,6 +827,7 @@ export default { |
|
|
service: this.form_myservicename, |
|
|
service: this.form_myservicename, |
|
|
readme: this.form_readme, |
|
|
readme: this.form_readme, |
|
|
baseservice: this.form_baseservice, |
|
|
baseservice: this.form_baseservice, |
|
|
|
|
|
visibility: this.form_visibility, |
|
|
sh: this.form_sh, |
|
|
sh: this.form_sh, |
|
|
packages: this.form_os, |
|
|
packages: this.form_os, |
|
|
gitrepo: this.form_gitrepo, |
|
|
gitrepo: this.form_gitrepo, |
|
@ -850,6 +914,7 @@ export default { |
|
|
setserviceform(data) { |
|
|
setserviceform(data) { |
|
|
this.form_myservicename = data.myservicename |
|
|
this.form_myservicename = data.myservicename |
|
|
this.form_baseservice = data.baseservice |
|
|
this.form_baseservice = data.baseservice |
|
|
|
|
|
this.form_visibility = data.visibility |
|
|
this.form_sh = data.sh |
|
|
this.form_sh = data.sh |
|
|
this.form_os = data.os |
|
|
this.form_os = data.os |
|
|
this.form_readme = data.readme |
|
|
this.form_readme = data.readme |
|
@ -900,7 +965,8 @@ export default { |
|
|
|
|
|
|
|
|
this.customservice.myservicename = this.customserviceall[cc].service |
|
|
this.customservice.myservicename = this.customserviceall[cc].service |
|
|
|
|
|
|
|
|
this.customservice.baseservice = this.customserviceall[cc].baseservice |
|
|
this.customservice.baseservice = this.customserviceall[cc].baseservice |
|
|
|
|
|
this.customservice.visibility = this.customserviceall[cc].visibility |
|
|
this.customservice.sh = this.customserviceall[cc].sh |
|
|
this.customservice.sh = this.customserviceall[cc].sh |
|
|
this.customservice.os = this.customserviceall[cc].packages |
|
|
this.customservice.os = this.customserviceall[cc].packages |
|
|
this.customservice.readme = this.customserviceall[cc].readme |
|
|
this.customservice.readme = this.customserviceall[cc].readme |
|
@ -942,7 +1008,7 @@ export default { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else if(f == 'gitrepo'){ |
|
|
else if(f == 'gitrepo'){ |
|
|
var field = await this.$refs.hybrid_stackversion.validate(); |
|
|
var field = await this.$refs.hybrid_stackgitrepo.validate(); |
|
|
if(field.valid == true){ |
|
|
if(field.valid == true){ |
|
|
this.isDeployValid.gitrepo = 1 |
|
|
this.isDeployValid.gitrepo = 1 |
|
|
}else{ |
|
|
}else{ |
|
@ -967,6 +1033,18 @@ export default { |
|
|
<style lang="scss"> |
|
|
<style lang="scss"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.switchsecondary { |
|
|
|
|
|
background: var(--secondary); |
|
|
|
|
|
color: #fff; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.flex-fixed-width-item { |
|
|
.flex-fixed-width-item { |
|
|
flex: 0 0 100px; |
|
|
flex: 0 0 100px; |
|
|