Skip to content

Commit 61089f7

Browse files
author
fabienSvstr
committed
Update
1 parent 6af672b commit 61089f7

File tree

3 files changed

+20
-37
lines changed

3 files changed

+20
-37
lines changed

client/src/components/users/UserListItem.vue

+19-5
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,19 @@
6565
<ion-text class="cell user-mobile-text__email">
6666
{{ user.humanHandle.email }}
6767
</ion-text>
68-
<tag-profile
69-
:profile="user.currentProfile"
70-
class="user-mobile-text__profile"
71-
/>
68+
<div class="user-mobile-text__profile-status">
69+
<tag-profile
70+
:profile="user.currentProfile"
71+
class="user-mobile-text__profile"
72+
/>
73+
<user-status-tag
74+
:revoked="user.isRevoked()"
75+
:frozen="user.isFrozen()"
76+
:show-tooltip="true"
77+
v-if="!user.isActive()"
78+
class="user-mobile-text__status"
79+
/>
80+
</div>
7281
</div>
7382
</div>
7483

@@ -106,7 +115,7 @@
106115
<!-- options -->
107116
<div class="user-options ion-item-child-clickable">
108117
<ion-button
109-
v-show="((isHovered || menuOpened) && !user.isCurrent) || isSmallDisplay"
118+
v-show="((isHovered || menuOpened || isSmallDisplay) && !user.isCurrent)"
110119
fill="clear"
111120
class="options-button"
112121
@click.stop="onOptionsClick($event)"
@@ -206,6 +215,11 @@ async function onOptionsClick(event: Event): Promise<void> {
206215
&__email {
207216
color: var(--parsec-color-light-secondary-grey);
208217
}
218+
219+
&__profile-status {
220+
display: flex;
221+
gap: 0.5rem;
222+
}
209223
}
210224
}
211225

client/src/theme/components/list.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
}
276276
}
277277

278-
.label-status,
278+
.label-status:not(.user-mobile-text__status),
279279
.user-status {
280280
flex: 0 0 8rem;
281281

client/tests/e2e/specs/documents_list.spec.ts

-31
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,6 @@ for (const displaySize of ['small', 'large']) {
5555
});
5656
}
5757

58-
for (const displaySize of ['small', 'large']) {
59-
msTest(`Documents page default state on ${displaySize} display`, async ({ home, documents }) => {
60-
if (displaySize === 'small') {
61-
const viewport = home.viewportSize();
62-
await home.setViewportSize({ width: 700, height: viewport ? viewport.height : 700 });
63-
}
64-
65-
const actionBar = documents.locator('#folders-ms-action-bar');
66-
await expect(actionBar.locator('.ms-action-bar-button:visible')).toHaveText(['New folder', 'Import']);
67-
await expect(actionBar.locator('.counter')).toHaveText('11 items', { useInnerText: true });
68-
await expect(actionBar.locator('#select-popover-button')).toHaveText('Name');
69-
await expect(actionBar.locator('#grid-view')).toNotHaveDisabledAttribute();
70-
await expect(actionBar.locator('#list-view')).toHaveDisabledAttribute();
71-
const entries = documents.locator('.folder-container').locator('.file-list-item');
72-
await expect(entries).toHaveCount(11);
73-
if (displaySize === 'small') {
74-
await expect(entries.locator('.file-name').locator('.file-name__label')).toHaveText(NAME_MATCHER_ARRAY);
75-
await expect(entries.locator('.data-date')).toHaveText(TIME_MATCHER_ARRAY);
76-
await expect(entries.locator('.data-size')).toHaveText(SIZE_MATCHER_ARRAY.slice(2));
77-
for (let i = 0; i < (await entries.count()); i++) {
78-
const entry = entries.nth(i);
79-
await expect(entry.locator('.options-button')).toBeVisible();
80-
}
81-
} else {
82-
await expect(entries.locator('.file-name').locator('.file-name__label')).toHaveText(NAME_MATCHER_ARRAY);
83-
await expect(entries.locator('.file-lastUpdate')).toHaveText(TIME_MATCHER_ARRAY);
84-
await expect(entries.locator('.file-size')).toHaveText(SIZE_MATCHER_ARRAY);
85-
}
86-
});
87-
}
88-
8958
msTest('Check documents in grid mode', async ({ documents }) => {
9059
await toggleViewMode(documents);
9160
const entries = documents.locator('.folder-container').locator('.file-card-item');

0 commit comments

Comments
 (0)