Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

Feature/profile navigation (#1464)

Browse Source 
- Fix bug where profile settings wasn't shown if user cannot change password
- Add missing "ApiKey" entry in the single user menu

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
This commit is contained in:
Florian Scholdei
2020-12-16 09:23:05 +01:00
committed by GitHub
parent 3f018c2255
commit 88b93dc8b8
30 changed files with 598 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
scm-ui/ui-webapp/src/containers/Profile.tsx
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
import React from "react";
import { Route, RouteComponentProps, withRouter } from "react-router-dom";
import { Redirect, Route, RouteComponentProps, Switch, withRouter } from "react-router-dom";
import { getMe } from "../modules/auth";
import { compose } from "redux";
import { connect } from "react-redux";
@@ -37,16 +37,16 @@ import {
SecondaryNavigationColumn,
SecondaryNavigation,
SubNavigation,
StateMenuContextProvider
StateMenuContextProvider,
urls
} from "@scm-manager/ui-components";
import ChangeUserPassword from "./ChangeUserPassword";
import ProfileInfo from "./ProfileInfo";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
import SetPublicKeys from "../users/components/publicKeys/SetPublicKeys";
import SetPublicKeyNavLink from "../users/components/navLinks/SetPublicKeysNavLink";
import SetPublicKeysNavLink from "../users/components/navLinks/SetPublicKeysNavLink";
import SetApiKeys from "../users/components/apiKeys/SetApiKeys";
import SetApiKeyNavLink from "../users/components/navLinks/SetApiKeysNavLink";
import { urls } from "@scm-manager/ui-components";
import SetApiKeysNavLink from "../users/components/navLinks/SetApiKeysNavLink";
type Props = RouteComponentProps &
WithTranslation & {
@@ -57,24 +57,22 @@ type Props = RouteComponentProps &
};
class Profile extends React.Component<Props> {
mayChangePassword = () => {
const { me } = this.props;
return !!me?._links?.password;
};
mayChangePassword = () => !!this.props.me?._links?.password;
canManagePublicKeys = () => !!this.props.me?._links?.publicKeys;
canManageApiKeys = () => !!this.props.me?._links?.apiKeys;
canManagePublicKeys = () => {
shouldRenderNavigation = () => {
const { me } = this.props;
return !!me?._links?.publicKeys;
};
canManageApiKeys = () => {
const { me } = this.props;
return !!me?._links?.apiKeys;
return (
!!me?._links?.password ||
!!me?._links?.publicKeys ||
!!me?._links?.apiKeys ||
binder.hasExtension("profile.route")
);
};
render() {
const url = urls.matchedUrl(this.props);
const { me, t } = this.props;
if (!me) {
@@ -101,6 +99,19 @@ class Profile extends React.Component<Props> {
<CustomQueryFlexWrappedColumns>
<PrimaryContentColumn>
<Route path={url} exact render={() => <ProfileInfo me={me} />} />
{this.shouldRenderNavigation() && (
<Switch>
{this.mayChangePassword() && (
<Redirect exact from={`${url}/settings/`} to={`${url}/settings/password`} />
)}
{this.canManagePublicKeys() && (
<Redirect exact from={`${url}/settings/`} to={`${url}/settings/publicKeys`} />
)}
{this.canManageApiKeys() && (
<Redirect exact from={`${url}/settings/`} to={`${url}/settings/apiKeys`} />
)}
</Switch>
)}
{this.mayChangePassword() && (
<Route path={`${url}/settings/password`} render={() => <ChangeUserPassword me={me} />} />
)}
@@ -120,15 +131,17 @@ class Profile extends React.Component<Props> {
label={t("profile.informationNavLink")}
title={t("profile.informationNavLink")}
/>
{this.mayChangePassword() && (
{this.shouldRenderNavigation() && (
<SubNavigation
to={`${url}/settings/password`}
to={`${url}/settings/`}
label={t("profile.settingsNavLink")}
title={t("profile.settingsNavLink")}
>
<NavLink to={`${url}/settings/password`} label={t("profile.changePasswordNavLink")} />
<SetPublicKeyNavLink user={me} publicKeyUrl={`${url}/settings/publicKeys`} />
<SetApiKeyNavLink user={me} apiKeyUrl={`${url}/settings/apiKeys`} />
{this.mayChangePassword() && (
<NavLink to={`${url}/settings/password`} label={t("profile.changePasswordNavLink")} />
)}
<SetPublicKeysNavLink user={me} publicKeyUrl={`${url}/settings/publicKeys`} />
<SetApiKeysNavLink user={me} apiKeyUrl={`${url}/settings/apiKeys`} />
<ExtensionPoint name="profile.setting" props={extensionProps} renderAll={true} />
</SubNavigation>
)}