Merge branch 'master' into sidebar-extensions

argoproj · Oct 3, 2022 · b074bd7 · b074bd7
2 parents 2896533 + 76fe1d5
commit b074bd7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -406,7 +406,7 @@ jobs:
           git config --global user.email "john.doe@example.com"
       - name: Pull Docker image required for tests
         run: |
-          docker pull ghcr.io/dexidp/dex:v2.32.1-distroless
+          docker pull ghcr.io/dexidp/dex:v2.35.0-distroless
           docker pull argoproj/argo-cd-ci-builder:v1.0.0
           docker pull redis:7.0.5-alpine
       - name: Create target directory for binaries in the build-process

diff --git a/manifests/base/dex/argocd-dex-server-deployment.yaml b/manifests/base/dex/argocd-dex-server-deployment.yaml
@@ -37,7 +37,7 @@ spec:
             type: RuntimeDefault
       containers:
       - name: dex
-        image: ghcr.io/dexidp/dex:v2.32.1-distroless
+        image: ghcr.io/dexidp/dex:v2.35.0-distroless
         imagePullPolicy: Always
         command: [/shared/argocd-dex, rundex]
         env:

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -10962,7 +10962,7 @@ spec:
               key: dexserver.disable.tls
               name: argocd-cmd-params-cm
               optional: true
-        image: ghcr.io/dexidp/dex:v2.32.1-distroless
+        image: ghcr.io/dexidp/dex:v2.35.0-distroless
         imagePullPolicy: Always
         name: dex
         ports:

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -1631,7 +1631,7 @@ spec:
               key: dexserver.disable.tls
               name: argocd-cmd-params-cm
               optional: true
-        image: ghcr.io/dexidp/dex:v2.32.1-distroless
+        image: ghcr.io/dexidp/dex:v2.35.0-distroless
         imagePullPolicy: Always
         name: dex
         ports:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -10033,7 +10033,7 @@ spec:
               key: dexserver.disable.tls
               name: argocd-cmd-params-cm
               optional: true
-        image: ghcr.io/dexidp/dex:v2.32.1-distroless
+        image: ghcr.io/dexidp/dex:v2.35.0-distroless
         imagePullPolicy: Always
         name: dex
         ports:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -702,7 +702,7 @@ spec:
               key: dexserver.disable.tls
               name: argocd-cmd-params-cm
               optional: true
-        image: ghcr.io/dexidp/dex:v2.32.1-distroless
+        image: ghcr.io/dexidp/dex:v2.35.0-distroless
         imagePullPolicy: Always
         name: dex
         ports:

diff --git a/ui/src/app/shared/components/version-info/version-info-panel.tsx b/ui/src/app/shared/components/version-info/version-info-panel.tsx
@@ -1,6 +1,7 @@
 import {DataLoader, SlidingPanel, Tooltip} from 'argo-ui';
 import * as React from 'react';
 import {VersionMessage} from '../../models';
+import {services} from '../../services';
 
 interface VersionPanelProps {
     isShown: boolean;
@@ -20,17 +21,23 @@ export class VersionPanel extends React.Component<VersionPanelProps, {copyState:
 
     public render() {
         return (
-            <DataLoader load={() => this.props.version}>
-                {version => {
-                    return (
-                        <SlidingPanel header={this.header} isShown={this.props.isShown} onClose={() => this.props.onClose()} hasCloseButton={true} isNarrow={true}>
-                            <div className='argo-table-list'>{this.buildVersionTable(version)}</div>
-                            <div>
-                                <Tooltip content='Copy all version info as JSON'>{this.getCopyButton(version)}</Tooltip>
-                            </div>
-                        </SlidingPanel>
-                    );
-                }}
+            <DataLoader load={() => services.viewPreferences.getPreferences()}>
+                {pref => (
+                    <DataLoader load={() => this.props.version}>
+                        {version => {
+                            return (
+                                <div className={'theme-' + pref.theme}>
+                                    <SlidingPanel header={this.header} isShown={this.props.isShown} onClose={() => this.props.onClose()} hasCloseButton={true} isNarrow={true}>
+                                        <div className='argo-table-list'>{this.buildVersionTable(version)}</div>
+                                        <div>
+                                            <Tooltip content='Copy all version info as JSON'>{this.getCopyButton(version)}</Tooltip>
+                                        </div>
+                                    </SlidingPanel>
+                                </div>
+                            );
+                        }}
+                    </DataLoader>
+                )}
             </DataLoader>
         );
     }