diff --git a/frontend/src/app/(public-area)/register/RegistrationForm.tsx b/frontend/src/app/(public-area)/register/RegistrationForm.tsx index 0903980a..d45b0429 100644 --- a/frontend/src/app/(public-area)/register/RegistrationForm.tsx +++ b/frontend/src/app/(public-area)/register/RegistrationForm.tsx @@ -52,8 +52,8 @@ export const RegistrationForm = () => { ) : ( <>

- Provide your email address and agree to let us do stuff, and we'll send you a verification email to - create your account and get started. 🚀 + Provide your email address and we'll send you a verification email to create your account and get + started. 🚀

Already have an account?{' '} diff --git a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx index 0990d25f..060477d0 100644 --- a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx +++ b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx @@ -252,13 +252,14 @@ const Page = () => { zoom, ]); - const teamAwsIntegrationsIfAdminAndNoReports = useTeamAwsIntegrations( - isTeamAdmin && teamReports && teamReports.length === 0 ? teamId : undefined, + const needsData = teamReports && teamReports.length === 0; + const teamAwsIntegrationsIfAdminAndNeedsData = useTeamAwsIntegrations( + isTeamAdmin && needsData ? teamId : undefined, ); const needsSubscriptionSetup = team && !team.entitlements.individualFeatures; const needsAwsIntegrationSetup = - teamAwsIntegrationsIfAdminAndNoReports && teamAwsIntegrationsIfAdminAndNoReports.length === 0; - const needsSetup = needsSubscriptionSetup || needsAwsIntegrationSetup; + teamAwsIntegrationsIfAdminAndNeedsData && teamAwsIntegrationsIfAdminAndNeedsData.length === 0; + const needsSetup = needsSubscriptionSetup || needsAwsIntegrationSetup || needsData; const canManageScps = teamAwsAccountsMap && [...teamAwsAccountsMap.values()].some((account) => account.canManageScps); @@ -355,7 +356,7 @@ const Page = () => {

Welcome!

This is the dashboard for your team.

-

There's nothing here, but we can fix that!

+

There's currently nothing here, but we can fix that!

{needsSubscriptionSetup && ( <>

Activate a subscription

@@ -369,7 +370,7 @@ const Page = () => {

)} - {needsAwsIntegrationSetup && ( + {needsAwsIntegrationSetup ? ( <>

Integrate with your AWS account

@@ -380,7 +381,30 @@ const Page = () => { to configure ingestion from your AWS account.

- )} + ) : needsData ? ( + <> +

Wait for data

+

+ If you've recently configured your AWS integration and chose to + backfill data, it will be available here shortly. +

+

+ If you did not choose to backfill data, it will take up to 24 hours for data + to appear. +

+

+ If data does not appear as expected, please double check your team's{' '} + + integration settings + {' '} + or{' '} + + contact us + {' '} + for help. +

+ + ) : null}
)} diff --git a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx index 4930ff3a..82a33f03 100644 --- a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx +++ b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx @@ -29,7 +29,7 @@ const CreateIntegrationForm = (props: CreateIntegrationFormProps) => { const [getAccountNamesFromOrganizations, setGetAccountNamesFromOrganizations] = useState(false); const [manageScps, setManageScps] = useState(false); const [isBusy, setIsBusy] = useState(false); - const [queueReportGeneration, setQueueReportGeneration] = useState(false); + const [queueReportGeneration, setQueueReportGeneration] = useState(true); const [errorMessage, setErrorMessage] = useState(''); const doCreate = async () => {