Skip to content

Conversation

@nikita15p
Copy link

What changes were proposed in this pull request?

Rebased the branch with latest trunk branch

guluo2016 and others added 30 commits November 8, 2024 18:31
…order of imports for WidgetResourceProvider.java (apache#3872)

* There will be failure when executing shell.py
* Wrong order of imports for WidgetResourceProvider.java
* Fix issue of test failure
* AMBARI-26239: Fix OozieUtils
… few (apache#3883)

* The database password character type requirement is too few
* Add more special characters, and add UT for this case
* Update test case
* add ruff check files
* add formatted code
apache#3860)

* AMBARI-26204: Migrate RecommendationResourceProviderTest from EasyMock to Mockito
…ter JDK 17 upgrade (apache#3859)

* AMBARI-26203: Fix testAllPropertiesHaveMarkdownDescriptions failed
* AMBARI-26211: Fix TaskActionScheduler test failed
…che#3863)

* AMBARI-26215: Fix BlueprintConfigurationProcessorTest and others
JiaLiangC and others added 16 commits December 27, 2024 10:56
…esourceProviderTest& ExecutionSchedulerTest& AmbariProxiedUserDetailsServiceTest
apache#3891)

* AMBARI-26238: Add Ambari Java Home configuration for JDK 17 in Ambari server
…apache#3917

* AMBARI-26269: Fix regex pattern flag position in ambari_jinja2 filters
---------

Co-authored-by: tongxiaojun <[email protected]>
… dependency (apache#3922)

Issue: Need to update org.codehaus.jackson:jackson-mapper-asl dependency.

Cause: the library has been moved to com.fasterxml.jackson.core » jackson-databind,
hence to keep up with the newer versions need to update the library dependency.

Changes made: to update the jackson-mapper-asl dependency to jackson-databind and the required library version upgrades

Co-authored-by: Vishal Suvagia <[email protected]>
…pache#3927

AMBARI-26286: refactor(ambari-ruff): convert .format() to f-strings
* add alluxio service

Co-authored-by: jialiang <[email protected]>

* fix license

---------

Co-authored-by: jialiang <[email protected]>
@nikita15p nikita15p changed the title Rebase with trunk branch AMBARI-26303 Rebase trunk branch onto frontend-refactor Jan 23, 2025
@nikita15p nikita15p changed the title AMBARI-26303 Rebase trunk branch onto frontend-refactor AMBARI-26303: Rebase trunk branch onto frontend-refactor Jan 24, 2025
@nikita15p
Copy link
Author

@JiaLiangC can you please review and merge this PR. I have added JIRA ticket so now CI should pass.

@arshadmohammad
Copy link
Contributor

We should avoid using the "Squash and Merge" option for this pull request. Additionally, the "Rebase and Merge" option is currently disabled. Therefore, I believe we will need to merge this PR using backend methods

@JiaLiangC
Copy link
Contributor

@nikita15p What is the purpose of your PR? The APIs of the trunk and the front branch are compatible, so there's no need to merge. I think a good approach would be to use the method described in https://dev.to/vinomanick/react-micro-frontend-in-ember-app-part-2-3hg8, which allows us to gradually migrate the Ember frontend to the React frontend.

@JiaLiangC
Copy link
Contributor

We should avoid using the "Squash and Merge" option for this pull request. Additionally, the "Rebase and Merge" option is currently disabled. Therefore, I believe we will need to merge this PR using backend methods

We should avoid using the "Squash and Merge" option for this pull request. Additionally, the "Rebase and Merge" option is currently disabled. Therefore, I believe we will need to merge this PR using backend methods

I think we can adopt a micro-frontend approach for gradual migration, as a complete refactoring would likely take a considerable amount of time.

@nikita15p
Copy link
Author

nikita15p commented Jan 27, 2025

@JiaLiangC I have rebased the latest frontend-refactor because I am working on ambari-web switch functionality to support both ReactJS and emberJS . So before I send my first PR of basic layouting, I intended to have latest code of ambari and hence rebased.
Also, I am trying to follow same approach as it was done earlier in frontend-refactor branch for ambari-admin angular->React modernisation.

@JiaLiangC
Copy link
Contributor

@nikita15p thanks !

@JiaLiangC JiaLiangC merged commit 982c545 into apache:frontend-refactor Feb 6, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants