Skip to content

Commit

Permalink
fix(dashboard): Subscriber page UI fixes (#7619)
Browse files Browse the repository at this point in the history
  • Loading branch information
desiprisg authored Jan 30, 2025
1 parent ff72d7d commit ad53157
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
9 changes: 5 additions & 4 deletions apps/dashboard/src/api/subscribers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ export const getSubscribers = async ({
...(orderBy && { orderBy }),
...(orderDirection && { orderDirection }),
});
const { data } = await getV2<{ data: ListSubscribersResponseDto }>(`/subscribers?${params}`, {
const response = await getV2<ListSubscribersResponseDto>(`/subscribers?${params}`, {
environment,
});
return data;

return response;
};

export const deleteSubscriber = async ({
Expand All @@ -50,8 +51,8 @@ export const deleteSubscriber = async ({
environment: IEnvironment;
subscriberId: string;
}) => {
const { data } = await delV2<{ data: RemoveSubscriberResponseDto }>(`/subscribers/${subscriberId}`, {
const response = await delV2<RemoveSubscriberResponseDto>(`/subscribers/${subscriberId}`, {
environment,
});
return data;
return response;
};
2 changes: 1 addition & 1 deletion apps/dashboard/src/components/confirmation-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ConfirmationModal = ({
<Dialog modal open={open} onOpenChange={onOpenChange}>
<DialogPortal>
<DialogOverlay />
<DialogContent className="sm:max-w-[440px]">
<DialogContent className="overflow-hidden sm:max-w-[440px]">
<div className="flex items-start gap-4 self-stretch">
<div className="bg-warning/10 flex items-center justify-center gap-2 rounded-[10px] p-2">
<RiAlertFill className="text-warning size-6" />
Expand Down
11 changes: 8 additions & 3 deletions apps/dashboard/src/components/subscribers/subscriber-row.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import { useDeleteSubscriber } from '@/hooks/use-delete-subscriber';
import { formatDateSimple } from '@/utils/format-date';
import { buildRoute, ROUTES } from '@/utils/routes';
import { cn } from '@/utils/ui';
import { SubscriberResponseDto } from '@novu/api/models/components';
import { ComponentProps, useState } from 'react';
import { RiDeleteBin2Line, RiFileCopyLine, RiMore2Fill, RiPulseFill } from 'react-icons/ri';
import { Link } from 'react-router-dom';
import { ExternalToast } from 'sonner';
import { Avatar, AvatarFallback, AvatarImage } from '../primitives/avatar';
import { CompactButton } from '../primitives/button-compact';
import { CopyButton } from '../primitives/copy-button';
import { SubscriberResponseDto } from '@novu/api/models/components';

const toastOptions: ExternalToast = {
position: 'bottom-right',
Expand Down Expand Up @@ -178,8 +178,13 @@ export const SubscriberRow = ({ subscriber }: SubscriberRowProps) => {
await deleteSubscriber({ subscriberId: subscriber.subscriberId });
setIsDeleteModalOpen(false);
}}
title={`Delete subscriber ${subscriberTitle}`}
description={`Are you sure you want to delete this subscriber? This action cannot be undone.`}
title={`Delete subscriber`}
description={
<span>
Are you sure you want to delete subscriber <span className="font-bold">{subscriberTitle}</span>? This action
cannot be undone.
</span>
}
confirmButtonText="Delete subscriber"
isLoading={isDeleteSubscriberPending}
/>
Expand Down

0 comments on commit ad53157

Please sign in to comment.