upcoming: [M3-7455] - Add child account access column and disable button when account has child accounts #10012

tyler-akamai · 2023-12-20T16:39:41Z

Description 📝

Add child account access column and disable button when account has child accounts.

Changes 🔄

List any change relevant to the reviewer.

Add child account access column
Disable button when account has child accounts

Preview 📷

Before	After

How to test 🧪

Prerequisites

MSW on
Parent/Child Account flag on

Verification steps

Navigate to http://localhost:3000/account/users and ensure there is an additional 'Child Account Access' column with accurate labels ('Enabled' and 'Disabled')
Navigate to http://localhost:3000/account/settings and ensure the button is disabled since the current account has a child account, and ensure there is a notice explaining why it is disabled.
Ensure the parent/child feature flag works as expected

As an Author I have considered 🤔

Check all that apply

tyler-akamai · 2023-12-27T20:41:08Z

packages/manager/src/features/Account/CloseAccountSetting.tsx


 import CloseAccountDialog from './CloseAccountDialog';

 const CloseAccountSetting = () => {
  const [dialogOpen, setDialogOpen] = React.useState<boolean>(false);

+  const { data: childAccounts } = useChildAccounts({});
+  const flags = useFlags();
+  const closeAccountDisabled = flags.parentChildAccountAccess


If the current account has child accounts, disable the 'Close Account' button

We should be able to simplify this:
const closeAccountDisabled = flags.parentChildAccountAccess && Boolean(childAccounts?.data?.length);

tyler-akamai · 2023-12-27T20:42:50Z

packages/manager/src/features/Account/CloseAccountSetting.tsx

  return (
    <>
      <Accordion defaultExpanded={true} heading="Close Account">
        <Grid container direction="column">
          <Grid>
-            <Button buttonType="outlined" onClick={() => setDialogOpen(true)}>
+            {closeAccountDisabled && (
+              <Notice spacingBottom={20} variant="info">


This was not in the mocks but we should tell the user why the button is disabled. I can run this by the UI team.

I tried to keep this consistent with the 'Backup Auto Enrollment' Section:

Yeah, this is a good call. Exact copy TBD - I know you reached out to Magda; we can be sure to get a response from her or Jan on that, whether it's finalized in this ticket or a follow up for copy changes.

…d-access-column-to-users-table

mjac0bs

Nice! Just some minor things here. If there's any outstanding feedback you don't get to, I can pick this up.

✅ Unit tests are passing 🎉
✅ Ensured there is an additional 'Child Account Access' column with accurate labels ('Enabled' and 'Disabled')
✅ Ensured the Close Account button is disabled since the current account has a child account, and ensure there is a notice explaining why it is disabled.
✅ Ensured the Close Account button is enabled if the current account does not have any child accounts.
Ensure the parent/child feature flag works as expected

See the comment in UserRow.tsx for a crash fix.

packages/manager/src/features/Users/UserRow.test.tsx

mjac0bs · 2023-12-29T19:52:26Z

packages/manager/src/features/Account/CloseAccountSetting.tsx

  return (
    <>
      <Accordion defaultExpanded={true} heading="Close Account">
        <Grid container direction="column">
          <Grid>
-            <Button buttonType="outlined" onClick={() => setDialogOpen(true)}>
+            {closeAccountDisabled && (
+              <Notice spacingBottom={20} variant="info">


Yeah, this is a good call. Exact copy TBD - I know you reached out to Magda; we can be sure to get a response from her or Jan on that, whether it's finalized in this ticket or a follow up for copy changes.

packages/manager/src/features/Users/UserRow.test.tsx

packages/manager/src/features/Users/UserRow.tsx

packages/manager/src/features/Account/CloseAccountSetting.test.tsx

packages/manager/src/features/Users/UserRow.test.tsx

jaalah-akamai · 2024-01-01T15:16:47Z

packages/manager/src/features/Account/CloseAccountSetting.tsx


 import CloseAccountDialog from './CloseAccountDialog';

 const CloseAccountSetting = () => {
  const [dialogOpen, setDialogOpen] = React.useState<boolean>(false);

+  const { data: childAccounts } = useChildAccounts({});
+  const flags = useFlags();
+  const closeAccountDisabled = flags.parentChildAccountAccess


We should be able to simplify this:
const closeAccountDisabled = flags.parentChildAccountAccess && Boolean(childAccounts?.data?.length);

jaalah-akamai · 2024-01-01T15:19:08Z

packages/manager/src/features/Users/UserRow.tsx

@@ -36,6 +40,11 @@ export const UserRow = ({ onDelete, user }: Props) => {
        <TableCell>{user.email}</TableCell>
      </Hidden>
      <TableCell>{user.restricted ? 'Limited' : 'Full'}</TableCell>
+      {flags.parentChildAccountAccess && (


We should provide a better check here as opposed to just relying on the feature flag, since that will disappear in the future and this entire column will be conditionally rendered.

packages/manager/src/features/Users/UsersLanding.tsx

… dynamic

…table

github-actions · 2024-01-02T18:44:16Z

Coverage Report: ✅
Base Coverage: 79.25%
Current Coverage: 79.25%

tyler-akamai added 2 commits December 20, 2023 11:34

added column and disabled button when account has child accounts

3845183

removed child access for child accounts in msw

76024d1

tyler-akamai self-assigned this Dec 20, 2023

tyler-akamai added the Parent / Child Account label Dec 20, 2023

tyler-akamai and others added 4 commits December 20, 2023 11:41

Added changeset

bf43651

Update pr-10012-upcoming-features-1703090453195.md

bb58dbd

add notice for disabled Close Account button

d56ce3d

Place disabled dialog behind feature flag

6298f47

tyler-akamai commented Dec 27, 2023

View reviewed changes

tyler-akamai added 8 commits December 28, 2023 12:49

add unit tests but one is failing

6b3b99e

Merge remote-tracking branch 'upstream/develop' into M3-7455-add-chil…

5fed31c

…d-access-column-to-users-table

unit tests not passing

8f293eb

unit tests failing

c6016b7

added makeResourcePage, still failing though

f0ed502

fix unit tests, shoutout Mariah

d3eda04

unit test failing

101694e

updated tests

8d9e5c1

tyler-akamai marked this pull request as ready for review December 29, 2023 19:33

tyler-akamai requested a review from a team as a code owner December 29, 2023 19:33

tyler-akamai requested review from mjac0bs and abailly-akamai and removed request for a team December 29, 2023 19:33

mjac0bs reviewed Dec 29, 2023

View reviewed changes

jaalah-akamai requested changes Jan 1, 2024

View reviewed changes

jaalah-akamai added the Requires Changes label Jan 1, 2024

mjac0bs added 4 commits January 2, 2024 08:57

Address feedback: unit test

65401eb

Address feedback: notice copy and unit tests

a98ec9d

Address feedback: fix conditional for col display; Make table col num…

132485f

… dynamic

Update unit test, still one skipped test to fix

f53d3ea

Merge branch 'develop' into M3-7455-add-child-access-column-to-users-…

62f4892

…table

mjac0bs added 2 commits January 2, 2024 10:59

Fix typo

fc94ec4

Fix user landing crash and unit tests

d795584

tyler-akamai closed this by deleting the head repository Jan 3, 2024

mjac0bs mentioned this pull request Jan 3, 2024

upcoming: [M3-7455] - Add child account access column and disable Delete Account button when account has child accounts #10025

Merged

12 tasks

This was referenced Jan 18, 2024

Release v1.110.0 - release → staging #10081

Closed

Release v1.110.0 - release → staging #10082

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upcoming: [M3-7455] - Add child account access column and disable button when account has child accounts #10012

upcoming: [M3-7455] - Add child account access column and disable button when account has child accounts #10012

tyler-akamai commented Dec 20, 2023 •

edited by mjac0bs

Loading

tyler-akamai Dec 27, 2023

jaalah-akamai Jan 1, 2024

tyler-akamai Dec 27, 2023 •

edited

Loading

mjac0bs Dec 29, 2023

mjac0bs left a comment

mjac0bs Dec 29, 2023

jaalah-akamai Jan 1, 2024

jaalah-akamai Jan 1, 2024

github-actions bot commented Jan 2, 2024 •

edited

Loading

upcoming: [M3-7455] - Add child account access column and disable button when account has child accounts #10012

upcoming: [M3-7455] - Add child account access column and disable button when account has child accounts #10012

Conversation

tyler-akamai commented Dec 20, 2023 • edited by mjac0bs Loading

Description 📝

Changes 🔄

Preview 📷

How to test 🧪

Prerequisites

Verification steps

As an Author I have considered 🤔

tyler-akamai Dec 27, 2023

Choose a reason for hiding this comment

jaalah-akamai Jan 1, 2024

Choose a reason for hiding this comment

tyler-akamai Dec 27, 2023 • edited Loading

Choose a reason for hiding this comment

mjac0bs Dec 29, 2023

Choose a reason for hiding this comment

mjac0bs left a comment

Choose a reason for hiding this comment

mjac0bs Dec 29, 2023

Choose a reason for hiding this comment

jaalah-akamai Jan 1, 2024

Choose a reason for hiding this comment

jaalah-akamai Jan 1, 2024

Choose a reason for hiding this comment

github-actions bot commented Jan 2, 2024 • edited Loading

tyler-akamai commented Dec 20, 2023 •

edited by mjac0bs

Loading

tyler-akamai Dec 27, 2023 •

edited

Loading

github-actions bot commented Jan 2, 2024 •

edited

Loading