GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 01:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: gh-4211: show copy and share invite link message next to pending invites (#4260)

Browse Source 
Co-authored-by: Vishal Sharma <makeavish786@gmail.com>
This commit is contained in:
Yunus M 2023-12-20 18:18:27 +05:30 committed by GitHub
parent f487c1956b
commit 90b8959045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/public/locales/en-GB/organizationsettings.json
View File

@ -14,5 +14,6 @@
"delete_domain_message": "Are you sure you want to delete this domain?", "delete_domain_message": "Are you sure you want to delete this domain?",
"delete_domain": "Delete Domain", "delete_domain": "Delete Domain",
"add_domain": "Add Domains", "add_domain": "Add Domains",
"saml_settings":"Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly" "saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly",
"invite_link_share_manually": "After inviting members, please copy the invite link and send them the link manually"
} }

3
frontend/public/locales/en/organizationsettings.json
View File

@ -14,5 +14,6 @@
"delete_domain_message": "Are you sure you want to delete this domain?", "delete_domain_message": "Are you sure you want to delete this domain?",
"delete_domain": "Delete Domain", "delete_domain": "Delete Domain",
"add_domain": "Add Domains", "add_domain": "Add Domains",
"saml_settings":"Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly" "saml_settings": "Your SAML settings have been saved, please login from incognito window to confirm that it has been set up correctly",
"invite_link_share_manually": "After inviting members, please copy the invite link and send them the link manually"
} }

25
frontend/src/container/LogsExplorerViews/index.tsx
View File

@ -147,13 +147,13 @@ function LogsExplorerViews(): JSX.Element {
[currentQuery, updateAllQueriesOperators], [currentQuery, updateAllQueriesOperators],
); );
const listChartData = useGetExplorerQueryRange( const {
listChartQuery, data: listChartData,
PANEL_TYPES.TIME_SERIES, isFetching: isFetchingListChartData,
{ isLoading: isLoadingListChartData,
} = useGetExplorerQueryRange(listChartQuery, PANEL_TYPES.TIME_SERIES, {
enabled: !!listChartQuery && panelType === PANEL_TYPES.LIST, enabled: !!listChartQuery && panelType === PANEL_TYPES.LIST,
}, });
);
const { data, isFetching, isError } = useGetExplorerQueryRange( const { data, isFetching, isError } = useGetExplorerQueryRange(
requestData, requestData,
@ -445,12 +445,8 @@ function LogsExplorerViews(): JSX.Element {
if (!stagedQuery) return []; if (!stagedQuery) return [];
if (panelType === PANEL_TYPES.LIST) { if (panelType === PANEL_TYPES.LIST) {
if ( if (listChartData && listChartData.payload.data.result.length > 0) {
listChartData && return listChartData.payload.data.result;
listChartData.data &&
listChartData.data.payload.data.result.length > 0
) {
return listChartData.data.payload.data.result;
} }
return []; return [];
} }
@ -472,7 +468,10 @@ function LogsExplorerViews(): JSX.Element {
return ( return (
<> <>
<LogsExplorerChart isLoading={isFetching} data={chartData} /> <LogsExplorerChart
isLoading={isFetchingListChartData || isLoadingListChartData}
data={chartData}
/>
{stagedQuery && ( {stagedQuery && (
<ActionsWrapper> <ActionsWrapper>
<ExportPanel <ExportPanel

6
frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx
View File

@ -271,6 +271,11 @@ function PendingInvitesContainer(): JSX.Element {
<Space direction="vertical" size="middle"> <Space direction="vertical" size="middle">
<TitleWrapper> <TitleWrapper>
<Typography.Title level={3}>{t('pending_invites')}</Typography.Title> <Typography.Title level={3}>{t('pending_invites')}</Typography.Title>
<Space>
<Typography.Text type="warning">
{t('invite_link_share_manually')}
</Typography.Text>
<Button <Button
icon={<PlusOutlined />} icon={<PlusOutlined />}
type="primary" type="primary"
@ -280,6 +285,7 @@ function PendingInvitesContainer(): JSX.Element {
> >
{t('invite_members')} {t('invite_members')}
</Button> </Button>
</Space>
</TitleWrapper> </TitleWrapper>
<ResizeTable <ResizeTable
columns={columns} columns={columns}