Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FEATURE (notifiers): Add mobile adaptivity for notifiers

Rostislav Dugin79ca374bb604
diff --git a/frontend/src/features/notifiers/ui/NotifiersComponent.tsx b/frontend/src/features/notifiers/ui/NotifiersComponent.tsx
index abbc3634..b25e368e 100644
--- a/frontend/src/features/notifiers/ui/NotifiersComponent.tsx
+++ b/frontend/src/features/notifiers/ui/NotifiersComponent.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
import { notifierApi } from '../../../entity/notifiers';
import type { Notifier } from '../../../entity/notifiers';
import type { WorkspaceResponse } from '../../../entity/workspaces';
+import { useIsMobile } from '../../../shared/hooks';
import { NotifierCardComponent } from './NotifierCardComponent';
import { NotifierComponent } from './NotifierComponent';
import { EditNotifierComponent } from './edit/EditNotifierComponent';
@@ -14,21 +15,47 @@ interface Props {
isCanManageNotifiers: boolean;
}
+const SELECTED_NOTIFIER_STORAGE_KEY = 'selectedNotifierId';
+
export const NotifiersComponent = ({ contentHeight, workspace, isCanManageNotifiers }: Props) => {
+ const isMobile = useIsMobile();
const [isLoading, setIsLoading] = useState(true);
const [notifiers, setNotifiers] = useState<Notifier[]>([]);
+ const [searchQuery, setSearchQuery] = useState('');
const [isShowAddNotifier, setIsShowAddNotifier] = useState(false);
const [selectedNotifierId, setSelectedNotifierId] = useState<string | undefined>(undefined);
- const loadNotifiers = () => {
- setIsLoading(true);
+
+ const updateSelectedNotifierId = (notifierId: string | undefined) => {
+ setSelectedNotifierId(notifierId);
+ if (notifierId) {
+ localStorage.setItem(`${SELECTED_NOTIFIER_STORAGE_KEY}_${workspace.id}`, notifierId);
+ } else {
+ localStorage.removeItem(`${SELECTED_NOTIFIER_STORAGE_KEY}_${workspace.id}`);
+ }
+ };
+
+ const loadNotifiers = (isSilent = false, selectNotifierId?: string) => {
+ if (!isSilent) {
+ setIsLoading(true);
+ }
notifierApi
.getNotifiers(workspace.id)
.then((notifiers) => {
setNotifiers(notifiers);
- if (!selectedNotifierId) {
- setSelectedNotifierId(notifiers[0]?.id);
+ if (selectNotifierId) {
+ updateSelectedNotifierId(selectNotifierId);
+ } else if (!selectedNotifierId && !isSilent && !isMobile) {
+ // On desktop, auto-select a notifier; on mobile, keep it unselected
+ const savedNotifierId = localStorage.getItem(
+ `${SELECTED_NOTIFIER_STORAGE_KEY}_${workspace.id}`,
+ );
+ const notifierToSelect =
+ savedNotifierId && notifiers.some((n) => n.id === savedNotifierId)
+ ? savedNotifierId
+ : notifiers[0]?.id;
+ updateSelectedNotifierId(notifierToSelect);
}
})
.catch((e) => alert(e.message))
@@ -37,6 +64,12 @@ export const NotifiersComponent = ({ contentHeight, workspace, isCanManageNotifi
useEffect(() => {
loadNotifiers();
+
+ const interval = setInterval(() => {
+ loadNotifiers(true);
+ }, 5 * 60_000);
+
+ return () => clearInterval(interval);
}, []);
if (isLoading) {
@@ -53,45 +86,89 @@ export const NotifiersComponent = ({ contentHeight, workspace, isCanManageNotifi
</Button>
);
+ const filteredNotifiers = notifiers.filter((notifier) =>
+ notifier.name.toLowerCase().includes(searchQuery.toLowerCase()),
+ );
+
+ // On mobile, show either the list or the notifier details
+ const showNotifierList = !isMobile || !selectedNotifierId;
+ const showNotifierDetails = selectedNotifierId && (!isMobile || selectedNotifierId);
+
return (
<>
<div className="flex grow">
- <div
- className="mx-3 w-[250px] min-w-[250px] overflow-y-auto"
- style={{ height: contentHeight }}
- >
- {notifiers.length >= 5 && isCanManageNotifiers && addNotifierButton}
-
- {notifiers.map((notifier) => (
- <NotifierCardComponent
- key={notifier.id}
- notifier={notifier}
- selectedNotifierId={selectedNotifierId}
- setSelectedNotifierId={setSelectedNotifierId}
- />
- ))}
+ {showNotifierList && (
+ <div
+ className="w-full overflow-y-auto md:mx-3 md:w-[250px] md:min-w-[250px] md:pr-2"
+ style={{ height: contentHeight }}
+ >
+ {notifiers.length >= 5 && (
+ <>
+ {isCanManageNotifiers && addNotifierButton}
- {notifiers.length < 5 && isCanManageNotifiers && addNotifierButton}
+ <div className="mb-2">
+ <input
+ placeholder="Search notifier"
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ className="w-full border-b border-gray-300 p-1 text-gray-500 outline-none"
+ />
+ </div>
+ </>
+ )}
- <div className="mx-3 text-center text-xs text-gray-500">
- Notifier - is a place where notifications will be sent (email, Slack, Telegram, etc.)
+ {filteredNotifiers.length > 0
+ ? filteredNotifiers.map((notifier) => (
+ <NotifierCardComponent
+ key={notifier.id}
+ notifier={notifier}
+ selectedNotifierId={selectedNotifierId}
+ setSelectedNotifierId={updateSelectedNotifierId}
+ />
+ ))
+ : searchQuery && (
+ <div className="mb-4 text-center text-sm text-gray-500">
+ No notifiers found matching &quot;{searchQuery}&quot;
+ </div>
+ )}
+
+ {notifiers.length < 5 && isCanManageNotifiers && addNotifierButton}
+
+ <div className="mx-3 text-center text-xs text-gray-500">
+ Notifier - is a place where notifications will be sent (email, Slack, Telegram, etc.)
+ </div>
</div>
- </div>
+ )}
- {selectedNotifierId && (
- <NotifierComponent
- notifierId={selectedNotifierId}
- onNotifierChanged={() => {
- loadNotifiers();
- }}
- onNotifierDeleted={() => {
- loadNotifiers();
- setSelectedNotifierId(
- notifiers.filter((notifier) => notifier.id !== selectedNotifierId)[0]?.id,
- );
- }}
- isCanManageNotifiers={isCanManageNotifiers}
- />
+ {showNotifierDetails && (
+ <div className="flex w-full flex-col md:flex-1">
+ {isMobile && (
+ <div className="mb-2">
+ <Button
+ type="default"
+ onClick={() => updateSelectedNotifierId(undefined)}
+ className="w-full"
+ >
+ ← Back to notifiers
+ </Button>
+ </div>
+ )}
+
+ <NotifierComponent
+ notifierId={selectedNotifierId}
+ onNotifierChanged={() => {
+ loadNotifiers();
+ }}
+ onNotifierDeleted={() => {
+ const remainingNotifiers = notifiers.filter(
+ (notifier) => notifier.id !== selectedNotifierId,
+ );
+ updateSelectedNotifierId(remainingNotifiers[0]?.id);
+ loadNotifiers();
+ }}
+ isCanManageNotifiers={isCanManageNotifiers}
+ />
+ </div>
)}
</div>
@@ -111,8 +188,8 @@ export const NotifiersComponent = ({ contentHeight, workspace, isCanManageNotifi
isShowName
isShowClose={false}
onClose={() => setIsShowAddNotifier(false)}
- onChanged={() => {
- loadNotifiers();
+ onChanged={(notifier) => {
+ loadNotifiers(false, notifier.id);
setIsShowAddNotifier(false);
}}
/>
diff --git a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
index eba90e67..c52b169c 100644
--- a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx
@@ -225,7 +225,7 @@ export function EditNotifierComponent({
)}
<div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Type</div>
+ <div className="w-[150px] min-w-[150px]">Type</div>
<Select
value={notifier?.notifierType}
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
index 198e4f8b..9721b95e 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx
@@ -11,31 +11,28 @@ interface Props {
export function EditDiscordNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
- <div className="flex">
- <div className="w-[130px] max-w-[130px] min-w-[130px] pr-3">Channel webhook URL</div>
-
- <div className="w-[250px]">
- <Input
- value={notifier?.discordNotifier?.channelWebhookUrl || ''}
- onChange={(e) => {
- if (!notifier?.discordNotifier) return;
- setNotifier({
- ...notifier,
- discordNotifier: {
- ...notifier.discordNotifier,
- channelWebhookUrl: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full"
- placeholder="1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- />
- </div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Channel webhook URL</div>
+ <Input
+ value={notifier?.discordNotifier?.channelWebhookUrl || ''}
+ onChange={(e) => {
+ if (!notifier?.discordNotifier) return;
+ setNotifier({
+ ...notifier,
+ discordNotifier: {
+ ...notifier.discordNotifier,
+ channelWebhookUrl: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ />
</div>
- <div className="ml-[130px] max-w-[250px]">
+ <div className="max-w-[250px] sm:ml-[150px]">
<div className="mt-1 text-xs text-gray-500">
<strong>How to get Discord webhook URL:</strong>
<br />
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
index 981f2f5b..278e1369 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx
@@ -12,34 +12,39 @@ interface Props {
export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Target email</div>
- <Input
- value={notifier?.emailNotifier?.targetEmail || ''}
- onChange={(e) => {
- if (!notifier?.emailNotifier) return;
-
- setNotifier({
- ...notifier,
- emailNotifier: {
- ...notifier.emailNotifier,
- targetEmail: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full max-w-[250px]"
- placeholder="[email protected]"
- />
-
- <Tooltip className="cursor-pointer" title="The email where you want to receive the message">
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Target email</div>
+ <div className="flex items-center">
+ <Input
+ value={notifier?.emailNotifier?.targetEmail || ''}
+ onChange={(e) => {
+ if (!notifier?.emailNotifier) return;
+
+ setNotifier({
+ ...notifier,
+ emailNotifier: {
+ ...notifier.emailNotifier,
+ targetEmail: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="[email protected]"
+ />
+
+ <Tooltip
+ className="cursor-pointer"
+ title="The email where you want to receive the message"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">SMTP host</div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">SMTP host</div>
<Input
value={notifier?.emailNotifier?.smtpHost || ''}
onChange={(e) => {
@@ -60,8 +65,8 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }
/>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">SMTP port</div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">SMTP port</div>
<Input
type="number"
value={notifier?.emailNotifier?.smtpPort || ''}
@@ -83,8 +88,8 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }
/>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">SMTP user</div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">SMTP user</div>
<Input
value={notifier?.emailNotifier?.smtpUser || ''}
onChange={(e) => {
@@ -105,8 +110,8 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }
/>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">SMTP password</div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">SMTP password</div>
<Input
type="password"
value={notifier?.emailNotifier?.smtpPassword || ''}
@@ -128,33 +133,35 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setUnsaved }
/>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">From</div>
- <Input
- value={notifier?.emailNotifier?.from || ''}
- onChange={(e) => {
- if (!notifier?.emailNotifier) return;
-
- setNotifier({
- ...notifier,
- emailNotifier: {
- ...notifier.emailNotifier,
- from: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full max-w-[250px]"
- placeholder="[email protected]"
- />
-
- <Tooltip
- className="cursor-pointer"
- title="Optional. Email address to use as sender. If empty, will use SMTP user or auto-generate from host"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">From</div>
+ <div className="flex items-center">
+ <Input
+ value={notifier?.emailNotifier?.from || ''}
+ onChange={(e) => {
+ if (!notifier?.emailNotifier) return;
+
+ setNotifier({
+ ...notifier,
+ emailNotifier: {
+ ...notifier.emailNotifier,
+ from: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="[email protected]"
+ />
+
+ <Tooltip
+ className="cursor-pointer"
+ title="Optional. Email address to use as sender. If empty, will use SMTP user or auto-generate from host"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
</>
);
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
index 27bb8146..b747f0ad 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx
@@ -11,7 +11,7 @@ interface Props {
export function EditSlackNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
- <div className="mb-1 ml-[130px] max-w-[200px]" style={{ lineHeight: 1 }}>
+ <div className="mb-1 max-w-[250px] sm:ml-[150px]" style={{ lineHeight: 1 }}>
<a
className="text-xs !text-blue-600"
href="https://postgresus.com/notifiers/slack"
@@ -22,54 +22,48 @@ export function EditSlackNotifierComponent({ notifier, setNotifier, setUnsaved }
</a>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Bot token</div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Bot token</div>
+ <Input
+ value={notifier?.slackNotifier?.botToken || ''}
+ onChange={(e) => {
+ if (!notifier?.slackNotifier) return;
- <div className="w-[250px]">
- <Input
- value={notifier?.slackNotifier?.botToken || ''}
- onChange={(e) => {
- if (!notifier?.slackNotifier) return;
-
- setNotifier({
- ...notifier,
- slackNotifier: {
- ...notifier.slackNotifier,
- botToken: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full"
- placeholder="xoxb-..."
- />
- </div>
+ setNotifier({
+ ...notifier,
+ slackNotifier: {
+ ...notifier.slackNotifier,
+ botToken: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="xoxb-..."
+ />
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Target chat ID</div>
-
- <div className="w-[250px]">
- <Input
- value={notifier?.slackNotifier?.targetChatId || ''}
- onChange={(e) => {
- if (!notifier?.slackNotifier) return;
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Target chat ID</div>
+ <Input
+ value={notifier?.slackNotifier?.targetChatId || ''}
+ onChange={(e) => {
+ if (!notifier?.slackNotifier) return;
- setNotifier({
- ...notifier,
- slackNotifier: {
- ...notifier.slackNotifier,
- targetChatId: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full"
- placeholder="C1234567890"
- />
- </div>
+ setNotifier({
+ ...notifier,
+ slackNotifier: {
+ ...notifier.slackNotifier,
+ targetChatId: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="C1234567890"
+ />
</div>
</>
);
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
index d2c500c3..809e72a0 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditTeamsNotifierComponent.tsx
@@ -27,7 +27,7 @@ export function EditTeamsNotifierComponent({ notifier, setNotifier, setUnsaved }
return (
<>
- <div className="mb-1 ml-[130px] max-w-[200px]" style={{ lineHeight: 1 }}>
+ <div className="mb-1 max-w-[250px] sm:ml-[150px]" style={{ lineHeight: 1 }}>
<a
className="text-xs !text-blue-600"
href="https://postgresus.com/notifiers/teams"
@@ -38,25 +38,24 @@ export function EditTeamsNotifierComponent({ notifier, setNotifier, setUnsaved }
</a>
</div>
- <div className="flex items-center">
- <div className="w-[130px] min-w-[130px]">Power Automate URL</div>
-
- <div className="w-[250px]">
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Power Automate URL</div>
+ <div className="flex items-center">
<Input
value={value}
onChange={onChange}
size="small"
- className="w-full"
+ className="w-full max-w-[250px]"
placeholder="https://prod-00.westeurope.logic.azure.com:443/workflows/....."
/>
- </div>
- <Tooltip
- className="cursor-pointer"
- title="HTTP endpoint from your Power Automate flow (When an HTTP request is received)"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <Tooltip
+ className="cursor-pointer"
+ title="HTTP endpoint from your Power Automate flow (When an HTTP request is received)"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
</>
);
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
index b2d49d19..74ed6f7c 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx
@@ -27,31 +27,28 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsave
return (
<>
- <div className="flex items-center">
- <div className="w-[130px] min-w-[130px]">Bot token</div>
-
- <div className="w-[250px]">
- <Input
- value={notifier?.telegramNotifier?.botToken || ''}
- onChange={(e) => {
- if (!notifier?.telegramNotifier) return;
- setNotifier({
- ...notifier,
- telegramNotifier: {
- ...notifier.telegramNotifier,
- botToken: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full"
- placeholder="1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- />
- </div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Bot token</div>
+ <Input
+ value={notifier?.telegramNotifier?.botToken || ''}
+ onChange={(e) => {
+ if (!notifier?.telegramNotifier) return;
+ setNotifier({
+ ...notifier,
+ telegramNotifier: {
+ ...notifier.telegramNotifier,
+ botToken: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ />
</div>
- <div className="mb-1 ml-[130px]">
+ <div className="mb-1 sm:ml-[150px]">
<a
className="text-xs !text-blue-600"
href="https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token"
@@ -62,10 +59,9 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsave
</a>
</div>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Target chat ID</div>
-
- <div className="w-[250px]">
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Target chat ID</div>
+ <div className="flex items-center">
<Input
value={notifier?.telegramNotifier?.targetChatId || ''}
onChange={(e) => {
@@ -81,20 +77,20 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsave
setUnsaved();
}}
size="small"
- className="w-full"
+ className="w-full max-w-[250px]"
placeholder="-1001234567890"
/>
- </div>
- <Tooltip
- className="cursor-pointer"
- title="The chat where you want to receive the message (it can be your private chat or a group)"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <Tooltip
+ className="cursor-pointer"
+ title="The chat where you want to receive the message (it can be your private chat or a group)"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
- <div className="ml-[130px] max-w-[250px]">
+ <div className="max-w-[250px] sm:ml-[150px]">
{!isShowHowToGetChatId ? (
<div
className="mt-1 cursor-pointer text-xs text-blue-600"
@@ -120,42 +116,42 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsave
)}
</div>
- <div className="mt-4 mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px] break-all">Send to group topic</div>
-
- <Switch
- checked={notifier?.telegramNotifier?.isSendToThreadEnabled || false}
- onChange={(checked) => {
- if (!notifier?.telegramNotifier) return;
+ <div className="mt-4 mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Send to group topic</div>
+ <div className="flex items-center">
+ <Switch
+ checked={notifier?.telegramNotifier?.isSendToThreadEnabled || false}
+ onChange={(checked) => {
+ if (!notifier?.telegramNotifier) return;
- setNotifier({
- ...notifier,
- telegramNotifier: {
- ...notifier.telegramNotifier,
- isSendToThreadEnabled: checked,
- // Clear thread ID if disabling
- threadId: checked ? notifier.telegramNotifier.threadId : undefined,
- },
- });
- setUnsaved();
- }}
- size="small"
- />
+ setNotifier({
+ ...notifier,
+ telegramNotifier: {
+ ...notifier.telegramNotifier,
+ isSendToThreadEnabled: checked,
+ // Clear thread ID if disabling
+ threadId: checked ? notifier.telegramNotifier.threadId : undefined,
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ />
- <Tooltip
- className="cursor-pointer"
- title="Enable this to send messages to a specific thread in a group chat"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <Tooltip
+ className="cursor-pointer"
+ title="Enable this to send messages to a specific thread in a group chat"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
{notifier?.telegramNotifier?.isSendToThreadEnabled && (
<>
- <div className="mb-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Thread ID</div>
-
- <div className="w-[250px]">
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Thread ID</div>
+ <div className="flex items-center">
<Input
value={notifier?.telegramNotifier?.threadId?.toString() || ''}
onChange={(e) => {
@@ -174,22 +170,22 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setUnsave
setUnsaved();
}}
size="small"
- className="w-full"
+ className="w-full max-w-[250px]"
placeholder="3"
type="number"
min="1"
/>
- </div>
- <Tooltip
- className="cursor-pointer"
- title="The ID of the thread where messages should be sent"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <Tooltip
+ className="cursor-pointer"
+ title="The ID of the thread where messages should be sent"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
- <div className="ml-[130px] max-w-[250px]">
+ <div className="max-w-[250px] sm:ml-[150px]">
<div className="mt-1 text-xs text-gray-500">
To get the thread ID, go to the thread in your Telegram group, tap on the thread name
at the top, then tap &ldquo;Thread Info&rdquo;. Copy the thread link and take the last
diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
index 2365db95..3600a752 100644
--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx
@@ -13,33 +13,29 @@ interface Props {
export function EditWebhookNotifierComponent({ notifier, setNotifier, setUnsaved }: Props) {
return (
<>
- <div className="flex items-center">
- <div className="w-[130px] min-w-[130px]">Webhook URL</div>
-
- <div className="w-[250px]">
- <Input
- value={notifier?.webhookNotifier?.webhookUrl || ''}
- onChange={(e) => {
- setNotifier({
- ...notifier,
- webhookNotifier: {
- ...(notifier.webhookNotifier || { webhookMethod: WebhookMethod.POST }),
- webhookUrl: e.target.value.trim(),
- },
- });
- setUnsaved();
- }}
- size="small"
- className="w-full"
- placeholder="https://example.com/webhook"
- />
- </div>
+ <div className="mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Webhook URL</div>
+ <Input
+ value={notifier?.webhookNotifier?.webhookUrl || ''}
+ onChange={(e) => {
+ setNotifier({
+ ...notifier,
+ webhookNotifier: {
+ ...(notifier.webhookNotifier || { webhookMethod: WebhookMethod.POST }),
+ webhookUrl: e.target.value.trim(),
+ },
+ });
+ setUnsaved();
+ }}
+ size="small"
+ className="w-full max-w-[250px]"
+ placeholder="https://example.com/webhook"
+ />
</div>
- <div className="mt-1 flex items-center">
- <div className="w-[130px] min-w-[130px]">Method</div>
-
- <div className="w-[250px]">
+ <div className="mt-1 mb-1 flex w-full flex-col items-start sm:flex-row sm:items-center">
+ <div className="mb-1 min-w-[150px] sm:mb-0">Method</div>
+ <div className="flex items-center">
<Select
value={notifier?.webhookNotifier?.webhookMethod || WebhookMethod.POST}
onChange={(value) => {
@@ -53,20 +49,20 @@ export function EditWebhookNotifierComponent({ notifier, setNotifier, setUnsaved
setUnsaved();
}}
size="small"
- className="w-full"
+ className="w-full max-w-[250px]"
options={[
{ value: WebhookMethod.POST, label: 'POST' },
{ value: WebhookMethod.GET, label: 'GET' },
]}
/>
- </div>
- <Tooltip
- className="cursor-pointer"
- title="The HTTP method that will be used to call the webhook"
- >
- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
- </Tooltip>
+ <Tooltip
+ className="cursor-pointer"
+ title="The HTTP method that will be used to call the webhook"
+ >
+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />
+ </Tooltip>
+ </div>
</div>
{notifier?.webhookNotifier?.webhookUrl && (
diff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowDiscordNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowDiscordNotifierComponent.tsx
index cbf60d79..7f29dd4c 100644
--- a/frontend/src/features/notifiers/ui/show/notifier/ShowDiscordNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowDiscordNotifierComponent.tsx
@@ -10,7 +10,7 @@ export function ShowDiscordNotifierComponent({ notifier }: Props) {
<div className="flex">
<div className="max-w-[110px] min-w-[110px] pr-3">Channel webhook URL</div>
- <div className="w-[250px]">{notifier.webhookNotifier?.webhookUrl.slice(0, 10)}*******</div>
+ <div>{notifier.webhookNotifier?.webhookUrl.slice(0, 10)}*******</div>
</div>
</>
);
diff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowSlackNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowSlackNotifierComponent.tsx
index ba207599..564b37c2 100644
--- a/frontend/src/features/notifiers/ui/show/notifier/ShowSlackNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowSlackNotifierComponent.tsx
@@ -10,7 +10,7 @@ export function ShowSlackNotifierComponent({ notifier }: Props) {
<div className="flex items-center">
<div className="min-w-[110px]">Bot token</div>
- <div className="w-[250px]">*********</div>
+ <div>*********</div>
</div>
<div className="mb-1 flex items-center">
diff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowTeamsNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowTeamsNotifierComponent.tsx
index 33848d14..dd7e9fe6 100644
--- a/frontend/src/features/notifiers/ui/show/notifier/ShowTeamsNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowTeamsNotifierComponent.tsx
@@ -18,7 +18,7 @@ export function ShowTeamsNotifierComponent({ notifier }: Props) {
<>
<div className="flex items-center">
<div className="min-w-[110px]">Power Automate URL: </div>
- <div className="w-[250px] break-all">
+ <div className="w-[50px] break-all md:w-[250px]">
{url ? (
<>
<span title={url}>{display}</span>
diff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx
index c4957bd7..821b7cb5 100644
--- a/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx
+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx
@@ -10,7 +10,7 @@ export function ShowTelegramNotifierComponent({ notifier }: Props) {
<div className="flex items-center">
<div className="min-w-[110px]">Bot token</div>
- <div className="w-[250px]">*********</div>
+ <div>*********</div>
</div>
<div className="mb-1 flex items-center">
diff --git a/frontend/src/widgets/main/MainScreenComponent.tsx b/frontend/src/widgets/main/MainScreenComponent.tsx
index b7c7daf6..ad84c891 100644
--- a/frontend/src/widgets/main/MainScreenComponent.tsx
+++ b/frontend/src/widgets/main/MainScreenComponent.tsx
@@ -31,7 +31,7 @@ export const MainScreenComponent = () => {
const { message } = App.useApp();
const screenHeight = useScreenHeight();
const isMobile = useIsMobile();
- const contentHeight = screenHeight - (isMobile ? 65 : 95);
+ const contentHeight = screenHeight - (isMobile ? 70 : 95);
const [selectedTab, setSelectedTab] = useState<
| 'notifiers'
@@ -267,12 +267,13 @@ export const MainScreenComponent = () => {
)}
</div>
- <Button
- type="text"
- icon={<MenuOutlined style={{ fontSize: '20px' }} />}
- onClick={() => setIsSidebarOpen(!isSidebarOpen)}
- className="mt-1 ml-auto md:hidden"
- />
+ <div className="mt-1 ml-auto md:hidden">
+ <Button
+ type="text"
+ icon={<MenuOutlined style={{ fontSize: '20px' }} />}
+ onClick={() => setIsSidebarOpen(!isSidebarOpen)}
+ />
+ </div>
</div>
{isLoading ? (
<div className="flex items-center justify-center py-2" style={{ height: contentHeight }}>