Skip to content

small onboarding improvements #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccbrown merged 1 commit into from
Apr 27, 2025
Merged

small onboarding improvements #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/app/(public-area)/register/RegistrationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ export const RegistrationForm = () => {
) : (
<>
<p>
Provide your email address and agree to let us do stuff, and we&apos;ll send you a verification email to
create your account and get started. 🚀
Provide your email address and we&apos;ll send you a verification email to create your account and get
started. 🚀
</p>
<p>
Already have an account?{' '}
Expand Down
38 changes: 31 additions & 7 deletions frontend/src/app/(user-area)/teams/[teamId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -355,7 +356,7 @@ const Page = () => {
<div className="flex flex-col gap-4 translucent-snow border border-platinum rounded-xl p-8 max-w-2xl">
<h1>Welcome!</h1>
<p>This is the dashboard for your team.</p>
<p>There&apos;s nothing here, but we can fix that!</p>
<p>There&apos;s currently nothing here, but we can fix that!</p>
{needsSubscriptionSetup && (
<>
<p className="uppercase label">Activate a subscription</p>
Expand All @@ -369,7 +370,7 @@ const Page = () => {
</p>
</>
)}
{needsAwsIntegrationSetup && (
{needsAwsIntegrationSetup ? (
<>
<p className="uppercase label">Integrate with your AWS account</p>
<p>
Expand All @@ -380,7 +381,30 @@ const Page = () => {
to configure ingestion from your AWS account.
</p>
</>
)}
) : needsData ? (
<>
<p className="uppercase label">Wait for data</p>
<p>
If you&apos;ve recently configured your AWS integration and chose to
backfill data, it will be available here shortly.
</p>
<p>
If you did not choose to backfill data, it will take up to 24 hours for data
to appear.
</p>
<p>
If data does not appear as expected, please double check your team&apos;s{' '}
<Link href={`/teams/${teamId}/settings/integrations`} className="link">
integration settings
</Link>{' '}
or{' '}
<Link href="/contact" className="link">
contact us
</Link>{' '}
for help.
</p>
</>
) : null}
</div>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
Loading