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: Changed profile.username to profile.displayName for header username display #1388

Merged
merged 12 commits into from
Mar 5, 2024
Merged

Fix: Changed profile.username to profile.displayName for header username display #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7e5c19
changed profile.username to profile.displayName
Junjiequan Jan 30, 2024
d2f3cae
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
nitrosx Feb 19, 2024
4afef27
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
nitrosx Feb 19, 2024
be30061
Update scichat loopback image
nitrosx Feb 19, 2024
33cebd2
Removed scichat loopback from e2e test
nitrosx Feb 19, 2024
6db948b
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
Junjiequan Feb 23, 2024
540a882
Update user.selectors.ts
nitrosx Feb 26, 2024
fa4068a
Update docker-compose.e2e.yaml
nitrosx Feb 26, 2024
f5f4db3
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
Junjiequan Mar 5, 2024
fe7eaf9
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
Junjiequan Mar 5, 2024
c9346af
removed all the ms-ad. prefix from userName
Junjiequan Mar 5, 2024
d861a9f
Merge branch 'master' into SWAP-3745-scicat-be-make-oidc-user-validat…
Junjiequan Mar 5, 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
2 changes: 1 addition & 1 deletion CI/ESS/e2e/docker-compose.e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
retries: 5
start_period: 40s
scichat-loopback:
image: "dacat/scichat-loopback:e2e"
image: "ghcr.io/scicatproject/scichat-loopback:e2e"
command:
[
"./wait-for-it.sh",
Expand Down
2 changes: 1 addition & 1 deletion src/app/_layout/app-header/app-header.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe("AppHeaderComponent", () => {
selectors: [
{
selector: selectCurrentUserName,
value: "ms-ad.User Name",
value: "User Name",
},
{
selector: selectThumbnailPhoto,
Expand Down
4 changes: 2 additions & 2 deletions src/app/state-management/selectors/user.selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export const selectCurrentUserName = createSelector(
selectCurrentUser,
(profile, user) => {
if (profile) {
return profile.username.replace("ms-ad.", "");
return profile.displayName;
} else if (user) {
return user.username.replace("ms-ad.", "");
return user.username;
} else {
return null;
}
Expand Down
Loading