Skip to content

feat: [M3-7017] - Update firewall events#9693

Merged
carrillo-erik merged 3 commits intolinode:feature/firewall-nodebalancerfrom
carrillo-erik:feat/M3-7017
Sep 20, 2023
Merged

feat: [M3-7017] - Update firewall events#9693
carrillo-erik merged 3 commits intolinode:feature/firewall-nodebalancerfrom
carrillo-erik:feat/M3-7017

Conversation

@carrillo-erik
Copy link
Contributor

Description 📝

Changes the copy of the notification message in the Events landing page to account for the ability to add NodeBalancers to Firewalls.

Major Changes 🔄

  • Replaces device for the appropriate device type (Linode or NodeBalancer) in the message displayed in the Events landing page.

Preview 📷

Before After
m3-7017-before m3-7017-after

How to test 🧪

  1. On you localhost instance, switch over to the Dev environment via the CloudManager dev tools.
  2. On a existing Firewall entity add at least one instance of both Linode and NodeBalancer.
  3. Validate the event notification messages in the Events landing page.
  4. On the same Firewall instance remove the Linode and NodeBalancer instances that you added in step 2.
  5. Validate the event notification messages in the Events landing page.

Copy link
Contributor

@abailly-akamai abailly-akamai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

tested events on this branch and now showing secondary entities

@carrillo-erik don't forget to add a changeset

@jaalah-akamai jaalah-akamai added the Add'tl Approval Needed Waiting on another approval! label Sep 19, 2023
Copy link
Member

@bnussman-akamai bnussman-akamai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both events look good!

Comment on lines +262 to +264
const secondaryEntityName = e.secondary_entity?.type
? capitalize(e.secondary_entity.type)
: e.secondary_entity?.type;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worst case this could return undefined undefined has been added to Firewall . if something goes terribly wrong on the API side. Should we consider adding any fallbacks to the undefineds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can fallback to the previous generic message in this case.

@bnussman-akamai bnussman-akamai added Approved Multiple approvals and ready to merge! and removed Add'tl Approval Needed Waiting on another approval! labels Sep 19, 2023
Copy link
Contributor

@jdamore-linode jdamore-linode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Just have one ask regarding the formatting of NodeBalancers, otherwise ready to approve!

Comment on lines +262 to +264
const secondaryEntityName = e.secondary_entity?.type
? capitalize(e.secondary_entity.type)
: e.secondary_entity?.type;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any chance we can use an object as a key/value dictionary to format the entity type name, similar to how it's handled on the landing page, so that nodebalancer is formatted as NodeBalancer instead of Nodebalancer? capitalize() would still be good as a fallback for theoretical cases where secondary_entity.type is something unexpected.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdamore-linode Thanks for pointing this out. I went ahead and removed capitalize() after taking @bnussman-akamai comment into consideration for the event in which the API returns undefined.

Copy link
Contributor

@jdamore-linode jdamore-linode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @carrillo-erik!

Copy link
Contributor

@abailly-akamai abailly-akamai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good and fallback implemented works 🚢

