Skip to content

Commit d1c485b

Browse files
authored
Ccs-4183-bugfixes2 (#602)
* address UI issue on Pre-live url * use icon and tooltip when product version metata is missing for the pre-live url
1 parent 7d0e7f0 commit d1c485b

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

pantheon-bundle/frontend/src/app/contentDisplay.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from "react"
2-
import { CopyIcon } from "@patternfly/react-icons";
2+
import { CopyIcon, InfoCircleIcon } from "@patternfly/react-icons";
33
import {
4-
Card, Text, TextContent, TextVariants, Level, LevelItem, Button, Divider, Title
4+
Card, Text, TextContent, TextVariants, Level, LevelItem, Button, Divider, Title, Tooltip
55
} from "@patternfly/react-core"
66

77
import { Versions } from "@app/versions"
@@ -119,8 +119,7 @@ class ContentDisplay extends Component<any, IModuleDisplayState | IAssemblyDispl
119119
</LevelItem>
120120
<LevelItem />
121121
<LevelItem>
122-
{this.state.lastPublishDate.trim() !== "" && this.state.lastPublishDate !== "-"
123-
&& this.state.variantUUID !== ""
122+
{this.state.variantUUID !== ""
124123
&& this.state.portalUrl !== ""
125124
&& this.state.portalUrlType === "LIVE"
126125
&& <span><a href={this.state.portalUrl} target="_blank">View on Customer Portal <i className="fa pf-icon-arrow" /></a> </span>
@@ -132,8 +131,7 @@ class ContentDisplay extends Component<any, IModuleDisplayState | IAssemblyDispl
132131
}
133132
</LevelItem>
134133
<LevelItem>
135-
{this.state.lastPublishDate.trim() !== "" && this.state.lastPublishDate !== "-"
136-
&& this.state.variantUUID !== ""
134+
{this.state.variantUUID !== ""
137135
&& this.state.portalUrl !== ""
138136
&& this.state.portalUrlType === "LIVE"
139137
&& <span><a id="permanentURL" onClick={this.copyToClipboard} onMouseLeave={this.mouseLeave}>Copy permanent URL <CopyIcon /></a></span>
@@ -146,7 +144,7 @@ class ContentDisplay extends Component<any, IModuleDisplayState | IAssemblyDispl
146144
{this.state.variantUUID !== ""
147145
&& this.state.portalUrl !== ""
148146
&& this.state.portalUrlType === "ERROR"
149-
&& <span>No URL; {this.state.portalUrl}</span>
147+
&& <span><div><Tooltip position="top" content={<div>NO URL; {this.state.portalUrl}</div>}><InfoCircleIcon /></Tooltip></div></span>
150148
}
151149

152150
<span>&emsp;{this.state.copySuccess !== "" && this.state.copySuccess}</span>

0 commit comments

Comments
 (0)