feat: DAH-2876 useRedirect for authenticated pages

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 orbs:
   ruby: circleci/[email protected]
   cypress: cypress-io/[email protected]
-  browser-tools: circleci/browser-tools@1.2.2
+  browser-tools: circleci/browser-tools@1.4.4
 defaults: &defaults
   working_directory: ~/web
   docker:
@@ -98,7 +98,7 @@ commands:
       - run:
           command: |
             ./node_modules/protractor/bin/webdriver-manager clean
-            ./node_modules/protractor/bin/webdriver-manager update --versions.chrome 2.41 --versions.standalone 3.141.59
+            ./node_modules/protractor/bin/webdriver-manager update --versions.standalone 4.0.0-alpha-2
             ./node_modules/protractor/bin/webdriver-manager status
   upgrade-bundler:
     description: Upgrade bundler

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ _just one or two sentences_
 
 https://sfgovdt.jira.com/browse/<JIRA TICKET NUMBER>
 
-## Checklist before requesting review
+## Before requesting eng review
 
 ### Version Control
 
@@ -20,16 +20,22 @@ https://sfgovdt.jira.com/browse/<JIRA TICKET NUMBER>
 - [ ] all automated code checks pass (linting, tests, coverage, etc.)
 - [ ] code irrelevant to the ticket is not modified e.g. changing indentation due to automated formatting
 - [ ] if the code changes the UI, it matches the UI design exactly
-- [ ] if the changes include human translations, follow the [human translations process](https://sfgovdt.jira.com/l/cp/XS1KpvE4)
 
 ### Review instructions
 
 - [ ] instructions specify which environment(s) it applies to
 - [ ] instructions work for PA testers
 - [ ] instructions have already been performed at least once
 
-### Request review
+### Request eng review
 
 - [ ] PR has `needs review` label
 - [ ] Use `Housing Eng` group to automatically assign reviewers, and/or assign specific engineers
 - [ ] If time sensitive, notify engineers in Slack
+
+## Before merging
+
+### Request product acceptance testing
+
+- [ ] Code change is behind a feature flag
+- [ ] If code change is not behind a feature flag, it has been PA tested in the review environment (use `needs product acceptance` label to indicate that the PR is waiting for PA testing)

Procfile

@@ -1,4 +1,6 @@
 web: bundle exec puma -C config/puma.rb
 worker: bundle exec sidekiq -C config/sidekiq.yml
-listener: bundle exec rake translate:subscribe
+# TODO: switch listener task back to `subscribe` after we are done logging translate usage
+# listener: bundle exec rake translate:subscribe
+listener: bundle exec rake translate:log_usage
 release: bundle exec rake db:migrate

app.json

@@ -32,7 +32,7 @@
         "heroku-postgresql"
       ],
       "scripts": {
-        "postdeploy": "rake db:migrate"
+        "postdeploy": "rake db:migrate && rake preload:user"
       }
     }
   },

app/assets/javascripts/account/AccountService.js.coffee

@@ -11,7 +11,8 @@ AccountService = (
   bsLoadingOverlayService,
   ShortFormApplicationService,
   ShortFormDataService,
-  ModalService
+  ModalService,
+  AnalyticsService
 ) ->
   Service = {}
   # userAuth is used as model for inputs in create-account form
