This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-ballista.git
The following commit(s) were added to refs/heads/master by this push:
new 5d4bc84a Move scheduler UI files into scheduler module (#431)
5d4bc84a is described below
commit 5d4bc84a5edc753052793b097c271515c7fd0e0a
Author: Andy Grove <[email protected]>
AuthorDate: Sat Oct 22 10:24:50 2022 -0600
Move scheduler UI files into scheduler module (#431)
* move scheduler ui files into scheduler module
* update scripts
* revert changelog
---
.github/workflows/typescript.yml | 2 +-
ballista/{ui/scheduler => scheduler/ui}/.dockerignore | 0
ballista/{ui/scheduler => scheduler/ui}/.gitignore | 0
ballista/{ui/scheduler => scheduler/ui}/README.md | 2 +-
ballista/{ui/scheduler => scheduler/ui}/index.d.ts | 0
ballista/{ui/scheduler => scheduler/ui}/package.json | 0
ballista/{ui/scheduler => scheduler/ui}/public/favicon.ico | Bin
ballista/{ui/scheduler => scheduler/ui}/public/index.html | 0
ballista/{ui/scheduler => scheduler/ui}/public/logo192.png | Bin
ballista/{ui/scheduler => scheduler/ui}/public/logo512.png | Bin
.../{ui/scheduler => scheduler/ui}/public/manifest.json | 0
ballista/{ui/scheduler => scheduler/ui}/public/robots.txt | 0
.../{ui/scheduler => scheduler/ui}/react-table-config.d.ts | 0
ballista/{ui/scheduler => scheduler/ui}/src/App.css | 0
ballista/{ui/scheduler => scheduler/ui}/src/App.test.tsx | 0
ballista/{ui/scheduler => scheduler/ui}/src/App.tsx | 0
.../scheduler => scheduler/ui}/src/components/DataTable.tsx | 0
.../{ui/scheduler => scheduler/ui}/src/components/Empty.tsx | 0
.../ui}/src/components/ExecutorsList.tsx | 0
.../scheduler => scheduler/ui}/src/components/Footer.tsx | 0
.../scheduler => scheduler/ui}/src/components/Header.tsx | 0
.../ui}/src/components/JobStagesMetrics.tsx | 0
.../ui}/src/components/QueriesList.tsx | 0
.../scheduler => scheduler/ui}/src/components/Summary.tsx | 0
.../{ui/scheduler => scheduler/ui}/src/components/logo.svg | 0
ballista/{ui/scheduler => scheduler/ui}/src/index.css | 0
ballista/{ui/scheduler => scheduler/ui}/src/index.tsx | 0
.../{ui/scheduler => scheduler/ui}/src/react-app-env.d.ts | 0
.../{ui/scheduler => scheduler/ui}/src/reportWebVitals.ts | 0
ballista/{ui/scheduler => scheduler/ui}/src/setupTests.ts | 0
ballista/{ui/scheduler => scheduler/ui}/tsconfig.json | 0
ballista/{ui/scheduler => scheduler/ui}/yarn.lock | 0
dev/build-ui.sh | 2 +-
dev/docker/ballista-scheduler.Dockerfile | 2 +-
dev/docker/builder-entrypoint.sh | 2 +-
35 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
index db6144a7..fad72995 100644
--- a/.github/workflows/typescript.yml
+++ b/.github/workflows/typescript.yml
@@ -36,6 +36,6 @@ jobs:
- name: Run yarn build
run: |
- cd ballista/ui/scheduler
+ cd ballista/scheduler/ui
yarn install
yarn build
\ No newline at end of file
diff --git a/ballista/ui/scheduler/.dockerignore
b/ballista/scheduler/ui/.dockerignore
similarity index 100%
rename from ballista/ui/scheduler/.dockerignore
rename to ballista/scheduler/ui/.dockerignore
diff --git a/ballista/ui/scheduler/.gitignore b/ballista/scheduler/ui/.gitignore
similarity index 100%
rename from ballista/ui/scheduler/.gitignore
rename to ballista/scheduler/ui/.gitignore
diff --git a/ballista/ui/scheduler/README.md b/ballista/scheduler/ui/README.md
similarity index 98%
rename from ballista/ui/scheduler/README.md
rename to ballista/scheduler/ui/README.md
index 4a0d95a8..dcb312f0 100644
--- a/ballista/ui/scheduler/README.md
+++ b/ballista/scheduler/ui/README.md
@@ -45,7 +45,7 @@ $ RUST_LOG=info cargo run --release
### Run Client project
```shell
-$ cd ui/scheduler
+$ cd scheduler/ui
$ yarn
Resolving packages...
$ yarn start
diff --git a/ballista/ui/scheduler/index.d.ts b/ballista/scheduler/ui/index.d.ts
similarity index 100%
rename from ballista/ui/scheduler/index.d.ts
rename to ballista/scheduler/ui/index.d.ts
diff --git a/ballista/ui/scheduler/package.json
b/ballista/scheduler/ui/package.json
similarity index 100%
rename from ballista/ui/scheduler/package.json
rename to ballista/scheduler/ui/package.json
diff --git a/ballista/ui/scheduler/public/favicon.ico
b/ballista/scheduler/ui/public/favicon.ico
similarity index 100%
rename from ballista/ui/scheduler/public/favicon.ico
rename to ballista/scheduler/ui/public/favicon.ico
diff --git a/ballista/ui/scheduler/public/index.html
b/ballista/scheduler/ui/public/index.html
similarity index 100%
rename from ballista/ui/scheduler/public/index.html
rename to ballista/scheduler/ui/public/index.html
diff --git a/ballista/ui/scheduler/public/logo192.png
b/ballista/scheduler/ui/public/logo192.png
similarity index 100%
rename from ballista/ui/scheduler/public/logo192.png
rename to ballista/scheduler/ui/public/logo192.png
diff --git a/ballista/ui/scheduler/public/logo512.png
b/ballista/scheduler/ui/public/logo512.png
similarity index 100%
rename from ballista/ui/scheduler/public/logo512.png
rename to ballista/scheduler/ui/public/logo512.png
diff --git a/ballista/ui/scheduler/public/manifest.json
b/ballista/scheduler/ui/public/manifest.json
similarity index 100%
rename from ballista/ui/scheduler/public/manifest.json
rename to ballista/scheduler/ui/public/manifest.json
diff --git a/ballista/ui/scheduler/public/robots.txt
b/ballista/scheduler/ui/public/robots.txt
similarity index 100%
rename from ballista/ui/scheduler/public/robots.txt
rename to ballista/scheduler/ui/public/robots.txt
diff --git a/ballista/ui/scheduler/react-table-config.d.ts
b/ballista/scheduler/ui/react-table-config.d.ts
similarity index 100%
rename from ballista/ui/scheduler/react-table-config.d.ts
rename to ballista/scheduler/ui/react-table-config.d.ts
diff --git a/ballista/ui/scheduler/src/App.css
b/ballista/scheduler/ui/src/App.css
similarity index 100%
rename from ballista/ui/scheduler/src/App.css
rename to ballista/scheduler/ui/src/App.css
diff --git a/ballista/ui/scheduler/src/App.test.tsx
b/ballista/scheduler/ui/src/App.test.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/App.test.tsx
rename to ballista/scheduler/ui/src/App.test.tsx
diff --git a/ballista/ui/scheduler/src/App.tsx
b/ballista/scheduler/ui/src/App.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/App.tsx
rename to ballista/scheduler/ui/src/App.tsx
diff --git a/ballista/ui/scheduler/src/components/DataTable.tsx
b/ballista/scheduler/ui/src/components/DataTable.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/DataTable.tsx
rename to ballista/scheduler/ui/src/components/DataTable.tsx
diff --git a/ballista/ui/scheduler/src/components/Empty.tsx
b/ballista/scheduler/ui/src/components/Empty.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/Empty.tsx
rename to ballista/scheduler/ui/src/components/Empty.tsx
diff --git a/ballista/ui/scheduler/src/components/ExecutorsList.tsx
b/ballista/scheduler/ui/src/components/ExecutorsList.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/ExecutorsList.tsx
rename to ballista/scheduler/ui/src/components/ExecutorsList.tsx
diff --git a/ballista/ui/scheduler/src/components/Footer.tsx
b/ballista/scheduler/ui/src/components/Footer.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/Footer.tsx
rename to ballista/scheduler/ui/src/components/Footer.tsx
diff --git a/ballista/ui/scheduler/src/components/Header.tsx
b/ballista/scheduler/ui/src/components/Header.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/Header.tsx
rename to ballista/scheduler/ui/src/components/Header.tsx
diff --git a/ballista/ui/scheduler/src/components/JobStagesMetrics.tsx
b/ballista/scheduler/ui/src/components/JobStagesMetrics.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/JobStagesMetrics.tsx
rename to ballista/scheduler/ui/src/components/JobStagesMetrics.tsx
diff --git a/ballista/ui/scheduler/src/components/QueriesList.tsx
b/ballista/scheduler/ui/src/components/QueriesList.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/QueriesList.tsx
rename to ballista/scheduler/ui/src/components/QueriesList.tsx
diff --git a/ballista/ui/scheduler/src/components/Summary.tsx
b/ballista/scheduler/ui/src/components/Summary.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/components/Summary.tsx
rename to ballista/scheduler/ui/src/components/Summary.tsx
diff --git a/ballista/ui/scheduler/src/components/logo.svg
b/ballista/scheduler/ui/src/components/logo.svg
similarity index 100%
rename from ballista/ui/scheduler/src/components/logo.svg
rename to ballista/scheduler/ui/src/components/logo.svg
diff --git a/ballista/ui/scheduler/src/index.css
b/ballista/scheduler/ui/src/index.css
similarity index 100%
rename from ballista/ui/scheduler/src/index.css
rename to ballista/scheduler/ui/src/index.css
diff --git a/ballista/ui/scheduler/src/index.tsx
b/ballista/scheduler/ui/src/index.tsx
similarity index 100%
rename from ballista/ui/scheduler/src/index.tsx
rename to ballista/scheduler/ui/src/index.tsx
diff --git a/ballista/ui/scheduler/src/react-app-env.d.ts
b/ballista/scheduler/ui/src/react-app-env.d.ts
similarity index 100%
rename from ballista/ui/scheduler/src/react-app-env.d.ts
rename to ballista/scheduler/ui/src/react-app-env.d.ts
diff --git a/ballista/ui/scheduler/src/reportWebVitals.ts
b/ballista/scheduler/ui/src/reportWebVitals.ts
similarity index 100%
rename from ballista/ui/scheduler/src/reportWebVitals.ts
rename to ballista/scheduler/ui/src/reportWebVitals.ts
diff --git a/ballista/ui/scheduler/src/setupTests.ts
b/ballista/scheduler/ui/src/setupTests.ts
similarity index 100%
rename from ballista/ui/scheduler/src/setupTests.ts
rename to ballista/scheduler/ui/src/setupTests.ts
diff --git a/ballista/ui/scheduler/tsconfig.json
b/ballista/scheduler/ui/tsconfig.json
similarity index 100%
rename from ballista/ui/scheduler/tsconfig.json
rename to ballista/scheduler/ui/tsconfig.json
diff --git a/ballista/ui/scheduler/yarn.lock b/ballista/scheduler/ui/yarn.lock
similarity index 100%
rename from ballista/ui/scheduler/yarn.lock
rename to ballista/scheduler/ui/yarn.lock
diff --git a/dev/build-ui.sh b/dev/build-ui.sh
index 816d6f7f..c7b0f2d9 100755
--- a/dev/build-ui.sh
+++ b/dev/build-ui.sh
@@ -20,4 +20,4 @@
set -e
. ./dev/build-set-env.sh
-docker build -t ballista-scheduler-ui:$BALLISTA_VERSION -f
dev/docker/ballista-scheduler-ui.Dockerfile ballista/ui/scheduler
+docker build -t ballista-scheduler-ui:$BALLISTA_VERSION -f
dev/docker/ballista-scheduler-ui.Dockerfile ballista/scheduler/ui
diff --git a/dev/docker/ballista-scheduler.Dockerfile
b/dev/docker/ballista-scheduler.Dockerfile
index 998e9dff..86fab72d 100644
--- a/dev/docker/ballista-scheduler.Dockerfile
+++ b/dev/docker/ballista-scheduler.Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y nginx netcat
COPY target/$RELEASE_FLAG/ballista-scheduler /root/ballista-scheduler
-COPY ballista/ui/scheduler/build /var/www/html
+COPY ballista/scheduler/ui/build /var/www/html
COPY dev/docker/nginx.conf /etc/nginx/sites-enabled/default
# Expose Ballista Scheduler web UI port
diff --git a/dev/docker/builder-entrypoint.sh b/dev/docker/builder-entrypoint.sh
index aa232510..f103b5e7 100755
--- a/dev/docker/builder-entrypoint.sh
+++ b/dev/docker/builder-entrypoint.sh
@@ -23,6 +23,6 @@ printenv
RELEASE_FLAG=${RELEASE_FLA:=release}
cargo build --features flight-sql "--$RELEASE_FLAG" "$@"
-cd ballista/ui/scheduler
+cd ballista/scheduler/ui
yarn install
yarn build
