Skip to content
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.

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

Update Roadmap JSON in Storybook #2297

Merged
merged 22 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/odyssey-storybook/applitools.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const applitoolsConfig = {
runInDocker: true,
serverUrl: "https://oktaeyes.applitools.com",
testConcurrency: 20,
waitBeforeCapture: 1000,
};

module.exports = applitoolsConfig;
219 changes: 27 additions & 192 deletions packages/odyssey-storybook/src/guidelines/Roadmap/RoadmapTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
* See the License for the specific language governing permissions and limitations under the License.
*/

import { DataFilter } from "@okta/odyssey-react-mui/labs";
import { DataTable, DataTableSortingState } from "@okta/odyssey-react-mui";
import { columns, data, OdysseyComponent } from "./roadmapData";
/* eslint-disable import/no-extraneous-dependencies */
import { memo, useCallback } from "react";
import { Box, DataTable, DataTableGetDataType } from "@okta/odyssey-react-mui";
import { useColumns, data, OdysseyComponent } from "./roadmapData";
import {
Callout,
CssBaseline,
Expand All @@ -23,202 +24,28 @@ import {
import { ThemeProvider as StorybookThemeProvider } from "@storybook/theming";
import * as odysseyTokens from "@okta/odyssey-design-tokens";

const processData = ({
initialData,
page = 1,
resultsPerPage = 100,
search,
filters,
sort,
}: {
initialData: OdysseyComponent[];
page?: number;
resultsPerPage?: number;
search?: string;
filters?: DataFilter[];
sort?: DataTableSortingState;
}) => {
let filteredData = [...initialData];

// Implement text-based query filtering
if (search) {
filteredData = filteredData.filter((row) =>
Object.values(row).some((value) =>
value.toString().toLowerCase().includes(search.toLowerCase()),
),
);
}

// Implement column-specific filtering
if (filters) {
filteredData = filteredData.filter((row) => {
return filters.every(({ id, value }) => {
// If filter value is null or undefined, skip this filter
if (value === null || value === undefined) {
return true;
}

// General filtering for other columns
return row[id as keyof OdysseyComponent]
?.toString()
.includes(value.toString());
});
});
}

function parseCustomDate(dateStr: string): Date {
if (dateStr.length <= 0) {
return new Date(2999, 0);
}

const months = [
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
];
const [monthStr, yearStr] = dateStr.split(" ");

const month = months.indexOf(monthStr);
const year = parseInt(yearStr.replace("'", ""), 10) + 2000; // Adjust for century

return new Date(year, month);
}

// Implement sorting
if (sort && sort.length > 0) {
filteredData.sort((a, b) => {
for (const { id, desc } of sort) {
let aValue: string | Date = a[id as keyof OdysseyComponent];
let bValue: string | Date = b[id as keyof OdysseyComponent];

if (
id === "startDate" ||
id === "labsRelease" ||
id === "fullRelease"
) {
aValue = parseCustomDate(aValue);
bValue = parseCustomDate(bValue);
}

if (aValue < bValue) return desc ? 1 : -1;
if (aValue > bValue) return desc ? -1 : 1;
}

return 0;
});
}
// Implement pagination
const startIdx = (page - 1) * resultsPerPage;
const endIdx = startIdx + resultsPerPage;
const paginatedData = filteredData.slice(startIdx, endIdx);

return paginatedData;
};

export const InnerRoadmapTable = () => {
// Constants for filter options

const typeOptions = [
{ label: "Component", value: "Component" },
{ label: "Pattern", value: "Pattern" },
];

const statusOptions = [
{ label: "In Progress", value: "In progress" },
{ label: "In Labs", value: "In labs" },
{ label: "Released", value: "Released" },
{ label: "Not Started", value: "Not started" },
];

const expectedOptions = [
{ label: "FY24", value: "FY24" },
{ label: "TBD", value: "TBD" },
{ label: "Q1 FY25", value: "Q1 FY25" },
{ label: "Q2 FY25", value: "Q2 FY25" },
{ label: "Q3 FY25", value: "Q3 FY25" },
{ label: "Q4 FY25", value: "Q4 FY25" },
{ label: "Q1 FY26", value: "Q1 FY26" },
{ label: "Q2 FY26", value: "Q2 FY26" },
{ label: "Q3 FY26", value: "Q3 FY26" },
{ label: "Q4 FY26", value: "Q4 FY26" },
];

const fetchData = ({
page,
resultsPerPage,
search,
filters,
sort,
const columns = useColumns(); // Use the hook to get columns
const filterData = ({
data,
}: {
page?: number;
resultsPerPage?: number;
search?: string;
filters?: DataFilter[];
sort?: DataTableSortingState;
}) => {
return processData({
initialData: data,
page: page,
resultsPerPage: resultsPerPage,
search: search,
filters: filters,
sort: sort,
});
data: OdysseyComponent[];
} & DataTableGetDataType) => {
const filteredData = data;

return filteredData;
};

return (
<DataTable
columns={columns}
totalRows={data.length}
getRowId={({ name }) => name}
getData={fetchData}
hasChangeableDensity={false}
hasColumnResizing={false}
hasColumnVisibility={false}
hasFilters
filters={[
{
id: "type",
label: "Type",
variant: "select",
options: typeOptions,
},
{
id: "status",
label: "Status",
variant: "select",
options: statusOptions,
},
{
id: "deliverableTiming",
label: "Deliverable timing",
variant: "autocomplete",
options: expectedOptions,
},
]}
resultsPerPage={100}
hasPagination={false}
hasRowSelection={false}
hasRowReordering={false}
searchDelayTime={0}
hasSearch
hasSorting
/>
);
const fetchData = useCallback(({ ...props }: DataTableGetDataType) => {
return filterData({ data, ...props });
}, []);

return <DataTable columns={columns} getData={fetchData} hasSorting={false} />;
};

const WrappedRoadmapTable = () => {
const odysseyTheme = createOdysseyMuiTheme({ odysseyTokens });

const MemoizedInnerRoadmapTable = memo(InnerRoadmapTable);
return (
<OdysseyThemeProvider>
{/* @ts-expect-error type mismatch on "typography" */}
Expand All @@ -233,7 +60,15 @@ const WrappedRoadmapTable = () => {
functionality, and you should not rely on them to make your purchase
decisions.
</Callout>
<InnerRoadmapTable />
<Box
sx={{
width: "700px",
maxWidth: "100%",
margin: "0 auto",
}}
>
<MemoizedInnerRoadmapTable />
</Box>
</ScopedCssBaseline>
</StorybookThemeProvider>
</OdysseyThemeProvider>
Expand Down
Loading