diff --git a/react-frontend/src/components/GroupServiceFailures.jsx b/react-frontend/src/components/GroupServiceFailures.jsx
index 3114cb3e..78875e87 100644
--- a/react-frontend/src/components/GroupServiceFailures.jsx
+++ b/react-frontend/src/components/GroupServiceFailures.jsx
@@ -6,7 +6,11 @@ import API from "../config/API";
import ServiceLoader from "./ServiceLoader";
import ReactTooltip from "react-tooltip";
import { STATUS_CLASS } from "../utils/constants";
-import { calcPer, isObjectEmpty } from "../utils/helper";
+import {
+ calcPer,
+ generateTooltipPosition,
+ isObjectEmpty,
+} from "../utils/helper";
import { errorToastConfig } from "../utils/toast";
const STATUS_TEXT = {
@@ -140,16 +144,18 @@ const GroupServiceFailures = ({ group = null, service, collapse }) => {
place="bottom"
backgroundColor="#344A6C"
html={true}
+ overridePosition={generateTooltipPosition}
/>
{failureData?.length > 0 ? (
failureData.map((d, i) => {
return (
handleMouseOver(d)}
onMouseOut={handleMouseOut}
key={i}
- data-tip={hoverText}>
+ data-tip={hoverText}
+ >
{d.status !== 0 && (
)}
@@ -166,13 +172,8 @@ const GroupServiceFailures = ({ group = null, service, collapse }) => {
- 90 {langs("days_ago")}
+ {langs("status_over_the_past")} 90 {langs("days")}
- {/* */}
- {/* {service_txt()} */}
- {/* {uptime}% uptime */}
-
- {langs("today")}
diff --git a/react-frontend/src/config/langs.js b/react-frontend/src/config/langs.js
index 7abfa66c..6c90794a 100644
--- a/react-frontend/src/config/langs.js
+++ b/react-frontend/src/config/langs.js
@@ -141,6 +141,7 @@ const english = {
notify_all: "Notify All Changes",
service_update: "Update Service",
service_create: "Create Service",
+ status_over_the_past: "Status over the past",
};
const langs = (v) => english[v];
diff --git a/react-frontend/src/styles/scss/base.scss b/react-frontend/src/styles/scss/base.scss
index 3144d87f..4d8345db 100644
--- a/react-frontend/src/styles/scss/base.scss
+++ b/react-frontend/src/styles/scss/base.scss
@@ -131,11 +131,12 @@
}
.block-chart {
+ padding-top: 7px;
+ height: 100%;
display: flex;
- justify-content: center;
- margin: 1rem 0;
- padding: 0 0.75rem;
-
+ flex-flow: row wrap;
+ justify-content: flex-start;
+ gap: 1px;
div.service_day:last-child {
margin-right: 0;
}
@@ -144,8 +145,9 @@
.service_day {
position: relative;
height: 24px;
- min-width: 4px;
- margin-right: 2px;
+ min-width: 6px;
+ margin-right: 1.5px;
+ margin-bottom: 4px;
cursor: pointer;
}
diff --git a/react-frontend/src/styles/scss/variables.scss b/react-frontend/src/styles/scss/variables.scss
index 9006f0d7..5655612b 100644
--- a/react-frontend/src/styles/scss/variables.scss
+++ b/react-frontend/src/styles/scss/variables.scss
@@ -3,7 +3,7 @@ $background-color: #f5f8ff;
$primary-bg: linear-gradient(314deg, #54a5ff -40%, #03299c);
$container-color: #ffffff;
$text-color: #2a2a2a;
-$max-width: 775px;
+$max-width: 824px;
/* colors */
$base-color: #1f2849;
diff --git a/react-frontend/src/utils/helper.js b/react-frontend/src/utils/helper.js
index 59e91d25..16365078 100644
--- a/react-frontend/src/utils/helper.js
+++ b/react-frontend/src/utils/helper.js
@@ -90,3 +90,18 @@ export const generateUUID = (length) => {
Math.floor(Math.random() * 36).toString(36)
).join("");
};
+
+export const generateTooltipPosition = (...args) => {
+ const position = args?.[0]; //tooltip default position
+ const { top, left } = position || {};
+ const place = args?.[4]; // tooltip placement
+ const offset = 6;
+
+ if (place === "left" || place === "right") {
+ return {
+ top,
+ left: place === "left" ? left + offset : left - offset,
+ };
+ }
+ return position;
+};