Merge branch 'mtc-deploy' into mtc-deploy-with-dev

binh-dam-ibigroup · binh-dam-ibigroup · commit ba497703f1c1 · 2025-10-06T09:30:36.000-04:00
diff --git a/lib/manager/components/version/FeedVersionActionsMTC.js b/lib/manager/components/version/FeedVersionActionsMTC.js
@@ -5,10 +5,11 @@ import moment from 'moment'
 import React, { Component } from 'react'
 import { Button, ButtonToolbar, MenuItem } from 'react-bootstrap'
 import { Link } from 'react-router'
+import { connect } from 'react-redux'
 
 import * as versionsActions from '../../actions/versions'
 import { BLOCKING_ERROR_TYPES } from '../../util/version'
-import type { Feed, FeedVersion, FeedVersionSummary, GtfsPlusValidation } from '../../../types'
+import type { Feed, FeedVersion, FeedVersionSummary, GtfsPlusValidation, ServerJob } from '../../../types'
 import type { ManagerUserState } from '../../../types/reducers'
 
 import VersionRetrievalBadge from './VersionRetrievalBadge'
@@ -17,6 +18,7 @@ import VersionSelectorDropdown from './VersionSelectorDropdown'
 export type Props = {
   feedSource: Feed,
   gtfsPlusValidation: GtfsPlusValidation,
+  jobs?: Array<ServerJob>,
   mergeVersions: typeof versionsActions.mergeVersions,
   publishFeedVersion: typeof versionsActions.publishFeedVersion,
   user: ManagerUserState,
@@ -72,7 +74,7 @@ function checkBlockingIssue (version: FeedVersion): boolean {
     !!(errorCounts.find(ec => BLOCKING_ERROR_TYPES.indexOf(ec.type) !== -1))
 }
 
-export default class FeedVersionActionsMTC extends Component<Props> {
+class FeedVersionActionsMTC extends Component<Props> {
   _handleMergeVersion: ((versionId: string) => void) = (versionId: string) => {
     // Note: service period feed merge has only been extensively tested with
     // MTC-specific logic.
@@ -85,6 +87,7 @@ export default class FeedVersionActionsMTC extends Component<Props> {
     const {
       feedSource,
       gtfsPlusValidation,
+      jobs,
       user,
       version
     } = this.props
@@ -106,6 +109,8 @@ export default class FeedVersionActionsMTC extends Component<Props> {
     const end = +moment(summary.endDate)
     const expired = end < now
 
+    const jobsProcessingThisVersion = jobs && jobs.some(job => job.feedVersionId === version.id)
+
     const publishButtonDisabled = !gtfsPlusValidation ||
       hasGtfsPlusBlockingIssue ||
       !gtfsPlusValidation.published ||
@@ -115,7 +120,8 @@ export default class FeedVersionActionsMTC extends Component<Props> {
       hasBlockingIssue ||
       isPublished ||
       processing ||
-      !userCanManageFeed(user, version)
+      !userCanManageFeed(user, version) ||
+      jobsProcessingThisVersion
 
     let publishWarningMessage
     if (hasBlockingIssue || hasGtfsPlusBlockingIssue) {
@@ -185,3 +191,9 @@ export default class FeedVersionActionsMTC extends Component<Props> {
     )
   }
 }
+
+const mapStateToProps = state => ({
+  jobs: state.status.jobMonitor.jobs
+})
+
+export default connect(mapStateToProps)(FeedVersionActionsMTC)
diff --git a/lib/types/index.js b/lib/types/index.js
@@ -1077,6 +1077,7 @@ export type MergeFeedsResult = {
 export type ServerJob = {
   deploymentId: ?string,
   feedSourceId: ?string,
+  feedVersionId: ?string,
   instanceId: ?string,
   jobId: string,
   mergeFeedsResult?: MergeFeedsResult,
