External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ready for release 1.1.4

Browse Source
This commit is contained in:
charlesgauthereau
2025-12-07 10:53:08 +01:00
parent ca232250cc
commit e1bc1ec6c8
16 changed files with 1944 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/wrappers/dashboard/database/alert-policy/alert-policy-form.tsx
+3 -6
View File
@@ -35,8 +35,10 @@ export const AlertPolicyForm = ({database, notificationChannels, organizationId,
const router = useRouter()
const organizationNotificationChannels = notificationChannels.map(channel => channel.id) ?? [];
const formattedAlertPoliciesList = (alertPolicies: AlertPolicy[]) => {
return alertPolicies.map((alertPolicy) => ({
return alertPolicies.filter((alertPolicy)=> organizationNotificationChannels.includes(alertPolicy.notificationChannelId)).map((alertPolicy) => ({
notificationChannelId: alertPolicy.notificationChannelId,
eventKinds: alertPolicy.eventKinds,
enabled: alertPolicy.enabled
@@ -273,11 +275,6 @@ export const AlertPolicyForm = ({database, notificationChannels, organizationId,
<Tooltip>
<TooltipTrigger asChild>
<div tabIndex={0} className="inline-flex rounded-md">
{/*<Switch*/}
{/* checked={true}*/}
{/* onCheckedChange={async () => {*/}
{/* }}*/}
{/*/>*/}
<FormField
src/components/wrappers/dashboard/database/alert-policy/alert-policy-modal.tsx
+12 -4
View File
@@ -26,14 +26,22 @@ type AlertPolicyModalProps = {
export const AlertPolicyModal = ({database, notificationChannels, organizationId}: AlertPolicyModalProps) => {
const [open, setOpen] = useState(false);
const notificationsChannelsIds = notificationChannels.map(channel => channel.id);
const activePolicies = database.alertPolicies?.filter((policy) => notificationsChannelsIds.some(()=> policy.notificationChannelId));
const notificationsChannelsFiltered = notificationChannels
.filter((channel) => channel.enabled)
const notificationsChannelsIds = notificationsChannelsFiltered
.map(channel => channel.id);
const activePolicies = database.alertPolicies?.filter((policy) => notificationsChannelsIds.includes(policy.notificationChannelId));
return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button variant="outline" onClick={() => setOpen(true)} className="relative">
<Megaphone/>
{ activePolicies && activePolicies.length > 0 && (
{activePolicies && activePolicies.length > 0 && (
<Badge
className="absolute -top-1.5 -right-1.5 h-4 w-4 rounded-full p-0 text-[10px] flex items-center justify-center"
>
@@ -52,7 +60,7 @@ export const AlertPolicyModal = ({database, notificationChannels, organizationId
<Separator className="mt-3 mb-3"/>
<AlertPolicyForm
organizationId={organizationId}
notificationChannels={notificationChannels}
notificationChannels={notificationsChannelsFiltered}
database={database}
onSuccess={() => setOpen(false)}
/>