arangodb · KVS85 · Nov 28, 2019 · Dec 20, 2018 · Dec 20, 2018 · Dec 20, 2018
diff --git a/.gitignore b/.gitignore
@@ -93,23 +93,12 @@ test.cpp.txt
 js/apps/*
 !js/apps/system
 !js/apps/system/*
-!js/apps/system/_admin/aardvark/APP/build
-!js/apps/system/_admin/aardvark/APP/build/*
-!js/apps/system/_admin/aardvark/APP/frontend/build
-!js/apps/system/_admin/aardvark/APP/frontend/build/*
-js/apps/system/_admin/aardvark/APP/node_modules/*
-
-js/apps/system/_admin/aardvark/APP/frontend/build/app.js
-js/apps/system/_admin/aardvark/APP/frontend/build/app.js.gz
-js/apps/system/_admin/aardvark/APP/frontend/build/templates.js
-js/apps/system/_admin/aardvark/APP/frontend/build/templates.js.gz
-js/apps/system/_admin/aardvark/APP/frontend/build/extra.css
-js/apps/system/_admin/aardvark/APP/frontend/build/extra.css.gz
-js/apps/system/_admin/aardvark/APP/frontend/build/index.html
-js/apps/system/_admin/aardvark/APP/frontend/build/libs.js
-js/apps/system/_admin/aardvark/APP/frontend/build/libs.js.gz
-js/apps/system/_admin/aardvark/APP/frontend/build/style.css
-js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part
+js/apps/system/_admin/aardvark/APP/react/node_modules/
+js/apps/system/_admin/aardvark/APP/react/node_modules/*
+!js/apps/system/_admin/aardvark/APP/react/build
+!js/apps/system/_admin/aardvark/APP/react/build/**
+!js/apps/system/_admin/aardvark/APP/react/build/static
+!js/apps/system/_admin/aardvark/APP/react/build/static/**
 
 .gdb-history
 npm-debug.log

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* ArangoDB web UI was switched to React from previous framework and rebuilt.
+
 * Enable the `parallelize-gather` AQL optimizer rule for certain write queries. 
 
   The optimization is turned on by default and can be disabled by setting the

@@ -40,13 +40,6 @@ else
     exit 1
 fi
 
-if grunt --version; then
-    echo "grunt found."
-else
-    echo "grunt missing from your system"
-    exit 1
-fi
-
 if gitbook --version; then
     echo "gitbook found."
 else
@@ -335,12 +328,12 @@ if [ "$SWAGGER" == "1" ];  then
     ./utils/generateSwagger.sh
 fi
 
-echo "GRUNT"
+echo "REACT"
 (
-    cd js/apps/system/_admin/aardvark/APP
+    cd js/apps/system/_admin/aardvark/APP/react
     rm -rf node_modules
     npm install
-    grunt deploy
+    npm run build
 )
 
 git add -f Documentation/Examples/*.generated

diff --git a/README_maintainers.md b/README_maintainers.md
@@ -215,28 +215,20 @@ To remove all available node modules and start a clean installation run:
 
 The frontend can also be built using these commands:
 
-    cd <SourceRoot>/js/apps/system/_admin/aardvark/APP/
+    cd <SourceRoot>/js/apps/system/_admin/aardvark/APP/react
     npm install
-    grunt deploy
+    npm run build
 
-For development purposes, go to `js/apps/system/_admin/aardvark/APP/` and open
-`manifest.json`. Then apply the following change:
+For development purposes, go to `js/apps/system/_admin/aardvark/APP/react` and
+run: 
 
-```
-     "/app.js": {
-     -      "path": "frontend/build/app.min.js",
-     -      "gzip": true
-     +      "path": "frontend/build/app.js",
-     +      "gzip": false
-          },
-```
+    npm start
 
-Then run `grunt`, `grunt deploy` and `grunt watch`. This should make every
-change in the code available after a reload for the browser. It is faster this
-way because the minification step is skipped.
+This will deploy a development server (Port: 3000) and automatically start your
+favorite browser and open the web UI.
 
-Note: You might need to do the same for other files.
-Usually the change for `app` should suffice however.
+All changes to any source will automatically re-build and reload your browser.
+Enjoy :)
 
 #### NPM Dependencies
 

diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake
@@ -74,14 +74,14 @@ include(InstallArangoDBJSClient)
 ### @brief install server-side JavaScript files
 ################################################################################
 
+# js/apps/system/_admin/aardvark/APP/manifest.json list files must be included
 install(
   DIRECTORY
     ${PROJECT_SOURCE_DIR}/js/actions
     ${PROJECT_SOURCE_DIR}/js/apps
     ${PROJECT_SOURCE_DIR}/js/server
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
-  REGEX       "^.*/aardvark/APP/node_modules$"             EXCLUDE
-  REGEX       "^.*/aardvark/APP/frontend/js/lib"           EXCLUDE
+  REGEX       "^.*/aardvark/APP/react/node_modules$"       EXCLUDE
   REGEX       "^.*/js/server/assets/swagger/*.map$"        EXCLUDE
   REGEX       "^.*/.bin"                                   EXCLUDE
 )

diff --git a/cmake/frontend/aardvark.cmake b/cmake/frontend/aardvark.cmake
@@ -4,13 +4,13 @@
 ################################################################################
 add_custom_target(frontend
   COMMENT "create frontend build"
-  COMMAND npm i --prefix ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP
-  COMMAND npm install --prefix ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP grunt
-  COMMAND ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/node_modules/grunt/bin/grunt --gruntfile ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/GruntFile.js deploy
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react
+  COMMAND npm install
+  COMMAND npm run build
   )
 
 add_custom_target(frontend_clean
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/node_modules
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/react/node_modules
   COMMENT "Removing frontend node modules"
   )