Skip to content
1 change: 1 addition & 0 deletions i18n/english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ components:
feedInfo: Feed Info
issues: Issues
latestVersion: Latest Version
publishState: Publish State
status: Status
FeedSourceTableRow:
dateFormat: MMM D, YYYY
Expand Down
10 changes: 9 additions & 1 deletion lib/manager/components/FeedSourceTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class FeedSourceTable extends PureComponent<Props> {
<h4>{this.messages(`comparisonColumn.${comparisonColumn}`)}</h4>
</th>
}
<th className='feed-version-column top-row' colSpan={3}>
<th className='feed-version-column top-row' colSpan={4}>
<h4>{this.messages('latestVersion')}</h4>
</th>
<th />
Expand Down Expand Up @@ -78,6 +78,14 @@ export default class FeedSourceTable extends PureComponent<Props> {
{this.messages('issues')}
</h4>
</th>
{comparisonColumn && comparisonColumn === 'PUBLISHED' &&
<th className='feed-version-column'>
<h4>
<Icon type='upload' />
{this.messages('publishState')}
</h4>
</th>
}
<th />
</tr>
</thead>
Expand Down
22 changes: 22 additions & 0 deletions lib/manager/components/FeedSourceTableRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
}
}

// eslint-disable-next-line complexity
render () {
const {
comparisonColumn,
Expand Down Expand Up @@ -236,6 +237,11 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
{currentVersionData.endDate}
</td>
<td className='feed-version-column'>{currentVersionData.errorCount}</td>
{comparisonColumn && comparisonColumn === 'PUBLISHED' &&
<td className='feed-version-column'>
<PublishStatus feedSource={feedSource} />
</td>
}
<td>
<FeedActionsDropdown {...this.props} />
</td>
Expand All @@ -247,6 +253,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user: ManagerUserState }> {
messages = getComponentMessages('FeedInfo')

/* eslint-disable complexity */
render () {
const { feedSource, project, user } = this.props

Expand Down Expand Up @@ -365,6 +372,21 @@ class Status extends PureComponent<{
}
}

class PublishStatus extends PureComponent<{
feedSource: Feed
}> {
messages = getComponentMessages('PublishStatus')

render () {
return (
<span className='feed-status status-not-published'>
<Icon type='minus-circle' />
{this.messages('notPublished')}
</span>
)
}
}

class FeedActionsDropdown extends PureComponent<Props> {
messages = getComponentMessages('FeedActionsDropdown')

Expand Down
1 change: 1 addition & 0 deletions lib/manager/components/version/FeedVersionActionsMTC.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class FeedVersionActionsMTC extends Component<Props> {

_onClickPublish: (() => any) = () => this.props.publishFeedVersion(this.props.version)

// eslint-disable-next-line complexity
render (): React$Element<"div"> {
const {
feedSource,
Expand Down
1 change: 0 additions & 1 deletion lib/manager/containers/FeedSourceTableRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import {uploadFeed} from '../actions/versions'
import FeedSourceTableRow from '../components/FeedSourceTableRow'
import {getVersionValidationSummaryByFilterStrategy} from '../util/version'

import type {Feed, Project} from '../../types'
import type {AppState} from '../../types/reducers'

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/util/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ export function projectHasAtLeastOneDeployment (project: ?Project): boolean {
export function projectHasAtLeastOneFeedWithAPublishedVersion (project: ?Project): boolean {
return !!project &&
!!project.feedSources &&
project.feedSources.some(feedSource => feedSource.publishedVersionId)
project.feedSources.some(feedSource => feedSource.latestPublishedVersionId)
}

export function validationState (val: ?boolean): ?string {
Expand Down
Loading