From e4164c7d6600cc8e85f0f09178082d1273b19c32 Mon Sep 17 00:00:00 2001 From: zeus Date: Sun, 23 Jan 2022 23:22:50 +0200 Subject: [PATCH] community menou 1 public/private --- src/components/mynetwork/AdhocView.vue | 4 +- .../availablemicroservicescustom.vue | 30 ++++++- .../mynetwork/buildermyservices.vue | 35 ++++++++ src/components/mynetwork/builderservices.vue | 31 +++++-- src/components/mynetwork/customservices.vue | 90 +++++++++++++++++-- src/components/mynetwork/mytable.vue | 2 +- src/store/modules/create_pipelineLLO.js | 1 + 7 files changed, 176 insertions(+), 17 deletions(-) diff --git a/src/components/mynetwork/AdhocView.vue b/src/components/mynetwork/AdhocView.vue index b6fe7ec..27fc1f6 100644 --- a/src/components/mynetwork/AdhocView.vue +++ b/src/components/mynetwork/AdhocView.vue @@ -458,7 +458,7 @@ export default { }) // from runLLO this.$root.$on('hybrid_log_in', (log) => { - console.log(log) + //console.log(log) //this.code += log.data //this.code += "\n" //console.log(" form socket log "+JSON.stringify(this.code)) @@ -495,7 +495,7 @@ export default { }) // from microservices not view icon this.$root.$on('hybrid_console_not_view', (v) => { - console.log(v) + //console.log(v) if(v){ this.vieconsoleicon = true }else if (!v){ diff --git a/src/components/mynetwork/availablemicroservicescustom.vue b/src/components/mynetwork/availablemicroservicescustom.vue index e7c5205..e8f2060 100644 --- a/src/components/mynetwork/availablemicroservicescustom.vue +++ b/src/components/mynetwork/availablemicroservicescustom.vue @@ -456,7 +456,35 @@ export default { titleClass: 'center aligned', dataClass: 'left aligned w-25 text-muted', visible:true, - width: '35%' + width: '25%' + }, + { + name: 'visibility', + title: 'Pub', + sortField: 'gitrepoCloneUrl', + dataClass: 'center aligned w-10 text-center', + visible:true, + width: '10%', + callback: function(value) { + //console.log('---- '+ value) + if (value == 'Public') { + var v = ` + +` + return v + }else{ + var v = ` + +` + return v + } + } }, { name: 'gitrepo', diff --git a/src/components/mynetwork/buildermyservices.vue b/src/components/mynetwork/buildermyservices.vue index 14916b5..2b46629 100644 --- a/src/components/mynetwork/buildermyservices.vue +++ b/src/components/mynetwork/buildermyservices.vue @@ -28,6 +28,13 @@
+ + Pub', + sortField: 'gitrepoCloneUrl', + dataClass: 'center aligned w-10 text-center', + visible:true, + width: '10%', + callback: function(value) { + //console.log('---- '+ value) + if (value == 'Public') { + var v = ` + +` + return v + }else{ + var v = ` + +` + return v + } + } + }, { name: '__slot:actions', // <---- title: 'Actions', diff --git a/src/components/mynetwork/builderservices.vue b/src/components/mynetwork/builderservices.vue index db5373c..89f7184 100644 --- a/src/components/mynetwork/builderservices.vue +++ b/src/components/mynetwork/builderservices.vue @@ -30,6 +30,12 @@
+ @@ -229,6 +236,7 @@ export default { title: 'Actions', titleClass: 'col text-center', dataClass: 'center aligned', + visible:false, width: '10%' }, ], @@ -337,15 +345,15 @@ export default { } }else if(action == 'upload-item' ){ - var log = await store.dispatch("pipelineLLO/getmyservices",{ - token:this.token, - service:data.swarmlabname - }) + // var log = await store.dispatch("pipelineLLO/getmyservices",{ + // token:this.token, + // service:data.swarmlabname + // }) //console.log(log) this.swarmlab=data var service = { - data: data, - log: log + data: data + // log: log } this.$root.$emit('hybrid_build_micro_service', service) } @@ -361,11 +369,15 @@ export default { return this.playbookInfo=value }, rowClicked(row, event) { + console.log(row) + this.onAction('upload-item', row, row._id) + /* return { html: true, title: () => { return 'Hello Popover: ' + (++this.counter) }, content: () => { return 'The date is:
' + new Date() + '' } } + */ }, loadsuccess(response) { var data = response.data.data @@ -400,6 +412,11 @@ export default { } +#idvuetablekeygmybuildservice1 tr td { + color: #2185d0; + cursor: pointer; +} + .flex-fixed-width-item { flex: 0 0 100px; } diff --git a/src/components/mynetwork/customservices.vue b/src/components/mynetwork/customservices.vue index c7bc922..b5e9c4b 100644 --- a/src/components/mynetwork/customservices.vue +++ b/src/components/mynetwork/customservices.vue @@ -9,7 +9,7 @@
- View and Manage your builds + View and Manage your build
@@ -125,6 +125,9 @@ round @click="onAction('form_version')"> + + +
@@ -133,7 +136,7 @@ {{ errors[0] }} +
+
+ +
+ + +
+ +
+ + +
+ +
+
+
@@ -506,6 +559,7 @@ export default { 'form_port3':'', 'form_name3':'', 'form_gitrepo':'', + 'form_visibility':'Public', customservice: { 'myservicename':'', 'os':'', @@ -549,7 +603,7 @@ export default { //console.log('false') }) this.$root.$on('hybrid_build_micro_service', (service) => { - //console.log(service); + console.log(service) this.setserviceform2null() this.menou = true this.myservicename = {} @@ -559,7 +613,8 @@ export default { this.menouselect = false this.customservice.microservice = service.data.swarmlabname this.form_baseservice = service.data.swarmlabname - + this.form_visibility = 'Public' +/* if( service.log.hasOwnProperty('data')){ if( service.log.data.hasOwnProperty('data')){ if(service.log.data.data){ @@ -574,6 +629,7 @@ export default { //console.log(cc) this.customservice.myservicename = service.log.data.data[cc].service this.customservice.baseservice = service.log.data.data[cc].baseservice + this.customservice.visibility = 'Public' this.customservice.sh = service.log.data.data[cc].sh this.customservice.os = service.log.data.data[cc].packages 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"} Vue.set(this.options, this.selected, vtmp1) //console.log('options '+ JSON.stringify(this.options)) +*/ }) this.$root.$on('hybrid_build_micro_myservice', (service) => { + console.log(service) this.menou = true this.myservicename = {} this.customserviceall = [] @@ -627,6 +685,7 @@ export default { if(service.log.data.data){ this.customservice.myservicename = service.log.data.data.service 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.os = service.log.data.data.packages this.customservice.readme = service.log.data.data.readme @@ -674,6 +733,10 @@ export default { }, methods: { + async onSwitch(value) { + console.log(value) + this.form_visibility = value + }, async onAction(value) { //console.log(value) var infotxt = '' @@ -764,6 +827,7 @@ export default { service: this.form_myservicename, readme: this.form_readme, baseservice: this.form_baseservice, + visibility: this.form_visibility, sh: this.form_sh, packages: this.form_os, gitrepo: this.form_gitrepo, @@ -850,6 +914,7 @@ export default { setserviceform(data) { this.form_myservicename = data.myservicename this.form_baseservice = data.baseservice + this.form_visibility = data.visibility this.form_sh = data.sh this.form_os = data.os this.form_readme = data.readme @@ -900,7 +965,8 @@ export default { 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.os = this.customserviceall[cc].packages this.customservice.readme = this.customserviceall[cc].readme @@ -942,7 +1008,7 @@ export default { } } else if(f == 'gitrepo'){ - var field = await this.$refs.hybrid_stackversion.validate(); + var field = await this.$refs.hybrid_stackgitrepo.validate(); if(field.valid == true){ this.isDeployValid.gitrepo = 1 }else{ @@ -967,6 +1033,18 @@ export default {