Skip to content

Commit d43e53f

Browse files
Prevent operator icons from stretching in operator subscription page
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1669304
1 parent a4ddf42 commit d43e53f

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

frontend/__tests__/components/operator-lifecycle-manager/clusterserviceversion.spec.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ describe(ClusterServiceVersionLogo.displayName, () => {
120120
it('renders logo image from given base64 encoded image string', () => {
121121
const image: ReactWrapper<React.ImgHTMLAttributes<any>> = wrapper.find('img');
122122

123-
expect(image.props().height).toEqual('40');
124-
expect(image.props().width).toEqual('40');
125123
expect(image.props().src).toEqual(`data:${testClusterServiceVersion.spec.icon.mediatype};base64,${testClusterServiceVersion.spec.icon.base64data}`);
126124
});
127125

@@ -130,8 +128,6 @@ describe(ClusterServiceVersionLogo.displayName, () => {
130128
const fallbackImg: ReactWrapper<React.ImgHTMLAttributes<any>> = wrapper.find('img');
131129

132130
expect(fallbackImg.props().src).toEqual(operatorLogo);
133-
expect(fallbackImg.props().height).toEqual('40');
134-
expect(fallbackImg.props().width).toEqual('40');
135131
});
136132

137133
it('renders ClusterServiceVersion name and provider from given spec', () => {

frontend/public/components/catalog/_catalog.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ $catalog-item-icon-size-sm: 24px;
8686
max-width: $catalog-item-icon-size-sm;
8787

8888
&[src$=".svg"] {
89-
height: $catalog-item-icon-size-sm;
89+
width: $catalog-item-icon-size-sm;
9090
}
9191

9292
&--large {
9393
max-height: $catalog-item-icon-size-lg;
9494
max-width: $catalog-item-icon-size-lg;
9595

9696
&[src$=".svg"] {
97-
height: $catalog-item-icon-size-lg;
97+
width: $catalog-item-icon-size-lg;
9898
}
9999
}
100100
}

frontend/public/components/operator-lifecycle-manager/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,11 @@ export const referenceForProvidedAPI = (desc: CRDDescription | APIServiceDefinit
240240

241241
export const ClusterServiceVersionLogo: React.SFC<ClusterServiceVersionLogoProps> = (props) => {
242242
const {icon, displayName, provider, version} = props;
243+
const imgSrc = _.isEmpty(icon) ? operatorLogo : `data:${icon.mediatype};base64,${icon.base64data}`;
243244

244245
return <div className="co-clusterserviceversion-logo">
245-
<div className="co-clusterserviceversion-logo__icon">{ _.isEmpty(icon)
246-
? <img src={operatorLogo} height="40" width="40" />
247-
: <img src={`data:${icon.mediatype};base64,${icon.base64data}`} height="40" width="40" /> }
246+
<div className="co-clusterserviceversion-logo__icon">
247+
<img className="co-catalog-item-icon__img co-catalog-item-icon__img--large" src={imgSrc} />
248248
</div>
249249
<div className="co-clusterserviceversion-logo__name">
250250
<h1 className="co-clusterserviceversion-logo__name__clusterserviceversion">{displayName}</h1>

0 commit comments

Comments
 (0)