From 4e38f1dcc0a834a34c3b29f4c50cbff657058c38 Mon Sep 17 00:00:00 2001 From: Palash Gupta Date: Tue, 11 Oct 2022 15:48:58 +0530 Subject: [PATCH] chore: free plan config is updated (#1625) * chore: free plan config is updated * fix: solved empty state issue with no auth domains Co-authored-by: Amol --- frontend/src/constants/app.ts | 3 ++ .../AuthDomains/index.tsx | 33 ++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/frontend/src/constants/app.ts b/frontend/src/constants/app.ts index 35ae663592..68bfe983db 100644 --- a/frontend/src/constants/app.ts +++ b/frontend/src/constants/app.ts @@ -8,3 +8,6 @@ export const DEFAULT_AUTH0_APP_REDIRECTION_PATH = ROUTES.APPLICATION; export const IS_SIDEBAR_COLLAPSED = 'isSideBarCollapsed'; export const INVITE_MEMBERS_HASH = '#invite-team-members'; + +export const SIGNOZ_UPGRADE_PLAN_URL = + 'https://upgrade.signoz.io/upgrade-from-app'; diff --git a/frontend/src/container/OrganizationSettings/AuthDomains/index.tsx b/frontend/src/container/OrganizationSettings/AuthDomains/index.tsx index ad283027ac..221ba963dc 100644 --- a/frontend/src/container/OrganizationSettings/AuthDomains/index.tsx +++ b/frontend/src/container/OrganizationSettings/AuthDomains/index.tsx @@ -4,6 +4,7 @@ import { ColumnsType } from 'antd/lib/table'; import deleteDomain from 'api/SAML/deleteDomain'; import listAllDomain from 'api/SAML/listAllDomain'; import updateDomain from 'api/SAML/updateDomain'; +import { SIGNOZ_UPGRADE_PLAN_URL } from 'constants/app'; import { FeatureKeys } from 'constants/featureKeys'; import useFeatureFlag from 'hooks/useFeatureFlag'; import React, { useCallback, useState } from 'react'; @@ -30,6 +31,21 @@ function AuthDomains(): JSX.Element { const SSOFlag = useFeatureFlag(FeatureKeys.SSO); + const notEntripriseData: SAMLDomain[] = [ + { + id: v4(), + name: '', + ssoEnabled: false, + orgId: (org || [])[0].id || '', + samlConfig: { + samlCert: '', + samlEntity: '', + samlIdp: '', + }, + ssoType: 'SAML', + }, + ]; + const { data, isLoading, refetch } = useQuery(['saml'], { queryFn: () => listAllDomain({ @@ -90,10 +106,10 @@ function AuthDomains(): JSX.Element { const onEditHandler = useCallback( (record: SAMLDomain) => (): void => { - setIsEditModalOpen(true); + onOpenHandler(setIsEditModalOpen)(); setCurrentDomain(record); }, - [], + [onOpenHandler], ); const onDeleteHandler = useCallback( @@ -128,7 +144,7 @@ function AuthDomains(): JSX.Element { ); const onClickLicenseHandler = useCallback(() => { - window.open('http://signoz.io/pricing'); + window.open(SIGNOZ_UPGRADE_PLAN_URL); }, []); const columns: ColumnsType = [ @@ -171,10 +187,7 @@ function AuthDomains(): JSX.Element { if (!SSOFlag) { return (