mirror of
https://github.com/element-hq/element-web
synced 2024-11-22 17:25:50 +03:00
Add release announcement for the new room header (#12802)
This commit is contained in:
parent
bb1b7f1fd0
commit
dafc97fe83
5 changed files with 91 additions and 68 deletions
|
@ -57,6 +57,9 @@ import { isVideoRoom } from "../../../utils/video-rooms";
|
||||||
import { notificationLevelToIndicator } from "../../../utils/notifications";
|
import { notificationLevelToIndicator } from "../../../utils/notifications";
|
||||||
import { CallGuestLinkButton } from "./RoomHeader/CallGuestLinkButton";
|
import { CallGuestLinkButton } from "./RoomHeader/CallGuestLinkButton";
|
||||||
import { ButtonEvent } from "../elements/AccessibleButton";
|
import { ButtonEvent } from "../elements/AccessibleButton";
|
||||||
|
import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement";
|
||||||
|
import { useIsReleaseAnnouncementOpen } from "../../../hooks/useIsReleaseAnnouncementOpen";
|
||||||
|
import { ReleaseAnnouncementStore } from "../../../stores/ReleaseAnnouncementStore";
|
||||||
|
|
||||||
export default function RoomHeader({
|
export default function RoomHeader({
|
||||||
room,
|
room,
|
||||||
|
@ -238,13 +241,25 @@ export default function RoomHeader({
|
||||||
voiceCallButton = undefined;
|
voiceCallButton = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isReleaseAnnouncementOpen = useIsReleaseAnnouncementOpen("newRoomHeader");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Flex as="header" align="center" gap="var(--cpd-space-3x)" className="mx_RoomHeader light-panel">
|
<Flex as="header" align="center" gap="var(--cpd-space-3x)" className="mx_RoomHeader light-panel">
|
||||||
|
<ReleaseAnnouncement
|
||||||
|
feature="newRoomHeader"
|
||||||
|
header={_t("room|header|release_announcement_header")}
|
||||||
|
description={_t("room|header|release_announcement_description")}
|
||||||
|
closeLabel={_t("action|ok")}
|
||||||
|
placement="bottom"
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
aria-label={_t("right_panel|room_summary_card|title")}
|
aria-label={_t("right_panel|room_summary_card|title")}
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
if (isReleaseAnnouncementOpen) {
|
||||||
|
ReleaseAnnouncementStore.instance.nextReleaseAnnouncement();
|
||||||
|
}
|
||||||
RightPanelStore.instance.showOrHidePanel(RightPanelPhases.RoomSummary);
|
RightPanelStore.instance.showOrHidePanel(RightPanelPhases.RoomSummary);
|
||||||
}}
|
}}
|
||||||
className="mx_RoomHeader_infoWrapper"
|
className="mx_RoomHeader_infoWrapper"
|
||||||
|
@ -306,6 +321,7 @@ export default function RoomHeader({
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
</button>
|
</button>
|
||||||
|
</ReleaseAnnouncement>
|
||||||
<Flex align="center" gap="var(--cpd-space-2x)">
|
<Flex align="center" gap="var(--cpd-space-2x)">
|
||||||
{additionalButtons?.map((props) => {
|
{additionalButtons?.map((props) => {
|
||||||
const label = props.label();
|
const label = props.label();
|
||||||
|
|
|
@ -1950,6 +1950,8 @@
|
||||||
"one": "Asking to join",
|
"one": "Asking to join",
|
||||||
"other": "%(count)s people asking to join"
|
"other": "%(count)s people asking to join"
|
||||||
},
|
},
|
||||||
|
"release_announcement_description": "Enjoy a simpler, more accessible room header.",
|
||||||
|
"release_announcement_header": "New design!",
|
||||||
"room_is_public": "This room is public",
|
"room_is_public": "This room is public",
|
||||||
"show_widgets_button": "Show Widgets",
|
"show_widgets_button": "Show Widgets",
|
||||||
"video_call_button_ec": "Video call (%(brand)s)",
|
"video_call_button_ec": "Video call (%(brand)s)",
|
||||||
|
|
|
@ -27,7 +27,7 @@ import { Features } from "../settings/Settings";
|
||||||
/**
|
/**
|
||||||
* The features are shown in the array order.
|
* The features are shown in the array order.
|
||||||
*/
|
*/
|
||||||
const FEATURES = ["threadsActivityCentre"] as const;
|
const FEATURES = ["threadsActivityCentre", "newRoomHeader"] as const;
|
||||||
/**
|
/**
|
||||||
* All the features that can be shown in the release announcements.
|
* All the features that can be shown in the release announcements.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -7,6 +7,8 @@ exports[`RoomHeader does not show the face pile for DMs 1`] = `
|
||||||
style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x);"
|
style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x);"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="dialog"
|
||||||
aria-label="Room info"
|
aria-label="Room info"
|
||||||
class="mx_RoomHeader_infoWrapper"
|
class="mx_RoomHeader_infoWrapper"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
|
|
|
@ -99,14 +99,18 @@ describe("ReleaseAnnouncementStore", () => {
|
||||||
// Sanity check
|
// Sanity check
|
||||||
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("threadsActivityCentre");
|
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("threadsActivityCentre");
|
||||||
|
|
||||||
const promise = listenReleaseAnnouncementChanged();
|
let promise = listenReleaseAnnouncementChanged();
|
||||||
|
await releaseAnnouncementStore.nextReleaseAnnouncement();
|
||||||
|
|
||||||
|
expect(await promise).toBe("newRoomHeader");
|
||||||
|
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("newRoomHeader");
|
||||||
|
|
||||||
|
promise = listenReleaseAnnouncementChanged();
|
||||||
await releaseAnnouncementStore.nextReleaseAnnouncement();
|
await releaseAnnouncementStore.nextReleaseAnnouncement();
|
||||||
// Currently there is only one feature, so the next feature should be null
|
|
||||||
expect(await promise).toBeNull();
|
expect(await promise).toBeNull();
|
||||||
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBeNull();
|
|
||||||
|
|
||||||
const secondStore = new ReleaseAnnouncementStore();
|
const secondStore = new ReleaseAnnouncementStore();
|
||||||
// The TAC release announcement has been viewed, so it should be updated in the store account
|
// All the release announcements have been viewed, so it should be updated in the store account
|
||||||
// The release announcement viewing states should be share among all instances (devices in the same account)
|
// The release announcement viewing states should be share among all instances (devices in the same account)
|
||||||
expect(secondStore.getReleaseAnnouncement()).toBeNull();
|
expect(secondStore.getReleaseAnnouncement()).toBeNull();
|
||||||
});
|
});
|
||||||
|
@ -118,8 +122,7 @@ describe("ReleaseAnnouncementStore", () => {
|
||||||
const promise = listenReleaseAnnouncementChanged();
|
const promise = listenReleaseAnnouncementChanged();
|
||||||
await secondStore.nextReleaseAnnouncement();
|
await secondStore.nextReleaseAnnouncement();
|
||||||
|
|
||||||
// Currently there is only one feature, so the next feature should be null
|
expect(await promise).toBe("newRoomHeader");
|
||||||
expect(await promise).toBeNull();
|
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("newRoomHeader");
|
||||||
expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBeNull();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue