Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Show usage banners in doc menu of free team sites

Browse Source 
Summary:
Also fixes a minor CSS regression in UserManager where the
link to add a team member wasn't shown on a separate row.

Test Plan: Browser tests.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D3444
This commit is contained in:
George Gevoian
2022-05-25 23:47:26 -07:00
parent 2f3cf59fc3
commit 74ec9358da
16 changed files with 341 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/client/ui/UserManager.ts
View File

@@ -283,12 +283,9 @@ export class UserManager extends Disposable {
!member.name ? null : cssMemberSecondary(
member.email, dom.cls('member-email'), testId('um-member-email')
),
dom('span',
(this._model.isPersonal
? this._buildSelfAnnotationDom(member)
: this._buildAnnotationDom(member)
),
testId('um-member-annotation'),
(this._model.isPersonal
? this._buildSelfAnnotationDom(member)
: this._buildAnnotationDom(member)
),
),
member.isRemoved ? null : this._memberRoleSelector(member.effectiveAccess,
@@ -364,15 +361,18 @@ export class UserManager extends Disposable {
const annotation = annotations.users.get(user.email);
if (!annotation) { return null; }
let memberType: string;
if (annotation.isSupport) {
return cssMemberType('Grist support');
memberType = 'Grist support';
} else if (annotation.isMember && annotations.hasTeam) {
return cssMemberType('Team member');
memberType = 'Team member';
} else if (annotations.hasTeam) {
return cssMemberType('Outside collaborator');
memberType = 'Outside collaborator';
} else {
return cssMemberType('Collaborator');
memberType = 'Collaborator';
}
return cssMemberType(memberType, testId('um-member-annotation'));
});
}