Skip to content

feat: add "Busy" status and new preset "Be right back" status #53850

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
Antreesy merged 3 commits into from
Aug 1, 2025
Merged

feat: add "Busy" status and new preset "Be right back" status #53850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56174f7
feat: add Busy status and new preset BRB status
miaulalala Jul 7, 2025
47923b9
style(user_status): adjust status modal styles
Antreesy Jul 28, 2025
9adc97e
chore(assets): Recompile assets
nextcloud-command Aug 1, 2025
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 apps/dav/lib/CalDAV/Status/StatusService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public function processCalendarStatus(string $userId): void {
$this->logger->debug("Found $count applicable event(s), changing user status", ['user' => $userId]);
$this->userStatusService->setUserStatus(
$userId,
IUserStatus::AWAY,
IUserStatus::BUSY,
IUserStatus::MESSAGE_CALENDAR_BUSY,
true
);
Expand Down
17 changes: 17 additions & 0 deletions apps/user_status/lib/Service/PredefinedStatusService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* @package OCA\UserStatus\Service
*/
class PredefinedStatusService {
private const BE_RIGHT_BACK = 'be-right-back';
private const MEETING = 'meeting';
private const COMMUTING = 'commuting';
private const SICK_LEAVE = 'sick-leave';
Expand Down Expand Up @@ -64,6 +65,15 @@ public function getDefaultStatuses(): array {
'time' => 1800,
],
],
[
'id' => self::BE_RIGHT_BACK,
'icon' => '⏳',
'message' => $this->getTranslatedStatusForId(self::BE_RIGHT_BACK),
'clearAt' => [
'type' => 'period',
'time' => 900,
],
],
[
'id' => self::REMOTE_WORK,
'icon' => '🏡',
Expand Down Expand Up @@ -143,6 +153,9 @@ public function getIconForId(string $id): ?string {
case self::REMOTE_WORK:
return '🏡';

case self::BE_RIGHT_BACK:
return '⏳';

case self::CALL:
return '💬';

Expand Down Expand Up @@ -179,6 +192,9 @@ public function getTranslatedStatusForId(string $id): ?string {
case self::CALL:
return $this->l10n->t('In a call');

case self::BE_RIGHT_BACK:
return $this->l10n->t('Be right back');

default:
return null;
}
Expand All @@ -195,6 +211,7 @@ public function isValidId(string $id): bool {
self::SICK_LEAVE,
self::VACATIONING,
self::OUT_OF_OFFICE,
self::BE_RIGHT_BACK,
self::REMOTE_WORK,
IUserStatus::MESSAGE_CALL,
IUserStatus::MESSAGE_AVAILABILITY,
Expand Down
8 changes: 3 additions & 5 deletions apps/user_status/src/components/ClearAtSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
:value="option"
:clearable="false"
placement="top"
label-outside
@option:selected="select" />
</div>
</template>
Expand Down Expand Up @@ -72,12 +73,9 @@ export default {
<style lang="scss" scoped>
.clear-at-select {
display: flex;
margin-bottom: 10px;
gap: calc(2 * var(--default-grid-baseline));
align-items: center;

&__label {
margin-inline-end: 12px;
}
margin-block: 0 calc(2 * var(--default-grid-baseline));

&__select {
flex-grow: 1;
Expand Down
42 changes: 20 additions & 22 deletions apps/user_status/src/components/OnlineStatusSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
name="user-status-online"
@change="onChange">
<label :for="id" class="user-status-online-select__label">
{{ label }}
<NcUserStatusIcon :status="type"
class="user-status-online-select__icon"
aria-hidden="true" />
{{ label }}
<em class="user-status-online-select__subline">{{ subline }}</em>
</label>
</div>
Expand Down Expand Up @@ -63,45 +64,42 @@ export default {
</script>

<style lang="scss" scoped>
@use 'sass:math';
$icon-size: 24px;
$label-padding: 8px;

.user-status-online-select {
&__label {
position: relative;
display: block;
margin: $label-padding;
padding: $label-padding;
padding-inline-start: $icon-size + $label-padding * 2;
border: 2px solid var(--color-main-background);
box-sizing: inherit;
display: grid;
grid-template-columns: var(--default-clickable-area) 1fr 2fr;
align-items: center;
gap: var(--default-grid-baseline);
min-height: var(--default-clickable-area);
padding: var(--default-grid-baseline);
border-radius: var(--border-radius-large);
background-color: var(--color-background-hover);
background-position: $label-padding center;
background-size: $icon-size;

span,
& {
&, & * {
cursor: pointer;
}

span {
position: absolute;
top: calc(50% - 10px);
inset-inline-start: 10px;
display: block;
width: $icon-size;
height: $icon-size;
&:hover {
background-color: var(--color-background-dark);
}
}

&__icon {
flex-shrink: 0;
max-width: 34px;
max-height: 100%;
}

&__input:checked + &__label {
outline: 2px solid var(--color-main-text);
background-color: var(--color-background-dark);
box-shadow: 0 0 0 4px var(--color-main-background);
}

&__input:focus-visible + &__label {
outline: 2px solid var(--color-primary-element) !important;
background-color: var(--color-background-dark);
}

&__subline {
Expand Down
15 changes: 13 additions & 2 deletions apps/user_status/src/components/PredefinedStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,19 @@ export default {
flex-basis: 100%;
border-radius: var(--border-radius);
align-items: center;
min-height: 44px;
min-height: var(--default-clickable-area);
padding-inline: var(--default-grid-baseline);

&, & * {
cursor: pointer;
}

&:hover {
background-color: var(--color-background-dark);
}

&--icon {
flex-basis: 40px;
flex-basis: var(--default-clickable-area);
text-align: center;
}

Expand All @@ -106,11 +115,13 @@ export default {
&__label:active {
outline: 2px solid var(--color-main-text);
box-shadow: 0 0 0 4px var(--color-main-background);
background-color: var(--color-background-dark);
border-radius: var(--border-radius-large);
}

&__input:focus-visible + &__label {
outline: 2px solid var(--color-primary-element) !important;
background-color: var(--color-background-dark);
border-radius: var(--border-radius-large);
}
}
Expand Down
3 changes: 2 additions & 1 deletion apps/user_status/src/components/PredefinedStatusesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export default {
.predefined-statuses-list {
display: flex;
flex-direction: column;
margin-bottom: 10px;
gap: var(--default-grid-baseline);
margin-block: 0 calc(2 * var(--default-grid-baseline));
}
</style>
5 changes: 3 additions & 2 deletions apps/user_status/src/components/PreviousStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ export default {
flex-basis: 100%;
border-radius: var(--border-radius);
align-items: center;
min-height: 44px;
min-height: var(--default-clickable-area);
padding-inline: var(--default-grid-baseline);

&:hover,
&:focus {
Expand All @@ -77,7 +78,7 @@ export default {
}

&__icon {
flex-basis: 40px;
flex-basis: var(--default-clickable-area);
text-align: center;
}

Expand Down
21 changes: 14 additions & 7 deletions apps/user_status/src/components/SetStatusModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<template>
<NcModal size="normal"
:name="$t('user_status', 'Set status')"
aria-labelledby="user_status-set-dialog"
label-id="user_status-set-dialog"
dark
:set-return-focus="setReturnFocus"
@close="closeModal">
<div class="set-status-modal">
Expand Down Expand Up @@ -336,19 +336,25 @@ export default {
.set-status-modal {
padding: 8px 20px 20px 20px;

&, & * {
box-sizing: border-box;
}

&__header {
font-size: 21px;
text-align: center;
height: fit-content;
min-height: var(--default-clickable-area);
line-height: var(--default-clickable-area);
overflow-wrap: break-word;
margin-block: 0 12px;
margin-block: 0 calc(2 * var(--default-grid-baseline));
}

&__online-status {
display: grid;
grid-template-columns: 1fr 1fr;
display: flex;
flex-direction: column;
gap: calc(2 * var(--default-grid-baseline));
margin-block: 0 calc(2 * var(--default-grid-baseline));
}

&__custom-input {
Expand All @@ -357,13 +363,14 @@ export default {
align-items: center;
gap: var(--default-grid-baseline);
width: 100%;
margin-bottom: 10px;
padding-inline-start: var(--default-grid-baseline);
margin-block: 0 calc(2 * var(--default-grid-baseline));
}

&__automation-hint {
display: flex;
width: 100%;
margin-bottom: 10px;
margin-block: 0 calc(2 * var(--default-grid-baseline));
color: var(--color-text-maxcontrast);
}

Expand Down
3 changes: 3 additions & 0 deletions apps/user_status/src/services/statusOptionsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const getAllStatusOptions = () => {
}, {
type: 'away',
label: t('user_status', 'Away'),
}, {
type: 'busy',
label: t('user_status', 'Busy'),
}, {
type: 'dnd',
label: t('user_status', 'Do not disturb'),
Expand Down
8 changes: 4 additions & 4 deletions apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function testCallOverwritesMeetingStatus(): void {
);
$this->service->setUserStatus(
'test123',
IUserStatus::AWAY,
IUserStatus::BUSY,
IUserStatus::MESSAGE_CALENDAR_BUSY,
true,
);
Expand All @@ -147,12 +147,12 @@ public function testCallOverwritesMeetingStatus(): void {

$this->service->setUserStatus(
'test123',
IUserStatus::AWAY,
IUserStatus::BUSY,
IUserStatus::MESSAGE_CALL,
true,
);
self::assertSame(
IUserStatus::AWAY,
IUserStatus::BUSY,
$this->service->findByUserId('test123')->getStatus(),
);

Expand Down Expand Up @@ -182,7 +182,7 @@ public function testOtherAutomationsDoNotOverwriteEachOther(): void {

$nostatus = $this->service->setUserStatus(
'test123',
IUserStatus::AWAY,
IUserStatus::BUSY,
IUserStatus::MESSAGE_CALENDAR_BUSY,
true,
);
Expand Down
16 changes: 14 additions & 2 deletions apps/user_status/tests/Unit/Service/PredefinedStatusServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected function setUp(): void {
}

public function testGetDefaultStatuses(): void {
$this->l10n->expects($this->exactly(7))
$this->l10n->expects($this->exactly(8))
->method('t')
->willReturnCallback(function ($text, $parameters = []) {
return vsprintf($text, $parameters);
Expand All @@ -52,6 +52,15 @@ public function testGetDefaultStatuses(): void {
'time' => 1800,
],
],
[
'id' => 'be-right-back',
'icon' => '⏳',
'message' => 'Be right back',
'clearAt' => [
'type' => 'period',
'time' => 900,
],
],
[
'id' => 'remote-work',
'icon' => '🏡',
Expand Down Expand Up @@ -106,6 +115,7 @@ public static function getIconForIdDataProvider(): array {
['sick-leave', '🤒'],
['vacationing', '🌴'],
['remote-work', '🏡'],
['be-right-back', '⏳'],
['call', '💬'],
['unknown-id', null],
];
Expand All @@ -127,6 +137,7 @@ public static function getTranslatedStatusForIdDataProvider(): array {
['sick-leave', 'Out sick'],
['vacationing', 'Vacationing'],
['remote-work', 'Working remotely'],
['be-right-back', 'Be right back'],
['call', 'In a call'],
['unknown-id', null],
];
Expand All @@ -145,13 +156,14 @@ public static function isValidIdDataProvider(): array {
['sick-leave', true],
['vacationing', true],
['remote-work', true],
['be-right-back', true],
['call', true],
['unknown-id', false],
];
}

public function testGetDefaultStatusById(): void {
$this->l10n->expects($this->exactly(7))
$this->l10n->expects($this->exactly(8))
->method('t')
->willReturnCallback(function ($text, $parameters = []) {
return vsprintf($text, $parameters);
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user-status-modal-5133.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user-status-modal-5133.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading