HEEDLS-585 Welcome emails - Filter #596

ibrahimmunir14 · 2021-09-14T16:19:22Z

JIRA link

HEEDLS-585

Description

Add filter and select/deselect all functionality to Send Welcome Emails page.

Screenshots

With JS

No JS

Developer checks

I have:

Run the formatter and made sure there are no IDE errors.
Written tests for the changes (controller, data services, services, view models etc) and manually tested my work with and without JavaScript. Full manual testing guidelines can be found here: https://softwiretech.atlassian.net/wiki/spaces/HEE/pages/6703648740/Testing
Updated/added documentation in Swiki and/or Readme.
Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken.
Scanned over my own MR to ensure everything is as expected.

…FilterAndPaginate Make searching, sorting and pagination individually controllable just like filtering.

Before fetching AllEmailDelegateItems, get the selected items on the page and send them to the AllEmailDelegateItems endpoint as a query parameter so the results are pre-checked.

If there is an error on Index POST, set FilterBy on the model before returning the view

No non-JS functionality yet

This reverts commit 4f5a07b.

AlexJacksonDS

Some questions and things to possibly change

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EmailDelegatesController.cs

DigitalLearningSolutions.Web/ViewModels/Common/SearchablePage/BaseSearchablePageViewModel.cs

DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts

DigitalLearningSolutions.Web/Scripts/trackingSystem/emailDelegates.ts

…rite tests

…setting FilterBy

AlexJacksonDS

Looks good, just a couple of very minor formatting issues to fix while resolving the merge conflict.

...ingSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EmailDelegatesControllerTests.cs

DigitalLearningSolutions.Web/ViewModels/Common/SearchablePage/BaseSearchablePageViewModel.cs

stellake

First round - haven't check the JS yet and only skim read the tests :)

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EmailDelegates/Index.cshtml

...b/ViewModels/TrackingSystem/Delegates/EmailDelegates/EmailDelegatesViewModelFilterOptions.cs

...gSolutions.Web/ViewModels/TrackingSystem/Delegates/EmailDelegates/EmailDelegatesViewModel.cs

...utions.Web/ViewModels/TrackingSystem/Delegates/EmailDelegates/EmailDelegatesItemViewModel.cs

...ons.Web/ViewModels/TrackingSystem/Delegates/EmailDelegates/AllEmailDelegateItemsViewModel.cs

DigitalLearningSolutions.Web/Helpers/FilteringHelper.cs

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EmailDelegatesController.cs

...Web.Tests/ViewModels/TrackingSystem/Delegates/EmailDelegates/EmailDelegatesViewModelTests.cs

DigitalLearningSolutions.Web/Scripts/trackingSystem/emailDelegates.ts

stellake

Looks good! 👍

ibrahimmunir14 added 13 commits September 8, 2021 10:56

HEEDLS-585 Move delegate item checkbox into partial

75b457d

HEEDLS-585 Implement no-JS filtering on EmailDelegates page

5683c3c

HEEDLS-585 Write tests for EmailDelegates Controller, VM and Filters

55c0ba4

HEEDLS-585 Add search/sort/paginationEnabled parameters to searchSort…

6b0c3ea

…FilterAndPaginate Make searching, sorting and pagination individually controllable just like filtering.

HEEDLS-585 Implement JS filtering on EmailDelegates page

0d800a1

HEEDLS-585 Keep track of selected delegates (JS) when submitting form

f52e506

Before fetching AllEmailDelegateItems, get the selected items on the page and send them to the AllEmailDelegateItems endpoint as a query parameter so the results are pre-checked.

HEEDLS-585 Keep track of selected filters (JS) when submitting form

c9d190b

If there is an error on Index POST, set FilterBy on the model before returning the view

HEEDLS-585 Add separate action for confirmation

4f5a07b

HEEDLS-585 TS Lint

93fa314

HEEDLS-585 Add Select/Deselect buttons with JS functionality

91b504c

No non-JS functionality yet

HEEDLS-585 Implement Select/Deselect All with no-JS functionality

1c4a437

HEEDLS-585 Hide select/deselect buttons if no delegates found

d330349

Revert "HEEDLS-585 Add separate action for confirmation"

a0a217e

This reverts commit 4f5a07b.

AlexJacksonDS reviewed Sep 15, 2021

View reviewed changes

ibrahimmunir14 added 4 commits September 15, 2021 13:49

HEEDLS-585 Extract GetFilterBy function; use in Email/AllDelegates; w…

fb9b3d0

…rite tests

HEEDLS-585 Make search/sort/filter/paginateEnabled parameters required

0bef066

HEEDLS-585 Remove sortEnabled parameter and always do sorting

d9be401

HEEDLS-585 Run linter and change function declaration style

ae31d34

ibrahimmunir14 force-pushed the HEEDLS-585-welcome-emails-filter branch from 2402ef9 to ae31d34 Compare September 15, 2021 17:13

ibrahimmunir14 requested a review from AlexJacksonDS September 15, 2021 17:22

HEEDLS-585 Create new VM on POST error and set form data, instead of …

757e9ac

…setting FilterBy

AlexJacksonDS approved these changes Sep 16, 2021

View reviewed changes

...ingSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EmailDelegatesControllerTests.cs Outdated Show resolved Hide resolved

DigitalLearningSolutions.Web/ViewModels/Common/SearchablePage/BaseSearchablePageViewModel.cs Outdated Show resolved Hide resolved

Merge branch 'master' into HEEDLS-585-welcome-emails-filter

f78b3a0

stellake reviewed Sep 20, 2021

View reviewed changes

ibrahimmunir14 added 6 commits September 21, 2021 12:00

HEEDLS-585 Review markups - renaming

585871a

HEEDLS-585 Pull out common DelegatesVMFilterOptions helper functions

42eb95f

HEEDLS-585 Pull out common GetCustomPromptOptions helper function

e73006a

HEEDLS-585 Review markups - early exit and renaming

be1fdf1

Merge branch 'master' into HEEDLS-585-welcome-emails-filter

e9a0c0d

HEEDLS-585 Use new SearchSortFilter changes

c585514

stellake reviewed Sep 21, 2021

View reviewed changes

DigitalLearningSolutions.Web/Scripts/trackingSystem/emailDelegates.ts Outdated Show resolved Hide resolved

stellake reviewed Sep 21, 2021

View reviewed changes

DigitalLearningSolutions.Web/Scripts/trackingSystem/emailDelegates.ts Outdated Show resolved Hide resolved

stellake reviewed Sep 21, 2021

View reviewed changes

DigitalLearningSolutions.Web/Scripts/trackingSystem/emailDelegates.ts Show resolved Hide resolved

ibrahimmunir14 added 4 commits September 21, 2021 18:00

HEEDLS-585 Rename PreChecked to IsDelegateSelected

c312653

HEEDLS-585 JS formatting

676ca04

HEEDLS-585 Specify index for each element in selectedIds query param

7a0a17c

Merge branch 'master' into HEEDLS-585-welcome-emails-filter

94f174f

stellake approved these changes Sep 22, 2021

View reviewed changes

ibrahimmunir14 merged commit fe10808 into master Sep 22, 2021

stellake deleted the HEEDLS-585-welcome-emails-filter branch September 24, 2021 09:41

HEEDLS-585 Welcome emails - Filter #596

HEEDLS-585 Welcome emails - Filter #596

Uh oh!

Conversation

ibrahimmunir14 commented Sep 14, 2021

JIRA link

Description

Screenshots

Developer checks

Uh oh!

AlexJacksonDS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexJacksonDS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

stellake left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stellake left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants