feat: Dashboard now displaying name, specRef and weight in the experi…

…mental step. (#1863) feat: Dashboard now displaying name, specRef and weight in the experimental step. (#1863) Signed-off-by: Alexander Matyushentsev <[email protected]>
argoproj · Mar 7, 2022 · acf8054 · acf8054
1 parent 4d95f6a
commit acf8054
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 3 deletions.
diff --git a/ui/src/app/components/rollout/rollout.scss b/ui/src/app/components/rollout/rollout.scss
@@ -76,6 +76,49 @@
             border: 2px solid $sherbert;
         }
 
+        &-title {
+            padding-left: 16px;
+            padding-right: 16px;
+            margin: 0 -16px;
+            &--experiment {
+                padding-bottom: 8px;
+                border-bottom: 1px solid $argo-color-gray-6;
+            }
+        }
+
+        &__content {
+            margin-left: -16px;
+            margin-right: -16px;
+            max-height: 160px;
+            overflow-y: auto;
+
+            &-body {
+                padding: 8px 16px;
+            }
+
+            &-header {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            &-title {
+                padding-top: 8px;
+                padding-bottom: 4px;
+                font-size: 14px;
+            }
+
+            &-value {
+                font-weight: 600;
+                padding-bottom: 4px;
+                border-bottom: 1px solid $argo-color-gray-4;
+                &:last-child {
+                    padding-bottom: -8px;
+                    border-bottom: none;
+                }
+            }
+        }
+
         &:hover > &__background {
             transform: scale(1.02);
         }

diff --git a/ui/src/app/components/rollout/rollout.tsx b/ui/src/app/components/rollout/rollout.tsx
@@ -3,7 +3,13 @@ import * as React from 'react';
 import {Helmet} from 'react-helmet';
 import {Key, KeybindingContext} from 'react-keyhooks';
 import {useHistory, useParams} from 'react-router-dom';
-import {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1CanaryStep, RolloutReplicaSetInfo, RolloutRolloutInfo, RolloutServiceApi} from '../../../models/rollout/generated';
+import {
+    GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1CanaryStep,
+    GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate,
+    RolloutReplicaSetInfo,
+    RolloutRolloutInfo,
+    RolloutServiceApi,
+} from '../../../models/rollout/generated';
 import {RolloutInfo} from '../../../models/rollout/rollout';
 import {NamespaceContext, RolloutAPIContext} from '../../shared/context/api';
 import {useWatchRollout} from '../../shared/services/rollout';
@@ -12,6 +18,7 @@ import {RolloutStatus, StatusIcon} from '../status-icon/status-icon';
 import {ContainersWidget} from './containers';
 import {Revision, RevisionWidget} from './revision';
 import './rollout.scss';
+import {Fragment} from 'react';
 
 const RolloutActions = React.lazy(() => import('../rollout-actions/rollout-actions'));
 export interface ImageInfo {
@@ -266,6 +273,7 @@ const parseDuration = (duration: string): string => {
 };
 
 const Step = (props: {step: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1CanaryStep; complete?: boolean; current?: boolean; last?: boolean}) => {
+    const [openedTemplate, setOpenedTemplate] = React.useState('');
     let icon: string;
     let content = '';
     let unit = '';
@@ -297,10 +305,52 @@ const Step = (props: {step: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1
     return (
         <React.Fragment>
             <EffectDiv className={`steps__step ${props.complete ? 'steps__step--complete' : ''} ${props.current ? 'steps__step--current' : ''}`}>
-                <i className={`fa ${icon}`} /> {content}
-                {unit}
+                <div className={`steps__step-title ${props.step.experiment ? 'steps__step-title--experiment' : ''}`}>
+                    <i className={`fa ${icon}`} /> {content}
+                    {unit}
+                </div>
+                {props.step.experiment?.templates && (
+                    <div className='steps__step__content'>
+                        {props.step.experiment?.templates.map((template) => {
+                            return <ExperimentWidget key={template.name} template={template} opened={openedTemplate === template.name} onToggle={setOpenedTemplate} />;
+                        })}
+                    </div>
+                )}
             </EffectDiv>
             {!props.last && <ThemeDiv className='steps__connector' />}
         </React.Fragment>
     );
 };
+
+const ExperimentWidget = ({
+    template,
+    opened,
+    onToggle,
+}: {
+    template: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate;
+    opened: boolean;
+    onToggle: (name: string) => void;
+}) => {
+    const icon = opened ? 'fa-chevron-circle-up' : 'fa-chevron-circle-down';
+    return (
+        <EffectDiv className='steps__step__content-body'>
+            <ThemeDiv className={`steps__step__content-header ${opened ? 'steps__step__content-value' : ''}`}>
+                {template.name}
+                <ThemeDiv onClick={() => onToggle(opened ? '' : template.name)}>
+                    <i className={`fa ${icon}`} />
+                </ThemeDiv>
+            </ThemeDiv>
+            {opened && (
+                <EffectDiv>
+                    <div className='steps__step__content-title'>SPECREF</div>
+                    <div className='steps__step__content-value'>{template.specRef}</div>
+                    {template.weight && (
+                        <Fragment>
+                            <div className='steps__step__content-title'>WEIGHT</div> <div className='steps__step__content-value'>{template.weight}</div>
+                        </Fragment>
+                    )}
+                </EffectDiv>
+            )}
+        </EffectDiv>
+    );
+};
diff --git a/ui/src/models/rollout/generated/api.ts b/ui/src/models/rollout/generated/api.ts
@@ -867,6 +867,12 @@ export interface GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExpe
      * @memberof GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate
      */
     replicas?: number;
+     /**
+     * 
+     * @type {number}
+     * @memberof GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate
+     */
+    weight?: number;
     /**
      * 
      * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1PodTemplateMetadata}