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

fix: Realtime conflict into Profile page #641

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Conversation

cballevre
Copy link
Member

@cballevre cballevre commented Oct 27, 2023

The document sent by cozy-stack in real time is the CouchDB document. Unlike a call to the JSON Api, the document does not contain the attribute field. When a change was made, it generated a conflict error. I modified the RealTimeQueries so that I could modify the real-time object before integrating it into the cozy-client. This makes it possible to have the same version everywhere and avoid conflicts.

See also: cozy/cozy-client#1412

@Crash-- Crash-- closed this Oct 30, 2023
@Crash-- Crash-- reopened this Oct 30, 2023
The document sent by cozy-stack in real time is the CouchDB document. Unlike a call to the JSON Api, the document does not contain the attribute field. When a change was made, it generated a conflict error. I modified the RealTimeQueries so that I could modify the real-time object before integrating it into the cozy-client. This makes it possible to have the same version everywhere and avoid conflicts.

See also: cozy/cozy-client#1412
@cballevre cballevre marked this pull request as ready for review October 30, 2023 14:05
@bundlemon
Copy link

bundlemon bot commented Oct 30, 2023

BundleMon

Files updated (1)
Status Path Size Limits
app/settings.(hash).js
95.26KB (+549B +0.57%) -
Unchanged files (15)
Status Path Size Limits
vendors/settings.(hash).js
916.61KB -
intents/settings.(hash).js
43.77KB -
img/export-cozy-mail.(hash).svg
27.88KB -
img/import-cozy.(hash).svg
11.28KB -
app-settings.(hash).min.css
9.96KB -
img/double_authent_prez_banner.(hash).svg
4.44KB -
img/protect_data_point.(hash).svg
4.17KB -
img/niv_secu_point.(hash).svg
1.56KB -
intents-settings.(hash).min.css
1.28KB -
img/icon-bills.(hash).svg
719B -
img/icon-laptop.(hash).svg
437B -
img/icon-arrow-left.(hash).svg
419B -
img/icon-question-mark.(hash).svg
379B -
img/icon-check.(hash).svg
367B -
img/icon-phone.(hash).svg
342B -

Total files change +549B +0.05%

Groups updated (1)
Status Path Size Limits
**/*.js
1.03MB (+549B +0.05%) +5%
Unchanged groups (2)
Status Path Size Limits
img/.
51.93KB -
**/*.css
38.86KB +5%

Final result: ✅

View report in BundleMon website ➡️


Current branch size history | Target branch size history

@cballevre cballevre merged commit 272a717 into master Oct 31, 2023
1 check passed
@cballevre cballevre deleted the fix/realtime-conflict branch October 31, 2023 14:27
@cballevre cballevre removed the released label Apr 4, 2024
@cozy cozy deleted a comment from cozy-bot Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants