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

fix: disable dirty check on exit (DHIS2-11701) #1930

Merged
merged 4 commits into from
Sep 2, 2021
Merged

fix: disable dirty check on exit (DHIS2-11701) #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6fa54
fix: disable dirty check on exit
janhenrikoverland Sep 2, 2021
e3b9734
fix: disable related cypress steps
janhenrikoverland Sep 2, 2021
858a8f1
fix: disable one more place
jenniferarnesen Sep 2, 2021
420493a
fix: a few more tests needing to be disabled
jenniferarnesen Sep 2, 2021
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
18 changes: 9 additions & 9 deletions cypress/integration/edit/edit_dashboard.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Feature: Creating, editing and deleting dashboard
And I click Exit without saving
Then the dashboard displays in view mode

@mutating
Scenario: I cancel exit without saving when name changed
Given I open existing dashboard
When I choose to edit dashboard
And dashboard title is added
And I click Exit without saving
And I decide to continue editing
Then the dashboard displays in edit mode
# @mutating
# Scenario: I cancel exit without saving when name changed
# Given I open existing dashboard
# When I choose to edit dashboard
# And dashboard title is added
# And I click Exit without saving
# And I decide to continue editing
# Then the dashboard displays in edit mode

# @mutating
# Scenario: I cancel exit without saving when item added
Expand All @@ -42,7 +42,7 @@ Feature: Creating, editing and deleting dashboard
When I choose to edit dashboard
And dashboard title is added
And I click Exit without saving
And I confirm I want to discard changes
# And I confirm I want to discard changes
Then the dashboard displays in view mode

@mutating
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/edit/filter_restrict.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Feature: Editing Filter Restrictions
And I add Facility Ownership to selected filters
And I click Confirm
And I click Exit without saving
And I confirm I want to discard changes
# And I confirm I want to discard changes
Then the dashboard displays in view mode
When I choose to edit dashboard
And I click on Filter settings
Expand Down
10 changes: 5 additions & 5 deletions cypress/integration/view/offline.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ Feature: Offline dashboard
When I click Exit without saving
Then the cached dashboard is loaded and displayed in view mode

Scenario: The sharing dialog is open when connectivity is lost
Given I open a cached dashboard
When I open sharing settings
And connectivity is turned off
Then it is not possible to change sharing settings
# Scenario: The sharing dialog is open when connectivity is lost
# Given I open a cached dashboard
# When I open sharing settings
# And connectivity is turned off
# Then it is not possible to change sharing settings

# Scenario: The interpretations panel is open when connectivity is lost
# Given I open a cached dashboard
Expand Down
12 changes: 7 additions & 5 deletions src/pages/edit/ActionsBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ const EditBar = ({ dashboard, ...props }) => {
}

const onConfirmDiscard = () => {
if (props.isDirty) {
setConfirmDiscardDlgIsOpen(true)
} else {
onDiscardConfirmed()
}
// disabling dirty check in 2.37

// if (props.isDirty) {
// setConfirmDiscardDlgIsOpen(true)
// } else {
onDiscardConfirmed()
// }
}

const onDiscardConfirmed = () => {
Expand Down
6 changes: 4 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@
markdown-it "^8.4.2"
prop-types "^15.6.2"

"@dhis2/[email protected]", "@dhis2/d2-ui-sharing-dialog@^7.3.2":
"@dhis2/[email protected]":
version "7.3.2"
resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.3.2.tgz#081cf3fcddb3b0095755263dc241ffda29bf6a85"
integrity sha512-1vywqSJudJFYx5sxXVx+lO3IrApqqQlM2zykWFAcjNElYeYZvBycATk0szTQoJvhCP6M90rMNbuKPpYiTE6BgQ==
Expand Down Expand Up @@ -2522,7 +2522,7 @@
"@dhis2/prop-types" "^1.6.4"
classnames "^2.3.1"

"@dhis2/ui@^6.19.0", "@dhis2/ui@^6.20.0":
"@dhis2/ui@6.20.0", "@dhis2/ui@^6.19.0", "@dhis2/ui@^6.20.0":
version "6.20.0"
resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-6.20.0.tgz#00473fdec2dfb40d351fefcba379cc5f96472311"
integrity sha512-l/ClExMi21FPIEfMg2bCvlLLUOx8r6s+3ZJudkMLtqSZvteZV9BYyPBUr2EyACBrtmwIbwvj71TBfZ3D6wSx8Q==
Expand Down Expand Up @@ -17860,8 +17860,10 @@ watchpack@^1.7.4:
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
dependencies:
chokidar "^3.4.1"
graceful-fs "^4.1.2"
neo-async "^2.5.0"
watchpack-chokidar2 "^2.0.1"
optionalDependencies:
chokidar "^3.4.1"
watchpack-chokidar2 "^2.0.1"
Expand Down