Skip to content

Commit 6e3a336

Browse files
empty data rename
Signed-off-by: Nicholas Bucher <[email protected]>
1 parent 9c77118 commit 6e3a336

File tree

15 files changed

+39
-47
lines changed

15 files changed

+39
-47
lines changed

projects/ui/src/Components/ApiDetails/gloo-gateway-components/ApiProductDetailsPageBody.tsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
ApiVersionSchema,
88
} from "../../../Apis/api-types";
99
import { ContentWidthDiv } from "../../../Styles/ContentWidthHelpers";
10-
import { SimpleEmptyContent } from "../../Common/EmptyData";
10+
import { EmptyData } from "../../Common/EmptyData";
1111
import DocsTabContent from "./DocsTab/DocsTabContent";
1212
import SchemaTabContent from "./SchemaTab/SchemaTabContent";
1313

@@ -80,17 +80,16 @@ export function ApiProductDetailsPageBody({
8080
{includesDocumentation ? (
8181
<DocsTabContent selectedApiVersion={selectedApiVersion} />
8282
) : (
83-
<SimpleEmptyContent title="No documentation found.">
83+
<EmptyData title="No documentation found.">
8484
<small>
8585
You may add documentation for this API in the{" "}
86-
<Code sx={{ whiteSpace: "nowrap" }}>
86+
<Code>
8787
spec.versions[your-version].openapiMetadata.description
8888
</Code>{" "}
89-
field of this{" "}
90-
<Code sx={{ whiteSpace: "nowrap" }}>ApiProduct</Code> resource.
91-
Markdown is supported.
89+
field of this <Code>ApiProduct</Code> resource. Markdown is
90+
supported.
9291
</small>
93-
</SimpleEmptyContent>
92+
</EmptyData>
9493
)}
9594
</Tabs.Panel>
9695
</Tabs>

projects/ui/src/Components/ApiDetails/gloo-gateway-components/SchemaTab/SchemaTabContent.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Box, Code } from "@mantine/core";
22
import { ApiVersion, ApiVersionSchema } from "../../../../Apis/api-types";
3-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
3+
import { EmptyData } from "../../../Common/EmptyData";
44
import { ErrorBoundary } from "../../../Common/ErrorBoundary";
55
import { ApiSchemaDisplay } from "./ApiSchemaDisplay";
66

@@ -16,10 +16,10 @@ const SchemaTabContent = ({
1616
if (!apiProductVersions.length) {
1717
return (
1818
<Box m="60px">
19-
<SimpleEmptyContent title={`No API versions found.`}>
19+
<EmptyData title={`No API versions found.`}>
2020
Add a version to the <Code>spec.versions</Code> field of this{" "}
2121
<Code>ApiProduct</Code> for data to appear.
22-
</SimpleEmptyContent>
22+
</EmptyData>
2323
</Box>
2424
);
2525
}
@@ -31,13 +31,13 @@ const SchemaTabContent = ({
3131
// There is a selected API version, but no schema.
3232
return (
3333
<Box m="60px">
34-
<SimpleEmptyContent title={`No schema found.`}>
34+
<EmptyData title={`No schema found.`}>
3535
The schema was not returned for this <Code>ApiProduct</Code> version.
3636
<br />
3737
Verify that your OpenApi spec was generated correctly in the
3838
corresponding <Code>ApiDoc</Code> resource for this{" "}
3939
<Code>Service</Code>.
40-
</SimpleEmptyContent>
40+
</EmptyData>
4141
</Box>
4242
);
4343
}

projects/ui/src/Components/Apis/EmptyApisPage.tsx

+4-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { AuthContext } from "../../Context/AuthContext";
55
import { apisImageURL } from "../../user_variables.tmplr";
66
import { BannerHeading } from "../Common/Banner/BannerHeading";
77
import { BannerHeadingTitle } from "../Common/Banner/BannerHeadingTitle";
8-
import { SimpleEmptyContent } from "../Common/EmptyData";
8+
import { EmptyData } from "../Common/EmptyData";
99
import { PageContainer } from "../Common/PageContainer";
1010
import { StyledApisListMain } from "./gloo-mesh-gateway-components/ApisPage.style";
1111

@@ -31,19 +31,15 @@ export const EmptyApisPageContent = () => {
3131
const { isLoggedIn } = useContext(AuthContext);
3232

3333
if (!!isLoggedIn)
34-
return (
35-
<SimpleEmptyContent>
36-
No API Products have been created.
37-
</SimpleEmptyContent>
38-
);
34+
return <EmptyData>No API Products have been created.</EmptyData>;
3935
return (
40-
<SimpleEmptyContent title="No API Products were found.">
36+
<EmptyData title="No API Products were found.">
4137
<small>
4238
To view API Products in private Portals, please log in.
4339
<br />
4440
To view API Products in public Portals, the Portal resource must have{" "}
4541
<Code>spec.visibility.public = true</Code>.
4642
</small>
47-
</SimpleEmptyContent>
43+
</EmptyData>
4844
);
4945
};

projects/ui/src/Components/Apis/gloo-gateway-components/ApisTab/ApisList.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import CustomPagination, {
1212
pageOptions,
1313
useCustomPagination,
1414
} from "../../../Common/CustomPagination";
15-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
15+
import { EmptyData } from "../../../Common/EmptyData";
1616
import { Loading } from "../../../Common/Loading";
1717
import { ApisPageStyles } from "../../ApisPage.style";
1818
import { ApiSummaryGridCard } from "./ApiSummaryCards/ApiSummaryGridCard";
@@ -79,11 +79,11 @@ export function ApisList({
7979
return <Loading message="Getting list of apis..." />;
8080
}
8181
if (!apiProductsList.length) {
82-
return <SimpleEmptyContent title="No API Products were found." />;
82+
return <EmptyData title="No API Products were found." />;
8383
}
8484
if (!filteredApiProductsList.length) {
8585
return (
86-
<SimpleEmptyContent title="No API Products were found matching these filters." />
86+
<EmptyData title="No API Products were found matching these filters." />
8787
);
8888
}
8989
if (preferGridView) {

projects/ui/src/Components/Apis/gloo-mesh-gateway-components/ApisList.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import CustomPagination, {
77
pageOptions,
88
useCustomPagination,
99
} from "../../Common/CustomPagination";
10-
import { SimpleEmptyContent } from "../../Common/EmptyData";
10+
import { EmptyData } from "../../Common/EmptyData";
1111
import { Loading } from "../../Common/Loading";
1212
import { ApiSummaryGridCard } from "./ApiSummaryGridCard";
1313
import { ApiSummaryListCard } from "./ApiSummaryListCard";
@@ -72,9 +72,7 @@ export function ApisList({
7272
}
7373

7474
if (!displayedApisList.length) {
75-
return (
76-
<SimpleEmptyContent title="No APIs were found matching these filters." />
77-
);
75+
return <EmptyData title="No APIs were found matching these filters." />;
7876
}
7977
return (
8078
<>

projects/ui/src/Components/Apps/Details/ApiKeysSection/AppApiKeysSection.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import CustomPagination, {
1616
pageOptions,
1717
useCustomPagination,
1818
} from "../../../Common/CustomPagination";
19-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
19+
import { EmptyData } from "../../../Common/EmptyData";
2020
import { Loading } from "../../../Common/Loading";
2121
import Table from "../../../Common/Table";
2222
import ToggleAddButton from "../../../Common/ToggleAddButton";
@@ -87,7 +87,7 @@ const AppApiKeysSection = ({ app }: { app: App }) => {
8787
/>
8888
{!apiKeys?.length ? (
8989
<Box mb={"-30px"} mt={"10px"}>
90-
<SimpleEmptyContent title="No API Keys were found." />
90+
<EmptyData title="No API Keys were found." />
9191
</Box>
9292
) : (
9393
<Box pt={"5px"}>

projects/ui/src/Components/Apps/Details/ApiSubscriptionsSection/AppApiSubscriptionsSection.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Icon } from "../../../../Assets/Icons";
55
import { DetailsPageStyles } from "../../../../Styles/shared/DetailsPageStyles";
66
import { UtilityStyles } from "../../../../Styles/shared/Utility.style";
77
import { Button } from "../../../Common/Button";
8-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
8+
import { EmptyData } from "../../../Common/EmptyData";
99
import SubscriptionInfoCard from "../../../Common/SubscriptionsList/SubscriptionInfoCard/SubscriptionInfoCard";
1010
import NewSubscriptionModal from "../Modals/NewSubscriptionModal";
1111

@@ -44,7 +44,7 @@ const AppApiSubscriptionsSection = ({
4444
</Flex>
4545
{subscriptions.length === 0 && (
4646
<Box pt="10px">
47-
<SimpleEmptyContent title="No API Subscriptions were found." />
47+
<EmptyData title="No API Subscriptions were found." />
4848
</Box>
4949
)}
5050
<Box pt={"5px"}>

projects/ui/src/Components/Apps/PageContent/AppsList.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { App, Team } from "../../../Apis/api-types";
44
import { useListAppsForTeams } from "../../../Apis/gg_hooks";
55
import { FilterPair, FilterType } from "../../../Utility/filter-utility";
66
import { omitErrorMessageResponse } from "../../../Utility/utility";
7-
import { SimpleEmptyContent } from "../../Common/EmptyData";
7+
import { EmptyData } from "../../Common/EmptyData";
88
import { Loading } from "../../Common/Loading";
99
import { AppsPageStyles } from "../AppsPage.style";
1010
import { AppSummaryGridCard } from "./AppSummaryCards/AppSummaryGridCard";
@@ -86,12 +86,10 @@ export function AppsList({
8686
return <Loading message="Getting list of apps..." />;
8787
}
8888
if (!appsList?.length) {
89-
return <SimpleEmptyContent title="No Apps were found." />;
89+
return <EmptyData title="No Apps were found." />;
9090
}
9191
if (!filteredAppsList.length) {
92-
return (
93-
<SimpleEmptyContent title="No Apps were found matching these filters." />
94-
);
92+
return <EmptyData title="No Apps were found matching these filters." />;
9593
}
9694
return (
9795
<AppsPageStyles.AppGridList>

projects/ui/src/Components/Common/EmptyData.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const StyledEmptyContentOuter = styled.div(
1818
`
1919
);
2020

21-
export const SimpleEmptyContent = (props: {
21+
export const EmptyData = (props: {
2222
children?: React.ReactNode;
2323
title?: React.ReactNode;
2424
}) => {

projects/ui/src/Components/Common/SubscriptionsList/SubscriptionsList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
isSubscriptionsListError,
66
} from "../../../Apis/api-types";
77
import { colors } from "../../../Styles";
8-
import { SimpleEmptyContent } from "../../Common/EmptyData";
8+
import { EmptyData } from "../../Common/EmptyData";
99
import { FiltrationProp } from "../Filters/AppliedFiltersSection";
1010
import SubscriptionInfoCard from "./SubscriptionInfoCard/SubscriptionInfoCard";
1111

@@ -35,7 +35,7 @@ const SubscriptionsList = ({
3535
return null;
3636
}
3737
if (subscriptions.length === 0) {
38-
return <SimpleEmptyContent title="No Subscriptions were found." />;
38+
return <EmptyData title="No Subscriptions were found." />;
3939
}
4040
return (
4141
<Box pb={"60px"}>

projects/ui/src/Components/Teams/Details/AppsSection/TeamAppsSection.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import CustomPagination, {
1414
pageOptions,
1515
useCustomPagination,
1616
} from "../../../Common/CustomPagination";
17-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
17+
import { EmptyData } from "../../../Common/EmptyData";
1818
import { Loading } from "../../../Common/Loading";
1919
import Table from "../../../Common/Table";
2020
import ToggleAddButton from "../../../Common/ToggleAddButton";
@@ -86,7 +86,7 @@ const TeamAppsSection = ({ team }: { team: Team }) => {
8686
)}
8787
{!apps?.length ? (
8888
<Box mb={"-30px"} mt={"30px"}>
89-
<SimpleEmptyContent title="No Apps were found." />
89+
<EmptyData title="No Apps were found." />
9090
</Box>
9191
) : (
9292
<Box pt={"5px"}>

projects/ui/src/Components/Teams/Details/UsersSection/TeamUsersSection.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import CustomPagination, {
1616
pageOptions,
1717
useCustomPagination,
1818
} from "../../../Common/CustomPagination";
19-
import { SimpleEmptyContent } from "../../../Common/EmptyData";
19+
import { EmptyData } from "../../../Common/EmptyData";
2020
import { Loading } from "../../../Common/Loading";
2121
import Table from "../../../Common/Table";
2222
import ToggleAddButton from "../../../Common/ToggleAddButton";
@@ -101,7 +101,7 @@ const TeamUsersSection = ({ team }: { team: Team }) => {
101101
{!members?.length ? (
102102
<Box mb={"-30px"}>
103103
{/* We never should get here, since the user must be a member. */}
104-
<SimpleEmptyContent title="No were found in this Team." />
104+
<EmptyData title="No were found in this Team." />
105105
</Box>
106106
) : (
107107
<Box pt={"5px"}>

projects/ui/src/Components/Teams/TeamsList/TeamsList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Box, Flex } from "@mantine/core";
22
import { di } from "react-magnetic-di";
33
import { useListTeams } from "../../../Apis/gg_hooks";
4-
import { SimpleEmptyContent } from "../../Common/EmptyData";
4+
import { EmptyData } from "../../Common/EmptyData";
55
import { Loading } from "../../Common/Loading";
66
import { TeamSummaryGridCard } from "./TeamSummaryCards/TeamSummaryGridCard";
77

@@ -16,7 +16,7 @@ export function TeamsList() {
1616
return <Loading message="Getting list of teams..." />;
1717
}
1818
if (!teamsList?.length) {
19-
return <SimpleEmptyContent title="No Teams were found." />;
19+
return <EmptyData title="No Teams were found." />;
2020
}
2121
return (
2222
<Box mb="30px">

projects/ui/src/Components/UsagePlans/UsagePlanList/APIUsagePlansList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo } from "react";
22
import { di } from "react-magnetic-di";
33
import { API } from "../../../Apis/api-types";
44
import { useListApis } from "../../../Apis/shared_hooks";
5-
import { SimpleEmptyContent } from "../../Common/EmptyData";
5+
import { EmptyData } from "../../Common/EmptyData";
66
import { ErrorBoundary } from "../../Common/ErrorBoundary";
77
import { Loading } from "../../Common/Loading";
88
import { APIUsagePlanCard } from "./APIUsagePlanCard";
@@ -46,7 +46,7 @@ export function APIUsagePlansList() {
4646
</ErrorBoundary>
4747
))
4848
) : (
49-
<SimpleEmptyContent title="No API Products were found." />
49+
<EmptyData title="No API Products were found." />
5050
)}
5151
</>
5252
);

projects/ui/src/Styles/global-styles/mantine-overrides.style.ts

+1
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,6 @@ export const mantineGlobalStyles = css`
6666
6767
code.mantine-Code-root {
6868
background-color: ${colors.januaryGreyDark1};
69+
white-space: nowrap;
6970
}
7071
`;

0 commit comments

Comments
 (0)