github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: PR review

pull/1097/head
smit95tpatel 2022-03-10 16:39:02 +05:30
parent b36d16779f
commit c163cca708
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/Dashboard/ServiceTreeView.vue
View File

@ -116,7 +116,7 @@ import FlatPickr from 'vue-flatpickr-component';
import 'flatpickr/dist/flatpickr.css'; import 'flatpickr/dist/flatpickr.css';
const getRootNodes = (data) => { const getRootNodes = (data) => {
if (!data || data.lenght === 0) { if (!data || data.length === 0) {
return; return;
} }
@ -143,14 +143,16 @@ const getTreeData = (parentServices, serviceStatus) => {
const treeData = []; const treeData = [];
for (let i=0; i<parentServices.length; i++) { for (let i=0; i<parentServices.length; i++) {
if (!parentServices[i].sub_services_detail) { const parentService = parentServices[i];
treeData.push({ parent: parentServices[i], children: [] });
if (!parentService.sub_services_detail) {
treeData.push({ parent: parentService, children: [] });
} else { } else {
const subServices = Object.keys(parentServices[i].sub_services_detail).reduce((acc, key) => { const subServices = Object.keys(parentService.sub_services_detail).reduce((acc, key) => {
const service = serviceStatus.find((item) => item.id == key); const service = serviceStatus.find((item) => item.id == key);
if (service) { if (service) {
acc.push({ ...service, ...parentServices[i].sub_services_detail[key] }); acc.push({ ...service, ...parentService.sub_services_detail[key] });
} }
return acc; return acc;
@ -158,7 +160,7 @@ const getTreeData = (parentServices, serviceStatus) => {
const children = getTreeData(subServices, serviceStatus); const children = getTreeData(subServices, serviceStatus);
treeData.push({ parent: parentServices[i], children }); treeData.push({ parent: parentService, children });
} }
} }

15
frontend/src/components/Elements/TreeItem.vue
View File

@ -24,9 +24,9 @@
</div> </div>
<div <div
v-tooltip="{ content: `${item.parent.downtime ? `${niceDateWithYear(item.parent.downtime.start)} - ${niceDateWithYear(item.parent.downtime.end)}`: ''}`, offset: 5, autoHide: true}" v-tooltip="{ content: `${item.parent.downtime ? `${niceDateWithYear(startDate)} - ${niceDateWithYear(endDate)}` : ''}`, offset: 5, autoHide: true}"
class="parent-name rounded-right" class="parent-name rounded-right"
:class="[{ 'cursor-text rounded': item.children.length === 0 }, item.parent.downtime ? item.parent.downtime.sub_status === 'down' ? 'bg-shade-danger' : 'bg-shade-warning' : 'bg-shade-success']" :class="[{ 'cursor-text rounded': item.children.length === 0 }, item.parent.downtime ? downtimeStatus === 'down' ? 'bg-shade-danger' : 'bg-shade-warning' : 'bg-shade-success']"
> >
{{ item.parent.name }} {{ item.parent.name }}
</div> </div>
@ -60,6 +60,17 @@ export default {
isOpen: false, isOpen: false,
}; };
}, },
computed: {
startDate: function () {
return this.item.parent.downtime?.start;
},
endDate: function () {
return this.item.parent.downtime?.end;
},
downtimeStatus: function () {
return this.item.parent.downtime?.sub_status;
}
},
methods: { methods: {
handleIsOpen: function () { handleIsOpen: function () {
this.isOpen = !this.isOpen; this.isOpen = !this.isOpen;

4
frontend/src/mixin.js
View File

@ -258,6 +258,10 @@ export default Vue.mixin({
return addSeconds(date, amount) return addSeconds(date, amount)
}, },
niceDateWithYear (val) { niceDateWithYear (val) {
if(!val) {
return '';
}
return format(parseISO(val), 'do MMM, yyyy h:mma'); return format(parseISO(val), 'do MMM, yyyy h:mma');
}, },
convertDateObjToSec (val) { convertDateObjToSec (val) {