Skip to content

Table and resultset table redesigns #2208

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
Mil4n0r merged 5 commits into from
May 15, 2025
Merged

Table and resultset table redesigns #2208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a7f946
Table & Resultset table redesigns
GomezIvann Apr 7, 2025
1dd4c1e
Table updates
GomezIvann Apr 23, 2025
c4529ad
Merge branch 'master' into gomezivann/table-redesign
GomezIvann Apr 24, 2025
6b1bdde
Table fixes
GomezIvann Apr 24, 2025
d2dee98
Merge branch 'master' into gomezivann/table-redesign
GomezIvann May 15, 2025
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
17 changes: 17 additions & 0 deletions apps/website/pages/components/resultset-table/code.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Head from "next/head";
import type { ReactElement } from "react";
import ResultsetTablePageLayout from "screens/components/resultset-table/ResultsetTablePageLayout";
import ResultsetTableCodePage from "screens/components/resultset-table/code/ResultsetTableCodePage";

const Code = () => (
<>
<Head>
<title>Resultset table code — Halstack Design System</title>
</Head>
<ResultsetTableCodePage />
</>
);

Code.getLayout = (page: ReactElement) => <ResultsetTablePageLayout>{page}</ResultsetTablePageLayout>;

export default Code;
26 changes: 11 additions & 15 deletions apps/website/pages/components/resultset-table/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import Head from "next/head";
import type { ReactElement } from "react";
import ResultsetTableCodePage from "screens/components/resultset-table/code/ResultsetTableCodePage";
import ResultsetTableOverviewPage from "screens/components/resultset-table/overview/ResultsetTableOverviewPage";
import ResultsetTablePageLayout from "screens/components/resultset-table/ResultsetTablePageLayout";

const Usage = () => {
return (
<>
<Head>
<title>Resultset Table — Halstack Design System</title>
</Head>
<ResultsetTableCodePage></ResultsetTableCodePage>
</>
);
};
const Index = () => (
<>
<Head>
<title>Resultset table — Halstack Design System</title>
</Head>
<ResultsetTableOverviewPage />
</>
);

Usage.getLayout = function getLayout(page: ReactElement) {
return <ResultsetTablePageLayout>{page}</ResultsetTablePageLayout>;
};
Index.getLayout = (page: ReactElement) => <ResultsetTablePageLayout>{page}</ResultsetTablePageLayout>;

export default Usage;
export default Index;
21 changes: 0 additions & 21 deletions apps/website/pages/components/resultset-table/specifications.tsx
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions apps/website/pages/components/resultset-table/usage.tsx
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions apps/website/pages/components/table/code.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Head from "next/head";
import type { ReactElement } from "react";
import TablePageLayout from "screens/components/table/TablePageLayout";
import TableCodePage from "screens/components/table/code/TableCodePage";

const Code = () => (
<>
<Head>
<title>Table code — Halstack Design System</title>
</Head>
<TableCodePage />
</>
);

Code.getLayout = (page: ReactElement) => <TablePageLayout>{page}</TablePageLayout>;

export default Code;
24 changes: 10 additions & 14 deletions apps/website/pages/components/table/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import Head from "next/head";
import type { ReactElement } from "react";
import TableCodePage from "screens/components/table/code/TableCodePage";
import TableOverviewPage from "screens/components/table/overview/TableOverviewPage";
import TablePageLayout from "screens/components/table/TablePageLayout";

const Index = () => {
return (
<>
<Head>
<title>Table — Halstack Design System</title>
</Head>
<TableCodePage></TableCodePage>
</>
);
};
const Index = () => (
<>
<Head>
<title>Table — Halstack Design System</title>
</Head>
<TableOverviewPage />
</>
);

Index.getLayout = function getLayout(page: ReactElement) {
return <TablePageLayout>{page}</TablePageLayout>;
};
Index.getLayout = (page: ReactElement) => <TablePageLayout>{page}</TablePageLayout>;

