Skip to content
Closed
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
698b1a3
Init prebuilds list
filiptronicek Jan 24, 2024
763b558
Text size and color tweaks
filiptronicek Jan 24, 2024
484e846
Dropdown filtering UI
filiptronicek Jan 25, 2024
f88c6dd
wip changes
filiptronicek Jan 25, 2024
8793b98
File renames and such
filiptronicek Jan 25, 2024
e5aa4b4
Filter by state
filiptronicek Jan 25, 2024
1ba43a1
Merge branch 'main' into ft/global-prebuild-list
filiptronicek Jan 25, 2024
d6db690
fix path
filiptronicek Jan 25, 2024
60f95a9
Merge branch 'ft/global-prebuild-list' of https://github.com/gitpod-i…
filiptronicek Jan 25, 2024
eaa2c1f
Add configuration ID filtering
filiptronicek Jan 26, 2024
eec581c
Merge branch 'main' into ft/global-prebuild-list
filiptronicek Jan 26, 2024
0d045e6
Prebuild list error state
filiptronicek Jan 29, 2024
f9b46c8
Protobuf sorting definition
filiptronicek Jan 29, 2024
0c6dd3b
API-level sorting
filiptronicek Jan 29, 2024
93fcd91
Simplify pagination
filiptronicek Jan 29, 2024
ea422f5
Fix undefined inference
filiptronicek Jan 29, 2024
f53b2fa
Dashboard adopt sort behavior
filiptronicek Jan 29, 2024
3542682
make sorting required
filiptronicek Jan 29, 2024
4398d55
Merge remote-tracking branch 'origin/main' into ft/global-prebuild-list
filiptronicek Jan 29, 2024
d56df8f
Move ordering 🤷‍♂️
filiptronicek Jan 29, 2024
780aaa7
Hopefully fix sorting 🤷‍♂️
filiptronicek Jan 30, 2024
25740a8
less `as`
filiptronicek Jan 30, 2024
5559c9a
Simplify state check
filiptronicek Jan 30, 2024
0254fd5
Repeated sorting
filiptronicek Jan 30, 2024
78798bc
Sort out sorting
filiptronicek Jan 30, 2024
2e17a1e
Configuration dropdown WIP
filiptronicek Jan 30, 2024
e16daa5
Make configuration filter disableable
filiptronicek Jan 31, 2024
7bac140
Use in in SQL
filiptronicek Jan 31, 2024
2d218d3
Minor styling adjustements
filiptronicek Jan 31, 2024
3b3d0a3
Nav item
filiptronicek Jan 31, 2024
55e9e04
Rename menu item
filiptronicek Jan 31, 2024
925581f
Const 🤷‍♂️
filiptronicek Jan 31, 2024
129bb4b
Always display filter reset opt
filiptronicek Jan 31, 2024
a8c4a1d
Add prebuild link to prebuild settings
filiptronicek Jan 31, 2024
e3906d0
Simplify
filiptronicek Jan 31, 2024
f957cb1
Don't throw errors
filiptronicek Jan 31, 2024
57e625e
FF hook
filiptronicek Jan 31, 2024
5a78ecb
Name failed to load state
filiptronicek Jan 31, 2024
6f2fbce
typo
filiptronicek Jan 31, 2024
6aa7661
Better unknown inference
filiptronicek Feb 1, 2024
f255b96
Add ConfigurationField component to display repository name and link
filiptronicek Feb 1, 2024
bff57a8
Do not retry configuration load
filiptronicek Feb 1, 2024
9df7d1e
Move prebuild utils
filiptronicek Feb 1, 2024
d897c58
Unify sort types
filiptronicek Feb 1, 2024
bfdab82
Refactor PrebuildTable to use arrow function syntax for mapping prebu…
filiptronicek Feb 1, 2024
9fabef6
fix imports
filiptronicek Feb 1, 2024
4a13f77
Widen triggered column
filiptronicek Feb 1, 2024
2f51443
Widen even more
filiptronicek Feb 1, 2024
f9ae195
Shorten status labels
filiptronicek Feb 1, 2024
2ff911b
Merge remote-tracking branch 'origin/main' into ft/global-prebuild-list
filiptronicek Feb 1, 2024
a5fc3ec
Merge branch 'main' into ft/global-prebuild-list
filiptronicek Feb 5, 2024
6a83afc
Init ws db tests
filiptronicek Feb 5, 2024
92ede9a
Rename list item comp accordingly
filiptronicek Feb 5, 2024
e607d8d
Test configuration ids and branches filtering
filiptronicek Feb 5, 2024
6c0867f
Merge branch 'main' into ft/global-prebuild-list
filiptronicek Feb 6, 2024
4279aae
Remove projects from nav depending on ff
filiptronicek Feb 6, 2024
fa3ec3d
Merge branch 'main' into ft/global-prebuild-list
filiptronicek Feb 7, 2024
7f30370
Merge branch 'ft/global-prebuild-list' into ft/conditionally-remove-p…
filiptronicek Feb 7, 2024
fed4a8d
Merge branch 'main' into ft/conditionally-remove-projects
filiptronicek Feb 12, 2024
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
8 changes: 5 additions & 3 deletions components/dashboard/src/menu/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { User, RoleOrPermission } from "@gitpod/public-api/lib/gitpod/v1/user_pb
import { getPrimaryEmail } from "@gitpod/public-api-common/lib/user-utils";
import { useHasRolePermission } from "../data/organizations/members-query";
import { OrganizationRole } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
import { useHasConfigurationsAndPrebuildsEnabled } from "../data/featureflag-query";

interface Entry {
title: string;
Expand Down Expand Up @@ -130,6 +131,7 @@ type OrgPagesNavProps = {
const OrgPagesNav: FC<OrgPagesNavProps> = ({ className }) => {
const location = useLocation();
const hasMemberPermission = useHasRolePermission(OrganizationRole.MEMBER);
const configurationsEnabled = useHasConfigurationsAndPrebuildsEnabled();

const leftMenu: Entry[] = useMemo(() => {
const menus = [
Expand All @@ -139,16 +141,16 @@ const OrgPagesNav: FC<OrgPagesNavProps> = ({ className }) => {
alternatives: ["/"],
},
];
// collaborator can't access projects
if (hasMemberPermission) {
// collaborators can't access projects
if (hasMemberPermission && !configurationsEnabled) {
menus.push({
title: "Projects",
link: `/projects`,
alternatives: [] as string[],
});
}
return menus;
}, [hasMemberPermission]);
}, [configurationsEnabled, hasMemberPermission]);

return (
<div
Expand Down