Skip to content

Commit d52e55d

Browse files
🪟 Updates to credits page (#15756)
* Removes side menu. * Removes conditional rendering that is no longer needed. * Adds bottom margin to the Remaining Credits block. * Renames credit usage component as per request.
1 parent 94fcf0d commit d52e55d

File tree

3 files changed

+6
-56
lines changed

3 files changed

+6
-56
lines changed

airbyte-webapp/src/packages/cloud/views/credits/CreditsPage/CreditsPage.tsx

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
import React, { Suspense } from "react";
1+
import React from "react";
22
import { FormattedMessage } from "react-intl";
3-
import { Navigate, Route, Routes } from "react-router-dom";
43
import styled from "styled-components";
54

65
import { PageTitle } from "components";
76
import HeadTitle from "components/HeadTitle";
8-
import LoadingPage from "components/LoadingPage";
97
import MainPageWithScroll from "components/MainPageWithScroll";
10-
import SideMenu from "components/SideMenu";
11-
import { CategoryItem } from "components/SideMenu/SideMenu";
128

13-
import useRouter from "hooks/useRouter";
14-
import { CloudRoutes } from "packages/cloud/cloudRoutes";
159
import { useAuthService } from "packages/cloud/services/auth/AuthService";
1610

17-
import CreditsUsagePage from "./components/CreditsUsagePage";
11+
import CreditsUsage from "./components/CreditsUsage";
1812
import { EmailVerificationHint } from "./components/EmailVerificationHint";
1913
import RemainingCredits from "./components/RemainingCredits";
2014

@@ -23,40 +17,13 @@ const Content = styled.div`
2317
height: 100%;
2418
`;
2519

26-
const MainInfo = styled.div`
27-
display: flex;
28-
flex-direction: row;
29-
margin-top: 29px;
30-
`;
31-
32-
const MainView = styled.div`
33-
width: 100%;
34-
margin-left: 47px;
35-
`;
36-
3720
const EmailVerificationHintWithMargin = styled(EmailVerificationHint)`
3821
margin-bottom: 8px;
3922
`;
4023

4124
const CreditsPage: React.FC = () => {
42-
const { push, pathname } = useRouter();
43-
const onSelectMenuItem = (newPath: string) => push(newPath);
4425
const { emailVerified } = useAuthService();
4526

46-
const menuItems: CategoryItem[] = [
47-
{
48-
routes: [
49-
{
50-
path: ``,
51-
name: <FormattedMessage id="credits.creditUsage" />,
52-
component: CreditsUsagePage,
53-
},
54-
],
55-
},
56-
];
57-
58-
const firstRoute = menuItems?.[0].routes?.[0]?.path;
59-
6027
return (
6128
<MainPageWithScroll
6229
headTitle={<HeadTitle titles={[{ id: "credits.credits" }]} />}
@@ -65,25 +32,7 @@ const CreditsPage: React.FC = () => {
6532
<Content>
6633
{!emailVerified && <EmailVerificationHintWithMargin />}
6734
<RemainingCredits selfServiceCheckoutEnabled={emailVerified} />
68-
<MainInfo>
69-
<SideMenu data={menuItems} onSelect={onSelectMenuItem} activeItem={pathname} />
70-
<MainView>
71-
<Suspense fallback={<LoadingPage />}>
72-
<Routes>
73-
{menuItems.flatMap((menuItem) =>
74-
menuItem.routes.map(({ path, component: Component }) => (
75-
<Route key={`${path}`} path={`${path}`} element={<Component />} />
76-
))
77-
)}
78-
79-
<Route
80-
path="*"
81-
element={<Navigate to={firstRoute ? `${menuItems?.[0].routes?.[0]?.path}` : CloudRoutes.Root} />}
82-
/>
83-
</Routes>
84-
</Suspense>
85-
</MainView>
86-
</MainInfo>
35+
<CreditsUsage />
8736
</Content>
8837
</MainPageWithScroll>
8938
);

airbyte-webapp/src/packages/cloud/views/credits/CreditsPage/components/CreditsUsagePage.tsx renamed to airbyte-webapp/src/packages/cloud/views/credits/CreditsPage/components/CreditsUsage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const Empty = styled.div`
3131

3232
const LegendLabels = ["value"];
3333

34-
const CreditsUsagePage: React.FC = () => {
34+
const CreditsUsage: React.FC = () => {
3535
const { formatMessage, formatDate } = useIntl();
3636

3737
const { workspaceId } = useCurrentWorkspace();
@@ -85,4 +85,4 @@ const CreditsUsagePage: React.FC = () => {
8585
);
8686
};
8787

88-
export default CreditsUsagePage;
88+
export default CreditsUsage;

airbyte-webapp/src/packages/cloud/views/credits/CreditsPage/components/RemainingCredits.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const Block = styled.div`
3030
display: flex;
3131
justify-content: space-between;
3232
align-items: center;
33+
margin: 10px 0px;
3334
`;
3435
const CreditView = styled.div`
3536
text-transform: uppercase;

0 commit comments

Comments
 (0)