@@ -85,10 +86,17 @@ AccountService = (
         # reset userAuth object
         angular.copy(Service.userAuthDefaults, Service.userAuth)
         if response.signedIn
+          AnalyticsService.trackEvent('login_succeeded', { origin: 'Application Sign In', user_id: response.id })
           Service.setLoggedInUser(response)
           Service._reformatDOB()
           return true
       ).catch((response) ->
+
+        AnalyticsService.trackEvent("login_failed", {
+            user_id: null,
+            origin: 'Application Sign In',
+            error_reason: response?.reason || undefined,
+          })
         # for errors we manually stop the loading overlay
         bsLoadingOverlayService.stop()
         return false
@@ -146,6 +154,7 @@ AccountService = (
     # reset the user data immediately, then call signOut
     Service.setLoggedInUser({})
     ShortFormApplicationService.resetApplicationData() unless opts.preserveAppData
+    AnalyticsService.trackEvent('logout', {reason: "Angular logout"})
     $auth.signOut()
     # close any open modal, e.g. "Lottery Results" that may have been opened while
     # you were on My Applications
@@ -322,7 +331,7 @@ AccountService = (
 
 AccountService.$inject = [
   '$state', '$auth', '$http', '$translate', '$window', 'bsLoadingOverlayService'
-  'ShortFormApplicationService', 'ShortFormDataService', 'ModalService'
+  'ShortFormApplicationService', 'ShortFormDataService', 'ModalService', 'AnalyticsService'
 ]
 
 angular

app/assets/javascripts/config/angularInitialize.js.coffee

@@ -46,7 +46,10 @@
       else if ShortFormApplicationService.isShortFormPage($state.current)
         # we don't want to show the beforeunload dialog, because it would allow the applicant to stay on the page after session expiration
         $window.removeEventListener('beforeunload', ShortFormApplicationService.onExit)
-        $state.go('dahlia.listing', {timeout: true, id: ShortFormApplicationService.listing.Id})
+        if ShortFormApplicationService.listingIsDalp()
+          $window.location.href = ShortFormApplicationService.localizedSfGovUrl("apply-downpayment-loan-buy-market-rate-home")
+        else
+          $state.go('dahlia.listing', {timeout: true, id: ShortFormApplicationService.listing.Id})
 
     $rootScope.$on '$stateChangeStart', (e, toState, toParams, fromState, fromParams) ->
       # always start the loading overlay
@@ -106,7 +109,10 @@
       if ShortFormApplicationService.hittingBackFromConfirmation(fromState, toState)
         # the redirect will trigger $stateChangeStart again and will popup the confirmation alert
         e.preventDefault()
-        $state.go('dahlia.listing', {id: ShortFormApplicationService.listing.listingID})
+        if ShortFormApplicationService.listingIsDalp()
+          $window.location.href = ShortFormApplicationService.localizedSfGovUrl("apply-downpayment-loan-buy-market-rate-home")
+        else
+          $state.go('dahlia.listing', {id: ShortFormApplicationService.listing.listingID})
 
       else if (ShortFormApplicationService.isLeavingShortForm(toState, fromState))
         content =
@@ -180,6 +186,8 @@
         if !ShortFormApplicationService.authorizedToProceed(toState, fromState, toSection)
           e.preventDefault()
           if ShortFormApplicationService.listingIsSale()
+            if (ShortFormApplicationService.listingIsDalp())
+              return $state.go('dahlia.short-form-application.dalp-screening', toParams)
             return $state.go('dahlia.short-form-application.prerequisites', toParams)
           return $state.go('dahlia.short-form-application.name', toParams)
 

app/assets/javascripts/config/angularRoutes.js.coffee

@@ -647,6 +647,17 @@
           $translate('page_title.listing_application', {listing: listing.Name})
         ]
     })
