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.

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

fix: left nav doesn't accurately update on workflow version page #718

Merged
merged 2 commits into from
Mar 9, 2023
Merged

fix: left nav doesn't accurately update on workflow version page #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
880b8fa
fix: left nav doesn't accurately update on workflow version page
ursucarina Mar 9, 2023
850c2bb
Merge branch 'master' into carina/versfix
ursucarina Mar 9, 2023
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
2 changes: 1 addition & 1 deletion packages/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flyteorg/console",
"version": "0.0.12",
"version": "0.0.13",
"description": "Flyteconsole main app module",
"main": "./dist/index.js",
"module": "./lib/index.js",
Expand Down
9 changes: 4 additions & 5 deletions packages/console/src/components/Tables/PaginatedDataList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ const PaginatedDataListHeader = <C,>(
className={column.className}
key={column.key}
align="left"
padding="default"
padding="normal"
sortDirection={orderBy === column.key ? order : false}
>
<TableSortLabel
Expand Down Expand Up @@ -154,13 +154,12 @@ const PaginatedDataList = <T,>({
totalRows,
showRadioButton,
fillEmptyRows = true,
noDataString,
}: PropsWithChildren<PaginatedDataListProps<T>>) => {
const classes = useStyles();
const [order, setOrder] = React.useState<Order>('asc');
const [orderBy, setOrderBy] = React.useState('calories');
const [page, setPage] = React.useState(0);
const [rowsPerPage, setRowsPerPage] = React.useState(5);
const [page] = React.useState(0);
const [rowsPerPage] = React.useState(5);

const handleRequestSort = (
event: React.MouseEvent<unknown>,
Expand Down Expand Up @@ -198,7 +197,7 @@ const PaginatedDataList = <T,>({
showRadioButton={showRadioButton}
/>
<TableBody>
{data.map((row, index) => {
{data.map((row, _index) => {
return rowRenderer(row);
})}
{fillEmptyRows && !showRadioButton && emptyRows > 0 && (
Expand Down
2 changes: 1 addition & 1 deletion packages/console/src/routes/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class Routes {
static WorkflowDetails = {
makeUrl: (project: string, domain: string, workflowName: string) =>
makeProjectDomainBoundPath(project, domain, `/workflows/${workflowName}`),
path: `${projectDomainBasePath}/workflows/:workflowName`,
path: `${projectDomainBasePath}/(workflows|workflow)/:workflowName`,
};

// LaunchPlans
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@flyteorg/common": "^0.0.3",
"@flyteorg/console": "^0.0.12",
"@flyteorg/console": "^0.0.13",
"long": "^4.0.0",
"protobufjs": "~6.11.3",
"react-ga4": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@ __metadata:
resolution: "@flyteconsole/client-app@workspace:website"
dependencies:
"@flyteorg/common": ^0.0.3
"@flyteorg/console": ^0.0.12
"@flyteorg/console": ^0.0.13
"@types/long": ^3.0.32
long: ^4.0.0
protobufjs: ~6.11.3
Expand Down Expand Up @@ -2034,7 +2034,7 @@ __metadata:
languageName: unknown
linkType: soft

"@flyteorg/console@^0.0.12, @flyteorg/console@workspace:packages/console":
"@flyteorg/console@^0.0.13, @flyteorg/console@workspace:packages/console":
version: 0.0.0-use.local
resolution: "@flyteorg/console@workspace:packages/console"
dependencies:
Expand Down