diff --git a/frontend/src/components/TextToolTip/index.tsx b/frontend/src/components/TextToolTip/index.tsx
new file mode 100644
index 0000000000..83f162fac9
--- /dev/null
+++ b/frontend/src/components/TextToolTip/index.tsx
@@ -0,0 +1,27 @@
+import { QuestionCircleFilled } from '@ant-design/icons';
+import { Tooltip } from 'antd';
+import React from 'react';
+
+const TextToolTip = ({ text, url }: TextToolTipProps) => (
+ {
+ return (
+
+ );
+ }}
+ >
+
+
+);
+
+interface TextToolTipProps {
+ url: string;
+ text: string;
+}
+
+export default TextToolTip;
diff --git a/frontend/src/container/AllAlertChannels/index.tsx b/frontend/src/container/AllAlertChannels/index.tsx
index 330e6dcdc9..c69a41e855 100644
--- a/frontend/src/container/AllAlertChannels/index.tsx
+++ b/frontend/src/container/AllAlertChannels/index.tsx
@@ -1,7 +1,8 @@
import { PlusOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
+import { Typography } from 'antd';
import getAll from 'api/channels/getAll';
import Spinner from 'components/Spinner';
+import TextToolTip from 'components/TextToolTip';
import ROUTES from 'constants/routes';
import useFetch from 'hooks/useFetch';
import history from 'lib/history';
@@ -9,7 +10,7 @@ import React, { useCallback } from 'react';
const { Paragraph } = Typography;
import AlertChannlesComponent from './AlertChannels';
-import { ButtonContainer } from './styles';
+import { ButtonContainer, Button } from './styles';
const AlertChannels = (): JSX.Element => {
const onToggleHandler = useCallback(() => {
@@ -33,9 +34,16 @@ const AlertChannels = (): JSX.Element => {
The latest added channel is used as the default channel for sending alerts
- }>
- New Alert Channel
-
+
+
+
+ }>
+ New Alert Channel
+
+
diff --git a/frontend/src/container/AllAlertChannels/styles.ts b/frontend/src/container/AllAlertChannels/styles.ts
index c8caa45fda..bfcab1154a 100644
--- a/frontend/src/container/AllAlertChannels/styles.ts
+++ b/frontend/src/container/AllAlertChannels/styles.ts
@@ -1,4 +1,5 @@
import styled from 'styled-components';
+import { Button as ButtonComponent } from 'antd';
export const ButtonContainer = styled.div`
&&& {
@@ -9,3 +10,9 @@ export const ButtonContainer = styled.div`
margin-bottom: 1rem;
}
`;
+
+export const Button = styled(ButtonComponent)`
+ &&& {
+ margin-left: 1rem;
+ }
+`;
diff --git a/frontend/src/container/GeneralSettings/index.tsx b/frontend/src/container/GeneralSettings/index.tsx
index 9aef4091c9..5a9311adae 100644
--- a/frontend/src/container/GeneralSettings/index.tsx
+++ b/frontend/src/container/GeneralSettings/index.tsx
@@ -2,6 +2,7 @@ import { Button, Modal, notification, Typography } from 'antd';
import getRetentionperoidApi from 'api/settings/getRetention';
import setRetentionApi from 'api/settings/setRetention';
import Spinner from 'components/Spinner';
+import TextToolTip from 'components/TextToolTip';
import useFetch from 'hooks/useFetch';
import convertIntoHr from 'lib/convertIntoHr';
import getSettingsPeroid from 'lib/getSettingsPeroid';
@@ -14,6 +15,7 @@ import {
Container,
ErrorText,
ErrorTextContainer,
+ ToolTipContainer,
} from './styles';
const GeneralSettings = (): JSX.Element => {
@@ -182,10 +184,26 @@ const GeneralSettings = (): JSX.Element => {
{Element}
- {errorText && (
+ {errorText ? (
{errorText}
+
+
+ ) : (
+
+
+
)}
article {
+ margin-right: 1rem;
+ }
+ }
+`;
+
+export const ToolTipContainer = styled.div`
+ &&& {
+ margin-top: 2rem;
+ margin-bottom: 2rem;
+ display: flex;
+ align-items: center;
+ width: 50%;
+ justify-content: flex-end;
}
`;
diff --git a/frontend/src/container/ListAlertRules/ListAlert.tsx b/frontend/src/container/ListAlertRules/ListAlert.tsx
index 413c15b2b3..7fd5d8d049 100644
--- a/frontend/src/container/ListAlertRules/ListAlert.tsx
+++ b/frontend/src/container/ListAlertRules/ListAlert.tsx
@@ -1,8 +1,9 @@
/* eslint-disable react/display-name */
import { PlusOutlined } from '@ant-design/icons';
-import { Button, notification, Tag, Typography } from 'antd';
+import { notification, Tag, Typography } from 'antd';
import Table, { ColumnsType } from 'antd/lib/table';
import getAll from 'api/alerts/getAll';
+import TextToolTip from 'components/TextToolTip';
import ROUTES from 'constants/routes';
import useInterval from 'hooks/useInterval';
import history from 'lib/history';
@@ -11,7 +12,7 @@ import { generatePath } from 'react-router';
import { Alerts } from 'types/api/alerts/getAll';
import DeleteAlert from './DeleteAlert';
-import { ButtonContainer } from './styles';
+import { ButtonContainer, Button } from './styles';
import Status from './TableComponents/Status';
const ListAlert = ({ allAlertRules }: ListAlertProps): JSX.Element => {
@@ -128,6 +129,13 @@ const ListAlert = ({ allAlertRules }: ListAlertProps): JSX.Element => {
{Element}
+
+
}>
New Alert
diff --git a/frontend/src/container/ListAlertRules/styles.ts b/frontend/src/container/ListAlertRules/styles.ts
index 0a29b92f37..2c54d3ec91 100644
--- a/frontend/src/container/ListAlertRules/styles.ts
+++ b/frontend/src/container/ListAlertRules/styles.ts
@@ -1,9 +1,17 @@
import styled from 'styled-components';
+import { Button as ButtonComponent } from 'antd';
export const ButtonContainer = styled.div`
&&& {
display: flex;
justify-content: flex-end;
margin-bottom: 2rem;
+ align-items: center;
+ }
+`;
+
+export const Button = styled(ButtonComponent)`
+ &&& {
+ margin-left: 1rem;
}
`;
diff --git a/frontend/src/container/ListOfDashboard/index.tsx b/frontend/src/container/ListOfDashboard/index.tsx
index 6f21e83989..ffbc84d044 100644
--- a/frontend/src/container/ListOfDashboard/index.tsx
+++ b/frontend/src/container/ListOfDashboard/index.tsx
@@ -2,6 +2,7 @@ import { PlusOutlined } from '@ant-design/icons';
import { Row, Table, TableColumnProps, Typography } from 'antd';
import createDashboard from 'api/dashboard/create';
import { AxiosError } from 'axios';
+import TextToolTip from 'components/TextToolTip';
import ROUTES from 'constants/routes';
import React, { useCallback, useState } from 'react';
import { useSelector } from 'react-redux';
@@ -10,7 +11,7 @@ import { AppState } from 'store/reducers';
import DashboardReducer from 'types/reducer/dashboards';
import { v4 } from 'uuid';
-import { NewDashboardButton, TableContainer } from './styles';
+import { NewDashboardButton, TableContainer, ButtonContainer } from './styles';
import Createdby from './TableComponents/CreatedBy';
import DateComponent from './TableComponents/Date';
import DeleteButton from './TableComponents/DeleteButton';
@@ -150,15 +151,25 @@ const ListOfAllDashboard = (): JSX.Element => {
return (
Dashboard List
- }
- type="primary"
- loading={newDashboardState.loading}
- danger={newDashboardState.error}
- >
- {getText()}
-
+
+
+
+
+ }
+ type="primary"
+ loading={newDashboardState.loading}
+ danger={newDashboardState.error}
+ >
+ {getText()}
+
+
);
}}
diff --git a/frontend/src/container/ListOfDashboard/styles.ts b/frontend/src/container/ListOfDashboard/styles.ts
index 7ba5d0975f..adf15fdf74 100644
--- a/frontend/src/container/ListOfDashboard/styles.ts
+++ b/frontend/src/container/ListOfDashboard/styles.ts
@@ -6,6 +6,8 @@ export const NewDashboardButton = styled(Button)`
display: flex;
justify-content: center;
align-items: center;
+
+ margin-left: 1rem;
}
`;
@@ -14,3 +16,10 @@ export const TableContainer = styled(Row)`
margin-top: 1rem;
}
`;
+
+export const ButtonContainer = styled.div`
+ &&& {
+ display: flex;
+ align-items: center;
+ }
+`;
diff --git a/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx b/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
index 7d10e56518..343e576516 100644
--- a/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
+++ b/frontend/src/container/NewWidget/LeftContainer/QuerySection/Query.tsx
@@ -1,5 +1,6 @@
import { Button, Divider } from 'antd';
import Input from 'components/Input';
+import TextToolTip from 'components/TextToolTip';
import { timePreferance } from 'container/NewWidget/RightContainer/timeItems';
import React, { useCallback, useState } from 'react';
import { connect } from 'react-redux';
@@ -14,7 +15,12 @@ import {
import AppActions from 'types/actions';
import { DeleteQueryProps } from 'types/actions/dashboard';
-import { Container, InputContainer, QueryWrapper } from './styles';
+import {
+ Container,
+ InputContainer,
+ QueryWrapper,
+ ButtonContainer,
+} from './styles';
const Query = ({
currentIndex,
@@ -82,7 +88,15 @@ const Query = ({
-
+
+
+
+
diff --git a/frontend/src/container/NewWidget/LeftContainer/QuerySection/styles.ts b/frontend/src/container/NewWidget/LeftContainer/QuerySection/styles.ts
index b78ce58e08..8efadde259 100644
--- a/frontend/src/container/NewWidget/LeftContainer/QuerySection/styles.ts
+++ b/frontend/src/container/NewWidget/LeftContainer/QuerySection/styles.ts
@@ -24,3 +24,15 @@ export const QueryWrapper = styled.div`
width: 95%; // each child is taking 95% of the parent
}
`;
+
+export const ButtonContainer = styled.div`
+ &&& {
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+
+ > button {
+ margin-bottom: 1rem;
+ }
+ }
+`;
diff --git a/frontend/src/modules/Traces/TraceGanttChart/TraceGanttChart.tsx b/frontend/src/modules/Traces/TraceGanttChart/TraceGanttChart.tsx
index 665050db88..032727766b 100644
--- a/frontend/src/modules/Traces/TraceGanttChart/TraceGanttChart.tsx
+++ b/frontend/src/modules/Traces/TraceGanttChart/TraceGanttChart.tsx
@@ -8,6 +8,7 @@ import {
Table as TableComponent,
Tabs,
} from 'antd';
+import TextToolTip from 'components/TextToolTip';
import { has, isEmpty, max } from 'lodash-es';
import traverseTreeData from 'modules/Traces/TraceGanttChart/TraceGanttChartHelpers';
import React, { useEffect, useRef, useState } from 'react';
@@ -22,6 +23,8 @@ const StyledButton = styled(Button)`
color: #f2f2f2;
font-size: 14px;
line-height: 20px;
+ margin-right: 0.5rem;
+ margin-left: 0.5rem;
`;
const Table = styled(TableComponent)`
@@ -332,18 +335,23 @@ const TraceGanttChart = ({
{id !== 'empty' && (
<>
+
+
+
Focus on selected path
-
-
Reset Focus