Prevent bulk finalization on instances with save points #5766

seadowg · 2023-10-05T12:18:18Z

What has been done to verify that this works as intended?

New tests

Why is this the best possible solution? Were any other approaches considered?

Not a lot to discuss here! Was very simple given the we are just failing to finalise for instances with save points.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

Just checking the feature is implemented as described should be enough here. If there are any ideas around ways to break it then feel free to play around with that as well though!

Before submitting this PR, please make sure you have:

run ./gradlew checkAll and confirmed all checks still pass OR confirm CircleCI build passes and run ./gradlew connectedDebugAndroidTest locally.
verified that any code or assets from external sources are properly credited in comments and/or in the about file.
verified that any new UI elements use theme colors. UI Components Style guidelines

seadowg · 2023-10-06T10:11:56Z

collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt

@@ -450,6 +455,25 @@ abstract class Page<T : Page<T>> {
        return this as T
    }

+    fun <D : Page<D>?> killAndReopenApp(destination: D): D {


This is copied over from master.

seadowg · 2023-10-06T10:12:57Z

collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryUseCases.kt

@@ -62,6 +66,17 @@ object FormEntryUseCases {
        )
    }

+    fun getSavePoint(formController: FormController, cacheDir: File): File? {


We should be able to use this in other places we grab save point files, but I'll leave out that refactor for the moment to avoid the risk of merge conflicts that it'd introduce.

srujner · 2023-10-09T11:56:03Z

Is this correct that now all forms in the Drafts tab has status "incomplete"?
No matter if it contains error or not.

seadowg · 2023-10-09T12:02:01Z

@srujner yes because #5760 hasn't merged yet so forms don't get validated when they're saved as draft and nothing is marked "complete".

srujner · 2023-10-09T12:04:00Z

@seadowg So shouldn't we start testing this PR after merging #5760?

seadowg · 2023-10-09T12:07:49Z

@srujner it's definitely possible to test it without that merging, but I do agree that it's going to be far less confusing so let's go with that.

dbemke · 2023-10-10T12:33:14Z

What is the state of a form with a save point which was opened and the changes were discarded? If I follow the steps from the AC and then open the form (with save point) and discard changes it’s possible to finalize it by "Finalize all forms”. Does the state of the form change if the changes were discarded?

Steps to reproduce:

Fill a form (without any questions with validation) and save it as a draft.
Go to Drafts and open the form.
Go to the settings and change the theme of the app.
Go back to Drafts and open the form.
Tap the device back button and discard changes.
Tap "Finalize all forms”.

seadowg · 2023-10-10T13:02:03Z

What is the state of a form with a save point which was opened and the changes were discarded?

The save point will be deleted won't it? So it should finalize successfully.

dbemke · 2023-10-10T13:06:08Z

It is. Ahhh I get it.. so opening and discarding changes the form with a save point "removes the save point" and the introduced changes in a save point

dbemke · 2023-10-10T15:23:46Z

Tested with Success!

Verified on device with Android 10

Verified cases:

steps from Acceptance Criteria
finalizing via "Finalize all" forms forms with save points with/without questions with validation
save points after going to project settings and after killing the app
saveIncomplete and saveIcomplete form with a required question
discarding changes form a save point and finilzing the form
don’t keep activities enabled/disabled

srujner · 2023-10-10T15:24:05Z

Tested with Success!

Verified on device with Android 13

Prevent bulk finalization on instances with save points

seadowg changed the base branch from master to v2023.3.x October 5, 2023 12:54

seadowg commented Oct 6, 2023

View reviewed changes

seadowg marked this pull request as ready for review October 6, 2023 10:22

seadowg mentioned this pull request Oct 6, 2023

Validate drafts when saved from end screen #5760

Merged

3 tasks

seadowg requested a review from grzesiek2010 October 9, 2023 09:27

grzesiek2010 approved these changes Oct 9, 2023

View reviewed changes

grzesiek2010 added the needs testing label Oct 9, 2023

seadowg force-pushed the save-point-bulk-finalize branch 2 times, most recently from 8cf7659 to 38e65f9 Compare October 10, 2023 09:10

Fail to finalize instances with save points

5169805

seadowg force-pushed the save-point-bulk-finalize branch from 38e65f9 to 5169805 Compare October 10, 2023 09:38

srujner added behavior verified and removed needs testing labels Oct 10, 2023

seadowg merged commit eaac576 into getodk:v2023.3.x Oct 10, 2023
6 checks passed

seadowg deleted the save-point-bulk-finalize branch October 10, 2023 15:24

seadowg added a commit to seadowg/collect that referenced this pull request Oct 18, 2023

Merge pull request getodk#5766 from seadowg/save-point-bulk-finalize

bf5f014

Prevent bulk finalization on instances with save points

seadowg added a commit to seadowg/collect that referenced this pull request Oct 24, 2023

Merge pull request getodk#5766 from seadowg/save-point-bulk-finalize

3367eff

Prevent bulk finalization on instances with save points

seadowg added a commit to seadowg/collect that referenced this pull request Oct 30, 2023

Merge pull request getodk#5766 from seadowg/save-point-bulk-finalize

3aca465

Prevent bulk finalization on instances with save points

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent bulk finalization on instances with save points #5766

Prevent bulk finalization on instances with save points #5766

seadowg commented Oct 5, 2023 •

edited

Loading

seadowg Oct 6, 2023

seadowg Oct 6, 2023

srujner commented Oct 9, 2023

seadowg commented Oct 9, 2023

srujner commented Oct 9, 2023

seadowg commented Oct 9, 2023

dbemke commented Oct 10, 2023

seadowg commented Oct 10, 2023

dbemke commented Oct 10, 2023 •

edited

Loading

dbemke commented Oct 10, 2023

srujner commented Oct 10, 2023

Prevent bulk finalization on instances with save points #5766

Prevent bulk finalization on instances with save points #5766

Conversation

seadowg commented Oct 5, 2023 • edited Loading

What has been done to verify that this works as intended?

Why is this the best possible solution? Were any other approaches considered?

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

Before submitting this PR, please make sure you have:

seadowg Oct 6, 2023

Choose a reason for hiding this comment

seadowg Oct 6, 2023

Choose a reason for hiding this comment

srujner commented Oct 9, 2023

seadowg commented Oct 9, 2023

srujner commented Oct 9, 2023

seadowg commented Oct 9, 2023

dbemke commented Oct 10, 2023

seadowg commented Oct 10, 2023

dbemke commented Oct 10, 2023 • edited Loading

dbemke commented Oct 10, 2023

srujner commented Oct 10, 2023

seadowg commented Oct 5, 2023 •

edited

Loading

dbemke commented Oct 10, 2023 •

edited

Loading