hacks for argoproj#13827

n9 · May 30, 2023 · cadeb85 · cadeb85
1 parent fcb9e18
commit cadeb85
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/ui/src/app/applications/components/application-details/application-details.scss b/ui/src/app/applications/components/application-details/application-details.scss
@@ -8,7 +8,6 @@ $header: 120px;
     height: 100vh;
     width: 100%;
     &__status-panel {
-        position: fixed;
         left: $sidebar-width;
         right: 0;
         z-index: 3;
@@ -28,11 +27,6 @@ $header: 120px;
         padding: 1em;
         overflow-x: auto;
         overflow-y: auto;
-        margin-top: 150px;
-        height: calc(100vh - 2 * 50px - 115px);
-        @media screen and (max-width: map-get($breakpoints, xlarge)) {
-            margin-top: 165px;
-        }
     }
 
     &__sliding-panel-pagination-wrap {
@@ -277,6 +271,11 @@ $header: 120px;
     }
 }
 
+.top-bar__left-side,
+.top-bar__right-side {
+    white-space: normal !important;
+    line-height: 40px;
+}
 
 @media screen and (max-width: map-get($breakpoints, large)) {
 .sliding-panel__body {

diff --git a/ui/src/app/shared/components/page/page.scss b/ui/src/app/shared/components/page/page.scss
@@ -48,6 +48,26 @@
     }
 }
 
+.page {
+    padding-top: 0 !important;
+    height: 100%;
+    overflow: hidden;
+    display: grid;
+    grid-template-rows: min-content 1fr;
+}
+
+.page__top-bar {
+    position: static;
+    height: auto !important;
+}
+
+.page__content-wrapper {
+    display: grid;
+    grid-template-rows: min-content 1fr;
+    height: 100%;
+    min-height: auto !important;
+}
+
 .login-logout-button {
     border-radius: 3px;
     @include themify($themes) {
@@ -76,6 +96,7 @@
 
 .sb-page-wrapper {
     padding-left: $sidebar-width;
+    height: 100%;
 
     &__sidebar-collapsed {
         padding-left: $collapsed-sidebar-width;
@@ -87,6 +108,10 @@
             &__top-bar {
                 left: $collapsed-sidebar-width !important;
             }
+            height: 100%;
+            display: grid;
+            grid-template-rows: min-content 1fr;
+            overflow: hidden;
         }
 
         .application-details__status-panel {

diff --git a/ui/src/app/webpack.config.js b/ui/src/app/webpack.config.js
@@ -11,7 +11,8 @@ console.log(`Bundling in ${isProd ? 'production' : 'development'}...`);
 
 const proxyConf = {
     target: process.env.ARGOCD_API_URL || 'http://localhost:8080',
-    secure: false
+    secure: true,
+    changeOrigin: true,
 };
 
 const config = {

diff --git a/ui/tsconfig.json b/ui/tsconfig.json