Skip to content

Commit 0c963d0

Browse files
rcmaiolinircmaiolini
authored
Merge pull request #856 from ercole-io/fix-bugs
Fix bugs
2 parents 810f598 + 9ffe528 commit 0c963d0

File tree

4 files changed

+119
-114
lines changed

4 files changed

+119
-114
lines changed

‎src/components/Header.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export default {
135135
title: 'Ercole Version',
136136
message: `
137137
<p class="has-text-weight-bold">Server Version: <span class="has-text-weight-normal">${this.version}</span></p>
138-
<p class="has-text-weight-bold">Web Version: <span class="has-text-weight-normal">2.47.0</span></p>
138+
<p class="has-text-weight-bold">Web Version: <span class="has-text-weight-normal">2.48.0</span></p>
139139
`,
140140
cancelButton: false,
141141
type: 'is-success',

‎src/components/Menu.vue‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -375,114 +375,114 @@ export default {
375375
},
376376
],
377377
},
378-
{
379-
title: this.$i18n.t('menu.cloudAdvisor'),
380-
icon: 'fas fa-cloud',
381-
attributes: { 'data-cy': 'mn-cloud' },
382-
hidden: this.checkMenu('Cloud Advisors', ''),
383-
child: [
384-
{
385-
title: this.$i18n.t('menu.oracle'),
386-
icon: 'fas fa-cloud',
387-
attributes: { 'data-cy': 'mn-cloud-oracle' },
388-
hidden: this.checkMenu('Oracle', 'Cloud Advisors'),
389-
child: [
390-
{
391-
href: { name: 'oracle-profile-configurations' },
392-
title: this.$i18n.t('menu.profileConfig'),
393-
icon: 'fas fa-user-cog',
394-
class: 'menu-third-level',
395-
attributes: { 'data-cy': 'mn-cloud-oracle-profile' },
396-
hidden: this.checkMenu('Profile Configuration', 'Oracle'),
397-
},
398-
{
399-
href: { name: 'oracle-recommendations' },
400-
title: this.$i18n.t('menu.recommendations'),
401-
icon: 'fas fa-user-shield',
402-
class: 'menu-third-level',
403-
disabled: !this.getCloudActiveProfiles('oci'),
404-
attributes: { 'data-cy': 'mn-cloud-oracle-recommendations' },
405-
hidden: this.checkMenu('Recommendations', 'Oracle'),
406-
},
407-
],
408-
},
409-
// {
410-
// title: this.$i18n.t('menu.aws'),
411-
// icon: 'fas fa-cloud',
412-
// attributes: { 'data-cy': 'mn-cloud-aws' },
413-
// hidden: this.checkMenu('AWS', 'Cloud Advisors'),
414-
// child: [
415-
// {
416-
// href: { name: 'aws-profile-configurations' },
417-
// title: this.$i18n.t('menu.profileConfig'),
418-
// icon: 'fas fa-user-cog',
419-
// class: 'menu-third-level',
420-
// attributes: { 'data-cy': 'mn-cloud-aws-profile' },
421-
// hidden: this.checkMenu('Profile Configuration', 'AWS'),
422-
// },
423-
// {
424-
// href: { name: 'aws-recommendations' },
425-
// title: this.$i18n.t('menu.recommendations'),
426-
// icon: 'fas fa-user-shield',
427-
// class: 'menu-third-level',
428-
// disabled: !this.getCloudActiveProfiles('aws'),
429-
// attributes: { 'data-cy': 'mn-cloud-aws-recommendations' },
430-
// hidden: this.checkMenu('Recommendations', 'AWS'),
431-
// },
432-
// ],
433-
// },
434-
// {
435-
// title: this.$i18n.t('menu.azure'),
436-
// icon: 'fas fa-cloud',
437-
// attributes: { 'data-cy': 'mn-cloud-azure' },
438-
// hidden: this.checkMenu('Azure', 'Cloud Advisors'),
439-
// child: [
440-
// {
441-
// href: { name: 'azure-profile-configurations' },
442-
// title: this.$i18n.t('menu.profileConfig'),
443-
// icon: 'fas fa-user-cog',
444-
// class: 'menu-third-level',
445-
// attributes: { 'data-cy': 'mn-cloud-azure-profile' },
446-
// hidden: this.checkMenu('Profile Configuration', 'Azure'),
447-
// },
448-
// // {
449-
// // href: { name: 'azure-recommendations' },
450-
// // title: this.$i18n.t('menu.recommendations'),
451-
// // icon: 'fas fa-user-shield',
452-
// // class: 'menu-third-level',
453-
// // disabled: !this.getCloudActiveProfiles('azure'),
454-
// // attributes: { 'data-cy': 'mn-cloud-azure-recommendations' },
455-
// // hidden: this.checkMenu('Recommendations', 'Azure'),
456-
// // },
457-
// ],
458-
// },
459-
{
460-
title: 'Google',
461-
icon: 'fas fa-cloud',
462-
attributes: { 'data-cy': 'mn-cloud-google' },
463-
hidden: !this.checkMenu('Google', 'Cloud Advisors'),
464-
child: [
465-
{
466-
href: { name: 'google-profile-configurations' },
467-
title: this.$i18n.t('menu.profileConfig'),
468-
icon: 'fas fa-user-cog',
469-
class: 'menu-third-level',
470-
attributes: { 'data-cy': 'mn-cloud-google-profile' },
471-
hidden: !this.checkMenu('Profile Configuration', 'Google'),
472-
},
473-
{
474-
href: { name: 'google-recommendations' },
475-
title: this.$i18n.t('menu.recommendations'),
476-
icon: 'fas fa-user-shield',
477-
class: 'menu-third-level',
478-
// disabled: !this.getCloudActiveProfiles('oci'),
479-
attributes: { 'data-cy': 'mn-cloud-google-recommendations' },
480-
hidden: !this.checkMenu('Recommendations', 'Google'),
481-
},
482-
],
483-
},
484-
],
485-
},
378+
// {
379+
// title: this.$i18n.t('menu.cloudAdvisor'),
380+
// icon: 'fas fa-cloud',
381+
// attributes: { 'data-cy': 'mn-cloud' },
382+
// hidden: this.checkMenu('Cloud Advisors', ''),
383+
// child: [
384+
// {
385+
// title: this.$i18n.t('menu.oracle'),
386+
// icon: 'fas fa-cloud',
387+
// attributes: { 'data-cy': 'mn-cloud-oracle' },
388+
// hidden: this.checkMenu('Oracle', 'Cloud Advisors'),
389+
// child: [
390+
// {
391+
// href: { name: 'oracle-profile-configurations' },
392+
// title: this.$i18n.t('menu.profileConfig'),
393+
// icon: 'fas fa-user-cog',
394+
// class: 'menu-third-level',
395+
// attributes: { 'data-cy': 'mn-cloud-oracle-profile' },
396+
// hidden: this.checkMenu('Profile Configuration', 'Oracle'),
397+
// },
398+
// {
399+
// href: { name: 'oracle-recommendations' },
400+
// title: this.$i18n.t('menu.recommendations'),
401+
// icon: 'fas fa-user-shield',
402+
// class: 'menu-third-level',
403+
// disabled: !this.getCloudActiveProfiles('oci'),
404+
// attributes: { 'data-cy': 'mn-cloud-oracle-recommendations' },
405+
// hidden: this.checkMenu('Recommendations', 'Oracle'),
406+
// },
407+
// ],
408+
// },
409+
// {
410+
// title: this.$i18n.t('menu.aws'),
411+
// icon: 'fas fa-cloud',
412+
// attributes: { 'data-cy': 'mn-cloud-aws' },
413+
// hidden: this.checkMenu('AWS', 'Cloud Advisors'),
414+
// child: [
415+
// {
416+
// href: { name: 'aws-profile-configurations' },
417+
// title: this.$i18n.t('menu.profileConfig'),
418+
// icon: 'fas fa-user-cog',
419+
// class: 'menu-third-level',
420+
// attributes: { 'data-cy': 'mn-cloud-aws-profile' },
421+
// hidden: this.checkMenu('Profile Configuration', 'AWS'),
422+
// },
423+
// {
424+
// href: { name: 'aws-recommendations' },
425+
// title: this.$i18n.t('menu.recommendations'),
426+
// icon: 'fas fa-user-shield',
427+
// class: 'menu-third-level',
428+
// disabled: !this.getCloudActiveProfiles('aws'),
429+
// attributes: { 'data-cy': 'mn-cloud-aws-recommendations' },
430+
// hidden: this.checkMenu('Recommendations', 'AWS'),
431+
// },
432+
// ],
433+
// },
434+
// {
435+
// title: this.$i18n.t('menu.azure'),
436+
// icon: 'fas fa-cloud',
437+
// attributes: { 'data-cy': 'mn-cloud-azure' },
438+
// hidden: this.checkMenu('Azure', 'Cloud Advisors'),
439+
// child: [
440+
// {
441+
// href: { name: 'azure-profile-configurations' },
442+
// title: this.$i18n.t('menu.profileConfig'),
443+
// icon: 'fas fa-user-cog',
444+
// class: 'menu-third-level',
445+
// attributes: { 'data-cy': 'mn-cloud-azure-profile' },
446+
// hidden: this.checkMenu('Profile Configuration', 'Azure'),
447+
// },
448+
// // {
449+
// // href: { name: 'azure-recommendations' },
450+
// // title: this.$i18n.t('menu.recommendations'),
451+
// // icon: 'fas fa-user-shield',
452+
// // class: 'menu-third-level',
453+
// // disabled: !this.getCloudActiveProfiles('azure'),
454+
// // attributes: { 'data-cy': 'mn-cloud-azure-recommendations' },
455+
// // hidden: this.checkMenu('Recommendations', 'Azure'),
456+
// // },
457+
// ],
458+
// },
459+
// {
460+
// title: 'Google',
461+
// icon: 'fas fa-cloud',
462+
// attributes: { 'data-cy': 'mn-cloud-google' },
463+
// hidden: !this.checkMenu('Google', 'Cloud Advisors'),
464+
// child: [
465+
// {
466+
// href: { name: 'google-profile-configurations' },
467+
// title: this.$i18n.t('menu.profileConfig'),
468+
// icon: 'fas fa-user-cog',
469+
// class: 'menu-third-level',
470+
// attributes: { 'data-cy': 'mn-cloud-google-profile' },
471+
// hidden: !this.checkMenu('Profile Configuration', 'Google'),
472+
// },
473+
// {
474+
// href: { name: 'google-recommendations' },
475+
// title: this.$i18n.t('menu.recommendations'),
476+
// icon: 'fas fa-user-shield',
477+
// class: 'menu-third-level',
478+
// // disabled: !this.getCloudActiveProfiles('oci'),
479+
// attributes: { 'data-cy': 'mn-cloud-google-recommendations' },
480+
// hidden: !this.checkMenu('Recommendations', 'Google'),
481+
// },
482+
// ],
483+
// },
484+
// ],
485+
// },
486486
{
487487
href: { name: 'repository' },
488488
title: this.$i18n.t('menu.repository'),

‎src/components/databases/oracle/OracleDBs.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@
3030
<template slot="bodyData" slot-scope="rowData">
3131
<TdContent :value="rowData.scope.name" class="first-col" />
3232
<TdContent :value="rowData.scope.uniqueName" />
33-
<TdContent :value="rowData.scope.dbID" />
3433
<HostLink :hostname="[rowData.scope.hostname, rowData.scope.name]" />
34+
<TdContent
35+
:value="rowData.scope.dbID"
36+
:class="{ 'is-hidden': moreInfoToggle.hiddenReliabilityOracle }"
37+
/>
3538
<TdIcon
3639
:value="rowData.scope.archivelog"
3740
:class="{ 'is-hidden': moreInfoToggle.hiddenReliabilityOracle }"

‎src/components/databases/oracle/oracle-head.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
"sort": "uniqueName",
88
"langKey": "common.collumns.uniqueName"
99
},
10-
{
11-
"sort": "dbID",
12-
"langKey": "DB ID"
13-
},
1410
{
1511
"sort": "hostname",
1612
"langKey": "common.collumns.hostname"
1713
},
14+
{
15+
"sort": "dbID",
16+
"group": "ReliabilityOracle",
17+
"class": "color-1",
18+
"langKey": "DB ID"
19+
},
1820
{
1921
"sort": "archivelog",
2022
"group": "ReliabilityOracle",

0 commit comments

Comments
 (0)