export default Index;
21 changes: 0 additions & 21 deletions apps/website/pages/components/table/specifications.tsx
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions apps/website/pages/components/table/usage.tsx
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions apps/website/screens/components/resultset-table/ResultsetTablePageLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,22 @@ import { ReactNode } from "react";

const ResultsetTablePageHeading = ({ children }: { children: ReactNode }) => {
const tabs = [
{ label: "Code", path: "/components/resultset-table" },
{ label: "Usage", path: "/components/resultset-table/usage" },
{
label: "Specifications",
path: "/components/resultset-table/specifications",
},
{ label: "Overview", path: "/components/resultset-table" },
{ label: "Code", path: "/components/resultset-table/code" },
];

return (
<DxcFlex direction="column" gap="var(--spacing-gap-xxl)">
<PageHeading>
<DxcFlex direction="column" gap="var(--spacing-gap-xl)">
<ComponentHeading name="Resultset Table" />
<ComponentHeading name="Resultset table" />
<DxcParagraph>
Data table is a component with a high rate of usage within the applications. It allows to show the user a
big amount of information in a simple and simplified way. All the information contained in the table has a
grid structure, defining columns and rows to place the data and allow the users to scan, analyze, compare
and filter that information.
</DxcParagraph>
<TabsPageHeading tabs={tabs}></TabsPageHeading>
<TabsPageHeading tabs={tabs} />
</DxcFlex>
</PageHeading>
{children}
Expand Down
19 changes: 9 additions & 10 deletions apps/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const cellTypeString = `{
displayValue: React.ReactNode;
sortValue?: string | number | Date;
}[]`;

const columnTypeString = `{
displayValue: React.ReactNode;
isSortable?: boolean;
Expand Down Expand Up @@ -290,15 +291,13 @@ const sections = [
},
];

const ResultsetTableCodePage = () => {
return (
<DxcFlex direction="column" gap="4rem">
<QuickNavContainerLayout>
<QuickNavContainer sections={sections} startHeadingLevel={2}></QuickNavContainer>
</QuickNavContainerLayout>
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/apps/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx" />
</DxcFlex>
);
};
const ResultsetTableCodePage = () => (
<DxcFlex direction="column" gap="4rem">
<QuickNavContainerLayout>
<QuickNavContainer sections={sections} startHeadingLevel={2} />
</QuickNavContainerLayout>
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/apps/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx" />
</DxcFlex>
);

export default ResultsetTableCodePage;
24 changes: 11 additions & 13 deletions ...components/table/usage/TableUsagePage.tsx → ...e/overview/ResultsetTableOverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,27 @@ import DocFooter from "@/common/DocFooter";

const sections = [
{
title: "Usage",
title: "Introduction",
content: (
<DxcBulletedList>
<DxcBulletedList.Item>Use the table component to compare information in rows and columns.</DxcBulletedList.Item>
<DxcBulletedList.Item>Every table cell requires a logical column header/row header.</DxcBulletedList.Item>
<DxcBulletedList.Item>
Don&#39;t use the table to create visual layout of the content of a page.
Don't use the table for create visual layout of the content of a page.
</DxcBulletedList.Item>
<DxcBulletedList.Item>Avoid truncating content, wrap instead.</DxcBulletedList.Item>
</DxcBulletedList>
),
},
];

const TableUsagePage = () => {
return (
<DxcFlex direction="column" gap="4rem">
<QuickNavContainerLayout>
<QuickNavContainer sections={sections} startHeadingLevel={2}></QuickNavContainer>
</QuickNavContainerLayout>
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/apps/website/screens/components/table/usage/TableUsagePage.tsx" />
</DxcFlex>
);
};
const ResultsetTableOverviewPage = () => (
<DxcFlex direction="column" gap="4rem">
<QuickNavContainerLayout>
<QuickNavContainer sections={sections} startHeadingLevel={2} />
</QuickNavContainerLayout>
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/apps/website/screens/components/resultset-table/overview/ResultsetTableOverviewPage.tsx" />
</DxcFlex>
);

export default TableUsagePage;
export default ResultsetTableOverviewPage;
Loading