-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[dashboard] allow editing user information #11023
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 218 additions & 0 deletions
218
components/dashboard/src/settings/ProfileInformation.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| /** | ||
| * Copyright (c) 2021 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 { User } from "@gitpod/gitpod-protocol"; | ||
| import { hoursBefore, isDateSmaller } from "@gitpod/gitpod-protocol/lib/util/timeutil"; | ||
| import React, { useContext, useState } from "react"; | ||
| import Alert from "../components/Alert"; | ||
| import CodeText from "../components/CodeText"; | ||
| import Modal from "../components/Modal"; | ||
| import { getGitpodService } from "../service/service"; | ||
| import { UserContext } from "../user-context"; | ||
| import { isGitpodIo } from "../utils"; | ||
|
|
||
| export namespace ProfileState { | ||
| export interface ProfileState { | ||
| name: string; | ||
| email: string; | ||
| company?: string; | ||
| avatarURL?: string; | ||
| } | ||
|
|
||
| export function getProfileState(user: User): ProfileState { | ||
| return { | ||
| name: User.getName(user!) || "", | ||
| email: User.getPrimaryEmail(user!) || "", | ||
| company: user?.additionalData?.profile?.companyName, | ||
| avatarURL: user?.avatarUrl, | ||
| }; | ||
| } | ||
|
|
||
| export function setProfileState(user: User, profileState: ProfileState): User { | ||
| user.fullName = profileState.name; | ||
| user.avatarUrl = profileState.avatarURL; | ||
|
|
||
| if (!user.additionalData) { | ||
| user.additionalData = {}; | ||
| } | ||
| if (!user.additionalData.profile) { | ||
| user.additionalData.profile = {}; | ||
| } | ||
| user.additionalData.profile.emailAddress = profileState.email; | ||
| user.additionalData.profile.companyName = profileState.company; | ||
| user.additionalData.profile.lastUpdatedDetailsNudge = new Date().toISOString(); | ||
|
|
||
| return user; | ||
| } | ||
|
|
||
| export function hasChanges(before: ProfileState, after: ProfileState) { | ||
| return ( | ||
| before.name !== after.name || | ||
| before.email !== after.email || | ||
| before.company !== after.company || | ||
| before.avatarURL !== after.avatarURL | ||
| ); | ||
| } | ||
|
|
||
| function shouldNudgeForUpdate(user: User): boolean { | ||
| if (!isGitpodIo()) { | ||
| return false; | ||
| } | ||
| if (!user.additionalData?.profile) { | ||
| // never updated profile information and account is older than 24 hours (i.e. ask on second day). | ||
| return !isDateSmaller(hoursBefore(new Date().toISOString(), 24), user.creationDate); | ||
| } | ||
| // if the profile wasn't updated for 12 months ask again. | ||
| return !( | ||
| !!user.additionalData.profile.lastUpdatedDetailsNudge && | ||
| isDateSmaller( | ||
| hoursBefore(new Date().toISOString(), 24 * 365), | ||
| user.additionalData.profile.lastUpdatedDetailsNudge, | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param state | ||
| * @returns error message or empty string when valid | ||
| */ | ||
| export function validate(state: ProfileState): string { | ||
| if (state.name.trim() === "") { | ||
| return "Name must not be empty."; | ||
| } | ||
| if (state.email.trim() === "") { | ||
| return "Email must not be empty."; | ||
| } | ||
| if ( | ||
| !/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test( | ||
| state.email.trim(), | ||
| ) | ||
| ) { | ||
| return "Please enter a valid email."; | ||
gtsiolis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return ""; | ||
| } | ||
|
|
||
| export function NudgeForProfileUpdateModal() { | ||
| const { user, setUser } = useContext(UserContext); | ||
| const original = ProfileState.getProfileState(user!); | ||
| const [profileState, setProfileState] = useState(original); | ||
| const [errorMessage, setErrorMessage] = useState(""); | ||
| const [visible, setVisible] = useState(shouldNudgeForUpdate(user!)); | ||
|
|
||
| const saveProfileState = () => { | ||
| const error = ProfileState.validate(profileState); | ||
| setErrorMessage(error); | ||
| if (error) { | ||
| return; | ||
| } | ||
| const updatedUser = ProfileState.setProfileState(user!, profileState); | ||
| setUser(updatedUser); | ||
| getGitpodService().server.updateLoggedInUser(updatedUser); | ||
| setVisible(shouldNudgeForUpdate(updatedUser!)); | ||
| }; | ||
|
|
||
| const cancelProfileUpdate = () => { | ||
| setProfileState(original); | ||
| saveProfileState(); | ||
| }; | ||
|
|
||
| return ( | ||
| <Modal | ||
| title="Update Profile Information" | ||
| visible={visible} | ||
| onClose={cancelProfileUpdate} | ||
| closeable={true} | ||
| className="_max-w-xl" | ||
| buttons={ | ||
| <div> | ||
| <button className="secondary" onClick={cancelProfileUpdate}> | ||
| Dismiss | ||
| </button> | ||
| <button className="ml-2" onClick={saveProfileState}> | ||
| Update Profile | ||
| </button> | ||
| </div> | ||
| } | ||
| > | ||
| <ProfileInformation | ||
| profileState={profileState} | ||
| errorMessage={errorMessage} | ||
| updated={false} | ||
| setProfileState={setProfileState} | ||
| /> | ||
| </Modal> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default function ProfileInformation(props: { | ||
gtsiolis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| profileState: ProfileState.ProfileState; | ||
| setProfileState: (newState: ProfileState.ProfileState) => void; | ||
| errorMessage: string; | ||
| updated: boolean; | ||
| children?: React.ReactChild[] | React.ReactChild; | ||
| }) { | ||
| return ( | ||
| <div> | ||
| <p className="text-base text-gray-500 pb-4 max-w-xl"> | ||
| The following information will be used to set up Git configuration. You can override Git author name and | ||
| email per project by using the default environment variables <CodeText>GIT_AUTHOR_NAME</CodeText>,{" "} | ||
| <CodeText>GIT_COMMITTER_NAME</CodeText>, <CodeText>GIT_AUTHOR_EMAIL</CodeText> and{" "} | ||
| <CodeText>GIT_COMMITTER_EMAIL</CodeText>. | ||
| </p> | ||
| {props.errorMessage.length > 0 && ( | ||
| <Alert type="error" closable={true} className="mb-2 max-w-xl rounded-md"> | ||
gtsiolis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {props.errorMessage} | ||
| </Alert> | ||
| )} | ||
| {props.updated && ( | ||
| <Alert type="message" closable={true} className="mb-2 max-w-xl rounded-md"> | ||
| Profile information has been updated. | ||
gtsiolis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </Alert> | ||
| )} | ||
| <div className="flex flex-col lg:flex-row"> | ||
| <div> | ||
| <div className="mt-4"> | ||
| <h4>Name</h4> | ||
| <input | ||
| type="text" | ||
| value={props.profileState.name} | ||
| onChange={(e) => props.setProfileState({ ...props.profileState, name: e.target.value })} | ||
| /> | ||
| </div> | ||
| <div className="mt-4"> | ||
| <h4>Email</h4> | ||
| <input | ||
| type="text" | ||
| value={props.profileState.email} | ||
| onChange={(e) => props.setProfileState({ ...props.profileState, email: e.target.value })} | ||
| /> | ||
| </div> | ||
| <div className="mt-4"> | ||
| <h4>Company</h4> | ||
| <input | ||
| type="text" | ||
| value={props.profileState.company} | ||
| onChange={(e) => props.setProfileState({ ...props.profileState, company: e.target.value })} | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div className="lg:pl-14"> | ||
| <div className="mt-4"> | ||
| <h4>Avatar</h4> | ||
| <img | ||
| className="rounded-full w-24 h-24" | ||
| src={props.profileState.avatarURL} | ||
| alt={props.profileState.name} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {props.children || null} | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.