diff --git a/src-local/llo/new.js b/src-local/llo/new.js index 767736a..01ac7b0 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -1086,6 +1086,40 @@ app.get('/getservicesinfo', (req, res, next) => { }); +app.get('/getservicesinfocustom', (req, res, next) => { + + var mydir = process.cwd() + var RES = new Object(); + var obj = JSON.parse(req.query["instance"]) + //console.log(obj) + RES.service = obj.instance.service + RES.baseservice = obj.instance.baseservice + RES.user = obj.instance.user + var baseservicetmp1 = RES.user.split('@') + var baseservice = `${baseservicetmp1[0]}-${RES.service}` + var myservice = `${RES.user}_${RES.service}_${RES.baseservice}/${baseservice}` + + var services_path = './community/'+myservice + if (fs.existsSync(services_path)) { + var found = 'yes' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + RES.pathdir = mydir; + RES.path = myservice; + res.json(RES) + }else{ + var found = 'no' + RES.error = false + RES.error_msg = "ok" + RES.data = found; + RES.pathdir = mydir; + RES.path = false; + res.json(RES) + } + +}); + app.get('/getjupyterinfo', (req, res, next) => { var RES = new Object(); diff --git a/src/App.vue b/src/App.vue index d06fd32..ddd2b02 100644 --- a/src/App.vue +++ b/src/App.vue @@ -264,15 +264,15 @@ Labs@Home - + MicroServices + LabRoom Storage Proof_of_concept - MicroServices @@ -358,13 +358,13 @@ + - diff --git a/src/components/dashboard.vue b/src/components/dashboard.vue index a766cf4..c39bc65 100644 --- a/src/components/dashboard.vue +++ b/src/components/dashboard.vue @@ -22,13 +22,13 @@ - + @@ -40,12 +40,12 @@ import {mapState, mapGetters, mapActions} from 'vuex' import card from '@/components/Card.vue' import CalendarView from "./manageservices/calendarview.vue"; //import CalendarView from "./manageservices/view-service.vue"; -import CalendarViewEvents from "./manageservices/view-events.vue"; +//import CalendarViewEvents from "./manageservices/view-events.vue"; export default { components: { card, - CalendarView, - CalendarViewEvents + CalendarView + // CalendarViewEvents }, data () { return { diff --git a/src/components/manageservices/manage-service.vue b/src/components/manageservices/manage-service.vue index 2119ae9..230c27b 100644 --- a/src/components/manageservices/manage-service.vue +++ b/src/components/manageservices/manage-service.vue @@ -618,8 +618,10 @@ export default { loadsuccess(response) { var data = response.data.data this.fielddata=data - var n = data.length - n=n-1 + if(data.length){ + var n = data.length + n=n-1 + } }, onLoadError(payload) { /* diff --git a/src/components/mynetwork/availablemicroservices.vue b/src/components/mynetwork/availablemicroservices.vue index 5362ecd..6e4b60f 100644 --- a/src/components/mynetwork/availablemicroservices.vue +++ b/src/components/mynetwork/availablemicroservices.vue @@ -160,6 +160,7 @@ > Save + @@ -850,7 +860,7 @@ export default { if(obWEB.name == this.hybridoptions.swarmlabname){ if(obWEB.hasOwnProperty('custom')){ if(obWEB.custom != 'no'){ - console.log(obWEB.custom) + //console.log(obWEB.custom) this.customedit = true this.custom.os = obWEB.customos this.custom.sh = obWEB.customsh @@ -936,7 +946,7 @@ export default { }) this.custommenouopen = false this.custommenou = false - console.log('chown ok '+ JSON.stringify(log.data)) + //console.log('chown ok '+ JSON.stringify(log.data)) }, async setcustom(){ let value = {} @@ -978,8 +988,8 @@ export default { //this.custom.sh = log.data.extrashtext Vue.set(this.custom, 'sh', log.data.extrashtext) } - console.log('chown extrapackages1 '+ JSON.stringify(this.custom.os)) - console.log('chown sh1 '+ JSON.stringify(this.custom.sh)) + //console.log('chown extrapackages1 '+ JSON.stringify(this.custom.os)) + //console.log('chown sh1 '+ JSON.stringify(this.custom.sh)) } }else{ @@ -1117,11 +1127,11 @@ info +=' Click on hyperlink opens Directory in new tab

' async onActionstop(result) { if (result.isConfirmed) { this.$wait.start('myRunInstancetutorremove'); - console.log('yes delete') + //console.log('yes delete') //v-if="testtest[props.rowData.swarmlabname] != props.rowData.swarmlabname && testtestdir[props.rowData.swarmlabname] == props.rowData.swarmlabname" //title="Remove Lab_Instance" //@click="onAction('rm-install', props.rowData, props.rowData._id)" - console.log(this.hybridoptions) + //console.log(this.hybridoptions) this.resetcustom() this.$wait.start('myRunInstancetutor'); var res = await store.dispatch('pipelineLLO/rmswarmlablocal', this.hybridoptions.swarmlabname) @@ -1175,15 +1185,16 @@ info +=' Click on hyperlink opens Directory in new tab

' > */ - console.log(row) - console.log(event) + //console.log(row) + //console.log(this.testtest) + //console.log(this.testtestdir) // ----------------------------- // check status run start it // ----------------------------- if(this.testtest[row.swarmlabname] != row.swarmlabname && this.testtestdir[row.swarmlabname] == row.swarmlabname){ if(!this.swarmlabinfonow){ this.hybridoptions = row - console.log('start '+row.swarmlabname) + //console.log('start '+row.swarmlabname) this.startservice = true this.onAction ('run-item', row, row._id) } @@ -1194,7 +1205,7 @@ info +=' Click on hyperlink opens Directory in new tab

' // ----------------------------- // check status run is running stop it // ----------------------------- - console.log('stop ' + row.swarmlabname) + //console.log('stop ' + row.swarmlabname) this.hybridoptions = row this.startservice = false this.onAction ('run-item', row, row._id) diff --git a/src/components/mynetwork/availablemicroservicescustom.vue b/src/components/mynetwork/availablemicroservicescustom.vue index d324e85..dd78dc7 100644 --- a/src/components/mynetwork/availablemicroservicescustom.vue +++ b/src/components/mynetwork/availablemicroservicescustom.vue @@ -7,7 +7,7 @@ - +