(zeppelin) branch master updated: [ZEPPELIN-6127] Fix setting incorrect ZEPPELIN_ANGULAR_WAR value

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 31c011b507 [ZEPPELIN-6127] Fix setting incorrect ZEPPELIN_ANGULAR_WAR 
value
31c011b507 is described below

commit 31c011b507034a681d6b6f7f072204e693e8915b
Author: ChanHo Lee <chanho0...@gmail.com>
AuthorDate: Wed Oct 16 15:19:42 2024 +0900

    [ZEPPELIN-6127] Fix setting incorrect ZEPPELIN_ANGULAR_WAR value
    
    ### What is this PR for?
    When setting `ZEPPELIN_ANGULAR_WAR`, it should check for the 
`${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin` directory.
    
    However, it currently checks for the `${ZEPPELIN_HOME}/zeppelin-web/dist` 
directory, causing an issue where the new UI load fails if the classic UI is 
not built.
    
    ### What type of PR is it?
    Bug Fix
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN-6127
    
    ### How should this be tested?
    - Clear classic UI `dist` directory. (remove 
`${ZEPPELIN_HOME}/zeppelin-web/dist` directory)
    - Build without classic UI profile (`./mvnw package -DskipTests 
-Pinclude-hadoop`)
    - Run Zeppelin with daemon script. (`./bin/zeppelin-daemon.sh start`)
    - Ensure the new UI loads properly at `http://localhost:8080/`.
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the license files need to update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    
    Closes #4874 from tbonelee/fix-new-ui-war-variable.
    
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 bin/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/common.sh b/bin/common.sh
index 56f8aa45ff..9aab5a693f 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -51,7 +51,7 @@ if [[ -z "${ZEPPELIN_WAR}" ]]; then
 fi
 
 if [[ -z "${ZEPPELIN_ANGULAR_WAR}" ]]; then
-  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
+  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin" ]]; then
     export 
ZEPPELIN_ANGULAR_WAR="${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin"
   else
     ZEPPELIN_ANGULAR_WAR=$(find -L "${ZEPPELIN_HOME}" -name 
"zeppelin-web-angular*.war")