class User < ApplicationRecord
CLDC-3116 Create homepage (#2113)
* feat: add blank homepage, update routing and tests
* feat: add welcome message and thoroughly test routing
* refactor: lint
* feat: update tests
* CLDC-3076: Make example dates consistent (#2107)
* CLDC-3076: Make example dates consistent
* Use example date even when some hint text provided already
* Temp remove some date restrictions
* Update to 2 line breaks
* Revert "Temp remove some date restrictions"
This reverts commit cd7f18f9f10957be0cbabee7665c0abe4239acb6.
* Fix lettings log accessor in date question (#2117)
* Fix lettings log accessor in date question
* Remove hardcoded date example from mrcdate question (#2118)
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
* CLDC-3061 Add guidance page (#2121)
* Add guidance page
* Link to guidance from start page
* feat: test home/start paths explicitly
* CLDC-2253 Add collection resources (#2120)
* Update collection resources, add to homepage
* Add guidance link to an empty page
* Update headings
* Rebase fix
* Update title
* Update file names
* Add section break
* CLDC-2593 Add upcoming deadlines section (#2119)
* Add upcoming deadlines section
* Update the content to use the correct dates
* Update content
* lint
* typos
* CLDC-2252 Add homepage task section (#2115)
* feat: wip add lettings, sales and schemes sections with correct text, counts, links and colouring
* feat: add flex styling to match designs
* CLDC-3076: Make example dates consistent (#2107)
* CLDC-3076: Make example dates consistent
* Use example date even when some hint text provided already
* Temp remove some date restrictions
* Update to 2 line breaks
* Revert "Temp remove some date restrictions"
This reverts commit cd7f18f9f10957be0cbabee7665c0abe4239acb6.
* Fix lettings log accessor in date question (#2117)
* Fix lettings log accessor in date question
* Remove hardcoded date example from mrcdate question (#2118)
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
* feat: update breakpoints for responsive layout changes
* lint: use hash lookup where possible
* lint: erblinting
* feat: improve formatting
* Reuse govuk grid
* Revert "Reuse govuk grid"
This reverts commit 8c71f5d9edf261802a8a86e07c13552f51283668.
* feat: test home page data boxes
* refactor: lint
* refactor: lint
* feat: test link behaviour is correct in all user scenarios
* refactor: lint
* feat: update tests
* feat: combine task, resources, deadlines sections
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Co-authored-by: Kat <kosiak.katrina@gmail.com>
* CLDC-2255 Add homepage notifications (#2131)
* feat: add notification table
* feat: add notification banner, use unread gem for notification management
* feat: add notifications page and remove unread_notification.rb
* feat: add blank homepage, update routing and tests
* feat: add welcome message and thoroughly test routing
* refactor: lint
* feat: update tests
* CLDC-3061 Add guidance page (#2121)
* Add guidance page
* Link to guidance from start page
* feat: test home/start paths explicitly
* feat: add notification table
* feat: add notification banner, use unread gem for notification management
* feat: add notifications page and remove unread_notification.rb
* feat: default p tag around sanitized page content
* feat: add active scope
* feat: use newest active unread/unauthenticated notification and update start page
* feat: add tests of notification behaviour and routing and refactor
* refactor: lint
* feat: update Gemfile.lock
* feat: add timestamps to readmark table
* feat: update gemfile.lock
* refactor: lint
* feat: test notifications page doesn't show notifications and code simplification
* feat: move notification helper methods to notifications_helper.rb
---------
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
* feat: clear all no-status filters on in progress links
* CLDC-2590 Add about this service section (#2124)
* Add about core section
* Move about core to the correct spot on start page
* Update content
* Add some margins
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Co-authored-by: Kat <kosiak.katrina@gmail.com>
12 months ago
acts_as_reader
# Include default devise modules. Others available are:
# :omniauthable
devise :database_authenticatable , :recoverable , :rememberable ,
:trackable , :lockable , :two_factor_authenticatable , :confirmable , :timeoutable
# Marked as optional because we validate organisation_id below instead so that
# the error message is linked to the right field on the form
belongs_to :organisation , optional : true
has_many :legacy_users
has_many :bulk_uploads
validates :name , presence : true
validates :email , presence : true
validates :email , uniqueness : { allow_blank : true , case_sensitive : true , if : :will_save_change_to_email? }
validates :email , format : { with : Devise . email_regexp , allow_blank : true , if : :will_save_change_to_email? }
validates :password , presence : { if : :password_required? }
validates :password , length : { within : Devise . password_length , allow_blank : true }
validates :password , confirmation : { if : :password_required? }
validates :phone_extension , format : { with : / \ A \ d+ \ z / , allow_blank : true , message : I18n . t ( " validations.numeric.format " , field : " " ) }
after_validation :send_data_protection_confirmation_reminder , if : :is_dpo_changed?
validates :organisation_id , presence : true
validate :organisation_not_merged
has_paper_trail ignore : %w[ last_sign_in_at
current_sign_in_at
current_sign_in_ip
last_sign_in_ip
failed_attempts
unlock_token
locked_at
reset_password_token
reset_password_sent_at
remember_created_at
sign_in_count
updated_at ]
has_one_time_password ( encrypted : true )
auto_strip_attributes :name , squish : true
ROLES = {
data_provider : 1 ,
data_coordinator : 2 ,
support : 99 ,
} . freeze
LOG_REASSIGNMENT = {
reassign_all : " Yes, change the stock owner and the managing agent " ,
reassign_stock_owner : " Yes, change the stock owner but keep the managing agent the same " ,
reassign_managing_agent : " Yes, change the managing agent but keep the stock owner the same " ,
unassign : " No, unassign the logs " ,
} . freeze
enum role : ROLES
scope :search_by_name , - > ( name ) { where ( " users.name ILIKE ? " , " % #{ name } % " ) }
scope :search_by_email , - > ( email ) { where ( " email ILIKE ? " , " % #{ email } % " ) }
scope :filter_by_active , - > { where ( active : true ) }
scope :search_by , - > ( param ) { search_by_name ( param ) . or ( search_by_email ( param ) ) }
scope :sorted_by_organisation_and_role , - > { joins ( :organisation ) . order ( " organisations.name " , role : :desc , name : :asc ) }
scope :filter_by_status , lambda { | statuses , _user = nil |
filtered_records = all
scopes = [ ]
statuses . each do | status |
status = status == " active " ? " active_status " : status
status = status == " unconfirmed " ? " not_signed_in " : status
if respond_to? ( status , true )
scopes << send ( status )
end
end
if scopes . any?
filtered_records = filtered_records . merge ( scopes . reduce ( & :or ) )
end
filtered_records
}
scope :not_signed_in , - > { where ( last_sign_in_at : nil , active : true ) }
scope :deactivated , - > { where ( active : false ) }
scope :active_status , - > { where ( active : true ) . where . not ( last_sign_in_at : nil ) }
scope :visible , lambda { | user = nil |
if user && ! user . support?
where ( discarded_at : nil , organisation : user . organisation . child_organisations + [ user . organisation ] )
else
where ( discarded_at : nil )
end
}
attr_accessor :log_reassignment
def lettings_logs
if support?
LettingsLog . all
else
LettingsLog . filter_by_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
end
def sales_logs
if support?
SalesLog . all
else
SalesLog . filter_by_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
end
def owned_lettings_logs
LettingsLog . filter_by_owning_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
def managed_lettings_logs
LettingsLog . filter_by_managing_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
def owned_sales_logs
SalesLog . filter_by_owning_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
def managed_sales_logs
SalesLog . filter_by_managing_organisation ( organisation . absorbed_organisations + [ organisation ] )
end
def schemes
if support?
Scheme . all
else
Scheme . filter_by_owning_organisation ( organisation . absorbed_organisations + [ organisation ] + organisation . parent_organisations )
end
end
def is_key_contact?
is_key_contact
end
def is_key_contact!
update ( is_key_contact : true )
end
def is_data_protection_officer?
is_dpo
end
def is_data_protection_officer!
update! ( is_dpo : true )
end
def deactivate! ( reactivate_with_organisation : false )
update! (
active : false ,
confirmed_at : nil ,
sign_in_count : 0 ,
initial_confirmation_sent : false ,
reactivate_with_organisation : ,
unconfirmed_email : nil ,
)
end
def reactivate!
update! (
active : true ,
reactivate_with_organisation : false ,
)
end
MFA_TEMPLATE_ID = " 6bdf5ee1-8e01-4be1-b1f9-747061d8a24c " . freeze
RESET_PASSWORD_TEMPLATE_ID = " 2c410c19-80a7-481c-a531-2bcb3264f8e6 " . freeze
CONFIRMABLE_TEMPLATE_ID = " 3fc2e3a7-0835-4b84-ab7a-ce51629eb614 " . freeze
RECONFIRMABLE_TEMPLATE_ID = " bcdec787-f0a7-46e9-8d63-b3e0a06ee455 " . freeze
Cldc 1226 deactivate users (#624)
* CLDC-1195: remove access keys
* 🤏 content fixes (#539)
* Remove ??
* Set hhmemb to totadult and tchild sum if hhmemb is not given (#540)
* Set hhmemb to totadult and tchild sum if hhmemb is not given
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* lint
* update method
* calculate hhmemb from details provided
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* Fix condition affects question (illness type)
* map tshortfall value (#543)
* Make case log status rely on subsection status so they can't get out of sync
* Fix complete case log fixture
* Fix Reason preference reason and lettings allocation answer option import
* don't route to hbrentshortfall if hb is 7 (#544)
* Age known believe import fixes (#545)
* amend fixture to make test fail
* fix failing test
* lint fixes
* Enable dynamically dependent answer options
* Refactor ecstat age check
* Dry depends on evaluation
* Derive major repairs for import
* Add white other
* Set major repair date
* Majorrepairs will never match
* Rubocop
* Cldc 1149 radio buttons filter (#548)
* radio button
* radio button again
* rubocop versioning issue fixed
* linux and darwin
* Fix Gemfile
* rubocop
* erb lint
Co-authored-by: baarkerlounger <db@slothlife.xyz>
* Set tshortfall to 0 if it should exists but is not provided (#550)
* Set tshortfall to 0 if it should exists but is not provided
* check if tshortfall is overridden
* Save correct la if postcode is invalid (#551)
* Allow illness type to be refused (#553)
* Radio button on log filter is now preset to "All" (#552)
* Radio button on log filter is now preset to "All"
* lint fixes
* removed instance @ variable
* CLDC-744-joint-tenancy-validation (#549)
* add joint tenancy validation
* fix validation and spec
* improvements
* updates
* lint fixes
* fix typo
* change message displayed on hhmemb page
* Add docs dir to dockerignore and cfignore (#555)
* Add files via upload (#554)
Adding Delta Discovery file
* Improve DB seeding (#556)
* Improve DB seeding
* Don't seed LA Rent Ranges in test
* Add navigation items helper
* Fix specs and linters
* Works but helper is hard to test
* add check to prevent error on hhmemb if joint is nil (#560)
* add failing spec
* add check to prevent error on hhmemb if joint is nil
* Refactor for testability
* Spec nav bar highlighting from user perspective
* CLDC-1218: Fix hbrentshortfall import (#558)
* Infer hbrentshortfall not known if tshortfall not provided and overridden
* Reorder import
* Referral can be internal for homeless (#561)
* Set case log ID offset at export (#562)
* Make tshortfall optional based on hidden tshortfall_known question (#563)
* Make tshortfall optional based on hidden tshortfall_known question
* Add test for optional
* Add test for JSON derived and dependent on false options
* Test routing
* Fix optionality
* Inactive users (#564)
* Allow users to be marked as inactive
* Import inactive users
* add missing field to seeded user for dev env
* Map joint tenancy field (#565)
* Use rake task to send onboarding emails (#566)
* Use rake task to send onboarding emails
* Wrap host lookup so it's easily stubbable
* Rake task can be called outside the rails environment so need to pass host in
* Not part of the usual app flow so contain to rake task
* Including routes helper in a rake task is a rabbit hole
* Use ENV var rather than param for host
* Sort case log index table by most recent by default (#567)
* Add sheltered accom field (#568)
* Remove needs type question until we support supported housing logs (#569)
* Fix routing for tshortfall (#571)
* Fix routing for tshortfall
* HB 7 and 8 don't exist in 22/23 anymore
* Add visiblly hidden change link text for details known questions
* Fix repeated use of Password in error summary (and use smart quotes)
* Make logs link less ambiguous
* Cldc 1217 retirement soft validation (#570)
* Interruption screen refactor
* Add test for retirement_age_for_person
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
* Rubocop
* update 22-23 form
* fix failures
* lint fixes
* remove whitespace
* remove commented code
* make spec file use translations instead of content
* update content
* lint fixes
* fix typo
* fix question wording
* fix failing spec
* add full stop
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* Hide inactive users and allow support users to view all users (#576)
* Hide inactive users and allow support users to view all users
* Enable support users to invite users to any organisation
* Add pagination to user views
* Update config/locales/devise.en.yml
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
* remove letting_in_sheltered_accomodation field (#577)
* remove letting_in_sheltered_accomodation field
This field is now duplicated by the shelteredaccom field
* lint fixes
* fix all failing specs
* Generisize pagination links
* CLDC-1101: Case log filter by organisation (#522)
* Rename org filter
* Ensure filters work when ID is passed
* UI init
* Lint
* Fix filter nesting
* Reduce width
* Set checked status of filters correctly
* Test filter presence
* Add filter test
* Rubocop
* Tweak styles for autocomplete within filter
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1224: Tenancy type and tenancy length (#578)
* Fix value mapping for tenancy type 22/23
* Update secure helper
* Null safe
* Spec update
* Update mandatory
* Use helper
* Remove joint tenancy hitn text and add don't know option (#579)
* Export improvements (#581)
* improved export - set start point for reference
* remove completed status from exports
* Added exception handling to export
* Improved tests, replaced rescue block with Sentry
Co-authored-by: Kat <katrina@madetech.com>
* Update logs table column heading to say ‘Status’, not ‘Completed’
* Show ‘Data protection officer’ and/or ‘Key contact’ tags in users table
* Update heading, label and hint text for user details
* Fix organisation filter (#582)
* Filter values correctly
* Remove filter value if hidden
* Return empty string rather than nil for accessible autocomplete
* Additional test for accessible automcomplete defaulting
* Add status tag helper
* Add missing ‘or’ divider on joint tenancy question
* Use dash not hyphen in answer options
* CLDC-1118: Implement data export structure (CDS) (#587)
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* CLDC-1217: Retirement soft validation (#586)
* Don't trigger soft validation if tenant prefers not to say
* Update gender content
* Fix spec description
* Enable support users to download user details (#589)
* Enable support users to download user details
* Download all users
* Rubocop
* Preload organisations to remove n+1 queries
* Confirmable (#580)
* Confirmable
* Remove obsolete rake task
* Skip confirmation for inactive users
* Send beta onboarding template if migrated from Softwire
* Default controller
* Use correct link
* Redirect confirmation to set password
* Confirm account within 3 days
* Only redirect to set password if not previously set
* Rubocop
* Confirm factory bot users
* Set password condition
* Changing email requires reconfirming
* No need to explicitly trigger email, devise does that for us now
* Remove flash banner
* Mock notify
* Mock in the right spec
* Test redirect and text
* User is confirmable
* Rubocop
* Redirect to url so we don't bypass authenticity token
* Update content
* Add test for resend invite flow
* Update link to resend confirmation email
* Rename password reset resend confirmation partial
* Expired link error page
* Remove resend confirmation link
* Update seed
* Expory contact
* Time zone
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* Attempt at fixing S3 error when saving Zip file (#590)
* Enable better other field validation labels
* Removing gaps caused by empty exports (#591)
* Add Sentry instrumentation (#593)
* Avoid NoMethodError when Sentry is not initialised
* Instrument collection_start_year
* Removes Sentry custom instrumentation
* test for user being in dev env not being asked for 2fa
* code for user being in dev env not being asked for 2fa
* pulled out of support person context, this should work for any user in dev env
* rubocop
* matching wording
* only support user atm need 2fa, so making this explicit
* Perf (#592)
* Memoize start year
* Reset
* Recalculate rather than reset
* Fix heisenspec (order independent array comparison) (#596)
* Redirect confirmed users to sign in
* Add support for CSV export (#598)
* Cldc 1102 admin organisations page (#557)
* Get all organisations in controller
* Display organisations data in the table
* Route to logs for specific organisation
* add tests
* update spec
* lint fixes
* set up failing test for organisation logs page
* fix failing test
* write test for organisations support user page
* Update a organisation page test and lint
* added pagination test with next and previous links and total count for support user
* test for pagination in organisations title
* Added "Organisations" to to organisations page title
* add pagination test for organisations page 2, remove second before block
* Add the remaining pagination tests
* Redirect when accessing organisation logs by non support user
* Test for displaying logs for specific organisation
* Add test for org name
* Add a failing log filter test for specific org
* Extract filter methods into a helper
* Allow logs filtering for specific org
* Fix test, support user was creating an extra org, remove orgs filter for specific org
* Remove redundant test, lint
* Reuse primary navigation component and add sub navigation for support users
* allow support users edit or and add sub navigation to about this org
* allow support users to access the edit org page
* only allow to edit existing editable fields
* display correct values in the organisations table
* allow support user to update org
* user table component for organisations table
* use guard clause for organisation logs page
* remove create a new lettings log from organisation logs
* Move case logs filter from helpers to modules
* lint erb
* yarn lint
* bring back if statement in logs controller
* update modules import
* let!
* test for links first in the org cotroller spec
* interpolate number of orgs
* conditionally render sub navigation
Co-authored-by: Kat <katrina@madetech.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
Co-authored-by: JG <moarpheus@gmail.com>
* Bump nokogiri from 1.13.5 to 1.13.6 (#601)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.5 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.5...v1.13.6)
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CLDC-1124: User search (#600)
* Add search by name for users
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Search is now non case sensitive
* Made search work for data co-ordinators
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Refactored to scope
* Added search by email
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* WIP Commit - added test for if search term matches a name and an email address simultaneously. Also changed search result caption for organisations to display "Matches X of Y users"
* Rubocop
* Preload org
* Linting
* Refactor filtered_users into module
* Only adjust query param if searched
* Add data coordinator tests
* Add table caption spec
* Dupe attribute
* Refactor into Search ViewComponent
* Rubocop
* Unit test user scopes
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Use dedicated styles for each navigation component
* Use dedicated styles for each navigation component
* Use simpler markup for table captions
* Use table component for logs list
* Correct markup for user and organisation tables
* Email allowlist (#603)
* Email allowlist
* Set rails master key in deploy pipelines
* CLDC-1258: Handle invalid void date during import (#604)
* Now we raise an exception if a non-existing organisation is referenced by a case log
* The void date is not imported if it is after the tenancy start date
* make organisations list page default view for support user login (#605)
* Use seperate components for primary and sub navigation
* Add LA org mapping
* Rubocop
* User search fixes (#607)
* Update query message
* Add clear search link
* Set input value
* Use gem component
* Move to list partial pattern
* Partial path
* Update spec
* Rubocop
* Unit test filter module
* Rubocop
* Add search result to page title if searched
* Add missing horizontal rule
* Use form_group attributes for search input
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1225: At import updates relationship to child when a person is under 16 (#609)
* Organisation search (#610)
* Add search to organisations
* Fix title
* Spec page title
* Don't seed org in test
* Handles unicode characters in postcode (#612)
* CSV download only includes users in search result
* Updates exported fields based on May 25th feedback (#613)
* Cldc 1223 pregnancy soft validations (#602)
* update hard validation limits for pregnancy age, remove hard validation if there are no females at all
* Add soft validations for pregnancy
* make the error message consistent
* Only check the values for the members with details known in the household
* Show interruption screen when resident details are updated
* Route back to check answers after an interruption screen and back to previous page if no is selected on the interruption screen
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* update validation messages
* fix a test
* fix a typo
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Avoid variable number of columns during CSV export (#614)
* CLDC-1277: no route matches bug (#615)
* don't display the save and go to the next incomplete section button if it errors 🤷♀️
* use 2022/23c fixture for in the test
* Allow support users and data coordinators to toggle active users
* Add a link to deactivate page
* add deactivate page
* Show if user is deactivated and fix form
* Show deactivated user in the user list
* Show reactivate user link for deactivated users
* add reactivate user page
* Refactor
* remove unused method, route and lint
* fix routes
* Only allow active users to log in
* Add flash banner for successful toggle, fix styles
* FIx more styling
* prevent editing deactivated user
* lint
* reset confirmed_at, password and sign in count when deactivated. Send reactivation email if user has previously logged in
* Use dash not hyphen in confirmation page button and links
* Content: Deactivate/reactivate account, not the user
* Send confirmation email to both, old and new email addresses
* Add possessive gem for names formatting
* Use hidden input field for active value
* lint
* Only send beta onboarding emails if the user hasn't previously logged in
* Don't clear the password for deactivated user
* refactor sending confirmation emails
Co-authored-by: kiddhustle <kiddhustle@wiardweb.com>
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Co-authored-by: baarkerlounger <db@slothlife.xyz>
Co-authored-by: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com>
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
Co-authored-by: Dushan <47317567+dushan-madetech@users.noreply.github.com>
Co-authored-by: Ted-U <92022120+Ted-U@users.noreply.github.com>
Co-authored-by: sona-mhclg <77793209+sona-mhclg@users.noreply.github.com>
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: JG <moarpheus@gmail.com>
Co-authored-by: J G <7750475+moarpheus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
3 years ago
USER_REACTIVATED_TEMPLATE_ID = " ac45a899-490e-4f59-ae8d-1256fc0001f9 " . freeze
FOR_OLD_EMAIL_CHANGED_BY_OTHER_USER_TEMPLATE_ID = " 3eb80517-1051-4dfc-b4cc-cb18228a3829 " . freeze
FOR_NEW_EMAIL_CHANGED_BY_OTHER_USER_TEMPLATE_ID = " 0cdd0be1-7fa5-4808-8225-ae4c5a002352 " . freeze
ORGANISATION_UPDATE_TEMPLATE_ID = " 4b7716c0-cc5c-41dd-92e4-a0dff03bdf5e " . freeze
def reset_password_notify_template
RESET_PASSWORD_TEMPLATE_ID
end
def confirmable_template
Cldc 1226 deactivate users (#624)
* CLDC-1195: remove access keys
* 🤏 content fixes (#539)
* Remove ??
* Set hhmemb to totadult and tchild sum if hhmemb is not given (#540)
* Set hhmemb to totadult and tchild sum if hhmemb is not given
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* lint
* update method
* calculate hhmemb from details provided
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* Fix condition affects question (illness type)
* map tshortfall value (#543)
* Make case log status rely on subsection status so they can't get out of sync
* Fix complete case log fixture
* Fix Reason preference reason and lettings allocation answer option import
* don't route to hbrentshortfall if hb is 7 (#544)
* Age known believe import fixes (#545)
* amend fixture to make test fail
* fix failing test
* lint fixes
* Enable dynamically dependent answer options
* Refactor ecstat age check
* Dry depends on evaluation
* Derive major repairs for import
* Add white other
* Set major repair date
* Majorrepairs will never match
* Rubocop
* Cldc 1149 radio buttons filter (#548)
* radio button
* radio button again
* rubocop versioning issue fixed
* linux and darwin
* Fix Gemfile
* rubocop
* erb lint
Co-authored-by: baarkerlounger <db@slothlife.xyz>
* Set tshortfall to 0 if it should exists but is not provided (#550)
* Set tshortfall to 0 if it should exists but is not provided
* check if tshortfall is overridden
* Save correct la if postcode is invalid (#551)
* Allow illness type to be refused (#553)
* Radio button on log filter is now preset to "All" (#552)
* Radio button on log filter is now preset to "All"
* lint fixes
* removed instance @ variable
* CLDC-744-joint-tenancy-validation (#549)
* add joint tenancy validation
* fix validation and spec
* improvements
* updates
* lint fixes
* fix typo
* change message displayed on hhmemb page
* Add docs dir to dockerignore and cfignore (#555)
* Add files via upload (#554)
Adding Delta Discovery file
* Improve DB seeding (#556)
* Improve DB seeding
* Don't seed LA Rent Ranges in test
* Add navigation items helper
* Fix specs and linters
* Works but helper is hard to test
* add check to prevent error on hhmemb if joint is nil (#560)
* add failing spec
* add check to prevent error on hhmemb if joint is nil
* Refactor for testability
* Spec nav bar highlighting from user perspective
* CLDC-1218: Fix hbrentshortfall import (#558)
* Infer hbrentshortfall not known if tshortfall not provided and overridden
* Reorder import
* Referral can be internal for homeless (#561)
* Set case log ID offset at export (#562)
* Make tshortfall optional based on hidden tshortfall_known question (#563)
* Make tshortfall optional based on hidden tshortfall_known question
* Add test for optional
* Add test for JSON derived and dependent on false options
* Test routing
* Fix optionality
* Inactive users (#564)
* Allow users to be marked as inactive
* Import inactive users
* add missing field to seeded user for dev env
* Map joint tenancy field (#565)
* Use rake task to send onboarding emails (#566)
* Use rake task to send onboarding emails
* Wrap host lookup so it's easily stubbable
* Rake task can be called outside the rails environment so need to pass host in
* Not part of the usual app flow so contain to rake task
* Including routes helper in a rake task is a rabbit hole
* Use ENV var rather than param for host
* Sort case log index table by most recent by default (#567)
* Add sheltered accom field (#568)
* Remove needs type question until we support supported housing logs (#569)
* Fix routing for tshortfall (#571)
* Fix routing for tshortfall
* HB 7 and 8 don't exist in 22/23 anymore
* Add visiblly hidden change link text for details known questions
* Fix repeated use of Password in error summary (and use smart quotes)
* Make logs link less ambiguous
* Cldc 1217 retirement soft validation (#570)
* Interruption screen refactor
* Add test for retirement_age_for_person
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
* Rubocop
* update 22-23 form
* fix failures
* lint fixes
* remove whitespace
* remove commented code
* make spec file use translations instead of content
* update content
* lint fixes
* fix typo
* fix question wording
* fix failing spec
* add full stop
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* Hide inactive users and allow support users to view all users (#576)
* Hide inactive users and allow support users to view all users
* Enable support users to invite users to any organisation
* Add pagination to user views
* Update config/locales/devise.en.yml
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
* remove letting_in_sheltered_accomodation field (#577)
* remove letting_in_sheltered_accomodation field
This field is now duplicated by the shelteredaccom field
* lint fixes
* fix all failing specs
* Generisize pagination links
* CLDC-1101: Case log filter by organisation (#522)
* Rename org filter
* Ensure filters work when ID is passed
* UI init
* Lint
* Fix filter nesting
* Reduce width
* Set checked status of filters correctly
* Test filter presence
* Add filter test
* Rubocop
* Tweak styles for autocomplete within filter
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1224: Tenancy type and tenancy length (#578)
* Fix value mapping for tenancy type 22/23
* Update secure helper
* Null safe
* Spec update
* Update mandatory
* Use helper
* Remove joint tenancy hitn text and add don't know option (#579)
* Export improvements (#581)
* improved export - set start point for reference
* remove completed status from exports
* Added exception handling to export
* Improved tests, replaced rescue block with Sentry
Co-authored-by: Kat <katrina@madetech.com>
* Update logs table column heading to say ‘Status’, not ‘Completed’
* Show ‘Data protection officer’ and/or ‘Key contact’ tags in users table
* Update heading, label and hint text for user details
* Fix organisation filter (#582)
* Filter values correctly
* Remove filter value if hidden
* Return empty string rather than nil for accessible autocomplete
* Additional test for accessible automcomplete defaulting
* Add status tag helper
* Add missing ‘or’ divider on joint tenancy question
* Use dash not hyphen in answer options
* CLDC-1118: Implement data export structure (CDS) (#587)
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* CLDC-1217: Retirement soft validation (#586)
* Don't trigger soft validation if tenant prefers not to say
* Update gender content
* Fix spec description
* Enable support users to download user details (#589)
* Enable support users to download user details
* Download all users
* Rubocop
* Preload organisations to remove n+1 queries
* Confirmable (#580)
* Confirmable
* Remove obsolete rake task
* Skip confirmation for inactive users
* Send beta onboarding template if migrated from Softwire
* Default controller
* Use correct link
* Redirect confirmation to set password
* Confirm account within 3 days
* Only redirect to set password if not previously set
* Rubocop
* Confirm factory bot users
* Set password condition
* Changing email requires reconfirming
* No need to explicitly trigger email, devise does that for us now
* Remove flash banner
* Mock notify
* Mock in the right spec
* Test redirect and text
* User is confirmable
* Rubocop
* Redirect to url so we don't bypass authenticity token
* Update content
* Add test for resend invite flow
* Update link to resend confirmation email
* Rename password reset resend confirmation partial
* Expired link error page
* Remove resend confirmation link
* Update seed
* Expory contact
* Time zone
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* Attempt at fixing S3 error when saving Zip file (#590)
* Enable better other field validation labels
* Removing gaps caused by empty exports (#591)
* Add Sentry instrumentation (#593)
* Avoid NoMethodError when Sentry is not initialised
* Instrument collection_start_year
* Removes Sentry custom instrumentation
* test for user being in dev env not being asked for 2fa
* code for user being in dev env not being asked for 2fa
* pulled out of support person context, this should work for any user in dev env
* rubocop
* matching wording
* only support user atm need 2fa, so making this explicit
* Perf (#592)
* Memoize start year
* Reset
* Recalculate rather than reset
* Fix heisenspec (order independent array comparison) (#596)
* Redirect confirmed users to sign in
* Add support for CSV export (#598)
* Cldc 1102 admin organisations page (#557)
* Get all organisations in controller
* Display organisations data in the table
* Route to logs for specific organisation
* add tests
* update spec
* lint fixes
* set up failing test for organisation logs page
* fix failing test
* write test for organisations support user page
* Update a organisation page test and lint
* added pagination test with next and previous links and total count for support user
* test for pagination in organisations title
* Added "Organisations" to to organisations page title
* add pagination test for organisations page 2, remove second before block
* Add the remaining pagination tests
* Redirect when accessing organisation logs by non support user
* Test for displaying logs for specific organisation
* Add test for org name
* Add a failing log filter test for specific org
* Extract filter methods into a helper
* Allow logs filtering for specific org
* Fix test, support user was creating an extra org, remove orgs filter for specific org
* Remove redundant test, lint
* Reuse primary navigation component and add sub navigation for support users
* allow support users edit or and add sub navigation to about this org
* allow support users to access the edit org page
* only allow to edit existing editable fields
* display correct values in the organisations table
* allow support user to update org
* user table component for organisations table
* use guard clause for organisation logs page
* remove create a new lettings log from organisation logs
* Move case logs filter from helpers to modules
* lint erb
* yarn lint
* bring back if statement in logs controller
* update modules import
* let!
* test for links first in the org cotroller spec
* interpolate number of orgs
* conditionally render sub navigation
Co-authored-by: Kat <katrina@madetech.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
Co-authored-by: JG <moarpheus@gmail.com>
* Bump nokogiri from 1.13.5 to 1.13.6 (#601)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.5 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.5...v1.13.6)
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CLDC-1124: User search (#600)
* Add search by name for users
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Search is now non case sensitive
* Made search work for data co-ordinators
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Refactored to scope
* Added search by email
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* WIP Commit - added test for if search term matches a name and an email address simultaneously. Also changed search result caption for organisations to display "Matches X of Y users"
* Rubocop
* Preload org
* Linting
* Refactor filtered_users into module
* Only adjust query param if searched
* Add data coordinator tests
* Add table caption spec
* Dupe attribute
* Refactor into Search ViewComponent
* Rubocop
* Unit test user scopes
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Use dedicated styles for each navigation component
* Use dedicated styles for each navigation component
* Use simpler markup for table captions
* Use table component for logs list
* Correct markup for user and organisation tables
* Email allowlist (#603)
* Email allowlist
* Set rails master key in deploy pipelines
* CLDC-1258: Handle invalid void date during import (#604)
* Now we raise an exception if a non-existing organisation is referenced by a case log
* The void date is not imported if it is after the tenancy start date
* make organisations list page default view for support user login (#605)
* Use seperate components for primary and sub navigation
* Add LA org mapping
* Rubocop
* User search fixes (#607)
* Update query message
* Add clear search link
* Set input value
* Use gem component
* Move to list partial pattern
* Partial path
* Update spec
* Rubocop
* Unit test filter module
* Rubocop
* Add search result to page title if searched
* Add missing horizontal rule
* Use form_group attributes for search input
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1225: At import updates relationship to child when a person is under 16 (#609)
* Organisation search (#610)
* Add search to organisations
* Fix title
* Spec page title
* Don't seed org in test
* Handles unicode characters in postcode (#612)
* CSV download only includes users in search result
* Updates exported fields based on May 25th feedback (#613)
* Cldc 1223 pregnancy soft validations (#602)
* update hard validation limits for pregnancy age, remove hard validation if there are no females at all
* Add soft validations for pregnancy
* make the error message consistent
* Only check the values for the members with details known in the household
* Show interruption screen when resident details are updated
* Route back to check answers after an interruption screen and back to previous page if no is selected on the interruption screen
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* update validation messages
* fix a test
* fix a typo
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Avoid variable number of columns during CSV export (#614)
* CLDC-1277: no route matches bug (#615)
* don't display the save and go to the next incomplete section button if it errors 🤷♀️
* use 2022/23c fixture for in the test
* Allow support users and data coordinators to toggle active users
* Add a link to deactivate page
* add deactivate page
* Show if user is deactivated and fix form
* Show deactivated user in the user list
* Show reactivate user link for deactivated users
* add reactivate user page
* Refactor
* remove unused method, route and lint
* fix routes
* Only allow active users to log in
* Add flash banner for successful toggle, fix styles
* FIx more styling
* prevent editing deactivated user
* lint
* reset confirmed_at, password and sign in count when deactivated. Send reactivation email if user has previously logged in
* Use dash not hyphen in confirmation page button and links
* Content: Deactivate/reactivate account, not the user
* Send confirmation email to both, old and new email addresses
* Add possessive gem for names formatting
* Use hidden input field for active value
* lint
* Only send beta onboarding emails if the user hasn't previously logged in
* Don't clear the password for deactivated user
* refactor sending confirmation emails
Co-authored-by: kiddhustle <kiddhustle@wiardweb.com>
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Co-authored-by: baarkerlounger <db@slothlife.xyz>
Co-authored-by: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com>
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
Co-authored-by: Dushan <47317567+dushan-madetech@users.noreply.github.com>
Co-authored-by: Ted-U <92022120+Ted-U@users.noreply.github.com>
Co-authored-by: sona-mhclg <77793209+sona-mhclg@users.noreply.github.com>
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: JG <moarpheus@gmail.com>
Co-authored-by: J G <7750475+moarpheus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
3 years ago
if last_sign_in_at . present? && ( unconfirmed_email . blank? || unconfirmed_email == email )
USER_REACTIVATED_TEMPLATE_ID
elsif initial_confirmation_sent && ! confirmed?
RECONFIRMABLE_TEMPLATE_ID
else
CONFIRMABLE_TEMPLATE_ID
end
end
def send_confirmation_instructions
return unless active?
super
update! ( initial_confirmation_sent : true )
end
def need_two_factor_authentication? ( _request )
return false if Rails . env . development?
return false if Rails . env . review?
support?
end
def send_two_factor_authentication_code ( code )
template_id = MFA_TEMPLATE_ID
personalisation = { otp : code }
DeviseNotifyMailer . new . send_email ( email , template_id , personalisation )
end
def assignable_roles
if Rails . env . staging? && in_staging_role_update_email_allowlist?
return ROLES
end
return { } unless data_coordinator? || support?
return ROLES if support?
ROLES . except ( :support )
end
def in_staging_role_update_email_allowlist?
Rails . application . credentials [ :staging_role_update_email_allowlist ] . include? ( email . split ( " @ " ) . last . downcase )
end
def logs_filters ( specific_org : false )
if ( support? && ! specific_org ) || organisation . has_managing_agents? || organisation . has_stock_owners?
%w[ years status needstypes assigned_to user owning_organisation managing_organisation bulk_upload_id user_text_search owning_organisation_text_search managing_organisation_text_search ]
else
%w[ years status needstypes assigned_to user bulk_upload_id user_text_search ]
end
end
def scheme_filters ( specific_org : false )
if ( support? && ! specific_org ) || organisation . has_managing_agents? || organisation . has_stock_owners?
%w[ status owning_organisation owning_organisation_text_search ]
else
%w[ status ]
end
end
def bulk_uploads_filters ( specific_org : false )
return [ ] unless support? && ! specific_org
%w[ user years uploaded_by uploading_organisation user_text_search uploading_organisation_text_search ]
end
delegate :name , to : :organisation , prefix : true
def self . download_attributes
%w[ id email name organisation_name role old_user_id is_dpo is_key_contact active sign_in_count last_sign_in_at ]
end
def self . to_csv
CSV . generate ( headers : true ) do | csv |
csv << download_attributes
all . find_each do | record |
csv << download_attributes . map { | attr | record . public_send ( attr ) }
end
end
end
Cldc 1226 deactivate users (#624)
* CLDC-1195: remove access keys
* 🤏 content fixes (#539)
* Remove ??
* Set hhmemb to totadult and tchild sum if hhmemb is not given (#540)
* Set hhmemb to totadult and tchild sum if hhmemb is not given
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* lint
* update method
* calculate hhmemb from details provided
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
* Fix condition affects question (illness type)
* map tshortfall value (#543)
* Make case log status rely on subsection status so they can't get out of sync
* Fix complete case log fixture
* Fix Reason preference reason and lettings allocation answer option import
* don't route to hbrentshortfall if hb is 7 (#544)
* Age known believe import fixes (#545)
* amend fixture to make test fail
* fix failing test
* lint fixes
* Enable dynamically dependent answer options
* Refactor ecstat age check
* Dry depends on evaluation
* Derive major repairs for import
* Add white other
* Set major repair date
* Majorrepairs will never match
* Rubocop
* Cldc 1149 radio buttons filter (#548)
* radio button
* radio button again
* rubocop versioning issue fixed
* linux and darwin
* Fix Gemfile
* rubocop
* erb lint
Co-authored-by: baarkerlounger <db@slothlife.xyz>
* Set tshortfall to 0 if it should exists but is not provided (#550)
* Set tshortfall to 0 if it should exists but is not provided
* check if tshortfall is overridden
* Save correct la if postcode is invalid (#551)
* Allow illness type to be refused (#553)
* Radio button on log filter is now preset to "All" (#552)
* Radio button on log filter is now preset to "All"
* lint fixes
* removed instance @ variable
* CLDC-744-joint-tenancy-validation (#549)
* add joint tenancy validation
* fix validation and spec
* improvements
* updates
* lint fixes
* fix typo
* change message displayed on hhmemb page
* Add docs dir to dockerignore and cfignore (#555)
* Add files via upload (#554)
Adding Delta Discovery file
* Improve DB seeding (#556)
* Improve DB seeding
* Don't seed LA Rent Ranges in test
* Add navigation items helper
* Fix specs and linters
* Works but helper is hard to test
* add check to prevent error on hhmemb if joint is nil (#560)
* add failing spec
* add check to prevent error on hhmemb if joint is nil
* Refactor for testability
* Spec nav bar highlighting from user perspective
* CLDC-1218: Fix hbrentshortfall import (#558)
* Infer hbrentshortfall not known if tshortfall not provided and overridden
* Reorder import
* Referral can be internal for homeless (#561)
* Set case log ID offset at export (#562)
* Make tshortfall optional based on hidden tshortfall_known question (#563)
* Make tshortfall optional based on hidden tshortfall_known question
* Add test for optional
* Add test for JSON derived and dependent on false options
* Test routing
* Fix optionality
* Inactive users (#564)
* Allow users to be marked as inactive
* Import inactive users
* add missing field to seeded user for dev env
* Map joint tenancy field (#565)
* Use rake task to send onboarding emails (#566)
* Use rake task to send onboarding emails
* Wrap host lookup so it's easily stubbable
* Rake task can be called outside the rails environment so need to pass host in
* Not part of the usual app flow so contain to rake task
* Including routes helper in a rake task is a rabbit hole
* Use ENV var rather than param for host
* Sort case log index table by most recent by default (#567)
* Add sheltered accom field (#568)
* Remove needs type question until we support supported housing logs (#569)
* Fix routing for tshortfall (#571)
* Fix routing for tshortfall
* HB 7 and 8 don't exist in 22/23 anymore
* Add visiblly hidden change link text for details known questions
* Fix repeated use of Password in error summary (and use smart quotes)
* Make logs link less ambiguous
* Cldc 1217 retirement soft validation (#570)
* Interruption screen refactor
* Add test for retirement_age_for_person
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
* Rubocop
* update 22-23 form
* fix failures
* lint fixes
* remove whitespace
* remove commented code
* make spec file use translations instead of content
* update content
* lint fixes
* fix typo
* fix question wording
* fix failing spec
* add full stop
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* Hide inactive users and allow support users to view all users (#576)
* Hide inactive users and allow support users to view all users
* Enable support users to invite users to any organisation
* Add pagination to user views
* Update config/locales/devise.en.yml
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
* remove letting_in_sheltered_accomodation field (#577)
* remove letting_in_sheltered_accomodation field
This field is now duplicated by the shelteredaccom field
* lint fixes
* fix all failing specs
* Generisize pagination links
* CLDC-1101: Case log filter by organisation (#522)
* Rename org filter
* Ensure filters work when ID is passed
* UI init
* Lint
* Fix filter nesting
* Reduce width
* Set checked status of filters correctly
* Test filter presence
* Add filter test
* Rubocop
* Tweak styles for autocomplete within filter
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1224: Tenancy type and tenancy length (#578)
* Fix value mapping for tenancy type 22/23
* Update secure helper
* Null safe
* Spec update
* Update mandatory
* Use helper
* Remove joint tenancy hitn text and add don't know option (#579)
* Export improvements (#581)
* improved export - set start point for reference
* remove completed status from exports
* Added exception handling to export
* Improved tests, replaced rescue block with Sentry
Co-authored-by: Kat <katrina@madetech.com>
* Update logs table column heading to say ‘Status’, not ‘Completed’
* Show ‘Data protection officer’ and/or ‘Key contact’ tags in users table
* Update heading, label and hint text for user details
* Fix organisation filter (#582)
* Filter values correctly
* Remove filter value if hidden
* Return empty string rather than nil for accessible autocomplete
* Additional test for accessible automcomplete defaulting
* Add status tag helper
* Add missing ‘or’ divider on joint tenancy question
* Use dash not hyphen in answer options
* CLDC-1118: Implement data export structure (CDS) (#587)
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
* CLDC-1217: Retirement soft validation (#586)
* Don't trigger soft validation if tenant prefers not to say
* Update gender content
* Fix spec description
* Enable support users to download user details (#589)
* Enable support users to download user details
* Download all users
* Rubocop
* Preload organisations to remove n+1 queries
* Confirmable (#580)
* Confirmable
* Remove obsolete rake task
* Skip confirmation for inactive users
* Send beta onboarding template if migrated from Softwire
* Default controller
* Use correct link
* Redirect confirmation to set password
* Confirm account within 3 days
* Only redirect to set password if not previously set
* Rubocop
* Confirm factory bot users
* Set password condition
* Changing email requires reconfirming
* No need to explicitly trigger email, devise does that for us now
* Remove flash banner
* Mock notify
* Mock in the right spec
* Test redirect and text
* User is confirmable
* Rubocop
* Redirect to url so we don't bypass authenticity token
* Update content
* Add test for resend invite flow
* Update link to resend confirmation email
* Rename password reset resend confirmation partial
* Expired link error page
* Remove resend confirmation link
* Update seed
* Expory contact
* Time zone
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* Attempt at fixing S3 error when saving Zip file (#590)
* Enable better other field validation labels
* Removing gaps caused by empty exports (#591)
* Add Sentry instrumentation (#593)
* Avoid NoMethodError when Sentry is not initialised
* Instrument collection_start_year
* Removes Sentry custom instrumentation
* test for user being in dev env not being asked for 2fa
* code for user being in dev env not being asked for 2fa
* pulled out of support person context, this should work for any user in dev env
* rubocop
* matching wording
* only support user atm need 2fa, so making this explicit
* Perf (#592)
* Memoize start year
* Reset
* Recalculate rather than reset
* Fix heisenspec (order independent array comparison) (#596)
* Redirect confirmed users to sign in
* Add support for CSV export (#598)
* Cldc 1102 admin organisations page (#557)
* Get all organisations in controller
* Display organisations data in the table
* Route to logs for specific organisation
* add tests
* update spec
* lint fixes
* set up failing test for organisation logs page
* fix failing test
* write test for organisations support user page
* Update a organisation page test and lint
* added pagination test with next and previous links and total count for support user
* test for pagination in organisations title
* Added "Organisations" to to organisations page title
* add pagination test for organisations page 2, remove second before block
* Add the remaining pagination tests
* Redirect when accessing organisation logs by non support user
* Test for displaying logs for specific organisation
* Add test for org name
* Add a failing log filter test for specific org
* Extract filter methods into a helper
* Allow logs filtering for specific org
* Fix test, support user was creating an extra org, remove orgs filter for specific org
* Remove redundant test, lint
* Reuse primary navigation component and add sub navigation for support users
* allow support users edit or and add sub navigation to about this org
* allow support users to access the edit org page
* only allow to edit existing editable fields
* display correct values in the organisations table
* allow support user to update org
* user table component for organisations table
* use guard clause for organisation logs page
* remove create a new lettings log from organisation logs
* Move case logs filter from helpers to modules
* lint erb
* yarn lint
* bring back if statement in logs controller
* update modules import
* let!
* test for links first in the org cotroller spec
* interpolate number of orgs
* conditionally render sub navigation
Co-authored-by: Kat <katrina@madetech.com>
Co-authored-by: Dushan Despotovic <dushan@madetech.com>
Co-authored-by: JG <moarpheus@gmail.com>
* Bump nokogiri from 1.13.5 to 1.13.6 (#601)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.5 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.5...v1.13.6)
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CLDC-1124: User search (#600)
* Add search by name for users
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Search is now non case sensitive
* Made search work for data co-ordinators
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Refactored to scope
* Added search by email
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* WIP Commit - added test for if search term matches a name and an email address simultaneously. Also changed search result caption for organisations to display "Matches X of Y users"
* Rubocop
* Preload org
* Linting
* Refactor filtered_users into module
* Only adjust query param if searched
* Add data coordinator tests
* Add table caption spec
* Dupe attribute
* Refactor into Search ViewComponent
* Rubocop
* Unit test user scopes
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Use dedicated styles for each navigation component
* Use dedicated styles for each navigation component
* Use simpler markup for table captions
* Use table component for logs list
* Correct markup for user and organisation tables
* Email allowlist (#603)
* Email allowlist
* Set rails master key in deploy pipelines
* CLDC-1258: Handle invalid void date during import (#604)
* Now we raise an exception if a non-existing organisation is referenced by a case log
* The void date is not imported if it is after the tenancy start date
* make organisations list page default view for support user login (#605)
* Use seperate components for primary and sub navigation
* Add LA org mapping
* Rubocop
* User search fixes (#607)
* Update query message
* Add clear search link
* Set input value
* Use gem component
* Move to list partial pattern
* Partial path
* Update spec
* Rubocop
* Unit test filter module
* Rubocop
* Add search result to page title if searched
* Add missing horizontal rule
* Use form_group attributes for search input
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
* CLDC-1225: At import updates relationship to child when a person is under 16 (#609)
* Organisation search (#610)
* Add search to organisations
* Fix title
* Spec page title
* Don't seed org in test
* Handles unicode characters in postcode (#612)
* CSV download only includes users in search result
* Updates exported fields based on May 25th feedback (#613)
* Cldc 1223 pregnancy soft validations (#602)
* update hard validation limits for pregnancy age, remove hard validation if there are no females at all
* Add soft validations for pregnancy
* make the error message consistent
* Only check the values for the members with details known in the household
* Show interruption screen when resident details are updated
* Route back to check answers after an interruption screen and back to previous page if no is selected on the interruption screen
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* update validation messages
* fix a test
* fix a typo
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
* Avoid variable number of columns during CSV export (#614)
* CLDC-1277: no route matches bug (#615)
* don't display the save and go to the next incomplete section button if it errors 🤷♀️
* use 2022/23c fixture for in the test
* Allow support users and data coordinators to toggle active users
* Add a link to deactivate page
* add deactivate page
* Show if user is deactivated and fix form
* Show deactivated user in the user list
* Show reactivate user link for deactivated users
* add reactivate user page
* Refactor
* remove unused method, route and lint
* fix routes
* Only allow active users to log in
* Add flash banner for successful toggle, fix styles
* FIx more styling
* prevent editing deactivated user
* lint
* reset confirmed_at, password and sign in count when deactivated. Send reactivation email if user has previously logged in
* Use dash not hyphen in confirmation page button and links
* Content: Deactivate/reactivate account, not the user
* Send confirmation email to both, old and new email addresses
* Add possessive gem for names formatting
* Use hidden input field for active value
* lint
* Only send beta onboarding emails if the user hasn't previously logged in
* Don't clear the password for deactivated user
* refactor sending confirmation emails
Co-authored-by: kiddhustle <kiddhustle@wiardweb.com>
Co-authored-by: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Co-authored-by: baarkerlounger <db@slothlife.xyz>
Co-authored-by: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com>
Co-authored-by: Ted <tedbooton@gmail.com>
Co-authored-by: Dushan <dushan@madetech.com>
Co-authored-by: Dushan <47317567+dushan-madetech@users.noreply.github.com>
Co-authored-by: Ted-U <92022120+Ted-U@users.noreply.github.com>
Co-authored-by: sona-mhclg <77793209+sona-mhclg@users.noreply.github.com>
Co-authored-by: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Co-authored-by: Stéphane Meny <smeny@users.noreply.github.com>
Co-authored-by: JG <moarpheus@gmail.com>
Co-authored-by: J G <7750475+moarpheus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ted <ted.booton@madetech.com>
Co-authored-by: baarkerlounger <baarkerlounger@users.noreply.github.com>
3 years ago
def can_toggle_active? ( user )
self != user && ( support? || data_coordinator? )
end
def valid_for_authentication?
super && active?
end
def editable_duplicate_lettings_logs_sets
lettings_logs . after_date ( FormHandler . instance . lettings_earliest_open_for_editing_collection_start_date ) . duplicate_sets ( id ) . map { | array_str | array_str ? array_str . map ( & :to_i ) : [ ] }
end
def editable_duplicate_sales_logs_sets
sales_logs . after_date ( FormHandler . instance . sales_earliest_open_for_editing_collection_start_date ) . duplicate_sets ( id ) . map { | array_str | array_str ? array_str . map ( & :to_i ) : [ ] }
end
CLDC-3116 Create homepage (#2113)
* feat: add blank homepage, update routing and tests
* feat: add welcome message and thoroughly test routing
* refactor: lint
* feat: update tests
* CLDC-3076: Make example dates consistent (#2107)
* CLDC-3076: Make example dates consistent
* Use example date even when some hint text provided already
* Temp remove some date restrictions
* Update to 2 line breaks
* Revert "Temp remove some date restrictions"
This reverts commit cd7f18f9f10957be0cbabee7665c0abe4239acb6.
* Fix lettings log accessor in date question (#2117)
* Fix lettings log accessor in date question
* Remove hardcoded date example from mrcdate question (#2118)
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
* CLDC-3061 Add guidance page (#2121)
* Add guidance page
* Link to guidance from start page
* feat: test home/start paths explicitly
* CLDC-2253 Add collection resources (#2120)
* Update collection resources, add to homepage
* Add guidance link to an empty page
* Update headings
* Rebase fix
* Update title
* Update file names
* Add section break
* CLDC-2593 Add upcoming deadlines section (#2119)
* Add upcoming deadlines section
* Update the content to use the correct dates
* Update content
* lint
* typos
* CLDC-2252 Add homepage task section (#2115)
* feat: wip add lettings, sales and schemes sections with correct text, counts, links and colouring
* feat: add flex styling to match designs
* CLDC-3076: Make example dates consistent (#2107)
* CLDC-3076: Make example dates consistent
* Use example date even when some hint text provided already
* Temp remove some date restrictions
* Update to 2 line breaks
* Revert "Temp remove some date restrictions"
This reverts commit cd7f18f9f10957be0cbabee7665c0abe4239acb6.
* Fix lettings log accessor in date question (#2117)
* Fix lettings log accessor in date question
* Remove hardcoded date example from mrcdate question (#2118)
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
* feat: update breakpoints for responsive layout changes
* lint: use hash lookup where possible
* lint: erblinting
* feat: improve formatting
* Reuse govuk grid
* Revert "Reuse govuk grid"
This reverts commit 8c71f5d9edf261802a8a86e07c13552f51283668.
* feat: test home page data boxes
* refactor: lint
* refactor: lint
* feat: test link behaviour is correct in all user scenarios
* refactor: lint
* feat: update tests
* feat: combine task, resources, deadlines sections
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Co-authored-by: Kat <kosiak.katrina@gmail.com>
* CLDC-2255 Add homepage notifications (#2131)
* feat: add notification table
* feat: add notification banner, use unread gem for notification management
* feat: add notifications page and remove unread_notification.rb
* feat: add blank homepage, update routing and tests
* feat: add welcome message and thoroughly test routing
* refactor: lint
* feat: update tests
* CLDC-3061 Add guidance page (#2121)
* Add guidance page
* Link to guidance from start page
* feat: test home/start paths explicitly
* feat: add notification table
* feat: add notification banner, use unread gem for notification management
* feat: add notifications page and remove unread_notification.rb
* feat: default p tag around sanitized page content
* feat: add active scope
* feat: use newest active unread/unauthenticated notification and update start page
* feat: add tests of notification behaviour and routing and refactor
* refactor: lint
* feat: update Gemfile.lock
* feat: add timestamps to readmark table
* feat: update gemfile.lock
* refactor: lint
* feat: test notifications page doesn't show notifications and code simplification
* feat: move notification helper methods to notifications_helper.rb
---------
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
* feat: clear all no-status filters on in progress links
* CLDC-2590 Add about this service section (#2124)
* Add about core section
* Move about core to the correct spot on start page
* Update content
* Add some margins
---------
Co-authored-by: Rachael Booth <Rachael.Booth@softwire.com>
Co-authored-by: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Co-authored-by: Kat <kosiak.katrina@gmail.com>
12 months ago
def active_unread_notifications
Notification . active . unread_by ( self )
end
def newest_active_unread_notification
active_unread_notifications . last
end
def status
return :deleted if discarded_at . present?
return :deactivated unless active
return :unconfirmed unless confirmed?
:active
end
def discard!
self . discarded_at = Time . zone . now
save! ( validate : false )
end
def phone_with_extension
return phone if phone_extension . blank?
" #{ phone } , Ext. #{ phone_extension } "
end
def assigned_to_lettings_logs
lettings_logs . where ( assigned_to : self )
end
def assigned_to_sales_logs
sales_logs . where ( assigned_to : self )
end
def reassign_logs_and_update_organisation ( new_organisation , log_reassignment )
return unless new_organisation
ActiveRecord :: Base . transaction do
lettings_logs_to_reassign = assigned_to_lettings_logs . visible
sales_logs_to_reassign = assigned_to_sales_logs . visible
current_organisation = organisation
logs_count = lettings_logs_to_reassign . count + sales_logs_to_reassign . count
return if logs_count . positive? && ( log_reassignment . blank? || ! LOG_REASSIGNMENT . key? ( log_reassignment . to_sym ) )
update! ( organisation : new_organisation )
case log_reassignment
when " reassign_all "
reassign_all_orgs ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
when " reassign_stock_owner "
reassign_stock_owners ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
when " reassign_managing_agent "
reassign_managing_agents ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
when " unassign "
unassign_organisations ( lettings_logs_to_reassign , sales_logs_to_reassign , current_organisation )
end
cancel_related_bulk_uploads
send_organisation_change_email ( current_organisation , new_organisation , log_reassignment , logs_count )
rescue StandardError = > e
Rails . logger . error ( " User update failed with: #{ e . message } " )
Sentry . capture_exception ( e )
raise ActiveRecord :: Rollback
end
end
protected
# Checks whether a password is needed or not. For validations only.
# Passwords are always required if it's a new record, or if the password
# or confirmation are being set somewhere.
def password_required?
! persisted? || ! password . nil? || ! password_confirmation . nil?
end
private
def organisation_not_merged
if organisation & . merge_date . present? && organisation . merge_date < Time . zone . now
errors . add :organisation_id , I18n . t ( " validations.organisation.merged " )
end
end
def send_data_protection_confirmation_reminder
return unless persisted?
return unless is_dpo?
return if organisation . data_protection_confirmed?
DataProtectionConfirmationMailer . send_confirmation_email ( self ) . deliver_later
end
def reassign_all_orgs ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
lettings_logs_to_reassign . update_all ( owning_organisation_id : new_organisation . id , managing_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
sales_logs_to_reassign . update_all ( owning_organisation_id : new_organisation . id , managing_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
end
def reassign_stock_owners ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
lettings_logs_to_reassign . update_all ( owning_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
sales_logs_to_reassign . update_all ( owning_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
end
def reassign_managing_agents ( new_organisation , lettings_logs_to_reassign , sales_logs_to_reassign )
lettings_logs_to_reassign . update_all ( managing_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
sales_logs_to_reassign . update_all ( managing_organisation_id : new_organisation . id , values_updated_at : Time . zone . now )
end
def unassign_organisations ( lettings_logs_to_reassign , sales_logs_to_reassign , current_organisation )
if User . find_by ( name : " Unassigned " , organisation : current_organisation )
unassigned_user = User . find_by ( name : " Unassigned " , organisation : current_organisation )
else
unassigned_user = User . new (
name : " Unassigned " ,
organisation_id : ,
is_dpo : false ,
encrypted_password : SecureRandom . hex ( 10 ) ,
email : SecureRandom . uuid ,
confirmed_at : Time . zone . now ,
active : false ,
)
unassigned_user . save! ( validate : false )
end
lettings_logs_to_reassign . update_all ( assigned_to_id : unassigned_user . id , values_updated_at : Time . zone . now )
sales_logs_to_reassign . update_all ( assigned_to_id : unassigned_user . id , values_updated_at : Time . zone . now )
end
def send_organisation_change_email ( current_organisation , new_organisation , log_reassignment , logs_count )
reassigned_logs_text = " "
assigned_logs_count = logs_count == 1 ? " is 1 log " : " are #{ logs_count } logs "
case log_reassignment
when " reassign_all "
reassigned_logs_text = " There #{ assigned_logs_count } assigned to you. The stock owner and managing agent on #{ logs_count == 1 ? 'this log' : 'these logs' } has been changed from #{ current_organisation . name } to #{ new_organisation . name } . "
when " reassign_stock_owner "
reassigned_logs_text = " There #{ assigned_logs_count } assigned to you. The stock owner on #{ logs_count == 1 ? 'this log' : 'these logs' } has been changed from #{ current_organisation . name } to #{ new_organisation . name } . "
when " reassign_managing_agent "
reassigned_logs_text = " There #{ assigned_logs_count } assigned to you. The managing agent on #{ logs_count == 1 ? 'this log' : 'these logs' } has been changed from #{ current_organisation . name } to #{ new_organisation . name } . "
when " unassign "
reassigned_logs_text = " There #{ assigned_logs_count } assigned to you. #{ logs_count == 1 ? 'This' : 'These' } have now been unassigned. "
end
template_id = ORGANISATION_UPDATE_TEMPLATE_ID
personalisation = {
from_organisation : " #{ current_organisation . name } (Organisation ID: #{ current_organisation . id } ) " ,
to_organisation : " #{ new_organisation . name } (Organisation ID: #{ new_organisation . id } ) " ,
reassigned_logs_text : ,
}
DeviseNotifyMailer . new . send_email ( email , template_id , personalisation )
end
def cancel_related_bulk_uploads
lettings_bu_ids = LettingsLog . where ( assigned_to : self , status : " pending " ) . map ( & :bulk_upload_id ) . compact . uniq
BulkUpload . where ( id : lettings_bu_ids ) . update! ( choice : " cancelled-by-moved-user " , moved_user_id : id )
sales_bu_ids = SalesLog . where ( assigned_to : self , status : " pending " ) . map ( & :bulk_upload_id ) . compact . uniq
BulkUpload . where ( id : sales_bu_ids ) . update! ( choice : " cancelled-by-moved-user " , moved_user_id : id )
end
end