Skip to content

company members: #1245

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

Merged
lyubov-voloshko merged 1 commit into from
Jul 5, 2025
Merged

company members: #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion frontend/src/app/components/company/company.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
}

.company-member-cell_email {
max-width: 200px;
max-width: 216px;
}

@media (width <= 600px) {
Expand All @@ -96,6 +96,19 @@
}
}

.company-member-cell_email-value {
display: flex;
align-items: center;
gap: 8px;
}

.company-member-cell_email-icon {
flex-shrink: 0;
font-size: 16px;
width: 16px;
height: 16px;
}

.company-member-cell_name {
max-width: 200px;
}
Expand Down
14 changes: 13 additions & 1 deletion frontend/src/app/components/company/company.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,19 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
class="company-member-cell company-member-cell_email"
data-label="Email"
attr.data-testid="company-member-email-{{i}}-cell">
<span>{{element.email}}</span>
<div class="company-member-cell_email-value">
<mat-icon *ngIf="element.externalRegistrationProvider === null"
class="company-member-cell_email-icon"
matTooltip="You registred with your email">
mail_outline
</mat-icon>
<mat-icon *ngIf="element.externalRegistrationProvider !== null"
class="company-member-cell_email-icon"
[svgIcon]="authProviderIcons[currentUser.externalRegistrationProvider]"
matTooltip="You registred with {{element.externalRegistrationProvider}}">
</mat-icon>
<span>{{element.email}}</span>
</div>
</td>
</ng-container>

Expand Down
5 changes: 5 additions & 0 deletions frontend/src/app/components/company/company.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ export class CompanyComponent {
'USER': 'Member'
}

public authProviderIcons = {
GOOGLE: 'google',
GITHUB: 'github',
}

get whiteLabelSettings(): {logo: string, favicon: string, tabTitle: string} {
return this._company.whiteLabelSettings || { logo: '', favicon: '', tabTitle : '' };
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/app/components/login/login.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ <h1 class="mat-headline-4 loginTitle">
To log in, please start by entering your email address and click next to continue.
</div>
<div *ngIf="userCompanies && userCompanies.length > 1 && !isCustomDomain" class="mat-body-1 login-header__directions">
Please select the company or organization you wish to log into and click next to continue.
Please select the company or organization you wish to log into and click next to continue. <br/>
Don’t see your company? Try logging in with Google or GitHub if that’s how you signed up.
</div>
</div>

Expand Down