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

feat: show info message in general settings for cloud users to reachout for retention change (#4476)

Browse Source
This commit is contained in:
Yunus M 2024-02-01 04:04:19 +05:30 committed by GitHub
parent 2f361de693
commit 64307f323f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 73 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss Normal file
View File

@ -0,0 +1,7 @@
.general-settings-container {
.ant-card-body {
display: flex;
align-items: center;
gap: 16px;
}
}

16
frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx Normal file
View File

@ -0,0 +1,16 @@
import './GeneralSettingsCloud.styles.scss';
import { Card, Typography } from 'antd';
import { Info } from 'lucide-react';
export default function GeneralSettingsCloud(): JSX.Element {
return (
<Card className="general-settings-container">
<Info size={16} />
<Typography.Text>
Please email us or connect with us via intercom support to change the
retention period.
</Typography.Text>
</Card>
);
}

3
frontend/src/container/GeneralSettingsCloud/index.tsx Normal file
View File

@ -0,0 +1,3 @@
import GeneralSettingsCloud from './GeneralSettingsCloud';
export default GeneralSettingsCloud;

13
frontend/src/container/SideNav/SideNav.tsx
View File

@ -253,6 +253,15 @@ function SideNav({
}
}, [isCloudUserVal, isEnterprise, isFetching]);
const [isCurrentOrgSettings] = useComponentPermission(
['current_org_settings'],
role,
);
const settingsRoute = isCurrentOrgSettings
? ROUTES.ORG_SETTINGS
: ROUTES.SETTINGS;
return (
<div className={cx('sideNav', collapsed ? 'collapsed' : '')}>
<div className="brand">
@ -302,7 +311,9 @@ function SideNav({
item={item}
isActive={activeMenuKey === item.key}
onClick={(): void => {
if (item) {
if (item.key === ROUTES.SETTINGS) {
history.push(settingsRoute);
} else if (item) {
onClickHandler(item?.key as string);
}
}}

33
frontend/src/pages/Settings/config.ts
View File

@ -2,17 +2,21 @@ import { RouteTabProps } from 'components/RouteTab/types';
import ROUTES from 'constants/routes';
import AlertChannels from 'container/AllAlertChannels';
import GeneralSettings from 'container/GeneralSettings';
import GeneralSettingsCloud from 'container/GeneralSettingsCloud';
import IngestionSettings from 'container/IngestionSettings/IngestionSettings';
import OrganizationSettings from 'container/OrganizationSettings';
import { TFunction } from 'i18next';
export const commonRoutes = (t: TFunction): RouteTabProps['routes'] => [
export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [
{
Component: GeneralSettings,
name: t('routes:general').toString(),
route: ROUTES.SETTINGS,
key: ROUTES.SETTINGS,
Component: OrganizationSettings,
name: t('routes:organization_settings').toString(),
route: ROUTES.ORG_SETTINGS,
key: ROUTES.ORG_SETTINGS,
},
];
export const alertChannels = (t: TFunction): RouteTabProps['routes'] => [
{
Component: AlertChannels,
name: t('routes:alert_channels').toString(),
@ -30,11 +34,20 @@ export const ingestionSettings = (t: TFunction): RouteTabProps['routes'] => [
},
];
export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [
export const generalSettings = (t: TFunction): RouteTabProps['routes'] => [
{
Component: OrganizationSettings,
name: t('routes:organization_settings').toString(),
route: ROUTES.ORG_SETTINGS,
key: ROUTES.ORG_SETTINGS,
Component: GeneralSettings,
name: t('routes:general').toString(),
route: ROUTES.SETTINGS,
key: ROUTES.SETTINGS,
},
];
export const generalSettingsCloud = (t: TFunction): RouteTabProps['routes'] => [
{
Component: GeneralSettingsCloud,
name: t('routes:general').toString(),
route: ROUTES.SETTINGS,
key: ROUTES.SETTINGS,
},
];

17
frontend/src/pages/Settings/utils.ts
View File

@ -3,7 +3,9 @@ import { TFunction } from 'i18next';
import { isCloudUser } from 'utils/app';
import {
commonRoutes,
alertChannels,
generalSettings,
generalSettingsCloud,
ingestionSettings,
organizationSettings,
} from './config';
@ -12,15 +14,20 @@ export const getRoutes = (
isCurrentOrgSettings: boolean,
t: TFunction,
): RouteTabProps['routes'] => {
let common = commonRoutes(t);
const settings = [];
if (isCurrentOrgSettings) {
common = [...common, ...organizationSettings(t)];
settings.push(...organizationSettings(t));
}
if (isCloudUser()) {
common = [...common, ...ingestionSettings(t)];
settings.push(...ingestionSettings(t));
settings.push(...alertChannels(t));
settings.push(...generalSettingsCloud(t));
} else {
settings.push(...alertChannels(t));
settings.push(...generalSettings(t));
}
return common;
return settings;
};