Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NIFI-11433] update angular, d3, moment, slickgrid, and jquery depen… #7174

Merged
merged 3 commits into from
Apr 24, 2023
Merged

[NIFI-11433] update angular, d3, moment, slickgrid, and jquery depen… #7174

merged 3 commits into from
Apr 24, 2023

Conversation

scottyaslan
Copy link
Contributor

…dencies

Summary

NIFI-11433

Tracking

Please complete the following tracking steps prior to pull request creation.

Issue Tracking

Pull Request Tracking

  • Pull Request title starts with Apache NiFi Jira issue number, such as NIFI-00000
  • Pull Request commit message starts with Apache NiFi Jira issue number, as such NIFI-00000

Pull Request Formatting

  • Pull Request based on current revision of the main branch
  • Pull Request refers to a feature branch with one commit containing changes

Verification

Please indicate the verification steps performed prior to pull request creation.

Build

  • Build completed using mvn clean install -P contrib-check
    • JDK 11
    • JDK 17

Licensing

  • New dependencies are compatible with the Apache License 2.0 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

@mtien-apache mtien-apache self-requested a review April 17, 2023 15:04
@mr1716
Copy link
Contributor

mr1716 commented Apr 18, 2023 •
edited
Loading

Think this would take care of most of the owasp dependency check findings

@sardell
Copy link
Contributor

sardell commented Apr 18, 2023

Reviewing now...

koccs
koccs reviewed Apr 18, 2023
View reviewed changes
Copy link
Contributor

@koccs koccs left a comment

Choose a reason for hiding this comment

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

I have found some minor things to improve.
And the usage of the new multiAttr helper function is a bit inconsistent, sometimes it is not used at all for multiple attributes, sometimes it is used for only one.

...dle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-version.js Show resolved Hide resolved
...ork-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js Show resolved Hide resolved
...mework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js Outdated Show resolved Hide resolved
...work-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js Outdated Show resolved Hide resolved
@mtien-apache
Copy link
Contributor

Reviewing...

mtien-apache
mtien-apache approved these changes Apr 18, 2023
View reviewed changes
Copy link
Contributor

@mtien-apache mtien-apache left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the upgrades, @scottyaslan! I tested a few basic flows, view data provenance, and component configurations that have tables using slickgrid. I see you added d3-helpers multiAttr. With the new d3 upgrade, you can now chain multiple attr() methods. Using the helper works well too, so I am ok with this.

koccs
koccs suggested changes Apr 19, 2023
View reviewed changes
Copy link
Contributor

@koccs koccs left a comment

Choose a reason for hiding this comment

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

Thanks for the changes, but there is an issue now. See my comment.

...mework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js Outdated Show resolved Hide resolved
@scottyaslan scottyaslan changed the title [NIFIF-11433] update angular, d3, moment, slickgrid, and jquery depen… [NIFI-11433] update angular, d3, moment, slickgrid, and jquery depen… Apr 21, 2023
koccs
koccs approved these changes Apr 21, 2023
View reviewed changes
Copy link
Contributor

@koccs koccs left a comment

Choose a reason for hiding this comment

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

Code looks good to me. I haven't tested manually, tho.

@mtien-apache
Copy link
Contributor

@scottyaslan Thanks for all the updates. Looks good now! Will merge shortly.

@mtien-apache mtien-apache merged commit 38ece1d into apache:main Apr 24, 2023
mtien-apache pushed a commit that referenced this pull request Apr 24, 2023
@scottyaslan
[NIFI-11433] update angular, d3, moment, slickgrid, and jquery depen… (…
10eab2a 
…#7174)

* [NIFIF-11433] update angular, d3, moment, slickgrid, and jquery dependencies

* address review feedback

* .entries instead of .keys

Merged #7174 into main.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtien-apache mtien-apache mtien-apache approved these changes

@koccs koccs koccs approved these changes

@mcgilman mcgilman Awaiting requested review from mcgilman

@andrewmlim andrewmlim Awaiting requested review from andrewmlim

@sardell sardell Awaiting requested review from sardell

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@scottyaslan @mr1716 @sardell @mtien-apache @koccs