Skip to content

[dashboard] Personal Access Token empty page #14660

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

Merged
merged 1 commit into from
Nov 14, 2022
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
3 changes: 3 additions & 0 deletions components/dashboard/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
settingsPathVariables,
settingsPathSSHKeys,
usagePathMain,
settingsPathPersonalAccessTokens,
} from "./settings/settings.routes";
import {
projectsPathInstallGitHubApp,
Expand All @@ -54,6 +55,7 @@ import { BlockedRepositories } from "./admin/BlockedRepositories";
import { AppNotifications } from "./AppNotifications";
import { publicApiTeamsToProtocol, teamsService } from "./service/public-api";
import { FeatureFlagContext } from "./contexts/FeatureFlagContext";
import PersonalAccessTokens from "./settings/PersonalAccessTokens";

const Setup = React.lazy(() => import(/* webpackPrefetch: true */ "./Setup"));
const Workspaces = React.lazy(() => import(/* webpackPrefetch: true */ "./workspaces/Workspaces"));
Expand Down Expand Up @@ -395,6 +397,7 @@ function App() {
<Route path={settingsPathNotifications} exact component={Notifications} />
<Route path={settingsPathBilling} exact component={Billing} />
<Route path={settingsPathPlans} exact component={Plans} />
<Route path={settingsPathPersonalAccessTokens} exact component={PersonalAccessTokens} />
<Route path={settingsPathVariables} exact component={EnvironmentVariables} />
<Route path={settingsPathSSHKeys} exact component={SSHKeys} />
<Route path={settingsPathPreferences} exact component={Preferences} />
Expand Down
1 change: 1 addition & 0 deletions components/dashboard/src/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export default function Menu() {
"keys",
"integrations",
"preferences",
"personal-tokens",
]);
const isAdminUI = inResource(window.location.pathname, ["admin"]);

Expand Down
5 changes: 5 additions & 0 deletions components/dashboard/src/contexts/FeatureFlagContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ const FeatureFlagContext = createContext<{
showUsageView: boolean;
showUseLastSuccessfulPrebuild: boolean;
usePublicApiTeamsService: boolean;
enablePersonalAccessTokens: boolean;
}>({
showPersistentVolumeClaimUI: false,
showUsageView: false,
showUseLastSuccessfulPrebuild: false,
usePublicApiTeamsService: false,
enablePersonalAccessTokens: false,
});

const FeatureFlagContextProvider: React.FC = ({ children }) => {
Expand All @@ -37,6 +39,7 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
const [showUsageView, setShowUsageView] = useState<boolean>(false);
const [showUseLastSuccessfulPrebuild, setShowUseLastSuccessfulPrebuild] = useState<boolean>(false);
const [usePublicApiTeamsService, setUsePublicApiTeamsService] = useState<boolean>(false);
const [enablePersonalAccessTokens, setPersonalAccessTokensEnabled] = useState<boolean>(false);

useEffect(() => {
if (!user) return;
Expand All @@ -46,6 +49,7 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
usage_view: { defaultValue: false, setter: setShowUsageView },
showUseLastSuccessfulPrebuild: { defaultValue: false, setter: setShowUseLastSuccessfulPrebuild },
publicApiExperimentalTeamsService: { defaultValue: false, setter: setUsePublicApiTeamsService },
personalAccessTokensEnabled: { defaultValue: false, setter: setPersonalAccessTokensEnabled },
};
for (const [flagName, config] of Object.entries(featureFlags)) {
if (teams) {
Expand Down Expand Up @@ -83,6 +87,7 @@ const FeatureFlagContextProvider: React.FC = ({ children }) => {
showUsageView,
showUseLastSuccessfulPrebuild,
usePublicApiTeamsService,
enablePersonalAccessTokens,
}}
>
{children}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import { useContext } from "react";
import { PageWithSubMenu } from "../components/PageWithSubMenu";
import { FeatureFlagContext } from "../contexts/FeatureFlagContext";
import { UserContext } from "../user-context";
import getSettingsMenu from "./settings-menu";

Expand All @@ -17,9 +18,14 @@ export interface PageWithAdminSubMenuProps {

export function PageWithSettingsSubMenu({ title, subtitle, children }: PageWithAdminSubMenuProps) {
const { userBillingMode } = useContext(UserContext);
const { enablePersonalAccessTokens } = useContext(FeatureFlagContext);

return (
<PageWithSubMenu subMenu={getSettingsMenu({ userBillingMode })} title={title} subtitle={subtitle}>
<PageWithSubMenu
subMenu={getSettingsMenu({ userBillingMode, enablePersonalAccessTokens })}
title={title}
subtitle={subtitle}
>
{children}
</PageWithSubMenu>
);
Expand Down
30 changes: 30 additions & 0 deletions components/dashboard/src/settings/PersonalAccessTokens.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* Copyright (c) 2022 Gitpod GmbH. All rights reserved.
* Licensed under the GNU Affero General Public License (AGPL).
* See License-AGPL.txt in the project root for license information.
*/

import { useContext } from "react";
import { Redirect } from "react-router";
import { FeatureFlagContext } from "../contexts/FeatureFlagContext";
import { PageWithSettingsSubMenu } from "./PageWithSettingsSubMenu";

function PersonalAccessTokens() {
const { enablePersonalAccessTokens } = useContext(FeatureFlagContext);

if (!enablePersonalAccessTokens) {
return <Redirect to="/" />;
}

return (
<div>
<PageWithSettingsSubMenu
title="Preferences"
subtitle="Manage your Personal Access Tokens to access the Gitpod API."
children={undefined}
></PageWithSettingsSubMenu>
</div>
);
}

export default PersonalAccessTokens;
14 changes: 13 additions & 1 deletion components/dashboard/src/settings/settings-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ import {
settingsPathTeams,
settingsPathVariables,
settingsPathSSHKeys,
settingsPathPersonalAccessTokens,
} from "./settings.routes";

export default function getSettingsMenu(params: { userBillingMode?: BillingMode }) {
export default function getSettingsMenu(params: {
userBillingMode?: BillingMode;
enablePersonalAccessTokens?: boolean;
}) {
return [
{
title: "Account",
Expand All @@ -29,6 +33,14 @@ export default function getSettingsMenu(params: { userBillingMode?: BillingMode
link: [settingsPathNotifications],
},
...renderBillingMenuEntries(params.userBillingMode),
...(params.enablePersonalAccessTokens
? [
{
title: "Personal Access Tokens",
link: [settingsPathPersonalAccessTokens],
},
]
: []),
{
title: "Variables",
link: [settingsPathVariables],
Expand Down
1 change: 1 addition & 0 deletions components/dashboard/src/settings/settings.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ export const settingsPathTeamsJoin = [settingsPathTeams, "join"].join("/");
export const settingsPathTeamsNew = [settingsPathTeams, "new"].join("/");

export const settingsPathVariables = "/variables";
export const settingsPathPersonalAccessTokens = "/personal-tokens";

export const settingsPathSSHKeys = "/keys";