+    .state('dahlia.short-form-application.dalp-screening', {
+      url: '/dalp-screening'
+      params:
+        skipConfirm: { squash: true, value: false }
+      views:
+        'container@':
+          templateUrl: 'short-form/templates/layout.html'
+          controller: 'ShortFormApplicationController'
+        '[email protected]':
+          templateUrl: 'short-form/templates/a4a-dalp-screening.html'
+    })
     # Short form: "You" section
     .state('dahlia.short-form-application.prerequisites', {
       url: '/prerequisites'
@@ -657,8 +668,10 @@
         infoChanged:
           squash: true
       onEnter: [
-        '$stateParams', 'ShortFormApplicationService', 'AccountService', 'AutosaveService'
-        ($stateParams, ShortFormApplicationService, AccountService, AutosaveService) ->
+        '$state', '$stateParams', 'ShortFormApplicationService', 'AccountService', 'AutosaveService'
+        ($state, $stateParams, ShortFormApplicationService, AccountService, AutosaveService) ->
+          if ShortFormApplicationService.listingIsDalp() && !ShortFormApplicationService.application.answeredDalpScreening
+            $state.go('dahlia.short-form-application.dalp-screening', {id: $stateParams.id, skipConfirm: true, lang: $stateParams.lang})
           # If applicant tries to go to this page on a rental listing, redirect them back to homepage
           if !ShortFormApplicationService.listingIsSale()
             $state.go('dahlia.welcome')
@@ -668,8 +681,8 @@
             ShortFormApplicationService.infoChanged = $stateParams.infoChanged
       ]
       resolve:
-        lendingInstitutions: ['LendingInstitutionService', (LendingInstitutionService) ->
-          LendingInstitutionService.getLendingInstitutions()
+        lendingInstitutions: ['listing', 'LendingInstitutionService', (listing, LendingInstitutionService) ->
+          LendingInstitutionService.getLendingInstitutions(listing.Custom_Listing_Type == "Downpayment Assistance Loan Program")
         ]
     })
     .state('dahlia.short-form-application.autofill-preview', {

app/assets/javascripts/lending-institutions/LendingInstitutionService.js.coffee

@@ -2,10 +2,15 @@ LendingInstitutionService = ($http) ->
   Service = {}
   Service.lendingInstitutions = {}
 
-  Service.getLendingInstitutions = ->
-    $http.get("/api/v1/short-form/lending_institutions").success((data, status) ->
-      angular.copy(data, Service.lendingInstitutions)
-    )
+  Service.getLendingInstitutions = (listingIsDalp) ->
+    if listingIsDalp
+      $http.get("/api/v1/short-form/lending_institutions_dalp").success((data, status) ->
+        angular.copy(data, Service.lendingInstitutions)
+      )
+    else
+      $http.get("/api/v1/short-form/lending_institutions").success((data, status) ->
+        angular.copy(data, Service.lendingInstitutions)
+      )
 
   Service.getLendingAgentName = (agentId) ->
     agent = _(Service.lendingInstitutions)

app/assets/javascripts/listings/ListingConstantsService.js.coffee

@@ -94,6 +94,8 @@ ListingConstantsService = () ->
     rightToReturnSunnydale: "Right to Return - Sunnydale"
     rightToReturnHuntersView: "Right to Return - Hunters View"
     rightToReturnPotrero: "Right to Return - Potrero"
+    dalpFirstResponder: "DALP First Responders"
+    dalpEducator: "DALP SFUSD Educators"
 
   # List of preferences that follow the right to return pattern.
   Service.rightToReturnPreferences =

app/assets/javascripts/listings/ListingIdentityService.js.coffee

@@ -28,6 +28,11 @@ ListingIdentityService = (ListingConstantsService) ->
     return false unless listing
     listing.Reserved_community_type == ListingConstantsService.RESERVED_TYPES.HABITAT
 
+  # Determine if listing is DALP listing that has hard-coded content
+  Service.isDalpListing = (listing) ->
+    return false unless listing
+    listing.Custom_Listing_Type == 'Downpayment Assistance Loan Program'
+
   # Business logic for determining if a listing is open
   # `due date` should be a datetime, to include precise hour of deadline
   Service.isOpen = (listing) ->

app/assets/javascripts/short-form/ShortFormApplicationController.js.coffee

@@ -11,6 +11,7 @@ ShortFormApplicationController = (
   AccountService,
   AddressValidationService,
   AnalyticsService,
+  FileUploadService,
   Idle,
   inputMaxLength,
   ListingDataService,
@@ -75,6 +76,8 @@ ShortFormApplicationController = (
 
   $scope.emailRegex = SharedService.emailRegex
 
+  $scope.localizedSfGovUrl = ShortFormApplicationService.localizedSfGovUrl
+
   $scope.propertyCardImageURL = ->
     if _.isArray($scope.listing.Listing_Images)
       return $scope.listing.Listing_Images[0].displayImageURL
@@ -295,7 +298,40 @@ ShortFormApplicationController = (
       $scope.clearEligibilityErrors()
       ShortFormNavigationService.goToApplicationPage('dahlia.short-form-welcome.overview')
 
-  ########## END CUSTOM SCREENING LOGIC ##########
+  ########## END CUSTOM EDUCATOR SCREENING LOGIC ##########
+
+  ########## BEGIN DALP SCREENING LOGIC ##########
+
+  $scope.onChangeDalpEducatorOrFirstResponder = ->
+    if $scope.application.dalpEducator || $scope.application.dalpFirstResponder
+      $scope.application.dalpNotEducatorOrFirstResponder = null
+
+  $scope.onChangeDalpNoneApply = ->
+    if $scope.application.dalpNotEducatorOrFirstResponder
+      $scope.application.dalpEducator = null
+      $scope.application.dalpFirstResponder = null
+
+  $scope.dalpNoOptionSelected = ->
+    !$scope.application.dalpNotEducatorOrFirstResponder &&
+    !$scope.application.dalpEducator &&
+    !$scope.application.dalpFirstResponder
+
+  $scope.dalpShowNoOptionSelectedError = ->
+    $scope.dalpNoOptionSelected() && $scope.form.applicationForm.$submitted
+
+  $scope.applicantHasClaimedDalpPriority = ->
+    ShortFormApplicationService.application.dalpEducator == true || ShortFormApplicationService.application.dalpFirstResponder == true
+
+  $scope.afterDalpScreening = ->
+    ShortFormApplicationService.application.answeredDalpScreening = true
+    # Clean up DALP proof files
+    if !ShortFormApplicationService.application.dalpEducator
+      FileUploadService.deleteFile($scope.listing, { document: ShortFormApplicationService.application.documents['DALP educator proof'] })
+    if !ShortFormApplicationService.application.dalpFirstResponder
+      FileUploadService.deleteFile($scope.listing, { document: ShortFormApplicationService.application.documents['DALP first responder proof'] })
+    ShortFormNavigationService.goToApplicationPage('dahlia.short-form-application.prerequisites')
+
+  ########## END DALP SCREENING LOGIC ##########
 
   $scope.addressInputInvalid = (identifier = '') ->
     return true if $scope.addressValidationError(identifier)
@@ -661,6 +697,15 @@ ShortFormApplicationController = (
       ShortFormNavigationService.goToSection('Preferences')
       return
 
+    if match == 'householdMatch' && ShortFormApplicationService.listingIsDalp()
+      $scope.goToNextReservedPageIfAvailable()
+      return
+
+    if match == 'incomeMatch' && ShortFormApplicationService.listingIsDalp()
+      ShortFormApplicationService.completeSection('Income')
+      ShortFormNavigationService.goToSection('Review')
+      return
+
     ShortFormApplicationService.checkHouseholdEligibility($scope.listing)
       .then( (response) ->
         eligibility = response.data
@@ -810,6 +855,9 @@ ShortFormApplicationController = (
   $scope.listingIsHabitat = ->
     ShortFormApplicationService.listingIsHabitat()
 
+  $scope.listingIsDalp = ->
+    ShortFormApplicationService.listingIsDalp()
+
   $scope.onIncomeValueChange = ->
     ShortFormApplicationService.invalidateIncomeForm()
     return if !ShortFormApplicationService.listingHasPreference('rentBurden') ||
@@ -950,7 +998,6 @@ ShortFormApplicationController = (
         $scope.submitDisabled = false
       )
     else
-      AnalyticsService.trackFormError('Application')
       $scope.handleErrorState()
 
   $scope.afterSignInWhileApplying = ->
@@ -1190,6 +1237,7 @@ ShortFormApplicationController.$inject = [
   'AccountService',
   'AddressValidationService',
   'AnalyticsService',
+  'FileUploadService',
   'Idle',
   'inputMaxLength',
   'ListingDataService',