Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(versioning): use version live from #4118

Merged
merged 4 commits into from
Jun 5, 2024
Merged

fix(versioning): use version live from #4118

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66fe89b
Use version live from
matthewelwell Jun 5, 2024
486a620
Update isScheduled
matthewelwell Jun 5, 2024
7f390a3
Fix issue with existing scheduled changes
matthewelwell Jun 5, 2024
052bcf5
Remove code duplication
matthewelwell Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions frontend/web/components/pages/ChangeRequestPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ const ChangeRequestsPage = class extends Component {
const isScheduled =
new Date(changeRequest.feature_states[0].live_from).valueOf() >
new Date().valueOf()
const scheduledDate = moment(changeRequest.feature_states[0].live_from)
const scheduledDate = changeRequest.feature_states
? moment(changeRequest.feature_states[0].live_from)
matthewelwell marked this conversation as resolved.
Show resolved Hide resolved
: moment(changeRequest.environment_feature_versions[0].live_from)

openConfirm({
body: (
Expand Down Expand Up @@ -256,7 +258,9 @@ const ChangeRequestsPage = class extends Component {
new Date(changeRequest.feature_states[0].live_from).valueOf() >
new Date().valueOf()

const scheduledDate = moment(changeRequest.feature_states[0].live_from)
const scheduledDate = changeRequest.feature_states
? moment(changeRequest.feature_states[0].live_from)
: moment(changeRequest.environment_feature_versions[0].live_from)

const approval =
changeRequest &&
Expand Down
Loading