From c09caa0914a71ef0d26c5a12ad87fe2244b7f594 Mon Sep 17 00:00:00 2001 From: Anil Natha Date: Fri, 10 Nov 2023 15:43:02 -0800 Subject: [PATCH 01/40] Updated environment configs to account for SIPS account updates. also renamed usage of "staging" to "test". --- .env/.env.development | 2 -- .env/.env.integration | 2 -- .env/.env.sips-test | 16 ++++++++++++++++ .env/.env.staging | 0 .env/.env.test | 16 ++++++++++++++++ package.json | 3 ++- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 .env/.env.sips-test delete mode 100644 .env/.env.staging create mode 100644 .env/.env.test diff --git a/.env/.env.development b/.env/.env.development index 8973bba..c21918a 100644 --- a/.env/.env.development +++ b/.env/.env.development @@ -13,6 +13,4 @@ VITE_AUTH_APP_APP_VIEWER_GROUP_NAME=Unity_Viewer VITE_ADS_URL=http://uads-test-dockstore-deploy-lb-1762603872.us-west-2.elb.amazonaws.com:9998 # SPS -#VITE_SPS_WPST_ENDPOINT=http://aaed06716800f4ead8e75815506a2999-2059110582.us-west-2.elb.amazonaws.com:5001/ # Direct -#VITE_SPS_WPST_ENDPOINT=https://1gp9st60gd.execute-api.us-west-2.amazonaws.com/dev/ades-wpst/ # Via API GATEWAY VITE_SPS_WPST_ENDPOINT=https://d3vc8w9zcq658.cloudfront.net/ades-wpst/ # Via CloudFront diff --git a/.env/.env.integration b/.env/.env.integration index 54c7659..0287534 100644 --- a/.env/.env.integration +++ b/.env/.env.integration @@ -13,6 +13,4 @@ VITE_AUTH_APP_APP_VIEWER_GROUP_NAME=Unity_Viewer VITE_ADS_URL=http://uads-test-dockstore-deploy-lb-1762603872.us-west-2.elb.amazonaws.com:9998 # SPS -#VITE_SPS_WPST_ENDPOINT=http://aaed06716800f4ead8e75815506a2999-2059110582.us-west-2.elb.amazonaws.com:5001/ # Direct -#VITE_SPS_WPST_ENDPOINT=https://1gp9st60gd.execute-api.us-west-2.amazonaws.com/dev/ades-wpst/ # Via API GATEWAY VITE_SPS_WPST_ENDPOINT=https://d3vc8w9zcq658.cloudfront.net/ades-wpst/ # Via CloudFront \ No newline at end of file diff --git a/.env/.env.sips-test b/.env/.env.sips-test new file mode 100644 index 0000000..513be1c --- /dev/null +++ b/.env/.env.sips-test @@ -0,0 +1,16 @@ +# GENERAL +VITE_ADMIN_EMAIL=anil.natha@jpl.nasa.gov + +# Auth +VITE_AUTH_OAUTH_CLIENT_ID=SET_IN_INTEGRATION_DOT_LOCAL_FILE +VITE_AUTH_OAUTH_REDIRECT_URI=https://dxebrgu0bc9w7.cloudfront.net/unity-sips-test/dashboard +VITE_AUTH_OAUTH_LOGOUT_ENDPOINT=https://unitysds-test.auth.us-west-2.amazoncognito.com/logout +VITE_AUTH_OAUTH_PROVIDER_URL=https://unitysds-test.auth.us-west-2.amazoncognito.com/oauth2 +VITE_AUTH_APP_ADMIN_GROUP_NAME=Unity_Admin +VITE_AUTH_APP_APP_VIEWER_GROUP_NAME=Unity_Viewer + +# ADS +VITE_ADS_URL=http://uads-test-dockstore-deploy-lb-1762603872.us-west-2.elb.amazonaws.com:9998 + +# SPS +VITE_SPS_WPST_ENDPOINT=https://dxebrgu0bc9w7.cloudfront.net/unity-sips-test/ades-wpst/ \ No newline at end of file diff --git a/.env/.env.staging b/.env/.env.staging deleted file mode 100644 index e69de29..0000000 diff --git a/.env/.env.test b/.env/.env.test new file mode 100644 index 0000000..0f052bc --- /dev/null +++ b/.env/.env.test @@ -0,0 +1,16 @@ +# GENERAL +VITE_ADMIN_EMAIL=anil.natha@jpl.nasa.gov + +# Auth +VITE_AUTH_OAUTH_CLIENT_ID=SET_IN_INTEGRATION_DOT_LOCAL_FILE +VITE_AUTH_OAUTH_REDIRECT_URI=https://dxebrgu0bc9w7.cloudfront.net/dashboard +VITE_AUTH_OAUTH_LOGOUT_ENDPOINT=https://unitysds-test.auth.us-west-2.amazoncognito.com/logout +VITE_AUTH_OAUTH_PROVIDER_URL=https://unitysds-test.auth.us-west-2.amazoncognito.com/oauth2 +VITE_AUTH_APP_ADMIN_GROUP_NAME=Unity_Admin +VITE_AUTH_APP_APP_VIEWER_GROUP_NAME=Unity_Viewer + +# ADS +VITE_ADS_URL=http://uads-test-dockstore-deploy-lb-1762603872.us-west-2.elb.amazonaws.com:9998 + +# SPS +VITE_SPS_WPST_ENDPOINT=https://dxebrgu0bc9w7.cloudfront.net/ades-wpst/ # Via CloudFront \ No newline at end of file diff --git a/package.json b/package.json index 56d5991..dffd017 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "dev": "vite", "build-integration": "tsc && vite build --mode integration --base=/dashboard/", - "build-staging": "tsc && vite build --mode staging --base=/dashboard/", + "build-test": "tsc && vite build --mode test --base=/dashboard/", + "build-sips-test": "tsc && vite build --mode sips-test --base=/unity-sips-test/dashboard/", "build-prod": "tsc && vite build --mode production", "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" From 2e4b03873e13f6812d81973c2015ea3c20b29255 Mon Sep 17 00:00:00 2001 From: Anil Natha Date: Mon, 13 Nov 2023 10:42:44 -0800 Subject: [PATCH 02/40] Renamed panel sizing auto save ID for job monitoring UI so it's unique, will avoid collision with future UIs. --- src/routes/jobs/monitoring/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/jobs/monitoring/index.tsx b/src/routes/jobs/monitoring/index.tsx index 83cdb46..b7b8a2c 100644 --- a/src/routes/jobs/monitoring/index.tsx +++ b/src/routes/jobs/monitoring/index.tsx @@ -152,7 +152,6 @@ function JobMonitoring() { title={ !jobid_param ? "Job Monitoring" : "Job Monitoring — " + jobid_param } description={ !jobid_param ? "Job Monitoring" : "Job Monitoring — " + jobid_param } /> - <>

Job Monitoring

@@ -173,6 +172,7 @@ function JobMonitoring() { +
{ selectedJob && ( From c40a935d77b346d510c636918943a9d10e989c38 Mon Sep 17 00:00:00 2001 From: Anil Natha Date: Mon, 13 Nov 2023 10:44:39 -0800 Subject: [PATCH 03/40] Updated scrolling behavior on job monitoring and new job submission form UIs. Now the navbar remains fixed, and the UIs scroll independently. --- src/index.css | 13 +++++++--- src/routes/jobs/monitoring/index.tsx | 38 +++++++++++++--------------- src/routes/jobs/new/index.tsx | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/index.css b/src/index.css index ff89127..deffccd 100644 --- a/src/index.css +++ b/src/index.css @@ -12,23 +12,30 @@ body { margin: 0; - display: flex; min-width: 320px; min-height: 100vh; } +.viewWrapper { + display: flex; + flex-direction: column; +} + .view { + height: calc(100vh - 48px); padding: 0px; background-color: #F1F2F3; - height: 100%; + flex-grow: 1; } .mainView { + height: 100%; padding: 20px; } .detailView { - width: 200px; + height: 100%; + min-width: 250px; background-color: var(--unity-white); padding: 8px; } \ No newline at end of file diff --git a/src/routes/jobs/monitoring/index.tsx b/src/routes/jobs/monitoring/index.tsx index b7b8a2c..f53752a 100644 --- a/src/routes/jobs/monitoring/index.tsx +++ b/src/routes/jobs/monitoring/index.tsx @@ -152,33 +152,29 @@ function JobMonitoring() { title={ !jobid_param ? "Job Monitoring" : "Job Monitoring — " + jobid_param } description={ !jobid_param ? "Job Monitoring" : "Job Monitoring — " + jobid_param } /> - - <> -

Job Monitoring

- -
-
- -
-
- + +

Job Monitoring

+ +
+ +
{ selectedJob && ( <> - +
Job Details
diff --git a/src/routes/jobs/new/index.tsx b/src/routes/jobs/new/index.tsx index ac3e190..6780656 100644 --- a/src/routes/jobs/new/index.tsx +++ b/src/routes/jobs/new/index.tsx @@ -170,7 +170,7 @@ function NewJob() { title="Create New Job" description="Create a new Job" /> -
+

Create New Job

From cad2c3fae206801d7dbdb9a57c477385029fd75b Mon Sep 17 00:00:00 2001 From: Anil Natha Date: Mon, 13 Nov 2023 11:34:13 -0800 Subject: [PATCH 04/40] Updated CSS class names to follow proper CSS naming conventions. --- src/Root.tsx | 4 ++-- src/index.css | 4 ++-- src/routes/home/index.tsx | 2 +- src/routes/jobs/monitoring/index.tsx | 4 ++-- src/routes/jobs/new/index.tsx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Root.tsx b/src/Root.tsx index 0ce8f18..b63c472 100644 --- a/src/Root.tsx +++ b/src/Root.tsx @@ -13,7 +13,7 @@ import Config from "./Config"; function Root() { return ( - <> +
@@ -24,7 +24,7 @@ function Root() { } />
- +
) } diff --git a/src/index.css b/src/index.css index deffccd..222ad97 100644 --- a/src/index.css +++ b/src/index.css @@ -28,12 +28,12 @@ body { flex-grow: 1; } -.mainView { +.main-view { height: 100%; padding: 20px; } -.detailView { +.detail-view { height: 100%; min-width: 250px; background-color: var(--unity-white); diff --git a/src/routes/home/index.tsx b/src/routes/home/index.tsx index c8ad148..94bf86d 100644 --- a/src/routes/home/index.tsx +++ b/src/routes/home/index.tsx @@ -8,7 +8,7 @@ function Home() { title="Home" description="Home" /> -
+

Home

diff --git a/src/routes/jobs/monitoring/index.tsx b/src/routes/jobs/monitoring/index.tsx index f53752a..8c94542 100644 --- a/src/routes/jobs/monitoring/index.tsx +++ b/src/routes/jobs/monitoring/index.tsx @@ -153,7 +153,7 @@ function JobMonitoring() { description={ !jobid_param ? "Job Monitoring" : "Job Monitoring — " + jobid_param } /> - +

Job Monitoring

@@ -174,7 +174,7 @@ function JobMonitoring() { selectedJob && ( <> - +
Job Details
diff --git a/src/routes/jobs/new/index.tsx b/src/routes/jobs/new/index.tsx index 6780656..5d68645 100644 --- a/src/routes/jobs/new/index.tsx +++ b/src/routes/jobs/new/index.tsx @@ -170,7 +170,7 @@ function NewJob() { title="Create New Job" description="Create a new Job" /> -
+

Create New Job

From ad4977ba044d57177cc5ef61890ec3011111b489 Mon Sep 17 00:00:00 2001 From: Anil Natha Date: Mon, 13 Nov 2023 11:34:28 -0800 Subject: [PATCH 05/40] Fixed scrolling behavior on web view component. --- src/components/WebView/index.css | 6 ++++++ src/components/WebView/index.tsx | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/WebView/index.css b/src/components/WebView/index.css index 9a6f6eb..7444f24 100644 --- a/src/components/WebView/index.css +++ b/src/components/WebView/index.css @@ -1,4 +1,10 @@ .unity-webview { width: 100%; height: 100%; + overflow: auto; +} + +.unity-webview iframe { + width: 100%; + height: 100%; } \ No newline at end of file diff --git a/src/components/WebView/index.tsx b/src/components/WebView/index.tsx index 10cd5b4..0137694 100644 --- a/src/components/WebView/index.tsx +++ b/src/components/WebView/index.tsx @@ -9,8 +9,8 @@ export default function WebView(props:WebViewProps) { const url = props.url; return ( - <> -