Skip to content

fix(ui): fix admin's announcements list, add and edit #5543

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −7
Open

fix(ui): fix admin's announcements list, add and edit #5543

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
2798da5
fix(ui,docker): expose TinyMCE API key env variable
luizhf42 Nov 19, 2025
4dc1adf
fix(ui): fix TurndownService instantiation for announcement add/edit
luizhf42 Nov 19, 2025
a908d88
fix(ui): prevent null value in announcements list
luizhf42 Nov 19, 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
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ services:
- SHELLHUB_ENTERPRISE=${SHELLHUB_ENTERPRISE}
- SHELLHUB_CLOUD=${SHELLHUB_CLOUD}
- SHELLHUB_ANNOUNCEMENTS=${SHELLHUB_ANNOUNCEMENTS}
- SHELLHUB_TINYMCE_API_KEY=${TINYMCE_API_KEY}
- SHELLHUB_VERSION=${SHELLHUB_VERSION}
- SHELLHUB_SENTRY_DSN=${SHELLHUB_SENTRY_DSN}
- SHELLHUB_PAYWALL=${SHELLHUB_PAYWALL}
Expand Down
6 changes: 2 additions & 4 deletions ui/admin/src/components/Announcement/AnnouncementEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ const snackbar = useSnackbar();
const showDialog = ref(false);
const md = new MarkdownIt();
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
const { turndown } = new TurndownService() as {
turndown: (input: string) => string;
};
const turndownService = new TurndownService() as { turndown: (input: string) => string };
const tinyMceKey = computed(() => envVariables.tinyMceKey);
const isTinyMceKeyEmpty = computed(() => tinyMceKey.value === "");
const announcement = computed(() => announcementStore.announcement);
Expand Down Expand Up @@ -127,7 +125,7 @@ const onSubmit = async () => {
}

try {
const contentInMarkdown = turndown(contentInHtml.value);
const contentInMarkdown = turndownService.turndown(contentInHtml.value);
await announcementStore.updateAnnouncement(announcement.value.uuid, {
title: title.value ?? "",
content: contentInMarkdown,
Expand Down
2 changes: 1 addition & 1 deletion ui/admin/src/store/modules/announcement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const useAnnouncementStore = defineStore("adminAnnouncement", () => {

const fetchAnnouncementList = async (data: { page: number; perPage: number; orderBy: "asc" | "desc"; }) => {
const res = await announcementApi.fetchAnnouncementList(data.page, data.perPage, data.orderBy);
announcements.value = res.data as IAdminAnnouncementShort[];
announcements.value = res.data as IAdminAnnouncementShort[] ?? [];
announcementCount.value = parseInt(res.headers["x-total-count"] as string, 10);
};

Expand Down
4 changes: 2 additions & 2 deletions ui/admin/src/views/NewAnnouncement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const tinyMceKeyIsEmpty = computed(() => tinyMceKey.value === "");
const announcement = ref("");
const announcementError = ref(false);
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
const { turndown } = new TurndownService() as { turndown: (input: string) => string };
const turndownService = new TurndownService() as { turndown: (input: string) => string };

watch(announcement, (val) => {
if (val) announcementError.value = false;
Expand All @@ -107,7 +107,7 @@ const postAnnouncement = async () => {
}

try {
const contentInHtml = turndown(announcement.value);
const contentInHtml = turndownService.turndown(announcement.value);
await announcementStore.createAnnouncement({
title: title.value,
content: contentInHtml,
Expand Down