AMBARI-26601 : rebase frontend refactor branch with latest changes from the trunk branch

.gitignore

@@ -9,9 +9,11 @@
 /ambari-server/derby.log
 /ambari-server/pass.txt
 /ambari-web/npm-debug.log
-/ambari-web/public/
-/ambari-web/node_modules/
-/ambari-web/node/
+/ambari-web/classic/public/
+/ambari-web/classic/node_modules/
+/ambari-web/classic/node/
+node/
+mode_modules/
 *.pyc
 *.py~
 **/*.iml

Jenkinsfile

@@ -44,7 +44,7 @@ pipeline {
 
     tools {
         maven 'maven_3_latest'
-        jdk 'jdk_1.8_latest'
+        jdk 'jdk_17_latest'
     }
 
     environment {
@@ -55,6 +55,24 @@ pipeline {
     }
 
     stages {
+        stage('Find and Run Ruff') {
+            steps {
+                script {
+                    sh 'pip3 install --user ruff'
+                    echo "Contents of /home/jenkins/.local/bin:"
+                    sh 'ls -l /home/jenkins/.local/bin || echo "Directory not found"'
+                }
+            }
+        }
+
+        stage('Ruff Check') {
+            steps {
+                withEnv(["PATH+LOCALBIN=/home/jenkins/.local/bin:${env.PATH}"]) {
+                    sh 'ruff --version'
+                    sh 'mvn exec:exec@ruff-check -Pruff-check -pl :ambari -DskipTests -Dmaven.install.skip=true'
+                }
+            }
+        }
         stage('Pre-Build Deps') {
             parallel{
                 stage('JIRA Integration') {
@@ -103,6 +121,13 @@ pipeline {
 
                 stage('Ambari Server PyTests') {
                     steps {
+                        sh '''
+                           # Install pyOpenSSL in one step
+                           pip3 install --user --upgrade pyOpenSSL
+                           # Verify installations
+                           pip3 --version
+                           openssl version
+                           '''
                         sh 'mvn clean -am test -pl ambari-server -DskipSurefireTests -Dmaven.test.failure.ignore -Dmaven.artifact.threads=10 -Drat.skip -Dcheckstyle.skip -DskipAdminWebTests=true'
                     }
                 }

KEYS

@@ -880,3 +880,60 @@ N/zWncPZFHya0QfOEWBrHsF/N1evfirEqFeVlwIS8frJ7zZUekyCZtTlkhImp48d
 Y+wM7m/7Q8IXwnCfRl1ktbLw
 =TNQ6
 -----END PGP PUBLIC KEY BLOCK-----
+pub   rsa4096 2024-11-20 [SC]
+      DCD36877D7A57FFDFC29343CE33E3A690928A669
+uid           [ultimate] Jialiang (CODE SIGNING KEY) <jialiang@apache.org>
+sub   rsa4096 2024-11-20 [E]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+dIlSNEfSnLL5KOOSp5+a/g==
+=Kh5s
+-----END PGP PUBLIC KEY BLOCK-----

ambari-admin/pom.xml

@@ -23,7 +23,6 @@
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
@@ -60,7 +59,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.3</version>
+        <version>1.11.0</version>
         <configuration>
           <nodeVersion>v4.5.0</nodeVersion>
           <npmVersion>2.15.0</npmVersion>
@@ -85,6 +84,41 @@
               <arguments>install --unsafe-perm</arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>install-node-and-npm-react</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>install-node-and-npm</goal>
+            </goals>
+            <configuration>
+              <nodeVersion>v20.11.0</nodeVersion>
+              <npmVersion>10.8.3</npmVersion>
+              <workingDirectory>src/main/resources/ui/ambari-admin/</workingDirectory>
+              <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm-install-react</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>install</arguments>
+              <workingDirectory>src/main/resources/ui/ambari-admin/</workingDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm-run-build-react</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>run build</arguments>
+              <workingDirectory>src/main/resources/ui/ambari-admin/</workingDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -155,7 +189,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5</version>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -199,8 +233,22 @@
             <exclude>src/main/resources/ui/admin-web/test/.bowerrc</exclude>
             <exclude>src/main/resources/ui/admin-web/.bowerrc</exclude>
             <exclude>src/main/resources/ui/admin-web/package.json</exclude>
+            <exclude>src/main/resources/ui/admin-web/package-lock.json</exclude>
             <exclude>src/main/resources/ui/admin-web/.jshintrc</exclude>
             <exclude>src/main/resources/ui/admin-web/.idea/**</exclude>
+            <exclude>package-lock.json</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/package-lock.json</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/tsconfig.json</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/package.json</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/.vite/**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/vite**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/src/assets/**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/dist/**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/node_modules/**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/node/**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/tsconfig**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/eslint**</exclude>
+            <exclude>src/main/resources/ui/ambari-admin/README**</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -212,7 +260,103 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-angular-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/classic</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/ui/admin-web/dist/angular</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+        </plugin>
+        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-react-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/latest</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/ui/ambari-admin/dist</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+        </plugin>
+        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-react-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes/latest</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/ui/ambari-admin/dist</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+        </plugin>
+        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-public-folder</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/ui/public</directory>
+                                    <includes>
+                                      <include>index.html</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+        </plugin>
     </plugins>
+
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -221,10 +365,6 @@
           <include>META-INF/**/*</include>
         </includes>
       </resource>
-      <resource>
-        <directory>src/main/resources/ui/admin-web/dist</directory>
-        <filtering>false</filtering>
-      </resource>
     </resources>
   </build>
   <profiles>
@@ -304,4 +444,4 @@
       </properties>
     </profile>
   </profiles>
-</project>
+</project>

ambari-admin/src/main/resources/ui/admin-web/app/index.html

@@ -67,6 +67,7 @@
              </a>
              <ul class="dropdown-menu">
                <li><a href ng-click="about()">{{'common.about' | translate}}</a></li>
+               <li><a href ng-click="switchExperience()">{{'common.switchExperience' | translate}}</a></li>
                <li role="separator" class="divider"></li>
                <li><a href ng-click="signOut()">{{'common.signOut' | translate}}</a></li>
              </ul>

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/AppCtrl.js

@@ -26,6 +26,11 @@ angular.module('ambariAdminConsole')
     });
   };
 
+  $scope.switchExperience = function() {
+    var currentLocation = $window.location.href;
+    $window.location.href = currentLocation.replace("classic", "latest");
+  };
+
   //todo replace with breadcrumb service
   $scope.$watch(function () {
     return $route.current;

ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js

@@ -27,6 +27,7 @@ angular.module('ambariAdminConsole')
     'common.ambari': 'Ambari',
     'common.apacheAmbari': 'Apache Ambari',
     'common.about': 'About',
+    'common.switchExperience': 'Switch to latest UI',
     'common.version': 'Version',
     'common.signOut': 'Sign out',
     'common.register': 'Register',