PublicDashboards: Revoke all public dashboards access to a specific user (#78709)

public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx

@@ -5,18 +5,29 @@ import { GrafanaTheme2 } from '@grafana/data/src';
 import { Button, Modal, ModalsController, useStyles2 } from '@grafana/ui/src';
 import { SessionUser } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils';
 
-const DeleteUserModal = ({ user, onDismiss }: { user: SessionUser; onDismiss: () => void }) => {
+import { useRevokeAllAccessMutation } from '../../dashboard/api/publicDashboardApi';
+
+const DeleteUserModal = ({ user, hideModal }: { user: SessionUser; hideModal: () => void }) => {
+  const [revokeAllAccess] = useRevokeAllAccessMutation();
   const styles = useStyles2(getStyles);
 
+  const onRevokeAccessClick = () => {
+    revokeAllAccess({ email: user.email });
+    hideModal();
+  };
+
   return (
-    <Modal className={styles.modal} isOpen title="Delete" onDismiss={onDismiss}>
+    <Modal className={styles.modal} isOpen title="Revoke access" onDismiss={hideModal}>
+      <p className={styles.description}>Are you sure you want to revoke access for {user.email}?</p>
       <p className={styles.description}>
-        The user {user.email} is currently present in {user.totalDashboards} public dashboard(s). If you wish to remove
+        This action will immediately revoke {user.email}&apos;s access to all public dashboards.
-        this user, please navigate to the settings of the corresponding public dashboard.
       </p>
       <Modal.ButtonRow>
-        <Button type="button" variant="secondary" onClick={onDismiss} fill="outline">
+        <Button type="button" variant="secondary" onClick={hideModal} fill="outline">
-          Close
+          Cancel
+        </Button>
+        <Button type="button" variant="destructive" onClick={onRevokeAccessClick}>
+          Revoke access
         </Button>
       </Modal.ButtonRow>
     </Modal>
@@ -29,7 +40,7 @@ export const DeleteUserModalButton = ({ user }: { user: SessionUser }) => (
       <Button
         size="sm"
         variant="destructive"
-        onClick={() => showModal(DeleteUserModal, { user, onDismiss: hideModal })}
+        onClick={() => showModal(DeleteUserModal, { user, hideModal })}
         icon="times"
         aria-label="Delete user"
         title="Delete user"

public/app/features/dashboard/api/publicDashboardApi.ts

@@ -140,7 +140,10 @@ export const publicDashboardApi = createApi({
         url: '',
       }),
     }),
-    deleteRecipient: builder.mutation<void, { recipientUid: string; dashboardUid: string; uid: string }>({
+    deleteRecipient: builder.mutation<
+      void,
+      { recipientUid: string; recipientEmail: string; dashboardUid: string; uid: string }
+    >({
       query: () => ({
         url: '',
       }),
@@ -202,6 +205,11 @@ export const publicDashboardApi = createApi({
         'ActiveUserDashboards',
       ],
     }),
+    revokeAllAccess: builder.mutation<void, { email: string }>({
+      query: () => ({
+        url: '',
+      }),
+    }),
   }),
 });
 
@@ -216,4 +224,5 @@ export const {
   useReshareAccessToRecipientMutation,
   useGetActiveUsersQuery,
   useGetActiveUserDashboardsQuery,
+  useRevokeAllAccessMutation,
 } = publicDashboardApi;

public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx

@@ -56,9 +56,9 @@ const EmailList = ({
 
   const isLoading = isDeleteLoading || isReshareLoading;
 
-  const onDeleteEmail = (recipientUid: string) => {
+  const onDeleteEmail = (recipientUid: string, recipientEmail: string) => {
     DashboardInteractions.revokePublicDashboardEmailClicked();
-    deleteEmail({ recipientUid, dashboardUid: dashboardUid, uid: publicDashboardUid });
+    deleteEmail({ recipientUid, recipientEmail, dashboardUid: dashboardUid, uid: publicDashboardUid });
   };
 
   const onReshare = (recipientUid: string) => {
@@ -82,7 +82,7 @@ const EmailList = ({
                   title="Revoke"
                   size="sm"
                   disabled={isLoading}
-                  onClick={() => onDeleteEmail(recipient.uid)}
+                  onClick={() => onDeleteEmail(recipient.uid, recipient.recipient)}
                   data-testid={`${selectors.DeleteEmail}-${idx}`}
                 >
                   Revoke