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.

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

Fixed false-conflict and added error handling for no changes made #493

Merged
merged 3 commits into from
Jun 23, 2023

Conversation

kintsoogi
Copy link
Contributor

@kintsoogi kintsoogi commented Jun 22, 2023

Describe what your pull request addresses

Test Instructions

  • Edit any card in the deploy preview
  • Click save
  • Make another edit to the same card
  • Click save
  • Verify that update status button is not showing a conflict (see picture below)

image

  • Open the hamburger menu and merge changes and verify that changes are merged and user branch is deleted

Copy link
Contributor

@PhotoNomad0 PhotoNomad0 left a comment

Choose a reason for hiding this comment

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

Good work cleaning up the code and sorting through the hazards!

Just waiting for you to publish and update translation-helps-rcl

package.json Outdated
@@ -54,7 +54,7 @@
"single-scripture-rcl": "3.4.4",
"tailwindcss": "^2.0.4",
"tc-ui-toolkit": "5.3.3",
"translation-helps-rcl": "3.4.2",
"translation-helps-rcl": "3.4.3-beta",
Copy link
Contributor

Choose a reason for hiding this comment

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

Good work cleaning up the code and sorting through the hazards!

Just waiting for you to publish and update translation-helps-rcl

@codecov
Copy link

codecov bot commented Jun 23, 2023

Codecov Report

Merging #493 (3ab4505) into develop (7c211a6) will not change coverage.
The diff coverage is 10.00%.

@@           Coverage Diff            @@
##           develop     #493   +/-   ##
========================================
  Coverage    50.83%   50.83%           
========================================
  Files           43       43           
  Lines         1314     1314           
========================================
  Hits           668      668           
  Misses         646      646           
Impacted Files Coverage Δ
src/components/ResourceCard.js 68.31% <0.00%> (ø)
src/hooks/useMergeCardsProps.js 73.01% <28.57%> (-1.59%) ⬇️

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@PhotoNomad0 PhotoNomad0 left a comment

Choose a reason for hiding this comment

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

LGTM

@PhotoNomad0 PhotoNomad0 merged commit d3acb0f into develop Jun 23, 2023
@delete-merged-branch delete-merged-branch bot deleted the bugfix-kintsoogi-491-doubleSave branch June 23, 2023 21:49
kintsoogi added a commit that referenced this pull request Sep 29, 2023
* Fixed false-conflict and added error handling for no changes made

* updated tHelps version

* darn tootin yarn locks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants