Skip to content

Commit

Permalink
Merge pull request #102 from grycap/master
Browse files Browse the repository at this point in the history 
fixing bug changes
  • Loading branch information
@catttam
catttam committed Apr 15, 2024
2 parents f22e666 + 52fcf30 commit 936abb8
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 50 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"sweetalert2": "^11.4.8",
"timers": "^0.1.1",
"vue": "^2.5.17",
"vue-json-pretty": "^1.9.5",
"vue-material": "^1.0.0-beta-14",
"vue-perfect-scrollbar": "^0.1.0",
"vue-router": "^3.0.1",
Expand Down
32 changes: 20 additions & 12 deletions src/components/AppDrawer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<button class="" type="button" @click="cleanfield()"><v-icon left color="red">cancel</v-icon></button>
</div>
<span v-show="error" style="color: #cc3300; font-size: 12px;"><b>Bucket name is required</b></span>
<span v-show="errorEGI" style="color: #cc3300; font-size: 12px;"><b>EGI auth does not allow create buckets</b></span>
</div>
</div>
</v-list>
Expand Down Expand Up @@ -99,6 +100,7 @@ export default {
},
data: () => ({
error: false,
errorEGI: false,
clipped: false,
test: true,
mini: false,
Expand Down Expand Up @@ -206,10 +208,13 @@ export default {
this.newBucketName = " ";
},
createBucket (name) {
if (this.newBucketName.length > 0){
if (this.newBucketName.length > 0 && !this.checkIfToken()){
this.error = false
this.errorEGI=false
var params = {'name': name.replace(/[^A-Z0-9]+/ig, "")};
this.createBucketCall(params,this.createBucketCallBack)
}else if( this.checkIfToken()){
this.errorEGI=true
}else{
this.error =true
this.error_message_text = "Error"
Expand Down Expand Up @@ -252,23 +257,26 @@ export default {
},
getBucketListCallBack(response){
try{
this.buckets = response.map((bucket) => {
return {
title: bucket.name,
to: `/buckets/${bucket.name}`,
active: false
}
})
this.menus.find((obj) => {
if (obj.title === 'Storage') {
obj.items = this.buckets
}
if(response?.code !== 'AccessDenied'){
this.buckets = response.map((bucket) => {
return {
title: bucket.name,
to: `/buckets/${bucket.name}`,
active: false
}
})
this.menus.find((obj) => {
if (obj.title === 'Storage') {
obj.items = this.buckets
}
})
}
}catch(err) {
console.error("ERROR with list buckets "+err);
}
},
getBucketsList () {
this.getBucketListCall(this.getBucketListCallBack)
},
}
Expand Down
76 changes: 41 additions & 35 deletions src/views/Functions.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,28 @@
<p style="display:inline" v-if=" alpineImage(props.item.alpine)">Yes</p>
<p style="display:inline" v-if=" !alpineImage(props.item.alpine)">No</p>
</v-card-text>
<v-card-text class="custom-padding"><strong>Is this service expose? </strong>
<v-card-text class="custom-padding"><strong>Is this service exposed? </strong>
<p style="display:inline" v-if=" isServiceExpose(props.item?.expose?.port)">Yes</p>
<p style="display:inline" v-if=" !isServiceExpose(props.item?.expose?.port)">No</p>
<p style="display:inline" v-if=" !isServiceExpose(props.item?.expose?.port)">No</p>
<ul v-if="isServiceExpose(props.item?.expose?.port)">
<li v-if="props.item?.expose?.nodePort == 0"><strong>url: </strong> <a target="_blank" :href="api+'/system/services/'+props.item.name+'/exposed/'">
{{api}}/system/services/{{props.item.name}}/exposed/ </a> </li>
<li><strong>min_scale: </strong> {{props.item?.expose?.min_scale}}</li>
<li><strong> max_scale: </strong> {{props.item?.expose?.max_scale}}</li>
<li><strong> port: </strong> {{props.item?.expose?.port}}</li>
<li><strong> cpu_threshold: </strong> {{props.item?.expose?.cpu_threshold}}</li>
<li><strong> rewrite_target: </strong> {{props.item?.expose?.rewrite_target}}</li>
<li v-if="props.item?.expose?.nodePort != 0"><strong> nodePort: </strong> {{props.item?.expose?.nodePort}}</li>
<li><strong> default_command: </strong> {{props.item?.expose?.default_command}}</li>
</ul>
</v-card-text>
<v-card-text v-show="getInterLink_available" class="custom-padding"><strong>Does this service use InterLink? </strong>
<v-card-text v-show="getInterLink_available" class="custom-padding"><strong>Is this service using InterLink? </strong>
<p style="display:inline" v-if=" useInterLink(props.item.enable_InterLink)">Yes</p>
<p style="display:inline" v-if=" !useInterLink(props.item.enable_InterLink)">No</p>
</v-card-text>
<v-card-text class="custom-padding"><strong>Environment variables: </strong>
<pre v-show="Object.keys(props.item.environment.Variables).length!==0" id="json-renderer"></pre>
<v-card-text v-show="Object.keys(props.item.environment.Variables).length!==0" class="custom-padding"><strong>Environment variables: </strong>
<pre id="json-renderer">{{showEnvVars(props.item.environment.Variables)}}</pre>
</v-card-text>
<v-card-actions>
Expand All @@ -167,7 +172,7 @@
<b>Suffix</b>
</div>
</div>
<div v-for="(val, i) in props.item.inputs" :key="'A'+ i" class="row" style="margin:10px 30px 20px 30px;border-bottom:1px solid #eee;padding-bottom:10px;">
<div v-for="(val, i) in props.item.input" :key="'A'+ i" class="row" style="margin:10px 30px 20px 30px;border-bottom:1px solid #eee;padding-bottom:10px;">
<div class="col-3 col-md-3 text-left">
<span class="d-inline d-md-none">{{val.path}}</span>
</div>
Expand Down Expand Up @@ -203,7 +208,7 @@
<b>Suffix</b>
</div>
</div>
<div v-for="(val, i) in props.item.outputs" :key="'D'+ i" class="row" style="margin:10px 30px 20px 30px;border-bottom:1px solid #eee;padding-bottom:10px;">
<div v-for="(val, i) in props.item.output" :key="'D'+ i" class="row" style="margin:10px 30px 20px 30px;border-bottom:1px solid #eee;padding-bottom:10px;">
<div class="col-3 col-md-3 text-left">
<span class="d-inline d-md-none">{{val.path}}</span>
</div>
Expand Down Expand Up @@ -422,34 +427,34 @@ export default {
this.show_spinner = false;
if (response.data !== null) {
this.services = Object.assign(this.services, response.data);
console.log(response.data)
this.services = response.data.map((serv) => {
//console.log(serv)
return serv/*{
service: serv.name,
container: serv.image,
token: serv.token,
cpu: serv.cpu,
logLevel: serv.log_level,
envVars: serv.environment,
image_pull_secrets:serv.image_pull_secrets,
annotations: serv.annotations,
labels: serv.labels,
memory: serv.memory,
input: serv.input,
output: serv.output,
storage_providers: serv.storage_providers,
script: serv.script,
total_cpu: serv.total_cpu,
total_memory: serv.total_memory,
alpine: serv.alpine,
image_prefetch: serv.image_prefetch,
expose:serv.expose,
enable_gpu: serv.enable_gpu,
enable_InterLink: serv.enable_InterLink
}*/
})
this.services = Object.assign(this.services, response.data);
console.log(response.data)
this.services = response.data.map((serv) => {
//console.log(serv)
return serv/*{
service: serv.name,
container: serv.image,
token: serv.token,
cpu: serv.cpu,
logLevel: serv.log_level,
envVars: serv.environment,
image_pull_secrets:serv.image_pull_secrets,
annotations: serv.annotations,
labels: serv.labels,
memory: serv.memory,
input: serv.input,
output: serv.output,
storage_providers: serv.storage_providers,
script: serv.script,
total_cpu: serv.total_cpu,
total_memory: serv.total_memory,
alpine: serv.alpine,
image_prefetch: serv.image_prefetch,
expose:serv.expose,
enable_gpu: serv.enable_gpu,
enable_InterLink: serv.enable_InterLink
}*/
})
}
this.loading = false;
}else{
Expand Down Expand Up @@ -508,6 +513,7 @@ export default {
// this.bottom = this.bottomVisible()
}.bind(this));
this.listServicesCall(this.listServicesCallback)
this.api = localStorage.getItem("api");
}
}
</script>
Expand Down
6 changes: 3 additions & 3 deletions src/views/Login.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ export default {
localStorage.setItem("authenticated", true);
localStorage.setItem("user", this.model.username);
localStorage.setItem("password", this.model.password);
localStorage.setItem("yunikorn_enable",response.data.config.yunikorn_enable);
localStorage.setItem("gpu_available",response.data.config.gpu_available);
localStorage.setItem("interLink_available",response.data.config.interLink_available);
localStorage.setItem("yunikorn_enable",response.data.config?.yunikorn_enable);
localStorage.setItem("gpu_available",response.data.config?.gpu_available);
localStorage.setItem("interLink_available",response.data.config?.interLink_available);
},
checkLoginCallback(response){
if(response == 200){
Expand Down

0 comments on commit 936abb8

Please sign in to comment.