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

Added functionality for Locking flows while editing #1588

Merged
merged 6 commits into from
Aug 16, 2021

Conversation

mdshamoon
Copy link
Member

Summary

Added functionality for Locking flows while editing

Test Plan

Added

@codecov
Copy link

codecov bot commented Aug 11, 2021

Codecov Report

Merging #1588 (8bb4115) into master (4a9e496) will decrease coverage by 0.20%.
The diff coverage is 87.50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1588      +/-   ##
==========================================
- Coverage   78.92%   78.72%   -0.21%     
==========================================
  Files         205      205              
  Lines        6791     6811      +20     
  Branches     1418     1422       +4     
==========================================
+ Hits         5360     5362       +2     
- Misses        993     1010      +17     
- Partials      438      439       +1     
Impacted Files Coverage Δ
src/components/floweditor/FlowEditor.tsx 77.84% <84.00%> (+7.50%) ⬆️
src/containers/Flow/FlowList/FlowList.tsx 86.53% <100.00%> (+0.82%) ⬆️
src/graphql/queries/Flow.ts 100.00% <100.00%> (ø)
src/mocks/Flow.tsx 100.00% <100.00%> (ø)
src/containers/Chat/Chat.tsx 34.61% <0.00%> (-21.16%) ⬇️
src/containers/Trigger/Trigger.tsx 77.33% <0.00%> (-16.00%) ⬇️
src/services/AuthService.tsx 57.94% <0.00%> (-6.55%) ⬇️
src/components/simulator/Simulator.tsx 70.85% <0.00%> (-2.29%) ⬇️
src/mocks/Chat.tsx 83.78% <0.00%> (ø)
src/containers/List/List.test.helper.ts 100.00% <0.00%> (ø)
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4a9e496...8bb4115. Read the comment docs.

@cypress
Copy link

cypress bot commented Aug 11, 2021



Test summary

164 0 0 0Flakiness 4


Run details

Project Glific
Status Passed
Commit 09348b1 ℹ️
Started Aug 15, 2021 9:35 PM
Ended Aug 15, 2021 9:56 PM
Duration 21:25 💡
OS Linux Ubuntu - 20.04
Browser Electron 89

View run in Cypress Dashboard ➡️


Flakiness

collection/Collection.spec.ts Flakiness
1 Collection > should delete collection
setting/OrganizationSetting.spec.ts Flakiness
1 Organization Settings > should add default flow
staff/Profile.spec.ts Flakiness
1 Profile > should be disabled: Phone number, status, provider status
template/HSMTemplate.spec.ts Flakiness
1 HSM Template > should load template list

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@mdshamoon mdshamoon marked this pull request as ready for review August 13, 2021 05:41
@mdshamoon mdshamoon self-assigned this Aug 13, 2021
@kurund kurund self-requested a review August 13, 2021 13:28
Copy link
Contributor

@kurund kurund left a comment

Choose a reason for hiding this comment

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

Functionality is working as expected.

src/containers/Flow/FlowList/FlowList.tsx Show resolved Hide resolved
@kurund
Copy link
Contributor

kurund commented Aug 15, 2021

@mdshamoon

We should wait for glific/glific#1694 to merge and then we can merge this PR. Without that, it will break the frontend master floweditor functionality.

@mdshamoon mdshamoon merged commit 35d05f9 into master Aug 16, 2021
@mdshamoon mdshamoon deleted the feature/flow-lock branch August 16, 2021 05:45
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.

Restrict user to open and edit the flow, if any another user is already making the changes in the flow
2 participants