fix: Trim trailing slash in Universal Inbox URL

This commit is contained in:
2024-04-29 17:29:37 +02:00
parent a8cf51ec4a
commit 735b2f5481
6 changed files with 12 additions and 12 deletions

View File

@@ -41,7 +41,7 @@ export function CreateTaskFromNotification({ notification, mutate }: CreateTaskF
const [searchText, setSearchText] = useState("");
const { isLoading, data: projects } = useFetch<Array<ProjectSummary>>(
`${preferences.universalInboxBaseUrl}/api/tasks/projects/search?matches=${searchText}`,
`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/projects/search?matches=${searchText}`,
{
keepPreviousData: true,
headers: {
@@ -123,7 +123,7 @@ async function createTaskFromNotification(
try {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/notifications/${notification.id}/task`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications/${notification.id}/task`, {
method: "POST",
body: JSON.stringify(taskCreation),
headers: {

View File

@@ -22,7 +22,7 @@ export function LinkNotificationToTask({ notification, mutate }: LinkNotificatio
const [searchText, setSearchText] = useState("");
const { isLoading, data: tasks } = useFetch<Array<Task>>(
`${preferences.universalInboxBaseUrl}/api/tasks/search?matches=${searchText}`,
`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/search?matches=${searchText}`,
{
keepPreviousData: true,
headers: {
@@ -78,7 +78,7 @@ async function linkNotificationToTask(
try {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/notifications/${notification.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications/${notification.id}`, {
method: "PATCH",
body: JSON.stringify({ status: TaskStatus.Deleted, task_id: taskId }),
headers: {

View File

@@ -72,7 +72,7 @@ export async function deleteNotification(
if (isNotificationBuiltFromTask(notification) && notification.task) {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/tasks/${notification.task.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/${notification.task.id}`, {
method: "PATCH",
body: JSON.stringify({ status: TaskStatus.Deleted }),
headers: {
@@ -93,7 +93,7 @@ export async function deleteNotification(
} else {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/notifications/${notification.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications/${notification.id}`, {
method: "PATCH",
body: JSON.stringify({ status: NotificationStatus.Deleted }),
headers: {
@@ -132,7 +132,7 @@ export async function unsubscribeFromNotification(
try {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/notifications/${notification.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications/${notification.id}`, {
method: "PATCH",
body: JSON.stringify({ status: NotificationStatus.Unsubscribed }),
headers: {
@@ -171,7 +171,7 @@ export async function snoozeNotification(
const snoozeTime = computeSnoozedUntil(new Date(), 1, 6);
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/notifications/${notification.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications/${notification.id}`, {
method: "PATCH",
body: JSON.stringify({ snoozed_until: snoozeTime }),
headers: {

View File

@@ -68,7 +68,7 @@ async function completeTask(notification: Notification, mutate: MutatePromise<Pa
try {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/tasks/${notification.task.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/${notification.task.id}`, {
method: "PATCH",
body: JSON.stringify({ status: TaskStatus.Done }),
headers: {

View File

@@ -39,7 +39,7 @@ export function PlanTask({ notification, mutate }: PlanTaskProps) {
const [searchText, setSearchText] = useState("");
const { isLoading, data: projects } = useFetch<Array<ProjectSummary>>(
`${preferences.universalInboxBaseUrl}/api/tasks/projects/search?matches=${searchText}`,
`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/projects/search?matches=${searchText}`,
{
keepPreviousData: true,
headers: {
@@ -122,7 +122,7 @@ async function planTask(
try {
await mutate(
handleErrors(
fetch(`${preferences.universalInboxBaseUrl}/api/tasks/${notification.task.id}`, {
fetch(`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/tasks/${notification.task.id}`, {
method: "PATCH",
body: JSON.stringify({
project: taskPlanning.project.name,

View File

@@ -33,7 +33,7 @@ export default function Command() {
const [notificationKind, setNotificationKind] = useState("");
const { isLoading, data, mutate } = useFetch<Page<Notification>>(
`${preferences.universalInboxBaseUrl}/api/notifications?status=Unread,Read&with_tasks=true${
`${preferences.universalInboxBaseUrl.replace(/\/$/, "")}/api/notifications?status=Unread,Read&with_tasks=true${
notificationKind ? "&notification_kind=" + notificationKind : ""
}`,
{