Merge pull request #14286 from GordonSmith/LOGIN_RELOCATE

HPCC-24894 Relocate Login.html sources

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Kevin Wang <kevin.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/CMakeLists.txt

@@ -28,6 +28,8 @@ file(COPY
     ${CMAKE_CURRENT_SOURCE_DIR}/put-selector
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/stub.htm
+    ${CMAKE_CURRENT_SOURCE_DIR}/Login.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/GetUserName.html
     ${CMAKE_CURRENT_SOURCE_DIR}/tsconfig.json
     ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js
     ${CMAKE_CURRENT_SOURCE_DIR}/xstyle
@@ -278,6 +280,9 @@ set ( SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/src/WUGraphLegend.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/WUScopeController.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/WUStatus.ts
+    ${CMAKE_CURRENT_SOURCE_DIR}/stub.htm
+    ${CMAKE_CURRENT_SOURCE_DIR}/Login.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/GetUserName.html
 )
 
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )

esp/src/lws.config.js

@@ -6,8 +6,6 @@ if (fs.existsSync("./lws.target.txt")) {
 }
 
 let rewrite = [
-    { from: "/esp/files/Login.html", to: "http://" + debugServerIP + ":8010/esp/files/Login.html" },
-    { from: "/esp/files/GetUserName.html", to: "http://" + debugServerIP + ":8010/esp/files/GetUserName.html" },
     { from: "/esp/titlebar(.*)", to: "http://" + debugServerIP + ":8010/esp/titlebar$1" },
     { from: "/esp/login", to: "http://" + debugServerIP + ":8010/esp/login" },
     { from: "/esp/logout", to: "http://" + debugServerIP + ":8010/esp/logout" },

esp/src/package.json

@@ -15,7 +15,9 @@
     "copy-res-font-awesome": "cpx \"./node_modules/font-awesome/**/*\" ./build/dist/font-awesome/",
     "copy-res-wasm": "cpx \"./node_modules/@hpcc-js/graph/dist/graphvizlib.wasm\" ./build/dist/",
     "copy-res-stub_htm": "cpx \"./stub.htm\" ./build/",
-    "copy-res": "run-s copy-res-es6-promise copy-res-eclwatch-img copy-res-eclwatch-ecl copy-res-dojo copy-res-dojox copy-res-TopoJSON copy-res-font-awesome copy-res-stub_htm copy-res-wasm",
+    "copy-res-login_html": "cpx \"./Login.html\" ./build/",
+    "copy-res-getusername_html": "cpx \"./GetUserName.html\" ./build/",
+    "copy-res": "run-p copy-res-es6-promise copy-res-eclwatch-img copy-res-eclwatch-ecl copy-res-dojo copy-res-dojox copy-res-TopoJSON copy-res-font-awesome copy-res-stub_htm copy-res-login_html copy-res-getusername_html copy-res-wasm",
     "compile": "tsc",
     "compile-watch": "npm run compile -- -w",
     "bundle": "node node_modules/webpack/bin/webpack.js --env production --config webpack.config.js",