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

Jump to bottom

Add Merge Warning For Externally Merged Feeds #958

Merged
merged 6 commits into from
Jul 4, 2023
Merged

Add Merge Warning For Externally Merged Feeds #958

merged 6 commits into from
Jul 4, 2023

Conversation

philip-cline
Copy link
Contributor

@philip-cline philip-cline commented Jun 27, 2023 •
edited
Loading

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
  • Any modified or new methods or classes have helpful JSDoc and code is thoroughly commented
  • The description lists all applicable issues this PR seeks to resolve
  • The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing

Description

Feeds merged outside of TDM are not recognized as merged feeds within TDM. This PR adds a static message that will be displayed whenever the upload file modal is displayed.

binh-dam-ibigroup
binh-dam-ibigroup approved these changes Jun 29, 2023
View reviewed changes
Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

lib/common/components/SelectFileModal.js Show resolved Hide resolved
lib/common/components/SelectFileModal.js Outdated Show resolved Hide resolved
lib/manager/components/version/FeedVersionNavigator.js Show resolved Hide resolved
miles-grant-ibigroup
miles-grant-ibigroup approved these changes Jul 3, 2023
View reviewed changes
Copy link
Contributor

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working!

lib/common/components/SelectFileModal.js Outdated Show resolved Hide resolved
lib/common/components/SelectFileModal.js Outdated Show resolved Hide resolved
@philip-cline philip-cline merged commit c90f112 into mtc-deploy Jul 4, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@binh-dam-ibigroup binh-dam-ibigroup binh-dam-ibigroup approved these changes

@miles-grant-ibigroup miles-grant-ibigroup miles-grant-ibigroup approved these changes

Assignees

@philip-cline philip-cline

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@philip-cline @binh-dam-ibigroup @miles-grant-ibigroup