chore: v2 cherry pick (#3555)

* fix: read from env instead of properties (#3535) Signed-off-by: achmelo <[email protected]> * fix: Proper reading OIDC configuration from system environment (#3537) * chore: update oidc login flow schema for v2 (#3540) --------- Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> * chore: upgrade saas Signed-off-by: at670475 <[email protected]> * chore: upgrade dependencies, rollback api-portal changes (#3543) --------- Signed-off-by: Pavel Jares <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: achmelo <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]> * fix issue with swagger Signed-off-by: at670475 <[email protected]> * fix typo Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: achmelo <[email protected]> Signed-off-by: Pablo Hernán Carle <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: Pavel Jares <[email protected]> Co-authored-by: achmelo <[email protected]> Co-authored-by: Pavel Jareš <[email protected]> Co-authored-by: Pablo Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]>
zowe · May 22, 2024 · 3e6e93b · 3e6e93b
1 parent 8d2d3bb
commit 3e6e93b
Show file tree

Hide file tree

Showing 48 changed files with 605 additions and 993 deletions.
diff --git a/.lock b/.lock
diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json
diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json
@@ -43,7 +43,7 @@
         "redux-persist-transform-filter": "0.0.22",
         "redux-thunk": "3.1.0",
         "rxjs": "7.8.1",
-        "sass": "1.71.1",
+        "sass": "1.77.0",
         "stream": "0.0.2",
         "swagger-ui-react": "5.17.5",
         "url": "0.11.3",

diff --git a/api-catalog-ui/frontend/src/assets/images/swagger.png b/api-catalog-ui/frontend/src/assets/images/swagger.png
diff --git a/api-catalog-ui/frontend/src/assets/images/swagger.svg b/api-catalog-ui/frontend/src/assets/images/swagger.svg
diff --git a/api-catalog-ui/frontend/src/assets/images/tutorials.png b/api-catalog-ui/frontend/src/assets/images/tutorials.png
diff --git a/api-catalog-ui/frontend/src/assets/images/tutorials.svg b/api-catalog-ui/frontend/src/assets/images/tutorials.svg
diff --git a/api-catalog-ui/frontend/src/assets/images/usecases.png b/api-catalog-ui/frontend/src/assets/images/usecases.png
diff --git a/api-catalog-ui/frontend/src/assets/images/usecases.svg b/api-catalog-ui/frontend/src/assets/images/usecases.svg
diff --git a/api-catalog-ui/frontend/src/assets/images/videos.png b/api-catalog-ui/frontend/src/assets/images/videos.png
diff --git a/api-catalog-ui/frontend/src/assets/images/videos.svg b/api-catalog-ui/frontend/src/assets/images/videos.svg
diff --git a/api-catalog-ui/frontend/src/assets/images/zowe-horizontal-color.png b/api-catalog-ui/frontend/src/assets/images/zowe-horizontal-color.png
diff --git a/api-catalog-ui/frontend/src/components/App/_app.scss b/api-catalog-ui/frontend/src/components/App/_app.scss
@@ -300,7 +300,7 @@ body {
   }
 
   .content {
-    &, .main-content .dashboard-content {
+    &, .main-content dashboard-content {
       display: flex;
       flex-direction: column;
       overflow: hidden;
@@ -349,7 +349,7 @@ body {
 
       .main-content2 {
         width: 100%;
-        padding: var( --contentTopPadding ) var( --contentRightPadding ) 0 var( --contentLeftPadding );
+        padding: var( --contentTopPadding ) var( --contentRightPadding ) var( --contentBottomPadding ) var( --contentLeftPadding );
         position: relative;
         overflow:auto;
 
@@ -370,11 +370,6 @@ body {
           }
         }
       }//end main-content
-      @media only screen and (min-width: 1362px) {
-        .main-content2 {
-          padding-right: 200px;
-        }
-    }
     }
   }//end content
 
@@ -416,7 +411,7 @@ body {
       font-family: var( --fontFamily00 );
       font-size: var(--spaceLarger);
       font-weight: var( --fontWeightBold);
-      line-height: var( --spaceHuge );
+      line-height: 28px;
       color: var( --text10 );
       text-align: left;
   }
@@ -453,11 +448,6 @@ body {
       border-color: transparent;
     }
   }
-
-  .registered {
-    font-size: 70%;
-    vertical-align: top;
-  }
 }
 
 #ot-sdk-btn.ot-sdk-show-settings, #ot-sdk-btn.optanon-show-settings {

diff --git a/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx b/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.jsx
@@ -203,8 +203,8 @@ export default class Dashboard extends Component {
                                     <div className="empty" />
                                     <h4 className="description-header">Swagger</h4>
                                     <h4 className="description-header">Use Cases</h4>
-                                    <h4 className="description-header">Getting Started</h4>
                                     <h4 className="description-header">Videos</h4>
+                                    <h4 className="description-header">Getting Started</h4>
                                 </div>
                             )}
 

diff --git a/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.test.jsx b/api-catalog-ui/frontend/src/components/Dashboard/Dashboard.test.jsx
@@ -7,7 +7,7 @@
  *
  * Copyright Contributors to the Zowe Project.
  */
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { shallow } from 'enzyme';
 import { describe, expect, it, jest } from '@jest/globals';
@@ -294,26 +294,6 @@ describe('>>> Dashboard component tests', () => {
         expect(productLabel.length).toEqual(0);
     });
 
-    it('should lazily load feedback button component in api portal mode', async () => {
-        process.env.REACT_APP_API_PORTAL = true;
-
-        const { getByText } = render(
-            <Dashboard
-                tiles={null}
-                fetchTilesStart={jest.fn()}
-                fetchTilesStop={jest.fn()}
-                clearService={jest.fn()}
-                clear={jest.fn()}
-                assertAuthorization={jest.fn()}
-                authentication={jest.fn()}
-            />
-        );
-
-        await waitFor(() => {
-            expect(getByText('Feedback Button')).toBeInTheDocument();
-        });
-    });
-
     it('should add fixed-header class and update padding when scrolled below filter height', () => {
         process.env.REACT_APP_API_PORTAL = true;
         const wrapper = shallow(