@carrillo-erik carrillo-erik merged commit 7f16205 into linode:feature/firewall-nodebalancer Sep 20, 2023
tyler-akamai added a commit that referenced this pull request Dec 7, 2023
* feat: [M3 7015] - Create nodebalancer tab in firewalls landing (#9590)

* initial changes

* finished the firewall device landing updates

* Added changeset: Create nodebalancer tab in firewalls landing

* fixed breadcrumb and variable names

* added FirewallDeviceLanding test file

* added initial unit tests

* updated jest.mock function, still not working

* swapped from jest.mock to MSW, still need some work

* fixed unit tests

* fixed tests for FirewallDeviceLanding

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* feat: [M3-7019] - Create add Nodebalancer to Firewall drawer (#9608)

* initial drawer commit

* finished the add nodebalancer drawer

* Added changeset: Created 'Add Nodebalancer' to Firewall drawer

* updated drawer and started to add event handlers

* added toast notification

* added multiple toast notifications

* separated nodebalancer and linode drawer

* added infinite scrolling

* fixed pr suggestions

* partially eliminated type definitions in LinodeSelect

* eliminated type definitions in LinodeSelect

* changed type definition of onSelectionChange in NodeBalancerSelect

* eliminated type declarations in NodeBalancerSelect

* erased commented out code

* initial round of fixes

* fixed linode error drawer not closing

* eliminated event message

* added todo comment

* added todo comment

* fixed toast notification, error reset, and error text

* fixed toast notification, error reset, and error text for Linode Drawer

* fixed nodebalancer drawer error notices

* merged with develop

* initial migration to new autocomplete component, still some errors

* can select linodes now, but the linodes arent showing as selected

* fixed selection issue with autocomplete

* migrated to new autocomplete component

* remove NodeBalancerSelect file changes

* added banks PR suggestions

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* feat: [M3-7052] - Add NodeBalancer table under Firewall / Devices (#9664)

* initial nodebalancer table commit

* Added changeset: Added NodeBalancer table under Firewall/Devices

* removed unnecessary prop extension

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* feat: [M3-7016] - Add Basic Filtering for Firewall Devices (#9626)

* initial firewall device filter commit

* Added changeset: Added Basic Filtering for Firewall Devices

* cleaned up label content in TextField

* initial ActionsPanel Storybook commit

* reverted ActionsPanel changes

* updated storybook

* Fixed storybook

* test commit - eslint issues

* test commit

* fixed text field

* removed unnecessary code

* added Alban's changes

* test commit

* removed test comment

* fixed filtering error

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>
Co-authored-by: Hana Xu <hxu@akamai.com>

* feat: [M3-7033] - Update Firewall Landing Device Column (#9668)

* initial update to device cell wrap functionality

* added extra console line for width

* still not working

* updated the code, still not working

* changes linodes column to devices column

* fixed styling file

* Added changeset: Updated Firewall Landing Device Column

* removed unnecessary styling

* fixed test results

* added Connie's pr suggestions

* updated styled row file

* added line clamp to styled component

* removed old test case

* updated row spacing

* fixed spacing

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* feat: [M3-7017] - Update firewall events (#9693)

* feat: [M3-7017] - Update firewall events

* Fix e2e test and secondary entity formatting

* Add changeset

* feat: [M3-7020] - Update Create Firewall drawer (#9630)

* feat: [M3-7020] - Update Create Firewall drawer

* Update firewall e2e tests for NodeBalancer UI improvements

* Integrate new Autocomplete component

* Change test description

* Add UI indicator for errors and reset nb values

* Add changeset

* Move static strings outside component

* Implement PR feedback suggestions

* Remove unnecessary check and change var name

---------

Co-authored-by: Joe D'Amore <jdamore@linode.com>

* feat: [M3-7021] - Added Firewall panel to create NodeBalancer flow (#9733)

* merged with upstream

* Added changeset: Added Firewall Panel to NodeBalancer Create flow

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* fix: [M3-7245] - Replaced 'Devices' with 'Services' in Firewall Page (#9775)

* replaced visible devices with services

* fixed routing for drawers

* Added changeset: Swapped 'Devices' to 'Services' in Firewall and updated Add Service to Firewall routing

* updated unit tests, still need work

* updated unit tests

* updated capitalization and unit tests

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* fixed merge conflict

* fix: [M3-7313] - Migrated Linode dropdown to Autocomplete in Firewall Landing > Create Firewall drawer (#9837)

* migrated Linode dropdown to Autocomplete, fixed NodeBalancer dropdown, added successfull toast notification

* Added changeset: Linode dropdown in Create Firewall drawer using LinodeSelect component instead of the Autocomplete component

* fixed changeset message from last pr

* updated unit tests

* addressed Hana's feedback

* removed helper text

* initial changes to unnecessary state

* addresses Banks feedback

* addressed additional feedback

* fixed syntax of optionsFilter

* switched set to list for autocomplete

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* feat: [M3-7163] - Add Firewall Section to NodeBalancer Details Page (#9831)

* first commit

* Code cleanup

* Fix quick bug

* PR feedback changes

* RQ changes

* fixed toast notification errors

* fixed toast notifications

* PR feedback

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>

* refactor: [M3-7377] - Migrate dopdowns in Create Firewall Drawer from Autocomplete to LinodeSelect and NodeBalancerSelect (#9886)

* initial commit

* updated font bold to use mui theme

* migrated autocomplete to nodebalancer select

* small naming changes

* Updated CreateFirewallDrawer and SelectFirewallPanel

* removed comments

* Added changeset: Dropdowns in Create Firewall Drawer using Autocomplete instead of updated LinodeSelect and NodeBalancerSelect

* fixed LinodeSelect unit tests

* added NodeBalancer unit tests

* fixed SelectFirewallPanel unit tests

* added pr feedback

* updated dropdown labels

* fixed unit tests

* fixed unit tests

* fixed unit tests

* working to fix timeout error

* rerunning unit tests

* test debug

* merged with develop

* testing unit tests

* testing last unit test

* testing last unit test

* removed line to see if unit tests will pass

* Replace calls to `jest.fn()` with `vi.fn()`

* rerunning tests

* fixed e2e tests

* resolved pr suggestions

---------

Co-authored-by: TylerWJ <tylerwjones99@gmail.com>
Co-authored-by: Banks Nussman <banks@nussman.us>
Co-authored-by: Joe D'Amore <jdamore@linode.com>

* feature: [M3-7442] - Put Firewall-Nodebalancer behind feature flag (#9931)

* initial feature flag migration

* Added remaining code under feature flag

* updated text in drawer

* Added changeset: Added feature flag to Firewall-NodeBalancer

* fixed unit test

* fixed unit tests

* added feature flag to dev tools

* test commit

* test commit

* fixed border issue in firewall's table

* partially fixed border issue

* partially fixed border issue

* fixed border issue

* feat: [M3-7018] - Add documentation links for Firewall NodeBalancer  (#9926)

* added links

* fixed nodebalancer create flow text

* made link format more consistent

* added changeset

* fixed filter issue

* removed comment

* started to address Alban's feedback

* fixed other instance of unnecessary else

* addressed feedback for Firewall Drawer Props

* added clamp-js for firewall landing

* added clamp-js library

* addressed some comments

* addressed onService required prop feedback

* addressed test feedbacl for FirewallDeviceLanding

* addressed test feedback for FirewallDeviceLanding

* added a todo in FirewallRulesLanding

* added unit tests for addNodebalancerDrawer and addLinodeDrawer

* addressed Connie's feedback ab aria labels

* sanitized error messages in add drawers

* added interface for secondaryEntityTypeObj

* fixed link in create NodeBalancer flow

* fixed header in create drawer

* Update packages/manager/.changeset/pr-9926-upcoming-features-1700672014523.md

Co-authored-by: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com>

* added period after Learn more in create firewall drawer

* fixed nodebalancer create flow issue

* NodeBalancer is now assigned to Firewall

* removed unnecessary invalidate query

* added doc link to NodeBalancer's details page

* improved organization of the AddLinodeDrawer and AddNodeBalancerDrawer

* added a constants file in FirewallLanding directory

* Update packages/manager/.changeset/pr-9926-upcoming-features-1700672014523.md

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/.changeset/pr-9931-upcoming-features-1700686098973.md

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/FirewallDeviceTable.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewalls.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/api-v4/src/nodebalancers/nodebalancers.ts

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/NodeBalancers/NodeBalancerDetail/NodeBalancerFirewalls.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddNodebalancerDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* Update packages/manager/src/features/Firewalls/FirewallDetail/Devices/AddLinodeDrawer.test.tsx

Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>

* fixed import error

* mapIdsToLinodes to mapIdsToDevices

* fixed Linodes Network tab Firewall Table error state

* fixed Linodes Network tab Firewall Table error state

* fixed Create NodeBalancer add firewall flow

* removed firewall_id forom NodeBalancerConfigNode

* added firewall_id to the payload

* fixed spelling issue

* Fix darkmode link color discrepancy

* added tags to CreateNodeBalancerPayload

* Replace html anchor tag with Link component

* change: [M3-7546] - Revert FW table row changes (#9974)

* change: [M3-7546] - Revert NB table row changes

* Fix linking for NodeBalancers from the table cell

* Remove the `clamp-js` package

* Add changeset

* added links to constants file

* changed SecondaryEntityType from interface to type

* changed improved mapIdsToDevices tests to cover nodebalancers

* Update packages/manager/src/features/Events/eventMessageGenerator.ts

Co-authored-by: Banks Nussman <115251059+bnussman-akamai@users.noreply.github.com>

* eliminated ternary in Summary Panel

* cleaned up NodeBalancerSettings displayFirewallInfotext

* Fix dark mode color issue on NB settings page

* invalidated device queries after firewall has been deleted

---------

Co-authored-by: tyler-akamai <139489745+tyler-akamai@users.noreply.github.com>
Co-authored-by: TylerWJ <tylerwjones99@gmail.com>
Co-authored-by: Hana Xu <hxu@akamai.com>
Co-authored-by: Joe D'Amore <jdamore@linode.com>
Co-authored-by: Tyler Jones <tjones@akamai.com>
Co-authored-by: Banks Nussman <banks@nussman.us>
Co-authored-by: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com>
Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com>
Co-authored-by: Banks Nussman <115251059+bnussman-akamai@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Approved Multiple approvals and ready to merge!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants