GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-07-28 14:52:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolves conflicts

Browse Source
This commit is contained in:
dhrubesh 2021-05-16 18:44:26 +05:30
parent 2bc01e50bd
commit c6e2e297d5
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/modules/Nav/TopNav/utils.ts
View File

@ -3,7 +3,6 @@ import ROUTES from "Src/constants/routes";
export const getLocalStorageRouteKey = (pathName: string) => { export const getLocalStorageRouteKey = (pathName: string) => {
let localStorageKey = ""; let localStorageKey = "";
const pathNameSplit = pathName.split("/"); const pathNameSplit = pathName.split("/");
console.log("pathName", pathName);
if (!pathNameSplit[2]) { if (!pathNameSplit[2]) {
localStorageKey = pathName; localStorageKey = pathName;
} else { } else {

3
frontend/src/modules/Servicemap/ServiceMap.tsx
View File

@ -10,8 +10,7 @@ import {
import { Spin } from "antd"; import { Spin } from "antd";
import styled from "styled-components"; import styled from "styled-components";
import { StoreState } from "../../store/reducers"; import { StoreState } from "../../store/reducers";
import { getZoomPx, getGraphData } from "./utils"; import { getZoomPx, getGraphData, getTooltip } from "./utils";
import { getGraphData, getTooltip } from "./utils";
import SelectService from "./SelectService"; import SelectService from "./SelectService";
import { ForceGraph2D } from "react-force-graph"; import { ForceGraph2D } from "react-force-graph";

2
frontend/src/modules/Servicemap/utils.ts
View File

@ -83,6 +83,7 @@ export const getZoomPx = (): number => {
} else if (width > 2500) { } else if (width > 2500) {
return 360; return 360;
} }
};
export const getTooltip = (node: { export const getTooltip = (node: {
p99: number; p99: number;
@ -105,5 +106,4 @@ export const getTooltip = (node: {
<div class="val">${node.errorRate}%</div> <div class="val">${node.errorRate}%</div>
</div> </div>
</div>`; </div>`;
}; };