tweaking how we style

only checking admin and read for final tenant

Author: travjenkins

src/components/tables/RowActions/AccessGrants/GrantWhatIsChanging.tsx

@@ -17,7 +17,7 @@ function GrantWhatIsChanging({
             sx={{
                 'flexWrap': 'wrap',
                 'lineBreak': 'anywhere',
-                '& span:nth-child(odd)': {
+                '& span:nth-of-type(odd)': {
                     fontWeight: 500,
                 },
             }}

src/components/tables/RowActions/Shared/ConfirmationWithExplination.tsx

@@ -18,9 +18,6 @@ import { useIntl } from 'react-intl';
 import { AccessGrantRowConfirmation } from '../AccessGrants/types';
 import { ConfirmationWithExplinationProps } from './types';
 
-const leftSideWidth = '50%';
-const rightSideWidth = '50%';
-
 function ConfirmationWithExplination({
     message,
     selected,
@@ -60,6 +57,8 @@ function ConfirmationWithExplination({
                     sx={{
                         color,
                         fontWeight,
+                        pr: 0,
+                        textAlign: 'right',
                     }}
                 >
                     {dangerous ? <WarningTriangle /> : null}
@@ -102,13 +101,13 @@ function ConfirmationWithExplination({
             <Table size="small" sx={{ ml: 2 }}>
                 <TableHead>
                     <TableRow style={{ width: '100%' }}>
-                        <TableCell style={{ width: leftSideWidth }}>
+                        <TableCell style={{ width: '50%' }}>
                             {intl.formatMessage({
                                 id: 'accessGrants.actions.extra.confirmation.whatIsChanging',
                             })}
                         </TableCell>
                         <TableCell />
-                        <TableCell style={{ width: rightSideWidth }}>
+                        <TableCell style={{ width: '50%' }}>
                             {intl.formatMessage({
                                 id: 'accessGrants.actions.extra.confirmation.whatThatMeans',
                             })}

src/hooks/useAccessGrantRemovalDescriptions.ts

@@ -1,7 +1,10 @@
 import { useUserStore } from 'context/User/useUserContextStore';
 import { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { useEntitiesStore_capabilities_adminable } from 'stores/Entities/hooks';
+import {
+    useEntitiesStore_capabilities_adminable,
+    useEntitiesStore_capabilities_readable,
+} from 'stores/Entities/hooks';
 import { BaseGrant, Grant_UserExt } from 'types';
 import { ESTUARY_SUPPORT_ROLE, isGrant_UserExt } from 'utils/misc-utils';
 import { useShallow } from 'zustand/react/shallow';
@@ -25,10 +28,9 @@ function useAccessGrantRemovalDescriptions() {
     );
 
     const adminable = useEntitiesStore_capabilities_adminable();
-
-    const probablyNewUser = useMemo(() => adminable.length === 1, [adminable]);
-
-    console.log('adminable', adminable);
+    const readable = useEntitiesStore_capabilities_readable();
+    const singleAdmin = useMemo(() => adminable.length === 1, [adminable]);
+    const singleReadable = useMemo(() => readable.length === 1, [readable]);
 
     const describeAccessGrantRemovals = useCallback(
         (value: Grant_UserExt | BaseGrant): AccessGrantRemovalDescription => {
@@ -41,7 +43,10 @@ function useAccessGrantRemovalDescriptions() {
             // Figure out what the of the grant is
             if (isGrant_UserExt(value)) {
                 if (value.user_email === userEmail) {
-                    if (probablyNewUser) {
+                    if (
+                        (singleAdmin && what === 'admin') ||
+                        (singleReadable && what === 'read')
+                    ) {
                         grantScope = 'finalEmail';
                     } else {
                         grantScope = 'ownEmail';
@@ -81,7 +86,7 @@ function useAccessGrantRemovalDescriptions() {
                 }),
             ];
         },
-        [intl, probablyNewUser, userEmail]
+        [intl, singleAdmin, singleReadable, userEmail]
     );
 
     return {

src/lang/en-US/AccessGrants.ts

@@ -61,8 +61,8 @@ export const AccessGrants: Record<string, string> = {
     'accessGrants.descriptions.removing.read.email': `${prefixes.email} see anything on the tenant.`,
 
     // When a user removes their own email and it is the last one they have
+    //  We do not check if they are removing their final "write"
     'accessGrants.descriptions.removing.admin.finalEmail': `${prefixes.finalEmail} create or manage ${suffixes.finalEmail}`,
-    'accessGrants.descriptions.removing.write.finalEmail': `${prefixes.finalEmail} create ${suffixes.finalEmail}`,
     'accessGrants.descriptions.removing.read.finalEmail': `${prefixes.finalEmail} view ${suffixes.finalEmail}`,
 
     // When a user removes their own email

src/types/index.ts

@@ -263,7 +263,7 @@ export interface InferredSchemas {
 }
 
 export interface BaseGrant {
-    capability: string;
+    capability: Capability;
     object_role: string;
     subject_role: string;
 }