From c68b8e5fd060f4850e3ba6263d2e8a105f2b60b3 Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Wed, 11 Oct 2023 09:02:24 -0400 Subject: [PATCH 1/6] Updating ESLint and Prettier rules --- .eslintrc.json | 55 +++++++++++++++++++++++++++++++++----------------- .prettierrc.js | 4 ++++ package.json | 4 ++++ 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 273feb0838..bb2829b83c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,7 +7,13 @@ "env": { "browser": true }, - "extends": ["angular"], + "extends": [ + "eslint:recommended", + "plugin:prettier/recommended", + "angular", + "standard", + "prettier" + ], "overrides": [ { "files": ["app/assets/javascripts/angular/**/*.spec.js"], @@ -25,18 +31,39 @@ ], "plugins": ["import"], "rules": { + "angular/definedundefined": "off", + "angular/typecheck-string": "off", + "angular/no-service-method": "off", + "angular/window-service": "off", "block-scoped-var": "error", + "consistent-this": ["error", "_this", "vm"], "dot-notation": "error", "eqeqeq": ["error", "smart"], + "max-len": [ + "error", + { + "code": 120, + "ignoreRegExpLiterals": true, + "ignoreStrings": true, + "ignoreTemplateLiterals": true, + "ignoreTrailingComments": true, + "ignoreUrls": true + } + ], "import/order": [ 2, { "newlines-between": "always" } ], + "new-cap": "error", + "new-parens": "error", "no-alert": "warn", + "no-array-constructor": "error", + "no-bitwise": "error", "no-caller": "error", "no-case-declarations": "error", + "no-continue": "error", "no-eval": "error", "no-extend-native": "error", "no-extra-bind": "error", @@ -44,13 +71,16 @@ "no-global-assign": "error", "no-implied-eval": "error", "no-iterator": "error", + "no-lonely-if": "error", "no-label-var": "error", "no-labels": "error", "no-lone-blocks": "error", "no-loop-func": "error", "no-multi-str": "error", + "no-negated-condition": "error", "no-new": "error", "no-new-func": "error", + "no-new-object": "error", "no-new-wrappers": "error", "no-octal-escape": "error", "no-param-reassign": "error", @@ -61,6 +91,7 @@ "no-shadow-restricted-names": "error", "no-throw-literal": "error", "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "error", "no-unsafe-negation": "error", "no-useless-call": "error", "no-useless-concat": "error", @@ -68,25 +99,13 @@ "no-useless-return": "error", "no-void": "error", "no-with": "error", + "prettier/prettier": [ + "error", + { "singleQuote": true, "tabWidth": 2 } + ], "radix": "error", "strict": ["error", "function"], "wrap-iife": ["error", "inside"], - "yoda": "error", - - "consistent-this": ["error", "_this", "vm"], - "new-cap": "error", - "new-parens": "error", - "no-array-constructor": "error", - "no-bitwise": "error", - "no-continue": "error", - "no-lonely-if": "error", - "no-negated-condition": "error", - "no-new-object": "error", - "no-unneeded-ternary": "error", - - "angular/definedundefined": "off", - "angular/typecheck-string": "off", - "angular/no-service-method": "off", - "angular/window-service": "off" + "yoda": "error" } } diff --git a/.prettierrc.js b/.prettierrc.js index af572f2c0d..250a8e9c99 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,4 +1,8 @@ module.exports = { singleQuote: true, trailingComma: 'all', + arrowParens: 'always', + semi: true, + printWidth: 120, + tabWidth: 2, }; diff --git a/package.json b/package.json index 0ecd8535d2..d8c75b9b1c 100644 --- a/package.json +++ b/package.json @@ -70,10 +70,14 @@ "eslint": "^7.13.0", "eslint-config-angular": "^0.5.0", "eslint-config-prettier": "^6.15.0", + "eslint-config-standard": "^17.1.0", "eslint-loader": "^4.0.2", "eslint-plugin-angular": "^4.0.1", "eslint-plugin-import": "^2.20.2", + "eslint-plugin-n": "^16.2.0", "eslint-plugin-prettier": "^3.1.4", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-standard": "^5.0.0", "favicons-webpack-plugin": "^4.2.0", "file-loader": "^6.0.0", "html-loader": "^1.3.2", From db16220854526830894b914d448d4faf9c5f5dbc Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Wed, 11 Oct 2023 09:02:40 -0400 Subject: [PATCH 2/6] Ran ESLint:fix and Prettier:fix --- app/app.component.js | 56 +- app/app.html | 48 +- .../javascripts/angular/all-tests.spec.js | 37 +- .../angular/campusContactsApp.config.js | 280 ++- .../angular/campusContactsApp.constants.js | 10 +- .../angular/campusContactsApp.module.js | 30 +- .../angular/campusContactsApp.routes.js | 1209 +++++----- .../angular/campusContactsApp.run.js | 108 +- .../aboutModal/aboutModal.component.js | 50 +- .../components/aboutModal/aboutModal.html | 56 +- .../accordion/accordion.component.js | 40 +- .../components/accordion/accordion.html | 10 +- .../accordionToggle.component.js | 22 +- .../accordionToggle/accordionToggle.html | 18 +- .../answerSheet/answerSheet.component.js | 46 +- .../components/answerSheet/answerSheet.html | 24 +- .../editAnswerSheetModal.component.js | 72 +- .../answerSheet/editAnswerSheetModal.html | 134 +- .../assignedLabelSelect.component.js | 66 +- .../assignedLabelSelect.html | 22 +- .../assignedLabelSelect.service.js | 40 +- .../assignedPeopleSelect.component.js | 74 +- .../assignedPeopleSelect.html | 40 +- .../assignedPeopleSelect.service.js | 72 +- .../assignedPeopleSelect.service.spec.js | 42 +- .../asyncContent/asyncContent.component.js | 10 +- .../contactActions.component.js | 22 +- .../contactActions/contactActions.html | 148 +- .../copySurvey/copySurvey.component.js | 88 +- .../components/copySurvey/copySurvey.html | 69 +- .../createSurvey/createSurvey.component.js | 69 +- .../components/createSurvey/createSurvey.html | 47 +- .../dashboard/dashboard.component.js | 35 +- .../subnav/dashboard-subnav.component.js | 16 +- .../dashboard/subnav/dashboard-subnav.html | 156 +- .../editAddress/editAddress.component.js | 183 +- .../components/editAddress/editAddress.html | 158 +- .../editAddress/editAddress.service.js | 131 +- .../editAddress/editAddress.service.spec.js | 323 ++- .../editGroup/editGroup.component.js | 138 +- .../components/editGroup/editGroup.html | 185 +- .../components/editGroup/editGroup.service.js | 16 +- .../editGroupOrLabelAssignments.component.js | 201 +- .../editGroupOrLabelAssignments.html | 47 +- .../editGroupOrLabelAssignments.service.js | 225 +- .../editLabel/editLabel.component.js | 84 +- .../editLabel/editLabel.component.spec.js | 212 +- .../components/editLabel/editLabel.html | 49 +- .../groupMembersModal.component.js | 259 +- .../groupMembersModal/groupMembersModal.html | 102 +- .../groupMembersModal.service.js | 108 +- .../groupMembersModal.service.spec.js | 116 +- .../iconButton/iconButton.component.js | 28 +- .../components/iconButton/iconButton.html | 8 +- .../iconModal/iconModal.component.js | 12 +- .../components/iconModal/iconModal.html | 72 +- .../interaction/interaction.component.js | 112 +- .../interaction/interaction.component.spec.js | 185 +- .../components/interaction/interaction.html | 89 +- .../loadingSpinner.component.js | 8 +- .../loadingSpinner/loadingSpinner.html | 2 +- .../components/massEdit/massEdit.component.js | 136 +- .../angular/components/massEdit/massEdit.html | 84 +- .../components/massEdit/massEdit.service.js | 895 ++++--- .../massEdit/massEdit.service.spec.js | 1153 ++++----- .../messageModal/messageModal.component.js | 268 +- .../components/messageModal/messageModal.html | 68 +- .../messageModal/messageModal.service.js | 62 +- .../ministryViewGroup.component.js | 138 +- .../ministryViewGroup/ministryViewGroup.html | 44 +- .../ministryViewGroup.service.js | 86 +- .../ministryViewGroup.service.spec.js | 120 +- .../ministryViewLabel.component.js | 71 +- .../ministryViewLabel.component.spec.js | 193 +- .../ministryViewLabel/ministryViewLabel.html | 25 +- .../ministryViewPerson.component.js | 159 +- .../ministryViewPerson.html | 159 +- .../multiselectList.component.js | 102 +- .../multiselectList/multiselectList.html | 30 +- .../multiselectList.service.js | 145 +- .../multiselectList.service.spec.js | 363 ++- .../myOrganizationsDashboard.component.js | 8 +- .../myOrganizationsDashboard.html | 7 +- .../myOrganizationsDashboard.service.js | 45 +- .../myOrganizationsDashboardList.component.js | 46 +- .../myOrganizationsDashboardList.html | 22 +- .../myPeopleDashboard.component.js | 308 ++- .../myPeopleDashboard.component.spec.js | 55 +- .../myPeopleDashboard/myPeopleDashboard.html | 161 +- .../myPeopleDashboard.service.js | 71 +- .../myPeopleDashboard.service.spec.js | 242 +- .../orgManagement/orgManagement.component.js | 10 +- .../orgManagement/orgManagement.html | 13 +- .../orgManagementEdit.component.js | 58 +- .../orgManagement/orgManagementEdit.html | 162 +- .../orgManagementSubOrg.component.js | 150 +- .../orgManagement/orgManagementSubOrg.html | 101 +- .../organization/organization.component.js | 157 +- .../components/organization/organization.html | 167 +- .../organizationBreadcrumbs.component.js | 70 +- .../organizationBreadcrumbs.html | 14 +- .../organizationCleanup.component.js | 151 +- .../organizationCleanup.html | 133 +- .../organizationContactImport.component.js | 68 +- .../organizationContactImport.html | 92 +- ...rganizationContactImportStep1.component.js | 146 +- .../organizationContactImportStep1.html | 200 +- ...rganizationContactImportStep2.component.js | 93 +- .../organizationContactImportStep2.html | 170 +- ...rganizationContactImportStep3.component.js | 262 +- .../organizationContactImportStep3.html | 113 +- ...rganizationContactImportStep4.component.js | 18 +- .../organizationContactImportStep4.html | 38 +- .../organizationOverview.component.js | 175 +- .../organizationOverview.html | 272 +-- .../organizationOverview.service.js | 98 +- .../organizationOverview.service.spec.js | 259 +- .../organizationOverviewGroups.component.js | 44 +- .../organizationOverviewGroups.html | 37 +- .../organizationOverviewLabels.component.js | 34 +- ...ganizationOverviewLabels.component.spec.js | 90 +- .../organizationOverviewLabels.html | 25 +- .../organizationOverviewPeople.component.js | 16 +- .../organizationOverviewPeople.html | 6 +- .../organizationOverviewSuborgs.component.js | 116 +- .../organizationOverviewSuborgs.html | 25 +- .../organizationOverviewSuborgs.service.js | 85 +- ...rganizationOverviewSuborgs.service.spec.js | 115 +- ...zationOverviewSurveyResponses.component.js | 56 +- .../organizationOverviewSurveyResponses.html | 41 +- .../organizationOverviewSurveys.component.js | 176 +- .../organizationOverviewSurveys.html | 236 +- .../organizationOverviewTeam.component.js | 92 +- ...organizationOverviewTeam.component.spec.js | 138 +- .../organizationOverviewTeam.html | 22 +- .../organizationOverviewTeam.service.js | 72 +- .../organizationSignatures.component.js | 217 +- .../organizationSignatures.html | 249 +- .../organizationSignaturesSign.component.js | 158 +- .../organizationSignaturesSign.html | 119 +- .../organizationalStats.component.js | 36 +- .../organizationalStats.html | 32 +- .../peopleFiltersPanel.component.js | 373 ++- .../peopleFiltersPanel.html | 466 ++-- .../peopleFiltersPanel.service.js | 38 +- .../peopleFiltersPanel.service.spec.js | 106 +- .../peopleScreen/peopleScreen.component.js | 915 ++++--- .../peopleScreen.component.spec.js | 44 +- .../components/peopleScreen/peopleScreen.html | 399 ++- .../peopleScreen/peopleScreen.service.js | 440 ++-- .../peopleScreen/peopleScreen.service.spec.js | 111 +- .../peopleViewPerson.component.js | 184 +- .../peopleViewPerson/peopleViewPerson.html | 149 +- .../personActivity.component.js | 76 +- .../personActivity/personActivity.html | 53 +- .../personAssigned.component.js | 28 +- .../personAssigned/personAssigned.html | 19 +- .../personAssigned/personAssigned.service.js | 47 +- .../personHistory/personHistory.component.js | 210 +- .../personHistory.component.spec.js | 98 +- .../personHistory/personHistory.html | 159 +- .../personHistory/personHistory.service.js | 93 +- .../personHistory.service.spec.js | 151 +- .../personMultiselect.component.js | 183 +- .../personMultiselect/personMultiselect.html | 43 +- .../personPage/personPage.component.js | 356 ++- .../components/personPage/personPage.html | 141 +- .../personPage/personPage.service.js | 156 +- .../personProfile/personProfile.component.js | 710 +++--- .../personProfile/personProfile.html | 681 +++--- .../personProfile/personProfile.service.js | 466 ++-- .../personProfile.service.spec.js | 832 +++---- .../preloadState/preloadState.component.js | 37 +- .../publicPhoneNumberValidation.component.js | 8 +- .../publicPhoneNumberValidation.html | 63 +- .../publicSurvey/publicSurvey.component.js | 10 +- .../components/publicSurvey/publicSurvey.html | 131 +- .../confirmMovementIndicators.component.js | 392 ++- .../confirmMovementIndicators.html | 138 +- .../tooltip/tooltip.component.js | 8 +- .../tooltip/tooltip.html | 11 +- .../reportMovementIndicators.component.js | 62 +- .../reportMovementIndicators.html | 30 +- .../suggestedActionsAccordion.component.js | 48 +- .../accordion/suggestedActionsAccordion.html | 130 +- .../suggestedActions.component.js | 156 +- .../suggestedActions/suggestedActions.html | 62 +- .../reportPeriod/reportPeriod.component.js | 12 +- .../components/reportPeriod/reportPeriod.html | 24 +- .../statsHeader/statsHeader.component.js | 16 +- .../components/statsHeader/statsHeader.html | 34 +- .../surveyOverview.component.js | 44 +- .../surveyOverview/surveyOverview.html | 86 +- .../surveyOverviewKeyword.component.js | 214 +- .../surveyOverviewKeyword.html | 264 +- .../autoAssignLabelNotifyModal.component.js | 44 +- .../autoAssignLabelNotifyModal.html | 116 +- .../predefinedQuestionsModal.component.js | 57 +- .../predefinedQuestionsModal.html | 76 +- .../surveyOverviewQuestions.component.js | 948 ++++---- .../surveyOverviewQuestions.html | 383 ++- .../surveyOverviewSettings.component.js | 188 +- .../surveyOverviewSettings.html | 303 +-- .../addSurveyResponseModal.component.js | 12 +- .../addSurveyResponseModal.html | 61 +- .../surveyResponses.component.js | 68 +- .../surveyResponses/surveyResponses.html | 37 +- .../surveyTypeformModal.component.js | 32 +- .../surveyTypeformModal.html | 62 +- .../surveys/surveyForm.component.js | 209 +- .../components/surveys/surveyFormPublic.html | 148 +- .../components/surveys/surveyFormUser.html | 87 +- .../transferModal/transferModal.component.js | 140 +- .../transferModal/transferModal.html | 110 +- .../transferModal/transferModal.service.js | 54 +- .../unsubscribe/unsubscribe.component.js | 52 +- .../components/unsubscribe/unsubscribe.html | 40 +- .../user-preferences.component.js | 64 +- .../user-preferences.component.spec.js | 76 +- .../user-preferences/user-preferences.html | 142 +- .../user-preferences.service.js | 62 +- .../user-preferences.service.spec.js | 8 +- .../angular/decorators/templateRequest.js | 60 +- .../angular/directives/autoGrow.directive.js | 98 +- .../angular/directives/exposeSelect.js | 14 +- .../javascripts/angular/directives/focus.js | 18 +- .../directives/onClickAway.directive.js | 44 +- .../directives/safeSubmit.directive.js | 72 +- .../angular/filters/mailto.filter.js | 6 +- .../angular/filters/personName.filter.js | 26 +- .../angular/filters/phone.filter.js | 80 +- .../angular/filters/translation.filter.js | 10 +- app/assets/javascripts/angular/main.js | 6 +- .../javascripts/angular/rollbar.config.js | 280 +-- .../angular/services/analyticsService.js | 295 ++- .../angular/services/asyncBindings.service.js | 87 +- .../services/authentication.service.js | 401 ++- .../angular/services/confirmModal.service.js | 64 +- .../angular/services/error.service.spec.js | 231 +- .../angular/services/error/error.service.js | 236 +- .../errorRetryToastTemplate.directive.js | 12 +- .../angular/services/facebookService.js | 82 +- .../angular/services/geoData.service.js | 38 +- .../angular/services/geoData.service.spec.js | 46 +- .../angular/services/groups.service.js | 508 ++-- .../angular/services/groups.service.spec.js | 716 +++--- .../angular/services/httpProxy.service.js | 456 ++-- .../services/httpProxy.service.spec.js | 711 +++--- .../angular/services/interactions.service.js | 335 ++- .../services/interactions.service.spec.js | 500 ++-- .../angular/services/labels.service.js | 167 +- .../angular/services/labels.service.spec.js | 376 ++- .../angular/services/localStorage.service.js | 32 +- .../services/loggedInPerson.service.js | 164 +- .../services/loggedInPerson.service.spec.js | 174 +- .../services/ministryViewTabs.service.js | 16 +- .../angular/services/models.service.js | 220 +- .../angular/services/models.service.spec.js | 42 +- .../angular/services/oktaService.js | 65 +- .../angular/services/organization.service.js | 283 +-- .../services/organization.service.spec.js | 203 +- .../angular/services/peopleSearch.service.js | 38 +- .../services/peopleSearch.service.spec.js | 100 +- .../angular/services/period.service.js | 109 +- .../angular/services/permission.service.js | 16 +- .../angular/services/person.service.js | 661 +++-- .../angular/services/person.service.spec.js | 584 +++-- .../angular/services/personSelection.js | 96 +- .../services/personSelection.service.spec.js | 224 +- .../angular/services/personTabs.service.js | 7 +- .../services/progressiveListLoader.service.js | 121 +- .../progressiveListLoader.service.spec.js | 231 +- .../angular/services/reports.service.js | 338 ++- .../angular/services/reports.service.spec.js | 551 ++--- .../services/requestDeduper.service.js | 66 +- .../services/requestDeduper.service.spec.js | 164 +- .../angular/services/routes.service.js | 157 +- .../services/sessionStorage.service.js | 32 +- .../angular/services/state.service.js | 8 +- .../angular/services/survey.service.js | 621 +++-- .../angular/services/survey.service.spec.js | 133 +- .../angular/services/urlHashParserService.js | 36 +- .../services/userPreferences.service.js | 163 +- .../services/userPreferences.service.spec.js | 278 +-- .../angular/workboxServiceWorker.ts | 20 +- .../authentication/authLanding.component.js | 2 +- .../authentication/authLanding.html | 10 +- .../impersonateUser.component.js | 26 +- .../authentication/inviteLink.component.js | 111 +- app/components/authentication/inviteLink.html | 16 +- .../authentication/mergeAccount.component.js | 97 +- .../authentication/mergeAccount.html | 71 +- .../authentication/signIn.component.js | 50 +- app/components/authentication/signIn.html | 60 +- .../navigation/navHeader.component.js | 33 +- app/components/navigation/navHeader.html | 193 +- .../navigation/navSearch.component.js | 10 +- app/components/navigation/navSearch.html | 117 +- babel.config.js | 6 +- bin/oneskyDownload.js | 41 +- bin/oneskyUpload.js | 38 +- karma.conf.js | 103 +- src/i18n/i18next.config.js | 34 +- src/i18n/locales/en-US.js | 2145 ++++++++--------- webpack.config.js | 347 ++- yarn.lock | 119 + 306 files changed, 20702 insertions(+), 25153 deletions(-) diff --git a/app/app.component.js b/app/app.component.js index 74d914f04f..0b406bd0b9 100644 --- a/app/app.component.js +++ b/app/app.component.js @@ -3,43 +3,37 @@ import './components/navigation/navHeader.component'; import './app.scss'; angular.module('campusContactsApp').component('app', { - controller: appController, - template: template, - bindings: { - hideHeader: '<', - hideFooter: '<', - hideMenuLinks: '<', - }, + controller: appController, + template, + bindings: { + hideHeader: '<', + hideFooter: '<', + hideMenuLinks: '<', + }, }); function appController(periodService, $rootScope, analyticsService) { - let deregisterEditOrganizationsEvent; - let deregisterStateChangedEvent; + let deregisterEditOrganizationsEvent; + let deregisterStateChangedEvent; - this.editOrganizations = false; - this.getPeriod = periodService.getPeriod; + this.editOrganizations = false; + this.getPeriod = periodService.getPeriod; - this.$onInit = () => { - this.year = new Date(); + this.$onInit = () => { + this.year = new Date(); - deregisterStateChangedEvent = $rootScope.$on( - 'state:changed', - (event, { loggedIn }) => { - if (loggedIn) analyticsService.setupAuthenitcatedAnalyticData(); - else analyticsService.clearAuthenticatedData(); - }, - ); + deregisterStateChangedEvent = $rootScope.$on('state:changed', (event, { loggedIn }) => { + if (loggedIn) analyticsService.setupAuthenitcatedAnalyticData(); + else analyticsService.clearAuthenticatedData(); + }); - deregisterEditOrganizationsEvent = $rootScope.$on( - 'editOrganizations', - (event, value) => { - this.editOrganizations = value; - }, - ); - }; + deregisterEditOrganizationsEvent = $rootScope.$on('editOrganizations', (event, value) => { + this.editOrganizations = value; + }); + }; - this.$onDestroy = () => { - deregisterEditOrganizationsEvent(); - deregisterStateChangedEvent(); - }; + this.$onDestroy = () => { + deregisterEditOrganizationsEvent(); + deregisterStateChangedEvent(); + }; } diff --git a/app/app.html b/app/app.html index d88b27d499..ffc2b69be6 100644 --- a/app/app.html +++ b/app/app.html @@ -1,34 +1,26 @@
- - - + + +
- +
diff --git a/app/assets/javascripts/angular/all-tests.spec.js b/app/assets/javascripts/angular/all-tests.spec.js index cdbeed68e1..64009db5b7 100644 --- a/app/assets/javascripts/angular/all-tests.spec.js +++ b/app/assets/javascripts/angular/all-tests.spec.js @@ -3,12 +3,13 @@ import angular from 'angular'; import 'angular-mocks'; class OktaAuth { - constructor(config) { - this.token = ''; - this.tokenManager = {}; - } - start() {} - signOut() {} + constructor(config) { + this.token = ''; + this.tokenManager = {}; + } + + start() {} + signOut() {} } window.OktaAuth = OktaAuth; @@ -16,19 +17,17 @@ window.OktaAuth = OktaAuth; beforeEach(angular.mock.module('campusContactsApp')); beforeEach( - angular.mock.module({ - analyticsService: { - init: jasmine.createSpy('init'), - track: jasmine.createSpy('track'), - }, - authenticationService: { - storeJwtToken: jasmine.createSpy('storeJwtToken'), - removeAccess: jasmine.createSpy('removeAccess'), - isTokenValid: jasmine - .createSpy('isTokenValid') - .and.returnValue(false), - }, - }), + angular.mock.module({ + analyticsService: { + init: jasmine.createSpy('init'), + track: jasmine.createSpy('track'), + }, + authenticationService: { + storeJwtToken: jasmine.createSpy('storeJwtToken'), + removeAccess: jasmine.createSpy('removeAccess'), + isTokenValid: jasmine.createSpy('isTokenValid').and.returnValue(false), + }, + }), ); /* global require */ diff --git a/app/assets/javascripts/angular/campusContactsApp.config.js b/app/assets/javascripts/angular/campusContactsApp.config.js index 40ce19501e..8bec653b58 100644 --- a/app/assets/javascripts/angular/campusContactsApp.config.js +++ b/app/assets/javascripts/angular/campusContactsApp.config.js @@ -1,145 +1,143 @@ angular - .module('campusContactsApp') - .config((envServiceProvider) => { - envServiceProvider.config({ - domains: { - development: ['localhost'], - production: ['campuscontacts.cru.org', 'ccontacts.app'], - staging: [ - // These wildcards need to be the last domains so they don't override matches above - '*.campuscontacts.cru.org', - '*.ccontacts.app', - '*.d23um2gb8xlk6n.amplifyapp.com', - ], - }, - vars: { - development: { - apiUrl: 'https://campus-contacts-api-stage.cru.org/apis/v4', - publicUri: 'https://localhost:8080', - oktaClientId: '0oa1oqxpke9BXTbhp0h8', - facebookAppId: '264148437992398', - surveyLinkPrefix: 'http://localhost:8080/s/', - }, - staging: { - apiUrl: 'https://campus-contacts-api-stage.cru.org/apis/v4', - publicUri: 'https://stage.campuscontacts.cru.org', - oktaClientId: '0oa1oqxpke9BXTbhp0h8', - facebookAppId: '264148437992398', - surveyLinkPrefix: 'https://stage.ccontacts.app/s/', - }, - production: { - apiUrl: 'https://campus-contacts-api.cru.org/apis/v4', - publicUri: 'https://campuscontacts.cru.org', - oktaClientId: '0oa1oqxpke9BXTbhp0h8', - facebookAppId: '264148437992398', - surveyLinkPrefix: 'https://ccontacts.app/s/', - googleAnalytics: 'UA-325725-21', - }, - defaults: { - oktaUrl: 'https://signon.okta.com', - googleAnalytics: 'UA-XXXXXX-XX', - }, - }, - }); + .module('campusContactsApp') + .config((envServiceProvider) => { + envServiceProvider.config({ + domains: { + development: ['localhost'], + production: ['campuscontacts.cru.org', 'ccontacts.app'], + staging: [ + // These wildcards need to be the last domains so they don't override matches above + '*.campuscontacts.cru.org', + '*.ccontacts.app', + '*.d23um2gb8xlk6n.amplifyapp.com', + ], + }, + vars: { + development: { + apiUrl: 'https://campus-contacts-api-stage.cru.org/apis/v4', + publicUri: 'https://localhost:8080', + oktaClientId: '0oa1oqxpke9BXTbhp0h8', + facebookAppId: '264148437992398', + surveyLinkPrefix: 'http://localhost:8080/s/', + }, + staging: { + apiUrl: 'https://campus-contacts-api-stage.cru.org/apis/v4', + publicUri: 'https://stage.campuscontacts.cru.org', + oktaClientId: '0oa1oqxpke9BXTbhp0h8', + facebookAppId: '264148437992398', + surveyLinkPrefix: 'https://stage.ccontacts.app/s/', + }, + production: { + apiUrl: 'https://campus-contacts-api.cru.org/apis/v4', + publicUri: 'https://campuscontacts.cru.org', + oktaClientId: '0oa1oqxpke9BXTbhp0h8', + facebookAppId: '264148437992398', + surveyLinkPrefix: 'https://ccontacts.app/s/', + googleAnalytics: 'UA-325725-21', + }, + defaults: { + oktaUrl: 'https://signon.okta.com', + googleAnalytics: 'UA-XXXXXX-XX', + }, + }, + }); - // run the environment check, so the comprobation is made - // before controllers and services are built - envServiceProvider.check(); - }) - .config(($compileProvider) => { - // Customized in order to add sms. Can retrieve original whitelist by calling it with no arguments. https://docs.angularjs.org/api/ng/provider/$compileProvider#aHrefSanitizationWhitelist - $compileProvider.aHrefSanitizationWhitelist( - /^\s*(https?|ftp|mailto|tel|sms|webcal|local|file|data|blob):/, - ); - }) - .config(($analyticsProvider) => { - $analyticsProvider.firstPageview(false); - $analyticsProvider.virtualPageviews(false); - }) - .config((ngMdIconServiceProvider, $qProvider) => { - /* eslint-disable max-len */ - ngMdIconServiceProvider - .addViewBox('holySpirit', '0 0 48 48') - .addViewBox('uncontactedPerson', '0 0 48 48') - .addViewBox('assignedPeople', '0 0 48 48') - .addViewBox('unassignedPerson', '0 0 48 48') - .addViewBox('spiritualConversation', '0 0 48 48') - .addViewBox('evangelism', '0 0 48 48') - .addViewBox('personalDecision', '0 0 48 48') - .addViewBox('discipleship', '0 0 48 48') - .addViewBox('archive', '0 0 48 48') - .addViewBox('addPerson', '0 0 48 48') - .addViewBox('email', '0 0 48 48') - .addViewBox('add', '0 0 48 48') - .addViewBox('phone', '0 0 48 48') - .addViewBox('close', '0 0 48 48') - .addViewBox('edit', '0 0 48 48') - .addViewBox('note', '0 0 48 48') - .addShapes({ - edit: - '', - unassignedPerson: - '', - phone: - '', - close: - '', - dashboard: - '' + - '' + - '', - discipleship: - '', - assignedPeople: - '', - uncontactedPerson: - '', - holySpirit: - '', - personalDecision: - '', - evangelism: - '', - survey: - '' + - '' + - '', - add: - '', - addPerson: - '', - snooze: - '' + - '' + - '', - dragHandle: - '' + - '' + - '', - visibilityOn: - '' + - '' + - '', - visibilityOff: - '' + - '' + - '', - editOrder: - '' + - '' + - '', - email: - '' + - '', - spiritualConversation: - '', - note: - '', - archive: - '', - }); + // run the environment check, so the comprobation is made + // before controllers and services are built + envServiceProvider.check(); + }) + .config(($compileProvider) => { + // Customized in order to add sms. Can retrieve original whitelist by calling it with no arguments. https://docs.angularjs.org/api/ng/provider/$compileProvider#aHrefSanitizationWhitelist + $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|sms|webcal|local|file|data|blob):/); + }) + .config(($analyticsProvider) => { + $analyticsProvider.firstPageview(false); + $analyticsProvider.virtualPageviews(false); + }) + .config((ngMdIconServiceProvider, $qProvider) => { + /* eslint-disable max-len */ + ngMdIconServiceProvider + .addViewBox('holySpirit', '0 0 48 48') + .addViewBox('uncontactedPerson', '0 0 48 48') + .addViewBox('assignedPeople', '0 0 48 48') + .addViewBox('unassignedPerson', '0 0 48 48') + .addViewBox('spiritualConversation', '0 0 48 48') + .addViewBox('evangelism', '0 0 48 48') + .addViewBox('personalDecision', '0 0 48 48') + .addViewBox('discipleship', '0 0 48 48') + .addViewBox('archive', '0 0 48 48') + .addViewBox('addPerson', '0 0 48 48') + .addViewBox('email', '0 0 48 48') + .addViewBox('add', '0 0 48 48') + .addViewBox('phone', '0 0 48 48') + .addViewBox('close', '0 0 48 48') + .addViewBox('edit', '0 0 48 48') + .addViewBox('note', '0 0 48 48') + .addShapes({ + edit: + '', + unassignedPerson: + '', + phone: + '', + close: + '', + dashboard: + '' + + '' + + '', + discipleship: + '', + assignedPeople: + '', + uncontactedPerson: + '', + holySpirit: + '', + personalDecision: + '', + evangelism: + '', + survey: + '' + + '' + + '', + add: + '', + addPerson: + '', + snooze: + '' + + '' + + '', + dragHandle: + '' + + '' + + '', + visibilityOn: + '' + + '' + + '', + visibilityOff: + '' + + '' + + '', + editOrder: + '' + + '' + + '', + email: + '' + + '', + spiritualConversation: + '', + note: + '', + archive: + '', + }); - /* eslint-enable max-len */ + /* eslint-enable max-len */ - $qProvider.errorOnUnhandledRejections(false); - }); + $qProvider.errorOnUnhandledRejections(false); + }); diff --git a/app/assets/javascripts/angular/campusContactsApp.constants.js b/app/assets/javascripts/angular/campusContactsApp.constants.js index 0f13a86da2..ce50fa3755 100644 --- a/app/assets/javascripts/angular/campusContactsApp.constants.js +++ b/app/assets/javascripts/angular/campusContactsApp.constants.js @@ -2,8 +2,8 @@ import _ from 'lodash'; import moment from 'moment'; angular - .module('campusContactsApp') - .constant('_', _) - .constant('moment', moment) - .constant('p2cOrgId', '8411') - .constant('rollbarAccessToken', 'e749b290a241465b9e70c9cf93124721'); + .module('campusContactsApp') + .constant('_', _) + .constant('moment', moment) + .constant('p2cOrgId', '8411') + .constant('rollbarAccessToken', 'e749b290a241465b9e70c9cf93124721'); diff --git a/app/assets/javascripts/angular/campusContactsApp.module.js b/app/assets/javascripts/angular/campusContactsApp.module.js index b213ac6bb6..e67f4a914e 100644 --- a/app/assets/javascripts/angular/campusContactsApp.module.js +++ b/app/assets/javascripts/angular/campusContactsApp.module.js @@ -20,19 +20,19 @@ import 'moment'; import 'angular-smart-table'; export default angular.module('campusContactsApp', [ - ngAnimate, - ngMdIcons, - 'beauby.jsonApiDataStore', - ngEnvironment, - uiRouter, - uiSelect, - 'ng-sortable', - uiBootstrap, - ngFileUpload, - ngInfiniteScroll, - 'toaster', - ngScrollGlue, - angulartics, - angularticsGoogle, - 'smart-table', + ngAnimate, + ngMdIcons, + 'beauby.jsonApiDataStore', + ngEnvironment, + uiRouter, + uiSelect, + 'ng-sortable', + uiBootstrap, + ngFileUpload, + ngInfiniteScroll, + 'toaster', + ngScrollGlue, + angulartics, + angularticsGoogle, + 'smart-table', ]); diff --git a/app/assets/javascripts/angular/campusContactsApp.routes.js b/app/assets/javascripts/angular/campusContactsApp.routes.js index 48e2c81e64..9b1a29df3d 100644 --- a/app/assets/javascripts/angular/campusContactsApp.routes.js +++ b/app/assets/javascripts/angular/campusContactsApp.routes.js @@ -1,678 +1,595 @@ angular - .module('campusContactsApp') - .config(function ( - $stateProvider, - $locationProvider, - $urlServiceProvider, - $uibResolveProvider, - asyncBindingsServiceProvider, - ministryViewTabs, - ministryViewDefaultTab, - personTabs, - personDefaultTab, - _, - ) { - // Instantiate factories - var asyncBindingsService = asyncBindingsServiceProvider.$get(); + .module('campusContactsApp') + .config(function ( + $stateProvider, + $locationProvider, + $urlServiceProvider, + $uibResolveProvider, + asyncBindingsServiceProvider, + ministryViewTabs, + ministryViewDefaultTab, + personTabs, + personDefaultTab, + _, + ) { + // Instantiate factories + const asyncBindingsService = asyncBindingsServiceProvider.$get(); - // Convenience alias - var lazyLoadedResolve = asyncBindingsService.lazyLoadedResolve; + // Convenience alias + const lazyLoadedResolve = asyncBindingsService.lazyLoadedResolve; - // Hack $stateProvider.state to support a custom state property "modal" that turns the state into a modal - // dialog. An Angular decorator would be preferable, but there is no way of decorating a provider. - var originalState = $stateProvider.state; - $stateProvider.state = function (state) { - var transform = state.modal ? modalState : _.identity; - return originalState(transform(state)); - }; + // Hack $stateProvider.state to support a custom state property "modal" that turns the state into a modal + // dialog. An Angular decorator would be preferable, but there is no way of decorating a provider. + const originalState = $stateProvider.state; + $stateProvider.state = function (state) { + const transform = state.modal ? modalState : _.identity; + return originalState(transform(state)); + }; - // Add a states helper method that defines an array of states all at once - $stateProvider.states = function (states) { - states.forEach(function (state) { - $stateProvider.state(state); - }); - return $stateProvider; - }; + // Add a states helper method that defines an array of states all at once + $stateProvider.states = function (states) { + states.forEach(function (state) { + $stateProvider.state(state); + }); + return $stateProvider; + }; - // Use the ui-router resolver so that we can correctly resolve ui-router injectables like $transition$ in - // $uibModal resolve blocks. - $uibResolveProvider.setResolver('$resolve'); + // Use the ui-router resolver so that we can correctly resolve ui-router injectables like $transition$ in + // $uibModal resolve blocks. + $uibResolveProvider.setResolver('$resolve'); - // Return the parent state name of a ui-router state name - function getParentState(stateName) { - // Drop the last part of the state to get the parent state - return _.chain(stateName).split('.').initial().join('.').value(); - } + // Return the parent state name of a ui-router state name + function getParentState(stateName) { + // Drop the last part of the state to get the parent state + return _.chain(stateName).split('.').initial().join('.').value(); + } - // Convert a normal ui-router state definition into a state representing a modal dialog - function modalState(state) { - var modalInstance = null; - var closedByRouteChange; - return { - name: state.name, - url: state.url, - abstract: state.abstract, - params: state.params, - onEnter: /* @ngInject */ function ($state, $uibModal) { - closedByRouteChange = false; + // Convert a normal ui-router state definition into a state representing a modal dialog + function modalState(state) { + let modalInstance = null; + let closedByRouteChange; + return { + name: state.name, + url: state.url, + abstract: state.abstract, + params: state.params, + onEnter: /* @ngInject */ function ($state, $uibModal) { + closedByRouteChange = false; - // The final generated template will look like this: - // - var injectedProps = _.keys(state.resolve); - var attributes = injectedProps.map(function (property) { - return ( - _.kebabCase(property) + '="$ctrl.' + property + '"' - ); - }); - var directive = _.kebabCase(state.component); - var template = - '<' + - directive + - ' ' + - attributes.join(' ') + - '>'; + // The final generated template will look like this: + // + const injectedProps = _.keys(state.resolve); + const attributes = injectedProps.map(function (property) { + return _.kebabCase(property) + '="$ctrl.' + property + '"'; + }); + const directive = _.kebabCase(state.component); + const template = '<' + directive + ' ' + attributes.join(' ') + '>'; - modalInstance = $uibModal.open({ - animation: true, - template: template, + modalInstance = $uibModal.open({ + animation: true, + template, - // Explicitly inject the injected properties as dependencies - controller: injectedProps.concat([ - function () { - var vm = this; + // Explicitly inject the injected properties as dependencies + controller: injectedProps.concat([ + function () { + const vm = this; - var injectedValues = arguments; - var injections = _.zipObject( - injectedProps, - injectedValues, - ); - _.extend(vm, injections); - }, - ]), - controllerAs: '$ctrl', - resolve: state.resolve, - windowClass: 'dashboard_panels pivot_theme', - }); + const injectedValues = arguments; + const injections = _.zipObject(injectedProps, injectedValues); + _.extend(vm, injections); + }, + ]), + controllerAs: '$ctrl', + resolve: state.resolve, + windowClass: 'dashboard_panels pivot_theme', + }); - modalInstance.result.finally(function () { - modalInstance = null; + modalInstance.result.finally(function () { + modalInstance = null; - if (closedByRouteChange) { - // The modal was closed as a result of a route change, so we should not modify the route - return; - } + if (closedByRouteChange) { + // The modal was closed as a result of a route change, so we should not modify the route + return; + } - $state.go(getParentState(state.name)); - }); - }, - onExit: function () { - if (modalInstance) { - closedByRouteChange = true; - modalInstance.close(); - } - }, - }; - } + $state.go(getParentState(state.name)); + }); + }, + onExit: function () { + if (modalInstance) { + closedByRouteChange = true; + modalInstance.close(); + } + }, + }; + } - // A dictionary of extra resolves needed by each component - // The key is the tab name and the name is a dictionary of extra resolves - var personTabResolves = { - history: { - history: lazyLoadedResolve( - /* @ngInject */ function ($uiRouter, routesService) { - var $transition$ = $uiRouter.globals.transition; - return routesService.getHistory( - $transition$.params().personId, - ); - }, - ), - }, - }; + // A dictionary of extra resolves needed by each component + // The key is the tab name and the name is a dictionary of extra resolves + const personTabResolves = { + history: { + history: lazyLoadedResolve( + /* @ngInject */ function ($uiRouter, routesService) { + const $transition$ = $uiRouter.globals.transition; + return routesService.getHistory($transition$.params().personId); + }, + ), + }, + }; - // Generate and return an array of the states needed for the personPage component - // The "state" parameter is the state definition that will contain the person page, including its tabs - function generatePersonPageStates(state) { - var states = []; + // Generate and return an array of the states needed for the personPage component + // The "state" parameter is the state definition that will contain the person page, including its tabs + function generatePersonPageStates(state) { + const states = []; - // Generate the container state - states.push({ - name: state.name, - url: state.url, - component: 'personPage', - abstract: true, - params: _.extend( - { - assignToMe: { type: 'bool', value: false }, - }, - state.params, - ), - modal: state.modal, - resolve: { - // We have to send the state name to the personPage component so that route links will work when - // the person page is in a modal. Relative ui-state directives work fine when the person page is - // a component. However, when it is a modal, apparently the component created by uib-modal does - // not know the state that it was created from, so those relative links will all be broken. To - // solve this, we send the state name to the component so that it can generate absolute links - // based on its current state. - stateName: _.constant(state.name), - person: lazyLoadedResolve( - /* @ngInject */ function ( - $state, - $uiRouter, - routesService, - personService, - ) { - // Ideally, we would inject $transition$, an object representing that ui-router makes - // available to states' resolves. However, when the state is refers to a state in a modal, - // the resolve will not have access to that transition, so we have to get it from the - // a ui-router global that is injectable everywhere. - var $transition$ = $uiRouter.globals.transition; - var params = $transition$.params(); + // Generate the container state + states.push({ + name: state.name, + url: state.url, + component: 'personPage', + abstract: true, + params: _.extend( + { + assignToMe: { type: 'bool', value: false }, + }, + state.params, + ), + modal: state.modal, + resolve: { + // We have to send the state name to the personPage component so that route links will work when + // the person page is in a modal. Relative ui-state directives work fine when the person page is + // a component. However, when it is a modal, apparently the component created by uib-modal does + // not know the state that it was created from, so those relative links will all be broken. To + // solve this, we send the state name to the component so that it can generate absolute links + // based on its current state. + stateName: _.constant(state.name), + person: lazyLoadedResolve( + /* @ngInject */ function ($state, $uiRouter, routesService, personService) { + // Ideally, we would inject $transition$, an object representing that ui-router makes + // available to states' resolves. However, when the state is refers to a state in a modal, + // the resolve will not have access to that transition, so we have to get it from the + // a ui-router global that is injectable everywhere. + const $transition$ = $uiRouter.globals.transition; + const params = $transition$.params(); - if (params.personId === 'new') { - // We are creating a new person instead of editing an existing one, so generate that - // new person model - return personService.getNewPerson(params.orgId); - } + if (params.personId === 'new') { + // We are creating a new person instead of editing an existing one, so generate that + // new person model + return personService.getNewPerson(params.orgId); + } - return routesService - .getPerson(params.personId) - .catch(function () { - // Go back to the parent state if the person could not be found - $state.go(getParentState(state.name), { - orgId: params.orgId, - }); + return routesService.getPerson(params.personId).catch(function () { + // Go back to the parent state if the person could not be found + $state.go(getParentState(state.name), { + orgId: params.orgId, + }); - throw new Error( - 'Person could not be loaded', - ); - }); - }, - ), + throw new Error('Person could not be loaded'); + }); + }, + ), - organizationId: /* @ngInject */ ($uiRouter) => { - const $transition$ = $uiRouter.globals.transition; - return $transition$.params().orgId - ? $transition$.params().orgId - : false; - }, + organizationId: /* @ngInject */ ($uiRouter) => { + const $transition$ = $uiRouter.globals.transition; + return $transition$.params().orgId ? $transition$.params().orgId : false; + }, - options: /* @ngInject */ function ($uiRouter) { - var $transition$ = $uiRouter.globals.transition; - return { - assignToMe: $transition$.params().assignToMe, - }; - }, - }, - }); + options: /* @ngInject */ function ($uiRouter) { + const $transition$ = $uiRouter.globals.transition; + return { + assignToMe: $transition$.params().assignToMe, + }; + }, + }, + }); - // Generate a state for each tab - personTabs.forEach(function (tab) { - var personTabView = { - component: 'person' + _.capitalize(tab), - }; - states.push({ - name: state.name + '.' + tab, - url: '/' + tab, - resolve: personTabResolves[tab], - views: state.modal - ? { 'personTab@': personTabView } - : { personTab: personTabView }, - }); - }); + // Generate a state for each tab + personTabs.forEach(function (tab) { + const personTabView = { + component: 'person' + _.capitalize(tab), + }; + states.push({ + name: state.name + '.' + tab, + url: '/' + tab, + resolve: personTabResolves[tab], + views: state.modal ? { 'personTab@': personTabView } : { personTab: personTabView }, + }); + }); - // Generate the default tab state - states.push({ - name: state.name + '.defaultTab', - redirectTo: state.name + '.' + personDefaultTab, - }); + // Generate the default tab state + states.push({ + name: state.name + '.defaultTab', + redirectTo: state.name + '.' + personDefaultTab, + }); - return states; - } + return states; + } - $stateProvider - .state({ - name: 'app', - url: '', - abstract: true, - component: 'app', - resolve: { - hideHeader: () => false, - hideFooter: () => false, - hideMenuLinks: () => false, - }, - }) - .state({ - name: 'appWithoutMenus', - url: '', - abstract: true, - component: 'app', - resolve: { - hideHeader: () => true, - hideFooter: () => true, - hideMenuLinks: () => false, - }, - }) - .state({ - name: 'appWithoutMenuLinks', - url: '', - abstract: true, - component: 'app', - resolve: { - hideHeader: () => false, - hideFooter: () => false, - hideMenuLinks: () => true, - }, - }) - .state({ - name: 'app.signIn', - url: '/sign-in?previousUri', - component: 'signIn', - data: { - isPublic: true, - }, - }) - .state({ - name: 'appWithoutMenus.unsubscribe', - url: '/unsubscribe', - component: 'unsubscribe', - data: { - isPublic: true, - }, - resolve: { - token: ($location) => $location.search().token, - organizationId: ($location) => - $location.search().organization_id, - organizationName: ($location) => - $location.search().organization_name, - }, - }) - .state({ - name: 'appWithoutMenuLinks.auth', - url: '/auth-web?access_token', - component: 'signIn', - resolve: { - accessToken: ($location, urlHashParserService) => { - return urlHashParserService.param('access_token'); - }, - }, - data: { - isPublic: true, - }, - }) - .state({ - name: 'appWithoutMenuLinks.authLanding', - url: '/auth', - component: 'authLanding', - data: { - isPublic: true, - }, - }) - .state({ - name: 'appWithoutMenus.mergeAccount', - url: '/merge-account/:rememberCode/:orgId/:userId', - component: 'mergeAccount', - resolve: { - rememberCode: ($transition$) => - $transition$.params().rememberCode, - userId: ($transition$) => $transition$.params().userId, - orgId: ($transition$) => $transition$.params().orgId, - loggedInUser: (loggedInPerson) => loggedInPerson.load(), - }, - }) - .state({ - name: 'app.impersonateUser', - url: '/impersonate-user/:userId', - component: 'impersonateUser', - resolve: { - userId: ($state, $transition$) => - $transition$.params().userId, - }, - }) - .state({ - name: 'app.stopImpersonatingUser', - url: '/stop-impersonation', - component: 'impersonateUser', - }) - .state({ - name: 'admin', - url: '/admin', - resolve: { - adminRedirect: (authenticationService) => - authenticationService.adminRedirect(), - }, - }) - .state({ - name: 'app.people', - url: '/people', - template: - '', - }) - .states( - generatePersonPageStates({ - name: 'app.people.new', - url: '/new?orgId', - modal: true, - params: { - orgId: { value: null }, - personId: { value: 'new' }, - }, - }), - ) - .state({ - name: 'app.ministries', - url: '/ministries', - abstract: true, - template: - '', - }) - .state({ - name: 'app.ministries.root', - url: '/root', - component: 'myOrganizationsDashboardList', - resolve: { - rootOrgs: function ( - myOrganizationsDashboardService, - userPreferencesService, - $q, - $state, - ) { - return myOrganizationsDashboardService - .getRootOrganizations() - .then( - userPreferencesService.applyUserOrgDisplayPreferences, - ) - .then((orgs) => { - if (orgs.length === 1) { - $state.go( - 'app.ministries.ministry.' + - ministryViewDefaultTab, - { orgId: orgs[0].id }, - ); - return $q.reject( - 'cancel transition, re-route user to root org.', - ); - } - return orgs; - }); - }, - }, - }) - .state({ - name: 'app.ministries.signAgreements', - url: '/sign-agreements', - component: 'organizationSignaturesSign', - }) - .state({ - name: 'app.ministries.ministry', - url: '/:orgId', - component: 'organizationOverview', - abstract: true, - resolve: { - org: lazyLoadedResolve( - /* @ngInject */ function ( - $state, - $transition$, - routesService, - ) { - return routesService - .getOrganization($transition$.params().orgId) - .catch(function () { - // Go to the root organization if the organization could not be loaded - $state.go('app.ministries.root'); - - throw new Error( - 'Organization could not be loaded', - ); - }); - }, - ), - }, - }) - .state({ - name: 'app.ministries.ministry.import', - url: '/import', - component: 'organizationContactImport', - params: { - surveyId: null, - }, - resolve: { - surveyId: ($state, $transition$) => - $transition$.params().surveyId, - }, - }) - .state({ - name: 'app.ministries.ministry.management', - url: '/management', - component: 'orgManagement', - }) - .state({ - name: 'app.ministries.ministry.cleanup', - url: '/organization-cleanup', - component: 'organizationCleanup', - resolve: { - orgId: ($transition$) => $transition$.params().orgId, - }, - }) - .state({ - name: 'app.ministries.ministry.signatures', - url: '/organization-signatures', - component: 'organizationSignatures', - resolve: { - orgId: ($transition$) => $transition$.params().orgId, - }, - }) - .state({ - name: 'app.ministries.ministry.reportMovementIndicators', - url: '/report-movement-indicators', - component: 'reportMovementIndicators', - resolve: { - orgId: ($transition$) => $transition$.params().orgId, - }, - }) - .state({ - name: 'app.ministries.ministry.defaultTab', - redirectTo: 'app.ministries.ministry.' + ministryViewDefaultTab, - }) - .states( - generatePersonPageStates({ - name: 'app.ministries.ministry.people.new', - url: '/new', - modal: true, - params: { - personId: { value: 'new' }, - }, - }), - ) - .states( - ministryViewTabs.map(function (tab) { - const formatArrayForFilter = (filter) => { - if (!filter) return {}; + $stateProvider + .state({ + name: 'app', + url: '', + abstract: true, + component: 'app', + resolve: { + hideHeader: () => false, + hideFooter: () => false, + hideMenuLinks: () => false, + }, + }) + .state({ + name: 'appWithoutMenus', + url: '', + abstract: true, + component: 'app', + resolve: { + hideHeader: () => true, + hideFooter: () => true, + hideMenuLinks: () => false, + }, + }) + .state({ + name: 'appWithoutMenuLinks', + url: '', + abstract: true, + component: 'app', + resolve: { + hideHeader: () => false, + hideFooter: () => false, + hideMenuLinks: () => true, + }, + }) + .state({ + name: 'app.signIn', + url: '/sign-in?previousUri', + component: 'signIn', + data: { + isPublic: true, + }, + }) + .state({ + name: 'appWithoutMenus.unsubscribe', + url: '/unsubscribe', + component: 'unsubscribe', + data: { + isPublic: true, + }, + resolve: { + token: ($location) => $location.search().token, + organizationId: ($location) => $location.search().organization_id, + organizationName: ($location) => $location.search().organization_name, + }, + }) + .state({ + name: 'appWithoutMenuLinks.auth', + url: '/auth-web?access_token', + component: 'signIn', + resolve: { + accessToken: ($location, urlHashParserService) => { + return urlHashParserService.param('access_token'); + }, + }, + data: { + isPublic: true, + }, + }) + .state({ + name: 'appWithoutMenuLinks.authLanding', + url: '/auth', + component: 'authLanding', + data: { + isPublic: true, + }, + }) + .state({ + name: 'appWithoutMenus.mergeAccount', + url: '/merge-account/:rememberCode/:orgId/:userId', + component: 'mergeAccount', + resolve: { + rememberCode: ($transition$) => $transition$.params().rememberCode, + userId: ($transition$) => $transition$.params().userId, + orgId: ($transition$) => $transition$.params().orgId, + loggedInUser: (loggedInPerson) => loggedInPerson.load(), + }, + }) + .state({ + name: 'app.impersonateUser', + url: '/impersonate-user/:userId', + component: 'impersonateUser', + resolve: { + userId: ($state, $transition$) => $transition$.params().userId, + }, + }) + .state({ + name: 'app.stopImpersonatingUser', + url: '/stop-impersonation', + component: 'impersonateUser', + }) + .state({ + name: 'admin', + url: '/admin', + resolve: { + adminRedirect: (authenticationService) => authenticationService.adminRedirect(), + }, + }) + .state({ + name: 'app.people', + url: '/people', + template: '', + }) + .states( + generatePersonPageStates({ + name: 'app.people.new', + url: '/new?orgId', + modal: true, + params: { + orgId: { value: null }, + personId: { value: 'new' }, + }, + }), + ) + .state({ + name: 'app.ministries', + url: '/ministries', + abstract: true, + template: '', + }) + .state({ + name: 'app.ministries.root', + url: '/root', + component: 'myOrganizationsDashboardList', + resolve: { + rootOrgs: function (myOrganizationsDashboardService, userPreferencesService, $q, $state) { + return myOrganizationsDashboardService + .getRootOrganizations() + .then(userPreferencesService.applyUserOrgDisplayPreferences) + .then((orgs) => { + if (orgs.length === 1) { + $state.go('app.ministries.ministry.' + ministryViewDefaultTab, { orgId: orgs[0].id }); + return $q.reject('cancel transition, re-route user to root org.'); + } + return orgs; + }); + }, + }, + }) + .state({ + name: 'app.ministries.signAgreements', + url: '/sign-agreements', + component: 'organizationSignaturesSign', + }) + .state({ + name: 'app.ministries.ministry', + url: '/:orgId', + component: 'organizationOverview', + abstract: true, + resolve: { + org: lazyLoadedResolve( + /* @ngInject */ function ($state, $transition$, routesService) { + return routesService.getOrganization($transition$.params().orgId).catch(function () { + // Go to the root organization if the organization could not be loaded + $state.go('app.ministries.root'); - return filter - .split(',') - .reduce( - (acc, value) => ({ ...acc, [value]: true }), - {}, - ); - }; + throw new Error('Organization could not be loaded'); + }); + }, + ), + }, + }) + .state({ + name: 'app.ministries.ministry.import', + url: '/import', + component: 'organizationContactImport', + params: { + surveyId: null, + }, + resolve: { + surveyId: ($state, $transition$) => $transition$.params().surveyId, + }, + }) + .state({ + name: 'app.ministries.ministry.management', + url: '/management', + component: 'orgManagement', + }) + .state({ + name: 'app.ministries.ministry.cleanup', + url: '/organization-cleanup', + component: 'organizationCleanup', + resolve: { + orgId: ($transition$) => $transition$.params().orgId, + }, + }) + .state({ + name: 'app.ministries.ministry.signatures', + url: '/organization-signatures', + component: 'organizationSignatures', + resolve: { + orgId: ($transition$) => $transition$.params().orgId, + }, + }) + .state({ + name: 'app.ministries.ministry.reportMovementIndicators', + url: '/report-movement-indicators', + component: 'reportMovementIndicators', + resolve: { + orgId: ($transition$) => $transition$.params().orgId, + }, + }) + .state({ + name: 'app.ministries.ministry.defaultTab', + redirectTo: 'app.ministries.ministry.' + ministryViewDefaultTab, + }) + .states( + generatePersonPageStates({ + name: 'app.ministries.ministry.people.new', + url: '/new', + modal: true, + params: { + personId: { value: 'new' }, + }, + }), + ) + .states( + ministryViewTabs.map(function (tab) { + const formatArrayForFilter = (filter) => { + if (!filter) return {}; - if (tab === 'people') { - return { - name: 'app.ministries.ministry.' + tab, - url: '/people?statuses=&assigned_to=', - component: - 'organizationOverview' + _.upperFirst(tab), - resolve: { - queryFilters: /* @ngInject */ ( - $transition$, - $location, - ) => { - const filters = $location.search(); + return filter.split(',').reduce((acc, value) => ({ ...acc, [value]: true }), {}); + }; - return { - ...(filters.assigned_to - ? { - assigned_tos: formatArrayForFilter( - filters.assigned_to, - ), - } - : {}), - ...(filters.statuses - ? { - statuses: formatArrayForFilter( - filters.statuses, - ), - } - : {}), - }; - }, - }, - }; - } + if (tab === 'people') { + return { + name: 'app.ministries.ministry.' + tab, + url: '/people?statuses=&assigned_to=', + component: 'organizationOverview' + _.upperFirst(tab), + resolve: { + queryFilters: /* @ngInject */ ($transition$, $location) => { + const filters = $location.search(); - return { - name: 'app.ministries.ministry.' + tab, - url: '/' + tab, - component: 'organizationOverview' + _.upperFirst(tab), - }; - }), - ) - .states( - generatePersonPageStates({ - name: 'app.people.person', - url: '/:personId/organization/:orgId', - modal: true, - params: { - orgId: { value: null }, - }, - }), - ) - .states( - generatePersonPageStates({ - name: 'app.people.myProfile', - url: '/:personId', - modal: true, - }), - ) - .states( - generatePersonPageStates({ - name: 'app.ministries.ministry.team.person', - url: '/:personId', - modal: true, - }), - ) - .states( - generatePersonPageStates({ - name: 'app.ministries.ministry.people.person', - url: '/:personId', - modal: false, - }), - ) - .states( - generatePersonPageStates({ - name: 'app.ministries.ministry.survey.responses.person', - url: '/:personId', - modal: false, - }), - ) - .state({ - name: 'app.userPreferences', - url: '/user-preferences', - template: '', - whiteBackground: true, - }) - .state({ - name: 'publicPhoneNumberValidation', - url: '/p/:code/:id', - component: 'publicPhoneNumberValidation', - data: { - isPublic: true, - }, - resolve: { - phoneNumberValidation: ( - $state, - $transition$, - routesService, - ) => { - return routesService - .getPhoneNumberValidation( - $transition$.params().code, - $transition$.params().id, - ) - .catch((e) => null); - }, - }, - }) - .state({ - name: 'appWithoutMenus.publicSurvey', - url: '/s/:surveyId?preview', - component: 'publicSurvey', - data: { - isPublic: true, - }, - resolve: { - survey: ($state, $transition$, routesService) => { - return routesService - .getSurvey($transition$.params().surveyId) - .catch((e) => null); - }, - preview: ($state, $transition$) => - !!$transition$.params().preview, - }, - }) - .state({ - name: 'appWithoutMenus.previewSurvey', - url: '/previewSurvey/:surveyId', - component: 'publicSurvey', - resolve: { - survey: ($state, $transition$, routesService) => - routesService.getSurvey($transition$.params().surveyId), - preview: () => true, - }, - }) - .state({ - name: 'appWithoutMenus.inviteLink', - url: '/l/:rememberCode/:orgId/:userId', - component: 'inviteLink', - data: { - isPublic: true, - }, - resolve: { - rememberCode: ($transition$) => - $transition$.params().rememberCode, - userId: ($transition$) => $transition$.params().userId, - orgId: ($transition$) => $transition$.params().orgId, - }, - }) - .state({ - name: 'app.ministries.ministry.survey', - url: '/survey/:surveyId', - abstract: true, - template: '', - resolve: { - survey: ($state, $transition$, routesService) => { - return routesService.getSurvey( - $transition$.params().surveyId, - ); - }, + return { + ...(filters.assigned_to + ? { + assigned_tos: formatArrayForFilter(filters.assigned_to), + } + : {}), + ...(filters.statuses + ? { + statuses: formatArrayForFilter(filters.statuses), + } + : {}), + }; }, - }) - .state({ - name: 'app.ministries.ministry.survey.manage', - url: '/', - component: 'surveyOverview', - }) - .state({ - name: 'app.ministries.ministry.survey.responses', - url: '/responses', - component: 'surveyResponses', - }); + }, + }; + } + + return { + name: 'app.ministries.ministry.' + tab, + url: '/' + tab, + component: 'organizationOverview' + _.upperFirst(tab), + }; + }), + ) + .states( + generatePersonPageStates({ + name: 'app.people.person', + url: '/:personId/organization/:orgId', + modal: true, + params: { + orgId: { value: null }, + }, + }), + ) + .states( + generatePersonPageStates({ + name: 'app.people.myProfile', + url: '/:personId', + modal: true, + }), + ) + .states( + generatePersonPageStates({ + name: 'app.ministries.ministry.team.person', + url: '/:personId', + modal: true, + }), + ) + .states( + generatePersonPageStates({ + name: 'app.ministries.ministry.people.person', + url: '/:personId', + modal: false, + }), + ) + .states( + generatePersonPageStates({ + name: 'app.ministries.ministry.survey.responses.person', + url: '/:personId', + modal: false, + }), + ) + .state({ + name: 'app.userPreferences', + url: '/user-preferences', + template: '', + whiteBackground: true, + }) + .state({ + name: 'publicPhoneNumberValidation', + url: '/p/:code/:id', + component: 'publicPhoneNumberValidation', + data: { + isPublic: true, + }, + resolve: { + phoneNumberValidation: ($state, $transition$, routesService) => { + return routesService + .getPhoneNumberValidation($transition$.params().code, $transition$.params().id) + .catch((e) => null); + }, + }, + }) + .state({ + name: 'appWithoutMenus.publicSurvey', + url: '/s/:surveyId?preview', + component: 'publicSurvey', + data: { + isPublic: true, + }, + resolve: { + survey: ($state, $transition$, routesService) => { + return routesService.getSurvey($transition$.params().surveyId).catch((e) => null); + }, + preview: ($state, $transition$) => !!$transition$.params().preview, + }, + }) + .state({ + name: 'appWithoutMenus.previewSurvey', + url: '/previewSurvey/:surveyId', + component: 'publicSurvey', + resolve: { + survey: ($state, $transition$, routesService) => routesService.getSurvey($transition$.params().surveyId), + preview: () => true, + }, + }) + .state({ + name: 'appWithoutMenus.inviteLink', + url: '/l/:rememberCode/:orgId/:userId', + component: 'inviteLink', + data: { + isPublic: true, + }, + resolve: { + rememberCode: ($transition$) => $transition$.params().rememberCode, + userId: ($transition$) => $transition$.params().userId, + orgId: ($transition$) => $transition$.params().orgId, + }, + }) + .state({ + name: 'app.ministries.ministry.survey', + url: '/survey/:surveyId', + abstract: true, + template: '', + resolve: { + survey: ($state, $transition$, routesService) => { + return routesService.getSurvey($transition$.params().surveyId); + }, + }, + }) + .state({ + name: 'app.ministries.ministry.survey.manage', + url: '/', + component: 'surveyOverview', + }) + .state({ + name: 'app.ministries.ministry.survey.responses', + url: '/responses', + component: 'surveyResponses', + }); - // This is the default URL if the URL does not match any routes - $urlServiceProvider.rules.otherwise('/people'); - $locationProvider.html5Mode(true); - }); + // This is the default URL if the URL does not match any routes + $urlServiceProvider.rules.otherwise('/people'); + $locationProvider.html5Mode(true); + }); diff --git a/app/assets/javascripts/angular/campusContactsApp.run.js b/app/assets/javascripts/angular/campusContactsApp.run.js index dea1082cee..c1cc4f3873 100644 --- a/app/assets/javascripts/angular/campusContactsApp.run.js +++ b/app/assets/javascripts/angular/campusContactsApp.run.js @@ -1,68 +1,64 @@ angular - .module('campusContactsApp') - .run(function ( - $window, - $rootScope, - $analytics, - $transitions, - localStorageService, - authenticationService, - loggedInPerson, - facebookService, - oktaService, - analyticsService, - state, - $location, - envService, - ) { - $rootScope.whiteBackground = false; - $transitions.onSuccess({}, (transition) => { - $rootScope.whiteBackground = !!transition.to().whiteBackground; - }); + .module('campusContactsApp') + .run(function ( + $window, + $rootScope, + $analytics, + $transitions, + localStorageService, + authenticationService, + loggedInPerson, + facebookService, + oktaService, + analyticsService, + state, + $location, + envService, + ) { + $rootScope.whiteBackground = false; + $transitions.onSuccess({}, (transition) => { + $rootScope.whiteBackground = !!transition.to().whiteBackground; + }); - $window.fbAsyncInit = function () { - facebookService.init(); - }; - oktaService.init(); + $window.fbAsyncInit = function () { + facebookService.init(); + }; + oktaService.init(); - if (authenticationService.isTokenValid()) - authenticationService.setupAuthenticationState(); + if (authenticationService.isTokenValid()) authenticationService.setupAuthenticationState(); - facebookService.loadSDK()(document); + facebookService.loadSDK()(document); - analyticsService.init(); + analyticsService.init(); - $transitions.onBefore({}, (transition) => { - if (transition.to().data && transition.to().data.isPublic) - return true; + $transitions.onBefore({}, (transition) => { + if (transition.to().data && transition.to().data.isPublic) return true; - if ($location.host().includes('ccontacts.app')) { - $window.location.href = envService.read('publicUri'); - return false; - } + if ($location.host().includes('ccontacts.app')) { + $window.location.href = envService.read('publicUri'); + return false; + } - if (!authenticationService.isTokenValid()) { - authenticationService.removeAccess(); - return transition.router.stateService.target('app.signIn', { - previousUri: $location.path(), - }); - } + if (!authenticationService.isTokenValid()) { + authenticationService.removeAccess(); + return transition.router.stateService.target('app.signIn', { + previousUri: $location.path(), + }); + } - if ( - transition.to().name !== 'app.ministries.signAgreements' && - state && - state.organization_with_missing_signatures_ids && - state.organization_with_missing_signatures_ids.length > 0 - ) { - return transition.router.stateService.target( - 'app.ministries.signAgreements', - ); - } + if ( + transition.to().name !== 'app.ministries.signAgreements' && + state && + state.organization_with_missing_signatures_ids && + state.organization_with_missing_signatures_ids.length > 0 + ) { + return transition.router.stateService.target('app.ministries.signAgreements'); + } - return loggedInPerson.loadOnce(); - }); + return loggedInPerson.loadOnce(); + }); - $transitions.onFinish({}, (transition) => { - analyticsService.track(transition); - }); + $transitions.onFinish({}, (transition) => { + analyticsService.track(transition); }); + }); diff --git a/app/assets/javascripts/angular/components/aboutModal/aboutModal.component.js b/app/assets/javascripts/angular/components/aboutModal/aboutModal.component.js index 584bc312c2..6a8e05560c 100644 --- a/app/assets/javascripts/angular/components/aboutModal/aboutModal.component.js +++ b/app/assets/javascripts/angular/components/aboutModal/aboutModal.component.js @@ -2,34 +2,34 @@ import template from './aboutModal.html'; import './aboutModal.scss'; angular - .module('campusContactsApp') - .component('aboutModal', { - controller: aboutModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - }) - .run( - /* @ngInject */ function ($rootScope, $uibModal) { - $rootScope.openAboutModal = function () { - $uibModal.open({ - component: 'aboutModal', - windowClass: 'pivot_theme', - size: 'md', - }); - }; - }, - ); + .module('campusContactsApp') + .component('aboutModal', { + controller: aboutModalController, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + }) + .run( + /* @ngInject */ function ($rootScope, $uibModal) { + $rootScope.openAboutModal = function () { + $uibModal.open({ + component: 'aboutModal', + windowClass: 'pivot_theme', + size: 'md', + }); + }; + }, + ); function aboutModalController() { - var vm = this; + const vm = this; - vm.year = new Date().getFullYear(); + vm.year = new Date().getFullYear(); - vm.$onInit = activate; + vm.$onInit = activate; - function activate() {} + function activate() {} } diff --git a/app/assets/javascripts/angular/components/aboutModal/aboutModal.html b/app/assets/javascripts/angular/components/aboutModal/aboutModal.html index 913787dce4..dc13179ed4 100644 --- a/app/assets/javascripts/angular/components/aboutModal/aboutModal.html +++ b/app/assets/javascripts/angular/components/aboutModal/aboutModal.html @@ -1,42 +1,26 @@
-

{{ 'nav.about.title' | t }}

+

{{ 'nav.about.title' | t }}

- - - © {{ 'nav.about.copyright' | t }} {{ $ctrl.year }} - {{'nav.powered_by_cru' | t}} + + + © {{ 'nav.about.copyright' | t }} {{ $ctrl.year }} + {{'nav.powered_by_cru' | t}}
- +
diff --git a/app/assets/javascripts/angular/components/accordion/accordion.component.js b/app/assets/javascripts/angular/components/accordion/accordion.component.js index 64897eb00a..6ac662f34a 100644 --- a/app/assets/javascripts/angular/components/accordion/accordion.component.js +++ b/app/assets/javascripts/angular/components/accordion/accordion.component.js @@ -2,30 +2,30 @@ import template from './accordion.html'; import './accordion.scss'; angular.module('campusContactsApp').component('accordion', { - controller: accordionController, - bindings: { - collapsed: '=?', - collapsible: '=?', - accordionDisabled: '<', - }, - template: template, - transclude: { - header: 'accordionHeader', - content: 'accordionContent', - }, + controller: accordionController, + bindings: { + collapsed: '=?', + collapsible: '=?', + accordionDisabled: '<', + }, + template, + transclude: { + header: 'accordionHeader', + content: 'accordionContent', + }, }); function accordionController(_) { - var vm = this; + const vm = this; - vm.toggleVisibility = toggleVisibility; + vm.toggleVisibility = toggleVisibility; - _.defaults(vm, { - collapsed: true, - collapsible: true, - }); + _.defaults(vm, { + collapsed: true, + collapsible: true, + }); - function toggleVisibility() { - vm.collapsed = !vm.collapsed; - } + function toggleVisibility() { + vm.collapsed = !vm.collapsed; + } } diff --git a/app/assets/javascripts/angular/components/accordion/accordion.html b/app/assets/javascripts/angular/components/accordion/accordion.html index 346fae753e..6641fca562 100644 --- a/app/assets/javascripts/angular/components/accordion/accordion.html +++ b/app/assets/javascripts/angular/components/accordion/accordion.html @@ -1,9 +1,5 @@
-
+
diff --git a/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.component.js b/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.component.js index 55c567b9db..4eb65c2bd2 100644 --- a/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.component.js +++ b/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.component.js @@ -2,20 +2,20 @@ import template from './accordionToggle.html'; import './accordionToggle.scss'; angular.module('campusContactsApp').component('accordionToggle', { - controller: accordionToggleController, - require: { - accordion: '^', - }, - template: template, - transclude: true, + controller: accordionToggleController, + require: { + accordion: '^', + }, + template, + transclude: true, }); function accordionToggleController() { - var vm = this; + const vm = this; - vm.toggleVisibility = toggleVisibility; + vm.toggleVisibility = toggleVisibility; - function toggleVisibility() { - vm.accordion.collapsed = !vm.accordion.collapsed; - } + function toggleVisibility() { + vm.accordion.collapsed = !vm.accordion.collapsed; + } } diff --git a/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.html b/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.html index 6d94eccd1d..6de15bd8a5 100644 --- a/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.html +++ b/app/assets/javascripts/angular/components/accordionToggle/accordionToggle.html @@ -1,11 +1,11 @@ - - - + + + diff --git a/app/assets/javascripts/angular/components/answerSheet/answerSheet.component.js b/app/assets/javascripts/angular/components/answerSheet/answerSheet.component.js index 9e0a002892..aede161260 100644 --- a/app/assets/javascripts/angular/components/answerSheet/answerSheet.component.js +++ b/app/assets/javascripts/angular/components/answerSheet/answerSheet.component.js @@ -4,33 +4,31 @@ import template from './answerSheet.html'; import './answerSheet.scss'; angular.module('campusContactsApp').component('answerSheet', { - template: template, - bindings: { - answerSheet: '<', - organizationId: '<', - }, - controller: answerSheetController, + template, + bindings: { + answerSheet: '<', + organizationId: '<', + }, + controller: answerSheetController, }); function answerSheetController($uibModal, loggedInPerson) { - this.moment = moment; + this.moment = moment; - this.editResponse = () => { - $uibModal.open({ - component: 'editAnswerSheetModal', - resolve: { - answerSheet: () => this.answerSheet, - organizationId: () => this.organizationId, - }, - windowClass: 'pivot_theme', - backdrop: 'static', - keyboard: false, - }); - }; + this.editResponse = () => { + $uibModal.open({ + component: 'editAnswerSheetModal', + resolve: { + answerSheet: () => this.answerSheet, + organizationId: () => this.organizationId, + }, + windowClass: 'pivot_theme', + backdrop: 'static', + keyboard: false, + }); + }; - this.$onInit = () => { - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt( - this.answerSheet.survey.organization, - ); - }; + this.$onInit = () => { + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.answerSheet.survey.organization); + }; } diff --git a/app/assets/javascripts/angular/components/answerSheet/answerSheet.html b/app/assets/javascripts/angular/components/answerSheet/answerSheet.html index fc94e124be..0c17c7dbf5 100644 --- a/app/assets/javascripts/angular/components/answerSheet/answerSheet.html +++ b/app/assets/javascripts/angular/components/answerSheet/answerSheet.html @@ -1,18 +1,18 @@
- +
-
- {{$ctrl.moment($ctrl.answerSheet.updated_at).fromNow()}} -
-
{{$ctrl.answerSheet.survey.title}}
-
-
{{answer.question.label}}
-
{{answer.value}}
-
+
+ {{$ctrl.moment($ctrl.answerSheet.updated_at).fromNow()}} +
+
{{$ctrl.answerSheet.survey.title}}
+
+
{{answer.question.label}}
+
{{answer.value}}
+
- - - + + +
diff --git a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js index 6e743b4a38..4173e50ce7 100644 --- a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js +++ b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js @@ -3,48 +3,46 @@ import template from './editAnswerSheetModal.html'; import './editAnswerSheetModal.scss'; angular.module('campusContactsApp').component('editAnswerSheetModal', { - bindings: { - resolve: '<', - dismiss: '&', - close: '&', - }, - template: template, - controller: editAnswerSheetModalController, + bindings: { + resolve: '<', + dismiss: '&', + close: '&', + }, + template, + controller: editAnswerSheetModalController, }); function editAnswerSheetModalController(httpProxy, modelsService) { - this.save = async (answerId) => { - const answers = this.resolve.answerSheet.answers; + this.save = async (answerId) => { + const answers = this.resolve.answerSheet.answers; - const includedAnswers = answers.map((a) => { - return { - type: 'answer', - attributes: { - question_id: a.question.id, - value: a.value, - }, - }; - }); + const includedAnswers = answers.map((a) => { + return { + type: 'answer', + attributes: { + question_id: a.question.id, + value: a.value, + }, + }; + }); - const url = modelsService - .getModelMetadata('answer_sheet') - .url.single(this.resolve.answerSheet.id); + const url = modelsService.getModelMetadata('answer_sheet').url.single(this.resolve.answerSheet.id); - const { data } = await httpProxy.put( - url, - { - data: { - type: 'answer_sheet', - attributes: {}, - }, - included: includedAnswers, - }, - { - params: { include: 'answers' }, - errorMessage: 'surveyTab:errors.updateSurvey', - }, - ); + const { data } = await httpProxy.put( + url, + { + data: { + type: 'answer_sheet', + attributes: {}, + }, + included: includedAnswers, + }, + { + params: { include: 'answers' }, + errorMessage: 'surveyTab:errors.updateSurvey', + }, + ); - this.close(); - }; + this.close(); + }; } diff --git a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.html b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.html index 69b94081c6..3f7c25125a 100644 --- a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.html +++ b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.html @@ -1,88 +1,64 @@
-

- {{ 'ministries.surveyResponses.editSurveyResponse' | t }} -

- - - +

{{ 'ministries.surveyResponses.editSurveyResponse' | t }}

+ + +
-
-
{{answer.question.label}}
+
+
{{answer.question.label}}
-
-
- -
-
-
- -
-
-
-
- -
-
-
- - {{ content }} -
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ + {{ content }} +
+
- - + +
diff --git a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js index a4e5fa0c4b..c0a1f4f508 100644 --- a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js +++ b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js @@ -2,43 +2,39 @@ import template from './assignedLabelSelect.html'; import './assignedLabelSelect.scss'; angular.module('campusContactsApp').component('assignedLabelSelect', { - bindings: { - assigned: '=', - organizationId: '<', - disabled: '<', - actionAfterSelect: '&', - }, - controller: assignedLabelSelectController, - template: template, + bindings: { + assigned: '=', + organizationId: '<', + disabled: '<', + actionAfterSelect: '&', + }, + controller: assignedLabelSelectController, + template, }); function assignedLabelSelectController($scope, assignedLabelSelectService) { - this.labels = []; - this.originalLabels = []; - this.$onInit = () => { - // When this loads, get all the labels and set this.originalLabels to all the labels. We do this once instead of every time the user types. - assignedLabelSelectService - .searchLabels(this.organizationId) - .then((labels) => { - this.originalLabels = labels; - }); - // This will happen everytime the user types - $scope.$watch('$select.search', (search) => { - if (search === '') { - // Set this.labels to the original list of labels we fetched - this.labels = [...this.originalLabels]; - return; - } - // Here we filter out all the labels from the originalLabels array that do not include what the user is currently typing - this.labels = this.originalLabels.filter((label) => - label.name.toLowerCase().includes(search.toLowerCase()), - ); - }); + this.labels = []; + this.originalLabels = []; + this.$onInit = () => { + // When this loads, get all the labels and set this.originalLabels to all the labels. We do this once instead of every time the user types. + assignedLabelSelectService.searchLabels(this.organizationId).then((labels) => { + this.originalLabels = labels; + }); + // This will happen everytime the user types + $scope.$watch('$select.search', (search) => { + if (search === '') { + // Set this.labels to the original list of labels we fetched + this.labels = [...this.originalLabels]; + return; + } + // Here we filter out all the labels from the originalLabels array that do not include what the user is currently typing + this.labels = this.originalLabels.filter((label) => label.name.toLowerCase().includes(search.toLowerCase())); + }); - $scope.$watch('$ctrl.assigned', (o, n) => { - if (this.actionAfterSelect && o !== n) { - this.actionAfterSelect(); - } - }); - }; + $scope.$watch('$ctrl.assigned', (o, n) => { + if (this.actionAfterSelect && o !== n) { + this.actionAfterSelect(); + } + }); + }; } diff --git a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.html b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.html index db07587e3c..2417e1bd6a 100644 --- a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.html +++ b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.html @@ -1,16 +1,8 @@ - - - {{ $item.name }} - - - {{ label.name }} - + + + {{ $item.name }} + + + {{ label.name }} + diff --git a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.service.js b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.service.js index 6b942225ce..3997d5f024 100644 --- a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.service.js +++ b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.service.js @@ -1,24 +1,22 @@ -angular - .module('campusContactsApp') - .factory('assignedLabelSelectService', assignedLabelSelectService); +angular.module('campusContactsApp').factory('assignedLabelSelectService', assignedLabelSelectService); function assignedLabelSelectService(httpProxy) { - return { - // Get all the labels from the current organizations - searchLabels: (organizationId) => { - return httpProxy - .get( - `/organizations/${organizationId}`, - { - include: 'labels', - }, - { - errorMessage: 'error.messages.surveys.loadQuestions', - }, - ) - .then((data) => { - return data.data.labels; - }); - }, - }; + return { + // Get all the labels from the current organizations + searchLabels: (organizationId) => { + return httpProxy + .get( + `/organizations/${organizationId}`, + { + include: 'labels', + }, + { + errorMessage: 'error.messages.surveys.loadQuestions', + }, + ) + .then((data) => { + return data.data.labels; + }); + }, + }; } diff --git a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.component.js b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.component.js index 520c5eadac..53a9abecf6 100644 --- a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.component.js +++ b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.component.js @@ -2,49 +2,39 @@ import template from './assignedPeopleSelect.html'; import './assignedPeopleSelect.scss'; angular.module('campusContactsApp').component('assignedPeopleSelect', { - bindings: { - assigned: '=', - ruleCode: '<', - organizationId: '<', - disabled: '<', - actionAfterSelect: '&', - }, - controller: assignedPeopleSelectController, - template: template, + bindings: { + assigned: '=', + ruleCode: '<', + organizationId: '<', + disabled: '<', + actionAfterSelect: '&', + }, + controller: assignedPeopleSelectController, + template, }); -function assignedPeopleSelectController( - $scope, - assignedPeopleSelectService, - RequestDeduper, -) { - this.people = []; - this.isMe = assignedPeopleSelectService.isMe; - this.$onInit = () => { - const requestDeduper = new RequestDeduper(); - // Refresh the person list whenever the search term changes - $scope.$watch('$select.search', (search) => { - assignedPeopleSelectService - .searchPeople(search, this.organizationId, requestDeduper) - .then((people) => { - if (this.assigned === null) { - this.people = people; - } else { - const assignedPeopleIds = this.assigned.map( - ({ id }) => id, - ); - // Find all the current people in this.assigned - this.people = people.filter( - (person) => !assignedPeopleIds.includes(person.id), - ); - } - }); - }); +function assignedPeopleSelectController($scope, assignedPeopleSelectService, RequestDeduper) { + this.people = []; + this.isMe = assignedPeopleSelectService.isMe; + this.$onInit = () => { + const requestDeduper = new RequestDeduper(); + // Refresh the person list whenever the search term changes + $scope.$watch('$select.search', (search) => { + assignedPeopleSelectService.searchPeople(search, this.organizationId, requestDeduper).then((people) => { + if (this.assigned === null) { + this.people = people; + } else { + const assignedPeopleIds = this.assigned.map(({ id }) => id); + // Find all the current people in this.assigned + this.people = people.filter((person) => !assignedPeopleIds.includes(person.id)); + } + }); + }); - $scope.$watch('$ctrl.assigned', (o, n) => { - if (this.actionAfterSelect && o !== n) { - this.actionAfterSelect(); - } - }); - }; + $scope.$watch('$ctrl.assigned', (o, n) => { + if (this.actionAfterSelect && o !== n) { + this.actionAfterSelect(); + } + }); + }; } diff --git a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.html b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.html index ac8cd36b7f..9f821d280c 100644 --- a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.html +++ b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.html @@ -1,30 +1,20 @@ - - + - - {{ $item | personName }} - ({{ 'application.assign_search.me' | t }}) - - - - - {{ person | personName }} - ({{ 'application.assign_search.me' | t }}) - - + > + + {{ $item | personName }} + ({{ 'application.assign_search.me' | t }}) + + + + + {{ person | personName }} + ({{ 'application.assign_search.me' | t }}) + + diff --git a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.js b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.js index da0158017e..d07eb77382 100644 --- a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.js +++ b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.js @@ -1,44 +1,34 @@ -angular - .module('campusContactsApp') - .factory('assignedPeopleSelectService', assignedPeopleSelectService); +angular.module('campusContactsApp').factory('assignedPeopleSelectService', assignedPeopleSelectService); -function assignedPeopleSelectService( - httpProxy, - modelsService, - loggedInPerson, - permissionService, -) { - return { - // Search for people in a particular organization that match the query - searchPeople: function (query, organizationId, deduper) { - if (!query || query.length < 2) { - return Promise.resolve([]); - } +function assignedPeopleSelectService(httpProxy, modelsService, loggedInPerson, permissionService) { + return { + // Search for people in a particular organization that match the query + searchPeople: function (query, organizationId, deduper) { + if (!query || query.length < 2) { + return Promise.resolve([]); + } - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - { - 'filters[name]': query, - 'filters[organization_ids]': organizationId, - 'filters[permission_ids]': permissionService.adminAndUserIds.join( - ',', - ), - 'fields[person]': 'first_name,last_name', - include: '', - }, - { - deduper: deduper, - errorMessage: - 'error.messages.assigned_select.search_people', - bypassStore: true, - }, - ) - .then(httpProxy.extractModels); - }, - // Determine whether a person is the currently logged-in person - isMe: function (person) { - return loggedInPerson.person === person; - }, - }; + return httpProxy + .get( + modelsService.getModelMetadata('person').url.all, + { + 'filters[name]': query, + 'filters[organization_ids]': organizationId, + 'filters[permission_ids]': permissionService.adminAndUserIds.join(','), + 'fields[person]': 'first_name,last_name', + include: '', + }, + { + deduper, + errorMessage: 'error.messages.assigned_select.search_people', + bypassStore: true, + }, + ) + .then(httpProxy.extractModels); + }, + // Determine whether a person is the currently logged-in person + isMe: function (person) { + return loggedInPerson.person === person; + }, + }; } diff --git a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.spec.js b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.spec.js index c3469f31b5..2ad74a8295 100644 --- a/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.spec.js +++ b/app/assets/javascripts/angular/components/assignedPeopleSelect/assignedPeopleSelect.service.spec.js @@ -1,32 +1,32 @@ import 'angular-mocks'; // Constants -var assignedPeopleSelectService; +let assignedPeopleSelectService; describe('assignedPeopleSelectService', function () { - beforeEach(function () { - var _this = this; - angular.mock.module(function ($provide) { - $provide.factory('loggedInPerson', function () { - return { - get person() { - return _this.person; - }, - }; - }); - }); + beforeEach(function () { + const _this = this; + angular.mock.module(function ($provide) { + $provide.factory('loggedInPerson', function () { + return { + get person() { + return _this.person; + }, + }; + }); }); + }); - beforeEach(inject(function (_assignedPeopleSelectService_) { - assignedPeopleSelectService = _assignedPeopleSelectService_; + beforeEach(inject(function (_assignedPeopleSelectService_) { + assignedPeopleSelectService = _assignedPeopleSelectService_; - this.person = { id: 123 }; - })); + this.person = { id: 123 }; + })); - describe('isMe', function () { - it('should check whether the person matches the logged in person', function () { - expect(assignedPeopleSelectService.isMe(this.person)).toBe(true); - expect(assignedPeopleSelectService.isMe({ id: 456 })).toBe(false); - }); + describe('isMe', function () { + it('should check whether the person matches the logged in person', function () { + expect(assignedPeopleSelectService.isMe(this.person)).toBe(true); + expect(assignedPeopleSelectService.isMe({ id: 456 })).toBe(false); }); + }); }); diff --git a/app/assets/javascripts/angular/components/asyncContent/asyncContent.component.js b/app/assets/javascripts/angular/components/asyncContent/asyncContent.component.js index b3b5046881..78650ae86d 100644 --- a/app/assets/javascripts/angular/components/asyncContent/asyncContent.component.js +++ b/app/assets/javascripts/angular/components/asyncContent/asyncContent.component.js @@ -2,9 +2,9 @@ import template from './asyncContent.html'; import './asyncContent.scss'; angular.module('campusContactsApp').component('asyncContent', { - bindings: { - ready: '<', - }, - template: template, - transclude: true, + bindings: { + ready: '<', + }, + template, + transclude: true, }); diff --git a/app/assets/javascripts/angular/components/contactActions/contactActions.component.js b/app/assets/javascripts/angular/components/contactActions/contactActions.component.js index 568832d36a..1f1095a04e 100644 --- a/app/assets/javascripts/angular/components/contactActions/contactActions.component.js +++ b/app/assets/javascripts/angular/components/contactActions/contactActions.component.js @@ -2,20 +2,20 @@ import template from './contactActions.html'; import './contactActions.scss'; angular.module('campusContactsApp').component('contactActions', { - bindings: { - phone: '<', - email: '<', - }, - template: template, - controller: contactActionsController, + bindings: { + phone: '<', + email: '<', + }, + template, + controller: contactActionsController, }); function contactActionsController() { - this.actionsVisible = false; + this.actionsVisible = false; - this.toggleActions = () => { - this.actionsVisible = !this.actionsVisible; - }; + this.toggleActions = () => { + this.actionsVisible = !this.actionsVisible; + }; - this.copyText = (text) => navigator.clipboard.writeText(text); + this.copyText = (text) => navigator.clipboard.writeText(text); } diff --git a/app/assets/javascripts/angular/components/contactActions/contactActions.html b/app/assets/javascripts/angular/components/contactActions/contactActions.html index 392d19feba..1464c9d1e8 100644 --- a/app/assets/javascripts/angular/components/contactActions/contactActions.html +++ b/app/assets/javascripts/angular/components/contactActions/contactActions.html @@ -1,92 +1,76 @@
- - - + + + - - - + + + - - - + + + - - - + + +
-
-
- - -
-
- - -
+
+
+ +
-
- - - +
+ +
+
+
+ + + +
diff --git a/app/assets/javascripts/angular/components/copySurvey/copySurvey.component.js b/app/assets/javascripts/angular/components/copySurvey/copySurvey.component.js index b74bc5988e..328af13964 100644 --- a/app/assets/javascripts/angular/components/copySurvey/copySurvey.component.js +++ b/app/assets/javascripts/angular/components/copySurvey/copySurvey.component.js @@ -1,55 +1,47 @@ import template from './copySurvey.html'; angular.module('campusContactsApp').component('copySurvey', { - controller: copySurveyController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: copySurveyController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function copySurveyController(surveyService, loggedInPerson) { - this.saving = false; - this.survey = {}; - - this.$onInit = () => { - this.survey.id = this.resolve.survey.id; - this.survey.title = this.resolve.survey.title; - - this.orgs = loggedInPerson.person.organizational_permissions.map( - (orgPermission) => orgPermission.organization, - ); - this.orgs = this.orgs.filter((org) => { - return loggedInPerson.isAdminAt(org); - }); - - //default to current org - this.survey.parent_organization = this.resolve.organizationId; - }; - - this.valid = () => { - return this.survey.parent_organization && this.survey.title; - }; - - this.save = () => { - this.saving = true; - - surveyService - .copySurvey( - this.survey.id, - this.survey.parent_organization, - this.survey.title, - ) - .then( - (newSurvey) => { - this.close(newSurvey); - }, - (response) => { - this.saving = false; - this.error = response.data.error; - }, - ); - }; + this.saving = false; + this.survey = {}; + + this.$onInit = () => { + this.survey.id = this.resolve.survey.id; + this.survey.title = this.resolve.survey.title; + + this.orgs = loggedInPerson.person.organizational_permissions.map((orgPermission) => orgPermission.organization); + this.orgs = this.orgs.filter((org) => { + return loggedInPerson.isAdminAt(org); + }); + + // default to current org + this.survey.parent_organization = this.resolve.organizationId; + }; + + this.valid = () => { + return this.survey.parent_organization && this.survey.title; + }; + + this.save = () => { + this.saving = true; + + surveyService.copySurvey(this.survey.id, this.survey.parent_organization, this.survey.title).then( + (newSurvey) => { + this.close(newSurvey); + }, + (response) => { + this.saving = false; + this.error = response.data.error; + }, + ); + }; } diff --git a/app/assets/javascripts/angular/components/copySurvey/copySurvey.html b/app/assets/javascripts/angular/components/copySurvey/copySurvey.html index 426db6cf11..e432e41954 100644 --- a/app/assets/javascripts/angular/components/copySurvey/copySurvey.html +++ b/app/assets/javascripts/angular/components/copySurvey/copySurvey.html @@ -1,51 +1,34 @@
- - - - + + + +
-
{{ $ctrl.error }}
+
{{ $ctrl.error }}
-
- -
+
+ +
-
- -
+
+ +
- - + +
diff --git a/app/assets/javascripts/angular/components/createSurvey/createSurvey.component.js b/app/assets/javascripts/angular/components/createSurvey/createSurvey.component.js index 6e364b5c82..5526ed6ff3 100644 --- a/app/assets/javascripts/angular/components/createSurvey/createSurvey.component.js +++ b/app/assets/javascripts/angular/components/createSurvey/createSurvey.component.js @@ -1,51 +1,48 @@ import template from './createSurvey.html'; angular.module('campusContactsApp').component('createSurvey', { - controller: createSurveyController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: createSurveyController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function createSurveyController(surveyService) { - var vm = this; + const vm = this; - vm.title = null; - vm.saving = false; - vm.survey = {}; + vm.title = null; + vm.saving = false; + vm.survey = {}; - vm.valid = valid; - vm.save = save; - vm.cancel = cancel; + vm.valid = valid; + vm.save = save; + vm.cancel = cancel; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - vm.orgId = vm.resolve.organizationId; - } + function activate() { + vm.orgId = vm.resolve.organizationId; + } - function valid() { - return vm.survey.title; - } + function valid() { + return vm.survey.title; + } - async function save() { - vm.saving = true; - - try { - const newSurvey = await surveyService.createSurvey( - vm.survey.title, - vm.orgId, - ); - vm.close({ $value: newSurvey }); - } catch (err) { - vm.saving = false; - } - } + async function save() { + vm.saving = true; - function cancel() { - vm.dismiss(); + try { + const newSurvey = await surveyService.createSurvey(vm.survey.title, vm.orgId); + vm.close({ $value: newSurvey }); + } catch (err) { + vm.saving = false; } + } + + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/createSurvey/createSurvey.html b/app/assets/javascripts/angular/components/createSurvey/createSurvey.html index 67d0de9ee7..29de86e74d 100644 --- a/app/assets/javascripts/angular/components/createSurvey/createSurvey.html +++ b/app/assets/javascripts/angular/components/createSurvey/createSurvey.html @@ -1,38 +1,21 @@
- - - - + + + +
-
- -
+
+ +
- - + +
diff --git a/app/assets/javascripts/angular/components/dashboard/dashboard.component.js b/app/assets/javascripts/angular/components/dashboard/dashboard.component.js index 0f221c56ab..9577d6fff8 100644 --- a/app/assets/javascripts/angular/components/dashboard/dashboard.component.js +++ b/app/assets/javascripts/angular/components/dashboard/dashboard.component.js @@ -1,29 +1,26 @@ import template from './dashboard.html'; angular.module('campusContactsApp').component('dashboard', { - controller: DashboardController, - template: template, + controller: DashboardController, + template, }); function DashboardController(periodService, $rootScope) { - const vm = this; - let deregisterEditOrganizationsEvent; + const vm = this; + let deregisterEditOrganizationsEvent; - vm.editOrganizations = false; - vm.getPeriod = periodService.getPeriod; - vm.$onInit = activate; - vm.$onDestroy = deactivate; + vm.editOrganizations = false; + vm.getPeriod = periodService.getPeriod; + vm.$onInit = activate; + vm.$onDestroy = deactivate; - function activate() { - deregisterEditOrganizationsEvent = $rootScope.$on( - 'editOrganizations', - function (event, value) { - vm.editOrganizations = value; - }, - ); - } + function activate() { + deregisterEditOrganizationsEvent = $rootScope.$on('editOrganizations', function (event, value) { + vm.editOrganizations = value; + }); + } - function deactivate() { - deregisterEditOrganizationsEvent(); - } + function deactivate() { + deregisterEditOrganizationsEvent(); + } } diff --git a/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.component.js b/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.component.js index 8136855eab..fd4ada102a 100644 --- a/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.component.js +++ b/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.component.js @@ -2,16 +2,16 @@ import './dashboard-subnav.scss'; import template from './dashboard-subnav.html'; angular.module('campusContactsApp').component('dashboardSubnav', { - controller: DashboardSubnavController, - template: template, + controller: DashboardSubnavController, + template, }); function DashboardSubnavController($rootScope, $state) { - this.$state = $state; - this.editOrganizations = false; + this.$state = $state; + this.editOrganizations = false; - this.toggleEditOrganizations = () => { - this.editOrganizations = !this.editOrganizations; - $rootScope.$broadcast('editOrganizations', this.editOrganizations); - }; + this.toggleEditOrganizations = () => { + this.editOrganizations = !this.editOrganizations; + $rootScope.$broadcast('editOrganizations', this.editOrganizations); + }; } diff --git a/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.html b/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.html index d0d07008de..88fb6563ce 100644 --- a/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.html +++ b/app/assets/javascripts/angular/components/dashboard/subnav/dashboard-subnav.html @@ -1,104 +1,88 @@
-
-
-
- - - +
+
+ + + - - - - -
- - - - -
+ > +
+ + + +
+
-
-
- - - - -
+
+
+ + + +
+
diff --git a/app/assets/javascripts/angular/components/editAddress/editAddress.component.js b/app/assets/javascripts/angular/components/editAddress/editAddress.component.js index 324c71f039..8928cac71e 100644 --- a/app/assets/javascripts/angular/components/editAddress/editAddress.component.js +++ b/app/assets/javascripts/angular/components/editAddress/editAddress.component.js @@ -2,103 +2,94 @@ import template from './editAddress.html'; import './editAddress.scss'; angular.module('campusContactsApp').component('editAddress', { - controller: editAddressController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: editAddressController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function editAddressController(editAddressService, personProfileService, _) { - var vm = this; - - vm.saving = false; - vm.addressTypes = editAddressService.getAddressTypes(); - - vm.valid = valid; - vm.loadRegions = loadRegions; - vm.isAddressTypeValid = isAddressTypeValid; - vm.save = save; - vm.cancel = cancel; - - vm.$onInit = activate; - - function activate() { - vm.person = vm.resolve.person; - - // This will be true if we are creating a new contact and false if we are editing an existing contact - vm.isNewAddress = vm.resolve.address === null; - - // Copy the address so that the changes can be discard if the user does not save - var address = vm.resolve.address; - vm.address = address - ? _.clone(address) - : editAddressService.getAddressTemplate(vm.person); - - // Get the list of the user's other addresses - vm.otherAddresses = _.without(vm.person.addresses, address); - - loadCountries().then(function () { - // For now, US regions are the only valid region choices - loadRegions('US'); - }); - } - - function valid() { - return editAddressService.isAddressValid(vm.address); - } - - // Populate vm.countries with the valid country choices - function loadCountries() { - return editAddressService - .getCountryOptions() - .then(function (countries) { - vm.countries = countries; - }); - } - - // Populate vm.countries with the valid region choices - function loadRegions(countryCode) { - return editAddressService - .getRegionOptions(countryCode) - .then(function (regions) { - vm.regions = regions; - }); - } - - function isAddressTypeValid(addressType) { - return editAddressService.isAddressTypeValid( - addressType, - vm.otherAddresses, - ); - } - - // Persist the changes to the address to the server - function save() { - vm.saving = true; - personProfileService - .saveAttribute(vm.person.id, vm.address, _.keys(vm.address)) - .then(function () { - if (vm.person.id === null && vm.isNewAddress) { - // The person is not saved on the server, so manually add the new address to the person - vm.person.addresses.push(vm.address); - } - - if (!vm.isNewAddress) { - // Apply the changes to the original address - _.extend(vm.resolve.address, vm.address); - } - - vm.close({ $value: vm.address }); - }) - .catch(function () { - vm.saving = false; - }); - } - - function cancel() { - vm.dismiss(); - } + const vm = this; + + vm.saving = false; + vm.addressTypes = editAddressService.getAddressTypes(); + + vm.valid = valid; + vm.loadRegions = loadRegions; + vm.isAddressTypeValid = isAddressTypeValid; + vm.save = save; + vm.cancel = cancel; + + vm.$onInit = activate; + + function activate() { + vm.person = vm.resolve.person; + + // This will be true if we are creating a new contact and false if we are editing an existing contact + vm.isNewAddress = vm.resolve.address === null; + + // Copy the address so that the changes can be discard if the user does not save + const address = vm.resolve.address; + vm.address = address ? _.clone(address) : editAddressService.getAddressTemplate(vm.person); + + // Get the list of the user's other addresses + vm.otherAddresses = _.without(vm.person.addresses, address); + + loadCountries().then(function () { + // For now, US regions are the only valid region choices + loadRegions('US'); + }); + } + + function valid() { + return editAddressService.isAddressValid(vm.address); + } + + // Populate vm.countries with the valid country choices + function loadCountries() { + return editAddressService.getCountryOptions().then(function (countries) { + vm.countries = countries; + }); + } + + // Populate vm.countries with the valid region choices + function loadRegions(countryCode) { + return editAddressService.getRegionOptions(countryCode).then(function (regions) { + vm.regions = regions; + }); + } + + function isAddressTypeValid(addressType) { + return editAddressService.isAddressTypeValid(addressType, vm.otherAddresses); + } + + // Persist the changes to the address to the server + function save() { + vm.saving = true; + personProfileService + .saveAttribute(vm.person.id, vm.address, _.keys(vm.address)) + .then(function () { + if (vm.person.id === null && vm.isNewAddress) { + // The person is not saved on the server, so manually add the new address to the person + vm.person.addresses.push(vm.address); + } + + if (!vm.isNewAddress) { + // Apply the changes to the original address + _.extend(vm.resolve.address, vm.address); + } + + vm.close({ $value: vm.address }); + }) + .catch(function () { + vm.saving = false; + }); + } + + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/editAddress/editAddress.html b/app/assets/javascripts/angular/components/editAddress/editAddress.html index 2a6e290d50..0d549bbeb1 100644 --- a/app/assets/javascripts/angular/components/editAddress/editAddress.html +++ b/app/assets/javascripts/angular/components/editAddress/editAddress.html @@ -1,101 +1,73 @@
- - - - + + + +
-
- - - - - -
+ ng-model="$ctrl.address.address_type" + > +
+ + + + + +
- - + +
diff --git a/app/assets/javascripts/angular/components/editAddress/editAddress.service.js b/app/assets/javascripts/angular/components/editAddress/editAddress.service.js index 5747a3a500..0f1f1764d8 100644 --- a/app/assets/javascripts/angular/components/editAddress/editAddress.service.js +++ b/app/assets/javascripts/angular/components/editAddress/editAddress.service.js @@ -1,76 +1,61 @@ -angular - .module('campusContactsApp') - .factory('editAddressService', editAddressService); +angular.module('campusContactsApp').factory('editAddressService', editAddressService); function editAddressService(geoDataService, JsonApiDataStore, _) { - var editAddressService = { - // Return an array of valid address types - getAddressTypes: function () { - return ['current', 'permanent', 'emergency1', 'emergency2']; - }, - - // Return a boolean indicating whether a particular address type is valid for a particular person's address - isAddressTypeValid: function (addressType, otherAddresses) { - // The address type is valid if no other addresses already have the address type - return !_.find(otherAddresses, { address_type: addressType }); - }, - - // Determine whether an address has valid field values - isAddressValid: function (address) { - return Boolean(address.address_type); - }, - - // Return an address for the specific with default field values - getAddressTemplate: function (person) { - // Find the first unused address type - var addressType = _.chain(editAddressService.getAddressTypes()) - .difference(_.map(person.addresses, 'address_type')) - .first() - .defaultTo(null) - .value(); - - var address = new JsonApiDataStore.Model('address'); - address.setAttribute('person_id', person.id); - address.setAttribute('address_type', addressType); - [ - 'address1', - 'address2', - 'address3', - 'address4', - 'city', - 'state', - 'zip', - 'country', - ].forEach(function (attribute) { - address.setAttribute(attribute, ''); - }); - return address; - }, - - // Return an array that resolves to the list of country options - getCountryOptions: function () { - return geoDataService.getCountries().then(function (countries) { - // Remove the priority countries and then add them back to the front of the list - var priorityCountryCodes = ['US', 'CA']; - var priorityCountries = priorityCountryCodes.map(function ( - countryCode, - ) { - return _.find(countries, { shortCode: countryCode }); - }); - return priorityCountries.concat( - _.difference(countries, priorityCountries), - ); - }); - }, - - // Return an array that resolves to the list of region options for a given country - getRegionOptions: function (countryCode) { - return geoDataService.getCountries().then(function (countries) { - var country = _.find(countries, { shortCode: countryCode }); - return country ? country.regions : []; - }); - }, - }; - - return editAddressService; + var editAddressService = { + // Return an array of valid address types + getAddressTypes: function () { + return ['current', 'permanent', 'emergency1', 'emergency2']; + }, + + // Return a boolean indicating whether a particular address type is valid for a particular person's address + isAddressTypeValid: function (addressType, otherAddresses) { + // The address type is valid if no other addresses already have the address type + return !_.find(otherAddresses, { address_type: addressType }); + }, + + // Determine whether an address has valid field values + isAddressValid: function (address) { + return Boolean(address.address_type); + }, + + // Return an address for the specific with default field values + getAddressTemplate: function (person) { + // Find the first unused address type + const addressType = _.chain(editAddressService.getAddressTypes()) + .difference(_.map(person.addresses, 'address_type')) + .first() + .defaultTo(null) + .value(); + + const address = new JsonApiDataStore.Model('address'); + address.setAttribute('person_id', person.id); + address.setAttribute('address_type', addressType); + ['address1', 'address2', 'address3', 'address4', 'city', 'state', 'zip', 'country'].forEach(function (attribute) { + address.setAttribute(attribute, ''); + }); + return address; + }, + + // Return an array that resolves to the list of country options + getCountryOptions: function () { + return geoDataService.getCountries().then(function (countries) { + // Remove the priority countries and then add them back to the front of the list + const priorityCountryCodes = ['US', 'CA']; + const priorityCountries = priorityCountryCodes.map(function (countryCode) { + return _.find(countries, { shortCode: countryCode }); + }); + return priorityCountries.concat(_.difference(countries, priorityCountries)); + }); + }, + + // Return an array that resolves to the list of region options for a given country + getRegionOptions: function (countryCode) { + return geoDataService.getCountries().then(function (countries) { + const country = _.find(countries, { shortCode: countryCode }); + return country ? country.regions : []; + }); + }, + }; + + return editAddressService; } diff --git a/app/assets/javascripts/angular/components/editAddress/editAddress.service.spec.js b/app/assets/javascripts/angular/components/editAddress/editAddress.service.spec.js index 09ececcac8..f83bc965bf 100644 --- a/app/assets/javascripts/angular/components/editAddress/editAddress.service.spec.js +++ b/app/assets/javascripts/angular/components/editAddress/editAddress.service.spec.js @@ -1,211 +1,160 @@ import 'angular-mocks'; // Constants -var editAddressService, $q, $rootScope, _; +let editAddressService, $q, $rootScope, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('editAddressService', function () { - beforeEach(inject(function ( - _editAddressService_, - _$q_, - _$rootScope_, - geoDataService, - ___, - ) { - editAddressService = _editAddressService_; - $q = _$q_; - $rootScope = _$rootScope_; - _ = ___; - - this.address1 = { id: 1, address_type: 'type1' }; - this.address2 = { id: 2, address_type: 'type2' }; - this.address3 = { id: 3, address_type: 'type3' }; - - var countries = [ - { shortCode: 'AA' }, - { shortCode: 'BA' }, - { shortCode: 'CA' }, - { - shortCode: 'US', - regions: [ - { shortCode: 'AL' }, - { shortCode: 'AK' }, - { shortCode: 'AZ' }, - ], - }, - ]; - spyOn(geoDataService, 'getCountries').and.returnValue( - $q.resolve(countries), - ); - })); - - describe('getAddressTypes', function () { - it('should return an array', function () { - expect(editAddressService.getAddressTypes()).toEqual( - jasmine.any(Array), - ); - }); + beforeEach(inject(function (_editAddressService_, _$q_, _$rootScope_, geoDataService, ___) { + editAddressService = _editAddressService_; + $q = _$q_; + $rootScope = _$rootScope_; + _ = ___; + + this.address1 = { id: 1, address_type: 'type1' }; + this.address2 = { id: 2, address_type: 'type2' }; + this.address3 = { id: 3, address_type: 'type3' }; + + const countries = [ + { shortCode: 'AA' }, + { shortCode: 'BA' }, + { shortCode: 'CA' }, + { + shortCode: 'US', + regions: [{ shortCode: 'AL' }, { shortCode: 'AK' }, { shortCode: 'AZ' }], + }, + ]; + spyOn(geoDataService, 'getCountries').and.returnValue($q.resolve(countries)); + })); + + describe('getAddressTypes', function () { + it('should return an array', function () { + expect(editAddressService.getAddressTypes()).toEqual(jasmine.any(Array)); }); + }); - describe('isAddressTypeValid', function () { - beforeEach(function () { - this.otherAddresses = [this.address1, this.address2]; - spyOn(editAddressService, 'getAddressTypes').and.returnValue([ - 'type1', - 'type2', - 'type3', - ]); - }); - - it('should treat unused address types as valid', function () { - expect( - editAddressService.isAddressTypeValid( - 'type3', - this.otherAddresses, - ), - ).toBe(true); - }); - - it('should treat used address types as invalid', function () { - expect( - editAddressService.isAddressTypeValid( - 'type1', - this.otherAddresses, - ), - ).toBe(false); - }); + describe('isAddressTypeValid', function () { + beforeEach(function () { + this.otherAddresses = [this.address1, this.address2]; + spyOn(editAddressService, 'getAddressTypes').and.returnValue(['type1', 'type2', 'type3']); }); - describe('isAddressValid', function () { - it('should treat addresses without a type as invalid', function () { - expect( - editAddressService.isAddressValid({ address_type: null }), - ).toBe(false); - }); - - it('should treat addresses with a type as valid', function () { - expect( - editAddressService.isAddressValid({ address_type: 'type' }), - ).toBe(true); - }); + it('should treat unused address types as valid', function () { + expect(editAddressService.isAddressTypeValid('type3', this.otherAddresses)).toBe(true); }); - describe('getAddressTemplate', function () { - it('should set the required address fields', function () { - var person = { - id: 1, - }; - expect(editAddressService.getAddressTemplate(person)).toEqual( - jasmine.objectContaining({ - _type: 'address', - person_id: person.id, - address_type: jasmine.any(String), - }), - ); - }); + it('should treat used address types as invalid', function () { + expect(editAddressService.isAddressTypeValid('type1', this.otherAddresses)).toBe(false); + }); + }); - it('should choose the first available address type', function () { - spyOn(editAddressService, 'getAddressTypes').and.returnValue([ - 'type1', - 'type2', - 'type3', - ]); - - expect( - editAddressService.getAddressTemplate({ - id: 1, - addresses: [], - }), - ).toEqual( - jasmine.objectContaining({ - address_type: 'type1', - }), - ); - - expect( - editAddressService.getAddressTemplate({ - id: 1, - addresses: [this.address1, this.address3], - }), - ).toEqual( - jasmine.objectContaining({ - address_type: 'type2', - }), - ); - - expect( - editAddressService.getAddressTemplate({ - id: 1, - addresses: [this.address1, this.address2, this.address3], - }), - ).toEqual( - jasmine.objectContaining({ - address_type: null, - }), - ); - }); + describe('isAddressValid', function () { + it('should treat addresses without a type as invalid', function () { + expect(editAddressService.isAddressValid({ address_type: null })).toBe(false); }); - describe('getCountryOptions', function () { - it( - 'should prioritize certain countries', - asynchronous(function () { - return editAddressService - .getCountryOptions() - .then(function (countryOptions) { - expect(_.map(countryOptions, 'shortCode')).toEqual([ - 'US', - 'CA', - 'AA', - 'BA', - ]); - }); - }), - ); + it('should treat addresses with a type as valid', function () { + expect(editAddressService.isAddressValid({ address_type: 'type' })).toBe(true); + }); + }); + + describe('getAddressTemplate', function () { + it('should set the required address fields', function () { + const person = { + id: 1, + }; + expect(editAddressService.getAddressTemplate(person)).toEqual( + jasmine.objectContaining({ + _type: 'address', + person_id: person.id, + address_type: jasmine.any(String), + }), + ); }); - describe('getRegionOptions', function () { - it( - "should return the country's regions", - asynchronous(function () { - return editAddressService - .getRegionOptions('US') - .then(function (regionOptions) { - expect(_.map(regionOptions, 'shortCode')).toEqual([ - 'AL', - 'AK', - 'AZ', - ]); - }); - }), - ); - - it( - 'should return an empty array for an invalid country', - asynchronous(function () { - return editAddressService - .getRegionOptions('foo') - .then(function (regionOptions) { - expect(_.map(regionOptions, 'shortCode')).toEqual([]); - }); - }), - ); + it('should choose the first available address type', function () { + spyOn(editAddressService, 'getAddressTypes').and.returnValue(['type1', 'type2', 'type3']); + + expect( + editAddressService.getAddressTemplate({ + id: 1, + addresses: [], + }), + ).toEqual( + jasmine.objectContaining({ + address_type: 'type1', + }), + ); + + expect( + editAddressService.getAddressTemplate({ + id: 1, + addresses: [this.address1, this.address3], + }), + ).toEqual( + jasmine.objectContaining({ + address_type: 'type2', + }), + ); + + expect( + editAddressService.getAddressTemplate({ + id: 1, + addresses: [this.address1, this.address2, this.address3], + }), + ).toEqual( + jasmine.objectContaining({ + address_type: null, + }), + ); }); + }); + + describe('getCountryOptions', function () { + it( + 'should prioritize certain countries', + asynchronous(function () { + return editAddressService.getCountryOptions().then(function (countryOptions) { + expect(_.map(countryOptions, 'shortCode')).toEqual(['US', 'CA', 'AA', 'BA']); + }); + }), + ); + }); + + describe('getRegionOptions', function () { + it( + "should return the country's regions", + asynchronous(function () { + return editAddressService.getRegionOptions('US').then(function (regionOptions) { + expect(_.map(regionOptions, 'shortCode')).toEqual(['AL', 'AK', 'AZ']); + }); + }), + ); + + it( + 'should return an empty array for an invalid country', + asynchronous(function () { + return editAddressService.getRegionOptions('foo').then(function (regionOptions) { + expect(_.map(regionOptions, 'shortCode')).toEqual([]); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/editGroup/editGroup.component.js b/app/assets/javascripts/angular/components/editGroup/editGroup.component.js index 4489225b60..f66cb25cda 100644 --- a/app/assets/javascripts/angular/components/editGroup/editGroup.component.js +++ b/app/assets/javascripts/angular/components/editGroup/editGroup.component.js @@ -2,93 +2,85 @@ import template from './editGroup.html'; import './editGroup.scss'; angular.module('campusContactsApp').component('editGroup', { - controller: editGroupController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: editGroupController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function editGroupController(groupsService, editGroupService, tFilter, _) { - var vm = this; + const vm = this; - vm.title = null; - vm.saving = false; - vm.meetingFrequencyOptions = ['weekly', 'monthly', 'sporadically']; - vm.weekDayOptions = _.range(0, 7).map(function (day) { - return { value: day, label: tFilter('date.day_names.' + day) }; - }); - vm.monthDayOptions = _.range(1, 32).map(function (day) { - return { value: day, label: day.toString() }; - }); + vm.title = null; + vm.saving = false; + vm.meetingFrequencyOptions = ['weekly', 'monthly', 'sporadically']; + vm.weekDayOptions = _.range(0, 7).map(function (day) { + return { value: day, label: tFilter('date.day_names.' + day) }; + }); + vm.monthDayOptions = _.range(1, 32).map(function (day) { + return { value: day, label: day.toString() }; + }); - vm.valid = valid; - vm.save = save; - vm.cancel = cancel; + vm.valid = valid; + vm.save = save; + vm.cancel = cancel; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - vm.orgId = vm.resolve.organizationId; - var groupTemplate = groupsService.getGroupTemplate(vm.orgId); - vm.group = _.clone(vm.resolve.group || groupTemplate); - vm.leaders = groupsService.getMembersWithRole(vm.group, 'leader'); + function activate() { + vm.orgId = vm.resolve.organizationId; + const groupTemplate = groupsService.getGroupTemplate(vm.orgId); + vm.group = _.clone(vm.resolve.group || groupTemplate); + vm.leaders = groupsService.getMembersWithRole(vm.group, 'leader'); - // The uib-timepicker needs the start and end times to be Date instances - // Default the start and end times to the values set on their default values in a new group template - vm.startTimeDate = groupsService.timeToDate( - vm.group.start_time || groupTemplate.start_time, - ); - vm.endTimeDate = groupsService.timeToDate( - vm.group.end_time || groupTemplate.end_time, - ); + // The uib-timepicker needs the start and end times to be Date instances + // Default the start and end times to the values set on their default values in a new group template + vm.startTimeDate = groupsService.timeToDate(vm.group.start_time || groupTemplate.start_time); + vm.endTimeDate = groupsService.timeToDate(vm.group.end_time || groupTemplate.end_time); - // Track the meeting time when it is a day of the week and when it is a day of the month separately - vm.meetingDayOfWeek = - vm.group.meets === 'weekly' ? vm.group.meeting_day : 0; - vm.meetingDayOfMonth = - vm.group.meets === 'monthly' ? vm.group.meeting_day : 1; + // Track the meeting time when it is a day of the week and when it is a day of the month separately + vm.meetingDayOfWeek = vm.group.meets === 'weekly' ? vm.group.meeting_day : 0; + vm.meetingDayOfMonth = vm.group.meets === 'monthly' ? vm.group.meeting_day : 1; - vm.title = vm.group.id - ? 'groups.edit.edit_group' - : 'groups.new.new_group'; - } - - function valid() { - return editGroupService.isGroupValid(vm.group); - } + vm.title = vm.group.id ? 'groups.edit.edit_group' : 'groups.new.new_group'; + } - function save() { - vm.saving = true; + function valid() { + return editGroupService.isGroupValid(vm.group); + } - // Update the start and end times with the uib-timepicker values - vm.group.start_time = groupsService.dateToTime(vm.startTimeDate); - vm.group.end_time = groupsService.dateToTime(vm.endTimeDate); + function save() { + vm.saving = true; - // Copy the meeting time to the group - if (vm.group.meets === 'weekly') { - vm.group.meeting_day = vm.meetingDayOfWeek; - } else if (vm.group.meets === 'monthly') { - vm.group.meeting_day = vm.meetingDayOfMonth; - } else if (vm.group.meets === 'sporadically') { - vm.group.meeting_day = null; - vm.group.start_time = null; - vm.group.end_time = null; - } + // Update the start and end times with the uib-timepicker values + vm.group.start_time = groupsService.dateToTime(vm.startTimeDate); + vm.group.end_time = groupsService.dateToTime(vm.endTimeDate); - groupsService - .saveGroup(vm.group, vm.leaders) - .then(function (newGroup) { - vm.close({ $value: newGroup }); - }) - .catch(function () { - vm.saving = false; - }); + // Copy the meeting time to the group + if (vm.group.meets === 'weekly') { + vm.group.meeting_day = vm.meetingDayOfWeek; + } else if (vm.group.meets === 'monthly') { + vm.group.meeting_day = vm.meetingDayOfMonth; + } else if (vm.group.meets === 'sporadically') { + vm.group.meeting_day = null; + vm.group.start_time = null; + vm.group.end_time = null; } - function cancel() { - vm.dismiss(); - } + groupsService + .saveGroup(vm.group, vm.leaders) + .then(function (newGroup) { + vm.close({ $value: newGroup }); + }) + .catch(function () { + vm.saving = false; + }); + } + + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/editGroup/editGroup.html b/app/assets/javascripts/angular/components/editGroup/editGroup.html index 4887ae1485..929aa4e9f4 100644 --- a/app/assets/javascripts/angular/components/editGroup/editGroup.html +++ b/app/assets/javascripts/angular/components/editGroup/editGroup.html @@ -1,119 +1,86 @@
- - - - + + + +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- - -
+
+ + +
-
- - -
+
+ + +
- - + +
diff --git a/app/assets/javascripts/angular/components/editGroup/editGroup.service.js b/app/assets/javascripts/angular/components/editGroup/editGroup.service.js index dfde79fa3f..84a0e31801 100644 --- a/app/assets/javascripts/angular/components/editGroup/editGroup.service.js +++ b/app/assets/javascripts/angular/components/editGroup/editGroup.service.js @@ -1,12 +1,10 @@ -angular - .module('campusContactsApp') - .factory('editGroupService', editGroupService); +angular.module('campusContactsApp').factory('editGroupService', editGroupService); function editGroupService() { - return { - // Determine whether a group has valid field values - isGroupValid: function (group) { - return group.name && group.location; - }, - }; + return { + // Determine whether a group has valid field values + isGroupValid: function (group) { + return group.name && group.location; + }, + }; } diff --git a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.component.js b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.component.js index 4ea7ec8bbc..3476166b25 100644 --- a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.component.js +++ b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.component.js @@ -2,125 +2,112 @@ import template from './editGroupOrLabelAssignments.html'; import './editGroupOrLabelAssignments.scss'; angular.module('campusContactsApp').component('editGroupOrLabelAssignments', { - controller: editGroupOrLabelAssignmentsController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: editGroupOrLabelAssignmentsController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); -function editGroupOrLabelAssignmentsController( - editGroupOrLabelAssignmentsService, - JsonApiDataStore, - _, -) { - var vm = this; - - vm.saving = false; - vm.entryOptions = []; - vm.selectedEntries = {}; - vm.addedEntries = []; - vm.removedEntries = []; - - vm.save = save; - vm.cancel = cancel; - - vm.$onInit = activate; - - function activate() { - loadEntryOptions(); - buildSelectedDict(); - - const title = isOrgLabelsMode() - ? 'people.show.apply_labels' - : 'people.show.apply_groups'; - vm.title = vm.resolve.person.first_name ? title : `${title}_undefined`; - vm.subtitle = isOrgLabelsMode() ? 'people.index.labels' : 'nav.groups'; - } +function editGroupOrLabelAssignmentsController(editGroupOrLabelAssignmentsService, JsonApiDataStore, _) { + const vm = this; - function isOrgLabelsMode() { - return vm.resolve.relationship === 'organizational_labels'; - } + vm.saving = false; + vm.entryOptions = []; + vm.selectedEntries = {}; + vm.addedEntries = []; + vm.removedEntries = []; - function orgRelationship() { - return isOrgLabelsMode() ? 'labels' : 'groups'; - } + vm.save = save; + vm.cancel = cancel; - function relatedModel() { - return isOrgLabelsMode() ? 'label' : 'group'; - } + vm.$onInit = activate; - function sortFunction() { - if (isOrgLabelsMode()) { - return function (organization) { - return parseInt(organization.id, 10); - }; - } - return 'name'; - } + function activate() { + loadEntryOptions(); + buildSelectedDict(); - function orgFilterExpression() { - if (isOrgLabelsMode()) { - return { organization_id: vm.resolve.organizationId }; - } - return ['group.organization.id', vm.resolve.organizationId]; - } + const title = isOrgLabelsMode() ? 'people.show.apply_labels' : 'people.show.apply_groups'; + vm.title = vm.resolve.person.first_name ? title : `${title}_undefined`; + vm.subtitle = isOrgLabelsMode() ? 'people.index.labels' : 'nav.groups'; + } - function errorMessage() { - return isOrgLabelsMode() - ? 'error.messages.edit_group_or_label_assignments.load_labels' - : 'error.messages.edit_group_or_label_assignments.load_groups'; - } + function isOrgLabelsMode() { + return vm.resolve.relationship === 'organizational_labels'; + } - function loadEntryOptions() { - var entries = JsonApiDataStore.store.find( - 'organization', - vm.resolve.organizationId, - )[orgRelationship()]; - vm.entryOptions = _.sortBy(entries, sortFunction()); - editGroupOrLabelAssignmentsService.loadPlaceholderEntries( - entries, - vm.resolve.organizationId, - errorMessage(), - ); - } + function orgRelationship() { + return isOrgLabelsMode() ? 'labels' : 'groups'; + } - function buildSelectedDict() { - vm.selectedEntries = _.chain(vm.resolve.person[vm.resolve.relationship]) - .filter(orgFilterExpression()) - .map(function (entry) { - return [entry[relatedModel()].id, true]; - }) - .fromPairs() - .value(); - } + function relatedModel() { + return isOrgLabelsMode() ? 'label' : 'group'; + } - function save() { - var savingPromise; - vm.saving = true; - if (isOrgLabelsMode()) { - savingPromise = editGroupOrLabelAssignmentsService.saveOrganizationalLabels( - vm.resolve.person, - vm.resolve.organizationId, - vm.addedEntries, - vm.removedEntries, - ); - } else { - savingPromise = editGroupOrLabelAssignmentsService.saveGroupMemberships( - vm.resolve.person, - vm.addedEntries, - vm.removedEntries, - ); - } - - savingPromise.then(vm.close).catch(function () { - vm.saving = false; - }); + function sortFunction() { + if (isOrgLabelsMode()) { + return function (organization) { + return parseInt(organization.id, 10); + }; } + return 'name'; + } - function cancel() { - vm.dismiss(); + function orgFilterExpression() { + if (isOrgLabelsMode()) { + return { organization_id: vm.resolve.organizationId }; } + return ['group.organization.id', vm.resolve.organizationId]; + } + + function errorMessage() { + return isOrgLabelsMode() + ? 'error.messages.edit_group_or_label_assignments.load_labels' + : 'error.messages.edit_group_or_label_assignments.load_groups'; + } + + function loadEntryOptions() { + const entries = JsonApiDataStore.store.find('organization', vm.resolve.organizationId)[orgRelationship()]; + vm.entryOptions = _.sortBy(entries, sortFunction()); + editGroupOrLabelAssignmentsService.loadPlaceholderEntries(entries, vm.resolve.organizationId, errorMessage()); + } + + function buildSelectedDict() { + vm.selectedEntries = _.chain(vm.resolve.person[vm.resolve.relationship]) + .filter(orgFilterExpression()) + .map(function (entry) { + return [entry[relatedModel()].id, true]; + }) + .fromPairs() + .value(); + } + + function save() { + let savingPromise; + vm.saving = true; + if (isOrgLabelsMode()) { + savingPromise = editGroupOrLabelAssignmentsService.saveOrganizationalLabels( + vm.resolve.person, + vm.resolve.organizationId, + vm.addedEntries, + vm.removedEntries, + ); + } else { + savingPromise = editGroupOrLabelAssignmentsService.saveGroupMemberships( + vm.resolve.person, + vm.addedEntries, + vm.removedEntries, + ); + } + + savingPromise.then(vm.close).catch(function () { + vm.saving = false; + }); + } + + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.html b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.html index 7ca60747f3..521833434f 100644 --- a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.html +++ b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.html @@ -1,36 +1,23 @@
-

{{ $ctrl.subtitle | t }}

- - - - +

{{ $ctrl.subtitle | t }}

+ + + +
- - + +
- - + +
diff --git a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.service.js b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.service.js index 9df7d6e492..5886b02e72 100644 --- a/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.service.js +++ b/app/assets/javascripts/angular/components/editGroupOrLabelAssignments/editGroupOrLabelAssignments.service.js @@ -1,161 +1,92 @@ -angular - .module('campusContactsApp') - .factory( - 'editGroupOrLabelAssignmentsService', - editGroupOrLabelAssignmentsService, - ); +angular.module('campusContactsApp').factory('editGroupOrLabelAssignmentsService', editGroupOrLabelAssignmentsService); -function editGroupOrLabelAssignmentsService( - $q, - httpProxy, - modelsService, - JsonApiDataStore, - personProfileService, - _, -) { - function pushNew(modelType, person, newIds, organizationId) { - var relationships = _.map(newIds, function (labelId) { - return buildRelationshipModel(modelType, labelId, organizationId); - }); +function editGroupOrLabelAssignmentsService($q, httpProxy, modelsService, JsonApiDataStore, personProfileService, _) { + function pushNew(modelType, person, newIds, organizationId) { + const relationships = _.map(newIds, function (labelId) { + return buildRelationshipModel(modelType, labelId, organizationId); + }); - return personProfileService.saveRelationships( - person, - relationships, - personRelationshipName(modelType), - ); - } + return personProfileService.saveRelationships(person, relationships, personRelationshipName(modelType)); + } - function buildRelationshipModel(modelType, relatedId, organizationId) { - var model = new JsonApiDataStore.Model(modelType); - if (modelType === 'organizational_label') { - model.setAttribute('label_id', relatedId); - model.setAttribute('organization_id', organizationId); - model.setRelationship( - 'label', - JsonApiDataStore.store.find('label', relatedId), - ); - } else { - model.setAttribute('group_id', relatedId); - model.setRelationship( - 'group', - JsonApiDataStore.store.find('group', relatedId), - ); - } - return model; + function buildRelationshipModel(modelType, relatedId, organizationId) { + const model = new JsonApiDataStore.Model(modelType); + if (modelType === 'organizational_label') { + model.setAttribute('label_id', relatedId); + model.setAttribute('organization_id', organizationId); + model.setRelationship('label', JsonApiDataStore.store.find('label', relatedId)); + } else { + model.setAttribute('group_id', relatedId); + model.setRelationship('group', JsonApiDataStore.store.find('group', relatedId)); } + return model; + } - function personRelationshipName(modelType) { - // accept either a string type or an object - return modelType === 'organizational_label' - ? 'organizational_labels' - : 'group_memberships'; - } + function personRelationshipName(modelType) { + // accept either a string type or an object + return modelType === 'organizational_label' ? 'organizational_labels' : 'group_memberships'; + } - function relatedModel(type) { - return type === 'organizational_label' ? 'label' : 'group'; - } + function relatedModel(type) { + return type === 'organizational_label' ? 'label' : 'group'; + } - function deleteByRelatedId(type, relatedId, person) { - var relationshipName = personRelationshipName(type); - var relatedType = relatedModel(type); - var relationship = _.find(person[relationshipName], [ - relatedType + '.id', - relatedId, - ]); - return personProfileService.deleteRelationship( - person, - relationship, - relationshipName, - ); - } + function deleteByRelatedId(type, relatedId, person) { + const relationshipName = personRelationshipName(type); + const relatedType = relatedModel(type); + const relationship = _.find(person[relationshipName], [relatedType + '.id', relatedId]); + return personProfileService.deleteRelationship(person, relationship, relationshipName); + } - function saveRelationshipChanges( - type, - person, - addedRelationshipIds, - removedRelationshipIds, - organizationId, - ) { - var promises = _.map(removedRelationshipIds, function (relatedId) { - return deleteByRelatedId(type, relatedId, person); - }); - if (addedRelationshipIds.length > 0) { - promises.push( - pushNew(type, person, addedRelationshipIds, organizationId), - ); - } - return $q.all(promises); + function saveRelationshipChanges(type, person, addedRelationshipIds, removedRelationshipIds, organizationId) { + const promises = _.map(removedRelationshipIds, function (relatedId) { + return deleteByRelatedId(type, relatedId, person); + }); + if (addedRelationshipIds.length > 0) { + promises.push(pushNew(type, person, addedRelationshipIds, organizationId)); } + return $q.all(promises); + } - function updateGroupMemberships(person, addedGroupIds, removedGroupIds) { - _.each(addedGroupIds, function (groupId) { - var group = JsonApiDataStore.store.find('group', groupId); - var membership = _.find(person.group_memberships, [ - 'group.id', - groupId, - ]); - group.group_memberships.push(membership); - }); - _.each(removedGroupIds, function (groupId) { - var group = JsonApiDataStore.store.find('group', groupId); - var membership = _.find(group.group_memberships, [ - 'person.id', - person.id, - ]); - _.remove(group.group_memberships, membership); - }); - } + function updateGroupMemberships(person, addedGroupIds, removedGroupIds) { + _.each(addedGroupIds, function (groupId) { + const group = JsonApiDataStore.store.find('group', groupId); + const membership = _.find(person.group_memberships, ['group.id', groupId]); + group.group_memberships.push(membership); + }); + _.each(removedGroupIds, function (groupId) { + const group = JsonApiDataStore.store.find('group', groupId); + const membership = _.find(group.group_memberships, ['person.id', person.id]); + _.remove(group.group_memberships, membership); + }); + } - return { - saveOrganizationalLabels: function ( - person, - organizationId, - addedLabelIds, - removedLabelIds, - ) { - return saveRelationshipChanges( - 'organizational_label', - person, - addedLabelIds, - removedLabelIds, - organizationId, - ); - }, + return { + saveOrganizationalLabels: function (person, organizationId, addedLabelIds, removedLabelIds) { + return saveRelationshipChanges('organizational_label', person, addedLabelIds, removedLabelIds, organizationId); + }, - saveGroupMemberships: function ( - person, - addedGroupIds, - removedGroupIds, - ) { - var savePromise = saveRelationshipChanges( - 'group_membership', - person, - addedGroupIds, - removedGroupIds, - ); - return savePromise.then(function (resp) { - updateGroupMemberships(person, addedGroupIds, removedGroupIds); - return resp; - }); - }, + saveGroupMemberships: function (person, addedGroupIds, removedGroupIds) { + const savePromise = saveRelationshipChanges('group_membership', person, addedGroupIds, removedGroupIds); + return savePromise.then(function (resp) { + updateGroupMemberships(person, addedGroupIds, removedGroupIds); + return resp; + }); + }, - loadPlaceholderEntries: function (entries, orgId, errorMessage) { - if (_.find(entries, { _placeHolder: true })) { - httpProxy.get( - modelsService - .getModelMetadata('organization') - .url.single(orgId), - { - include: modelsService.getModelMetadata( - entries[0]._type, - ).include, - 'filters[user_created]': false, - }, - { - errorMessage: errorMessage, - }, - ); - } - }, - }; + loadPlaceholderEntries: function (entries, orgId, errorMessage) { + if (_.find(entries, { _placeHolder: true })) { + httpProxy.get( + modelsService.getModelMetadata('organization').url.single(orgId), + { + include: modelsService.getModelMetadata(entries[0]._type).include, + 'filters[user_created]': false, + }, + { + errorMessage, + }, + ); + } + }, + }; } diff --git a/app/assets/javascripts/angular/components/editLabel/editLabel.component.js b/app/assets/javascripts/angular/components/editLabel/editLabel.component.js index d7a783c388..52bf4e0ec1 100644 --- a/app/assets/javascripts/angular/components/editLabel/editLabel.component.js +++ b/app/assets/javascripts/angular/components/editLabel/editLabel.component.js @@ -1,50 +1,48 @@ import template from './editLabel.html'; angular.module('campusContactsApp').component('editLabel', { - controller: editLabelController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: editLabelController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function editLabelController(labelsService, _) { - var vm = this; - - vm.title = null; - vm.saving = false; - - vm.valid = valid; - vm.save = save; - - vm.$onInit = activate; - - function activate() { - vm.orgId = vm.resolve.organizationId; - var labelTemplate = labelsService.getLabelTemplate(vm.orgId); - vm.label = _.clone(vm.resolve.label || labelTemplate); - - vm.title = vm.label.id - ? 'labels.edit.edit_label' - : 'labels.new.new_label'; - } - - function valid() { - return Boolean(vm.label.name); - } - - function save() { - vm.saving = true; - - return labelsService - .saveLabel(vm.label) - .then(function (newLabel) { - vm.close({ $value: newLabel }); - }) - .catch(function () { - vm.saving = false; - }); - } + const vm = this; + + vm.title = null; + vm.saving = false; + + vm.valid = valid; + vm.save = save; + + vm.$onInit = activate; + + function activate() { + vm.orgId = vm.resolve.organizationId; + const labelTemplate = labelsService.getLabelTemplate(vm.orgId); + vm.label = _.clone(vm.resolve.label || labelTemplate); + + vm.title = vm.label.id ? 'labels.edit.edit_label' : 'labels.new.new_label'; + } + + function valid() { + return Boolean(vm.label.name); + } + + function save() { + vm.saving = true; + + return labelsService + .saveLabel(vm.label) + .then(function (newLabel) { + vm.close({ $value: newLabel }); + }) + .catch(function () { + vm.saving = false; + }); + } } diff --git a/app/assets/javascripts/angular/components/editLabel/editLabel.component.spec.js b/app/assets/javascripts/angular/components/editLabel/editLabel.component.spec.js index 9149f651f7..424760bf2f 100644 --- a/app/assets/javascripts/angular/components/editLabel/editLabel.component.spec.js +++ b/app/assets/javascripts/angular/components/editLabel/editLabel.component.spec.js @@ -1,132 +1,118 @@ import 'angular-mocks'; // Constants -var $ctrl, $q, $rootScope, JsonApiDataStore; +let $ctrl, $q, $rootScope, JsonApiDataStore; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('editLabel component', function () { - beforeEach(inject(function ( - $componentController, - _$q_, - _$rootScope_, - _JsonApiDataStore_, - ) { - $q = _$q_; - $rootScope = _$rootScope_; - JsonApiDataStore = _JsonApiDataStore_; - - this.labelsService = jasmine.createSpyObj('labelsService', [ - 'getLabelTemplate', - 'saveLabel', - ]); - this.close = jasmine.createSpy('close'); - this.dismiss = jasmine.createSpy('dismiss'); - - this.label = new JsonApiDataStore.Model('label'); - this.label.setAttribute('id', 1); - this.label.setAttribute('name', 'Test label'); - - $ctrl = $componentController( - 'editLabel', - { - labelsService: this.labelsService, - }, - { - resolve: { - organizationId: 1, - label: this.label, - }, - close: this.close, - dismiss: this.dismiss, - }, - ); - })); - - describe('$onInit', function () { - it("should initialize and create a label if one doesn't exist", function () { - delete $ctrl.resolve.label; - this.labelsService.getLabelTemplate.and.returnValue({ - name: 'New Label', - }); - - $ctrl.$onInit(); - - expect($ctrl.orgId).toEqual(1); - expect($ctrl.label).toEqual({ name: 'New Label' }); - expect($ctrl.title).toEqual('labels.new.new_label'); - }); + beforeEach(inject(function ($componentController, _$q_, _$rootScope_, _JsonApiDataStore_) { + $q = _$q_; + $rootScope = _$rootScope_; + JsonApiDataStore = _JsonApiDataStore_; + + this.labelsService = jasmine.createSpyObj('labelsService', ['getLabelTemplate', 'saveLabel']); + this.close = jasmine.createSpy('close'); + this.dismiss = jasmine.createSpy('dismiss'); + + this.label = new JsonApiDataStore.Model('label'); + this.label.setAttribute('id', 1); + this.label.setAttribute('name', 'Test label'); + + $ctrl = $componentController( + 'editLabel', + { + labelsService: this.labelsService, + }, + { + resolve: { + organizationId: 1, + label: this.label, + }, + close: this.close, + dismiss: this.dismiss, + }, + ); + })); + + describe('$onInit', function () { + it("should initialize and create a label if one doesn't exist", function () { + delete $ctrl.resolve.label; + this.labelsService.getLabelTemplate.and.returnValue({ + name: 'New Label', + }); + + $ctrl.$onInit(); + + expect($ctrl.orgId).toEqual(1); + expect($ctrl.label).toEqual({ name: 'New Label' }); + expect($ctrl.title).toEqual('labels.new.new_label'); }); + }); - describe('valid', function () { - beforeEach(function () { - $ctrl.$onInit(); - }); - - it('should return true if the edited label has a name', function () { - expect($ctrl.valid()).toEqual(true); - }); + describe('valid', function () { + beforeEach(function () { + $ctrl.$onInit(); + }); - it('should return false if the edited label is empty', function () { - $ctrl.label.name = ''; - expect($ctrl.valid()).toEqual(false); - }); + it('should return true if the edited label has a name', function () { + expect($ctrl.valid()).toEqual(true); }); - describe('save', function () { - beforeEach(function () { - $ctrl.$onInit(); - }); + it('should return false if the edited label is empty', function () { + $ctrl.label.name = ''; + expect($ctrl.valid()).toEqual(false); + }); + }); - it( - 'should save the edited label', - asynchronous(function () { - var _this = this; - this.labelsService.saveLabel.and.returnValue( - $q.resolve({ name: 'Saved Label' }), - ); - - return $ctrl.save().then(function () { - expect(_this.labelsService.saveLabel).toHaveBeenCalledWith( - _this.label, - ); - expect(_this.close).toHaveBeenCalledWith({ - $value: { name: 'Saved Label' }, - }); - expect($ctrl.saving).toEqual(true); - }); - }), - ); - - it( - 'should handle an error saving the edited label', - asynchronous(function () { - var _this = this; - this.labelsService.saveLabel.and.returnValue($q.reject()); - - return $ctrl.save().then(function () { - expect(_this.labelsService.saveLabel).toHaveBeenCalledWith( - _this.label, - ); - expect($ctrl.saving).toEqual(false); - }); - }), - ); + describe('save', function () { + beforeEach(function () { + $ctrl.$onInit(); }); + + it( + 'should save the edited label', + asynchronous(function () { + const _this = this; + this.labelsService.saveLabel.and.returnValue($q.resolve({ name: 'Saved Label' })); + + return $ctrl.save().then(function () { + expect(_this.labelsService.saveLabel).toHaveBeenCalledWith(_this.label); + expect(_this.close).toHaveBeenCalledWith({ + $value: { name: 'Saved Label' }, + }); + expect($ctrl.saving).toEqual(true); + }); + }), + ); + + it( + 'should handle an error saving the edited label', + asynchronous(function () { + const _this = this; + this.labelsService.saveLabel.and.returnValue($q.reject()); + + return $ctrl.save().then(function () { + expect(_this.labelsService.saveLabel).toHaveBeenCalledWith(_this.label); + expect($ctrl.saving).toEqual(false); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/editLabel/editLabel.html b/app/assets/javascripts/angular/components/editLabel/editLabel.html index d9e9227abb..3dfe299d22 100644 --- a/app/assets/javascripts/angular/components/editLabel/editLabel.html +++ b/app/assets/javascripts/angular/components/editLabel/editLabel.html @@ -1,40 +1,21 @@
- - - - + + + +
-
- -
+
+ +
- - + +
diff --git a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.component.js b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.component.js index 4218b86429..5987a0a192 100644 --- a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.component.js +++ b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.component.js @@ -2,142 +2,137 @@ import template from './groupMembersModal.html'; import './groupMembersModal.scss'; angular.module('campusContactsApp').component('groupMembersModal', { - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - controller: groupMembersModalController, - template: template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + controller: groupMembersModalController, + template, }); function groupMembersModalController( - $scope, - $uibModal, - confirmModalService, - RequestDeduper, - ProgressiveListLoader, - groupsService, - groupMembersModalService, - tFilter, - _, + $scope, + $uibModal, + confirmModalService, + RequestDeduper, + ProgressiveListLoader, + groupsService, + groupMembersModalService, + tFilter, + _, ) { - var vm = this; - - vm.memberships = []; - vm.loadedAll = false; - vm.busy = false; - vm.memberAdderVisible = false; - vm.loadMemberPage = loadMemberPage; - vm.toggleMemberAdderVisibility = toggleMemberAdderVisibility; - vm.messageGroup = messageGroup; - vm.emailPerson = emailPerson; - vm.addMember = addMember; - vm.removeMember = removeMember; - - vm.close = close; - vm.$onInit = activate; - - var requestDeduper = new RequestDeduper(); - var listLoader = new ProgressiveListLoader({ - modelType: 'person', - requestDeduper: requestDeduper, - errorMessage: 'error.messages.group_members.load_member_chunk', + const vm = this; + + vm.memberships = []; + vm.loadedAll = false; + vm.busy = false; + vm.memberAdderVisible = false; + vm.loadMemberPage = loadMemberPage; + vm.toggleMemberAdderVisibility = toggleMemberAdderVisibility; + vm.messageGroup = messageGroup; + vm.emailPerson = emailPerson; + vm.addMember = addMember; + vm.removeMember = removeMember; + + vm.close = close; + vm.$onInit = activate; + + const requestDeduper = new RequestDeduper(); + const listLoader = new ProgressiveListLoader({ + modelType: 'person', + requestDeduper, + errorMessage: 'error.messages.group_members.load_member_chunk', + }); + + function activate() { + vm.group = vm.resolve.group; + + $scope.$watchCollection('$ctrl.group.group_memberships', function () { + vm.members = groupsService.getAllMembers(vm.group); }); - - function activate() { - vm.group = vm.resolve.group; - - $scope.$watchCollection('$ctrl.group.group_memberships', function () { - vm.members = groupsService.getAllMembers(vm.group); - }); - } - - // Load another page of members - function loadMemberPage() { - vm.busy = true; - - return groupMembersModalService - .loadMoreGroupMembers(vm.group, listLoader) - .then(function (res) { - // Convert members to memberships - vm.memberships = res.list.map(function (member) { - return groupsService.findMember(vm.group, member); - }); - vm.loadedAll = res.loadedAll; - }) - .finally(function () { - vm.busy = false; - }); - } - - function toggleMemberAdderVisibility() { - vm.memberAdderVisible = !vm.memberAdderVisible; - } - - // Generate a selection object from an array of people - function generateSelection(members) { - return { - orgId: vm.group.organization.id, - filters: { - groups: [vm.group.id], - }, - selectedPeople: _.map(members, 'id'), - unselectedPeople: [], - totalSelectedPeople: members.length, - allSelected: true, - allIncluded: true, - }; - } - - function messageGroup(medium) { - var members = groupsService.getAllMembers(vm.group); - $uibModal.open({ - component: 'messageModal', - resolve: { - medium: _.constant(medium), - selection: _.constant(generateSelection(members)), - }, - windowClass: 'pivot_theme', - size: 'md', - }); - } - - function emailPerson(person) { - $uibModal.open({ - component: 'messageModal', - resolve: { - medium: _.constant('email'), - selection: _.constant(generateSelection([person])), - }, - windowClass: 'pivot_theme', - size: 'md', + } + + // Load another page of members + function loadMemberPage() { + vm.busy = true; + + return groupMembersModalService + .loadMoreGroupMembers(vm.group, listLoader) + .then(function (res) { + // Convert members to memberships + vm.memberships = res.list.map(function (member) { + return groupsService.findMember(vm.group, member); }); - } - - function addMember(person) { - groupMembersModalService - .addMember(vm.group, person) - .then(function (membership) { - vm.memberships.push(membership); - }); - } - - function removeMember(membership) { - confirmModalService - .create(tFilter('groups.members.remove_confirm')) - .then(function () { - return groupMembersModalService.removeMember( - vm.group, - membership, - ); - }) - .then(function () { - _.pull(vm.memberships, membership); - }); - } - - function close() { - vm.close(); - } + vm.loadedAll = res.loadedAll; + }) + .finally(function () { + vm.busy = false; + }); + } + + function toggleMemberAdderVisibility() { + vm.memberAdderVisible = !vm.memberAdderVisible; + } + + // Generate a selection object from an array of people + function generateSelection(members) { + return { + orgId: vm.group.organization.id, + filters: { + groups: [vm.group.id], + }, + selectedPeople: _.map(members, 'id'), + unselectedPeople: [], + totalSelectedPeople: members.length, + allSelected: true, + allIncluded: true, + }; + } + + function messageGroup(medium) { + const members = groupsService.getAllMembers(vm.group); + $uibModal.open({ + component: 'messageModal', + resolve: { + medium: _.constant(medium), + selection: _.constant(generateSelection(members)), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + } + + function emailPerson(person) { + $uibModal.open({ + component: 'messageModal', + resolve: { + medium: _.constant('email'), + selection: _.constant(generateSelection([person])), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + } + + function addMember(person) { + groupMembersModalService.addMember(vm.group, person).then(function (membership) { + vm.memberships.push(membership); + }); + } + + function removeMember(membership) { + confirmModalService + .create(tFilter('groups.members.remove_confirm')) + .then(function () { + return groupMembersModalService.removeMember(vm.group, membership); + }) + .then(function () { + _.pull(vm.memberships, membership); + }); + } + + function close() { + vm.close(); + } } diff --git a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.html b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.html index 4e38fb4c96..5eade3f415 100644 --- a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.html +++ b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.html @@ -1,67 +1,55 @@
-

{{ 'groups.members.title' | t }}

-

{{ $ctrl.group.name }}

+

{{ 'groups.members.title' | t }}

+

{{ $ctrl.group.name }}

-
-
- {{ 'groups.members.columns.name' | t }} -
-
- -
- - -
-
-
-
-
+
{{ 'groups.members.columns.name' | t }}
+
+ +
+ -
+
+
-
- {{ membership.person | personName }} - ({{ 'groups.members.leader' | t }}) -
-
- - -
-
-
- {{ 'general.loading_more' | t }} -
+ class="row member" + > +
+ {{ membership.person | personName }} + ({{ 'groups.members.leader' | t }}) +
+
+ +
+
+
{{ 'general.loading_more' | t }}
+
- +
diff --git a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.js b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.js index 65287bdd4e..4abcb77f2c 100644 --- a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.js +++ b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.js @@ -1,66 +1,52 @@ -angular - .module('campusContactsApp') - .factory('groupMembersModalService', groupMembersModalService); +angular.module('campusContactsApp').factory('groupMembersModalService', groupMembersModalService); -function groupMembersModalService( - httpProxy, - JsonApiDataStore, - modelsService, - _, -) { - return { - // Load another chunk of group members - loadMoreGroupMembers: function (group, listLoader) { - // All of the group's group_memberships should have already been loaded by groupsService.loadLeaders, - // but load the group_memberships anyway, just in case that request has not completed yet - return listLoader.loadMore({ - include: 'email_addresses,phone_numbers,group_memberships', - 'filters[organization_ids]': group.organization.id, - 'filters[group_ids]': group.id, - }); - }, +function groupMembersModalService(httpProxy, JsonApiDataStore, modelsService, _) { + return { + // Load another chunk of group members + loadMoreGroupMembers: function (group, listLoader) { + // All of the group's group_memberships should have already been loaded by groupsService.loadLeaders, + // but load the group_memberships anyway, just in case that request has not completed yet + return listLoader.loadMore({ + include: 'email_addresses,phone_numbers,group_memberships', + 'filters[organization_ids]': group.organization.id, + 'filters[group_ids]': group.id, + }); + }, - // Add a member to the group - addMember: function (group, person) { - var membership = new JsonApiDataStore.Model('group_membership'); - membership.setAttribute('role', 'member'); - membership.setAttribute('group_id', group.id); - membership.setAttribute('person_id', person.id); + // Add a member to the group + addMember: function (group, person) { + const membership = new JsonApiDataStore.Model('group_membership'); + membership.setAttribute('role', 'member'); + membership.setAttribute('group_id', group.id); + membership.setAttribute('person_id', person.id); - var payload = membership.serialize(); - return httpProxy - .post( - modelsService.getModelMetadata('group_membership').url.all, - payload, - { - errorMessage: 'error.messages.group_members.add_member', - }, - ) - .then(httpProxy.extractModel) - .then(function (membership) { - group.group_memberships.push(membership); - return membership; - }); - }, + const payload = membership.serialize(); + return httpProxy + .post(modelsService.getModelMetadata('group_membership').url.all, payload, { + errorMessage: 'error.messages.group_members.add_member', + }) + .then(httpProxy.extractModel) + .then(function (membership) { + group.group_memberships.push(membership); + return membership; + }); + }, - // Remove a member from a group - removeMember: function (group, membership) { - var url = modelsService - .getModelMetadata('group_membership') - .url.single(membership.id); - return httpProxy - .delete( - url, - {}, - { - errorMessage: - 'error.messages.group_members.remove_member', - }, - ) - .then(function () { - _.pull(group.group_memberships, membership); - return membership; - }); - }, - }; + // Remove a member from a group + removeMember: function (group, membership) { + const url = modelsService.getModelMetadata('group_membership').url.single(membership.id); + return httpProxy + .delete( + url, + {}, + { + errorMessage: 'error.messages.group_members.remove_member', + }, + ) + .then(function () { + _.pull(group.group_memberships, membership); + return membership; + }); + }, + }; } diff --git a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.spec.js b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.spec.js index 20c9d330cb..41811adce3 100644 --- a/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.spec.js +++ b/app/assets/javascripts/angular/components/groupMembersModal/groupMembersModal.service.spec.js @@ -1,82 +1,68 @@ import 'angular-mocks'; // Constants -var groupMembersModalService, $q, $rootScope, httpProxy, _; +let groupMembersModalService, $q, $rootScope, httpProxy, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('groupMembersModalService service', function () { - beforeEach(inject(function ( - _groupMembersModalService_, - _$q_, - _$rootScope_, - _httpProxy_, - ___, - ) { - groupMembersModalService = _groupMembersModalService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - _ = ___; + beforeEach(inject(function (_groupMembersModalService_, _$q_, _$rootScope_, _httpProxy_, ___) { + groupMembersModalService = _groupMembersModalService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + _ = ___; - this.group = { - id: 1, - group_memberships: [{ id: 11 }], - }; - })); + this.group = { + id: 1, + group_memberships: [{ id: 11 }], + }; + })); - describe('groupMembersModalService.addMember', function () { - it( - 'should add the new membership to the group', - asynchronous(function () { - spyOn(httpProxy, 'extractModel').and.returnValue({ id: 12 }); - spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); + describe('groupMembersModalService.addMember', function () { + it( + 'should add the new membership to the group', + asynchronous(function () { + spyOn(httpProxy, 'extractModel').and.returnValue({ id: 12 }); + spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); - var _this = this; - var person = { id: 21 }; - return groupMembersModalService - .addMember(this.group, person) - .then(function () { - expect( - _.map(_this.group.group_memberships, 'id'), - ).toEqual([11, 12]); - }); - }), - ); - }); + const _this = this; + const person = { id: 21 }; + return groupMembersModalService.addMember(this.group, person).then(function () { + expect(_.map(_this.group.group_memberships, 'id')).toEqual([11, 12]); + }); + }), + ); + }); - describe('groupMembersModalService.removeMember', function () { - it( - 'should remove the membership from the group', - asynchronous(function () { - spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); + describe('groupMembersModalService.removeMember', function () { + it( + 'should remove the membership from the group', + asynchronous(function () { + spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); - var _this = this; - var membership = this.group.group_memberships[0]; - return groupMembersModalService - .removeMember(this.group, membership) - .then(function () { - expect( - _.map(_this.group.group_memberships, 'id'), - ).toEqual([]); - }); - }), - ); - }); + const _this = this; + const membership = this.group.group_memberships[0]; + return groupMembersModalService.removeMember(this.group, membership).then(function () { + expect(_.map(_this.group.group_memberships, 'id')).toEqual([]); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/iconButton/iconButton.component.js b/app/assets/javascripts/angular/components/iconButton/iconButton.component.js index ba3d801d3a..a6179c56b9 100644 --- a/app/assets/javascripts/angular/components/iconButton/iconButton.component.js +++ b/app/assets/javascripts/angular/components/iconButton/iconButton.component.js @@ -8,24 +8,24 @@ import './iconButton.scss'; */ angular.module('campusContactsApp').component('iconButton', { - controller: iconButtonController, - bindings: { - disabled: '<', - icon: '<', - size: '<', - }, - template: template, + controller: iconButtonController, + bindings: { + disabled: '<', + icon: '<', + size: '<', + }, + template, }); function iconButtonController() { - var vm = this; + const vm = this; - vm.handleClick = handleClick; + vm.handleClick = handleClick; - function handleClick(event) { - if (vm.disabled) { - event.preventDefault(); - event.stopPropagation(); - } + function handleClick(event) { + if (vm.disabled) { + event.preventDefault(); + event.stopPropagation(); } + } } diff --git a/app/assets/javascripts/angular/components/iconButton/iconButton.html b/app/assets/javascripts/angular/components/iconButton/iconButton.html index 3f549d4475..9b3140af0d 100644 --- a/app/assets/javascripts/angular/components/iconButton/iconButton.html +++ b/app/assets/javascripts/angular/components/iconButton/iconButton.html @@ -1,7 +1,7 @@ diff --git a/app/assets/javascripts/angular/components/iconModal/iconModal.component.js b/app/assets/javascripts/angular/components/iconModal/iconModal.component.js index 8591d43b01..d6e52cb28d 100644 --- a/app/assets/javascripts/angular/components/iconModal/iconModal.component.js +++ b/app/assets/javascripts/angular/components/iconModal/iconModal.component.js @@ -2,10 +2,10 @@ import template from './iconModal.html'; import './iconModal.scss'; angular.module('campusContactsApp').component('iconModal', { - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, }); diff --git a/app/assets/javascripts/angular/components/iconModal/iconModal.html b/app/assets/javascripts/angular/components/iconModal/iconModal.html index 0682d73e91..bad2a70a73 100644 --- a/app/assets/javascripts/angular/components/iconModal/iconModal.html +++ b/app/assets/javascripts/angular/components/iconModal/iconModal.html @@ -1,44 +1,34 @@
-
-
- -

- {{ $ctrl.resolve.title }} -

-
- -

- {{ paragraph }} -

-
-
- - {{ $ctrl.resolve.dismissLabel }} - - - {{ $ctrl.resolve.closeLabel }} - +
+
+ +

{{ $ctrl.resolve.title }}

+ +

+ {{ paragraph }} +

+
+
+ + {{ $ctrl.resolve.dismissLabel }} + + + {{ $ctrl.resolve.closeLabel }} + +
diff --git a/app/assets/javascripts/angular/components/interaction/interaction.component.js b/app/assets/javascripts/angular/components/interaction/interaction.component.js index 6336a3cf68..c1af728de7 100644 --- a/app/assets/javascripts/angular/components/interaction/interaction.component.js +++ b/app/assets/javascripts/angular/components/interaction/interaction.component.js @@ -4,65 +4,59 @@ import template from './interaction.html'; import './interaction.scss'; angular.module('campusContactsApp').component('interaction', { - controller: interactionController, - template: template, - bindings: { - person: '<', - interaction: '<', - onDelete: '&', - }, + controller: interactionController, + template, + bindings: { + person: '<', + interaction: '<', + onDelete: '&', + }, }); -function interactionController( - interactionsService, - confirmModalService, - $filter, -) { - var vm = this; - - vm.editInteraction = false; - vm.moment = moment; - - vm.$onInit = activate; - vm.updateInteraction = updateInteraction; - vm.deleteInteraction = deleteInteraction; - - vm.modifyInteractionState = 'view'; - - function activate() { - vm.interactionType = interactionsService.getInteractionType( - vm.interaction.interaction_type_id, - ); - } - - function updateInteraction() { - vm.modifyInteractionState = 'saving'; - return interactionsService - .updateInteraction(vm.interaction) - .then(function () { - vm.modifyInteractionState = 'view'; - }) - .catch(function () { - vm.modifyInteractionState = 'edit'; - }); - } - - function deleteInteraction() { - vm.modifyInteractionState = 'saving'; - return confirmModalService - .create($filter('t')('interactions.delete_confirmation')) - .then(function () { - return interactionsService.deleteInteraction(vm.interaction); - }) - .then(function () { - vm.onDelete({ - $event: { - interaction: vm.interaction, - }, - }); - }) - .catch(function () { - vm.modifyInteractionState = 'view'; - }); - } +function interactionController(interactionsService, confirmModalService, $filter) { + const vm = this; + + vm.editInteraction = false; + vm.moment = moment; + + vm.$onInit = activate; + vm.updateInteraction = updateInteraction; + vm.deleteInteraction = deleteInteraction; + + vm.modifyInteractionState = 'view'; + + function activate() { + vm.interactionType = interactionsService.getInteractionType(vm.interaction.interaction_type_id); + } + + function updateInteraction() { + vm.modifyInteractionState = 'saving'; + return interactionsService + .updateInteraction(vm.interaction) + .then(function () { + vm.modifyInteractionState = 'view'; + }) + .catch(function () { + vm.modifyInteractionState = 'edit'; + }); + } + + function deleteInteraction() { + vm.modifyInteractionState = 'saving'; + return confirmModalService + .create($filter('t')('interactions.delete_confirmation')) + .then(function () { + return interactionsService.deleteInteraction(vm.interaction); + }) + .then(function () { + vm.onDelete({ + $event: { + interaction: vm.interaction, + }, + }); + }) + .catch(function () { + vm.modifyInteractionState = 'view'; + }); + } } diff --git a/app/assets/javascripts/angular/components/interaction/interaction.component.spec.js b/app/assets/javascripts/angular/components/interaction/interaction.component.spec.js index 029da0619b..12911e8a04 100644 --- a/app/assets/javascripts/angular/components/interaction/interaction.component.spec.js +++ b/app/assets/javascripts/angular/components/interaction/interaction.component.spec.js @@ -1,130 +1,109 @@ describe('interaction component', function () { - var $ctrl, $q, $rootScope, interactionsService, confirmModalService; - - beforeEach(inject(function ( - $componentController, - _$q_, - _$timeout_, - _$rootScope_, - ) { - interactionsService = jasmine.createSpyObj('interactionsService', [ - 'getInteractionType', - 'updateInteraction', - 'deleteInteraction', - ]); - confirmModalService = jasmine.createSpyObj('confirmModalService', [ - 'create', - ]); - - $ctrl = $componentController( - 'interaction', - { - interactionsService: interactionsService, - confirmModalService: confirmModalService, - }, - { - interaction: { - id: '1', - interaction_type_id: '4', - }, - onDelete: jasmine.createSpy('onDelete'), - }, - ); - $q = _$q_; - $rootScope = _$rootScope_; - })); - - describe('$onInit', function () { - it('should populate interactionType', function () { - interactionsService.getInteractionType.and.returnValue('Test type'); - - $ctrl.$onInit(); - - expect(interactionsService.getInteractionType).toHaveBeenCalledWith( - $ctrl.interaction.interaction_type_id, - ); - expect($ctrl.interactionType).toEqual('Test type'); - }); + let $ctrl, $q, $rootScope, interactionsService, confirmModalService; + + beforeEach(inject(function ($componentController, _$q_, _$timeout_, _$rootScope_) { + interactionsService = jasmine.createSpyObj('interactionsService', [ + 'getInteractionType', + 'updateInteraction', + 'deleteInteraction', + ]); + confirmModalService = jasmine.createSpyObj('confirmModalService', ['create']); + + $ctrl = $componentController( + 'interaction', + { + interactionsService, + confirmModalService, + }, + { + interaction: { + id: '1', + interaction_type_id: '4', + }, + onDelete: jasmine.createSpy('onDelete'), + }, + ); + $q = _$q_; + $rootScope = _$rootScope_; + })); + + describe('$onInit', function () { + it('should populate interactionType', function () { + interactionsService.getInteractionType.and.returnValue('Test type'); + + $ctrl.$onInit(); + + expect(interactionsService.getInteractionType).toHaveBeenCalledWith($ctrl.interaction.interaction_type_id); + expect($ctrl.interactionType).toEqual('Test type'); }); + }); - describe('updateInteraction', function () { - it('should update the interaction', function () { - interactionsService.updateInteraction.and.returnValue($q.resolve()); + describe('updateInteraction', function () { + it('should update the interaction', function () { + interactionsService.updateInteraction.and.returnValue($q.resolve()); - $ctrl.updateInteraction(); + $ctrl.updateInteraction(); - expect($ctrl.modifyInteractionState).toEqual('saving'); - expect(interactionsService.updateInteraction).toHaveBeenCalledWith( - $ctrl.interaction, - ); + expect($ctrl.modifyInteractionState).toEqual('saving'); + expect(interactionsService.updateInteraction).toHaveBeenCalledWith($ctrl.interaction); - $rootScope.$digest(); + $rootScope.$digest(); - expect($ctrl.modifyInteractionState).toEqual('view'); - }); - it('should handle an error updating the interaction', function () { - interactionsService.updateInteraction.and.returnValue($q.reject()); + expect($ctrl.modifyInteractionState).toEqual('view'); + }); + it('should handle an error updating the interaction', function () { + interactionsService.updateInteraction.and.returnValue($q.reject()); - $ctrl.updateInteraction(); + $ctrl.updateInteraction(); - expect($ctrl.modifyInteractionState).toEqual('saving'); - expect(interactionsService.updateInteraction).toHaveBeenCalledWith( - $ctrl.interaction, - ); + expect($ctrl.modifyInteractionState).toEqual('saving'); + expect(interactionsService.updateInteraction).toHaveBeenCalledWith($ctrl.interaction); - $rootScope.$digest(); + $rootScope.$digest(); - expect($ctrl.modifyInteractionState).toEqual('edit'); - }); + expect($ctrl.modifyInteractionState).toEqual('edit'); }); + }); - describe('deleteInteraction', function () { - it('should delete the interaction', function () { - confirmModalService.create.and.returnValue($q.resolve()); + describe('deleteInteraction', function () { + it('should delete the interaction', function () { + confirmModalService.create.and.returnValue($q.resolve()); - $ctrl.deleteInteraction(); + $ctrl.deleteInteraction(); - expect($ctrl.modifyInteractionState).toEqual('saving'); - expect(confirmModalService.create).toHaveBeenCalledWith( - jasmine.any(String), - ); + expect($ctrl.modifyInteractionState).toEqual('saving'); + expect(confirmModalService.create).toHaveBeenCalledWith(jasmine.any(String)); - interactionsService.deleteInteraction.and.returnValue($q.resolve()); - $rootScope.$digest(); + interactionsService.deleteInteraction.and.returnValue($q.resolve()); + $rootScope.$digest(); - expect(interactionsService.deleteInteraction).toHaveBeenCalledWith( - $ctrl.interaction, - ); - $rootScope.$digest(); + expect(interactionsService.deleteInteraction).toHaveBeenCalledWith($ctrl.interaction); + $rootScope.$digest(); - expect($ctrl.onDelete).toHaveBeenCalledWith({ - $event: { - interaction: $ctrl.interaction, - }, - }); - }); - it('should handle an error deleting the interaction', function () { - confirmModalService.create.and.returnValue($q.resolve()); + expect($ctrl.onDelete).toHaveBeenCalledWith({ + $event: { + interaction: $ctrl.interaction, + }, + }); + }); + it('should handle an error deleting the interaction', function () { + confirmModalService.create.and.returnValue($q.resolve()); - $ctrl.deleteInteraction(); + $ctrl.deleteInteraction(); - expect($ctrl.modifyInteractionState).toEqual('saving'); - expect(confirmModalService.create).toHaveBeenCalledWith( - jasmine.any(String), - ); + expect($ctrl.modifyInteractionState).toEqual('saving'); + expect(confirmModalService.create).toHaveBeenCalledWith(jasmine.any(String)); - interactionsService.deleteInteraction.and.returnValue($q.reject()); + interactionsService.deleteInteraction.and.returnValue($q.reject()); - $rootScope.$digest(); + $rootScope.$digest(); - expect(interactionsService.deleteInteraction).toHaveBeenCalledWith( - $ctrl.interaction, - ); + expect(interactionsService.deleteInteraction).toHaveBeenCalledWith($ctrl.interaction); - $rootScope.$digest(); + $rootScope.$digest(); - expect($ctrl.onDelete).not.toHaveBeenCalled(); - expect($ctrl.modifyInteractionState).toEqual('view'); - }); + expect($ctrl.onDelete).not.toHaveBeenCalled(); + expect($ctrl.modifyInteractionState).toEqual('view'); }); + }); }); diff --git a/app/assets/javascripts/angular/components/interaction/interaction.html b/app/assets/javascripts/angular/components/interaction/interaction.html index df4d8e7481..f3e354e075 100644 --- a/app/assets/javascripts/angular/components/interaction/interaction.html +++ b/app/assets/javascripts/angular/components/interaction/interaction.html @@ -1,67 +1,34 @@
- +
-
- - {{ initiator === $ctrl.personTab.person ? - ('ministries.people.history.me' | t) : (initiator | personName) - }}, - - {{'ministries.people.history.anonymous' | t}} - >> - {{$ctrl.moment($ctrl.interaction.timestamp).fromNow()}} -
-
{{$ctrl.interactionType.title | t}}
-
-
- {{$ctrl.interaction.comment}} -
- -
+
+ + {{ initiator === $ctrl.personTab.person ? ('ministries.people.history.me' | t) : (initiator | personName) + }}, + + {{'ministries.people.history.anonymous' | t}} + >> + {{$ctrl.moment($ctrl.interaction.timestamp).fromNow()}} +
+
{{$ctrl.interactionType.title | t}}
+
+
{{$ctrl.interaction.comment}}
+ +
- -
- - - + +
+ + +
diff --git a/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.component.js b/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.component.js index 9eaed19cb0..4d817e2adb 100644 --- a/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.component.js +++ b/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.component.js @@ -2,8 +2,8 @@ import template from './loadingSpinner.html'; import './loadingSpinner.scss'; angular.module('campusContactsApp').component('loadingSpinner', { - bindings: { - size: '<', - }, - template: template, + bindings: { + size: '<', + }, + template, }); diff --git a/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.html b/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.html index ef959bb325..ed311f8be5 100644 --- a/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.html +++ b/app/assets/javascripts/angular/components/loadingSpinner/loadingSpinner.html @@ -1,3 +1,3 @@
- +
diff --git a/app/assets/javascripts/angular/components/massEdit/massEdit.component.js b/app/assets/javascripts/angular/components/massEdit/massEdit.component.js index c1fb74521e..ec2bd15aea 100644 --- a/app/assets/javascripts/angular/components/massEdit/massEdit.component.js +++ b/app/assets/javascripts/angular/components/massEdit/massEdit.component.js @@ -2,89 +2,85 @@ import template from './massEdit.html'; import './massEdit.scss'; angular.module('campusContactsApp').component('massEdit', { - controller: massEditController, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, - template: template, + controller: massEditController, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, + template, }); function massEditController(massEditService, personService) { - var vm = this; + const vm = this; - vm.saving = false; + vm.saving = false; - vm.save = save; - vm.cancel = cancel; + vm.save = save; + vm.cancel = cancel; - vm.changes = {}; + vm.changes = {}; - vm.selectFields = [ - { - name: 'followup_status', - options: personService.getFollowupStatusOptions(), - }, - { name: 'cru_status', options: personService.getCruStatusOptions() }, - { - name: 'student_status', - options: personService.getEnrollmentOptions(), - }, - { name: 'gender', options: personService.getGenderOptions() }, - ]; + vm.selectFields = [ + { + name: 'followup_status', + options: personService.getFollowupStatusOptions(), + }, + { name: 'cru_status', options: personService.getCruStatusOptions() }, + { + name: 'student_status', + options: personService.getEnrollmentOptions(), + }, + { name: 'gender', options: personService.getGenderOptions() }, + ]; - var unchangedOption = { id: null, i18n: 'mass_edit.unchanged' }; - vm.selectFields.forEach(function (selectField) { - // Prepend the unchanged option to the list of options - selectField.options.unshift(unchangedOption); + const unchangedOption = { id: null, i18n: 'mass_edit.unchanged' }; + vm.selectFields.forEach(function (selectField) { + // Prepend the unchanged option to the list of options + selectField.options.unshift(unchangedOption); - vm.changes[selectField.name] = null; - }); + vm.changes[selectField.name] = null; + }); - vm.multiselectFields = massEditService.statDefinitions.map(function ( - statDefinition, - ) { - return { - name: statDefinition.type, - options: [], - selection: {}, - ready: false, - }; - }); - vm.multiselectFields.forEach(function (multiselectField) { - vm.changes[multiselectField.name + '_added'] = []; - vm.changes[multiselectField.name + '_removed'] = []; - }); + vm.multiselectFields = massEditService.statDefinitions.map(function (statDefinition) { + return { + name: statDefinition.type, + options: [], + selection: {}, + ready: false, + }; + }); + vm.multiselectFields.forEach(function (multiselectField) { + vm.changes[multiselectField.name + '_added'] = []; + vm.changes[multiselectField.name + '_removed'] = []; + }); - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - var selection = vm.resolve.selection; + function activate() { + const selection = vm.resolve.selection; - // Load the relationships needed to determine which options are selected and the options themselves - massEditService.loadOptions(selection).then(function (options) { - vm.multiselectFields.forEach(function (multiselectField) { - multiselectField.options = options[multiselectField.name]; - multiselectField.selection = massEditService.selectionFromOptions( - multiselectField.options, - ); - multiselectField.ready = true; - }); - }); - } + // Load the relationships needed to determine which options are selected and the options themselves + massEditService.loadOptions(selection).then(function (options) { + vm.multiselectFields.forEach(function (multiselectField) { + multiselectField.options = options[multiselectField.name]; + multiselectField.selection = massEditService.selectionFromOptions(multiselectField.options); + multiselectField.ready = true; + }); + }); + } - function save() { - vm.saving = true; - massEditService - .applyChanges(vm.resolve.selection, vm.changes) - .then(vm.close) - .catch(function () { - vm.saving = false; - }); - } + function save() { + vm.saving = true; + massEditService + .applyChanges(vm.resolve.selection, vm.changes) + .then(vm.close) + .catch(function () { + vm.saving = false; + }); + } - function cancel() { - vm.dismiss(); - } + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/massEdit/massEdit.html b/app/assets/javascripts/angular/components/massEdit/massEdit.html index d71b878093..dc1a42df68 100644 --- a/app/assets/javascripts/angular/components/massEdit/massEdit.html +++ b/app/assets/javascripts/angular/components/massEdit/massEdit.html @@ -1,57 +1,39 @@
- - - - + + + +
-
- -
-
- -
+
+ +
+
+ +
- - + +
diff --git a/app/assets/javascripts/angular/components/massEdit/massEdit.service.js b/app/assets/javascripts/angular/components/massEdit/massEdit.service.js index b5d44236ac..6b5faff4ab 100644 --- a/app/assets/javascripts/angular/components/massEdit/massEdit.service.js +++ b/app/assets/javascripts/angular/components/massEdit/massEdit.service.js @@ -1,503 +1,416 @@ angular.module('campusContactsApp').factory('massEditService', massEditService); -function massEditService( - $q, - httpProxy, - JsonApiDataStore, - modelsService, - personSelectionService, - _, -) { - // Return a boolean indicating whether a particular person is assigned to the team member - function personHasAssignment(person, orgId, teamMember) { - return Boolean( - _.find(person.reverse_contact_assignments, function (assignment) { - return ( - assignment.organization.id === orgId && - assignment.assigned_to.id === teamMember.id - ); - }), - ); - } - - // Return a boolean indicating whether a particular person has the label - function personHasLabel(person, orgId, label) { - return Boolean( - _.find(person.organizational_labels, function ( - organizationalLabel, - ) { - return ( - organizationalLabel.organization_id === orgId && - organizationalLabel.label.id === label.id - ); - }), - ); - } - - // Return a boolean indicating whether a particular person has the group - function personHasGroup(person, orgId, group) { - return Boolean( - _.find(person.group_memberships, ['group.id', group.id]), - ); - } - - // Define the mass editable attributes that are simple values (i.e. a number or a string) - var simpleChangeManifests = { - student_status: { type: 'person' }, - gender: { type: 'person' }, - followup_status: { type: 'permission' }, - cru_status: { type: 'permission' }, - archived: { type: null }, - delete: { type: null }, - }; - - // List of mass editable attributes that are simple values - var simpleChangeFields = _.keys(simpleChangeManifests); - - // List of mass editable attributes that are on the person model - var personChangeFields = _.keys( - _.pickBy(simpleChangeManifests, { type: 'person' }), +function massEditService($q, httpProxy, JsonApiDataStore, modelsService, personSelectionService, _) { + // Return a boolean indicating whether a particular person is assigned to the team member + function personHasAssignment(person, orgId, teamMember) { + return Boolean( + _.find(person.reverse_contact_assignments, function (assignment) { + return assignment.organization.id === orgId && assignment.assigned_to.id === teamMember.id; + }), ); - - // List of mass editable attributes that are on the organizational permission model - var permissionChangeFields = _.keys( - _.pickBy(simpleChangeManifests, { type: 'permission' }), + } + + // Return a boolean indicating whether a particular person has the label + function personHasLabel(person, orgId, label) { + return Boolean( + _.find(person.organizational_labels, function (organizationalLabel) { + return organizationalLabel.organization_id === orgId && organizationalLabel.label.id === label.id; + }), ); + } + + // Return a boolean indicating whether a particular person has the group + function personHasGroup(person, orgId, group) { + return Boolean(_.find(person.group_memberships, ['group.id', group.id])); + } + + // Define the mass editable attributes that are simple values (i.e. a number or a string) + const simpleChangeManifests = { + student_status: { type: 'person' }, + gender: { type: 'person' }, + followup_status: { type: 'permission' }, + cru_status: { type: 'permission' }, + archived: { type: null }, + delete: { type: null }, + }; + + // List of mass editable attributes that are simple values + const simpleChangeFields = _.keys(simpleChangeManifests); + + // List of mass editable attributes that are on the person model + const personChangeFields = _.keys(_.pickBy(simpleChangeManifests, { type: 'person' })); + + // List of mass editable attributes that are on the organizational permission model + const permissionChangeFields = _.keys(_.pickBy(simpleChangeManifests, { type: 'permission' })); + + // Define the mass editable attributes that are complex values (i.e. an { id: Boolean } hash of added/removed + // models) + // The manifest is in the format expected by applyComplexChanges + const complexChangeManifests = { + assigned_tos: { + personAttribute: 'reverse_contact_assignments', + modelType: 'contact_assignment', + getModelPredicate: function (assignedToId) { + return ['assigned_to.id', assignedToId]; + }, + getModelAttributes: function (assignedToId, person, organizationId) { + return { + assigned_to: JsonApiDataStore.store.find('person', assignedToId), + organization: JsonApiDataStore.store.find('organization', organizationId), + person_id: person.id, + }; + }, + }, + labels: { + personAttribute: 'organizational_labels', + modelType: 'organizational_label', + getModelPredicate: function (labelId) { + return ['label.id', labelId]; + }, + getModelAttributes: function (labelId, person, organizationId) { + return { + label: JsonApiDataStore.store.find('label', labelId), + organization_id: organizationId, + person_id: person.id, + }; + }, + }, + groups: { + personAttribute: 'group_memberships', + modelType: 'group_membership', + getModelPredicate: function (groupId) { + return ['group.id', groupId]; + }, + getModelAttributes: function (groupId, person, organizationId) { + // eslint-disable-line no-unused-vars + return { + group: JsonApiDataStore.store.find('group', groupId), + person, + role: 'member', + }; + }, + }, + }; + + // List of mass editable attributes that are complex values + const complexChangeFields = _.keys(complexChangeManifests); + + var massEditService = { + // Convert a list of added and removed ids into a hash with keys matching the ids and a value of true for + // added and false for removed + hashFromAddedRemoved: function (addedIds, removedIds) { + return _.extend( + _.zipObject(addedIds, _.fill(Array(addedIds.length), true)), + _.zipObject(removedIds, _.fill(Array(removedIds.length), false)), + ); + }, + + // Convert a changes object from the massEdit component into the form expected by the bulk people changes + // endpoint + prepareChanges: function (changes) { + const filteredChanges = {}; + simpleChangeFields.forEach(function (field) { + // A value of null or undefined means no change, so ignore those changes + if (!_.isNil(changes[field])) { + filteredChanges[field] = changes[field]; + } + }); + complexChangeFields.forEach(function (field) { + const addedIds = changes[field + '_added'] || []; + const removedIds = changes[field + '_removed'] || []; + + // Empty added ids and removed ids means no change, so ignore those changes + if (addedIds.length + removedIds.length > 0) { + // Turn a list of added and removed fields into an object + filteredChanges[field] = massEditService.hashFromAddedRemoved(addedIds, removedIds); + } + }); + return filteredChanges; + }, + + // Apply the changes on the server + applyChanges: function (selection, changes) { + const filteredChanges = massEditService.prepareChanges(changes); + massEditService.applyChangesLocally(selection, filteredChanges); + + const normalizedFilters = personSelectionService.convertToFilters(selection); + + const payload = { + data: { + type: 'bulk_people_change', + attributes: _.extend( + { + organization_id: selection.orgId, - // Define the mass editable attributes that are complex values (i.e. an { id: Boolean } hash of added/removed - // models) - // The manifest is in the format expected by applyComplexChanges - var complexChangeManifests = { - assigned_tos: { - personAttribute: 'reverse_contact_assignments', - modelType: 'contact_assignment', - getModelPredicate: function (assignedToId) { - return ['assigned_to.id', assignedToId]; - }, - getModelAttributes: function ( - assignedToId, - person, - organizationId, - ) { - return { - assigned_to: JsonApiDataStore.store.find( - 'person', - assignedToId, - ), - organization: JsonApiDataStore.store.find( - 'organization', - organizationId, - ), - person_id: person.id, - }; - }, - }, - labels: { - personAttribute: 'organizational_labels', - modelType: 'organizational_label', - getModelPredicate: function (labelId) { - return ['label.id', labelId]; + // Prefer using person_ids over selection.ids because the former does validation that the + // latter does not. If person_ids is truthy, it will override the selection. + person_ids: normalizedFilters.ids, }, - getModelAttributes: function (labelId, person, organizationId) { - return { - label: JsonApiDataStore.store.find('label', labelId), - organization_id: organizationId, - person_id: person.id, - }; - }, - }, - groups: { - personAttribute: 'group_memberships', - modelType: 'group_membership', - getModelPredicate: function (groupId) { - return ['group.id', groupId]; - }, - getModelAttributes: function (groupId, person, organizationId) { - // eslint-disable-line no-unused-vars - return { - group: JsonApiDataStore.store.find('group', groupId), - person: person, - role: 'member', - }; - }, - }, - }; - - // List of mass editable attributes that are complex values - var complexChangeFields = _.keys(complexChangeManifests); - - var massEditService = { - // Convert a list of added and removed ids into a hash with keys matching the ids and a value of true for - // added and false for removed - hashFromAddedRemoved: function (addedIds, removedIds) { - return _.extend( - _.zipObject(addedIds, _.fill(Array(addedIds.length), true)), - _.zipObject( - removedIds, - _.fill(Array(removedIds.length), false), - ), - ); + filteredChanges, + ), }, - - // Convert a changes object from the massEdit component into the form expected by the bulk people changes - // endpoint - prepareChanges: function (changes) { - var filteredChanges = {}; - simpleChangeFields.forEach(function (field) { - // A value of null or undefined means no change, so ignore those changes - if (!_.isNil(changes[field])) { - filteredChanges[field] = changes[field]; - } - }); - complexChangeFields.forEach(function (field) { - var addedIds = changes[field + '_added'] || []; - var removedIds = changes[field + '_removed'] || []; - - // Empty added ids and removed ids means no change, so ignore those changes - if (addedIds.length + removedIds.length > 0) { - // Turn a list of added and removed fields into an object - filteredChanges[ - field - ] = massEditService.hashFromAddedRemoved( - addedIds, - removedIds, - ); - } - }); - return filteredChanges; - }, - - // Apply the changes on the server - applyChanges: function (selection, changes) { - var filteredChanges = massEditService.prepareChanges(changes); - massEditService.applyChangesLocally(selection, filteredChanges); - - var normalizedFilters = personSelectionService.convertToFilters( - selection, - ); - - var payload = { - data: { - type: 'bulk_people_change', - attributes: _.extend( - { - organization_id: selection.orgId, - - // Prefer using person_ids over selection.ids because the former does validation that the - // latter does not. If person_ids is truthy, it will override the selection. - person_ids: normalizedFilters.ids, - }, - filteredChanges, - ), - }, - filters: normalizedFilters, - }; - return httpProxy - .post('/bulk_people_changes', payload, { - errorMessage: 'error.messages.mass_edit.apply_mass_edit', - }) - .then(httpProxy.extractModels); - }, - - // Apply changes that involve modifying a one-to-many relationship (like assignments, group memberships, - // or label applications) to a person - /* - * manifest schema: - * { - * // The attribute on the person model with the related models can be found - * personAttribute, - * - * // The type of the related models - * modelType, - * - * // Returns the predicate used by _.find to locate an existing related model - * getModelPredicate(id), - * - * // Returns the attributes to be applied to a new related model - * getModelAttributes(id, person) - * } - */ - applyComplexChanges: function ( - changes, - person, - organizationId, - manifest, - ) { - _.forEach(changes, function (change, id) { - var existingModel = _.find( - person[manifest.personAttribute], - manifest.getModelPredicate(id), - ); - - if (change === true && !existingModel) { - // Add a model - var addedAssignment = new JsonApiDataStore.Model( - manifest.modelType, - ); - _.extend( - addedAssignment, - manifest.getModelAttributes(id, person, organizationId), - ); - person[manifest.personAttribute].push(addedAssignment); - } else if (change === false && existingModel) { - // Remove a model - JsonApiDataStore.store.destroy(existingModel); - _.pull(person[manifest.personAttribute], existingModel); - } - }); - }, - - // Apply the changes locally - applyChangesLocally: function (selection, changes) { - var orgId = selection.orgId; - - selection.selectedPeople.forEach(function (personId) { - var person = JsonApiDataStore.store.find('person', personId); - var orgPermission = _.find(person.organizational_permissions, { - organization_id: orgId, - }); - - // Changes to person fields can be simply copied to the person model - _.extend(person, _.pick(changes, personChangeFields)); - - // Changes to permission fields can be simply copied to the organizational permission model - if (orgPermission) { - _.extend( - orgPermission, - _.pick(changes, permissionChangeFields), - ); - } - - _.each(complexChangeManifests, function ( - changeManifest, - changeField, - ) { - massEditService.applyComplexChanges( - changes[changeField], - person, - orgId, - changeManifest, - ); - }); - }); - }, - - statDefinitions: [ + filters: normalizedFilters, + }; + return httpProxy + .post('/bulk_people_changes', payload, { + errorMessage: 'error.messages.mass_edit.apply_mass_edit', + }) + .then(httpProxy.extractModels); + }, + + // Apply changes that involve modifying a one-to-many relationship (like assignments, group memberships, + // or label applications) to a person + /* + * manifest schema: + * { + * // The attribute on the person model with the related models can be found + * personAttribute, + * + * // The type of the related models + * modelType, + * + * // Returns the predicate used by _.find to locate an existing related model + * getModelPredicate(id), + * + * // Returns the attributes to be applied to a new related model + * getModelAttributes(id, person) + * } + */ + applyComplexChanges: function (changes, person, organizationId, manifest) { + _.forEach(changes, function (change, id) { + const existingModel = _.find(person[manifest.personAttribute], manifest.getModelPredicate(id)); + + if (change === true && !existingModel) { + // Add a model + const addedAssignment = new JsonApiDataStore.Model(manifest.modelType); + _.extend(addedAssignment, manifest.getModelAttributes(id, person, organizationId)); + person[manifest.personAttribute].push(addedAssignment); + } else if (change === false && existingModel) { + // Remove a model + JsonApiDataStore.store.destroy(existingModel); + _.pull(person[manifest.personAttribute], existingModel); + } + }); + }, + + // Apply the changes locally + applyChangesLocally: function (selection, changes) { + const orgId = selection.orgId; + + selection.selectedPeople.forEach(function (personId) { + const person = JsonApiDataStore.store.find('person', personId); + const orgPermission = _.find(person.organizational_permissions, { + organization_id: orgId, + }); + + // Changes to person fields can be simply copied to the person model + _.extend(person, _.pick(changes, personChangeFields)); + + // Changes to permission fields can be simply copied to the organizational permission model + if (orgPermission) { + _.extend(orgPermission, _.pick(changes, permissionChangeFields)); + } + + _.each(complexChangeManifests, function (changeManifest, changeField) { + massEditService.applyComplexChanges(changes[changeField], person, orgId, changeManifest); + }); + }); + }, + + statDefinitions: [ + { + type: 'assigned_tos', + idField: 'person_id', + personHasModel: personHasAssignment, + }, + { + type: 'labels', + idField: 'label_id', + personHasModel: personHasLabel, + }, + { + type: 'groups', + idField: 'group_id', + personHasModel: personHasGroup, + }, + ], + + // Return a boolean indicating whether a person has any unloaded relationships + personHasUnloadedRelationships: function (person, relationshipNames) { + // Consider the person to be missing if any of its relationships are missing + return relationshipNames.some(function (relationshipName) { + return massEditService.relationshipHasUnloadedModels(person[relationshipName]); + }); + }, + + // Return a boolean indicating whether a relationship has any unloaded models + relationshipHasUnloadedModels: function (relationship) { + return relationship.some(_.negate(httpProxy.isLoaded)); + }, + + // Load the necessary relationships for a selection + loadPeopleRelationships: function (selection) { + // Optimize by only loading relationships when optionStateFromModel will actually use those + // relationships when determining option selection states + if (personSelectionService.containsUnincludedPeople(selection)) { + return $q.resolve(); + } + + // The "reverse_contact_assignments" relationship is needed also, but it is already being loaded by + // organizationOverviewPeopleService.loadMoreOrgPeople + const relationships = ['organizational_labels', 'group_memberships']; + + // Only load people for whom at least one of their relationships contains a placeholder model + const peopleMissingRelationships = selection.selectedPeople.filter(function (personId) { + const person = JsonApiDataStore.store.find('person', personId); + return massEditService.personHasUnloadedRelationships(person, relationships); + }); + + // Only make a network request if there are people that need their relationships loaded + return peopleMissingRelationships === 0 + ? $q.resolve() + : httpProxy.get( + modelsService.getModelMetadata('person').url.all, { - type: 'assigned_tos', - idField: 'person_id', - personHasModel: personHasAssignment, + include: relationships.join(','), + 'filters[organization_ids]': selection.orgId, + 'filters[ids]': peopleMissingRelationships.join(','), }, { - type: 'labels', - idField: 'label_id', - personHasModel: personHasLabel, + errorMessage: 'error.messages.mass_edit.load_relationships', }, - { - type: 'groups', - idField: 'group_id', - personHasModel: personHasGroup, - }, - ], - - // Return a boolean indicating whether a person has any unloaded relationships - personHasUnloadedRelationships: function (person, relationshipNames) { - // Consider the person to be missing if any of its relationships are missing - return relationshipNames.some(function (relationshipName) { - return massEditService.relationshipHasUnloadedModels( - person[relationshipName], - ); - }); - }, - - // Return a boolean indicating whether a relationship has any unloaded models - relationshipHasUnloadedModels: function (relationship) { - return relationship.some(_.negate(httpProxy.isLoaded)); - }, - - // Load the necessary relationships for a selection - loadPeopleRelationships: function (selection) { - // Optimize by only loading relationships when optionStateFromModel will actually use those - // relationships when determining option selection states - if (personSelectionService.containsUnincludedPeople(selection)) { - return $q.resolve(); - } - - // The "reverse_contact_assignments" relationship is needed also, but it is already being loaded by - // organizationOverviewPeopleService.loadMoreOrgPeople - var relationships = ['organizational_labels', 'group_memberships']; - - // Only load people for whom at least one of their relationships contains a placeholder model - var peopleMissingRelationships = selection.selectedPeople.filter( - function (personId) { - var person = JsonApiDataStore.store.find( - 'person', - personId, - ); - return massEditService.personHasUnloadedRelationships( - person, - relationships, - ); - }, - ); - - // Only make a network request if there are people that need their relationships loaded - return peopleMissingRelationships === 0 - ? $q.resolve() - : httpProxy.get( - modelsService.getModelMetadata('person').url.all, - { - include: relationships.join(','), - 'filters[organization_ids]': selection.orgId, - 'filters[ids]': peopleMissingRelationships.join(','), - }, - { - errorMessage: - 'error.messages.mass_edit.load_relationships', - }, - ); - }, - - // Load the filter stats for an organization - loadFilterStats: function (orgId) { - return httpProxy - .get( - modelsService - .getModelMetadata('filter_stats') - .url.single('people'), - { - organization_id: orgId, - include_zeros: true, - }, - { - errorMessage: 'error.messages.mass_edit.load_options', - }, - ) - .then(httpProxy.extractModel); - }, - - // Return an array of options generated from a particular type of stats - optionsForStatsType: function (stats, statType, selection) { - var statDefinition = _.find(massEditService.statDefinitions, { - type: statType, - }); - return stats[statDefinition.type].map(function (stat) { - var id = stat[statDefinition.idField]; - var state; - if (stat.count === 0) { - // This stat is empty, so automatically treat this option as unselected - state = false; - } else { - state = massEditService.optionStateFromModel( - { id: id, count: stat.count }, - selection, - statDefinition.personHasModel, - ); - } - return { - id: id, - name: stat.name, - state: state, - }; - }); - }, - - // Return the options generated from a stats model - optionsFromStats: function (stats, selection) { - var statTypes = _.map(massEditService.statDefinitions, 'type'); - return _.fromPairs( - statTypes.map(function (statType) { - // Key is the type, value is the options - return [ - statType, - massEditService.optionsForStatsType( - stats, - statType, - selection, - ), - ]; - }), - ); - }, - - // Return a promise that resolves to the available multiselect options - loadOptions: function (selection) { - return $q - .all([ - // Load the filter stats because they include the id and name of all possible assignments, labels, - // and groups and can therefore be used as the basis for calculating the options - massEditService.loadFilterStats(selection.orgId), - - // In parallel, load the relationships needed to determine which options are selected - massEditService.loadPeopleRelationships(selection), - ]) - .then(function (results) { - var stats = results[0]; - return massEditService.optionsFromStats(stats, selection); - }); - }, - - // Determine the right state for a generic model option - // If all people "have" the model, return true, if no people "have" the model, return false, and if some - // people "have" the model, return indeterminate. - // "model" is the model option in question (such as a label, group, or contact assignment, for example). - // "personHasModel" is expected to implement the algorithm for determining whether a person "has" a model. - // It is called with the model and the person in question. - optionStateFromModel: function (model, selection, personHasModel) { - if (personSelectionService.containsUnincludedPeople(selection)) { - // When unincluded contacts are selected, all options are automatically treated as indeterminate - return null; - } - if (selection.selectedPeople.length === 0) { - // When no contacts are selected, all options are automatically treated as unselected - return false; - } - - // Convert the array of person ids into an array of people - var selectedPeople = selection.selectedPeople.map(function ( - personId, - ) { - return JsonApiDataStore.store.find('person', personId); - }); - - // Gather a list of the people with the model - var matchingPeople = selectedPeople.filter(function (person) { - return personHasModel(person, selection.orgId, model); - }); - - // Determine whether all of the selected people have the model - var allSelected = matchingPeople.length === selectedPeople.length; - - // Determine whether none of the selected people have the models - var noneSelected = matchingPeople.length === 0; - - if (noneSelected) { - // Unselected - return false; - } - if (allSelected) { - // Selected - return true; - } - - // Indeterminate - return null; - }, - - personHasAssignment: personHasAssignment, - personHasLabel: personHasLabel, - personHasGroup: personHasGroup, - - // Return an option selection object from an array of options - selectionFromOptions: function (options) { - return _.chain(options) - .map(function (option) { - return [option.id, option.state]; - }) - .fromPairs() - .value(); - }, - }; - - return massEditService; + ); + }, + + // Load the filter stats for an organization + loadFilterStats: function (orgId) { + return httpProxy + .get( + modelsService.getModelMetadata('filter_stats').url.single('people'), + { + organization_id: orgId, + include_zeros: true, + }, + { + errorMessage: 'error.messages.mass_edit.load_options', + }, + ) + .then(httpProxy.extractModel); + }, + + // Return an array of options generated from a particular type of stats + optionsForStatsType: function (stats, statType, selection) { + const statDefinition = _.find(massEditService.statDefinitions, { + type: statType, + }); + return stats[statDefinition.type].map(function (stat) { + const id = stat[statDefinition.idField]; + let state; + if (stat.count === 0) { + // This stat is empty, so automatically treat this option as unselected + state = false; + } else { + state = massEditService.optionStateFromModel( + { id, count: stat.count }, + selection, + statDefinition.personHasModel, + ); + } + return { + id, + name: stat.name, + state, + }; + }); + }, + + // Return the options generated from a stats model + optionsFromStats: function (stats, selection) { + const statTypes = _.map(massEditService.statDefinitions, 'type'); + return _.fromPairs( + statTypes.map(function (statType) { + // Key is the type, value is the options + return [statType, massEditService.optionsForStatsType(stats, statType, selection)]; + }), + ); + }, + + // Return a promise that resolves to the available multiselect options + loadOptions: function (selection) { + return $q + .all([ + // Load the filter stats because they include the id and name of all possible assignments, labels, + // and groups and can therefore be used as the basis for calculating the options + massEditService.loadFilterStats(selection.orgId), + + // In parallel, load the relationships needed to determine which options are selected + massEditService.loadPeopleRelationships(selection), + ]) + .then(function (results) { + const stats = results[0]; + return massEditService.optionsFromStats(stats, selection); + }); + }, + + // Determine the right state for a generic model option + // If all people "have" the model, return true, if no people "have" the model, return false, and if some + // people "have" the model, return indeterminate. + // "model" is the model option in question (such as a label, group, or contact assignment, for example). + // "personHasModel" is expected to implement the algorithm for determining whether a person "has" a model. + // It is called with the model and the person in question. + optionStateFromModel: function (model, selection, personHasModel) { + if (personSelectionService.containsUnincludedPeople(selection)) { + // When unincluded contacts are selected, all options are automatically treated as indeterminate + return null; + } + if (selection.selectedPeople.length === 0) { + // When no contacts are selected, all options are automatically treated as unselected + return false; + } + + // Convert the array of person ids into an array of people + const selectedPeople = selection.selectedPeople.map(function (personId) { + return JsonApiDataStore.store.find('person', personId); + }); + + // Gather a list of the people with the model + const matchingPeople = selectedPeople.filter(function (person) { + return personHasModel(person, selection.orgId, model); + }); + + // Determine whether all of the selected people have the model + const allSelected = matchingPeople.length === selectedPeople.length; + + // Determine whether none of the selected people have the models + const noneSelected = matchingPeople.length === 0; + + if (noneSelected) { + // Unselected + return false; + } + if (allSelected) { + // Selected + return true; + } + + // Indeterminate + return null; + }, + + personHasAssignment, + personHasLabel, + personHasGroup, + + // Return an option selection object from an array of options + selectionFromOptions: function (options) { + return _.chain(options) + .map(function (option) { + return [option.id, option.state]; + }) + .fromPairs() + .value(); + }, + }; + + return massEditService; } diff --git a/app/assets/javascripts/angular/components/massEdit/massEdit.service.spec.js b/app/assets/javascripts/angular/components/massEdit/massEdit.service.spec.js index 6dc7b33da9..fe0ff5369d 100644 --- a/app/assets/javascripts/angular/components/massEdit/massEdit.service.spec.js +++ b/app/assets/javascripts/angular/components/massEdit/massEdit.service.spec.js @@ -1,646 +1,519 @@ -var massEditService, _; +let massEditService, _; describe('massEditService', function () { - beforeEach(inject(function (_massEditService_, ___) { - massEditService = _massEditService_; - _ = ___; - - this.loadedModel = {}; - this.unloadedModel = { _placeHolder: true }; - this.loadedRelationship = [this.loadedModel]; - this.unloadedRelationship = [this.loadedModel, this.unloadedModel]; + beforeEach(inject(function (_massEditService_, ___) { + massEditService = _massEditService_; + _ = ___; + + this.loadedModel = {}; + this.unloadedModel = { _placeHolder: true }; + this.loadedRelationship = [this.loadedModel]; + this.unloadedRelationship = [this.loadedModel, this.unloadedModel]; + })); + + describe('hashFromAddedRemoved', function () { + it('should generate a hash of added and removed fields', function () { + expect(massEditService.hashFromAddedRemoved([1, 4, 5], [2, 3])).toEqual({ + 1: true, + 2: false, + 3: false, + 4: true, + 5: true, + }); + }); + }); + + describe('prepareChanges', function () { + it('should filter out non-whitelisted fields', function () { + expect( + massEditService.prepareChanges({ + foo: true, + bar: false, + }), + ).toEqual({}); + }); + + it('should filter out unchanged simple fields', function () { + expect( + massEditService.prepareChanges({ + followup_status: 1, + cru_status: null, + student_status: 1, + gender: null, + }), + ).toEqual({ followup_status: 1, student_status: 1 }); + }); + + it('should filter out unchanged complex fields', function () { + expect( + massEditService.prepareChanges({ + assigned_tos_added: [], + assigned_tos_removed: [], + }), + ).toEqual({}); + }); + + it('should prepare complex fields', function () { + expect( + massEditService.prepareChanges({ + assigned_tos_added: [1], + assigned_tos_removed: [2, 3], + }), + ).toEqual({ + assigned_tos: { 1: true, 2: false, 3: false }, + }); + }); + }); + + describe('applyComplexChanges', function () { + beforeEach(function () { + this.manifest = { + personAttribute: 'reverse_contact_assignments', + modelType: 'contact_assignment', + getModelPredicate: function (id) { + return ['assigned_to.id', id]; + }, + getModelAttributes: function (assignedToId, person, orgId) { + return { + assigned_to: { id: assignedToId }, + organization_id: orgId, + person_id: person.id, + }; + }, + }; + + this.person = { + id: 1, + reverse_contact_assignments: [{ assigned_to: { id: '123' } }], + }; + + this.orgId = 2; + }); + + it('should add new related models', function () { + massEditService.applyComplexChanges( + { + 456: true, + }, + this.person, + this.orgId, + this.manifest, + ); + expect(_.map(this.person.reverse_contact_assignments, 'assigned_to.id')).toEqual(['123', '456']); + }); + + it('should not add existing related models', function () { + massEditService.applyComplexChanges( + { + 123: true, + }, + this.person, + this.orgId, + this.manifest, + ); + expect(_.map(this.person.reverse_contact_assignments, 'assigned_to.id')).toEqual(['123']); + }); + + it('should remove existing related models', inject(function (JsonApiDataStore) { + spyOn(JsonApiDataStore.store, 'destroy'); + massEditService.applyComplexChanges( + { + 123: false, + }, + this.person, + this.orgId, + this.manifest, + ); + expect(_.map(this.person.reverse_contact_assignments, 'assigned_to.id')).toEqual([]); + expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); + })); + + it('should not remove non-existing related models', inject(function (JsonApiDataStore) { + spyOn(JsonApiDataStore.store, 'destroy'); + massEditService.applyComplexChanges( + { + 456: false, + }, + this.person, + this.orgId, + this.manifest, + ); + expect(_.map(this.person.reverse_contact_assignments, 'assigned_to.id')).toEqual(['123']); + expect(JsonApiDataStore.store.destroy).not.toHaveBeenCalled(); + })); + }); + + describe('applyChangesLocally', function () { + beforeEach(inject(function (JsonApiDataStore) { + this.people = _.range(3).map(function (personId) { + return { id: personId }; + }); + + const _this = this; + spyOn(JsonApiDataStore.store, 'find').and.callFake(function (modelType, modelId) { + return ( + { + person: _this.people[modelId], + organization: { id: modelId }, + label: { id: modelId }, + group: { id: modelId }, + }[modelType] || null + ); + }); })); - describe('hashFromAddedRemoved', function () { - it('should generate a hash of added and removed fields', function () { - expect( - massEditService.hashFromAddedRemoved([1, 4, 5], [2, 3]), - ).toEqual({ - 1: true, - 2: false, - 3: false, - 4: true, - 5: true, - }); - }); - }); - - describe('prepareChanges', function () { - it('should filter out non-whitelisted fields', function () { - expect( - massEditService.prepareChanges({ - foo: true, - bar: false, - }), - ).toEqual({}); - }); - - it('should filter out unchanged simple fields', function () { - expect( - massEditService.prepareChanges({ - followup_status: 1, - cru_status: null, - student_status: 1, - gender: null, - }), - ).toEqual({ followup_status: 1, student_status: 1 }); - }); - - it('should filter out unchanged complex fields', function () { - expect( - massEditService.prepareChanges({ - assigned_tos_added: [], - assigned_tos_removed: [], - }), - ).toEqual({}); - }); - - it('should prepare complex fields', function () { - expect( - massEditService.prepareChanges({ - assigned_tos_added: [1], - assigned_tos_removed: [2, 3], - }), - ).toEqual({ - assigned_tos: { 1: true, 2: false, 3: false }, - }); - }); - }); - - describe('applyComplexChanges', function () { - beforeEach(function () { - this.manifest = { - personAttribute: 'reverse_contact_assignments', - modelType: 'contact_assignment', - getModelPredicate: function (id) { - return ['assigned_to.id', id]; - }, - getModelAttributes: function (assignedToId, person, orgId) { - return { - assigned_to: { id: assignedToId }, - organization_id: orgId, - person_id: person.id, - }; - }, - }; - - this.person = { - id: 1, - reverse_contact_assignments: [{ assigned_to: { id: '123' } }], - }; - - this.orgId = 2; - }); - - it('should add new related models', function () { - massEditService.applyComplexChanges( - { - 456: true, - }, - this.person, - this.orgId, - this.manifest, - ); - expect( - _.map( - this.person.reverse_contact_assignments, - 'assigned_to.id', - ), - ).toEqual(['123', '456']); - }); - - it('should not add existing related models', function () { - massEditService.applyComplexChanges( - { - 123: true, - }, - this.person, - this.orgId, - this.manifest, - ); - expect( - _.map( - this.person.reverse_contact_assignments, - 'assigned_to.id', - ), - ).toEqual(['123']); - }); - - it('should remove existing related models', inject(function ( - JsonApiDataStore, - ) { - spyOn(JsonApiDataStore.store, 'destroy'); - massEditService.applyComplexChanges( - { - 123: false, - }, - this.person, - this.orgId, - this.manifest, - ); - expect( - _.map( - this.person.reverse_contact_assignments, - 'assigned_to.id', - ), - ).toEqual([]); - expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); - })); - - it('should not remove non-existing related models', inject(function ( - JsonApiDataStore, - ) { - spyOn(JsonApiDataStore.store, 'destroy'); - massEditService.applyComplexChanges( - { - 456: false, - }, - this.person, - this.orgId, - this.manifest, - ); - expect( - _.map( - this.person.reverse_contact_assignments, - 'assigned_to.id', - ), - ).toEqual(['123']); - expect(JsonApiDataStore.store.destroy).not.toHaveBeenCalled(); - })); - }); - - describe('applyChangesLocally', function () { - beforeEach(inject(function (JsonApiDataStore) { - this.people = _.range(3).map(function (personId) { - return { id: personId }; - }); - - var _this = this; - spyOn(JsonApiDataStore.store, 'find').and.callFake(function ( - modelType, - modelId, - ) { - return ( - { - person: _this.people[modelId], - organization: { id: modelId }, - label: { id: modelId }, - group: { id: modelId }, - }[modelType] || null - ); - }); - })); - - it('should copy person changes to changed people', function () { - massEditService.applyChangesLocally( - { - selectedPeople: [0, 2], - }, - { student_status: 1 }, - ); - expect(this.people[0].student_status).toBe(1); - expect(this.people[1].student_status).toBeUndefined(); - expect(this.people[2].student_status).toBe(1); - }); - - it('should copy permission changes to changed people organizational permissions', function () { - var orgId = 123; - this.people[0].organizational_permissions = [ - { id: 100, organization_id: orgId }, - ]; - this.people[1].organizational_permissions = []; - this.people[2].organizational_permissions = [ - { id: 200, organization_id: orgId + 1 }, - { id: 201, organization_id: orgId }, - ]; - massEditService.applyChangesLocally( - { - orgId: orgId, - selectedPeople: [0, 2], - }, - { followup_status: 1 }, - ); - expect( - this.people[0].organizational_permissions[0].followup_status, - ).toBe(1); - expect( - this.people[1].organizational_permissions[0], - ).toBeUndefined(); - expect( - this.people[2].organizational_permissions[1].followup_status, - ).toBe(1); - }); - - it('should add and remove assignments', inject(function ( - JsonApiDataStore, - ) { - this.people[0].reverse_contact_assignments = [ - { assigned_to: { id: '1' } }, - ]; - spyOn(JsonApiDataStore.store, 'destroy'); - massEditService.applyChangesLocally( - { - selectedPeople: [0], - }, - { assigned_tos: { 1: false, 2: true } }, - ); - expect( - _.map( - this.people[0].reverse_contact_assignments, - 'assigned_to.id', - ), - ).toEqual([2]); - expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); - })); - - it('should add and remove labels', inject(function (JsonApiDataStore) { - this.people[0].organizational_labels = [{ label: { id: '1' } }]; - spyOn(JsonApiDataStore.store, 'destroy'); - massEditService.applyChangesLocally( - { - selectedPeople: [0], - }, - { labels: { 1: false, 2: true } }, - ); - expect( - _.map(this.people[0].organizational_labels, 'label.id'), - ).toEqual(['2']); - expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); - })); - - it('should add and remove groups', inject(function (JsonApiDataStore) { - this.people[0].group_memberships = [{ group: { id: '1' } }]; - spyOn(JsonApiDataStore.store, 'destroy'); - massEditService.applyChangesLocally( - { - selectedPeople: [0], - }, - { groups: { 1: false, 2: true } }, - ); - expect( - _.map(this.people[0].group_memberships, 'group.id'), - ).toEqual(['2']); - expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); - })); - }); - - describe('personHasUnloadedRelationships', function () { - it('should should return true for unloaded relationships', function () { - expect( - massEditService.personHasUnloadedRelationships( - { - relationship1: this.loadedRelationship, - relationship2: this.unloadedRelationship, - }, - ['relationship1', 'relationship2'], - ), - ).toBe(true); - }); - - it('should should return false for loaded relationships', function () { - expect( - massEditService.personHasUnloadedRelationships( - { - relationship1: this.loadedRelationship, - relationship2: this.loadedRelationship, - }, - ['relationship1', 'relationship2'], - ), - ).toBe(false); - }); - }); - - describe('relationshipHasUnloadedModels', function () { - it('should return true for unloaded models', function () { - expect( - massEditService.relationshipHasUnloadedModels( - this.unloadedRelationship, - ), - ).toBe(true); - }); - - it('should return false for loaded models', function () { - expect( - massEditService.relationshipHasUnloadedModels( - this.loadedRelationship, - ), - ).toBe(false); - }); - }); - - describe('optionsForStatsType', function () { - beforeEach(function () { - this.stats = { - assigned_tos: [ - { person_id: 1, name: 'Adam', count: 1 }, - { person_id: 2, name: 'Bill', count: 1 }, - ], - }; - this.selection = {}; - spyOn(massEditService, 'optionStateFromModel').and.returnValue( - true, - ); - }); - - it('should generate options from the stats', function () { - expect( - massEditService.optionsForStatsType( - this.stats, - 'assigned_tos', - this.select, - ), - ).toEqual([ - { id: 1, name: 'Adam', state: true }, - { id: 2, name: 'Bill', state: true }, - ]); - }); - - it('should set the state to unselected for empty stats', function () { - this.stats.assigned_tos[0].count = 0; - expect( - massEditService.optionsForStatsType( - this.stats, - 'assigned_tos', - this.select, - ), - ).toEqual([ - { id: 1, name: 'Adam', state: false }, - { id: 2, name: 'Bill', state: true }, - ]); - }); - }); - - describe('optionsFromStats', function () { - it('should generate options for all types from the stats', function () { - this.stats = {}; - this.selection = {}; - this.assignedTos = []; - this.labels = []; - this.groups = []; - spyOn(massEditService, 'optionsForStatsType').and.returnValues( - this.assignedTos, - this.labels, - this.groups, - ); - expect( - massEditService.optionsFromStats(this.stats, this.selection), - ).toEqual({ - assigned_tos: this.assignedTos, - labels: this.labels, - groups: this.groups, - }); - }); - }); - - describe('optionStateFromModel', function () { - beforeEach(inject(function (JsonApiDataStore) { - this.people = _.range(3).map(function (personId) { - return { id: personId }; - }); - - var people = this.people; - spyOn(JsonApiDataStore.store, 'find').and.callFake(function ( - modelType, - modelId, - ) { - return people[modelId]; - }); - - this.model = {}; - - this.selection = { - allSelected: false, - allIncluded: true, - orgId: 1, - selectedPeople: [0, 1], - }; - })); - - it('should return indeterminate when some unincluded people are selected', function () { - this.selection.allSelected = true; - this.selection.allIncluded = false; - expect( - massEditService.optionStateFromModel( - this.model, - this.selection, - _.noop, - ), - ).toBe(null); - }); - - it('should return unselected when no people are selected', function () { - this.selection.selectedPeople = []; - expect( - massEditService.optionStateFromModel( - this.model, - this.selection, - _.noop, - ), - ).toBe(false); - }); - - it('should call personHasModel once per selected person', function () { - var personHasModel = jasmine.createSpy(); - massEditService.optionStateFromModel( - this.model, - this.selection, - personHasModel, - ); - expect(personHasModel.calls.allArgs()).toEqual([ - [this.people[0], this.selection.orgId, this.model], - [this.people[1], this.selection.orgId, this.model], - ]); - }); - - it('should return selected when all selected people have the model', function () { - var personHasModel = jasmine - .createSpy() - .and.returnValues(true, true); - expect( - massEditService.optionStateFromModel( - this.model, - this.selection, - personHasModel, - ), - ).toBe(true); - }); - - it('should return unselected when no selected people have the model', function () { - var personHasModel = jasmine - .createSpy() - .and.returnValues(false, false); - expect( - massEditService.optionStateFromModel( - this.model, - this.selection, - personHasModel, - ), - ).toBe(false); - }); - - it('should return indeterminate when some selected people have the model', function () { - var personHasModel = jasmine - .createSpy() - .and.returnValues(true, false); - expect( - massEditService.optionStateFromModel( - this.model, - this.selection, - personHasModel, - ), - ).toBe(null); - }); - }); - - describe('personHasAssignment', function () { - beforeEach(function () { - this.teamMember = { id: 1 }; - this.wrongTeamMember = { id: 2 }; - this.orgId = 123; - this.org = { id: this.orgId }; - this.wrongOrg = { id: 234 }; - this.matchingAssignment = { - assigned_to: this.teamMember, - organization: this.org, - }; - this.wrongPersonAssignment = { - assigned_to: this.wrongTeamMember, - organization: this.org, - }; - this.wrongOrgAssignment = { - assigned_to: this.teamMember, - organization: this.wrongOrg, - }; - }); - - it('should return true if the person is assigned to the team member', function () { - expect( - massEditService.personHasAssignment( - { - reverse_contact_assignments: [this.matchingAssignment], - }, - this.orgId, - this.teamMember, - ), - ).toBe(true); - }); - - it('should return false if the person is not assigned to the team member', function () { - expect( - massEditService.personHasAssignment( - { - reverse_contact_assignments: [ - this.wrongPersonAssignment, - this.wrongOrgAssignment, - ], - }, - this.orgId, - this.teamMember, - ), - ).toBe(false); - }); - }); - - describe('personHasLabel', function () { - beforeEach(function () { - this.personId = 1; - this.label = { id: 123 }; - this.wrongLabel = { id: 234 }; - this.orgId = 456; - this.wrongOrgId = 567; - this.matchingLabel = { - organization_id: this.orgId, - label: this.label, - }; - this.wrongIdLabel = { - organization_id: this.orgId, - label: this.wrongLabel, - }; - this.wrongOrgLabel = { - organization_id: this.wrongOrgId, - label: this.label, - }; - }); - - it('should return true if the person has the label', function () { - expect( - massEditService.personHasLabel( - { - id: this.personId, - organizational_labels: [this.matchingLabel], - }, - this.orgId, - this.label, - ), - ).toBe(true); - }); - - it('should return false if the person does not have the label', function () { - expect( - massEditService.personHasLabel( - { - id: this.personId, - organizational_labels: [ - this.wrongIdLabel, - this.wrongOrgLabel, - ], - }, - this.orgId, - this.label, - ), - ).toBe(false); - }); - }); - - describe('personHasGroup', function () { - beforeEach(function () { - this.personId = 1; - this.group = { id: 123 }; - this.wrongGroup = { id: 234 }; - this.matchingGroup = { group: this.group }; - this.wrongIdGroup = { group: this.wrongGroup }; - }); - - it('should return true if the person has the group', function () { - expect( - massEditService.personHasGroup( - { - id: this.personId, - group_memberships: [this.matchingGroup], - }, - this.orgId, - this.group, - ), - ).toBe(true); - }); - - it('should return false if the person does not have the group', function () { - expect( - massEditService.personHasGroup( - { - id: this.personId, - group_memberships: [this.wrongIdGroup], - }, - this.orgId, - this.group, - ), - ).toBe(false); - }); - }); - - describe('selectionFromOptions', function () { - it('should return a selection object', function () { - expect( - massEditService.selectionFromOptions([ - { id: 1, state: true }, - { id: 2, state: false }, - { id: 3, state: true }, - ]), - ).toEqual({ - 1: true, - 2: false, - 3: true, - }); - }); + it('should copy person changes to changed people', function () { + massEditService.applyChangesLocally( + { + selectedPeople: [0, 2], + }, + { student_status: 1 }, + ); + expect(this.people[0].student_status).toBe(1); + expect(this.people[1].student_status).toBeUndefined(); + expect(this.people[2].student_status).toBe(1); + }); + + it('should copy permission changes to changed people organizational permissions', function () { + const orgId = 123; + this.people[0].organizational_permissions = [{ id: 100, organization_id: orgId }]; + this.people[1].organizational_permissions = []; + this.people[2].organizational_permissions = [ + { id: 200, organization_id: orgId + 1 }, + { id: 201, organization_id: orgId }, + ]; + massEditService.applyChangesLocally( + { + orgId, + selectedPeople: [0, 2], + }, + { followup_status: 1 }, + ); + expect(this.people[0].organizational_permissions[0].followup_status).toBe(1); + expect(this.people[1].organizational_permissions[0]).toBeUndefined(); + expect(this.people[2].organizational_permissions[1].followup_status).toBe(1); + }); + + it('should add and remove assignments', inject(function (JsonApiDataStore) { + this.people[0].reverse_contact_assignments = [{ assigned_to: { id: '1' } }]; + spyOn(JsonApiDataStore.store, 'destroy'); + massEditService.applyChangesLocally( + { + selectedPeople: [0], + }, + { assigned_tos: { 1: false, 2: true } }, + ); + expect(_.map(this.people[0].reverse_contact_assignments, 'assigned_to.id')).toEqual([2]); + expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); + })); + + it('should add and remove labels', inject(function (JsonApiDataStore) { + this.people[0].organizational_labels = [{ label: { id: '1' } }]; + spyOn(JsonApiDataStore.store, 'destroy'); + massEditService.applyChangesLocally( + { + selectedPeople: [0], + }, + { labels: { 1: false, 2: true } }, + ); + expect(_.map(this.people[0].organizational_labels, 'label.id')).toEqual(['2']); + expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); + })); + + it('should add and remove groups', inject(function (JsonApiDataStore) { + this.people[0].group_memberships = [{ group: { id: '1' } }]; + spyOn(JsonApiDataStore.store, 'destroy'); + massEditService.applyChangesLocally( + { + selectedPeople: [0], + }, + { groups: { 1: false, 2: true } }, + ); + expect(_.map(this.people[0].group_memberships, 'group.id')).toEqual(['2']); + expect(JsonApiDataStore.store.destroy).toHaveBeenCalled(); + })); + }); + + describe('personHasUnloadedRelationships', function () { + it('should should return true for unloaded relationships', function () { + expect( + massEditService.personHasUnloadedRelationships( + { + relationship1: this.loadedRelationship, + relationship2: this.unloadedRelationship, + }, + ['relationship1', 'relationship2'], + ), + ).toBe(true); + }); + + it('should should return false for loaded relationships', function () { + expect( + massEditService.personHasUnloadedRelationships( + { + relationship1: this.loadedRelationship, + relationship2: this.loadedRelationship, + }, + ['relationship1', 'relationship2'], + ), + ).toBe(false); + }); + }); + + describe('relationshipHasUnloadedModels', function () { + it('should return true for unloaded models', function () { + expect(massEditService.relationshipHasUnloadedModels(this.unloadedRelationship)).toBe(true); + }); + + it('should return false for loaded models', function () { + expect(massEditService.relationshipHasUnloadedModels(this.loadedRelationship)).toBe(false); + }); + }); + + describe('optionsForStatsType', function () { + beforeEach(function () { + this.stats = { + assigned_tos: [ + { person_id: 1, name: 'Adam', count: 1 }, + { person_id: 2, name: 'Bill', count: 1 }, + ], + }; + this.selection = {}; + spyOn(massEditService, 'optionStateFromModel').and.returnValue(true); + }); + + it('should generate options from the stats', function () { + expect(massEditService.optionsForStatsType(this.stats, 'assigned_tos', this.select)).toEqual([ + { id: 1, name: 'Adam', state: true }, + { id: 2, name: 'Bill', state: true }, + ]); + }); + + it('should set the state to unselected for empty stats', function () { + this.stats.assigned_tos[0].count = 0; + expect(massEditService.optionsForStatsType(this.stats, 'assigned_tos', this.select)).toEqual([ + { id: 1, name: 'Adam', state: false }, + { id: 2, name: 'Bill', state: true }, + ]); + }); + }); + + describe('optionsFromStats', function () { + it('should generate options for all types from the stats', function () { + this.stats = {}; + this.selection = {}; + this.assignedTos = []; + this.labels = []; + this.groups = []; + spyOn(massEditService, 'optionsForStatsType').and.returnValues(this.assignedTos, this.labels, this.groups); + expect(massEditService.optionsFromStats(this.stats, this.selection)).toEqual({ + assigned_tos: this.assignedTos, + labels: this.labels, + groups: this.groups, + }); + }); + }); + + describe('optionStateFromModel', function () { + beforeEach(inject(function (JsonApiDataStore) { + this.people = _.range(3).map(function (personId) { + return { id: personId }; + }); + + const people = this.people; + spyOn(JsonApiDataStore.store, 'find').and.callFake(function (modelType, modelId) { + return people[modelId]; + }); + + this.model = {}; + + this.selection = { + allSelected: false, + allIncluded: true, + orgId: 1, + selectedPeople: [0, 1], + }; + })); + + it('should return indeterminate when some unincluded people are selected', function () { + this.selection.allSelected = true; + this.selection.allIncluded = false; + expect(massEditService.optionStateFromModel(this.model, this.selection, _.noop)).toBe(null); + }); + + it('should return unselected when no people are selected', function () { + this.selection.selectedPeople = []; + expect(massEditService.optionStateFromModel(this.model, this.selection, _.noop)).toBe(false); + }); + + it('should call personHasModel once per selected person', function () { + const personHasModel = jasmine.createSpy(); + massEditService.optionStateFromModel(this.model, this.selection, personHasModel); + expect(personHasModel.calls.allArgs()).toEqual([ + [this.people[0], this.selection.orgId, this.model], + [this.people[1], this.selection.orgId, this.model], + ]); + }); + + it('should return selected when all selected people have the model', function () { + const personHasModel = jasmine.createSpy().and.returnValues(true, true); + expect(massEditService.optionStateFromModel(this.model, this.selection, personHasModel)).toBe(true); + }); + + it('should return unselected when no selected people have the model', function () { + const personHasModel = jasmine.createSpy().and.returnValues(false, false); + expect(massEditService.optionStateFromModel(this.model, this.selection, personHasModel)).toBe(false); + }); + + it('should return indeterminate when some selected people have the model', function () { + const personHasModel = jasmine.createSpy().and.returnValues(true, false); + expect(massEditService.optionStateFromModel(this.model, this.selection, personHasModel)).toBe(null); + }); + }); + + describe('personHasAssignment', function () { + beforeEach(function () { + this.teamMember = { id: 1 }; + this.wrongTeamMember = { id: 2 }; + this.orgId = 123; + this.org = { id: this.orgId }; + this.wrongOrg = { id: 234 }; + this.matchingAssignment = { + assigned_to: this.teamMember, + organization: this.org, + }; + this.wrongPersonAssignment = { + assigned_to: this.wrongTeamMember, + organization: this.org, + }; + this.wrongOrgAssignment = { + assigned_to: this.teamMember, + organization: this.wrongOrg, + }; + }); + + it('should return true if the person is assigned to the team member', function () { + expect( + massEditService.personHasAssignment( + { + reverse_contact_assignments: [this.matchingAssignment], + }, + this.orgId, + this.teamMember, + ), + ).toBe(true); + }); + + it('should return false if the person is not assigned to the team member', function () { + expect( + massEditService.personHasAssignment( + { + reverse_contact_assignments: [this.wrongPersonAssignment, this.wrongOrgAssignment], + }, + this.orgId, + this.teamMember, + ), + ).toBe(false); + }); + }); + + describe('personHasLabel', function () { + beforeEach(function () { + this.personId = 1; + this.label = { id: 123 }; + this.wrongLabel = { id: 234 }; + this.orgId = 456; + this.wrongOrgId = 567; + this.matchingLabel = { + organization_id: this.orgId, + label: this.label, + }; + this.wrongIdLabel = { + organization_id: this.orgId, + label: this.wrongLabel, + }; + this.wrongOrgLabel = { + organization_id: this.wrongOrgId, + label: this.label, + }; + }); + + it('should return true if the person has the label', function () { + expect( + massEditService.personHasLabel( + { + id: this.personId, + organizational_labels: [this.matchingLabel], + }, + this.orgId, + this.label, + ), + ).toBe(true); + }); + + it('should return false if the person does not have the label', function () { + expect( + massEditService.personHasLabel( + { + id: this.personId, + organizational_labels: [this.wrongIdLabel, this.wrongOrgLabel], + }, + this.orgId, + this.label, + ), + ).toBe(false); + }); + }); + + describe('personHasGroup', function () { + beforeEach(function () { + this.personId = 1; + this.group = { id: 123 }; + this.wrongGroup = { id: 234 }; + this.matchingGroup = { group: this.group }; + this.wrongIdGroup = { group: this.wrongGroup }; + }); + + it('should return true if the person has the group', function () { + expect( + massEditService.personHasGroup( + { + id: this.personId, + group_memberships: [this.matchingGroup], + }, + this.orgId, + this.group, + ), + ).toBe(true); + }); + + it('should return false if the person does not have the group', function () { + expect( + massEditService.personHasGroup( + { + id: this.personId, + group_memberships: [this.wrongIdGroup], + }, + this.orgId, + this.group, + ), + ).toBe(false); + }); + }); + + describe('selectionFromOptions', function () { + it('should return a selection object', function () { + expect( + massEditService.selectionFromOptions([ + { id: 1, state: true }, + { id: 2, state: false }, + { id: 3, state: true }, + ]), + ).toEqual({ + 1: true, + 2: false, + 3: true, + }); }); + }); }); diff --git a/app/assets/javascripts/angular/components/messageModal/messageModal.component.js b/app/assets/javascripts/angular/components/messageModal/messageModal.component.js index ec0aa69ea4..ca58d81403 100644 --- a/app/assets/javascripts/angular/components/messageModal/messageModal.component.js +++ b/app/assets/javascripts/angular/components/messageModal/messageModal.component.js @@ -4,157 +4,141 @@ import i18next from 'i18next'; import template from './messageModal.html'; angular.module('campusContactsApp').component('messageModal', { - controller: messageModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, + controller: messageModalController, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, }); -function messageModalController( - $filter, - JsonApiDataStore, - messageModalService, - _, -) { - var vm = this; - - vm.message = ''; - vm.sending = false; - - vm.getMaximumLength = getMaximumLength; - vm.getRemainingLength = getRemainingLength; - vm.isValid = isValid; - vm.send = send; - vm.cancel = cancel; - - vm.$onInit = activate; - - // The maximum message lengths of the supported media - var lengthLimits = { - email: 5000, - sms: 480, - }; - - function activate() { - vm.medium = vm.resolve.medium; - if (!_.includes(['email', 'sms'], vm.medium)) { - throw new Error('Invalid medium: ' + vm.medium); - } - - vm.title = 'messages.' + vm.medium + '_title'; - vm.subtitle = 'messages.' + vm.medium + '_subtitle'; - vm.formattedRecipients = getFormattedRecipients(); - } - - // Return the recipients list as a nicely-formatted, human-readable string - function getFormattedRecipients() { - var filters = vm.resolve.selection.filters; - var parts = []; +function messageModalController($filter, JsonApiDataStore, messageModalService, _) { + const vm = this; - parts.push( - i18next.t('messages.recipients.contacts', { - contact_count: vm.resolve.selection.totalSelectedPeople, - }), - ); + vm.message = ''; + vm.sending = false; - var organizationName = JsonApiDataStore.store.find( - 'organization', - vm.resolve.selection.orgId, - ).name; - parts.push( - i18next.t('messages.recipients.organization', { - name: organizationName, - }), - ); + vm.getMaximumLength = getMaximumLength; + vm.getRemainingLength = getRemainingLength; + vm.isValid = isValid; + vm.send = send; + vm.cancel = cancel; - if (filters.searchString) { - parts.push( - i18next.t('messages.recipients.search', { - search: filters.searchString, - }), - ); - } - - var exclusions = vm.resolve.selection.allSelected - ? vm.resolve.selection.unselectedPeople - : []; - - /* - * "name" the property on the filters object - * "type" is the JSON API model type that the filter ids refer to - * "nameField" is the name of the name attribute on the JSON API model - * "ids" is the array of model ids and defaults to filters[definition.name] - */ - var filterDefinitions = [ - { name: 'groups', type: 'group', nameField: 'name' }, - { name: 'labels', type: 'label', nameField: 'name' }, - { name: 'assignedTos', type: 'person', nameField: 'full_name' }, - { - name: 'exclusions', - type: 'person', - nameField: 'full_name', - ids: exclusions, - }, - ]; - filterDefinitions.forEach(function (definition) { - var ids = definition.ids || filters[definition.name] || []; - if (ids.length > 0) { - var names = ids - .map(function (id) { - return JsonApiDataStore.store.find( - definition.type, - id, - )[definition.nameField]; - }) - .join(', '); - parts.push( - i18next.t( - 'messages.recipients.' + _.snakeCase(definition.name), - { - names: names, - }, - ), - ); - } - }); - - return parts.join(' '); - } + vm.$onInit = activate; - // Return the number of characters that the message can still hold - function getMaximumLength() { - return lengthLimits[vm.medium]; - } + // The maximum message lengths of the supported media + const lengthLimits = { + email: 5000, + sms: 480, + }; - // Return the number of characters that the message can still hold - function getRemainingLength() { - return getMaximumLength() - vm.message.length; + function activate() { + vm.medium = vm.resolve.medium; + if (!_.includes(['email', 'sms'], vm.medium)) { + throw new Error('Invalid medium: ' + vm.medium); } - function isValid() { - return vm.message && (vm.medium !== 'email' || vm.subject); + vm.title = 'messages.' + vm.medium + '_title'; + vm.subtitle = 'messages.' + vm.medium + '_subtitle'; + vm.formattedRecipients = getFormattedRecipients(); + } + + // Return the recipients list as a nicely-formatted, human-readable string + function getFormattedRecipients() { + const filters = vm.resolve.selection.filters; + const parts = []; + + parts.push( + i18next.t('messages.recipients.contacts', { + contact_count: vm.resolve.selection.totalSelectedPeople, + }), + ); + + const organizationName = JsonApiDataStore.store.find('organization', vm.resolve.selection.orgId).name; + parts.push( + i18next.t('messages.recipients.organization', { + name: organizationName, + }), + ); + + if (filters.searchString) { + parts.push( + i18next.t('messages.recipients.search', { + search: filters.searchString, + }), + ); } - function send() { - vm.sending = true; - - var sendingPromise = messageModalService.sendMessage({ - recipients: vm.resolve.selection, - medium: vm.medium, - subject: vm.subject, - message: vm.message, - surveyId: vm.resolve.surveyId, - }); - - sendingPromise.then(vm.close).catch(function () { - vm.sending = false; - }); - } - - function cancel() { - vm.dismiss(); - } + const exclusions = vm.resolve.selection.allSelected ? vm.resolve.selection.unselectedPeople : []; + + /* + * "name" the property on the filters object + * "type" is the JSON API model type that the filter ids refer to + * "nameField" is the name of the name attribute on the JSON API model + * "ids" is the array of model ids and defaults to filters[definition.name] + */ + const filterDefinitions = [ + { name: 'groups', type: 'group', nameField: 'name' }, + { name: 'labels', type: 'label', nameField: 'name' }, + { name: 'assignedTos', type: 'person', nameField: 'full_name' }, + { + name: 'exclusions', + type: 'person', + nameField: 'full_name', + ids: exclusions, + }, + ]; + filterDefinitions.forEach(function (definition) { + const ids = definition.ids || filters[definition.name] || []; + if (ids.length > 0) { + const names = ids + .map(function (id) { + return JsonApiDataStore.store.find(definition.type, id)[definition.nameField]; + }) + .join(', '); + parts.push( + i18next.t('messages.recipients.' + _.snakeCase(definition.name), { + names, + }), + ); + } + }); + + return parts.join(' '); + } + + // Return the number of characters that the message can still hold + function getMaximumLength() { + return lengthLimits[vm.medium]; + } + + // Return the number of characters that the message can still hold + function getRemainingLength() { + return getMaximumLength() - vm.message.length; + } + + function isValid() { + return vm.message && (vm.medium !== 'email' || vm.subject); + } + + function send() { + vm.sending = true; + + const sendingPromise = messageModalService.sendMessage({ + recipients: vm.resolve.selection, + medium: vm.medium, + subject: vm.subject, + message: vm.message, + surveyId: vm.resolve.surveyId, + }); + + sendingPromise.then(vm.close).catch(function () { + vm.sending = false; + }); + } + + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/messageModal/messageModal.html b/app/assets/javascripts/angular/components/messageModal/messageModal.html index b4dc4e1004..6899e61d8c 100644 --- a/app/assets/javascripts/angular/components/messageModal/messageModal.html +++ b/app/assets/javascripts/angular/components/messageModal/messageModal.html @@ -1,46 +1,34 @@
-

{{ $ctrl.title | t }}

-

- {{ $ctrl.subtitle | t: { recipients: $ctrl.formattedRecipients } }} -

- - - +

{{ $ctrl.title | t }}

+

{{ $ctrl.subtitle | t: { recipients: $ctrl.formattedRecipients } }}

+ + +
- - - + + +
- +
diff --git a/app/assets/javascripts/angular/components/messageModal/messageModal.service.js b/app/assets/javascripts/angular/components/messageModal/messageModal.service.js index 74799d5513..7798081846 100644 --- a/app/assets/javascripts/angular/components/messageModal/messageModal.service.js +++ b/app/assets/javascripts/angular/components/messageModal/messageModal.service.js @@ -1,41 +1,35 @@ -angular - .module('campusContactsApp') - .factory('messageModalService', messageModalService); +angular.module('campusContactsApp').factory('messageModalService', messageModalService); function messageModalService(httpProxy, personSelectionService) { - var messageModalService = { - sendMessage: function (options) { - var selection = options.recipients; - var filters = personSelectionService.convertToFilters( - selection, - options.surveyId, - ); + const messageModalService = { + sendMessage: function (options) { + const selection = options.recipients; + const filters = personSelectionService.convertToFilters(selection, options.surveyId); - return httpProxy.post( - '/bulk_messages', - { - data: { - type: 'bulk_message', - attributes: { - organization_id: selection.orgId, - send_via: options.medium, - subject: options.subject, - message: options.message, + return httpProxy.post( + '/bulk_messages', + { + data: { + type: 'bulk_message', + attributes: { + organization_id: selection.orgId, + send_via: options.medium, + subject: options.subject, + message: options.message, - // Prefer using recipient_ids over filters because the former does validation that the - // latter does not. If recipient_ids is truthy, it will override the filters. - recipient_ids: filters.ids, - }, - }, - filters: filters, - }, - { - errorMessage: - 'error.messages.bulk_message_modal.send_message', - }, - ); + // Prefer using recipient_ids over filters because the former does validation that the + // latter does not. If recipient_ids is truthy, it will override the filters. + recipient_ids: filters.ids, + }, + }, + filters, }, - }; + { + errorMessage: 'error.messages.bulk_message_modal.send_message', + }, + ); + }, + }; - return messageModalService; + return messageModalService; } diff --git a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.component.js b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.component.js index 79a1043bf9..b054c1dc39 100644 --- a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.component.js +++ b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.component.js @@ -2,88 +2,80 @@ import template from './ministryViewGroup.html'; import './ministryViewGroup.scss'; angular.module('campusContactsApp').component('ministryViewGroup', { - controller: ministryViewGroupController, - template: template, - bindings: { - group: '<', - }, + controller: ministryViewGroupController, + template, + bindings: { + group: '<', + }, }); function ministryViewGroupController( - $scope, - $uibModal, - confirmModalService, - tFilter, - groupsService, - ministryViewGroupService, - _, + $scope, + $uibModal, + confirmModalService, + tFilter, + groupsService, + ministryViewGroupService, + _, ) { - var vm = this; + const vm = this; - vm.getLeaders = getLeaders; - vm.openGroup = openGroup; - vm.editGroup = editGroup; - vm.deleteGroup = deleteGroup; - vm.$onInit = activate; - vm.groupLength = groupLength; + vm.getLeaders = getLeaders; + vm.openGroup = openGroup; + vm.editGroup = editGroup; + vm.deleteGroup = deleteGroup; + vm.$onInit = activate; + vm.groupLength = groupLength; - function groupLength() { - return vm.group.group_memberships.filter((m) => m.person !== null) - .length; - } + function groupLength() { + return vm.group.group_memberships.filter((m) => m.person !== null).length; + } - function activate() { - $scope.$watchGroup( - [ - '$ctrl.group.meets', - '$ctrl.group.meeting_day', - '$ctrl.group.start_time', - '$ctrl.group.end_time', - ], - function () { - vm.meetingTime = ministryViewGroupService.formatMeetingTime( - vm.group, - ); - }, - ); - } + function activate() { + $scope.$watchGroup( + ['$ctrl.group.meets', '$ctrl.group.meeting_day', '$ctrl.group.start_time', '$ctrl.group.end_time'], + function () { + vm.meetingTime = ministryViewGroupService.formatMeetingTime(vm.group); + }, + ); + } - function getLeaders() { - return groupsService.getMembersWithRole(vm.group, 'leader'); - } + function getLeaders() { + return groupsService.getMembersWithRole(vm.group, 'leader'); + } - function openGroup() { - $uibModal.open({ - component: 'groupMembersModal', - resolve: { - group: _.constant(vm.group), - }, - windowClass: 'pivot_theme', - size: 'md', - }); - } + function openGroup() { + $uibModal.open({ + component: 'groupMembersModal', + resolve: { + group: _.constant(vm.group), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + } - function editGroup() { - $uibModal.open({ - component: 'editGroup', - resolve: { - organizationId: _.constant(vm.group.organization.id), - group: _.constant(vm.group), - }, - windowClass: 'pivot_theme', - size: 'md', - }); - } + function editGroup() { + $uibModal.open({ + component: 'editGroup', + resolve: { + organizationId: _.constant(vm.group.organization.id), + group: _.constant(vm.group), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + } - function deleteGroup() { - confirmModalService - .create( - tFilter('groups.confirm_delete_group', { - group_name: vm.group.name, - }), - ) - .then(function () { - return groupsService.deleteGroup(vm.group); - }); - } + function deleteGroup() { + confirmModalService + .create( + tFilter('groups.confirm_delete_group', { + group_name: vm.group.name, + }), + ) + .then(function () { + return groupsService.deleteGroup(vm.group); + }); + } } diff --git a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.html b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.html index 5f94ac3c56..ef9e790e75 100644 --- a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.html +++ b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.html @@ -1,26 +1,22 @@
-
- {{ $ctrl.group.name }} ({{ $ctrl.groupLength() }}) -
-
- - {{ leader | personName }}, - -
-
{{ $ctrl.meetingTime }}
-
{{ $ctrl.group.location }}
-
- - -
+
{{ $ctrl.group.name }} ({{ $ctrl.groupLength() }})
+
+ {{ leader | personName }}, +
+
{{ $ctrl.meetingTime }}
+
{{ $ctrl.group.location }}
+
+ + +
diff --git a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.js b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.js index e70583d754..cccf59777c 100644 --- a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.js +++ b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.js @@ -1,53 +1,49 @@ -angular - .module('campusContactsApp') - .factory('ministryViewGroupService', ministryViewGroupService); +angular.module('campusContactsApp').factory('ministryViewGroupService', ministryViewGroupService); function ministryViewGroupService(groupsService, tFilter, moment, _) { - // Convert a time in milliseconds since midnight into a human-readable string - function formatTime(time) { - return _.isNil(time) - ? '' - : moment(groupsService.timeToDate(time)).format('LT'); - } + // Convert a time in milliseconds since midnight into a human-readable string + function formatTime(time) { + return _.isNil(time) ? '' : moment(groupsService.timeToDate(time)).format('LT'); + } - // Convert a number into its ordinal form (1st, 2nd, 3rd, etc.) - function formatOrdinal(number) { - var onesDigit = number % 10; - var tensDigit = ((number % 100) - onesDigit) / 10; - var suffix = - tensDigit !== 1 && onesDigit >= 1 && onesDigit <= 3 - ? tFilter(`ministries.groups.ordinal_suffixes.${onesDigit}`) - : tFilter('ministries.groups.ordinal_suffixes.0'); - return number + suffix; - } + // Convert a number into its ordinal form (1st, 2nd, 3rd, etc.) + function formatOrdinal(number) { + const onesDigit = number % 10; + const tensDigit = ((number % 100) - onesDigit) / 10; + const suffix = + tensDigit !== 1 && onesDigit >= 1 && onesDigit <= 3 + ? tFilter(`ministries.groups.ordinal_suffixes.${onesDigit}`) + : tFilter('ministries.groups.ordinal_suffixes.0'); + return number + suffix; + } - // Return a human-readable string representing the group's meeting time - function formatMeetingTime(group) { - var time = tFilter('ministries.groups.meeting_time.time_range', { - start: formatTime(group.start_time), - end: formatTime(group.end_time), - }); + // Return a human-readable string representing the group's meeting time + function formatMeetingTime(group) { + const time = tFilter('ministries.groups.meeting_time.time_range', { + start: formatTime(group.start_time), + end: formatTime(group.end_time), + }); - if (group.meets === 'weekly') { - var dayOfWeek = tFilter('date.day_names.' + group.meeting_day); - return tFilter('ministries.groups.meeting_time.weekly', { - time: time, - day: dayOfWeek, - }); - } else if (group.meets === 'monthly') { - var dayOfMonth = formatOrdinal(group.meeting_day); - return tFilter('ministries.groups.meeting_time.monthly', { - time: time, - day: dayOfMonth, - }); - } else if (group.meets === 'sporadically') { - return tFilter('ministries.groups.meeting_time.sporadically'); - } + if (group.meets === 'weekly') { + const dayOfWeek = tFilter('date.day_names.' + group.meeting_day); + return tFilter('ministries.groups.meeting_time.weekly', { + time, + day: dayOfWeek, + }); + } else if (group.meets === 'monthly') { + const dayOfMonth = formatOrdinal(group.meeting_day); + return tFilter('ministries.groups.meeting_time.monthly', { + time, + day: dayOfMonth, + }); + } else if (group.meets === 'sporadically') { + return tFilter('ministries.groups.meeting_time.sporadically'); } + } - return { - formatTime: formatTime, - formatOrdinal: formatOrdinal, - formatMeetingTime: formatMeetingTime, - }; + return { + formatTime, + formatOrdinal, + formatMeetingTime, + }; } diff --git a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js index 0c55494b58..10c17f836a 100644 --- a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js +++ b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js @@ -1,75 +1,75 @@ import 'angular-mocks'; // Constants -var ministryViewGroupService, tFilter; +let ministryViewGroupService, tFilter; describe('ministryViewGroupService service', function () { - beforeEach(inject(function (_ministryViewGroupService_) { - ministryViewGroupService = _ministryViewGroupService_; - })); + beforeEach(inject(function (_ministryViewGroupService_) { + ministryViewGroupService = _ministryViewGroupService_; + })); - describe('ministryViewGroupService.formatOrdinal', function () { - it('should convert numbers to ordinal strings', function () { - expect(ministryViewGroupService.formatOrdinal(0)).toBe('0th'); - expect(ministryViewGroupService.formatOrdinal(1)).toBe('1st'); - expect(ministryViewGroupService.formatOrdinal(2)).toBe('2nd'); - expect(ministryViewGroupService.formatOrdinal(3)).toBe('3rd'); - expect(ministryViewGroupService.formatOrdinal(4)).toBe('4th'); - expect(ministryViewGroupService.formatOrdinal(10)).toBe('10th'); - expect(ministryViewGroupService.formatOrdinal(11)).toBe('11th'); - expect(ministryViewGroupService.formatOrdinal(12)).toBe('12th'); - expect(ministryViewGroupService.formatOrdinal(13)).toBe('13th'); - expect(ministryViewGroupService.formatOrdinal(14)).toBe('14th'); - expect(ministryViewGroupService.formatOrdinal(20)).toBe('20th'); - expect(ministryViewGroupService.formatOrdinal(21)).toBe('21st'); - expect(ministryViewGroupService.formatOrdinal(22)).toBe('22nd'); - expect(ministryViewGroupService.formatOrdinal(23)).toBe('23rd'); - expect(ministryViewGroupService.formatOrdinal(24)).toBe('24th'); - }); + describe('ministryViewGroupService.formatOrdinal', function () { + it('should convert numbers to ordinal strings', function () { + expect(ministryViewGroupService.formatOrdinal(0)).toBe('0th'); + expect(ministryViewGroupService.formatOrdinal(1)).toBe('1st'); + expect(ministryViewGroupService.formatOrdinal(2)).toBe('2nd'); + expect(ministryViewGroupService.formatOrdinal(3)).toBe('3rd'); + expect(ministryViewGroupService.formatOrdinal(4)).toBe('4th'); + expect(ministryViewGroupService.formatOrdinal(10)).toBe('10th'); + expect(ministryViewGroupService.formatOrdinal(11)).toBe('11th'); + expect(ministryViewGroupService.formatOrdinal(12)).toBe('12th'); + expect(ministryViewGroupService.formatOrdinal(13)).toBe('13th'); + expect(ministryViewGroupService.formatOrdinal(14)).toBe('14th'); + expect(ministryViewGroupService.formatOrdinal(20)).toBe('20th'); + expect(ministryViewGroupService.formatOrdinal(21)).toBe('21st'); + expect(ministryViewGroupService.formatOrdinal(22)).toBe('22nd'); + expect(ministryViewGroupService.formatOrdinal(23)).toBe('23rd'); + expect(ministryViewGroupService.formatOrdinal(24)).toBe('24th'); }); + }); - describe('ministryViewGroupService.formatTime', function () { - it('should format a time in milliseconds since midnight as a time string', function () { - expect(ministryViewGroupService.formatTime(0)).toBe('12:00 AM'); - }); + describe('ministryViewGroupService.formatTime', function () { + it('should format a time in milliseconds since midnight as a time string', function () { + expect(ministryViewGroupService.formatTime(0)).toBe('12:00 AM'); + }); - it('should return a blank string for null times', function () { - expect(ministryViewGroupService.formatTime(null)).toBe(''); - }); + it('should return a blank string for null times', function () { + expect(ministryViewGroupService.formatTime(null)).toBe(''); }); + }); - describe('ministryViewGroupService.formatMeetingTime', function () { - it('should format weekly meeting times', function () { - expect( - ministryViewGroupService.formatMeetingTime({ - meets: 'weekly', - meeting_day: 4, - start_time: 18 * 60 * 60 * 1000, - end_time: 20 * 60 * 60 * 1000, - }), - ).toEqual('Weekly on Thursdays 6:00 PM - 8:00 PM'); - }); + describe('ministryViewGroupService.formatMeetingTime', function () { + it('should format weekly meeting times', function () { + expect( + ministryViewGroupService.formatMeetingTime({ + meets: 'weekly', + meeting_day: 4, + start_time: 18 * 60 * 60 * 1000, + end_time: 20 * 60 * 60 * 1000, + }), + ).toEqual('Weekly on Thursdays 6:00 PM - 8:00 PM'); + }); - it('should format monthly meeting times', function () { - expect( - ministryViewGroupService.formatMeetingTime({ - meets: 'monthly', - meeting_day: 11, - start_time: 18 * 60 * 60 * 1000, - end_time: 20 * 60 * 60 * 1000, - }), - ).toEqual('Monthly on the 11th from 6:00 PM - 8:00 PM'); - }); + it('should format monthly meeting times', function () { + expect( + ministryViewGroupService.formatMeetingTime({ + meets: 'monthly', + meeting_day: 11, + start_time: 18 * 60 * 60 * 1000, + end_time: 20 * 60 * 60 * 1000, + }), + ).toEqual('Monthly on the 11th from 6:00 PM - 8:00 PM'); + }); - it('should format sporadic meeting times', function () { - expect( - ministryViewGroupService.formatMeetingTime({ - meets: 'sporadically', - meeting_day: null, - start_time: null, - end_time: null, - }), - ).toEqual('Sporadically'); - }); + it('should format sporadic meeting times', function () { + expect( + ministryViewGroupService.formatMeetingTime({ + meets: 'sporadically', + meeting_day: null, + start_time: null, + end_time: null, + }), + ).toEqual('Sporadically'); }); + }); }); diff --git a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.js b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.js index 955b8b12df..0ba2adab86 100644 --- a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.js +++ b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.js @@ -2,50 +2,41 @@ import template from './ministryViewLabel.html'; import './ministryViewLabel.scss'; angular.module('campusContactsApp').component('ministryViewLabel', { - controller: ministryViewLabelController, - template: template, - bindings: { - label: '<', - }, + controller: ministryViewLabelController, + template, + bindings: { + label: '<', + }, }); -function ministryViewLabelController( - $uibModal, - confirmModalService, - tFilter, - labelsService, - loggedInPerson, - _, -) { - var vm = this; +function ministryViewLabelController($uibModal, confirmModalService, tFilter, labelsService, loggedInPerson, _) { + const vm = this; - vm.editLabel = editLabel; - vm.deleteLabel = deleteLabel; - vm.$onInit = activate; + vm.editLabel = editLabel; + vm.deleteLabel = deleteLabel; + vm.$onInit = activate; - function activate() { - vm.adminPrivileges = loggedInPerson.isAdminAt(vm.label.organization); - } + function activate() { + vm.adminPrivileges = loggedInPerson.isAdminAt(vm.label.organization); + } - function editLabel() { - $uibModal.open({ - component: 'editLabel', - resolve: { - organizationId: _.constant(vm.label.organization.id), - label: _.constant(vm.label), - }, - windowClass: 'pivot_theme', - size: 'sm', - }); - } + function editLabel() { + $uibModal.open({ + component: 'editLabel', + resolve: { + organizationId: _.constant(vm.label.organization.id), + label: _.constant(vm.label), + }, + windowClass: 'pivot_theme', + size: 'sm', + }); + } - function deleteLabel() { - return confirmModalService - .create( - tFilter('labels.delete.confirm', { label_name: vm.label.name }), - ) - .then(function () { - return labelsService.deleteLabel(vm.label); - }); - } + function deleteLabel() { + return confirmModalService + .create(tFilter('labels.delete.confirm', { label_name: vm.label.name })) + .then(function () { + return labelsService.deleteLabel(vm.label); + }); + } } diff --git a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.spec.js b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.spec.js index c21fc0572e..d1493b7d5c 100644 --- a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.spec.js +++ b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.component.spec.js @@ -1,126 +1,105 @@ import 'angular-mocks'; // Constants -var $ctrl, $q, $rootScope, JsonApiDataStore; +let $ctrl, $q, $rootScope, JsonApiDataStore; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('minstryViewLabel component', function () { - beforeEach(inject(function ( - $componentController, - _$q_, - _$rootScope_, - _JsonApiDataStore_, - ) { - $q = _$q_; - $rootScope = _$rootScope_; - JsonApiDataStore = _JsonApiDataStore_; - - this.loggedInPerson = jasmine.createSpyObj('loggedInPerson', [ - 'isAdminAt', - ]); - this.$uibModal = jasmine.createSpyObj('$uibModal', ['open']); - this.confirmModalService = jasmine.createSpyObj('confirmModalService', [ - 'create', - ]); - this.labelsService = jasmine.createSpyObj('labelsService', [ - 'deleteLabel', - ]); - - this.organization = new JsonApiDataStore.Model('organization', 1); - this.organization.setRelationship('labels', []); - - this.label = new JsonApiDataStore.Model('label'); - this.label.setAttribute('id', 1); - this.label.setAttribute('name', 'Test label'); - this.label.setRelationship('organization', this.organization); - - $ctrl = $componentController( - 'ministryViewLabel', - { - loggedInPerson: this.loggedInPerson, - $uibModal: this.$uibModal, - confirmModalService: this.confirmModalService, - labelsService: this.labelsService, - }, - { - label: this.label, - }, - ); - })); - - describe('$onInit', function () { - it('should initialize admin privileges', function () { - this.loggedInPerson.isAdminAt.and.returnValue(true); - - $ctrl.$onInit(); - - expect(this.loggedInPerson.isAdminAt).toHaveBeenCalledWith( - this.organization, - ); - expect($ctrl.adminPrivileges).toEqual(true); - }); + beforeEach(inject(function ($componentController, _$q_, _$rootScope_, _JsonApiDataStore_) { + $q = _$q_; + $rootScope = _$rootScope_; + JsonApiDataStore = _JsonApiDataStore_; + + this.loggedInPerson = jasmine.createSpyObj('loggedInPerson', ['isAdminAt']); + this.$uibModal = jasmine.createSpyObj('$uibModal', ['open']); + this.confirmModalService = jasmine.createSpyObj('confirmModalService', ['create']); + this.labelsService = jasmine.createSpyObj('labelsService', ['deleteLabel']); + + this.organization = new JsonApiDataStore.Model('organization', 1); + this.organization.setRelationship('labels', []); + + this.label = new JsonApiDataStore.Model('label'); + this.label.setAttribute('id', 1); + this.label.setAttribute('name', 'Test label'); + this.label.setRelationship('organization', this.organization); + + $ctrl = $componentController( + 'ministryViewLabel', + { + loggedInPerson: this.loggedInPerson, + $uibModal: this.$uibModal, + confirmModalService: this.confirmModalService, + labelsService: this.labelsService, + }, + { + label: this.label, + }, + ); + })); + + describe('$onInit', function () { + it('should initialize admin privileges', function () { + this.loggedInPerson.isAdminAt.and.returnValue(true); + + $ctrl.$onInit(); + + expect(this.loggedInPerson.isAdminAt).toHaveBeenCalledWith(this.organization); + expect($ctrl.adminPrivileges).toEqual(true); + }); + }); + + describe('editLabel', function () { + it('should open the edit label modal', function () { + $ctrl.editLabel(); + + expect(this.$uibModal.open).toHaveBeenCalledWith( + jasmine.objectContaining({ + component: 'editLabel', + }), + ); + expect(this.$uibModal.open.calls.argsFor(0)[0].resolve.organizationId()).toEqual(this.organization.id); + expect(this.$uibModal.open.calls.argsFor(0)[0].resolve.label()).toEqual(this.label); }); + }); - describe('editLabel', function () { - it('should open the edit label modal', function () { - $ctrl.editLabel(); - - expect(this.$uibModal.open).toHaveBeenCalledWith( - jasmine.objectContaining({ - component: 'editLabel', - }), - ); - expect( - this.$uibModal.open.calls - .argsFor(0)[0] - .resolve.organizationId(), - ).toEqual(this.organization.id); - expect( - this.$uibModal.open.calls.argsFor(0)[0].resolve.label(), - ).toEqual(this.label); - }); + describe('deleteLabel', function () { + beforeEach(function () { + this.confirmModalService.create.and.returnValue($q.resolve()); + this.labelsService.deleteLabel.and.returnValue($q.resolve()); }); - describe('deleteLabel', function () { - beforeEach(function () { - this.confirmModalService.create.and.returnValue($q.resolve()); - this.labelsService.deleteLabel.and.returnValue($q.resolve()); - }); + it('should open the confirmation dialog', function () { + $ctrl.deleteLabel(); - it('should open the confirmation dialog', function () { - $ctrl.deleteLabel(); + expect(this.confirmModalService.create).toHaveBeenCalled(); + }); - expect(this.confirmModalService.create).toHaveBeenCalled(); - }); + it( + 'should delete the label', + asynchronous(function () { + const _this = this; - it( - 'should delete the label', - asynchronous(function () { - var _this = this; - - return $ctrl.deleteLabel().then(function () { - expect( - _this.labelsService.deleteLabel, - ).toHaveBeenCalledWith(_this.label); - }); - }), - ); - }); + return $ctrl.deleteLabel().then(function () { + expect(_this.labelsService.deleteLabel).toHaveBeenCalledWith(_this.label); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.html b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.html index f7e21eac30..c4d6612d08 100644 --- a/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.html +++ b/app/assets/javascripts/angular/components/ministryViewLabel/ministryViewLabel.html @@ -1,23 +1,8 @@
-
- {{ $ctrl.label.i18n ? ($ctrl.label.i18n | t) : $ctrl.label.name }} -
+
{{ $ctrl.label.i18n ? ($ctrl.label.i18n | t) : $ctrl.label.name }}
-
- - -
+
+ + +
diff --git a/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.component.js b/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.component.js index 11924b51ca..d365528494 100644 --- a/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.component.js +++ b/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.component.js @@ -2,115 +2,90 @@ import template from './ministryViewPerson.html'; import './ministryViewPerson.scss'; angular.module('campusContactsApp').component('ministryViewPerson', { - controller: ministryViewPersonController, - template: template, - bindings: { - person: '<', - organizationId: '<', - selected: '=', - questions: '<', - odd: '<', - showLastSurvey: '=', - }, + controller: ministryViewPersonController, + template, + bindings: { + person: '<', + organizationId: '<', + selected: '=', + questions: '<', + odd: '<', + showLastSurvey: '=', + }, }); -function ministryViewPersonController( - $rootScope, - $scope, - personService, - personProfileService, -) { - var vm = this; - - vm.loadingAssignmentOptions = false; - vm.addAssignment = addAssignment; - vm.removeAssignment = removeAssignment; - vm.saveAttribute = saveAttribute; - vm.toggleAssignmentVisibility = toggleAssignmentVisibility; - vm.onAssignmentsKeydown = onAssignmentsKeydown; - vm.isContact = isContact; - vm.followupStatusOptions = personService.getFollowupStatusOptions(); - - this.$onInit = () => { - // Update UI when the users add or removes an assignment - this.personModifiedUnsubscribe = $rootScope.$on( - 'personModified', - () => { - this.updateAssigned(); - }, - ); - }; +function ministryViewPersonController($rootScope, $scope, personService, personProfileService) { + const vm = this; - this.$onDestroy = () => { - this.personModifiedUnsubscribe(); - }; + vm.loadingAssignmentOptions = false; + vm.addAssignment = addAssignment; + vm.removeAssignment = removeAssignment; + vm.saveAttribute = saveAttribute; + vm.toggleAssignmentVisibility = toggleAssignmentVisibility; + vm.onAssignmentsKeydown = onAssignmentsKeydown; + vm.isContact = isContact; + vm.followupStatusOptions = personService.getFollowupStatusOptions(); - this.$onChanges = (changes) => { - if ( - !changes.person || - changes.person.currentValue === changes.person.previousValue - ) - return; + this.$onInit = () => { + // Update UI when the users add or removes an assignment + this.personModifiedUnsubscribe = $rootScope.$on('personModified', () => { + this.updateAssigned(); + }); + }; - const person = changes.person.currentValue; + this.$onDestroy = () => { + this.personModifiedUnsubscribe(); + }; - if (this.showLastSurvey) { - if (!person.answer_sheets) this.lastSurvey = null; + this.$onChanges = (changes) => { + if (!changes.person || changes.person.currentValue === changes.person.previousValue) return; - this.lastSurvey = personService.getLastSurvey(person); - } + const person = changes.person.currentValue; - this.orgPermission = personService.getOrgPermission( - person, - this.organizationId, - ); + if (this.showLastSurvey) { + if (!person.answer_sheets) this.lastSurvey = null; - this.assignedTo = personService.getAssignedTo( - person, - this.organizationId, - ); + this.lastSurvey = personService.getLastSurvey(person); + } - this.updateAssigned = () => { - this.assignedTo = personService.getAssignedTo( - person, - this.organizationId, - ); - }; + this.orgPermission = personService.getOrgPermission(person, this.organizationId); - this.phoneNumber = personService.getPhoneNumber(person); - this.emailAddress = personService.getEmailAddress(person); + this.assignedTo = personService.getAssignedTo(person, this.organizationId); + + this.updateAssigned = () => { + this.assignedTo = personService.getAssignedTo(person, this.organizationId); }; - function addAssignment(person) { - return personProfileService - .addAssignments(vm.person, vm.organizationId, [person]) - .then(() => $scope.$emit('personModified')); - } + this.phoneNumber = personService.getPhoneNumber(person); + this.emailAddress = personService.getEmailAddress(person); + }; - function removeAssignment(person) { - return personProfileService - .removeAssignments(vm.person, [person]) - .then(() => $scope.$emit('personModified')); - } + function addAssignment(person) { + return personProfileService + .addAssignments(vm.person, vm.organizationId, [person]) + .then(() => $scope.$emit('personModified')); + } - function saveAttribute(model, attribute) { - personProfileService - .saveAttribute(vm.person.id, model, attribute) - .then(() => $scope.$emit('personModified')); - } + function removeAssignment(person) { + return personProfileService.removeAssignments(vm.person, [person]).then(() => $scope.$emit('personModified')); + } - function toggleAssignmentVisibility() { - vm.assignmentsVisible = !vm.assignmentsVisible; - } + function saveAttribute(model, attribute) { + personProfileService.saveAttribute(vm.person.id, model, attribute).then(() => $scope.$emit('personModified')); + } - function onAssignmentsKeydown(event) { - if (event.keyCode === 27) { - // Escape key was pressed, so hide the assignments selector - vm.assignmentsVisible = false; - } - } + function toggleAssignmentVisibility() { + vm.assignmentsVisible = !vm.assignmentsVisible; + } - function isContact() { - return personService.isContact(vm.person, vm.organizationId); + function onAssignmentsKeydown(event) { + if (event.keyCode === 27) { + // Escape key was pressed, so hide the assignments selector + vm.assignmentsVisible = false; } + } + + function isContact() { + return personService.isContact(vm.person, vm.organizationId); + } } diff --git a/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.html b/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.html index 2e7843b7d1..5aeab57bfa 100644 --- a/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.html +++ b/app/assets/javascripts/angular/components/ministryViewPerson/ministryViewPerson.html @@ -1,99 +1,72 @@
-
-
- -
-
- - {{ $ctrl.person | personName }} - -
+
+
+
-
- {{ 'ministries.people.' + $ctrl.person.gender.toLowerCase() | t - }} +
+ {{ $ctrl.person | personName }}
-
-
-
- {{ $ctrl.assignedTo.length > 0 ? ($ctrl.assignedTo[0] | - personName: 'firstAndLastInitial') : ('assignments.unassigned' | - t) }} - (+{{ $ctrl.assignedTo.length - 1 }}) -
- -
-
- - -
+
+
+ {{ 'ministries.people.' + $ctrl.person.gender.toLowerCase() | t }} +
+
+
+
+ {{ $ctrl.assignedTo.length > 0 ? ($ctrl.assignedTo[0] | personName: 'firstAndLastInitial') : + ('assignments.unassigned' | t) }} + (+{{ $ctrl.assignedTo.length - 1 }}) +
+
-
- -
-
- {{ 'followup_status.archived' | t }} -
-
- -
-
- {{ $ctrl.lastSurvey | date }} -
-
- {{ $ctrl.person.answers[question.id].join(', ') }} +
+ +
+
+
+ +
+
+ {{ 'followup_status.archived' | t }} +
+
+ +
+
+ {{ $ctrl.lastSurvey | date }} +
+
+ {{ $ctrl.person.answers[question.id].join(', ') }} +
diff --git a/app/assets/javascripts/angular/components/multiselectList/multiselectList.component.js b/app/assets/javascripts/angular/components/multiselectList/multiselectList.component.js index a46f038cbb..86e7f0a0f2 100644 --- a/app/assets/javascripts/angular/components/multiselectList/multiselectList.component.js +++ b/app/assets/javascripts/angular/components/multiselectList/multiselectList.component.js @@ -2,58 +2,58 @@ import template from './multiselectList.html'; import './multiselectList.scss'; angular.module('campusContactsApp').component('multiselectList', { - controller: multiselectListController, - bindings: { - // list of objects that have an id and name - options: '=', - - // dictionary with id keys and value of true/false/null - originalSelection: '=', - addedOutput: '=', - removedOutput: '=', - }, - template: template, + controller: multiselectListController, + bindings: { + // list of objects that have an id and name + options: '=', + + // dictionary with id keys and value of true/false/null + originalSelection: '=', + addedOutput: '=', + removedOutput: '=', + }, + template, }); function multiselectListController(multiselectListService, _) { - var vm = this; - - vm.toggle = toggle; - vm.isSelected = isSelected; - vm.isUnselected = isUnselected; - vm.isIndeterminate = isIndeterminate; - - vm.$onInit = activate; - - function activate() { - fillSelected(); - - vm.addedOutput = vm.addedOutput || []; - vm.removedOutput = vm.removedOutput || []; - } - - function fillSelected() { - vm.selected = _.clone(vm.originalSelection); - } - - function toggle(id) { - multiselectListService.toggle(id, { - originalSelection: vm.originalSelection, - currentSelection: vm.selected, - addedOutput: vm.addedOutput, - removedOutput: vm.removedOutput, - }); - } - - function isSelected(id) { - return multiselectListService.isSelected(vm.selected, id); - } - - function isUnselected(id) { - return multiselectListService.isUnselected(vm.selected, id); - } - - function isIndeterminate(id) { - return multiselectListService.isIndeterminate(vm.selected, id); - } + const vm = this; + + vm.toggle = toggle; + vm.isSelected = isSelected; + vm.isUnselected = isUnselected; + vm.isIndeterminate = isIndeterminate; + + vm.$onInit = activate; + + function activate() { + fillSelected(); + + vm.addedOutput = vm.addedOutput || []; + vm.removedOutput = vm.removedOutput || []; + } + + function fillSelected() { + vm.selected = _.clone(vm.originalSelection); + } + + function toggle(id) { + multiselectListService.toggle(id, { + originalSelection: vm.originalSelection, + currentSelection: vm.selected, + addedOutput: vm.addedOutput, + removedOutput: vm.removedOutput, + }); + } + + function isSelected(id) { + return multiselectListService.isSelected(vm.selected, id); + } + + function isUnselected(id) { + return multiselectListService.isUnselected(vm.selected, id); + } + + function isIndeterminate(id) { + return multiselectListService.isIndeterminate(vm.selected, id); + } } diff --git a/app/assets/javascripts/angular/components/multiselectList/multiselectList.html b/app/assets/javascripts/angular/components/multiselectList/multiselectList.html index 51ea048ae5..d48963cc86 100644 --- a/app/assets/javascripts/angular/components/multiselectList/multiselectList.html +++ b/app/assets/javascripts/angular/components/multiselectList/multiselectList.html @@ -1,22 +1,14 @@
    -
  • - + - {{ entry.i18n ? (entry.i18n | t) : entry.name }} - - - -
    • + ng-click="$ctrl.toggle(entry.id)" + > + {{ entry.i18n ? (entry.i18n | t) : entry.name }} + + + +
diff --git a/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.js b/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.js index 5efe7add82..b0c845548a 100644 --- a/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.js +++ b/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.js @@ -1,93 +1,76 @@ -angular - .module('campusContactsApp') - .factory('multiselectListService', multiselectListService); +angular.module('campusContactsApp').factory('multiselectListService', multiselectListService); function multiselectListService(_) { - /* - * Throughout the multiselectListService API, a "selection" is a hash where the key is the option id and the - * value is the option's selection state. That state is an enumeration where true represents selected, false - * represents unselected, and null represents indeterminate. - */ - var multiselectListService = { - // Return a boolean indicating whether or not an option is selected - isSelected: function (selection, id) { - return selection[id] === true; - }, + /* + * Throughout the multiselectListService API, a "selection" is a hash where the key is the option id and the + * value is the option's selection state. That state is an enumeration where true represents selected, false + * represents unselected, and null represents indeterminate. + */ + var multiselectListService = { + // Return a boolean indicating whether or not an option is selected + isSelected: function (selection, id) { + return selection[id] === true; + }, - // Return a boolean indicating whether or not an option is unselected - isUnselected: function (selection, id) { - var state = selection[id]; - return typeof state === 'undefined' || state === false; - }, + // Return a boolean indicating whether or not an option is unselected + isUnselected: function (selection, id) { + const state = selection[id]; + return typeof state === 'undefined' || state === false; + }, - // Return a boolean indicating whether or not an option is in the indeterminate state - isIndeterminate: function (selection, id) { - return selection[id] === null; - }, + // Return a boolean indicating whether or not an option is in the indeterminate state + isIndeterminate: function (selection, id) { + return selection[id] === null; + }, - // Toggle the state of an option, taking indeterminate states into account - // The listState is an object with an "originalSelection" field that specifies the initial selection state, - // a "currentSelection" field that specifies the current selection state, an "addedOutput" field that is an - // array of all the option ids added to the current selection versus the original selection, and a - // "removedOutput" field that is an array of all the option ids removed from the current selection versus - // the original selection. - // This method will update "currentSelection", "addedOutput", and "removedOutput" as necessary, while - // leaving "originalSelection" untouched. - toggle: function (id, listState) { - var originalSelection = listState.originalSelection; - var currentSelection = listState.currentSelection; - var addedOutput = listState.addedOutput; - var removedOutput = listState.removedOutput; + // Toggle the state of an option, taking indeterminate states into account + // The listState is an object with an "originalSelection" field that specifies the initial selection state, + // a "currentSelection" field that specifies the current selection state, an "addedOutput" field that is an + // array of all the option ids added to the current selection versus the original selection, and a + // "removedOutput" field that is an array of all the option ids removed from the current selection versus + // the original selection. + // This method will update "currentSelection", "addedOutput", and "removedOutput" as necessary, while + // leaving "originalSelection" untouched. + toggle: function (id, listState) { + const originalSelection = listState.originalSelection; + const currentSelection = listState.currentSelection; + const addedOutput = listState.addedOutput; + const removedOutput = listState.removedOutput; - var newState; - if (multiselectListService.isSelected(currentSelection, id)) { - // Selected toggles to unselected - newState = false; - } else if ( - multiselectListService.isUnselected(currentSelection, id) - ) { - // Unselected toggles to indeterminate if available and selected otherwise - newState = multiselectListService.isIndeterminate( - originalSelection, - id, - ) - ? null - : true; - } else if ( - multiselectListService.isIndeterminate(currentSelection, id) - ) { - // Indeterminate toggles to selected - newState = true; - } + let newState; + if (multiselectListService.isSelected(currentSelection, id)) { + // Selected toggles to unselected + newState = false; + } else if (multiselectListService.isUnselected(currentSelection, id)) { + // Unselected toggles to indeterminate if available and selected otherwise + newState = multiselectListService.isIndeterminate(originalSelection, id) ? null : true; + } else if (multiselectListService.isIndeterminate(currentSelection, id)) { + // Indeterminate toggles to selected + newState = true; + } - currentSelection[id] = newState; + currentSelection[id] = newState; - if (multiselectListService.isSelected(currentSelection, id)) { - _.pull(removedOutput, id); + if (multiselectListService.isSelected(currentSelection, id)) { + _.pull(removedOutput, id); - // don't add to added diff if it was one of the original selections - if (!multiselectListService.isSelected(originalSelection, id)) { - addedOutput.push(id); - } - } else if ( - multiselectListService.isUnselected(currentSelection, id) - ) { - _.pull(addedOutput, id); + // don't add to added diff if it was one of the original selections + if (!multiselectListService.isSelected(originalSelection, id)) { + addedOutput.push(id); + } + } else if (multiselectListService.isUnselected(currentSelection, id)) { + _.pull(addedOutput, id); - // don't flag something to be removed if it wasn't there in the first place - if ( - !multiselectListService.isUnselected(originalSelection, id) - ) { - removedOutput.push(id); - } - } else if ( - multiselectListService.isIndeterminate(currentSelection, id) - ) { - _.pull(removedOutput, id); - _.pull(addedOutput, id); - } - }, - }; + // don't flag something to be removed if it wasn't there in the first place + if (!multiselectListService.isUnselected(originalSelection, id)) { + removedOutput.push(id); + } + } else if (multiselectListService.isIndeterminate(currentSelection, id)) { + _.pull(removedOutput, id); + _.pull(addedOutput, id); + } + }, + }; - return multiselectListService; + return multiselectListService; } diff --git a/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.spec.js b/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.spec.js index 5c3dd27c67..2fa3719ffb 100644 --- a/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.spec.js +++ b/app/assets/javascripts/angular/components/multiselectList/multiselectList.service.spec.js @@ -1,220 +1,169 @@ import 'angular-mocks'; // Constants -var multiselectListService, _; +let multiselectListService, _; describe('multiselectListService', function () { - beforeEach(inject(function (_multiselectListService_, ___) { - multiselectListService = _multiselectListService_; - _ = ___; - })); - - describe('state checks', function () { - beforeEach(function () { - this.id = 1; - this.selected = { 1: true }; - this.unselected = { 1: false }; - this.indeterminate = { 1: null }; - this.missing = {}; - }); + beforeEach(inject(function (_multiselectListService_, ___) { + multiselectListService = _multiselectListService_; + _ = ___; + })); + + describe('state checks', function () { + beforeEach(function () { + this.id = 1; + this.selected = { 1: true }; + this.unselected = { 1: false }; + this.indeterminate = { 1: null }; + this.missing = {}; + }); - describe('isSelected', function () { - it('should return true for selected states', function () { - expect( - multiselectListService.isSelected(this.selected, this.id), - ).toBe(true); - }); - - it('should return false for other states', function () { - expect( - multiselectListService.isSelected(this.unselected, this.id), - ).toBe(false); - expect( - multiselectListService.isSelected( - this.indeterminate, - this.id, - ), - ).toBe(false); - expect( - multiselectListService.isSelected(this.missing, this.id), - ).toBe(false); - }); - }); + describe('isSelected', function () { + it('should return true for selected states', function () { + expect(multiselectListService.isSelected(this.selected, this.id)).toBe(true); + }); - describe('isUnselected', function () { - it('should return true for unselected and missing states', function () { - expect( - multiselectListService.isUnselected( - this.unselected, - this.id, - ), - ).toBe(true); - expect( - multiselectListService.isUnselected(this.missing, this.id), - ).toBe(true); - }); - - it('should return false for other states', function () { - expect( - multiselectListService.isUnselected(this.selected, this.id), - ).toBe(false); - expect( - multiselectListService.isUnselected( - this.indeterminate, - this.id, - ), - ).toBe(false); - }); - }); + it('should return false for other states', function () { + expect(multiselectListService.isSelected(this.unselected, this.id)).toBe(false); + expect(multiselectListService.isSelected(this.indeterminate, this.id)).toBe(false); + expect(multiselectListService.isSelected(this.missing, this.id)).toBe(false); + }); + }); - describe('isIndeterminate', function () { - it('should return true for indeterminate states', function () { - expect( - multiselectListService.isIndeterminate( - this.indeterminate, - this.id, - ), - ).toBe(true); - }); - - it('should return false for other states', function () { - expect( - multiselectListService.isIndeterminate( - this.selected, - this.id, - ), - ).toBe(false); - expect( - multiselectListService.isIndeterminate( - this.unselected, - this.id, - ), - ).toBe(false); - expect( - multiselectListService.isIndeterminate( - this.missing, - this.id, - ), - ).toBe(false); - }); - }); + describe('isUnselected', function () { + it('should return true for unselected and missing states', function () { + expect(multiselectListService.isUnselected(this.unselected, this.id)).toBe(true); + expect(multiselectListService.isUnselected(this.missing, this.id)).toBe(true); + }); + + it('should return false for other states', function () { + expect(multiselectListService.isUnselected(this.selected, this.id)).toBe(false); + expect(multiselectListService.isUnselected(this.indeterminate, this.id)).toBe(false); + }); }); - describe('toggle', function () { - var id = 1; - var states = { - selected: { 1: true }, - unselected: { 1: false }, - indeterminate: { 1: null }, - missing: {}, - }; - var output = { - present: [id], - absent: [], - }; - - var tests = [ - { - initialSelection: 'selected', - currentSelection: 'selected', - addedOutput: 'absent', - removedOutput: 'absent', - expectedSelected: 'unselected', - expectedAddedOutput: 'absent', - expectedRemovedOutput: 'present', - }, - { - initialSelection: 'unselected', - currentSelection: 'selected', - addedOutput: 'present', - removedOutput: 'absent', - expectedSelected: 'unselected', - expectedAddedOutput: 'absent', - expectedRemovedOutput: 'absent', - }, - { - initialSelection: 'indeterminate', - currentSelection: 'selected', - addedOutput: 'present', - removedOutput: 'absent', - expectedSelected: 'unselected', - expectedAddedOutput: 'absent', - expectedRemovedOutput: 'present', - }, - - { - initialSelection: 'selected', - currentSelection: 'unselected', - addedOutput: 'absent', - removedOutput: 'present', - expectedSelected: 'selected', - expectedAddedOutput: 'absent', - expectedRemovedOutput: 'absent', - }, - { - initialSelection: 'unselected', - currentSelection: 'unselected', - addedOutput: 'absent', - removedOutput: 'absent', - expectedSelected: 'selected', - expectedAddedOutput: 'present', - expectedRemovedOutput: 'absent', - }, - { - initialSelection: 'indeterminate', - currentSelection: 'unselected', - addedOutput: 'present', - removedOutput: 'absent', - expectedSelected: 'indeterminate', - expectedAddedOutput: 'absent', - expectedRemovedOutput: 'absent', - }, - - { - initialSelection: 'indeterminate', - currentSelection: 'indeterminate', - addedOutput: 'absent', - removedOutput: 'absent', - expectedSelected: 'selected', - expectedAddedOutput: 'present', - expectedRemovedOutput: 'absent', - }, - - { - initialSelection: 'missing', - currentSelection: 'missing', - addedOutput: 'absent', - removedOutput: 'absent', - expectedSelected: 'selected', - expectedAddedOutput: 'present', - expectedRemovedOutput: 'absent', - }, - ]; - - tests.forEach(function (test) { - var testText = - 'should toggle ' + - test.currentSelection + - ' state that was initially ' + - test.initialSelection; - it(testText, function () { - var currentSelection = _.clone(states[test.currentSelection]); - var addedOutput = _.clone(output[test.addedOutput]); - var removedOutput = _.clone(output[test.removedOutput]); - - multiselectListService.toggle(id, { - originalSelection: states[test.initialSelection], - currentSelection: currentSelection, - addedOutput: addedOutput, - removedOutput: removedOutput, - }); - - expect(currentSelection).toEqual(states[test.expectedSelected]); - expect(addedOutput).toEqual(output[test.expectedAddedOutput]); - expect(removedOutput).toEqual( - output[test.expectedRemovedOutput], - ); - }); + describe('isIndeterminate', function () { + it('should return true for indeterminate states', function () { + expect(multiselectListService.isIndeterminate(this.indeterminate, this.id)).toBe(true); + }); + + it('should return false for other states', function () { + expect(multiselectListService.isIndeterminate(this.selected, this.id)).toBe(false); + expect(multiselectListService.isIndeterminate(this.unselected, this.id)).toBe(false); + expect(multiselectListService.isIndeterminate(this.missing, this.id)).toBe(false); + }); + }); + }); + + describe('toggle', function () { + const id = 1; + const states = { + selected: { 1: true }, + unselected: { 1: false }, + indeterminate: { 1: null }, + missing: {}, + }; + const output = { + present: [id], + absent: [], + }; + + const tests = [ + { + initialSelection: 'selected', + currentSelection: 'selected', + addedOutput: 'absent', + removedOutput: 'absent', + expectedSelected: 'unselected', + expectedAddedOutput: 'absent', + expectedRemovedOutput: 'present', + }, + { + initialSelection: 'unselected', + currentSelection: 'selected', + addedOutput: 'present', + removedOutput: 'absent', + expectedSelected: 'unselected', + expectedAddedOutput: 'absent', + expectedRemovedOutput: 'absent', + }, + { + initialSelection: 'indeterminate', + currentSelection: 'selected', + addedOutput: 'present', + removedOutput: 'absent', + expectedSelected: 'unselected', + expectedAddedOutput: 'absent', + expectedRemovedOutput: 'present', + }, + + { + initialSelection: 'selected', + currentSelection: 'unselected', + addedOutput: 'absent', + removedOutput: 'present', + expectedSelected: 'selected', + expectedAddedOutput: 'absent', + expectedRemovedOutput: 'absent', + }, + { + initialSelection: 'unselected', + currentSelection: 'unselected', + addedOutput: 'absent', + removedOutput: 'absent', + expectedSelected: 'selected', + expectedAddedOutput: 'present', + expectedRemovedOutput: 'absent', + }, + { + initialSelection: 'indeterminate', + currentSelection: 'unselected', + addedOutput: 'present', + removedOutput: 'absent', + expectedSelected: 'indeterminate', + expectedAddedOutput: 'absent', + expectedRemovedOutput: 'absent', + }, + + { + initialSelection: 'indeterminate', + currentSelection: 'indeterminate', + addedOutput: 'absent', + removedOutput: 'absent', + expectedSelected: 'selected', + expectedAddedOutput: 'present', + expectedRemovedOutput: 'absent', + }, + + { + initialSelection: 'missing', + currentSelection: 'missing', + addedOutput: 'absent', + removedOutput: 'absent', + expectedSelected: 'selected', + expectedAddedOutput: 'present', + expectedRemovedOutput: 'absent', + }, + ]; + + tests.forEach(function (test) { + const testText = 'should toggle ' + test.currentSelection + ' state that was initially ' + test.initialSelection; + it(testText, function () { + const currentSelection = _.clone(states[test.currentSelection]); + const addedOutput = _.clone(output[test.addedOutput]); + const removedOutput = _.clone(output[test.removedOutput]); + + multiselectListService.toggle(id, { + originalSelection: states[test.initialSelection], + currentSelection, + addedOutput, + removedOutput, }); + + expect(currentSelection).toEqual(states[test.expectedSelected]); + expect(addedOutput).toEqual(output[test.expectedAddedOutput]); + expect(removedOutput).toEqual(output[test.expectedRemovedOutput]); + }); }); + }); }); diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.component.js b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.component.js index c1df883a03..c0ee1fc1df 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.component.js +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.component.js @@ -2,8 +2,8 @@ import template from './myOrganizationsDashboard.html'; import './myOrganizationsDashboard.scss'; angular.module('campusContactsApp').component('myOrganizationsDashboard', { - template: template, - controller: function ($state) { - this.$state = $state; - }, + template, + controller: function ($state) { + this.$state = $state; + }, }); diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.html b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.html index 3a8e2deada..12c7692301 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.html +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.html @@ -1,6 +1,3 @@ -
- +
+
diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.service.js b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.service.js index c5cf61d468..e83af7ee90 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.service.js +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboard/myOrganizationsDashboard.service.js @@ -1,28 +1,23 @@ -angular - .module('campusContactsApp') - .factory( - 'myOrganizationsDashboardService', - myOrganizationsDashboardService, - ); +angular.module('campusContactsApp').factory('myOrganizationsDashboardService', myOrganizationsDashboardService); function myOrganizationsDashboardService(httpProxy, modelsService, _) { - return { - // Return an array of all loaded root organizations - getRootOrganizations: function () { - return httpProxy - .get( - modelsService.getModelMetadata('organization').url.all, - { - 'filters[user_created]': false, - 'filters[descendants]': false, - include: 'organizational_permissions', - 'page[limit]': 100, - }, - { - errorMessage: 'error.messages.organization.loadAll', - }, - ) - .then(httpProxy.extractModels); - }, - }; + return { + // Return an array of all loaded root organizations + getRootOrganizations: function () { + return httpProxy + .get( + modelsService.getModelMetadata('organization').url.all, + { + 'filters[user_created]': false, + 'filters[descendants]': false, + include: 'organizational_permissions', + 'page[limit]': 100, + }, + { + errorMessage: 'error.messages.organization.loadAll', + }, + ) + .then(httpProxy.extractModels); + }, + }; } diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js index 02c6a04817..8f7d590f42 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js @@ -1,33 +1,29 @@ import template from './myOrganizationsDashboardList.html'; angular.module('campusContactsApp').component('myOrganizationsDashboardList', { - template: template, - bindings: { - rootOrgs: '<', - }, - controller: /* @ngInject */ function (userPreferencesService, $scope) { - let deregisterEditOrganizationsEvent; + template, + bindings: { + rootOrgs: '<', + }, + controller: /* @ngInject */ function (userPreferencesService, $scope) { + let deregisterEditOrganizationsEvent; - deregisterEditOrganizationsEvent = $scope.$on( - 'editOrganizations', - (event, value) => { - this.editOrganizations = value; - }, - ); + deregisterEditOrganizationsEvent = $scope.$on('editOrganizations', (event, value) => { + this.editOrganizations = value; + }); - var vm = this; + const vm = this; - this.$onDestroy = () => { - deregisterEditOrganizationsEvent(); - }; + this.$onDestroy = () => { + deregisterEditOrganizationsEvent(); + }; - vm.sortableOptions = { - handle: '.sort-orgs-handle', - ghostClass: 'o-40', - forceFallback: true, // Needed to make sticky header and scrollSensitivity work - scrollSensitivity: 100, - onEnd: () => - userPreferencesService.organizationOrderChange(vm.rootOrgs), - }; - }, + vm.sortableOptions = { + handle: '.sort-orgs-handle', + ghostClass: 'o-40', + forceFallback: true, // Needed to make sticky header and scrollSensitivity work + scrollSensitivity: 100, + onEnd: () => userPreferencesService.organizationOrderChange(vm.rootOrgs), + }; + }, }); diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.html b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.html index b1f5dba9d7..19de805635 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.html +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.html @@ -1,13 +1,13 @@
- - -
-

{{ 'ministries.noMinistriesFound' | t }}

-
+ + +
+

{{ 'ministries.noMinistriesFound' | t }}

+
diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.js index f6a3a008e2..cdb3402cf9 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.js @@ -8,202 +8,166 @@ import template from './myPeopleDashboard.html'; import './myPeopleDashboard.scss'; angular.module('campusContactsApp').component('myPeopleDashboard', { - controller: myPeopleDashboardController, - bindings: { - editMode: '<', - }, - template: template, + controller: myPeopleDashboardController, + bindings: { + editMode: '<', + }, + template, }); function myPeopleDashboardController( - $scope, - $log, - $document, - $window, - JsonApiDataStore, - _, - myPeopleDashboardService, - periodService, - loggedInPerson, - personService, - reportsService, - userPreferencesService, + $scope, + $log, + $document, + $window, + JsonApiDataStore, + _, + myPeopleDashboardService, + periodService, + loggedInPerson, + personService, + reportsService, + userPreferencesService, ) { - var vm = this; - vm.people = []; - vm.organizations = []; - vm.loading = true; - vm.noPeople = false; + const vm = this; + vm.people = []; + vm.organizations = []; + vm.loading = true; + vm.noPeople = false; - vm.favicon = favicon; - vm.iosShare = iosShare; + vm.favicon = favicon; + vm.iosShare = iosShare; - vm.sortableOptions = { - handle: '.sort-orgs-handle', - ghostClass: 'o-40', - forceFallback: true, // Needed to make sticky header and scrollSensitivity work - scrollSensitivity: 100, - onEnd: () => - userPreferencesService.organizationOrderChange(vm.organizations), - }; + vm.sortableOptions = { + handle: '.sort-orgs-handle', + ghostClass: 'o-40', + forceFallback: true, // Needed to make sticky header and scrollSensitivity work + scrollSensitivity: 100, + onEnd: () => userPreferencesService.organizationOrderChange(vm.organizations), + }; - vm.$onInit = async () => { - await loggedInPerson.loadOnce(); - await loadAndSyncData(); + vm.$onInit = async () => { + await loggedInPerson.loadOnce(); + await loadAndSyncData(); - angular.element($document).on('people::personAdded', loadAndSyncData); - vm.toggleOrgVisibility = - userPreferencesService.toggleOrganizationVisibility; + angular.element($document).on('people::personAdded', loadAndSyncData); + vm.toggleOrgVisibility = userPreferencesService.toggleOrganizationVisibility; - vm.noPeopleWelcome = i18next.t('dashboard.no_contacts.welcome', { - name: loggedInPerson.person.first_name.toUpperCase(), - }); + vm.noPeopleWelcome = i18next.t('dashboard.no_contacts.welcome', { + name: loggedInPerson.person.first_name.toUpperCase(), + }); - periodService.subscribe($scope, loadReports); + periodService.subscribe($scope, loadReports); - $scope.$apply(); - }; + $scope.$apply(); + }; - vm.$onDestroy = cleanUp; + vm.$onDestroy = cleanUp; - vm.noPeopleWelcome = ''; + vm.noPeopleWelcome = ''; - vm.showSuggestLandscape = () => - // Yes this code can be removed after this date https://jira.cru.org/browse/MHP-3002?focusedCommentId=84408&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-84408 - moment().isBefore('2020-12-01') && - myPeopleDashboardService.isMobile() && - $window.matchMedia('(orientation: portrait)').matches && - !localStorage.getItem('hideSuggestLandscape'); + vm.showSuggestLandscape = () => + // Yes this code can be removed after this date https://jira.cru.org/browse/MHP-3002?focusedCommentId=84408&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-84408 + moment().isBefore('2020-12-01') && + myPeopleDashboardService.isMobile() && + $window.matchMedia('(orientation: portrait)').matches && + !localStorage.getItem('hideSuggestLandscape'); - vm.dismissSuggestLandscape = () => - localStorage.setItem('hideSuggestLandscape', true); + vm.dismissSuggestLandscape = () => localStorage.setItem('hideSuggestLandscape', true); - vm.showIosAddToHomeScreen = () => - myPeopleDashboardService.isIos() && - !window.navigator.standalone && - !localStorage.getItem('hideIosAddToHomeScreen'); + vm.showIosAddToHomeScreen = () => + myPeopleDashboardService.isIos() && !window.navigator.standalone && !localStorage.getItem('hideIosAddToHomeScreen'); - vm.dismissIosAddToHomeScreen = () => - localStorage.setItem('hideIosAddToHomeScreen', true); + vm.dismissIosAddToHomeScreen = () => localStorage.setItem('hideIosAddToHomeScreen', true); - function cleanUp() { - angular.element($document).off('people::personAdded', loadAndSyncData); - } + function cleanUp() { + angular.element($document).off('people::personAdded', loadAndSyncData); + } - function loadAndSyncData() { - var includes = [ - 'organizational_permissions', - 'phone_numbers', - 'email_addresses', - ]; + function loadAndSyncData() { + const includes = ['organizational_permissions', 'phone_numbers', 'email_addresses']; - personService - .getContactAssignments(loggedInPerson.person, null, includes) - .then(dataLoaded); - } + personService.getContactAssignments(loggedInPerson.person, null, includes).then(dataLoaded); + } - function loadReports() { - const people = vm.organizations.flatMap(({ people }) => people); - const organizations = vm.organizations; - - const limitLength = 100; - const warnLength = 25; - - if (people.length > limitLength || organizations.length > limitLength) { - $log.error( - `People dashboard tried to load more than ${limitLength} reports. Report ids truncated.`, - { - numPeopleIds: people.length, - numCommunityIds: organizations.length, - }, - ); - } else if ( - people.length > warnLength || - organizations.length > warnLength - ) { - $log.warn( - `People dashboard loaded more than ${warnLength} reports.`, - { - numPeopleIds: people.length, - numCommunityIds: organizations.length, - }, - ); - } - - const limitedOrganizations = organizations.slice(0, limitLength); - const limitedPeople = people.slice(0, limitLength); - - reportsService - .loadOrganizationReports(limitedOrganizations) - .catch(function (error) { - $log.error('Error loading organization reports', error); - }); - - reportsService - .loadMultiplePeopleReports(limitedOrganizations, limitedPeople) - .catch(function (error) { - $log.error('Error loading people reports', error); - }); - } + function loadReports() { + const people = vm.organizations.flatMap(({ people }) => people); + const organizations = vm.organizations; - function loadOrganizations() { - myPeopleDashboardService - .loadOrganizations({ 'page[limit]': 100 }) - .then(function (organizations) { - vm.organizations = organizations; - - vm.organizations = userPreferencesService.applyUserOrgDisplayPreferences( - vm.organizations, - ); - loadReports(); - }) - .catch(function (error) { - $log.error('Error loading organizations', error); - }); - } + const limitLength = 100; + const warnLength = 25; - function dataLoaded(assignmentsToMe) { - var people = JsonApiDataStore.store.findAll('person'); - people.forEach(function (person) { - if (_.isNil(person.last_name)) { - person.last_name = ''; - } - }); - - // Get the array of all the organizations that have at least one person assigned to me - vm.organizations = _.chain(assignmentsToMe) - .map('organization') - .uniq() - .value(); - - vm.organizations.forEach(function (organization) { - // Get an array of the people assigned to me on this organization - organization.people = _.filter(assignmentsToMe, { - organization: organization, - }).map(function (assignment) { - return JsonApiDataStore.store.find( - 'person', - assignment.person_id, - ); - }); - }); - - vm.organizations = userPreferencesService.applyUserOrgDisplayPreferences( - vm.organizations, - ); - - vm.collapsible = - people.length > 10 || _.keys(vm.organizations).length > 1; - - if (_.keys(vm.organizations).length === 0) { - noPeople(); - } - loadReports(); - vm.loading = false; + if (people.length > limitLength || organizations.length > limitLength) { + $log.error(`People dashboard tried to load more than ${limitLength} reports. Report ids truncated.`, { + numPeopleIds: people.length, + numCommunityIds: organizations.length, + }); + } else if (people.length > warnLength || organizations.length > warnLength) { + $log.warn(`People dashboard loaded more than ${warnLength} reports.`, { + numPeopleIds: people.length, + numCommunityIds: organizations.length, + }); } - function noPeople() { - vm.noPeople = true; - loadOrganizations(); + const limitedOrganizations = organizations.slice(0, limitLength); + const limitedPeople = people.slice(0, limitLength); + + reportsService.loadOrganizationReports(limitedOrganizations).catch(function (error) { + $log.error('Error loading organization reports', error); + }); + + reportsService.loadMultiplePeopleReports(limitedOrganizations, limitedPeople).catch(function (error) { + $log.error('Error loading people reports', error); + }); + } + + function loadOrganizations() { + myPeopleDashboardService + .loadOrganizations({ 'page[limit]': 100 }) + .then(function (organizations) { + vm.organizations = organizations; + + vm.organizations = userPreferencesService.applyUserOrgDisplayPreferences(vm.organizations); + loadReports(); + }) + .catch(function (error) { + $log.error('Error loading organizations', error); + }); + } + + function dataLoaded(assignmentsToMe) { + const people = JsonApiDataStore.store.findAll('person'); + people.forEach(function (person) { + if (_.isNil(person.last_name)) { + person.last_name = ''; + } + }); + + // Get the array of all the organizations that have at least one person assigned to me + vm.organizations = _.chain(assignmentsToMe).map('organization').uniq().value(); + + vm.organizations.forEach(function (organization) { + // Get an array of the people assigned to me on this organization + organization.people = _.filter(assignmentsToMe, { + organization, + }).map(function (assignment) { + return JsonApiDataStore.store.find('person', assignment.person_id); + }); + }); + + vm.organizations = userPreferencesService.applyUserOrgDisplayPreferences(vm.organizations); + + vm.collapsible = people.length > 10 || _.keys(vm.organizations).length > 1; + + if (_.keys(vm.organizations).length === 0) { + noPeople(); } + loadReports(); + vm.loading = false; + } + + function noPeople() { + vm.noPeople = true; + loadOrganizations(); + } } diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js index 8a715144c0..63862c25c8 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js @@ -1,40 +1,37 @@ import 'angular-mocks'; // Constants -var $controller, myPeopleDashboardService, $scope, loggedInPerson; +let $controller, myPeopleDashboardService, $scope, loggedInPerson; describe('myPeopleDashboard Components Tests', function () { - beforeEach(inject(function ( - $rootScope, - $componentController, - _loggedInPerson_, - ) { - $scope = $rootScope.$new(); - loggedInPerson = _loggedInPerson_; + beforeEach(inject(function ($rootScope, $componentController, _loggedInPerson_) { + $scope = $rootScope.$new(); + loggedInPerson = _loggedInPerson_; - spyOn(loggedInPerson, 'person').andReturn({ first_name: 'John' }); + spyOn(loggedInPerson, 'person').andReturn({ first_name: 'John' }); - $controller = $componentController( - 'myPeopleDashboard', - { $scope: $scope }, - { myBinding: { period: '<', editMode: '<' } }, - loggedInPerson, - ); + $controller = $componentController( + 'myPeopleDashboard', + { $scope }, + { myBinding: { period: '<', editMode: '<' } }, + loggedInPerson, + ); - myPeopleDashboardService = jasmine.createSpyObj( - 'myPeopleDashboardService', - ['loadPeople', 'loadReports', 'loadOrganizations'], - ); + myPeopleDashboardService = jasmine.createSpyObj('myPeopleDashboardService', [ + 'loadPeople', + 'loadReports', + 'loadOrganizations', + ]); - describe('Components.Controller', function () { - it('should exist', function () { - expect($controller).toBeDefined(); - }); + describe('Components.Controller', function () { + it('should exist', function () { + expect($controller).toBeDefined(); + }); - it('loadPeople should have been called', function () { - myPeopleDashboardService.loadPeople(); - expect(myPeopleDashboardService.loadPeople).toHaveBeenCalled(); - }); - }); - })); + it('loadPeople should have been called', function () { + myPeopleDashboardService.loadPeople(); + expect(myPeopleDashboardService.loadPeople).toHaveBeenCalled(); + }); + }); + })); }); diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.html b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.html index 243dff3700..04f1781c83 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.html +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.html @@ -1,101 +1,74 @@
-

- {{ 'dashboard.loading_contacts' | t }} -

-
-

{{ $ctrl.noPeopleWelcome }}

- - {{ 'dashboard.no_contacts_help.part1' | t }} - - {{ 'dashboard.no_contacts_help.part2' | t }} - -
+

{{ 'dashboard.loading_contacts' | t }}

+
+

{{ $ctrl.noPeopleWelcome }}

+ + {{ 'dashboard.no_contacts_help.part1' | t }} + + {{ 'dashboard.no_contacts_help.part2' | t }} + +
-
+ - -
-
- - -
-
- -
-
- - {{ 'dashboard.edit_org_order_help.part1' | t }} - - {{ 'dashboard.edit_org_order_help.part2' | t }} - -
-
-
- - - {{ 'dashboard.suggestLandscape.suggestion' | t }} - - - {{ 'dashboard.suggestLandscape.dismiss' | t }} - +
+
+ +
+
+ +
+
+ + {{ 'dashboard.edit_org_order_help.part1' | t }} + + {{ 'dashboard.edit_org_order_help.part2' | t }} + +
+
+
+ + {{ 'dashboard.suggestLandscape.suggestion' | t }} + {{ 'dashboard.suggestLandscape.dismiss' | t }}
-
-
- - - - {{ 'dashboard.suggestIosAddToHomeScreen.title' | t }} - - - {{ 'dashboard.suggestIosAddToHomeScreen.description' | t }} - -
- - {{ 'dashboard.suggestIosAddToHomeScreen.actionPart1' | t }} - - - - {{ 'dashboard.suggestIosAddToHomeScreen.actionPart2' | t }} - -
-
+
+
+
+ + + {{ 'dashboard.suggestIosAddToHomeScreen.title' | t }} + {{ 'dashboard.suggestIosAddToHomeScreen.description' | t }} +
+ {{ 'dashboard.suggestIosAddToHomeScreen.actionPart1' | t }} + + {{ 'dashboard.suggestIosAddToHomeScreen.actionPart2' | t }} +
+
diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.js index 1185f3afe7..e91fada62d 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.js @@ -1,48 +1,37 @@ -angular - .module('campusContactsApp') - .factory('myPeopleDashboardService', myPeopleDashboardService); +angular.module('campusContactsApp').factory('myPeopleDashboardService', myPeopleDashboardService); function myPeopleDashboardService(httpProxy, modelsService, _) { - var myPeopleDashboardService = { - isMobile: () => - window.navigator.userAgent.match( - /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i, - ), + const myPeopleDashboardService = { + isMobile: () => window.navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i), - isIos: () => window.navigator.userAgent.match(/iPhone|iPad|iPod/i), + isIos: () => window.navigator.userAgent.match(/iPhone|iPad|iPod/i), - loadPeople: function (params) { - return httpProxy.get( - modelsService.getModelMetadata('person').url.all, - params || {}, - { - errorMessage: - 'error.messages.my_people_dashboard.load_people', - }, - ); - }, + loadPeople: function (params) { + return httpProxy.get(modelsService.getModelMetadata('person').url.all, params || {}, { + errorMessage: 'error.messages.my_people_dashboard.load_people', + }); + }, - loadOrganizations: function (params) { - return httpProxy - .get( - modelsService.getModelMetadata('organization').url.all, - _.extend( - { - sort: '-active_people_count', - include: '', - 'page[limit]': 100, - 'filters[user_created]': false, - }, - params, - ), - { - errorMessage: - 'error.messages.my_people_dashboard.load_orgs', - }, - ) - .then(httpProxy.extractModels); - }, - }; + loadOrganizations: function (params) { + return httpProxy + .get( + modelsService.getModelMetadata('organization').url.all, + _.extend( + { + sort: '-active_people_count', + include: '', + 'page[limit]': 100, + 'filters[user_created]': false, + }, + params, + ), + { + errorMessage: 'error.messages.my_people_dashboard.load_orgs', + }, + ) + .then(httpProxy.extractModels); + }, + }; - return myPeopleDashboardService; + return myPeopleDashboardService; } diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js index 4007670532..dc94792943 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js @@ -1,149 +1,131 @@ import 'angular-mocks'; // Constants -var myPeopleDashboardService, httpProxy, $rootScope, $q, JsonApiDataStore; +let myPeopleDashboardService, httpProxy, $rootScope, $q, JsonApiDataStore; function async(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('myPeopleDashboardService Tests', function () { - beforeEach(inject(function ( - _$q_, - _$rootScope_, - _myPeopleDashboardService_, - _httpProxy_, - _JsonApiDataStore_, - ) { - var _this = this; - - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - JsonApiDataStore = _JsonApiDataStore_; - myPeopleDashboardService = _myPeopleDashboardService_; - - this.person = { - personId: 123, - }; - - this.people = [ - { - personId: 123, - }, - { - personId: 234, - }, - ]; - - this.organizationReports = { - reportId: 123, - }; - - this.loadOrganizationParams = { - 'page[limit]': 100, - sort: '-active_people_count', - include: '', - 'filters[user_created]': false, - }; - - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); + beforeEach(inject(function (_$q_, _$rootScope_, _myPeopleDashboardService_, _httpProxy_, _JsonApiDataStore_) { + const _this = this; - spyOn(JsonApiDataStore.store, 'sync').and.returnValue( - _this.httpResponse, - ); - })); - describe('People Tests', function () { - it('should contain loadPeople', function () { - expect(myPeopleDashboardService.loadPeople).toBeDefined(); - }); + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + JsonApiDataStore = _JsonApiDataStore_; + myPeopleDashboardService = _myPeopleDashboardService_; - it('should call GET loadPeople URL', function () { - var params = { - 'page[limit]': 250, - include: - 'phone_numbers,email_addresses,reverse_contact_assignments.organization,' + - 'organizational_permissions', - 'filters[assigned_tos]': 'me', - }; - myPeopleDashboardService.loadPeople(params); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - params, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + this.person = { + personId: 123, + }; - it('should load people', async(function () { - this.httpResponse = this.people; - - var _this = this; - return myPeopleDashboardService - .loadPeople() - .then(function (loadedPeople) { - expect(loadedPeople).toEqual(_this.people); - }); - })); - - it('should sync people JsonApiDataStore', async(function () { - this.httpResponse = this.people; - - var _this = this; - JsonApiDataStore.store.sync('people', this.people); - return myPeopleDashboardService.loadPeople().then(function () { - expect(JsonApiDataStore.store.sync).toHaveBeenCalledWith( - 'people', - _this.people, - ); - }); - })); + this.people = [ + { + personId: 123, + }, + { + personId: 234, + }, + ]; + + this.organizationReports = { + reportId: 123, + }; + + this.loadOrganizationParams = { + 'page[limit]': 100, + sort: '-active_people_count', + include: '', + 'filters[user_created]': false, + }; + + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return $q.resolve(_this.httpResponse); }); - describe('Organization loading', function () { - it('should contain load Organization', function () { - expect(myPeopleDashboardService.loadOrganizations).toBeDefined(); - }); + spyOn(JsonApiDataStore.store, 'sync').and.returnValue(_this.httpResponse); + })); + describe('People Tests', function () { + it('should contain loadPeople', function () { + expect(myPeopleDashboardService.loadPeople).toBeDefined(); + }); - it('should call GET loadOrganization URL', function () { - myPeopleDashboardService.loadOrganizations( - this.loadOrganizationParams, - ); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - this.loadOrganizationParams, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + it('should call GET loadPeople URL', function () { + const params = { + 'page[limit]': 250, + include: + 'phone_numbers,email_addresses,reverse_contact_assignments.organization,' + 'organizational_permissions', + 'filters[assigned_tos]': 'me', + }; + myPeopleDashboardService.loadPeople(params); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + params, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); + + it('should load people', async(function () { + this.httpResponse = this.people; + + const _this = this; + return myPeopleDashboardService.loadPeople().then(function (loadedPeople) { + expect(loadedPeople).toEqual(_this.people); + }); + })); + + it('should sync people JsonApiDataStore', async(function () { + this.httpResponse = this.people; - it('should load Organization', async(function () { - this.httpResponse = { data: this.organizationReports }; + const _this = this; + JsonApiDataStore.store.sync('people', this.people); + return myPeopleDashboardService.loadPeople().then(function () { + expect(JsonApiDataStore.store.sync).toHaveBeenCalledWith('people', _this.people); + }); + })); + }); - var _this = this; + describe('Organization loading', function () { + it('should contain load Organization', function () { + expect(myPeopleDashboardService.loadOrganizations).toBeDefined(); + }); - return myPeopleDashboardService - .loadOrganizations(this.loadOrganizationParams) - .then(function (loadedOrganization) { - expect(loadedOrganization).toEqual( - _this.organizationReports, - ); - }); - })); + it('should call GET loadOrganization URL', function () { + myPeopleDashboardService.loadOrganizations(this.loadOrganizationParams); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + this.loadOrganizationParams, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); }); + + it('should load Organization', async(function () { + this.httpResponse = { data: this.organizationReports }; + + const _this = this; + + return myPeopleDashboardService + .loadOrganizations(this.loadOrganizationParams) + .then(function (loadedOrganization) { + expect(loadedOrganization).toEqual(_this.organizationReports); + }); + })); + }); }); diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagement.component.js b/app/assets/javascripts/angular/components/orgManagement/orgManagement.component.js index 9f1fe7f17e..b7c3155484 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagement.component.js +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagement.component.js @@ -2,11 +2,11 @@ import template from './orgManagement.html'; import './orgManagement.scss'; angular.module('campusContactsApp').component('orgManagement', { - controller: orgManagementController, - require: { - organizationOverview: '^', - }, - template: template, + controller: orgManagementController, + require: { + organizationOverview: '^', + }, + template, }); function orgManagementController() {} diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagement.html b/app/assets/javascripts/angular/components/orgManagement/orgManagement.html index 3706771983..6db590323a 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagement.html +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagement.html @@ -1,12 +1,7 @@
-

- {{ 'common:organizations.manage' | t }} -

+

{{ 'common:organizations.manage' | t }}

-
- -
+
+ +
diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.component.js b/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.component.js index 6715b41d2a..527ce568ff 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.component.js +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.component.js @@ -3,39 +3,39 @@ import helpIcon from '../../../../images/icons/icon-help.svg'; import template from './orgManagementEdit.html'; angular.module('campusContactsApp').component('orgManagementEdit', { - controller: orgManagementEditController, - bindings: { - org: '<', - new: '<', - editComplete: '&', - }, - template: template, + controller: orgManagementEditController, + bindings: { + org: '<', + new: '<', + editComplete: '&', + }, + template, }); function orgManagementEditController(organizationService) { - this.helpIcon = helpIcon; + this.helpIcon = helpIcon; - this.$onInit = () => { - if (this.new) { - this.orgEdit = { - show_sub_orgs: true, - }; - } else { - this.orgEdit = { ...this.org }; - } - }; + this.$onInit = () => { + if (this.new) { + this.orgEdit = { + show_sub_orgs: true, + }; + } else { + this.orgEdit = { ...this.org }; + } + }; - this.save = () => { - if (this.new) { - organizationService.createOrg(this.orgEdit, this.org).then(() => { - this.editComplete({ orgId: this.org.id, refresh: true }); - }); - } else { - organizationService.saveOrg(this.orgEdit).then(() => { - this.org = this.orgEdit; + this.save = () => { + if (this.new) { + organizationService.createOrg(this.orgEdit, this.org).then(() => { + this.editComplete({ orgId: this.org.id, refresh: true }); + }); + } else { + organizationService.saveOrg(this.orgEdit).then(() => { + this.org = this.orgEdit; - this.editComplete({ orgId: this.org.id }); - }); - } - }; + this.editComplete({ orgId: this.org.id }); + }); + } + }; } diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.html b/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.html index 6a27b2d9bf..958bc3a524 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.html +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagementEdit.html @@ -1,96 +1,78 @@
-

- {{ $ctrl.new ? ('common:organizations.new' | t) : - ('common:organizations.edit' | t) }} -

-
-
-
- - -
-
- -
-

- {{ 'common:organizations.type_help' | t }} -

-
- -
-
-
- + {{ $ctrl.new ? ('common:organizations.new' | t) : ('common:organizations.edit' | t) }} + +
+
+
+ + +
+
+ -
-
-

- {{ 'common:organizations.sub_help' | t }} -

+ + +
+

{{ 'common:organizations.type_help' | t }}

-
-
+
+
+ + +
+
+

{{ 'common:organizations.sub_help' | t }}

+
+
+ - -
-
+ class="f6 link ba b--pivot-dark-blue ihshort mb2 dib pivot-dark-blue bold br2 ttu tracked bg-transparent w-20" + > + {{ 'common:general.cancel' | t }} + + +
+
diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.component.js b/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.component.js index 472f20dcdd..117e7cc57e 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.component.js +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.component.js @@ -8,97 +8,83 @@ import warningIcon from '../../../../images/icons/icon-warning-2.svg'; import template from './orgManagementSubOrg.html'; angular.module('campusContactsApp').component('orgManagementSubOrg', { - controller: orgManagementSubOrgController, - bindings: { - org: '<', - isRoot: '<', - }, - template: template, + controller: orgManagementSubOrgController, + bindings: { + org: '<', + isRoot: '<', + }, + template, }); -function orgManagementSubOrgController( - organizationOverviewSuborgsService, - organizationService, - $uibModal, - $timeout, -) { - this.addIcon = addIcon; - this.editIcon = editIcon; - this.trashIcon = trashIcon; +function orgManagementSubOrgController(organizationOverviewSuborgsService, organizationService, $uibModal, $timeout) { + this.addIcon = addIcon; + this.editIcon = editIcon; + this.trashIcon = trashIcon; - this.orgExpanded = {}; - this.editExpanded = {}; - this.newExpanded = {}; + this.orgExpanded = {}; + this.editExpanded = {}; + this.newExpanded = {}; - this.$onInit = () => { - if (this.isRoot) { - this.subOrgs = [this.org]; - this.orgExpanded[this.org.id] = true; - } else { - organizationOverviewSuborgsService - .loadOrgSubOrgs(this.org) - .then((subOrgs) => { - this.subOrgs = subOrgs; - }); - } - }; + this.$onInit = () => { + if (this.isRoot) { + this.subOrgs = [this.org]; + this.orgExpanded[this.org.id] = true; + } else { + organizationOverviewSuborgsService.loadOrgSubOrgs(this.org).then((subOrgs) => { + this.subOrgs = subOrgs; + }); + } + }; - this.editSubOrg = ($event, orgId) => { - $event.stopPropagation(); - this.editExpanded[orgId] = !this.editExpanded[orgId]; - this.newExpanded[orgId] = false; - }; + this.editSubOrg = ($event, orgId) => { + $event.stopPropagation(); + this.editExpanded[orgId] = !this.editExpanded[orgId]; + this.newExpanded[orgId] = false; + }; - this.newSubOrg = ($event, orgId) => { - $event.stopPropagation(); - this.editExpanded[orgId] = false; - this.newExpanded[orgId] = !this.newExpanded[orgId]; - }; + this.newSubOrg = ($event, orgId) => { + $event.stopPropagation(); + this.editExpanded[orgId] = false; + this.newExpanded[orgId] = !this.newExpanded[orgId]; + }; - this.editComplete = (orgId, refresh) => { - this.editExpanded[orgId] = false; - this.newExpanded[orgId] = false; + this.editComplete = (orgId, refresh) => { + this.editExpanded[orgId] = false; + this.newExpanded[orgId] = false; - if (refresh) { - this.orgExpanded[orgId] = false; - $timeout(() => { - this.orgExpanded[orgId] = true; - }, 500); - } - }; + if (refresh) { + this.orgExpanded[orgId] = false; + $timeout(() => { + this.orgExpanded[orgId] = true; + }, 500); + } + }; - this.deleteSubOrg = ($event, org) => { - $event.stopPropagation(); + this.deleteSubOrg = ($event, org) => { + $event.stopPropagation(); - if (!org) { - return; - } + if (!org) { + return; + } - $uibModal - .open({ - component: 'iconModal', - resolve: { - icon: () => warningIcon, - title: () => - i18next.t( - 'ministries:organizations.deleteConfirmModal.title', - { - org_name: org.name, - }, - ), - paragraphs: () => [ - i18next.t( - 'ministries:organizations.deleteConfirmModal.description', - ), - ], - dismissLabel: () => i18next.t('cancel'), - closeLabel: () => i18next.t('general.delete'), - }, - }) - .result.then(() => { - organizationService.deleteOrg(org).then(() => { - this.subOrgs.splice(this.subOrgs.indexOf(org), 1); - }); - }); - }; + $uibModal + .open({ + component: 'iconModal', + resolve: { + icon: () => warningIcon, + title: () => + i18next.t('ministries:organizations.deleteConfirmModal.title', { + org_name: org.name, + }), + paragraphs: () => [i18next.t('ministries:organizations.deleteConfirmModal.description')], + dismissLabel: () => i18next.t('cancel'), + closeLabel: () => i18next.t('general.delete'), + }, + }) + .result.then(() => { + organizationService.deleteOrg(org).then(() => { + this.subOrgs.splice(this.subOrgs.indexOf(org), 1); + }); + }); + }; } diff --git a/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.html b/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.html index 5ab6346646..e654db3025 100644 --- a/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.html +++ b/app/assets/javascripts/angular/components/orgManagement/orgManagementSubOrg.html @@ -1,79 +1,46 @@
-

- {{subOrg.name}} - - - Edit - +

+ {{subOrg.name}} + + + Edit + - - Delete - + + Delete + - - Add - - -

- + + Add + + +

+ - + - +
-
-

- {{'common:organizations.none_found' | t}} -

+
+

{{'common:organizations.none_found' | t}}

diff --git a/app/assets/javascripts/angular/components/organization/organization.component.js b/app/assets/javascripts/angular/components/organization/organization.component.js index f7aa4ca54b..7d0418648d 100644 --- a/app/assets/javascripts/angular/components/organization/organization.component.js +++ b/app/assets/javascripts/angular/components/organization/organization.component.js @@ -2,104 +2,93 @@ import template from './organization.html'; import './organization.scss'; angular.module('campusContactsApp').component('organization', { - controller: organizationController, - bindings: { - options: ' - -
+ +
+ +
+

{{ $ctrl.org.name }}

+
+ +
+ - -
-

- {{ $ctrl.org.name }} -

-
- -
- - -
- - -
- - - - - - - - -
+ +
+ +
-
- - {{'dashboard.done' |t}} -
- - + + + + + + + +
+
+
+ + {{'dashboard.done' |t}} +
+ + diff --git a/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.component.js b/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.component.js index f842f59d31..1a3eb86832 100644 --- a/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.component.js +++ b/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.component.js @@ -2,52 +2,40 @@ import template from './organizationBreadcrumbs.html'; import './organizationBreadcrumbs.scss'; angular.module('campusContactsApp').component('organizationBreadcrumbs', { - controller: organizationBreadcrumbsController, - template: template, - bindings: { - orgId: '<', - }, + controller: organizationBreadcrumbsController, + template, + bindings: { + orgId: '<', + }, }); -function organizationBreadcrumbsController( - $transitions, - $uiRouter, - JsonApiDataStore, - organizationService, -) { - var vm = this; - vm.orgHierarchy = null; +function organizationBreadcrumbsController($transitions, $uiRouter, JsonApiDataStore, organizationService) { + const vm = this; + vm.orgHierarchy = null; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - if (vm.orgId) { - organizationService - .loadOrgsById( - [vm.orgId], - 'error.messages.organization.load_ancestry', - ) - .then(function () { - updateOrganization(vm.orgId); - }); - } else { - updateOrganization($uiRouter.globals.params.orgId); - subscribe(); - } + function activate() { + if (vm.orgId) { + organizationService.loadOrgsById([vm.orgId], 'error.messages.organization.load_ancestry').then(function () { + updateOrganization(vm.orgId); + }); + } else { + updateOrganization($uiRouter.globals.params.orgId); + subscribe(); } + } - function subscribe() { - $transitions.onSuccess({ to: 'app.ministries.**' }, function ( - transition, - ) { - updateOrganization(transition.params('to').orgId); - }); - } + function subscribe() { + $transitions.onSuccess({ to: 'app.ministries.**' }, function (transition) { + updateOrganization(transition.params('to').orgId); + }); + } - function updateOrganization(orgId) { - var org = JsonApiDataStore.store.find('organization', orgId); - organizationService.getOrgHierarchy(org).then(function (hierarchy) { - vm.orgHierarchy = hierarchy; - }); - } + function updateOrganization(orgId) { + const org = JsonApiDataStore.store.find('organization', orgId); + organizationService.getOrgHierarchy(org).then(function (hierarchy) { + vm.orgHierarchy = hierarchy; + }); + } } diff --git a/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.html b/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.html index 0c1197e794..c12e812f63 100644 --- a/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.html +++ b/app/assets/javascripts/angular/components/organizationBreadcrumbs/organizationBreadcrumbs.html @@ -1,14 +1,8 @@ - - {{'ministries.roots' | t}} - - > + {{'ministries.roots' | t}} + > - > - {{org.name}} + > + {{org.name}} diff --git a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js index 84a7c7082d..f46b30d410 100644 --- a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js +++ b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js @@ -6,92 +6,89 @@ import checkIcon from '../../../../images/icons/icon-check.svg'; import template from './organizationCleanup.html'; angular.module('campusContactsApp').component('organizationCleanup', { - bindings: { - orgId: '<', - }, - template: template, - controller: organizationCleanupController, + bindings: { + orgId: '<', + }, + template, + controller: organizationCleanupController, }); function organizationCleanupController(httpProxy, $scope, $uibModal, $state) { - this.archiveBeforeDate = new Date(); - this.archiveInactivityDate = new Date(); - this.checkIcon = checkIcon; + this.archiveBeforeDate = new Date(); + this.archiveInactivityDate = new Date(); + this.checkIcon = checkIcon; - const showConfirmModal = async (title) => { - const archiveValue = - title === 'ministries.cleanup.archive_by_inactivity_confirm_message' - ? 'leaders_last_sign_in_at' - : 'persons_inactive_since'; - const archiveDate = - title === 'ministries.cleanup.archive_by_inactivity_confirm_message' - ? this.archiveInactivityDate - : this.archiveBeforeDate; + const showConfirmModal = async (title) => { + const archiveValue = + title === 'ministries.cleanup.archive_by_inactivity_confirm_message' + ? 'leaders_last_sign_in_at' + : 'persons_inactive_since'; + const archiveDate = + title === 'ministries.cleanup.archive_by_inactivity_confirm_message' + ? this.archiveInactivityDate + : this.archiveBeforeDate; - const confirmModal = $uibModal.open({ - component: 'iconModal', - resolve: { - title: () => i18next.t(title), - closeLabel: () => i18next.t('general.ok'), - dismissLabel: () => i18next.t('general.cancel'), - }, - windowClass: 'pivot_theme', - backdrop: 'static', - }); + const confirmModal = $uibModal.open({ + component: 'iconModal', + resolve: { + title: () => i18next.t(title), + closeLabel: () => i18next.t('general.ok'), + dismissLabel: () => i18next.t('general.cancel'), + }, + windowClass: 'pivot_theme', + backdrop: 'static', + }); - try { - const modalResponse = await confirmModal.result; - archiveContacts(archiveValue)(archiveDate); - } catch (err) {} - }; + try { + const modalResponse = await confirmModal.result; + archiveContacts(archiveValue)(archiveDate); + } catch (err) {} + }; - const archiveContacts = (archiveBy) => async (dateBy) => { - if (!dateBy) return; - const params = { - type: 'bulk_archive_contacts', - id: this.orgId, - attributes: { - organization_id: this.orgId, - before_date: dateBy, - archive_by: archiveBy, - archived: true, - }, - }; + const archiveContacts = (archiveBy) => async (dateBy) => { + if (!dateBy) return; + const params = { + type: 'bulk_archive_contacts', + id: this.orgId, + attributes: { + organization_id: this.orgId, + before_date: dateBy, + archive_by: archiveBy, + archived: true, + }, + }; - const { data } = await httpProxy.post( - '/organizations/archives', - { - data: params, - }, - { - errorMessage: 'error.messages.organization.cleanup', - }, - ); + const { data } = await httpProxy.post( + '/organizations/archives', + { + data: params, + }, + { + errorMessage: 'error.messages.organization.cleanup', + }, + ); - if (data) { - const modalInstance = $uibModal.open({ - component: 'iconModal', - resolve: { - title: () => i18next.t('ministries.cleanup.success_title'), - paragraphs: () => [ - i18next.t('ministries.cleanup.success_message'), - ], - icon: () => this.checkIcon, - closeLabel: () => - i18next.t('ministries.cleanup.success_cta'), - }, - windowClass: 'pivot_theme', - backdrop: 'static', - keyboard: false, - }); + if (data) { + const modalInstance = $uibModal.open({ + component: 'iconModal', + resolve: { + title: () => i18next.t('ministries.cleanup.success_title'), + paragraphs: () => [i18next.t('ministries.cleanup.success_message')], + icon: () => this.checkIcon, + closeLabel: () => i18next.t('ministries.cleanup.success_cta'), + }, + windowClass: 'pivot_theme', + backdrop: 'static', + keyboard: false, + }); - const result = await modalInstance.result; - $state.go('app.ministries.ministry.people', { - orgId: this.orgId, - }); - } + const result = await modalInstance.result; + $state.go('app.ministries.ministry.people', { + orgId: this.orgId, + }); + } - $scope.$apply(); - }; - this.showConfirmModal = showConfirmModal; + $scope.$apply(); + }; + this.showConfirmModal = showConfirmModal; } diff --git a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.html b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.html index 0fb9093d53..d9d2193a29 100644 --- a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.html +++ b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.html @@ -1,84 +1,61 @@
-

- {{ 'ministries.cleanup.title' | t }} -

-

- {{ 'ministries.cleanup.description.part1' | t }} -

-

- {{ 'ministries.cleanup.description.part2' | t }} -

+

{{ 'ministries.cleanup.title' | t }}

+

{{ 'ministries.cleanup.description.part1' | t }}

+

{{ 'ministries.cleanup.description.part2' | t }}

-
-
-

- {{ 'ministries.cleanup.archive_alumni' | t }} -

-

- {{ 'ministries.cleanup.archive_alumni_description' | t }} -

- {{ 'ministries.cleanup.open_contacts' | t }} -
-
+
+

{{ 'ministries.cleanup.archive_alumni' | t }}

+

{{ 'ministries.cleanup.archive_alumni_description' | t }}

+ {{ 'ministries.cleanup.open_contacts' | t }} +
+
+

+ {{ 'ministries.cleanup.archive_by_date' | t }} + +

+
+

{{ 'ministries.cleanup.archive_by_date_description' | t }}

+ + + -
-
-
+ +
+
+

+ {{ 'ministries.cleanup.archive_by_inactivity' | t }} + +

+
+

{{ 'ministries.cleanup.archive_by_inactivity_description' | t }}

+ + + -
-
+ {{ 'ministries.cleanup.archive_by_inactivity' | t }} + +
+
diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.component.js index ea3a352c6a..c132e58a8d 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.component.js @@ -3,46 +3,44 @@ import './organizationContactImport.scss'; import '../surveyOverview/surveyOverview.scss'; angular.module('campusContactsApp').component('organizationContactImport', { - require: { - organizationOverview: '^', - }, - bindings: { - surveyId: '<', - }, - template: template, - controller: organizationContactImportController, + require: { + organizationOverview: '^', + }, + bindings: { + surveyId: '<', + }, + template, + controller: organizationContactImportController, }); function organizationContactImportController() { - this.columnMap = {}; - this.activeStep = 1; + this.columnMap = {}; + this.activeStep = 1; - this.$onInit = () => { - this.org = this.organizationOverview.org; - this.surveys = this.organizationOverview.surveys; - this.selectedSurvey = this.surveys.find( - (survey) => survey.id === this.surveyId, - ); - }; + this.$onInit = () => { + this.org = this.organizationOverview.org; + this.surveys = this.organizationOverview.surveys; + this.selectedSurvey = this.surveys.find((survey) => survey.id === this.surveyId); + }; - this.next = (selectedSurvey, fileName, csvData, columnMap) => { - if (selectedSurvey) { - this.selectedSurvey = selectedSurvey; - } - if (csvData) { - this.csvData = csvData; - } - if (fileName) { - this.fileName = fileName; - } - if (columnMap) { - this.columnMap = columnMap; - } + this.next = (selectedSurvey, fileName, csvData, columnMap) => { + if (selectedSurvey) { + this.selectedSurvey = selectedSurvey; + } + if (csvData) { + this.csvData = csvData; + } + if (fileName) { + this.fileName = fileName; + } + if (columnMap) { + this.columnMap = columnMap; + } - this.activeStep++; - }; + this.activeStep++; + }; - this.previous = () => { - this.activeStep--; - }; + this.previous = () => { + this.activeStep--; + }; } diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.html b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.html index f1d615ecfe..b9ab2a0648 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.html +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImport.html @@ -1,49 +1,49 @@
-
-
-
-

Import Contacts

-
-
- {{ step }} -
-
-
-
+
+
+
+

Import Contacts

+
+
+ {{ step }} +
+
+
+
- - - - -
+ + + + +
diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js index 3b733bfed8..2e67122d2a 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js @@ -6,86 +6,84 @@ import errorIcon from '../../../../images/icons/icon-error.svg'; import template from './organizationContactImportStep1.html'; -angular - .module('campusContactsApp') - .component('organizationContactImportStep1', { - bindings: { - org: '<', - surveys: '<', - next: '&', - selectedSurvey: '<', - fileName: '<', - csvData: '<', - }, - template: template, - controller: organizationContactImportStep1Controller, - }); +angular.module('campusContactsApp').component('organizationContactImportStep1', { + bindings: { + org: '<', + surveys: '<', + next: '&', + selectedSurvey: '<', + fileName: '<', + csvData: '<', + }, + template, + controller: organizationContactImportStep1Controller, +}); function organizationContactImportStep1Controller($scope, $uibModal, $state) { - this.fileIcon = fileIcon; - this.warningIcon = warningIcon; - this.errorIcon = errorIcon; - this.isInteger = Number.isInteger; + this.fileIcon = fileIcon; + this.warningIcon = warningIcon; + this.errorIcon = errorIcon; + this.isInteger = Number.isInteger; - this.selectFile = () => { - // eslint-disable-next-line angular/document-service - const input = document.createElement('input'); - input.setAttribute('type', 'file'); - input.setAttribute('accept', '.csv'); - input.click(); + this.selectFile = () => { + // eslint-disable-next-line angular/document-service + const input = document.createElement('input'); + input.setAttribute('type', 'file'); + input.setAttribute('accept', '.csv'); + input.click(); - input.addEventListener( - 'change', - () => { - $scope.$apply(() => { - this.fileTypeError = false; - delete this.csvData; - delete this.parseErrors; - const file = input.files[0]; - const fileExtension = file.name.split('.').pop(); - this.fileName = file.name; + input.addEventListener( + 'change', + () => { + $scope.$apply(() => { + this.fileTypeError = false; + delete this.csvData; + delete this.parseErrors; + const file = input.files[0]; + const fileExtension = file.name.split('.').pop(); + this.fileName = file.name; - if (fileExtension === 'csv') { - this.parseCsv(file); - } else { - this.fileTypeError = true; - delete this.csvData; - delete this.fileName; - } - }); - }, - false, - ); - }; + if (fileExtension === 'csv') { + this.parseCsv(file); + } else { + this.fileTypeError = true; + delete this.csvData; + delete this.fileName; + } + }); + }, + false, + ); + }; - this.parseCsv = (file) => { - Papa.parse(file, { - skipEmptyLines: 'greedy', - complete: (results) => { - $scope.$apply(() => { - if (results.errors.length) { - this.parseErrors = results.errors; - } - this.csvData = results.data; - }); - }, + this.parseCsv = (file) => { + Papa.parse(file, { + skipEmptyLines: 'greedy', + complete: (results) => { + $scope.$apply(() => { + if (results.errors.length) { + this.parseErrors = results.errors; + } + this.csvData = results.data; }); - }; + }, + }); + }; - this.createSurvey = () => { - const modal = $uibModal - .open({ - component: 'createSurvey', - resolve: { - organizationId: () => this.org.id, - }, - windowClass: 'pivot_theme', - size: 'sm', - }) - .result.then((newSurvey) => { - $state.go('app.ministries.ministry.survey.manage', { - surveyId: newSurvey.id, - }); - }); - }; + this.createSurvey = () => { + const modal = $uibModal + .open({ + component: 'createSurvey', + resolve: { + organizationId: () => this.org.id, + }, + windowClass: 'pivot_theme', + size: 'sm', + }) + .result.then((newSurvey) => { + $state.go('app.ministries.ministry.survey.manage', { + surveyId: newSurvey.id, + }); + }); + }; } diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.html b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.html index b187cca4c2..013fb8d3e6 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.html +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.html @@ -1,143 +1,93 @@
-

{{ 'contact_import:step_1.title' | t }}

-

- {{ 'contact_import:step_1.instructions' | t }} - - {{ 'contact_import:step_1.create_survey' | t }} +

{{ 'contact_import:step_1.title' | t }}

+

+ {{ 'contact_import:step_1.instructions' | t }} + {{ 'contact_import:step_1.create_survey' | t }} + {{ 'contact_import:step_1.instructions_b' | t }} +

+
+
+ +
+ + {{ $ctrl.selectedSurvey ? $ctrl.selectedSurvey.title : 'Select' }} - {{ 'contact_import:step_1.instructions_b' | t }} -

-
-
- -
- - {{ $ctrl.selectedSurvey ? $ctrl.selectedSurvey.title : - 'Select' }} - - -
-
-
-

- {{ 'contact_import:step_1.upload' | t }} -

-
-
+
+
+

{{ 'contact_import:step_1.upload' | t }}

+
+ + ng-click="$ctrl.selectFile()" + > + {{ 'contact_import:step_1.select' | t }} + - - - {{ $ctrl.fileName }} - {{ 'contact_import:step_1.rowCount' | - t: { count: $ctrl.csvData.length - 1 } }} - + + + {{ $ctrl.fileName }} - {{ 'contact_import:step_1.rowCount' | t: { count: $ctrl.csvData.length - 1 } }} + - - - {{ 'contact_import:step_1.fileTypeError' | t }} - + + + {{ 'contact_import:step_1.fileTypeError' | t }} + - - - {{ 'contact_import:step_1.parseErrors.summary' | t }} - -
-
-
- - - {{ 'contact_import:step_1.parseErrors.message' | t }} - {{ 'contact_import:step_1.parseErrors.note' | t - }} - -
- - - - - - - - - - - -
- {{ 'contact_import:step_1.parseErrors.row' | t }} - - {{ 'contact_import:step_1.parseErrors.characterPos' - | t }} - - {{ 'contact_import:step_1.parseErrors.error' | t }} -
- {{ $ctrl.isInteger(error.row) ? error.row + 1 : '' - }} - {{ error.index }}{{ error.message }}
-
+ + + {{ 'contact_import:step_1.parseErrors.summary' | t }} + +
+
+
+ + + {{ 'contact_import:step_1.parseErrors.message' | t }} + {{ 'contact_import:step_1.parseErrors.note' | t }} +
-
+ + + + + + + + + + + +
{{ 'contact_import:step_1.parseErrors.row' | t }}{{ 'contact_import:step_1.parseErrors.characterPos' | t }}{{ 'contact_import:step_1.parseErrors.error' | t }}
{{ $ctrl.isInteger(error.row) ? error.row + 1 : '' }}{{ error.index }}{{ error.message }}
+
+
+
- + > + {{ 'continue' | t }} +
diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js index 37f6e90b4c..6bfbc61725 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js @@ -3,57 +3,48 @@ import _ from 'lodash'; import template from './organizationContactImportStep2.html'; -angular - .module('campusContactsApp') - .component('organizationContactImportStep2', { - bindings: { - next: '&', - previous: '&', - csvData: '<', - selectedSurvey: '<', - columnMap: '<', - }, - template: template, - controller: organizationContactImportStep2Controller, - }); +angular.module('campusContactsApp').component('organizationContactImportStep2', { + bindings: { + next: '&', + previous: '&', + csvData: '<', + selectedSurvey: '<', + columnMap: '<', + }, + template, + controller: organizationContactImportStep2Controller, +}); function organizationContactImportStep2Controller($scope, surveyService) { - this.currentPreviewRow = 1; - - this.$onInit = () => { - //get survey questions - surveyService - .getSurveyQuestions(this.selectedSurvey.id) - .then((questions) => { - this.surveyQuestions = questions.data; - }); - }; - - this.doNotImportColumn = (index) => { - if (this.columnMap[index]) { - delete this.columnMap[index]; - } - }; - - this.questionInUse = (questionId) => { - return _.includes(_.map(this.columnMap, 'id'), questionId); - }; - - this.canContinue = () => { - return Object.keys(this.columnMap).length > 0; - }; - - this.nextPreviewRow = () => { - this.currentPreviewRow = - this.currentPreviewRow + 1 < this.csvData.length - ? this.currentPreviewRow + 1 - : this.currentPreviewRow; - }; - - this.previousPreviewRow = () => { - this.currentPreviewRow = - this.currentPreviewRow - 1 > 0 - ? this.currentPreviewRow - 1 - : this.currentPreviewRow; - }; + this.currentPreviewRow = 1; + + this.$onInit = () => { + // get survey questions + surveyService.getSurveyQuestions(this.selectedSurvey.id).then((questions) => { + this.surveyQuestions = questions.data; + }); + }; + + this.doNotImportColumn = (index) => { + if (this.columnMap[index]) { + delete this.columnMap[index]; + } + }; + + this.questionInUse = (questionId) => { + return _.includes(_.map(this.columnMap, 'id'), questionId); + }; + + this.canContinue = () => { + return Object.keys(this.columnMap).length > 0; + }; + + this.nextPreviewRow = () => { + this.currentPreviewRow = + this.currentPreviewRow + 1 < this.csvData.length ? this.currentPreviewRow + 1 : this.currentPreviewRow; + }; + + this.previousPreviewRow = () => { + this.currentPreviewRow = this.currentPreviewRow - 1 > 0 ? this.currentPreviewRow - 1 : this.currentPreviewRow; + }; } diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.html b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.html index c9d44425dc..eab9749040 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.html +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.html @@ -1,110 +1,80 @@
-

{{ 'contact_import:step_2.title' | t }}

-

- {{ 'contact_import:step_2.instructions' | t }} -

-
- - - - - - - - - - {{ 'contact_import:step_2.title' | t }} +

{{ 'contact_import:step_2.instructions' | t }}

+
+
- {{ 'contact_import:step_2.csv_column' | t }} - - - - - {{ 'contact_import:step_2.preview' | t : { current: - $ctrl.currentPreviewRow, max: $ctrl.csvData.length - 1 } - }} - - - - - {{ 'contact_import:step_2.question_column' | t }} -
+ + + + + + + + + + + + - - - - -
{{ 'contact_import:step_2.csv_column' | t }} + + + + {{ 'contact_import:step_2.preview' | t : { current: $ctrl.currentPreviewRow, max: $ctrl.csvData.length - 1 } + }} + + + + {{ 'contact_import:step_2.question_column' | t }}
{{ $ctrl.csvData[0][index] }}{{ $ctrl.csvData[$ctrl.currentPreviewRow][index] }} +
+ + {{ $ctrl.columnMap[index] ? $ctrl.columnMap[index].column_title || $ctrl.columnMap[index].label : + ('contact_import:step_2.do_not_import' | t) }} + +
- {{ $ctrl.csvData[0][index] }} - - {{ $ctrl.csvData[$ctrl.currentPreviewRow][index] }} - -
- - {{ $ctrl.columnMap[index] ? - $ctrl.columnMap[index].column_title || - $ctrl.columnMap[index].label : - ('contact_import:step_2.do_not_import' | t) }} - - -
-
-
+ + {{ question.column_title || question.label }} + + +
  • + {{ 'contact_import:step_2.loadingQuestions' | t }} +
    • + +
    + + + + +
    - - + + > + {{ 'continue' | t }} +
    diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js index fd374a916a..5dac244249 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js @@ -4,153 +4,141 @@ import uuidv1 from 'uuid'; import template from './organizationContactImportStep3.html'; -angular - .module('campusContactsApp') - .component('organizationContactImportStep3', { - bindings: { - org: '<', - next: '&', - previous: '&', - csvData: '<', - selectedSurvey: '<', - columnMap: '<', - }, - template: template, - controller: organizationContactImportStep3Controller, +angular.module('campusContactsApp').component('organizationContactImportStep3', { + bindings: { + org: '<', + next: '&', + previous: '&', + csvData: '<', + selectedSurvey: '<', + columnMap: '<', + }, + template, + controller: organizationContactImportStep3Controller, +}); + +function organizationContactImportStep3Controller($scope, surveyService, labelsService) { + this.contactLabels = {}; + this.disableButtons = true; + + this.$onInit = () => { + this.csvData.shift(); // remove header row + + this.disableButtons = false; + }; + + this.addLabel = (labelName) => { + const label = labelsService.getLabelTemplate(this.selectedSurvey.organization_id); + label.name = labelName; + + labelsService.saveLabel(label).then((newLabel) => { + this.contactLabels[newLabel.id] = true; + this.newLabelName = ''; }); + }; + + this.getLabels = () => { + return _.keys( + _.pickBy(this.contactLabels, (value) => { + return value; + }), + ); + }; + + this.import = () => { + const postData = { + included: [], + data: { + type: 'bulk_create_job', + attributes: { + bulk_data: [], + }, + }, + }; -function organizationContactImportStep3Controller( - $scope, - surveyService, - labelsService, -) { - this.contactLabels = {}; - this.disableButtons = true; + _.forEach(this.csvData, (record) => { + const answerIds = []; + const labelIds = []; + + // map answers + _.forEach(this.columnMap, (question, questionIndex) => { + const answerId = uuidv1(); + + postData.included.push({ + type: 'answer', + id: answerId, + attributes: { + question_id: Number(question.id), + value: record[questionIndex], + }, + }); - this.$onInit = () => { - this.csvData.shift(); //remove header row + answerIds.push(answerId); + }); - this.disableButtons = false; - }; - - this.addLabel = (labelName) => { - let label = labelsService.getLabelTemplate( - this.selectedSurvey.organization_id, - ); - label.name = labelName; + // map organization labels + _.forEach(this.getLabels(), (labelId) => { + const labelUUID = uuidv1(); - labelsService.saveLabel(label).then((newLabel) => { - this.contactLabels[newLabel.id] = true; - this.newLabelName = ''; + postData.included.push({ + type: 'organizational_label', + id: labelUUID, + attributes: { + label_id: Number(labelId), + organization_id: this.selectedSurvey.organization_id, + }, }); - }; - this.getLabels = () => { - return _.keys( - _.pickBy(this.contactLabels, (value) => { - return value; - }), - ); - }; + labelIds.push(labelUUID); + }); - this.import = () => { - let postData = { - included: [], + // map answer sheets + const answerSheet = { + type: 'answer_sheet', + relationships: { + survey: { data: { - type: 'bulk_create_job', - attributes: { - bulk_data: [], - }, + type: 'survey', + id: this.selectedSurvey.id, }, - }; - - _.forEach(this.csvData, (record) => { - let answerIds = [], - labelIds = []; - - //map answers - _.forEach(this.columnMap, (question, questionIndex) => { - const answerId = uuidv1(); - - postData.included.push({ - type: 'answer', - id: answerId, - attributes: { - question_id: Number(question.id), - value: record[questionIndex], - }, - }); - - answerIds.push(answerId); - }); - - //map organization labels - _.forEach(this.getLabels(), (labelId) => { - const labelUUID = uuidv1(); - - postData.included.push({ - type: 'organizational_label', - id: labelUUID, - attributes: { - label_id: Number(labelId), - organization_id: this.selectedSurvey.organization_id, - }, - }); - - labelIds.push(labelUUID); - }); - - //map answer sheets - let answerSheet = { - type: 'answer_sheet', - relationships: { - survey: { - data: { - type: 'survey', - id: this.selectedSurvey.id, - }, - }, - answers: { - data: [], - }, - organizational_labels: { - data: [], - }, - }, - }; - - _.forEach(answerIds, (answerId) => { - answerSheet.relationships.answers.data.push({ - type: 'answer', - id: answerId, - }); - }); - - _.forEach(labelIds, (labelId) => { - answerSheet.relationships.organizational_labels.data.push({ - type: 'organizational_label', - id: labelId, - }); - }); - - postData.data.attributes.bulk_data.push(answerSheet); + }, + answers: { + data: [], + }, + organizational_labels: { + data: [], + }, + }, + }; + + _.forEach(answerIds, (answerId) => { + answerSheet.relationships.answers.data.push({ + type: 'answer', + id: answerId, }); + }); - this.disableButtons = true; - this.importErrors = []; - surveyService.importContacts(postData).then( - () => { - this.next(); - }, - (response) => { - const { - data: { - errors: [{ detail: { bulk_data } = [] } = {}] = [], - } = {}, - } = response; - this.importErrors = bulk_data; - this.disableButtons = false; - }, - ); - }; + _.forEach(labelIds, (labelId) => { + answerSheet.relationships.organizational_labels.data.push({ + type: 'organizational_label', + id: labelId, + }); + }); + + postData.data.attributes.bulk_data.push(answerSheet); + }); + + this.disableButtons = true; + this.importErrors = []; + surveyService.importContacts(postData).then( + () => { + this.next(); + }, + (response) => { + const { data: { errors: [{ detail: { bulk_data } = [] } = {}] = [] } = {} } = response; + this.importErrors = bulk_data; + this.disableButtons = false; + }, + ); + }; } diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.html b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.html index 41443f738a..dd227c70d3 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.html +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.html @@ -1,76 +1,59 @@
    -
    -
    {{ error }}
    -
    +
    +
    {{ error }}
    +
    -

    {{ 'contact_import:step_3.title' | t }}

    -

    - - {{ 'contact_import:step_3.instructions' | t: { count: +

    {{ 'contact_import:step_3.title' | t }}

    +

    + + {{ 'contact_import:step_3.instructions' | t: { count: ($ctrl.csvData.length | number) } }} -

    -
    - - {{ 'contact_import:step_3.labels' | t }} - -
    -
    - - -
    -
    -
    - - - -
    -
    +

    +
    + {{ 'contact_import:step_3.labels' | t }} +
    +
    + + +
    +
    +
    + + + +
    +
    - - + ng-click="$ctrl.import()" + > + {{ 'continue' | t }} +
    diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.component.js index 31836f638f..ea6495eb15 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.component.js @@ -2,16 +2,14 @@ import checkIcon from '../../../../images/icons/icon-check.svg'; import template from './organizationContactImportStep4.html'; -angular - .module('campusContactsApp') - .component('organizationContactImportStep4', { - bindings: { - org: '<', - }, - template: template, - controller: organizationContactImportStep4Controller, - }); +angular.module('campusContactsApp').component('organizationContactImportStep4', { + bindings: { + org: '<', + }, + template, + controller: organizationContactImportStep4Controller, +}); function organizationContactImportStep4Controller() { - this.checkIcon = checkIcon; + this.checkIcon = checkIcon; } diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.html b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.html index 5e958d05e2..f570b7f4cd 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.html +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep4.html @@ -1,25 +1,17 @@
    -
    - -

    - {{ 'contact_import:step_4.title' | t }} -

    -
    -
    -

    - {{ 'contact_import:step_4.instructions' | t }} -

    -

    - - {{ 'contact_import:step_4.home' | t }} - -

    -
    +
    + +

    {{ 'contact_import:step_4.title' | t }}

    +
    +
    +

    {{ 'contact_import:step_4.instructions' | t }}

    +

    + + {{ 'contact_import:step_4.home' | t }} + +

    +
    diff --git a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.component.js b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.component.js index 3345c306e1..6d77f3b7c3 100644 --- a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.component.js +++ b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.component.js @@ -3,101 +3,92 @@ import './organizationOverview.scss'; import template from './organizationOverview.html'; angular.module('campusContactsApp').component('organizationOverview', { - controller: organizationOverviewController, - bindings: { - org: '<', - loadDetails: ' { - this.orgNavOpen = !this.orgNavOpen; - }; - - this.isTabVisible = (tabName) => { - return ( - tabName !== 'labels' && - !(tabName === 'surveys' && !this.directAdminPrivileges) - ); - }; - - this.showOrgNav = () => - !$state.$current.name.match( - /^app\.ministries\.ministry\.(survey\.|import|management|reportMovementIndicators|cleanup|signatures)/, - ); - - this.$onInit = asyncBindingsService.lazyLoadedActivate(activate, ['org']); - - function activate() { - _.defaults(this, { - loadDetails: true, - }); - - this.adminPrivileges = loggedInPerson.isAdminAt(this.org); - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.org); - - const rootOrgId = organizationService.getOrgHierarchyIds(this.org)[0]; - - this.p2cOrg = this.org.id === p2cOrgId || rootOrgId === p2cOrgId; - - if (!this.loadDetails) { - // Abort before loading org details - return; - } - - // Make groups and surveys mirror that property on the organization - $scope.$watch('$ctrl.org.groups', () => { - this.groups = this.org.groups; - }); - $scope.$watch('$ctrl.org.surveys', () => { - this.surveys = this.org.surveys; - }); - - // Find all of the groups and surveys related to the org - organizationOverviewService.loadOrgRelations(this.org); - - // The suborgs, people, and team are loaded by their respective tab components, not this component. - // However, this component does need to know how many people and team members there are, so set the - // people and team to a sparse array of the appropriate length. - organizationOverviewService - .getSubOrgCount(this.org) - .then((subOrgCount) => { - this.suborgs = new Array(subOrgCount); - }); - organizationOverviewService - .getPersonCount(this.org) - .then((personCount) => { - this.people = new Array(personCount); - }); - organizationOverviewService - .getTeamCount(this.org) - .then((teamMemberCount) => { - this.team = new Array(teamMemberCount); - }); + this.tabNames = ministryViewTabs; + this.adminPrivileges = true; + this.p2cOrg = false; + this.toggleVisibility = userPreferencesService.toggleOrganizationVisibility; + this.surveyResponses = 'countHidden'; + this.envService = envService; + this.$state = $state; + + this.orgNavOpen = false; + + this.toggleNav = () => { + this.orgNavOpen = !this.orgNavOpen; + }; + + this.isTabVisible = (tabName) => { + return tabName !== 'labels' && !(tabName === 'surveys' && !this.directAdminPrivileges); + }; + + this.showOrgNav = () => + !$state.$current.name.match( + /^app\.ministries\.ministry\.(survey\.|import|management|reportMovementIndicators|cleanup|signatures)/, + ); + + this.$onInit = asyncBindingsService.lazyLoadedActivate(activate, ['org']); + + function activate() { + _.defaults(this, { + loadDetails: true, + }); + + this.adminPrivileges = loggedInPerson.isAdminAt(this.org); + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.org); + + const rootOrgId = organizationService.getOrgHierarchyIds(this.org)[0]; + + this.p2cOrg = this.org.id === p2cOrgId || rootOrgId === p2cOrgId; + + if (!this.loadDetails) { + // Abort before loading org details + return; } + + // Make groups and surveys mirror that property on the organization + $scope.$watch('$ctrl.org.groups', () => { + this.groups = this.org.groups; + }); + $scope.$watch('$ctrl.org.surveys', () => { + this.surveys = this.org.surveys; + }); + + // Find all of the groups and surveys related to the org + organizationOverviewService.loadOrgRelations(this.org); + + // The suborgs, people, and team are loaded by their respective tab components, not this component. + // However, this component does need to know how many people and team members there are, so set the + // people and team to a sparse array of the appropriate length. + organizationOverviewService.getSubOrgCount(this.org).then((subOrgCount) => { + this.suborgs = new Array(subOrgCount); + }); + organizationOverviewService.getPersonCount(this.org).then((personCount) => { + this.people = new Array(personCount); + }); + organizationOverviewService.getTeamCount(this.org).then((teamMemberCount) => { + this.team = new Array(teamMemberCount); + }); + } } diff --git a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.html b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.html index 5eedc074fc..760133525e 100644 --- a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.html +++ b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.html @@ -1,157 +1,135 @@ +
    +
    +
    + {{ $ctrl.org.name }} +
    + + +
    + + + + + +
    +
    -
    -
    - {{ $ctrl.org.name }} -
    - - -
    - - - - - - -
    -
    -
    -
    + + {{ 'ministries.' + tabName + '.header' | t }} + ({{ $ctrl[tabName].length }}) + + +
    +
    + {{ 'ministries.tools.header' | t }} + +
    +
    -
    - {{ 'ministries.tools.header' | t }} - -
    - -
    -
    -
    -
    - + ui-state="'^.ministry.reportMovementIndicators'" + ui-state-params="{ orgId: $ctrl.org.id }" + > + {{ 'nav.report_movement_indicators' | t }} + + +
  • + {{ 'signatures.title' | t }} +
    • +
    +
    - -
    - +
    +
    +
    + +
    + +
    diff --git a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.js b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.js index 38f6d42661..8f08584231 100644 --- a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.js +++ b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.js @@ -1,63 +1,55 @@ -angular - .module('campusContactsApp') - .factory('organizationOverviewService', organizationOverviewService); +angular.module('campusContactsApp').factory('organizationOverviewService', organizationOverviewService); function organizationOverviewService( - $q, - httpProxy, - modelsService, - peopleScreenService, - organizationOverviewTeamService, - organizationOverviewSuborgsService, - _, + $q, + httpProxy, + modelsService, + peopleScreenService, + organizationOverviewTeamService, + organizationOverviewSuborgsService, + _, ) { - return { - // Load an organization's relationships (groups and surveys) - loadOrgRelations: function (org) { - // Determine which relations are not yet loaded - var include = ['groups', 'surveys'].filter(function (relation) { - // Include this relation only if contains placeholder relations that need to be fully loaded - return ( - _.findIndex(org[relation], { _placeHolder: true }) !== -1 - ); - }); + return { + // Load an organization's relationships (groups and surveys) + loadOrgRelations: function (org) { + // Determine which relations are not yet loaded + const include = ['groups', 'surveys'].filter(function (relation) { + // Include this relation only if contains placeholder relations that need to be fully loaded + return _.findIndex(org[relation], { _placeHolder: true }) !== -1; + }); - if (_.includes(include, 'surveys')) { - include.push('surveys.keyword'); - } + if (_.includes(include, 'surveys')) { + include.push('surveys.keyword'); + } - // Load the missing relations, if any - if (include.length === 0) { - return $q.resolve(); - } - return httpProxy.get( - modelsService.getModelUrl(org), - { - include: include.join(','), - 'fields[group]': - 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', - }, - { - errorMessage: - 'error.messages.organization_overview.load_org_relationships', - }, - ); + // Load the missing relations, if any + if (include.length === 0) { + return $q.resolve(); + } + return httpProxy.get( + modelsService.getModelUrl(org), + { + include: include.join(','), + 'fields[group]': 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', }, - - getSubOrgCount: function (org) { - return organizationOverviewSuborgsService.loadOrgSubOrgCount( - org.id, - ); + { + errorMessage: 'error.messages.organization_overview.load_org_relationships', }, + ); + }, - // Return a promise that resolves to the number of people in an organization - getPersonCount: function (org) { - return peopleScreenService.loadOrgPeopleCount(org.id); - }, + getSubOrgCount: function (org) { + return organizationOverviewSuborgsService.loadOrgSubOrgCount(org.id); + }, - // Return a promise that resolves to the number of team members in an organization - getTeamCount: function (org) { - return organizationOverviewTeamService.loadOrgTeamCount(org.id); - }, - }; + // Return a promise that resolves to the number of people in an organization + getPersonCount: function (org) { + return peopleScreenService.loadOrgPeopleCount(org.id); + }, + + // Return a promise that resolves to the number of team members in an organization + getTeamCount: function (org) { + return organizationOverviewTeamService.loadOrgTeamCount(org.id); + }, + }; } diff --git a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.spec.js b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.spec.js index c65a1f5c0e..263c35d858 100644 --- a/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.spec.js +++ b/app/assets/javascripts/angular/components/organizationOverview/organizationOverview.service.spec.js @@ -1,155 +1,138 @@ -var organizationOverviewService, httpProxy, $rootScope, $q; -var peopleScreenService, organizationOverviewTeamService; // eslint-disable-line one-var +let organizationOverviewService, httpProxy, $rootScope, $q; +let peopleScreenService, organizationOverviewTeamService; // eslint-disable-line one-var function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('organizationOverviewService', function () { - beforeEach(inject(function ( - _organizationOverviewService_, - _httpProxy_, - _$rootScope_, - _$q_, - _peopleScreenService_, - _organizationOverviewTeamService_, - ) { - organizationOverviewService = _organizationOverviewService_; - httpProxy = _httpProxy_; - $rootScope = _$rootScope_; - $q = _$q_; - peopleScreenService = _peopleScreenService_; - organizationOverviewTeamService = _organizationOverviewTeamService_; + beforeEach(inject(function ( + _organizationOverviewService_, + _httpProxy_, + _$rootScope_, + _$q_, + _peopleScreenService_, + _organizationOverviewTeamService_, + ) { + organizationOverviewService = _organizationOverviewService_; + httpProxy = _httpProxy_; + $rootScope = _$rootScope_; + $q = _$q_; + peopleScreenService = _peopleScreenService_; + organizationOverviewTeamService = _organizationOverviewTeamService_; - this.id = 123; - this.placeholderRelation = { _placeHolder: true }; - this.loadedRelation = {}; + this.id = 123; + this.placeholderRelation = { _placeHolder: true }; + this.loadedRelation = {}; - spyOn(httpProxy, 'callHttp'); - })); + spyOn(httpProxy, 'callHttp'); + })); - describe('loadOrgRelations', function () { - it('loads groups and surveys when they are unloaded', function () { - organizationOverviewService.loadOrgRelations({ - _type: 'organization', - id: this.id, - groups: [this.placeholderRelation], - surveys: [this.placeholderRelation], - }); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { - include: 'groups,surveys,surveys.keyword', - 'fields[group]': - 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + describe('loadOrgRelations', function () { + it('loads groups and surveys when they are unloaded', function () { + organizationOverviewService.loadOrgRelations({ + _type: 'organization', + id: this.id, + groups: [this.placeholderRelation], + surveys: [this.placeholderRelation], + }); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { + include: 'groups,surveys,surveys.keyword', + 'fields[group]': 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('loads nothing when groups and surveys are loaded', function () { - organizationOverviewService.loadOrgRelations({ - _type: 'organization', - id: this.id, - groups: [this.loadedRelation], - surveys: [this.loadedRelation], - }); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('loads nothing when groups and surveys are loaded', function () { + organizationOverviewService.loadOrgRelations({ + _type: 'organization', + id: this.id, + groups: [this.loadedRelation], + surveys: [this.loadedRelation], + }); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('loads only surveys when groups are loaded', function () { - organizationOverviewService.loadOrgRelations({ - _type: 'organization', - id: this.id, - groups: [this.loadedRelation], - surveys: [this.placeholderRelation], - }); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { - include: 'surveys,surveys.keyword', - 'fields[group]': - 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + it('loads only surveys when groups are loaded', function () { + organizationOverviewService.loadOrgRelations({ + _type: 'organization', + id: this.id, + groups: [this.loadedRelation], + surveys: [this.placeholderRelation], + }); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { + include: 'surveys,surveys.keyword', + 'fields[group]': 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('loads only groups when groups are partialy loaded and surveys are loaded', function () { - organizationOverviewService.loadOrgRelations({ - _type: 'organization', - id: this.id, - groups: [this.loadedRelation, this.placeholderRelation], - surveys: [this.loadedRelation], - }); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { - include: 'groups', - 'fields[group]': - 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + it('loads only groups when groups are partialy loaded and surveys are loaded', function () { + organizationOverviewService.loadOrgRelations({ + _type: 'organization', + id: this.id, + groups: [this.loadedRelation, this.placeholderRelation], + surveys: [this.loadedRelation], + }); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { + include: 'groups', + 'fields[group]': 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests', + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); }); + }); - describe('getPersonCount', function () { - it( - 'should load the person count', - asynchronous(function () { - spyOn( - peopleScreenService, - 'loadOrgPeopleCount', - ).and.returnValue($q.resolve(5)); + describe('getPersonCount', function () { + it( + 'should load the person count', + asynchronous(function () { + spyOn(peopleScreenService, 'loadOrgPeopleCount').and.returnValue($q.resolve(5)); - return organizationOverviewService - .getPersonCount({ id: 1 }) - .then(function (personCount) { - expect( - peopleScreenService.loadOrgPeopleCount, - ).toHaveBeenCalledWith(1); - expect(personCount).toBe(5); - }); - }), - ); - }); + return organizationOverviewService.getPersonCount({ id: 1 }).then(function (personCount) { + expect(peopleScreenService.loadOrgPeopleCount).toHaveBeenCalledWith(1); + expect(personCount).toBe(5); + }); + }), + ); + }); - describe('getTeamCount', function () { - it( - 'should load the team count', - asynchronous(function () { - spyOn( - organizationOverviewTeamService, - 'loadOrgTeamCount', - ).and.returnValue($q.resolve(5)); + describe('getTeamCount', function () { + it( + 'should load the team count', + asynchronous(function () { + spyOn(organizationOverviewTeamService, 'loadOrgTeamCount').and.returnValue($q.resolve(5)); - return organizationOverviewService - .getTeamCount({ id: 1 }) - .then(function (personCount) { - expect( - organizationOverviewTeamService.loadOrgTeamCount, - ).toHaveBeenCalledWith(1); - expect(personCount).toBe(5); - }); - }), - ); - }); + return organizationOverviewService.getTeamCount({ id: 1 }).then(function (personCount) { + expect(organizationOverviewTeamService.loadOrgTeamCount).toHaveBeenCalledWith(1); + expect(personCount).toBe(5); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.component.js b/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.component.js index 79c37ac2f7..ec37ec5701 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.component.js @@ -2,31 +2,31 @@ import template from './organizationOverviewGroups.html'; import './organizationOverviewGroups.scss'; angular.module('campusContactsApp').component('organizationOverviewGroups', { - controller: organizationOverviewGroupsController, - require: { - organizationOverview: '^', - }, - template: template, + controller: organizationOverviewGroupsController, + require: { + organizationOverview: '^', + }, + template, }); function organizationOverviewGroupsController($uibModal, groupsService, _) { - var vm = this; - vm.addGroup = addGroup; - vm.$onInit = activate; + const vm = this; + vm.addGroup = addGroup; + vm.$onInit = activate; - function activate() { - // Load the groups and leaders - groupsService.loadLeaders(vm.organizationOverview.org); - } + function activate() { + // Load the groups and leaders + groupsService.loadLeaders(vm.organizationOverview.org); + } - function addGroup() { - $uibModal.open({ - component: 'editGroup', - resolve: { - organizationId: _.constant(vm.organizationOverview.org.id), - }, - windowClass: 'pivot_theme', - size: 'md', - }); - } + function addGroup() { + $uibModal.open({ + component: 'editGroup', + resolve: { + organizationId: _.constant(vm.organizationOverview.org.id), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + } } diff --git a/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.html b/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.html index 31e3d6eb77..3401fbea0d 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.html +++ b/app/assets/javascripts/angular/components/organizationOverviewGroups/organizationOverviewGroups.html @@ -1,28 +1,17 @@
    -
    - {{ 'ministries.groups.columns.name' | t: { group_count: - $ctrl.organizationOverview.groups.length } }} -
    -
    - {{ 'ministries.groups.columns.leaders' | t }} -
    -
    - {{ 'ministries.groups.columns.time' | t }} -
    -
    - {{ 'ministries.groups.columns.location' | t }} -
    -
    - -
    +
    + {{ 'ministries.groups.columns.name' | t: { group_count: $ctrl.organizationOverview.groups.length } }} +
    +
    {{ 'ministries.groups.columns.leaders' | t }}
    +
    {{ 'ministries.groups.columns.time' | t }}
    +
    {{ 'ministries.groups.columns.location' | t }}
    +
    + +
    - +
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.js b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.js index 5662c279a6..7a55703bef 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.js @@ -2,25 +2,25 @@ import template from './organizationOverviewLabels.html'; import './organizationOverviewLabels.scss'; angular.module('campusContactsApp').component('organizationOverviewLabels', { - controller: organizationOverviewLabelsController, - require: { - organizationOverview: '^', - }, - template: template, + controller: organizationOverviewLabelsController, + require: { + organizationOverview: '^', + }, + template, }); function organizationOverviewLabelsController($uibModal, _) { - var vm = this; - vm.addLabel = addLabel; + const vm = this; + vm.addLabel = addLabel; - function addLabel() { - $uibModal.open({ - component: 'editLabel', - resolve: { - organizationId: _.constant(vm.organizationOverview.org.id), - }, - windowClass: 'pivot_theme', - size: 'sm', - }); - } + function addLabel() { + $uibModal.open({ + component: 'editLabel', + resolve: { + organizationId: _.constant(vm.organizationOverview.org.id), + }, + windowClass: 'pivot_theme', + size: 'sm', + }); + } } diff --git a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.spec.js b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.spec.js index 881e7f1b52..def7913943 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.spec.js +++ b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.component.spec.js @@ -1,54 +1,50 @@ import 'angular-mocks'; // Constants -var $ctrl, JsonApiDataStore; +let $ctrl, JsonApiDataStore; describe('organizationOverviewLabels component', function () { - beforeEach(inject(function ($componentController, _JsonApiDataStore_) { - JsonApiDataStore = _JsonApiDataStore_; - - this.$uibModal = jasmine.createSpyObj('$uibModal', ['open']); - - this.organization = new JsonApiDataStore.Model('organization', 1); - - this.label = new JsonApiDataStore.Model('label'); - this.label.setAttribute('id', 1); - this.label.setAttribute('name', 'Test label'); - this.label.setRelationship('organization', this.organization); - - this.organization.setRelationship('labels', [this.label]); - - $ctrl = $componentController( - 'organizationOverviewLabels', - { - $uibModal: this.$uibModal, - }, - { - organizationOverview: { - org: this.organization, - }, - }, - ); - })); - - it('should make the labels available to the template', function () { - expect($ctrl.organizationOverview.org.labels).toEqual([this.label]); - }); - - describe('addLabel', function () { - it('should open the edit label modal', function () { - $ctrl.addLabel(); - - expect(this.$uibModal.open).toHaveBeenCalledWith( - jasmine.objectContaining({ - component: 'editLabel', - }), - ); - expect( - this.$uibModal.open.calls - .argsFor(0)[0] - .resolve.organizationId(), - ).toEqual(this.organization.id); - }); + beforeEach(inject(function ($componentController, _JsonApiDataStore_) { + JsonApiDataStore = _JsonApiDataStore_; + + this.$uibModal = jasmine.createSpyObj('$uibModal', ['open']); + + this.organization = new JsonApiDataStore.Model('organization', 1); + + this.label = new JsonApiDataStore.Model('label'); + this.label.setAttribute('id', 1); + this.label.setAttribute('name', 'Test label'); + this.label.setRelationship('organization', this.organization); + + this.organization.setRelationship('labels', [this.label]); + + $ctrl = $componentController( + 'organizationOverviewLabels', + { + $uibModal: this.$uibModal, + }, + { + organizationOverview: { + org: this.organization, + }, + }, + ); + })); + + it('should make the labels available to the template', function () { + expect($ctrl.organizationOverview.org.labels).toEqual([this.label]); + }); + + describe('addLabel', function () { + it('should open the edit label modal', function () { + $ctrl.addLabel(); + + expect(this.$uibModal.open).toHaveBeenCalledWith( + jasmine.objectContaining({ + component: 'editLabel', + }), + ); + expect(this.$uibModal.open.calls.argsFor(0)[0].resolve.organizationId()).toEqual(this.organization.id); }); + }); }); diff --git a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.html b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.html index cea766f4b5..51be7f8d0e 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.html +++ b/app/assets/javascripts/angular/components/organizationOverviewLabels/organizationOverviewLabels.html @@ -1,22 +1,13 @@
    -
    - {{ 'ministries.labels.columns.name' | t }} -
    +
    {{ 'ministries.labels.columns.name' | t }}
    -
    - -
    +
    + +
    - +
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.component.js b/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.component.js index 10a4e5f3ca..b9dfb0a2ce 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.component.js @@ -1,13 +1,13 @@ import template from './organizationOverviewPeople.html'; angular.module('campusContactsApp').component('organizationOverviewPeople', { - controller: organizationOverviewPeopleController, - require: { - organizationOverview: '^', - }, - bindings: { - queryFilters: '<', - }, - template: template, + controller: organizationOverviewPeopleController, + require: { + organizationOverview: '^', + }, + bindings: { + queryFilters: '<', + }, + template, }); function organizationOverviewPeopleController() {} diff --git a/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.html b/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.html index 010210f89a..4a14e4453e 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.html +++ b/app/assets/javascripts/angular/components/organizationOverviewPeople/organizationOverviewPeople.html @@ -1,5 +1,5 @@ diff --git a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.component.js b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.component.js index 5f40441995..78a6f66f32 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.component.js @@ -2,76 +2,70 @@ import template from './organizationOverviewSuborgs.html'; import './organizationOverviewSuborgs.scss'; angular.module('campusContactsApp').component('organizationOverviewSuborgs', { - controller: organizationOverviewSuborgsController, - bindings: { - $transition$: '<', - }, - require: { - organizationOverview: '^', - }, - template: template, + controller: organizationOverviewSuborgsController, + bindings: { + $transition$: '<', + }, + require: { + organizationOverview: '^', + }, + template, }); function organizationOverviewSuborgsController( - $scope, - $state, - $log, - reportsService, - periodService, - ProgressiveListLoader, - organizationOverviewSuborgsService, + $scope, + $state, + $log, + reportsService, + periodService, + ProgressiveListLoader, + organizationOverviewSuborgsService, ) { - var vm = this; - vm.loadedAll = false; - vm.subOrgs = []; - vm.loadSubOrgsPage = loadSubOrgsPage; + const vm = this; + vm.loadedAll = false; + vm.subOrgs = []; + vm.loadSubOrgsPage = loadSubOrgsPage; - var listLoader = new ProgressiveListLoader({ - modelType: 'organization', - errorMessage: - 'error.messages.organization_overview_suborgs.load_org_chunk', - }); + const listLoader = new ProgressiveListLoader({ + modelType: 'organization', + errorMessage: 'error.messages.organization_overview_suborgs.load_org_chunk', + }); - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - periodService.subscribe($scope, loadReports); - } + function activate() { + periodService.subscribe($scope, loadReports); + } - function loadSubOrgsPage() { - if (vm.busy) { - return; - } - vm.busy = true; + function loadSubOrgsPage() { + if (vm.busy) { + return; + } + vm.busy = true; - return organizationOverviewSuborgsService - .loadOrgSubOrgs(vm.organizationOverview.org, listLoader) - .then(function (resp) { - vm.subOrgs = resp.list; - vm.loadedAll = resp.loadedAll; - loadReports(); + return organizationOverviewSuborgsService + .loadOrgSubOrgs(vm.organizationOverview.org, listLoader) + .then(function (resp) { + vm.subOrgs = resp.list; + vm.loadedAll = resp.loadedAll; + loadReports(); - // TODO: this seems to have been broken somehow, probably through a UI Router upgrade - // If this component was implicitly navigated to since it is the default tab and the org has no sub - // orgs, then navigate to the people tab instead. If this component was explicitly navigated to, - // such as by the user directly clicking on its tab, then do not perform that navigation. - if ( - vm.$transition$.redirectedFrom() && - vm.subOrgs.length === 0 - ) { - $state.go('^.people'); - } - }) - .finally(function () { - vm.busy = false; - }); - } + // TODO: this seems to have been broken somehow, probably through a UI Router upgrade + // If this component was implicitly navigated to since it is the default tab and the org has no sub + // orgs, then navigate to the people tab instead. If this component was explicitly navigated to, + // such as by the user directly clicking on its tab, then do not perform that navigation. + if (vm.$transition$.redirectedFrom() && vm.subOrgs.length === 0) { + $state.go('^.people'); + } + }) + .finally(function () { + vm.busy = false; + }); + } - function loadReports() { - reportsService - .loadOrganizationReports(vm.subOrgs) - .catch(function (error) { - $log.error('Error loading organization reports', error); - }); - } + function loadReports() { + reportsService.loadOrganizationReports(vm.subOrgs).catch(function (error) { + $log.error('Error loading organization reports', error); + }); + } } diff --git a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.html b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.html index 1e64ebfb4c..16392c9909 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.html +++ b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.html @@ -1,21 +1,12 @@
    -
    - {{ org.name }} - -
    -
    - {{ 'general.loading_more' | t }} -
    +
    + {{ org.name }} + +
    +
    {{ 'general.loading_more' | t }}
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.js b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.js index fc7a1200a9..5dbb3e83db 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.js +++ b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.js @@ -1,58 +1,39 @@ -angular - .module('campusContactsApp') - .factory( - 'organizationOverviewSuborgsService', - organizationOverviewSuborgsService, - ); +angular.module('campusContactsApp').factory('organizationOverviewSuborgsService', organizationOverviewSuborgsService); function organizationOverviewSuborgsService(httpProxy, modelsService) { - var organizationOverviewSuborgsService = { - buildGetParams: function (orgId) { - return { - include: ['groups', 'surveys'].join(','), - 'filters[parent_ids]': orgId, - 'filters[user_created]': false, - }; - }, + var organizationOverviewSuborgsService = { + buildGetParams: function (orgId) { + return { + include: ['groups', 'surveys'].join(','), + 'filters[parent_ids]': orgId, + 'filters[user_created]': false, + }; + }, - // Load an organization's sub-orgs - // The "org" parameter may either be an organization model or an organization id - loadOrgSubOrgs: function (org, listLoader) { - var requestParams = organizationOverviewSuborgsService.buildGetParams( - org.id || org, - ); - if (listLoader) { - return listLoader.loadMore(requestParams); - } + // Load an organization's sub-orgs + // The "org" parameter may either be an organization model or an organization id + loadOrgSubOrgs: function (org, listLoader) { + const requestParams = organizationOverviewSuborgsService.buildGetParams(org.id || org); + if (listLoader) { + return listLoader.loadMore(requestParams); + } - return httpProxy - .get( - modelsService.getModelMetadata('organization').url.all, - requestParams, - ) - .then((resp) => { - return resp.data; - }); - }, + return httpProxy.get(modelsService.getModelMetadata('organization').url.all, requestParams).then((resp) => { + return resp.data; + }); + }, - loadOrgSubOrgCount: function (orgId) { - var requestParams = organizationOverviewSuborgsService.buildGetParams( - orgId, - ); - requestParams['page[limit]'] = 0; - return httpProxy - .get( - modelsService.getModelMetadata('organization').url.all, - requestParams, - { - errorMessage: - 'error.messages.organization_overview_suborgs.load_org_suborg_count', - }, - ) - .then(function (resp) { - return resp.meta.total; - }); - }, - }; - return organizationOverviewSuborgsService; + loadOrgSubOrgCount: function (orgId) { + const requestParams = organizationOverviewSuborgsService.buildGetParams(orgId); + requestParams['page[limit]'] = 0; + return httpProxy + .get(modelsService.getModelMetadata('organization').url.all, requestParams, { + errorMessage: 'error.messages.organization_overview_suborgs.load_org_suborg_count', + }) + .then(function (resp) { + return resp.meta.total; + }); + }, + }; + return organizationOverviewSuborgsService; } diff --git a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.spec.js b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.spec.js index 85f87bf54b..252e6d104e 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.spec.js +++ b/app/assets/javascripts/angular/components/organizationOverviewSuborgs/organizationOverviewSuborgs.service.spec.js @@ -1,69 +1,62 @@ -var organizationOverviewSuborgsService, httpProxy, $rootScope, $q; +let organizationOverviewSuborgsService, httpProxy, $rootScope, $q; function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('organizationOverviewSuborgsService', function () { - beforeEach(inject(function ( - _organizationOverviewSuborgsService_, - _httpProxy_, - _$rootScope_, - _$q_, - ) { - organizationOverviewSuborgsService = _organizationOverviewSuborgsService_; - httpProxy = _httpProxy_; - $rootScope = _$rootScope_; - $q = _$q_; - - this.orgId = 123; - - // override these to define what will be result of httpProxy - this.responseOrgs = []; - this.responseTotal = 10; + beforeEach(inject(function (_organizationOverviewSuborgsService_, _httpProxy_, _$rootScope_, _$q_) { + organizationOverviewSuborgsService = _organizationOverviewSuborgsService_; + httpProxy = _httpProxy_; + $rootScope = _$rootScope_; + $q = _$q_; + + this.orgId = 123; + + // override these to define what will be result of httpProxy + this.responseOrgs = []; + this.responseTotal = 10; + + const _this = this; + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return $q.resolve({ + data: _this.responseOrgs, + meta: { total: _this.responseTotal }, + }); + }); + })); + + describe('loadOrgSubOrgCount', function () { + it( + 'should load the sub org count', + asynchronous(function () { + this.responseTotal = 5; + + return organizationOverviewSuborgsService.loadOrgSubOrgCount(this.orgId).then(function (subOrgCount) { + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ 'page[limit]': 0 }), + null, + jasmine.objectContaining({ + errorMessage: jasmine.any(String), + }), + ); - var _this = this; - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return $q.resolve({ - data: _this.responseOrgs, - meta: { total: _this.responseTotal }, - }); + expect(subOrgCount).toBe(5); }); - })); - - describe('loadOrgSubOrgCount', function () { - it( - 'should load the sub org count', - asynchronous(function () { - this.responseTotal = 5; - - return organizationOverviewSuborgsService - .loadOrgSubOrgCount(this.orgId) - .then(function (subOrgCount) { - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ 'page[limit]': 0 }), - null, - jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }), - ); - - expect(subOrgCount).toBe(5); - }); - }), - ); - }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.component.js b/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.component.js index ca72196b75..3a2990b3cb 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.component.js @@ -3,38 +3,32 @@ import _ from 'lodash'; import template from './organizationOverviewSurveyResponses.html'; -angular - .module('campusContactsApp') - .component('organizationOverviewSurveyResponses', { - require: { - organizationOverview: '^', - }, - template: template, - controller: organizationOverviewSurveyResponsesController, - }); +angular.module('campusContactsApp').component('organizationOverviewSurveyResponses', { + require: { + organizationOverview: '^', + }, + template, + controller: organizationOverviewSurveyResponsesController, +}); -function organizationOverviewSurveyResponsesController( - $scope, - surveyService, - periodService, -) { - this.surveyStats = {}; - this.$onInit = () => { - //get survey stats - this.getSurveyStats(); +function organizationOverviewSurveyResponsesController($scope, surveyService, periodService) { + this.surveyStats = {}; + this.$onInit = () => { + // get survey stats + this.getSurveyStats(); - //on period change, update survey stats - periodService.subscribe($scope, () => { - this.surveyStats = {}; - this.getSurveyStats(); - }); - }; + // on period change, update survey stats + periodService.subscribe($scope, () => { + this.surveyStats = {}; + this.getSurveyStats(); + }); + }; - this.getSurveyStats = () => { - _.forEach(this.organizationOverview.surveys, (survey) => { - surveyService.getStats(survey.id).then((statData) => { - this.surveyStats[survey.id] = statData; - }); - }); - }; + this.getSurveyStats = () => { + _.forEach(this.organizationOverview.surveys, (survey) => { + surveyService.getStats(survey.id).then((statData) => { + this.surveyStats[survey.id] = statData; + }); + }); + }; } diff --git a/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.html b/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.html index 9d7cad761d..39fa0f1771 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.html +++ b/app/assets/javascripts/angular/components/organizationOverviewSurveyResponses/organizationOverviewSurveyResponses.html @@ -1,35 +1,22 @@
    -
    {{ 'surveyTab:columns.survey' | t }}
    -
    - {{ 'surveyTab:columns.contacts' | t }} +
    {{ 'surveyTab:columns.survey' | t }}
    +
    {{ 'surveyTab:columns.contacts' | t }}
    +
    {{ 'surveyTab:columns.unassigned' | t }}
    +
    {{ 'surveyTab:columns.uncontacted' | t }}
    +
    +
    +
    +
    + {{ survey.title }}
    - {{ 'surveyTab:columns.unassigned' | t }} + {{ $ctrl.surveyStats[survey.id].contact_count }}
    - {{ 'surveyTab:columns.uncontacted' | t }} + {{ $ctrl.surveyStats[survey.id].unassigned_count }}
    -
    -
    -
    -
    - - {{ survey.title }} - -
    -
    - {{ $ctrl.surveyStats[survey.id].contact_count }} -
    -
    - {{ $ctrl.surveyStats[survey.id].unassigned_count }} -
    -
    - {{ $ctrl.surveyStats[survey.id].uncontacted_count }} -
    +
    + {{ $ctrl.surveyStats[survey.id].uncontacted_count }}
    +
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.component.js b/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.component.js index 9463b3eb3a..29b8e254ad 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.component.js @@ -4,108 +4,100 @@ import _ from 'lodash'; import template from './organizationOverviewSurveys.html'; angular.module('campusContactsApp').component('organizationOverviewSurveys', { - require: { - organizationOverview: '^', - }, - template: template, - controller: organizationOverviewSurveysController, + require: { + organizationOverview: '^', + }, + template, + controller: organizationOverviewSurveysController, }); function organizationOverviewSurveysController( - $scope, - $state, - $uibModal, - surveyService, - confirmModalService, - envService, - tFilter, - loggedInPerson, + $scope, + $state, + $uibModal, + surveyService, + confirmModalService, + envService, + tFilter, + loggedInPerson, ) { - this.surveyLinkPrefix = envService.read('surveyLinkPrefix'); + this.surveyLinkPrefix = envService.read('surveyLinkPrefix'); - this.$onInit = () => { - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt( - this.organizationOverview.org, - ); - }; + this.$onInit = () => { + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.organizationOverview.org); + }; - this.createSurvey = () => { - $uibModal - .open({ - component: 'createSurvey', - resolve: { - organizationId: _.constant( - this.organizationOverview.org.id, - ), - }, - windowClass: 'pivot_theme', - size: 'sm', - }) - .result.then((newSurvey) => { - //go to edit screen - $state.go('app.ministries.ministry.survey.manage', { - surveyId: newSurvey.id, - }); - }); - }; - - this.copySurvey = (survey) => { - $uibModal.open({ - component: 'copySurvey', - resolve: { - organizationId: _.constant(this.organizationOverview.org.id), - survey: _.constant(survey), - }, - windowClass: 'pivot_theme', - size: 'md', + this.createSurvey = () => { + $uibModal + .open({ + component: 'createSurvey', + resolve: { + organizationId: _.constant(this.organizationOverview.org.id), + }, + windowClass: 'pivot_theme', + size: 'sm', + }) + .result.then((newSurvey) => { + // go to edit screen + $state.go('app.ministries.ministry.survey.manage', { + surveyId: newSurvey.id, }); - }; + }); + }; - this.changeStatus = (survey, active) => { - survey.is_frozen = !active; - surveyService.updateSurvey(survey); - }; + this.copySurvey = (survey) => { + $uibModal.open({ + component: 'copySurvey', + resolve: { + organizationId: _.constant(this.organizationOverview.org.id), + survey: _.constant(survey), + }, + windowClass: 'pivot_theme', + size: 'md', + }); + }; - this.deleteSurvey = (survey) => { - if (!survey) { - return; - } + this.changeStatus = (survey, active) => { + survey.is_frozen = !active; + surveyService.updateSurvey(survey); + }; - confirmModalService - .create( - tFilter('surveys:delete:confirm', { - survey_title: survey.title, - }), - ) - .then(() => { - surveyService.deleteSurvey(survey).then(() => { - this.organizationOverview.surveys.splice( - this.organizationOverview.surveys.indexOf(survey), - 1, - ); - }); - }); - }; + this.deleteSurvey = (survey) => { + if (!survey) { + return; + } - this.massEntry = (survey) => { - $uibModal.open({ - component: 'addSurveyResponseModal', - resolve: { - survey: () => survey, - }, - windowClass: 'pivot_theme', - backdrop: 'static', - keyboard: false, - }); - }; - this.showTypeformModal = () => { - $uibModal.open({ - component: 'surveyTypeformModal', - resolve: { - webhookUrl: () => - this.organizationOverview.org.typeform_webhook_url, - }, - windowClass: 'pivot_theme', + confirmModalService + .create( + tFilter('surveys:delete:confirm', { + survey_title: survey.title, + }), + ) + .then(() => { + surveyService.deleteSurvey(survey).then(() => { + this.organizationOverview.surveys.splice(this.organizationOverview.surveys.indexOf(survey), 1); }); - }; + }); + }; + + this.massEntry = (survey) => { + $uibModal.open({ + component: 'addSurveyResponseModal', + resolve: { + survey: () => survey, + }, + windowClass: 'pivot_theme', + backdrop: 'static', + keyboard: false, + }); + }; + this.showTypeformModal = () => { + $uibModal.open({ + component: 'surveyTypeformModal', + resolve: { + webhookUrl: () => this.organizationOverview.org.typeform_webhook_url, + }, + windowClass: 'pivot_theme', + }); + }; } diff --git a/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.html b/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.html index f7695864eb..3e6701b6ba 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.html +++ b/app/assets/javascripts/angular/components/organizationOverviewSurveys/organizationOverviewSurveys.html @@ -1,169 +1,89 @@
    -
    {{ 'surveyTab:columns.survey' | t }}
    -
    {{ 'surveyTab:columns.keyword' | t }}
    -
    {{ 'surveyTab:columns.link' | t }}
    -
    {{ 'surveyTab:columns.status' | t }}
    -
    {{ 'surveyTab:columns.survey' | t }}
    +
    {{ 'surveyTab:columns.keyword' | t }}
    +
    {{ 'surveyTab:columns.link' | t }}
    +
    {{ 'surveyTab:columns.status' | t }}
    +
    + {{ 'surveyTab:columns.typeform' | t }} + +
    +
    + +
    + +
    {{ survey.keyword.keyword }}
    +
    + {{ $ctrl.surveyLinkPrefix }}{{ survey.id }} - {{ 'surveyTab:columns.typeform' | t }} - +
    +
    +
    + + + {{ 'surveyTab:status.live' | t }} + + + + {{ 'surveyTab:status.off' | t }} +
    -
    - +
    + + + {{ 'surveyTab:status.live' | t }} + + + + {{ 'surveyTab:status.off' | t }} +
    - -
    {{ survey.keyword.keyword }}
    - +
    + +
    +
    +
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.js b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.js index 275276dbf1..127c48f176 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.js +++ b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.js @@ -1,61 +1,57 @@ import template from './organizationOverviewTeam.html'; angular.module('campusContactsApp').component('organizationOverviewTeam', { - controller: organizationOverviewTeamController, - require: { - organizationOverview: '^', - }, - template: template, + controller: organizationOverviewTeamController, + require: { + organizationOverview: '^', + }, + template, }); function organizationOverviewTeamController( - organizationOverviewTeamService, - ProgressiveListLoader, - reportsService, - periodService, - $scope, + organizationOverviewTeamService, + ProgressiveListLoader, + reportsService, + periodService, + $scope, ) { - var vm = this; - vm.team = []; - vm.loadTeamPage = loadTeamPage; - - var listLoader = new ProgressiveListLoader({ - modelType: 'person', - errorMessage: - 'error.messages.organization_overview_team.load_team_chunk', - }); + const vm = this; + vm.team = []; + vm.loadTeamPage = loadTeamPage; - vm.$onInit = activate; + const listLoader = new ProgressiveListLoader({ + modelType: 'person', + errorMessage: 'error.messages.organization_overview_team.load_team_chunk', + }); - function activate() { - periodService.subscribe($scope, function () { - loadTeamReports([vm.organizationOverview.org.id], vm.team); - }); - } + vm.$onInit = activate; - function loadTeamPage() { - if (vm.busy) { - return; - } - vm.busy = true; - - return organizationOverviewTeamService - .loadOrgTeam(vm.organizationOverview.org, listLoader) - .then(function (resp) { - vm.team = resp.list; - vm.loadedAll = resp.loadedAll; - // Use the nextBatch from the response which only includes unloaded people. - return loadTeamReports( - [vm.organizationOverview.org.id], - resp.nextBatch, - ); - }) - .finally(function () { - vm.busy = false; - }); - } + function activate() { + periodService.subscribe($scope, function () { + loadTeamReports([vm.organizationOverview.org.id], vm.team); + }); + } - function loadTeamReports(orgIds, team) { - return reportsService.loadMultiplePeopleReports(orgIds, team); + function loadTeamPage() { + if (vm.busy) { + return; } + vm.busy = true; + + return organizationOverviewTeamService + .loadOrgTeam(vm.organizationOverview.org, listLoader) + .then(function (resp) { + vm.team = resp.list; + vm.loadedAll = resp.loadedAll; + // Use the nextBatch from the response which only includes unloaded people. + return loadTeamReports([vm.organizationOverview.org.id], resp.nextBatch); + }) + .finally(function () { + vm.busy = false; + }); + } + + function loadTeamReports(orgIds, team) { + return reportsService.loadMultiplePeopleReports(orgIds, team); + } } diff --git a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.spec.js b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.spec.js index 6fd7575117..9bc3aca8c3 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.spec.js +++ b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.component.spec.js @@ -1,88 +1,62 @@ describe('organizationOverviewTeam component', function () { - var $ctrl, - $q, - $rootScope, - organizationOverviewTeamService, - reportsService, - periodService; - - beforeEach(inject(function ( - $componentController, - _$q_, - _$timeout_, - _$rootScope_, - ) { - organizationOverviewTeamService = jasmine.createSpyObj( - 'organizationOverviewTeamService', - ['loadOrgTeam'], - ); - reportsService = jasmine.createSpyObj('reportsService', [ - 'loadMultiplePeopleReports', - ]); - periodService = jasmine.createSpyObj('periodService', ['subscribe']); - - $ctrl = $componentController( - 'organizationOverviewTeam', - { - organizationOverviewTeamService: organizationOverviewTeamService, - reportsService: reportsService, - periodService: periodService, - }, - { - organizationOverview: { - org: { - id: 1, - }, - }, - }, - ); - $q = _$q_; - $rootScope = _$rootScope_; - })); - - describe('$onInit', function () { - it('should reload the team reports when the period changes', function () { - $ctrl.$onInit(); - - expect(periodService.subscribe).toHaveBeenCalledWith( - jasmine.any(Object), - jasmine.any(Function), - ); - expect( - reportsService.loadMultiplePeopleReports, - ).not.toHaveBeenCalled(); + let $ctrl, $q, $rootScope, organizationOverviewTeamService, reportsService, periodService; - $ctrl.team = 'fake team'; + beforeEach(inject(function ($componentController, _$q_, _$timeout_, _$rootScope_) { + organizationOverviewTeamService = jasmine.createSpyObj('organizationOverviewTeamService', ['loadOrgTeam']); + reportsService = jasmine.createSpyObj('reportsService', ['loadMultiplePeopleReports']); + periodService = jasmine.createSpyObj('periodService', ['subscribe']); - periodService.subscribe.calls.argsFor(0)[1](); - - expect( - reportsService.loadMultiplePeopleReports, - ).toHaveBeenCalledWith([1], 'fake team'); - }); + $ctrl = $componentController( + 'organizationOverviewTeam', + { + organizationOverviewTeamService, + reportsService, + periodService, + }, + { + organizationOverview: { + org: { + id: 1, + }, + }, + }, + ); + $q = _$q_; + $rootScope = _$rootScope_; + })); + + describe('$onInit', function () { + it('should reload the team reports when the period changes', function () { + $ctrl.$onInit(); + + expect(periodService.subscribe).toHaveBeenCalledWith(jasmine.any(Object), jasmine.any(Function)); + expect(reportsService.loadMultiplePeopleReports).not.toHaveBeenCalled(); + + $ctrl.team = 'fake team'; + + periodService.subscribe.calls.argsFor(0)[1](); + + expect(reportsService.loadMultiplePeopleReports).toHaveBeenCalledWith([1], 'fake team'); }); - - describe('loadTeamPage', function () { - it('should load the people on the team', function () { - organizationOverviewTeamService.loadOrgTeam.and.returnValue( - $q.resolve({ - list: 'teamList', - nextBatch: 'teamList', - loadedAll: true, - }), - ); - - $ctrl.loadTeamPage(); - expect( - organizationOverviewTeamService.loadOrgTeam, - ).toHaveBeenCalledWith({ id: 1 }, jasmine.any(Object)); - $rootScope.$digest(); - expect($ctrl.team).toEqual('teamList'); - expect( - reportsService.loadMultiplePeopleReports, - ).toHaveBeenCalledWith([1], 'teamList'); - expect($ctrl.loadedAll).toEqual(true); - expect($ctrl.busy).toEqual(false); - }); + }); + + describe('loadTeamPage', function () { + it('should load the people on the team', function () { + organizationOverviewTeamService.loadOrgTeam.and.returnValue( + $q.resolve({ + list: 'teamList', + nextBatch: 'teamList', + loadedAll: true, + }), + ); + + $ctrl.loadTeamPage(); + expect(organizationOverviewTeamService.loadOrgTeam).toHaveBeenCalledWith({ id: 1 }, jasmine.any(Object)); + $rootScope.$digest(); + expect($ctrl.team).toEqual('teamList'); + expect(reportsService.loadMultiplePeopleReports).toHaveBeenCalledWith([1], 'teamList'); + expect($ctrl.loadedAll).toEqual(true); + expect($ctrl.busy).toEqual(false); }); + }); }); diff --git a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.html b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.html index 0f7045297c..b99e21239c 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.html +++ b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.html @@ -1,16 +1,14 @@
    - - -
    - {{ 'general.loading_more' | t }} -
    + + +
    {{ 'general.loading_more' | t }}
    diff --git a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.service.js b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.service.js index 9070e001ec..81b9070622 100644 --- a/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.service.js +++ b/app/assets/javascripts/angular/components/organizationOverviewTeam/organizationOverviewTeam.service.js @@ -1,49 +1,35 @@ -angular - .module('campusContactsApp') - .factory( - 'organizationOverviewTeamService', - organizationOverviewTeamService, - ); +angular.module('campusContactsApp').factory('organizationOverviewTeamService', organizationOverviewTeamService); function organizationOverviewTeamService(httpProxy, modelsService) { - var organizationOverviewTeamService = { - buildGetParams: function (orgId) { - return { - include: ['phone_numbers', 'email_addresses'].join(','), - 'filters[organization_ids]': orgId, - 'filters[permissions]': 'admin,user', - }; - }, + var organizationOverviewTeamService = { + buildGetParams: function (orgId) { + return { + include: ['phone_numbers', 'email_addresses'].join(','), + 'filters[organization_ids]': orgId, + 'filters[permissions]': 'admin,user', + }; + }, - // Load an organization's team members - // The "org" parameter may either be an organization model or an organization id - loadOrgTeam: function (org, listLoader) { - var orgId = org.id || org; - var requestParams = organizationOverviewTeamService.buildGetParams( - orgId, - ); - return listLoader.loadMore(requestParams); - }, + // Load an organization's team members + // The "org" parameter may either be an organization model or an organization id + loadOrgTeam: function (org, listLoader) { + const orgId = org.id || org; + const requestParams = organizationOverviewTeamService.buildGetParams(orgId); + return listLoader.loadMore(requestParams); + }, - loadOrgTeamCount: function (orgId) { - var requestParams = organizationOverviewTeamService.buildGetParams( - orgId, - ); - requestParams['page[limit]'] = 0; + loadOrgTeamCount: function (orgId) { + const requestParams = organizationOverviewTeamService.buildGetParams(orgId); + requestParams['page[limit]'] = 0; - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - requestParams, - { - errorMessage: - 'error.messages.organization_overview_team.load_org_team_count', - }, - ) - .then(function (resp) { - return resp.meta.total; - }); - }, - }; - return organizationOverviewTeamService; + return httpProxy + .get(modelsService.getModelMetadata('person').url.all, requestParams, { + errorMessage: 'error.messages.organization_overview_team.load_org_team_count', + }) + .then(function (resp) { + return resp.meta.total; + }); + }, + }; + return organizationOverviewTeamService; } diff --git a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.js b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.js index 71a9f8b100..6ae8c58ba4 100644 --- a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.js +++ b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.js @@ -2,131 +2,110 @@ import template from './organizationSignatures.html'; import './organizationSignatures.scss'; angular.module('campusContactsApp').component('organizationSignatures', { - bindings: { - orgId: '<', - }, - template: template, - controller: organizationSignaturesController, + bindings: { + orgId: '<', + }, + template, + controller: organizationSignaturesController, }); -function organizationSignaturesController( - httpProxy, - $scope, - $window, - envService, - $http, -) { - this.signatures = []; - this.signatureData = []; - this.exportLink = ''; - this.itemsPerPage = 50; - this.isLoading = true; - - const getSignatures = (orgId, searchText, offset) => { - const params = { - include: '', - 'page[limit]': this.itemsPerPage, - ...(searchText ? { 'filters[q]': searchText } : {}), - ...(offset ? { 'page[offset]': offset } : {}), - }; - - return httpProxy.get(`/organizations/${orgId}/signatures`, params, { - errorMessage: 'error.messages.surveys.loadQuestions', - }); - }; - - const prepareData = (data) => - data.map((signature) => ({ - first_name: signature.first_name, - last_name: signature.last_name, - updated_at: signature.updated_at, - code_of_conduct: signature.code_of_conduct, - statement_of_faith: signature.statement_of_faith, - organization_name: signature.organization.name, - })); - - const buildExportCsvLink = (searchText) => { - const params = { - access_token: $http.defaults.headers.common.Authorization.slice(7), - include: '', - format: 'csv', - ...(searchText ? { 'filters[q]': searchText } : {}), - }; - - const query = Object.entries(params).reduce( - (accumulator, [key, value]) => { - return `${accumulator}&${encodeURIComponent( - key, - )}=${encodeURIComponent(value)}`; - }, - '', - ); - - return ( - envService.read('apiUrl') + - `/organizations/${this.orgId}/signatures?${query}` - ); - }; - - const loadData = async (tableState, searchText) => { - this.isLoading = true; - this.signatures = []; - const start = (tableState && tableState.pagination.start) || 0; - const { data, meta } = await getSignatures( - this.orgId, - searchText, - start, - ); - const numberOfPages = Math.ceil(meta.total / this.itemsPerPage); - - this.signatureData = prepareData(data); - this.signatures = [...this.signatureData]; - this.exportLink = buildExportCsvLink(searchText); - - tableState.pagination.numberOfPages = numberOfPages; - tableState.pagination.currentPage = - Math.ceil(start / this.itemsPerPage) + 1; - tableState.pagination.pages = []; - - for (let i = 0; i < numberOfPages; i++) { - tableState.pagination.pages.push(i); - } - - tableState.pagination.totalItemCount = meta.total; - this.tableState = tableState; - this.isLoading = false; - $scope.$apply(); - }; - - this.setPage = (page, searchText) => { - this.tableState.pagination.start = page * this.itemsPerPage; - loadData(this.tableState, searchText); - }; - - this.nextPage = (searchText) => { - this.tableState.pagination.start = - this.tableState.pagination.currentPage * this.itemsPerPage; - loadData(this.tableState, searchText); +function organizationSignaturesController(httpProxy, $scope, $window, envService, $http) { + this.signatures = []; + this.signatureData = []; + this.exportLink = ''; + this.itemsPerPage = 50; + this.isLoading = true; + + const getSignatures = (orgId, searchText, offset) => { + const params = { + include: '', + 'page[limit]': this.itemsPerPage, + ...(searchText ? { 'filters[q]': searchText } : {}), + ...(offset ? { 'page[offset]': offset } : {}), }; - this.previousPage = (searchText) => { - this.tableState.pagination.start = - (this.tableState.pagination.currentPage - 2) * this.itemsPerPage; - loadData(this.tableState, searchText); + return httpProxy.get(`/organizations/${orgId}/signatures`, params, { + errorMessage: 'error.messages.surveys.loadQuestions', + }); + }; + + const prepareData = (data) => + data.map((signature) => ({ + first_name: signature.first_name, + last_name: signature.last_name, + updated_at: signature.updated_at, + code_of_conduct: signature.code_of_conduct, + statement_of_faith: signature.statement_of_faith, + organization_name: signature.organization.name, + })); + + const buildExportCsvLink = (searchText) => { + const params = { + access_token: $http.defaults.headers.common.Authorization.slice(7), + include: '', + format: 'csv', + ...(searchText ? { 'filters[q]': searchText } : {}), }; - this.load = (tableState) => { - tableState.pagination.numberOfPages = 0; - this.tableState = tableState; - loadData(tableState); - }; + const query = Object.entries(params).reduce((accumulator, [key, value]) => { + return `${accumulator}&${encodeURIComponent(key)}=${encodeURIComponent(value)}`; + }, ''); - this.search = (searchText, tableState) => { - tableState.pagination.start = 0; - loadData(tableState, searchText); - }; + return envService.read('apiUrl') + `/organizations/${this.orgId}/signatures?${query}`; + }; - this.searchOnChange = (searchText, tableState) => { - if (!searchText) this.search(searchText, tableState); - }; + const loadData = async (tableState, searchText) => { + this.isLoading = true; + this.signatures = []; + const start = (tableState && tableState.pagination.start) || 0; + const { data, meta } = await getSignatures(this.orgId, searchText, start); + const numberOfPages = Math.ceil(meta.total / this.itemsPerPage); + + this.signatureData = prepareData(data); + this.signatures = [...this.signatureData]; + this.exportLink = buildExportCsvLink(searchText); + + tableState.pagination.numberOfPages = numberOfPages; + tableState.pagination.currentPage = Math.ceil(start / this.itemsPerPage) + 1; + tableState.pagination.pages = []; + + for (let i = 0; i < numberOfPages; i++) { + tableState.pagination.pages.push(i); + } + + tableState.pagination.totalItemCount = meta.total; + this.tableState = tableState; + this.isLoading = false; + $scope.$apply(); + }; + + this.setPage = (page, searchText) => { + this.tableState.pagination.start = page * this.itemsPerPage; + loadData(this.tableState, searchText); + }; + + this.nextPage = (searchText) => { + this.tableState.pagination.start = this.tableState.pagination.currentPage * this.itemsPerPage; + loadData(this.tableState, searchText); + }; + + this.previousPage = (searchText) => { + this.tableState.pagination.start = (this.tableState.pagination.currentPage - 2) * this.itemsPerPage; + loadData(this.tableState, searchText); + }; + + this.load = (tableState) => { + tableState.pagination.numberOfPages = 0; + this.tableState = tableState; + loadData(tableState); + }; + + this.search = (searchText, tableState) => { + tableState.pagination.start = 0; + loadData(tableState, searchText); + }; + + this.searchOnChange = (searchText, tableState) => { + if (!searchText) this.search(searchText, tableState); + }; } diff --git a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.html b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.html index b44151ea0e..1e3de30379 100644 --- a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.html +++ b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.html @@ -1,159 +1,98 @@
    -

    {{ 'signatures.title' | t }}

    -
    -
    - {{ 'signatures.downloadCsv' | t }} -
    -
    -
    - - -
    -
    +

    {{ 'signatures.title' | t }}

    +
    +
    + {{ 'signatures.downloadCsv' | t }}
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - {{ 'signatures.grid.dateSigned' | t }} - - {{ 'signatures.grid.firstName' | t }} - - {{ 'signatures.grid.lastName' | t }} - - {{ 'signatures.grid.codeOfConduct' | t }} - - {{ 'signatures.grid.statementOfFaith' | t }} - - {{ 'signatures.grid.organization' | t }} -
    {{ row.updated_at | date }}{{ row.first_name }}{{ row.last_name }} - {{ 'signatures.grid.accepted' | t }} - {{ 'signatures.grid.declined' | t }} - {{ 'signatures.grid.notAccecptedYet' | t }} - - {{ 'signatures.grid.accepted' | t }} - {{ 'signatures.grid.declined' | t }} - {{ 'signatures.grid.notAccecptedYet' | t }} - {{ row.organization_name }}
    - {{ 'signatures.grid.loading' | t }} - - {{ 'signatures.grid.notFound' | t }} -
    - -
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + {{ 'signatures.grid.dateSigned' | t }} + {{ 'signatures.grid.firstName' | t }}{{ 'signatures.grid.lastName' | t }}{{ 'signatures.grid.codeOfConduct' | t }} + {{ 'signatures.grid.statementOfFaith' | t }} + + {{ 'signatures.grid.organization' | t }} +
    {{ row.updated_at | date }}{{ row.first_name }}{{ row.last_name }} + {{ 'signatures.grid.accepted' | t }} + {{ 'signatures.grid.declined' | t }} + {{ 'signatures.grid.notAccecptedYet' | t }} + + {{ 'signatures.grid.accepted' | t }} + {{ 'signatures.grid.declined' | t }} + {{ 'signatures.grid.notAccecptedYet' | t }} + {{ row.organization_name }}
    {{ 'signatures.grid.loading' | t }}{{ 'signatures.grid.notFound' | t }}
    + +
    +
    diff --git a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.component.js b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.component.js index 7c21916cb2..5c054e5eeb 100644 --- a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.component.js +++ b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.component.js @@ -1,108 +1,92 @@ import template from './organizationSignaturesSign.html'; angular.module('campusContactsApp').component('organizationSignaturesSign', { - template: template, - controller: organizationSignaturesSignController, + template, + controller: organizationSignaturesSignController, }); function organizationSignaturesSignController( - state, - authenticationService, - httpProxy, - $state, - $rootScope, - $scope, - $filter, - $sce, + state, + authenticationService, + httpProxy, + $state, + $rootScope, + $scope, + $filter, + $sce, ) { - this.nonSignedAgreements = ['code_of_conduct', 'statement_of_faith']; - this.hasDeclined = false; - - let deregisterStateChangedEvent; - - const sendAgreement = (orgId, type, status) => { - const params = { - include: [], - data: { - attributes: { - kind: type, - status: status, - }, - }, - }; - - return httpProxy.post(`/organizations/${orgId}/signatures`, params, { - errorMessage: 'error.messages.signature_request', - }); + this.nonSignedAgreements = ['code_of_conduct', 'statement_of_faith']; + this.hasDeclined = false; + + let deregisterStateChangedEvent; + + const sendAgreement = (orgId, type, status) => { + const params = { + include: [], + data: { + attributes: { + kind: type, + status, + }, + }, }; - const updateAllAgreements = async (orgIds, type, status) => { - await Promise.all( - orgIds.map((orgId) => sendAgreement(orgId, type, status)), - ); - }; + return httpProxy.post(`/organizations/${orgId}/signatures`, params, { + errorMessage: 'error.messages.signature_request', + }); + }; - const updateAgreement = async (type, status) => { - await updateAllAgreements( - state.organization_with_missing_signatures_ids, - type, - status, - ); + const updateAllAgreements = async (orgIds, type, status) => { + await Promise.all(orgIds.map((orgId) => sendAgreement(orgId, type, status))); + }; - this.nonSignedAgreements = this.nonSignedAgreements.filter( - (t) => t !== type, - ); + const updateAgreement = async (type, status) => { + await updateAllAgreements(state.organization_with_missing_signatures_ids, type, status); - $scope.$apply(); - }; + this.nonSignedAgreements = this.nonSignedAgreements.filter((t) => t !== type); - const hasAgreedTo = (type) => { - const signed = this.nonSignedAgreements.find((t) => t === type); - return !signed; - }; + $scope.$apply(); + }; - this.$onInit = () => { - authenticationService.updateUserData(); - - deregisterStateChangedEvent = $rootScope.$on( - 'state:changed', - (event, data) => { - if (data.organization_with_missing_signatures_ids.length <= 0) - authenticationService.postAuthRedirect(); - }, - ); - - this.codeOfConductText = $sce.trustAsHtml( - $filter('t')('signatures.agreements.codeOfConduct.text'), - ); - this.statementOfFaithText = $sce.trustAsHtml( - $filter('t')('signatures.agreements.statementOfFaith.text'), - ); - }; + const hasAgreedTo = (type) => { + const signed = this.nonSignedAgreements.find((t) => t === type); + return !signed; + }; - this.$onDestroy = () => { - deregisterStateChangedEvent(); - }; + this.$onInit = () => { + authenticationService.updateUserData(); - this.returnToApp = () => { - authenticationService.updateUserData(); - authenticationService.postAuthRedirect(); - }; + deregisterStateChangedEvent = $rootScope.$on('state:changed', (event, data) => { + if (data.organization_with_missing_signatures_ids.length <= 0) authenticationService.postAuthRedirect(); + }); - this.acceptAgreement = async (type) => { - updateAgreement(type, 'accepted'); - }; + this.codeOfConductText = $sce.trustAsHtml($filter('t')('signatures.agreements.codeOfConduct.text')); + this.statementOfFaithText = $sce.trustAsHtml($filter('t')('signatures.agreements.statementOfFaith.text')); + }; - this.declineAgreement = async (type) => { - this.hasDeclined = true; - await updateAgreement(type, 'declined'); - }; + this.$onDestroy = () => { + deregisterStateChangedEvent(); + }; - this.hasSignedCodeOfConduct = () => { - return hasAgreedTo('code_of_conduct'); - }; + this.returnToApp = () => { + authenticationService.updateUserData(); + authenticationService.postAuthRedirect(); + }; - this.hasSignedSignedStatementOfFaith = () => { - return hasAgreedTo('statement_of_faith'); - }; + this.acceptAgreement = async (type) => { + updateAgreement(type, 'accepted'); + }; + + this.declineAgreement = async (type) => { + this.hasDeclined = true; + await updateAgreement(type, 'declined'); + }; + + this.hasSignedCodeOfConduct = () => { + return hasAgreedTo('code_of_conduct'); + }; + + this.hasSignedSignedStatementOfFaith = () => { + return hasAgreedTo('statement_of_faith'); + }; } diff --git a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.html b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.html index 928e9a7c44..0a3d602a6f 100644 --- a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.html +++ b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignaturesSign.html @@ -1,66 +1,59 @@
    -
    -

    {{ 'signatures.agreements.codeOfConduct.title' | t }}

    -
    -
    - - -
    -
    -
    +

    {{ 'signatures.agreements.codeOfConduct.title' | t }}

    +
    +
    + + +
    +
    +
    +

    {{ 'signatures.agreements.statementOfFaith.title' | t }}

    +
    +
    + + +
    +
    +
    +
    +

    {{ 'signatures.agreements.accepted.message' | t }}

    +
    +
    +

    {{ 'signatures.agreements.declined.title' | t }}

    +
    +

    {{ 'signatures.agreements.declined.mainBlurb' | t }}

    +

    {{ 'signatures.agreements.declined.requestAccessBlurb' | t }}

    +
    +
    + - -
    - -
    -
    -

    {{ 'signatures.agreements.accepted.message' | t }}

    -
    -
    -

    {{ 'signatures.agreements.declined.title' | t }}

    -
    -

    {{ 'signatures.agreements.declined.mainBlurb' | t }}

    -

    - {{ 'signatures.agreements.declined.requestAccessBlurb' | t - }} -

    -
    -
    - -
    + {{ 'signatures.agreements.button' | t }} + +
    diff --git a/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.component.js b/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.component.js index 83a1e02ae7..395a3b9ddf 100644 --- a/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.component.js +++ b/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.component.js @@ -2,30 +2,30 @@ import template from './organizationalStats.html'; import './organizationalStats.scss'; angular.module('campusContactsApp').component('organizationalStats', { - bindings: { - org: '<', - }, - controller: organizationalStatsController, - template: template, + bindings: { + org: '<', + }, + controller: organizationalStatsController, + template, }); function organizationalStatsController($scope, periodService, reportsService) { - var vm = this; + const vm = this; - vm.getInteractionCount = getInteractionCount; + vm.getInteractionCount = getInteractionCount; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - periodService.subscribe($scope, lookupReport); - lookupReport(); - } + function activate() { + periodService.subscribe($scope, lookupReport); + lookupReport(); + } - function lookupReport() { - vm.report = reportsService.lookupOrganizationReport(vm.org.id); - } + function lookupReport() { + vm.report = reportsService.lookupOrganizationReport(vm.org.id); + } - function getInteractionCount(interactionTypeId) { - return reportsService.getInteractionCount(vm.report, interactionTypeId); - } + function getInteractionCount(interactionTypeId) { + return reportsService.getInteractionCount(vm.report, interactionTypeId); + } } diff --git a/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.html b/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.html index fe783df8a7..9bc04ca699 100644 --- a/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.html +++ b/app/assets/javascripts/angular/components/organizationalStats/organizationalStats.html @@ -1,24 +1,24 @@
    - {{ ($ctrl.report.contact_count | number) || '-' }} + {{ ($ctrl.report.contact_count | number) || '-' }}
    - - + - {{ $ctrl.report.uncontacted_count | number }} - - - - + ng-if="$ctrl.report.uncontacted_count" + > + {{ $ctrl.report.uncontacted_count | number }} + + + -
    diff --git a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.js b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.js index 45a44d2721..9f688c6896 100644 --- a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.js +++ b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.js @@ -2,216 +2,173 @@ import template from './peopleFiltersPanel.html'; import './peopleFiltersPanel.scss'; angular.module('campusContactsApp').component('peopleFiltersPanel', { - controller: peopleFiltersPanelController, - template: template, - bindings: { - filtersChanged: '&', - organizationId: '<', - surveyId: '<', - questions: '<', - preloadedFilters: '<', - }, + controller: peopleFiltersPanelController, + template, + bindings: { + filtersChanged: '&', + organizationId: '<', + surveyId: '<', + questions: '<', + preloadedFilters: '<', + }, }); -function peopleFiltersPanelController( - $rootScope, - $scope, - httpProxy, - modelsService, - peopleFiltersPanelService, - _, -) { - this.filtersApplied = false; - this.groupOptions = []; - this.assignmentOptions = []; - this.labelOptions = []; - this.statusOptions = []; - this.genderOptions = []; - this.permissionOptions = []; - this.questionOptions = []; - this.filters = {}; - - this.$onInit = () => { - loadFilterStats(); - this.personModifiedUnsubscribe = $rootScope.$on( - 'personModified', - loadFilterStats, - ); - this.massEditAppliedUnsubscribe = $rootScope.$on( - 'massEditApplied', - loadFilterStats, - ); - // Listen for an update that the filter count may have changed - this.updateFilterCount = $rootScope.$on('updateFilterCount', () => { - loadFilterStats(); - }); +function peopleFiltersPanelController($rootScope, $scope, httpProxy, modelsService, peopleFiltersPanelService, _) { + this.filtersApplied = false; + this.groupOptions = []; + this.assignmentOptions = []; + this.labelOptions = []; + this.statusOptions = []; + this.genderOptions = []; + this.permissionOptions = []; + this.questionOptions = []; + this.filters = {}; + + this.$onInit = () => { + loadFilterStats(); + this.personModifiedUnsubscribe = $rootScope.$on('personModified', loadFilterStats); + this.massEditAppliedUnsubscribe = $rootScope.$on('massEditApplied', loadFilterStats); + // Listen for an update that the filter count may have changed + this.updateFilterCount = $rootScope.$on('updateFilterCount', () => { + loadFilterStats(); + }); + }; + + this.$onChanges = (changes) => { + if (changes.preloadedFilters && changes.preloadedFilters.currentValue !== changes.preloadedFilters.previousValue) { + this.filters = { + searchString: '', + labels: {}, + assignedTos: {}, + statuses: {}, + permissions: {}, + groups: {}, + questions: {}, + answerMatchingOptions: {}, + includeArchived: false, + ...changes.preloadedFilters.currentValue, + }; + + this.updateFilters(); + } + }; + + this.$onDestroy = () => { + this.personModifiedUnsubscribe(); + this.massEditAppliedUnsubscribe(); + this.updateFilterCount(); + }; + + this.hideNonFilterableQuestionAnswerResponse = (question) => { + if (question.kind !== 'TextField') return false; + + return question.label.toLowerCase() === 'last name' || question.label.toLowerCase() === 'first name'; + }; + + this.resetFilters = () => { + this.filters = { + searchString: '', + labels: {}, + assignedTos: {}, + statuses: {}, + permissions: {}, + groups: {}, + questions: {}, + answerMatchingOptions: {}, + includeArchived: false, }; - - this.$onChanges = (changes) => { - if ( - changes.preloadedFilters && - changes.preloadedFilters.currentValue !== - changes.preloadedFilters.previousValue - ) { - this.filters = { - searchString: '', - labels: {}, - assignedTos: {}, - statuses: {}, - permissions: {}, - groups: {}, - questions: {}, - answerMatchingOptions: {}, - includeArchived: false, - ...changes.preloadedFilters.currentValue, - }; - - this.updateFilters(); - } - }; - - this.$onDestroy = () => { - this.personModifiedUnsubscribe(); - this.massEditAppliedUnsubscribe(); - this.updateFilterCount(); - }; - - this.hideNonFilterableQuestionAnswerResponse = (question) => { - if (question.kind !== 'TextField') return false; - - return ( - question.label.toLowerCase() === 'last name' || - question.label.toLowerCase() === 'first name' - ); - }; - - this.resetFilters = () => { - this.filters = { - searchString: '', - labels: {}, - assignedTos: {}, - statuses: {}, - permissions: {}, - groups: {}, - questions: {}, - answerMatchingOptions: {}, - includeArchived: false, - }; - }; - - this.updateFilters = (option, questionId) => { - const questionFilter = - option === 'no_response' || option === 'any_response' ? option : ''; - - if (questionId) { - this.filters.questions = { - ...this.filters.questions, - ...{ [questionId]: questionFilter }, - }; - } - - this.filtersApplied = peopleFiltersPanelService.filtersHasActive( - getNormalizedFilters(), - ); - sendFilters(); - }; - - // Send the filters to this component's parent via the filtersChanged binding - const sendFilters = () => { - this.filtersChanged({ filters: getNormalizedFilters() }); - }; - - const loadFilterStats = () => { - return httpProxy - .get( - modelsService - .getModelMetadata('filter_stats') - .url.single(this.surveyId ? 'survey' : 'people'), - { - organization_id: this.organizationId, - survey_id: this.surveyId, - include_unassigned: true, - }, - { - errorMessage: - 'error.messages.people_filters_panel.load_filter_stats', - }, - ) - .then(httpProxy.extractModel) - .then((stats) => { - this.labelOptions = stats.labels; - this.assignmentOptions = stats.assigned_tos; - this.groupOptions = stats.groups; - this.statusOptions = stats.statuses.filter( - (option) => option.followup_status !== 'do_not_email', - ); - this.permissionOptions = stats.permissions; - this.genderOptions = stats.genders; - this.questionOptions = stats.questions; - - // Restrict the active filters to currently valid options - // A filter could include a non-existent label, for example, if people were edited so that no one - // has that label anymore - this.filters.labels = _.pick( - this.filters.labels, - _.map(this.labelOptions, 'label_id'), - ); - this.filters.assignedTos = _.pick( - this.filters.assignedTos, - _.map(this.assignmentOptions, 'person_id'), - ); - - this.filters.groups = _.pick( - this.filters.groups, - _.map(this.groupOptions, 'group_id'), - ); - }); - }; - - this.findStats = ({ id }) => - this.questionOptions.find(({ question_id }) => question_id === id); - - const emptyArrayToUndefined = (value) => - value.length === 0 ? undefined : value; - - const getFiltersFromObj = _.flow([ - _.pickBy, // keep truthy key/value pairs - Object.keys, // get array of keys - emptyArrayToUndefined, - ]); - - const getNormalizedFilters = () => { - const questions = _.flow([ - (questions) => - _.mapValues(questions, (answers) => - getFiltersFromObj( - typeof answers === 'string' - ? { [answers]: !!answers } // becomes falsy if answer is empty string - : answers, - ), - ), - _.pickBy, // keep truthy key/value pairs - ])(this.filters.questions); - - return { - searchString: this.filters.searchString, - includeArchived: this.filters.includeArchived, - labels: getFiltersFromObj(this.filters.labels), - assignedTos: getFiltersFromObj(this.filters.assigned_tos), - groups: getFiltersFromObj(this.filters.groups), - statuses: getFiltersFromObj(this.filters.statuses), - permissions: getFiltersFromObj(this.filters.permissions), - genders: getFiltersFromObj(this.filters.genders), - questions, - answerMatchingOptions: _.flow([ - // Use defined questions to determine which matching options need to be sent - (questions) => - _.mapValues( - questions, - (_, id) => this.filters.answerMatchingOptions[id], - ), - _.pickBy, - ])(questions), - }; + }; + + this.updateFilters = (option, questionId) => { + const questionFilter = option === 'no_response' || option === 'any_response' ? option : ''; + + if (questionId) { + this.filters.questions = { + ...this.filters.questions, + ...{ [questionId]: questionFilter }, + }; + } + + this.filtersApplied = peopleFiltersPanelService.filtersHasActive(getNormalizedFilters()); + sendFilters(); + }; + + // Send the filters to this component's parent via the filtersChanged binding + const sendFilters = () => { + this.filtersChanged({ filters: getNormalizedFilters() }); + }; + + const loadFilterStats = () => { + return httpProxy + .get( + modelsService.getModelMetadata('filter_stats').url.single(this.surveyId ? 'survey' : 'people'), + { + organization_id: this.organizationId, + survey_id: this.surveyId, + include_unassigned: true, + }, + { + errorMessage: 'error.messages.people_filters_panel.load_filter_stats', + }, + ) + .then(httpProxy.extractModel) + .then((stats) => { + this.labelOptions = stats.labels; + this.assignmentOptions = stats.assigned_tos; + this.groupOptions = stats.groups; + this.statusOptions = stats.statuses.filter((option) => option.followup_status !== 'do_not_email'); + this.permissionOptions = stats.permissions; + this.genderOptions = stats.genders; + this.questionOptions = stats.questions; + + // Restrict the active filters to currently valid options + // A filter could include a non-existent label, for example, if people were edited so that no one + // has that label anymore + this.filters.labels = _.pick(this.filters.labels, _.map(this.labelOptions, 'label_id')); + this.filters.assignedTos = _.pick(this.filters.assignedTos, _.map(this.assignmentOptions, 'person_id')); + + this.filters.groups = _.pick(this.filters.groups, _.map(this.groupOptions, 'group_id')); + }); + }; + + this.findStats = ({ id }) => this.questionOptions.find(({ question_id }) => question_id === id); + + const emptyArrayToUndefined = (value) => (value.length === 0 ? undefined : value); + + const getFiltersFromObj = _.flow([ + _.pickBy, // keep truthy key/value pairs + Object.keys, // get array of keys + emptyArrayToUndefined, + ]); + + const getNormalizedFilters = () => { + const questions = _.flow([ + (questions) => + _.mapValues(questions, (answers) => + getFiltersFromObj( + typeof answers === 'string' + ? { [answers]: !!answers } // becomes falsy if answer is empty string + : answers, + ), + ), + _.pickBy, // keep truthy key/value pairs + ])(this.filters.questions); + + return { + searchString: this.filters.searchString, + includeArchived: this.filters.includeArchived, + labels: getFiltersFromObj(this.filters.labels), + assignedTos: getFiltersFromObj(this.filters.assigned_tos), + groups: getFiltersFromObj(this.filters.groups), + statuses: getFiltersFromObj(this.filters.statuses), + permissions: getFiltersFromObj(this.filters.permissions), + genders: getFiltersFromObj(this.filters.genders), + questions, + answerMatchingOptions: _.flow([ + // Use defined questions to determine which matching options need to be sent + (questions) => _.mapValues(questions, (_, id) => this.filters.answerMatchingOptions[id]), + _.pickBy, + ])(questions), }; + }; } diff --git a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.html b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.html index db9404adf7..bd2f9c1ae3 100644 --- a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.html +++ b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.html @@ -1,312 +1,188 @@
    - + -
    +
    + +
    + + + + {{'search.labels.title' | t}} + + +
    - - - - {{'search.labels.title' | t}} - - - - - - - - {{'search.assignments.title' | t}} - - - - - + {{ labelOption.i18n ? (labelOption.i18n | t) : labelOption.name }} + {{ labelOption.count }} + + + + + + {{'search.assignments.title' | t}} + + + + + - - - {{'search.status.title' | t}} - - - - - + + + {{'search.status.title' | t}} + + + + + - - - {{'search.permission.title' | t}} - - - - - + + + {{'search.permission.title' | t}} + + + + + - - - {{'search.gender.title' | t}} - - - - - + + + {{'search.gender.title' | t}} + + + + + - - - {{'search.groups.title' | t}} - - - - - + + + {{'search.groups.title' | t}} + + + + + - + + {{'search.questions.title' | t}} + + + + class="filter-sub-row filter-groups" + ng-repeat="question in $ctrl.questions" + ng-if="question.kind === 'TextField' || $ctrl.findStats(question)" + > - {{'search.questions.title' | t}} + {{question.label}} - - - {{question.label}} - - - - - - - - - -
    -
    diff --git a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.js b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.js index 8571be153c..c1abaec460 100644 --- a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.js +++ b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.js @@ -1,25 +1,23 @@ import _ from 'lodash'; -angular - .module('campusContactsApp') - .factory('peopleFiltersPanelService', peopleFiltersPanelService); +angular.module('campusContactsApp').factory('peopleFiltersPanelService', peopleFiltersPanelService); function peopleFiltersPanelService() { - return { - // Determine whether a filters object contains any active filters or not - filtersHasActive: function (filters) { - return ( - Boolean(filters.searchString) || - filters.includeArchived === true || - _.keys(filters.labels).length > 0 || - _.keys(filters.assignedTos).length > 0 || - _.keys(filters.groups).length > 0 || - _.keys(filters.statuses).length > 0 || - _.keys(filters.permissions).length > 0 || - _.keys(filters.genders).length > 0 || - _.keys(filters.questions).length > 0 || - filters.includeArchived === true - ); - }, - }; + return { + // Determine whether a filters object contains any active filters or not + filtersHasActive: function (filters) { + return ( + Boolean(filters.searchString) || + filters.includeArchived === true || + _.keys(filters.labels).length > 0 || + _.keys(filters.assignedTos).length > 0 || + _.keys(filters.groups).length > 0 || + _.keys(filters.statuses).length > 0 || + _.keys(filters.permissions).length > 0 || + _.keys(filters.genders).length > 0 || + _.keys(filters.questions).length > 0 || + filters.includeArchived === true + ); + }, + }; } diff --git a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.spec.js b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.spec.js index e0558fa1b8..2fe4ee14d4 100644 --- a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.spec.js +++ b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.service.spec.js @@ -1,68 +1,66 @@ import 'angular-mocks'; // Constants -var peopleFiltersPanelService; +let peopleFiltersPanelService; describe('peopleFiltersPanelService', function () { - beforeEach(inject(function (_peopleFiltersPanelService_) { - peopleFiltersPanelService = _peopleFiltersPanelService_; - })); + beforeEach(inject(function (_peopleFiltersPanelService_) { + peopleFiltersPanelService = _peopleFiltersPanelService_; + })); - describe('filtersHasActive', function () { - it('should return true when a search string filter is present', function () { - expect( - peopleFiltersPanelService.filtersHasActive({ - searchString: 'John', - }), - ).toEqual(true); - }); + describe('filtersHasActive', function () { + it('should return true when a search string filter is present', function () { + expect( + peopleFiltersPanelService.filtersHasActive({ + searchString: 'John', + }), + ).toEqual(true); + }); - it('should return true when an archived filter is present', function () { - expect( - peopleFiltersPanelService.filtersHasActive({ - includeArchived: true, - }), - ).toEqual(true); - }); + it('should return true when an archived filter is present', function () { + expect( + peopleFiltersPanelService.filtersHasActive({ + includeArchived: true, + }), + ).toEqual(true); + }); - it('should return true when a label filter is present', function () { - expect( - peopleFiltersPanelService.filtersHasActive({ - labels: { 1: true }, - }), - ).toEqual(true); - }); + it('should return true when a label filter is present', function () { + expect( + peopleFiltersPanelService.filtersHasActive({ + labels: { 1: true }, + }), + ).toEqual(true); + }); - it('should return true when an assigned to filter is present', function () { - expect( - peopleFiltersPanelService.filtersHasActive({ - assignedTos: { 1: true }, - }), - ).toEqual(true); - }); + it('should return true when an assigned to filter is present', function () { + expect( + peopleFiltersPanelService.filtersHasActive({ + assignedTos: { 1: true }, + }), + ).toEqual(true); + }); - it('should return true when a group filter is present', function () { - expect( - peopleFiltersPanelService.filtersHasActive({ - groups: { 1: true }, - }), - ).toEqual(true); - }); + it('should return true when a group filter is present', function () { + expect( + peopleFiltersPanelService.filtersHasActive({ + groups: { 1: true }, + }), + ).toEqual(true); + }); - it('should return false when no filters are present', function () { - expect(peopleFiltersPanelService.filtersHasActive({})).toEqual( - false, - ); + it('should return false when no filters are present', function () { + expect(peopleFiltersPanelService.filtersHasActive({})).toEqual(false); - expect( - peopleFiltersPanelService.filtersHasActive({ - searchString: '', - includeArchived: false, - labels: {}, - assignedTos: {}, - groups: {}, - }), - ).toEqual(false); - }); + expect( + peopleFiltersPanelService.filtersHasActive({ + searchString: '', + includeArchived: false, + labels: {}, + assignedTos: {}, + groups: {}, + }), + ).toEqual(false); }); + }); }); diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.js b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.js index 5b4e2db82c..e1785e90c3 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.js +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.js @@ -14,519 +14,462 @@ import closeIcon from '../../../../images/icons/close.svg'; import template from './peopleScreen.html'; angular.module('campusContactsApp').component('peopleScreen', { - controller: peopleScreenController, - bindings: { - org: '<', - loaderService: '<', - surveyId: '<', - questions: '<', - queryFilters: '<', - }, - require: { - organizationOverview: '^', - }, - template: template, + controller: peopleScreenController, + bindings: { + org: '<', + loaderService: '<', + surveyId: '<', + questions: '<', + queryFilters: '<', + }, + require: { + organizationOverview: '^', + }, + template, }); function peopleScreenController( - $rootScope, - $scope, - $filter, - $uibModal, - confirmModalService, - peopleScreenService, - personService, - peopleFiltersPanelService, - organizationOverviewTeamService, - loggedInPerson, - ProgressiveListLoader, - RequestDeduper, + $rootScope, + $scope, + $filter, + $uibModal, + confirmModalService, + peopleScreenService, + personService, + peopleFiltersPanelService, + organizationOverviewTeamService, + loggedInPerson, + ProgressiveListLoader, + RequestDeduper, ) { - const listLoader = new ProgressiveListLoader({ - modelType: 'person', - requestDeduper: new RequestDeduper(), - errorMessage: - 'error.messages.organization_overview_people.load_people_chunk', - }); - - this.people = []; - this.multiSelection = {}; - this.filters = {}; - this.loadedAll = false; - this.busy = false; - this.selectedCount = 0; - this.totalCount = 0; - this.$rootScope = $rootScope; - - // Icons - this.pencilIcon = pencilIcon; - this.mergeIcon = mergeIcon; - this.emailIcon = emailIcon; - this.messageIcon = messageIcon; - this.downloadCsvIcon = downloadCsvIcon; - this.transferIcon = transferIcon; - this.archiveIcon = archiveIcon; - this.deleteIcon = deleteIcon; - this.closeIcon = closeIcon; - - // represents if the user has checked the "Select All" checkbox - this.selectAllValue = false; + const listLoader = new ProgressiveListLoader({ + modelType: 'person', + requestDeduper: new RequestDeduper(), + errorMessage: 'error.messages.organization_overview_people.load_people_chunk', + }); + + this.people = []; + this.multiSelection = {}; + this.filters = {}; + this.loadedAll = false; + this.busy = false; + this.selectedCount = 0; + this.totalCount = 0; + this.$rootScope = $rootScope; + + // Icons + this.pencilIcon = pencilIcon; + this.mergeIcon = mergeIcon; + this.emailIcon = emailIcon; + this.messageIcon = messageIcon; + this.downloadCsvIcon = downloadCsvIcon; + this.transferIcon = transferIcon; + this.archiveIcon = archiveIcon; + this.deleteIcon = deleteIcon; + this.closeIcon = closeIcon; + + // represents if the user has checked the "Select All" checkbox + this.selectAllValue = false; + + // Define the columns that can be selected as sort keys + // The "getSortKey" method returns the value that a person should be sorted by when sorting by that column + this.columns = [ + { + name: 'name', + cssClass: 'name-column', + label: 'ministries.people.name', + sortable: true, + getSortKey: (person) => { + return [(person.last_name || '').toLowerCase(), (person.first_name || '').toLowerCase()]; + }, + orderFields: ['last_name', 'first_name'], + }, + { + name: 'gender', + cssClass: 'detail-column gender-column', + label: 'ministries.people.gender', + sortable: true, + getSortKey: (person) => { + return person.gender; + }, + orderFields: ['gender', 'last_name', 'first_name'], + }, + { + name: 'assignment', + cssClass: 'detail-column assigned-to-column', + label: 'assignments.assignment', + sortable: false, + }, + { + name: 'status', + cssClass: 'detail-column status-column', + label: 'ministries.people.status', + sortable: true, + getSortKey: (person) => { + const orgPermission = personService.getOrgPermission(person, this.org.id); + + if (!orgPermission || orgPermission.archive_date !== null) return 'Archived'; + + return personService.getFollowupStatus(person, this.org.id); + }, + orderFields: ['organizational_permissions.followup_status', 'last_name', 'first_name'], + }, + { + name: 'contactActions', + cssClass: 'detail-column contact-actions-column', + label: 'ministries.people.contactActions', + sortable: false, + }, + ]; - // Define the columns that can be selected as sort keys - // The "getSortKey" method returns the value that a person should be sorted by when sorting by that column - this.columns = [ - { - name: 'name', - cssClass: 'name-column', - label: 'ministries.people.name', - sortable: true, - getSortKey: (person) => { - return [ - (person.last_name || '').toLowerCase(), - (person.first_name || '').toLowerCase(), - ]; - }, - orderFields: ['last_name', 'first_name'], - }, - { - name: 'gender', - cssClass: 'detail-column gender-column', - label: 'ministries.people.gender', - sortable: true, - getSortKey: (person) => { - return person.gender; - }, - orderFields: ['gender', 'last_name', 'first_name'], - }, - { - name: 'assignment', - cssClass: 'detail-column assigned-to-column', - label: 'assignments.assignment', - sortable: false, - }, - { - name: 'status', - cssClass: 'detail-column status-column', - label: 'ministries.people.status', - sortable: true, - getSortKey: (person) => { - const orgPermission = personService.getOrgPermission( - person, - this.org.id, - ); - - if (!orgPermission || orgPermission.archive_date !== null) - return 'Archived'; - - return personService.getFollowupStatus(person, this.org.id); - }, - orderFields: [ - 'organizational_permissions.followup_status', - 'last_name', - 'first_name', - ], - }, - { - name: 'contactActions', - cssClass: 'detail-column contact-actions-column', - label: 'ministries.people.contactActions', - sortable: false, - }, - ]; + this.defaultSortOrder = { column: this.columns[0], direction: 'asc' }; - this.defaultSortOrder = { column: this.columns[0], direction: 'asc' }; + let unsubscribe = null; - let unsubscribe = null; + this.$onInit = () => { + if (this.surveyId) addLastSurveyColumn(); - this.$onInit = () => { - if (this.surveyId) addLastSurveyColumn(); + unsubscribe = $rootScope.$on('personCreated', (event, person) => { + onNewPerson(person); + }); - unsubscribe = $rootScope.$on('personCreated', (event, person) => { - onNewPerson(person); + this.sortOrder = _.clone(this.defaultSortOrder); + this.isAdmin = loggedInPerson.isAdminAt(this.org); + + $scope.$watch( + '$ctrl.multiSelection', + () => { + this.selectedCount = selectedCount(); + }, + true, + ); + }; + + this.$onDestroy = () => { + unsubscribe(); + }; + + const addLastSurveyColumn = () => { + this.columns.push({ + name: 'lastSurvey', + cssClass: 'detail-column last-survey-column', + label: 'ministries.people.lastSurvey', + sortable: true, + getSortKey: (person) => { + const lastSurvey = personService.getLastSurvey(person); + if (!lastSurvey) return '1969-12-12 00:00:00'; // Force null to buttom of list + return lastSurvey; + }, + orderFields: ['answer_sheets.updated_at', 'last_name', 'first_name'], + }); + }; + + const selectedCount = () => { + // because multiSelection is only a list of the loaded records, + // we need to count the ones that are explicitly un-selected when + // select all is checked + const unselected = getUnselectedPeople().length; + + // has the user unselected all of the records? + if (unselected === this.totalCount) { + this.selectAllValue = false; + } + + if (this.selectAllValue) { + return this.totalCount - unselected; + } + return getSelectedPeople().length; + }; + + this.loadPersonPage = () => { + this.busy = true; + const orgId = this.org.id; + + // Generate the sort order list + return peopleScreenService + .loadMoreOrgPeople(orgId, this.filters, getOrder(), listLoader, this.loaderService, this.surveyId) + .then((resp) => { + const oldPeople = this.people; + this.people = resp.list; + this.loadedAll = resp.loadedAll; + this.totalCount = resp.total; + // Set the selected state of all of the new people + _.differenceBy(this.people, oldPeople, 'id').forEach((person) => { + this.multiSelection[person.id] = this.selectAllValue; }); - + }) + .finally(() => { + this.busy = false; + }); + }; + + // Respond to the creation of a new person by potentially adding it to the person list, updating counts, etc. + const onNewPerson = (person) => { + // If filters are applied, then refresh the list because the new person may or may not be included + // in the person list. If no filters applied, simply add it to the person list. + if (peopleFiltersPanelService.filtersHasActive(this.filters)) { + resetList(); + this.loadPersonPage(); + } else { + this.people.push(person); + this.totalCount++; + this.multiSelection[person.id] = this.selectAllValue; + } + + // Update the people count shown in the people tab + if (this.organizationOverview.people) { + this.organizationOverview.people.length++; + // When a new person is added, check if the Team count has changed and update the UI + organizationOverviewTeamService + .loadOrgTeamCount(this.org.id) + .then((resp) => (this.organizationOverview.team.length = resp)); + } + // Emit to tell the peopleFilterPanel component that the assigned to count could have changed + $rootScope.$emit('updateFilterCount'); + }; + + // Return an array of the ids of all people with the specified selection state (true for selected, false for + // unselected) + const getPeopleByState = (state) => { + return _.chain(this.multiSelection) + .pickBy((selected) => { + return selected === state; + }) + .keys() + .value(); + }; + + // Return an array of the ids of all selected people + const getSelectedPeople = () => { + return getPeopleByState(true); + }; + + // Return an array of the ids of all selected people + const getUnselectedPeople = () => { + return getPeopleByState(false); + }; + + const resetList = () => { + this.people = []; + listLoader.reset(); + this.loadedAll = false; + this.selectAllValue = false; + this.multiSelection = {}; + }; + + this.filtersChanged = (newFilters) => { + this.filters = newFilters; + resetList(); + this.loadPersonPage(); + }; + + this.setSortColumn = (column) => { + if (this.sortOrder.column === column) { + if (this.sortOrder.direction === 'asc') { + this.sortOrder.direction = 'desc'; + } else if (this.sortOrder.direction === 'desc') { this.sortOrder = _.clone(this.defaultSortOrder); - this.isAdmin = loggedInPerson.isAdminAt(this.org); - - $scope.$watch( - '$ctrl.multiSelection', - () => { - this.selectedCount = selectedCount(); - }, - true, - ); - }; - - this.$onDestroy = () => { - unsubscribe(); - }; - - const addLastSurveyColumn = () => { - this.columns.push({ - name: 'lastSurvey', - cssClass: 'detail-column last-survey-column', - label: 'ministries.people.lastSurvey', - sortable: true, - getSortKey: (person) => { - const lastSurvey = personService.getLastSurvey(person); - if (!lastSurvey) return '1969-12-12 00:00:00'; //Force null to buttom of list - return lastSurvey; - }, - orderFields: [ - 'answer_sheets.updated_at', - 'last_name', - 'first_name', - ], - }); - }; - - const selectedCount = () => { - // because multiSelection is only a list of the loaded records, - // we need to count the ones that are explicitly un-selected when - // select all is checked - const unselected = getUnselectedPeople().length; - - // has the user unselected all of the records? - if (unselected === this.totalCount) { - this.selectAllValue = false; - } - - if (this.selectAllValue) { - return this.totalCount - unselected; - } - return getSelectedPeople().length; - }; - - this.loadPersonPage = () => { - this.busy = true; - const orgId = this.org.id; - - // Generate the sort order list - return peopleScreenService - .loadMoreOrgPeople( - orgId, - this.filters, - getOrder(), - listLoader, - this.loaderService, - this.surveyId, - ) - .then((resp) => { - const oldPeople = this.people; - this.people = resp.list; - this.loadedAll = resp.loadedAll; - this.totalCount = resp.total; - // Set the selected state of all of the new people - _.differenceBy(this.people, oldPeople, 'id').forEach( - (person) => { - this.multiSelection[person.id] = this.selectAllValue; - }, - ); - }) - .finally(() => { - this.busy = false; - }); + } + } else { + this.sortOrder.column = column; + this.sortOrder.direction = 'asc'; + } + + // Reload the list of people using the new sort order + resetList(); + this.loadPersonPage(); + }; + + this.selectAll = () => { + this.people.forEach((person) => { + this.multiSelection[person.id] = this.selectAllValue; + }); + }; + + // Get the current selection in a standard form + const getSelection = () => { + return { + orgId: this.org.id, + surveyId: this.surveyId, + filters: this.filters, + selectedPeople: getSelectedPeople(), + unselectedPeople: getUnselectedPeople(), + totalSelectedPeople: this.selectedCount, + allSelected: this.selectAllValue, + allIncluded: this.loadedAll, }; + }; - // Respond to the creation of a new person by potentially adding it to the person list, updating counts, etc. - const onNewPerson = (person) => { - // If filters are applied, then refresh the list because the new person may or may not be included - // in the person list. If no filters applied, simply add it to the person list. - if (peopleFiltersPanelService.filtersHasActive(this.filters)) { - resetList(); - this.loadPersonPage(); - } else { - this.people.push(person); - this.totalCount++; - this.multiSelection[person.id] = this.selectAllValue; - } + // Get the current sort order + const getOrder = () => { + return this.sortOrder.column.orderFields.map((fieldName) => { + return { field: fieldName, direction: this.sortOrder.direction }; + }); + }; + + // Open a modal to mass-edit all selected people + this.massEdit = () => { + $uibModal + .open({ + component: 'massEdit', + resolve: { + selection: _.constant(getSelection()), + }, + windowClass: 'pivot_theme', + size: 'md', + }) + .result.then(() => { + $scope.$broadcast('massEditApplied'); - // Update the people count shown in the people tab - if (this.organizationOverview.people) { - this.organizationOverview.people.length++; - // When a new person is added, check if the Team count has changed and update the UI - organizationOverviewTeamService - .loadOrgTeamCount(this.org.id) - .then((resp) => (this.organizationOverview.team.length = resp)); + // Determine whether any filters are applied + if (!peopleFiltersPanelService.filtersHasActive(this.filters)) { + // When there are no filters, we only need to make sure that all the people that people in the list + // are assigned to are loaded + peopleScreenService.loadAssignedTos(this.people, this.org.id); + return; } - // Emit to tell the peopleFilterPanel component that the assigned to count could have changed - $rootScope.$emit('updateFilterCount'); - }; - - // Return an array of the ids of all people with the specified selection state (true for selected, false for - // unselected) - const getPeopleByState = (state) => { - return _.chain(this.multiSelection) - .pickBy((selected) => { - return selected === state; - }) - .keys() - .value(); - }; - - // Return an array of the ids of all selected people - const getSelectedPeople = () => { - return getPeopleByState(true); - }; - // Return an array of the ids of all selected people - const getUnselectedPeople = () => { - return getPeopleByState(false); - }; + // When there are filters, we need to reload the entire people list because those people might not match + // the filter anymore and we are currently choosing not to do client-side filtering - const resetList = () => { - this.people = []; - listLoader.reset(); - this.loadedAll = false; - this.selectAllValue = false; - this.multiSelection = {}; - }; + const originalSelectAllValue = this.selectAllValue; + const originalMultiSelection = this.multiSelection; - this.filtersChanged = (newFilters) => { - this.filters = newFilters; + // Empty and reload the people list resetList(); - this.loadPersonPage(); - }; + this.loadPersonPage().then(() => { + // Restore the select all value and the selection states of all people that are still loaded - this.setSortColumn = (column) => { - if (this.sortOrder.column === column) { - if (this.sortOrder.direction === 'asc') { - this.sortOrder.direction = 'desc'; - } else if (this.sortOrder.direction === 'desc') { - this.sortOrder = _.clone(this.defaultSortOrder); - } - } else { - this.sortOrder.column = column; - this.sortOrder.direction = 'asc'; - } + // Ignore original selection states that do not match a loaded person + const relevantOriginalSelections = _.pick(originalMultiSelection, _.map(this.people, 'id')); - // Reload the list of people using the new sort order - resetList(); - this.loadPersonPage(); - }; + // Copy those selections to the current selection + _.extend(this.multiSelection, relevantOriginalSelections); - this.selectAll = () => { - this.people.forEach((person) => { - this.multiSelection[person.id] = this.selectAllValue; - }); - }; - - // Get the current selection in a standard form - const getSelection = () => { - return { - orgId: this.org.id, - surveyId: this.surveyId, - filters: this.filters, - selectedPeople: getSelectedPeople(), - unselectedPeople: getUnselectedPeople(), - totalSelectedPeople: this.selectedCount, - allSelected: this.selectAllValue, - allIncluded: this.loadedAll, - }; - }; - - // Get the current sort order - const getOrder = () => { - return this.sortOrder.column.orderFields.map((fieldName) => { - return { field: fieldName, direction: this.sortOrder.direction }; - }); - }; - - // Open a modal to mass-edit all selected people - this.massEdit = () => { - $uibModal - .open({ - component: 'massEdit', - resolve: { - selection: _.constant(getSelection()), - }, - windowClass: 'pivot_theme', - size: 'md', - }) - .result.then(() => { - $scope.$broadcast('massEditApplied'); - - // Determine whether any filters are applied - if (!peopleFiltersPanelService.filtersHasActive(this.filters)) { - // When there are no filters, we only need to make sure that all the people that people in the list - // are assigned to are loaded - peopleScreenService.loadAssignedTos( - this.people, - this.org.id, - ); - return; - } - - // When there are filters, we need to reload the entire people list because those people might not match - // the filter anymore and we are currently choosing not to do client-side filtering - - const originalSelectAllValue = this.selectAllValue; - const originalMultiSelection = this.multiSelection; - - // Empty and reload the people list - resetList(); - this.loadPersonPage().then(() => { - // Restore the select all value and the selection states of all people that are still loaded - - // Ignore original selection states that do not match a loaded person - const relevantOriginalSelections = _.pick( - originalMultiSelection, - _.map(this.people, 'id'), - ); - - // Copy those selections to the current selection - _.extend(this.multiSelection, relevantOriginalSelections); - - // Keep the select all checkbox selected if it was originally selected and some people are selected - this.selectAllValue = - originalSelectAllValue && - getSelectedPeople().length > 0; - }); - }); - }; - - this.sendMessage = (medium) => { - $uibModal.open({ - component: 'messageModal', - resolve: { - medium: _.constant(medium), - selection: _.constant(getSelection()), - surveyId: () => this.surveyId, - }, - windowClass: 'pivot_theme', - size: 'md', - }); - }; - - // Remove the specified people from the people list in the UI - const removePeopleFromList = (peopleIds) => { - // Partition loaded people by whether or not they are removed - const partition = _.partition(this.people, (person) => { - return _.includes(peopleIds, person.id); - }); - const removedPeople = partition[0]; - const remainingPeople = partition[1]; - - // Update the people list and count - this.people = remainingPeople; - this.totalCount -= removedPeople.length; - listLoader.reset(this.people); - - // Update the people count shown in the people tab - if (this.organizationOverview.people) { - this.organizationOverview.people.length -= removedPeople.length; - // When a person is removed, check if the team count has been changed and update the UI to match it - organizationOverviewTeamService - .loadOrgTeamCount(this.org.id) - .then((resp) => (this.organizationOverview.team.length = resp)); - } - - // Remove the selection state of removed people - removedPeople.forEach((person) => { - delete this.multiSelection[person.id]; + // Keep the select all checkbox selected if it was originally selected and some people are selected + this.selectAllValue = originalSelectAllValue && getSelectedPeople().length > 0; }); + }); + }; + + this.sendMessage = (medium) => { + $uibModal.open({ + component: 'messageModal', + resolve: { + medium: _.constant(medium), + selection: _.constant(getSelection()), + surveyId: () => this.surveyId, + }, + windowClass: 'pivot_theme', + size: 'md', + }); + }; - // Instruct the infinite scroller to check whether more people should be loaded because after - // removing some people, the list will be shorter and may now be at the bottom. However, do this in - // the next digest cycle after all of the removed people have been removed from the UI. - $scope.$applyAsync(() => { - $scope.$emit('checkInfiniteScroll'); - }); - $scope.$broadcast('massEditApplied'); - // Emit to tell the peopleFilterPanel component that the assigned to count could have changed - $scope.$emit('updateFilterCount'); - }; + // Remove the specified people from the people list in the UI + const removePeopleFromList = (peopleIds) => { + // Partition loaded people by whether or not they are removed + const partition = _.partition(this.people, (person) => { + return _.includes(peopleIds, person.id); + }); + const removedPeople = partition[0]; + const remainingPeople = partition[1]; + + // Update the people list and count + this.people = remainingPeople; + this.totalCount -= removedPeople.length; + listLoader.reset(this.people); + + // Update the people count shown in the people tab + if (this.organizationOverview.people) { + this.organizationOverview.people.length -= removedPeople.length; + // When a person is removed, check if the team count has been changed and update the UI to match it + organizationOverviewTeamService + .loadOrgTeamCount(this.org.id) + .then((resp) => (this.organizationOverview.team.length = resp)); + } + + // Remove the selection state of removed people + removedPeople.forEach((person) => { + delete this.multiSelection[person.id]; + }); - // Remove the selected people - // This is an abstract method that can both archive and remove people - const removePeople = (message, performRemoval) => { - const selection = getSelection(); - let transformedMessage = message; - - // look to see if the user is the only one selected, if so, allow them to archive self - if (_.isEqual(selection.selectedPeople, [loggedInPerson.person.id])) { - transformedMessage = 'ministries.people.remove_self_confirm'; - } else if (selection.allSelected && !selection.allIncluded) { - // if everyone is selected, unselectedPeople will only be used if not everyone is loaded - // and we know if everyone is loaded by checkin allIncluded - if ( - _.indexOf( - selection.unselectedPeople, - loggedInPerson.person.id, - ) === -1 - ) { - selection.unselectedPeople = _.union( - selection.unselectedPeople, - [loggedInPerson.person.id], - ); - selection.totalSelectedPeople = selectedCount() - 1; - } - } else if ( - _.indexOf(selection.selectedPeople, loggedInPerson.person.id) !== -1 - ) { - selection.selectedPeople = _.pull( - selection.selectedPeople, - loggedInPerson.person.id, - ); - selection.totalSelectedPeople = selectedCount() - 1; + // Instruct the infinite scroller to check whether more people should be loaded because after + // removing some people, the list will be shorter and may now be at the bottom. However, do this in + // the next digest cycle after all of the removed people have been removed from the UI. + $scope.$applyAsync(() => { + $scope.$emit('checkInfiniteScroll'); + }); + $scope.$broadcast('massEditApplied'); + // Emit to tell the peopleFilterPanel component that the assigned to count could have changed + $scope.$emit('updateFilterCount'); + }; + + // Remove the selected people + // This is an abstract method that can both archive and remove people + const removePeople = (message, performRemoval) => { + const selection = getSelection(); + let transformedMessage = message; + + // look to see if the user is the only one selected, if so, allow them to archive self + if (_.isEqual(selection.selectedPeople, [loggedInPerson.person.id])) { + transformedMessage = 'ministries.people.remove_self_confirm'; + } else if (selection.allSelected && !selection.allIncluded) { + // if everyone is selected, unselectedPeople will only be used if not everyone is loaded + // and we know if everyone is loaded by checkin allIncluded + if (_.indexOf(selection.unselectedPeople, loggedInPerson.person.id) === -1) { + selection.unselectedPeople = _.union(selection.unselectedPeople, [loggedInPerson.person.id]); + selection.totalSelectedPeople = selectedCount() - 1; + } + } else if (_.indexOf(selection.selectedPeople, loggedInPerson.person.id) !== -1) { + selection.selectedPeople = _.pull(selection.selectedPeople, loggedInPerson.person.id); + selection.totalSelectedPeople = selectedCount() - 1; + } + transformedMessage = $filter('t')(transformedMessage, { + contact_count: selection.totalSelectedPeople, + }); + confirmModalService + .create(transformedMessage) + .then(() => { + return performRemoval(selection); + }) + .then(() => { + removePeopleFromList(selection.selectedPeople); + }); + }; + + this.exportPeople = () => { + peopleScreenService.exportPeople(this.org.id, getSelection(), getOrder(), this.surveyId); + }; + + this.transferPeople = () => { + const selection = getSelection(); + $uibModal + .open({ + component: 'transferModal', + resolve: { + selection: _.constant(selection), + surveyId: () => this.surveyId, + }, + windowClass: 'pivot_theme', + size: 'md', + }) + .result.then((copyContacts) => { + if (copyContacts === false) { + removePeopleFromList(selection.selectedPeople); } - transformedMessage = $filter('t')(transformedMessage, { - contact_count: selection.totalSelectedPeople, - }); - confirmModalService - .create(transformedMessage) - .then(() => { - return performRemoval(selection); - }) - .then(() => { - removePeopleFromList(selection.selectedPeople); - }); - }; - - this.exportPeople = () => { - peopleScreenService.exportPeople( - this.org.id, - getSelection(), - getOrder(), - this.surveyId, - ); - }; + }); + }; - this.transferPeople = () => { - const selection = getSelection(); - $uibModal - .open({ - component: 'transferModal', - resolve: { - selection: _.constant(selection), - surveyId: () => this.surveyId, - }, - windowClass: 'pivot_theme', - size: 'md', - }) - .result.then((copyContacts) => { - if (copyContacts === false) { - removePeopleFromList(selection.selectedPeople); - } - }); - }; + this.archivePeople = () => { + removePeople('ministries.people.archive_people_confirm', peopleScreenService.archivePeople); + }; - this.archivePeople = () => { - removePeople( - 'ministries.people.archive_people_confirm', - peopleScreenService.archivePeople, - ); - }; + this.deletePeople = () => { + removePeople('ministries.people.delete_people_confirm', peopleScreenService.deletePeople); + }; - this.deletePeople = () => { - removePeople( - 'ministries.people.delete_people_confirm', - peopleScreenService.deletePeople, - ); - }; - - this.clearSelection = () => { - this.selectAllValue = false; - this.multiSelection = {}; - }; + this.clearSelection = () => { + this.selectAllValue = false; + this.multiSelection = {}; + }; } diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.spec.js b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.spec.js index 2b49c1443d..5c5c5f87de 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.spec.js +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.component.spec.js @@ -1,28 +1,28 @@ describe('peopleScreen component', function () { - var $ctrl, loggedInPerson; + let $ctrl, loggedInPerson; - beforeEach(inject(function ($componentController) { - loggedInPerson = jasmine.createSpyObj('loggedInPerson', ['isAdminAt']); + beforeEach(inject(function ($componentController) { + loggedInPerson = jasmine.createSpyObj('loggedInPerson', ['isAdminAt']); - $ctrl = $componentController( - 'peopleScreen', - { - loggedInPerson: loggedInPerson, - }, - { - org: { - id: 1, - }, - }, - ); - })); + $ctrl = $componentController( + 'peopleScreen', + { + loggedInPerson, + }, + { + org: { + id: 1, + }, + }, + ); + })); - describe('$onInit', function () { - it('should initialize the component', function () { - loggedInPerson.isAdminAt.and.returnValue(true); - $ctrl.$onInit(); - expect(loggedInPerson.isAdminAt).toHaveBeenCalledWith({ id: 1 }); - expect($ctrl.isAdmin).toEqual(true); - }); + describe('$onInit', function () { + it('should initialize the component', function () { + loggedInPerson.isAdminAt.and.returnValue(true); + $ctrl.$onInit(); + expect(loggedInPerson.isAdminAt).toHaveBeenCalledWith({ id: 1 }); + expect($ctrl.isAdmin).toEqual(true); }); + }); }); diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.html b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.html index f0f6592a0b..ec40a89669 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.html +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.html @@ -1,248 +1,215 @@
    -
    - - {{ 'ministries.people.showFilters' | t }} - -
    -
    -
    -
    + + {{ 'ministries.people.showFilters' | t }} + +
    +
    +
    +
    -
    -
    - {{ 'ministries.people.header' | t }} -
    - - - + > +
    +
    + {{ 'ministries.people.header' | t }} +
    + + + +
    + + +
    +
    +
    +
    +
    +
    + +
    + +
    + {{ column.label | t }} +
    + + + +
    - - + +
    -
    -
    -
    -
    -
    - -
    - -
    - {{ column.label | t }} -
    - - - - -
    - - -
    -
    -
    - - {{ column.label | t }} - -
    - - - - -
    - - -
    -
    - {{ question.label }} -
    -
    -
    -
    + + {{ column.label | t }} + +
    + - + +
    + + +
    +
    + {{ question.label }} +
    +
    +
    +
    + -
    -
    - {{ 'ministries.people.selected_contacts' | t : { - contactCount: $ctrl.selectedCount } }} -
    -
    - +
    + {{ 'ministries.people.selected_contacts' | t : { contactCount: $ctrl.selectedCount } }} +
    +
    + - - - - - + - -
    -
    -
    -
    -
    - +
    + - -
    - {{ 'general.loading_more' | t }} -
    -
    -
    + selected="$ctrl.multiSelection[person.id]" + person="person" + organization-id="$ctrl.org.id" + questions="$ctrl.questions" + odd="$odd" + , + show-last-survey="$ctrl.surveyId" + > + +
    + {{ 'general.loading_more' | t }}
    - +
    +
    +
    +
    diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js index 4faac06ca3..57e02c8b30 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js @@ -1,264 +1,212 @@ -angular - .module('campusContactsApp') - .factory('peopleScreenService', peopleScreenService); +angular.module('campusContactsApp').factory('peopleScreenService', peopleScreenService); function peopleScreenService( - $http, - $q, - $window, - httpProxy, - JsonApiDataStore, - modelsService, - envService, - personSelectionService, - massEditService, - _, + $http, + $q, + $window, + httpProxy, + JsonApiDataStore, + modelsService, + envService, + personSelectionService, + massEditService, + _, ) { - const peopleScreenService = { - // Load all of the people that a list of people are assigned to - loadAssignedTos: function (people, orgId) { - // Find all of the people that any of those people are assigned to - const assignedTos = _.chain(people) - .map('reverse_contact_assignments') - .flatten() - .filter(['organization.id', orgId]) - .map('assigned_to') - .uniq() - .value(); + const peopleScreenService = { + // Load all of the people that a list of people are assigned to + loadAssignedTos: function (people, orgId) { + // Find all of the people that any of those people are assigned to + const assignedTos = _.chain(people) + .map('reverse_contact_assignments') + .flatten() + .filter(['organization.id', orgId]) + .map('assigned_to') + .uniq() + .value(); - // Find the ids of those assigned to people who are not loaded - const unloadedIds = _.chain(assignedTos) - .filter(_.negate(httpProxy.isLoaded)) - .map('id') - .value(); + // Find the ids of those assigned to people who are not loaded + const unloadedIds = _.chain(assignedTos).filter(_.negate(httpProxy.isLoaded)).map('id').value(); - // Load those unloaded models - return unloadedIds.length === 0 - ? $q.resolve() - : httpProxy.get( - modelsService.getModelMetadata('person').url.all, - { - include: '', - 'filters[ids]': unloadedIds.join(','), - }, - { - errorMessage: - 'error.messages.organization_overview_people.load_assignments', - }, - ); - }, - // Load an organization's people - loadMoreOrgPeople: function ( - orgId, - filters, - order, - listLoader, - loaderService, - surveyId, - ) { - const requestParams = peopleScreenService.buildListParams( - orgId, - filters, - order, - surveyId, - ); + // Load those unloaded models + return unloadedIds.length === 0 + ? $q.resolve() + : httpProxy.get( + modelsService.getModelMetadata('person').url.all, + { + include: '', + 'filters[ids]': unloadedIds.join(','), + }, + { + errorMessage: 'error.messages.organization_overview_people.load_assignments', + }, + ); + }, + // Load an organization's people + loadMoreOrgPeople: function (orgId, filters, order, listLoader, loaderService, surveyId) { + const requestParams = peopleScreenService.buildListParams(orgId, filters, order, surveyId); - return listLoader - .loadMore( - requestParams, - surveyId ? peopleScreenService.transformData : undefined, - ) - .then(function (resp) { - // Load the assignments in parallel - peopleScreenService.loadAssignedTos(resp.nextBatch, orgId); - return resp; - }); - }, + return listLoader + .loadMore(requestParams, surveyId ? peopleScreenService.transformData : undefined) + .then(function (resp) { + // Load the assignments in parallel + peopleScreenService.loadAssignedTos(resp.nextBatch, orgId); + return resp; + }); + }, - loadOrgPeopleCount: function (orgId) { - const requestParams = peopleScreenService.buildListParams(orgId); - requestParams['page[limit]'] = 0; + loadOrgPeopleCount: function (orgId) { + const requestParams = peopleScreenService.buildListParams(orgId); + requestParams['page[limit]'] = 0; - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - requestParams, - { - errorMessage: - 'error.messages.organization_overview_people.load_org_people_count', - }, - ) - .then(function (resp) { - return resp.meta.total; - }); - }, + return httpProxy + .get(modelsService.getModelMetadata('person').url.all, requestParams, { + errorMessage: 'error.messages.organization_overview_people.load_org_people_count', + }) + .then(function (resp) { + return resp.meta.total; + }); + }, - buildListParams: ( - orgId, - filters = {}, - orderParam = [], - surveyId = '', - ) => ({ - include: [ - 'phone_numbers', - 'email_addresses', - 'organizational_permissions', - 'reverse_contact_assignments', - ...(surveyId ? ['answer_sheets.answers'] : []), - ].join(','), - sort: peopleScreenService.buildOrderString(orderParam), - 'filters[organization_ids]': orgId, - ...(surveyId - ? { - 'filters[answer_sheets][survey_ids]': surveyId, - } - : {}), - ...(filters.searchString - ? { - 'filters[name]': filters.searchString, - } - : {}), - ...(filters.includeArchived - ? { - 'filters[include_archived]': true, - } - : {}), - ...(filters.labels - ? { - 'filters[label_ids]': filters.labels.join(','), - } - : {}), - ...(filters.assignedTos - ? { - 'filters[assigned_tos]': filters.assignedTos.join(','), - } - : {}), - ...(filters.groups - ? { - 'filters[group_ids]': filters.groups.join(','), - } - : {}), - ...(filters.statuses - ? { - 'filters[statuses]': filters.statuses.join(','), - } - : {}), - ...(filters.permissions - ? { - 'filters[permissions]': filters.permissions.join(','), - } - : {}), - ...(filters.genders - ? { - 'filters[genders]': filters.genders.join(','), - } - : {}), - ...(filters.questions - ? Object.entries(filters.questions).reduce( - (acc, [questionId, values]) => ({ - ...acc, - [`filters[answer_sheets][answers][${questionId}][]`]: values, - }), - {}, - ) - : {}), - ...(filters.answerMatchingOptions - ? Object.entries(filters.answerMatchingOptions).reduce( - (acc, [questionId, value]) => ({ - ...acc, - [`filters[answer_sheets][answers_options][${questionId}]`]: value, - }), - {}, - ) - : {}), - 'fields[person]': - 'first_name,last_name,gender,email_addresses,phone_numbers,answer_sheets,organizational_permissions,reverse_contact_assignments,organizational_labels,group_memberships', - 'fields[organizational_permission]': - 'followup_status,organization_id,permission_id,archive_date', - 'fields[email_address]': 'email,primary', - 'fields[phone_number]': 'number,primary,validated', - 'fields[contact_assignment]': 'assigned_to,organization,created_at', - 'fields[answer_sheet]': 'answers,survey,updated_at', - 'fields[answer]': 'value,question', - }), + buildListParams: (orgId, filters = {}, orderParam = [], surveyId = '') => ({ + include: [ + 'phone_numbers', + 'email_addresses', + 'organizational_permissions', + 'reverse_contact_assignments', + ...(surveyId ? ['answer_sheets.answers'] : []), + ].join(','), + sort: peopleScreenService.buildOrderString(orderParam), + 'filters[organization_ids]': orgId, + ...(surveyId + ? { + 'filters[answer_sheets][survey_ids]': surveyId, + } + : {}), + ...(filters.searchString + ? { + 'filters[name]': filters.searchString, + } + : {}), + ...(filters.includeArchived + ? { + 'filters[include_archived]': true, + } + : {}), + ...(filters.labels + ? { + 'filters[label_ids]': filters.labels.join(','), + } + : {}), + ...(filters.assignedTos + ? { + 'filters[assigned_tos]': filters.assignedTos.join(','), + } + : {}), + ...(filters.groups + ? { + 'filters[group_ids]': filters.groups.join(','), + } + : {}), + ...(filters.statuses + ? { + 'filters[statuses]': filters.statuses.join(','), + } + : {}), + ...(filters.permissions + ? { + 'filters[permissions]': filters.permissions.join(','), + } + : {}), + ...(filters.genders + ? { + 'filters[genders]': filters.genders.join(','), + } + : {}), + ...(filters.questions + ? Object.entries(filters.questions).reduce( + (acc, [questionId, values]) => ({ + ...acc, + [`filters[answer_sheets][answers][${questionId}][]`]: values, + }), + {}, + ) + : {}), + ...(filters.answerMatchingOptions + ? Object.entries(filters.answerMatchingOptions).reduce( + (acc, [questionId, value]) => ({ + ...acc, + [`filters[answer_sheets][answers_options][${questionId}]`]: value, + }), + {}, + ) + : {}), + 'fields[person]': + 'first_name,last_name,gender,email_addresses,phone_numbers,answer_sheets,organizational_permissions,reverse_contact_assignments,organizational_labels,group_memberships', + 'fields[organizational_permission]': 'followup_status,organization_id,permission_id,archive_date', + 'fields[email_address]': 'email,primary', + 'fields[phone_number]': 'number,primary,validated', + 'fields[contact_assignment]': 'assigned_to,organization,created_at', + 'fields[answer_sheet]': 'answers,survey,updated_at', + 'fields[answer]': 'value,question', + }), - // Convert an array of field order entries in the format { field, direction: 'asc'|'desc' into the order - // string expected by he API - buildOrderString: function (order) { - return order - .map(function (orderEntry) { - return `${ - orderEntry.direction === 'desc' ? '-' : '' - }${orderEntry.field}`; - }) - .join(','); - }, + // Convert an array of field order entries in the format { field, direction: 'asc'|'desc' into the order + // string expected by he API + buildOrderString: function (order) { + return order + .map(function (orderEntry) { + return `${orderEntry.direction === 'desc' ? '-' : ''}${orderEntry.field}`; + }) + .join(','); + }, - transformData: (params) => (data) => { - // We MUST mutate this object here to keep Angular watchers watching the JsonApiDataStore for changes which is stupid. Everything should work with immutable data but it wasn't implemented that way... An example where creating a new object broke something is updating a contact assignment on the peopleScreen. - return Object.assign(data, { - answers: ( - _.findLast( - data.answer_sheets, - (sheet) => - sheet.survey.id === - params['filters[answer_sheets][survey_ids]'], - ) || { answers: [] } - ).answers.reduce( - (acc, answer) => ({ - ...acc, - [answer.question.id]: [ - ...(acc[answer.question.id] || []), - answer.value, - ], - }), - {}, - ), - }); - }, + transformData: (params) => (data) => { + // We MUST mutate this object here to keep Angular watchers watching the JsonApiDataStore for changes which is stupid. Everything should work with immutable data but it wasn't implemented that way... An example where creating a new object broke something is updating a contact assignment on the peopleScreen. + return Object.assign(data, { + answers: ( + _.findLast( + data.answer_sheets, + (sheet) => sheet.survey.id === params['filters[answer_sheets][survey_ids]'], + ) || { answers: [] } + ).answers.reduce( + (acc, answer) => ({ + ...acc, + [answer.question.id]: [...(acc[answer.question.id] || []), answer.value], + }), + {}, + ), + }); + }, - // Export the selected people - exportPeople: function (orgId, selection, order, surveyId) { - const filterParams = peopleScreenService.buildListParams( - orgId, - selection.filters, - order, - surveyId, - ); + // Export the selected people + exportPeople: function (orgId, selection, order, surveyId) { + const filterParams = peopleScreenService.buildListParams(orgId, selection.filters, order, surveyId); - const params = _.extend(filterParams, { - access_token: $http.defaults.headers.common.Authorization.slice( - 7, - ), // strip off the "Bearer " part - organization_id: selection.orgId, - sort: peopleScreenService.buildOrderString(order), - format: 'csv', - }); + const params = _.extend(filterParams, { + access_token: $http.defaults.headers.common.Authorization.slice(7), // strip off the "Bearer " part + organization_id: selection.orgId, + sort: peopleScreenService.buildOrderString(order), + format: 'csv', + }); - const queryString = _.map(params, function (value, key) { - return ( - encodeURIComponent(key) + '=' + encodeURIComponent(value) - ); - }).join('&'); + const queryString = _.map(params, function (value, key) { + return encodeURIComponent(key) + '=' + encodeURIComponent(value); + }).join('&'); - // Navigate to the URL to initiate the download - const url = - envService.read('apiUrl') + - modelsService.getModelMetadata('person').url.all + - '?' + - queryString; - $window.location.replace(url); - }, + // Navigate to the URL to initiate the download + const url = envService.read('apiUrl') + modelsService.getModelMetadata('person').url.all + '?' + queryString; + $window.location.replace(url); + }, - // Archive the selected people - archivePeople: function (selection) { - return massEditService.applyChanges(selection, { archived: true }); - }, + // Archive the selected people + archivePeople: function (selection) { + return massEditService.applyChanges(selection, { archived: true }); + }, - // Delete the selected people - deletePeople: function (selection) { - return massEditService.applyChanges(selection, { delete: true }); - }, - }; - return peopleScreenService; + // Delete the selected people + deletePeople: function (selection) { + return massEditService.applyChanges(selection, { delete: true }); + }, + }; + return peopleScreenService; } diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.spec.js b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.spec.js index 0b90e42426..90e2a6a50d 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.spec.js +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.spec.js @@ -1,70 +1,63 @@ let peopleScreenService, httpProxy, $rootScope, $q; function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('peopleScreenService', function () { - beforeEach(inject(function ( - _peopleScreenService_, - _httpProxy_, - _$rootScope_, - _$q_, - ) { - peopleScreenService = _peopleScreenService_; - httpProxy = _httpProxy_; - $rootScope = _$rootScope_; - $q = _$q_; - - this.orgId = 123; - - // override these to define what will be result of httpProxy - this.responsePeople = []; - this.responseTotal = 10; - - spyOn(httpProxy, 'callHttp').and.callFake(() => { - return $q.resolve({ - data: this.responsePeople, - meta: { total: this.responseTotal }, - }); - }); - })); - - describe('loadOrgPeopleCount', function () { - it( - 'should load the person count', - asynchronous(function () { - this.responseTotal = 5; - - return peopleScreenService - .loadOrgPeopleCount(this.orgId) - .then(function (personCount) { - expect(personCount).toBe(5); - }); - }), - ); + beforeEach(inject(function (_peopleScreenService_, _httpProxy_, _$rootScope_, _$q_) { + peopleScreenService = _peopleScreenService_; + httpProxy = _httpProxy_; + $rootScope = _$rootScope_; + $q = _$q_; + + this.orgId = 123; + + // override these to define what will be result of httpProxy + this.responsePeople = []; + this.responseTotal = 10; + + spyOn(httpProxy, 'callHttp').and.callFake(() => { + return $q.resolve({ + data: this.responsePeople, + meta: { total: this.responseTotal }, + }); }); + })); + + describe('loadOrgPeopleCount', function () { + it( + 'should load the person count', + asynchronous(function () { + this.responseTotal = 5; - describe('buildOrderString', function () { - it('should generate a valid order string', function () { - expect( - peopleScreenService.buildOrderString([ - { field: 'key1', direction: 'asc' }, - { field: 'key2', direction: 'desc' }, - { field: 'key3', direction: 'desc' }, - ]), - ).toBe('key1,-key2,-key3'); + return peopleScreenService.loadOrgPeopleCount(this.orgId).then(function (personCount) { + expect(personCount).toBe(5); }); + }), + ); + }); + + describe('buildOrderString', function () { + it('should generate a valid order string', function () { + expect( + peopleScreenService.buildOrderString([ + { field: 'key1', direction: 'asc' }, + { field: 'key2', direction: 'desc' }, + { field: 'key3', direction: 'desc' }, + ]), + ).toBe('key1,-key2,-key3'); }); + }); }); diff --git a/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.component.js b/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.component.js index 17a2ec9c53..1392afa0ae 100644 --- a/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.component.js +++ b/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.component.js @@ -2,120 +2,108 @@ import template from './peopleViewPerson.html'; import './peopleViewPerson.scss'; angular.module('campusContactsApp').component('peopleViewPerson', { - controller: peopleViewPersonController, - template: template, - bindings: { - person: '<', - organizationId: '<', - }, + controller: peopleViewPersonController, + template, + bindings: { + person: '<', + organizationId: '<', + }, }); function peopleViewPersonController( - $animate, - $filter, - $scope, - $state, - $window, - periodService, - personService, - reportsService, - interactionsService, - confirmModalService, + $animate, + $filter, + $scope, + $state, + $window, + periodService, + personService, + reportsService, + interactionsService, + confirmModalService, ) { - var vm = this; + const vm = this; - vm.addInteractionBtnsVisible = false; - vm.closingInteractionButtons = false; - vm.toggleInteractionBtns = toggleInteractionBtns; - vm.openAddInteractionPanel = openAddInteractionPanel; - vm.saveInteraction = saveInteraction; - vm.reportInteractions = reportInteractions; - vm.openProfile = openProfile; - vm.$onInit = activate; + vm.addInteractionBtnsVisible = false; + vm.closingInteractionButtons = false; + vm.toggleInteractionBtns = toggleInteractionBtns; + vm.openAddInteractionPanel = openAddInteractionPanel; + vm.saveInteraction = saveInteraction; + vm.reportInteractions = reportInteractions; + vm.openProfile = openProfile; + vm.$onInit = activate; - function activate() { - vm.interactionTypes = interactionsService.getInteractionTypes().concat({ - id: -1, - icon: 'archive', - title: 'general.archive', - }); - closeAddInteractionPanel(); + function activate() { + vm.interactionTypes = interactionsService.getInteractionTypes().concat({ + id: -1, + icon: 'archive', + title: 'general.archive', + }); + closeAddInteractionPanel(); - vm.uncontacted = - personService.getFollowupStatus(vm.person, vm.organizationId) === - 'uncontacted'; + vm.uncontacted = personService.getFollowupStatus(vm.person, vm.organizationId) === 'uncontacted'; - periodService.subscribe($scope, lookupReport); - lookupReport(); - } + periodService.subscribe($scope, lookupReport); + lookupReport(); + } - function lookupReport() { - vm.report = reportsService.lookupPersonReport( - vm.organizationId, - vm.person.id, - ); - } + function lookupReport() { + vm.report = reportsService.lookupPersonReport(vm.organizationId, vm.person.id); + } - function toggleInteractionBtns() { - vm.addInteractionBtnsVisible = !vm.addInteractionBtnsVisible; - if (!vm.addInteractionBtnsVisible) { - $animate.on( - 'leave', - $window.document.getElementsByClassName( - 'addInteractionButtons', - ), - function callback(element, phase) { - vm.closingInteractionButtons = phase === 'start'; - $scope.$apply(); - }, - ); - closeAddInteractionPanel(); - } + function toggleInteractionBtns() { + vm.addInteractionBtnsVisible = !vm.addInteractionBtnsVisible; + if (!vm.addInteractionBtnsVisible) { + $animate.on('leave', $window.document.getElementsByClassName('addInteractionButtons'), function callback( + element, + phase, + ) { + vm.closingInteractionButtons = phase === 'start'; + $scope.$apply(); + }); + closeAddInteractionPanel(); } + } - function openAddInteractionPanel(type) { - if (type.id === -1) { - archivePerson(); - } else { - vm.openPanelType = type; - } + function openAddInteractionPanel(type) { + if (type.id === -1) { + archivePerson(); + } else { + vm.openPanelType = type; } + } - function saveInteraction() { - var interaction = { - interactionTypeId: vm.openPanelType.id, - comment: vm.interactionComment, - }; - interactionsService - .recordInteraction(interaction, vm.organizationId, vm.person.id) - .then(function () { - vm.uncontacted = false; - toggleInteractionBtns(); - }); - } + function saveInteraction() { + const interaction = { + interactionTypeId: vm.openPanelType.id, + comment: vm.interactionComment, + }; + interactionsService.recordInteraction(interaction, vm.organizationId, vm.person.id).then(function () { + vm.uncontacted = false; + toggleInteractionBtns(); + }); + } - function closeAddInteractionPanel() { - vm.openPanelType = ''; - vm.interactionComment = ''; - } + function closeAddInteractionPanel() { + vm.openPanelType = ''; + vm.interactionComment = ''; + } - function reportInteractions(interactionTypeId) { - return reportsService.getInteractionCount(vm.report, interactionTypeId); - } + function reportInteractions(interactionTypeId) { + return reportsService.getInteractionCount(vm.report, interactionTypeId); + } - function archivePerson() { - confirmModalService - .create($filter('t')('organizations.cleanup.confirm_archive')) - .then(() => { - personService.archivePerson(vm.person, vm.organizationId); - }); - } + function archivePerson() { + confirmModalService.create($filter('t')('organizations.cleanup.confirm_archive')).then(() => { + personService.archivePerson(vm.person, vm.organizationId); + }); + } - // Open the profile page for this person - function openProfile() { - $state.go('.person.defaultTab', { - personId: vm.person.id, - orgId: vm.organizationId, - }); - } + // Open the profile page for this person + function openProfile() { + $state.go('.person.defaultTab', { + personId: vm.person.id, + orgId: vm.organizationId, + }); + } } diff --git a/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.html b/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.html index d3864c5dee..de598e456e 100644 --- a/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.html +++ b/app/assets/javascripts/angular/components/peopleViewPerson/peopleViewPerson.html @@ -1,94 +1,83 @@
    -
    - {{ $ctrl.person | personName }} - ({{ 'dashboard.uncontacted' | t }}) -
    -
    -
    {{ $ctrl.report.contact_count || '-' }}
    -
    - + {{ $ctrl.person | personName }} + ({{ 'dashboard.uncontacted' | t }}) +
    +
    +
    {{ $ctrl.report.contact_count || '-' }}
    + -
    - - + ng-if="$ctrl.report.uncontacted_count" + > + {{ $ctrl.report.uncontacted_count }} + + -
    +
    + - +
    -
    - -
    +
    + +
    -
    - - - -
    - + - + + +
    + +
    - - - {{ 'dashboard.done' | t }} - + ng-model="$ctrl.interactionComment" + class="auto-grow" + > + + {{ 'dashboard.done' | t }} +
    diff --git a/app/assets/javascripts/angular/components/personActivity/personActivity.component.js b/app/assets/javascripts/angular/components/personActivity/personActivity.component.js index 1a85e5e977..01a7a48c56 100644 --- a/app/assets/javascripts/angular/components/personActivity/personActivity.component.js +++ b/app/assets/javascripts/angular/components/personActivity/personActivity.component.js @@ -2,53 +2,45 @@ import template from './personActivity.html'; import './personActivity.scss'; angular.module('campusContactsApp').component('personActivity', { - controller: personActivityController, - require: { - personTab: '^personPage', - }, - template: template, + controller: personActivityController, + require: { + personTab: '^personPage', + }, + template, }); -function personActivityController( - interactionsService, - reportsService, - periodService, -) { - var vm = this; - vm.report = null; - vm.period = null; - vm.getInteractionCount = getInteractionCount; - vm.$onInit = activate; - vm.setPeriod = setPeriod; +function personActivityController(interactionsService, reportsService, periodService) { + const vm = this; + vm.report = null; + vm.period = null; + vm.getInteractionCount = getInteractionCount; + vm.$onInit = activate; + vm.setPeriod = setPeriod; - function activate() { - vm.interactionTypes = interactionsService - .getInteractionTypes() - .filter(function (interactionType) { - return interactionType.id !== 1; - }); - vm.periods = periodService.getPeriods(); - updatePeriod(); - } + function activate() { + vm.interactionTypes = interactionsService.getInteractionTypes().filter(function (interactionType) { + return interactionType.id !== 1; + }); + vm.periods = periodService.getPeriods(); + updatePeriod(); + } - function setPeriod(period) { - periodService.setPeriod(period); - updatePeriod(); - } + function setPeriod(period) { + periodService.setPeriod(period); + updatePeriod(); + } - function updatePeriod() { - vm.period = periodService.getPeriod(); + function updatePeriod() { + vm.period = periodService.getPeriod(); - var organizationId = vm.personTab.organizationId; - var personId = vm.personTab.person.id; - reportsService - .loadPersonReport(organizationId, personId) - .then(function (report) { - vm.report = report; - }); - } + const organizationId = vm.personTab.organizationId; + const personId = vm.personTab.person.id; + reportsService.loadPersonReport(organizationId, personId).then(function (report) { + vm.report = report; + }); + } - function getInteractionCount(interactionTypeId) { - return reportsService.getInteractionCount(vm.report, interactionTypeId); - } + function getInteractionCount(interactionTypeId) { + return reportsService.getInteractionCount(vm.report, interactionTypeId); + } } diff --git a/app/assets/javascripts/angular/components/personActivity/personActivity.html b/app/assets/javascripts/angular/components/personActivity/personActivity.html index 07abbd7495..aa8efa1369 100644 --- a/app/assets/javascripts/angular/components/personActivity/personActivity.html +++ b/app/assets/javascripts/angular/components/personActivity/personActivity.html @@ -1,37 +1,26 @@
    - - {{period.label | t}} - + + {{period.label | t}} +
    -
    -
    - {{'assignments.assigned' | t}} - {{$ctrl.report.contact_count || '-'}} -
    -
    - {{'followup_status.uncontacted' | t}} - {{$ctrl.report.uncontacted_count || '-'}} -
    -
    - {{interactionType.title | t}} - {{$ctrl.getInteractionCount(interactionType.id) || '-'}} -
    +
    +
    + {{'assignments.assigned' | t}} + {{$ctrl.report.contact_count || '-'}}
    +
    + {{'followup_status.uncontacted' | t}} + {{$ctrl.report.uncontacted_count || '-'}} +
    +
    + {{interactionType.title | t}} + {{$ctrl.getInteractionCount(interactionType.id) || '-'}} +
    +
    diff --git a/app/assets/javascripts/angular/components/personAssigned/personAssigned.component.js b/app/assets/javascripts/angular/components/personAssigned/personAssigned.component.js index 440a1555ce..b7f6dd9854 100644 --- a/app/assets/javascripts/angular/components/personAssigned/personAssigned.component.js +++ b/app/assets/javascripts/angular/components/personAssigned/personAssigned.component.js @@ -2,23 +2,21 @@ import template from './personAssigned.html'; import './personAssigned.scss'; angular.module('campusContactsApp').component('personAssigned', { - controller: personAssignedController, - require: { - personTab: '^personPage', - }, - template: template, + controller: personAssignedController, + require: { + personTab: '^personPage', + }, + template, }); function personAssignedController(personAssignedService) { - var vm = this; - vm.assignments = null; - vm.$onInit = activate; + const vm = this; + vm.assignments = null; + vm.$onInit = activate; - function activate() { - personAssignedService - .getAssigned(vm.personTab.person, vm.personTab.organizationId) - .then(function (assignments) { - vm.assignments = assignments; - }); - } + function activate() { + personAssignedService.getAssigned(vm.personTab.person, vm.personTab.organizationId).then(function (assignments) { + vm.assignments = assignments; + }); + } } diff --git a/app/assets/javascripts/angular/components/personAssigned/personAssigned.html b/app/assets/javascripts/angular/components/personAssigned/personAssigned.html index 4b8deea5f2..8706cddc98 100644 --- a/app/assets/javascripts/angular/components/personAssigned/personAssigned.html +++ b/app/assets/javascripts/angular/components/personAssigned/personAssigned.html @@ -1,15 +1,10 @@
    -
    -
    - - {{assignment.person | personName}} - - - {{'followup_status.' + assignment.followup_status | t}} - -
    +
    +
    + {{assignment.person | personName}} + + {{'followup_status.' + assignment.followup_status | t}} +
    +
    diff --git a/app/assets/javascripts/angular/components/personAssigned/personAssigned.service.js b/app/assets/javascripts/angular/components/personAssigned/personAssigned.service.js index dece52285c..4cd71b29e6 100644 --- a/app/assets/javascripts/angular/components/personAssigned/personAssigned.service.js +++ b/app/assets/javascripts/angular/components/personAssigned/personAssigned.service.js @@ -1,32 +1,23 @@ -angular - .module('campusContactsApp') - .factory('personAssignedService', personAssignedService); +angular.module('campusContactsApp').factory('personAssignedService', personAssignedService); function personAssignedService(JsonApiDataStore, personService) { - return { - // Return an array of information items about the people assigned to a particular person in a - // particular organization - getAssigned: function (person, organizationId) { - // Return information about a contact assignment (currently the assignee and followup status) - function assignmentInfoFromAssignment(assignment) { - var person = JsonApiDataStore.store.find( - 'person', - assignment.person_id, - ); - var orgId = assignment.organization.id; - return { - person: person, - followup_status: - personService.getFollowupStatus(person, orgId) || - 'uncontacted', - }; - } + return { + // Return an array of information items about the people assigned to a particular person in a + // particular organization + getAssigned: function (person, organizationId) { + // Return information about a contact assignment (currently the assignee and followup status) + function assignmentInfoFromAssignment(assignment) { + const person = JsonApiDataStore.store.find('person', assignment.person_id); + const orgId = assignment.organization.id; + return { + person, + followup_status: personService.getFollowupStatus(person, orgId) || 'uncontacted', + }; + } - return personService - .getContactAssignments(person, organizationId) - .then(function (assignments) { - return assignments.map(assignmentInfoFromAssignment); - }); - }, - }; + return personService.getContactAssignments(person, organizationId).then(function (assignments) { + return assignments.map(assignmentInfoFromAssignment); + }); + }, + }; } diff --git a/app/assets/javascripts/angular/components/personHistory/personHistory.component.js b/app/assets/javascripts/angular/components/personHistory/personHistory.component.js index 96e87d5158..7c4ac6bfc3 100644 --- a/app/assets/javascripts/angular/components/personHistory/personHistory.component.js +++ b/app/assets/javascripts/angular/components/personHistory/personHistory.component.js @@ -2,132 +2,120 @@ import template from './personHistory.html'; import './personHistory.scss'; angular.module('campusContactsApp').component('personHistory', { - controller: personHistoryController, - bindings: { - history: '<', - }, - require: { - personTab: '^personPage', - }, - template: template, + controller: personHistoryController, + bindings: { + history: '<', + }, + require: { + personTab: '^personPage', + }, + template, }); function personHistoryController( - $scope, - $element, - $window, - $interval, - $q, - asyncBindingsService, - interactionsService, - personHistoryService, - _, + $scope, + $element, + $window, + $interval, + $q, + asyncBindingsService, + interactionsService, + personHistoryService, + _, ) { - var vm = this; - vm.filters = ['all', 'interactions', 'notes', 'surveys']; - vm.filter = vm.filters[0]; - vm.historyFeed = null; - vm.interactionTypesVisible = false; - vm.newInteractionType = null; - vm.newInteractionComment = null; - vm.createInteraction = createInteraction; - vm.saveInteraction = saveInteraction; - vm.clearInteraction = clearInteraction; - vm.openInteractionTypeSheet = openInteractionTypeSheet; - vm.closeInteractionTypeSheet = closeInteractionTypeSheet; - vm.removeInteraction = removeInteraction; - vm.$onInit = asyncBindingsService.lazyLoadedActivate(activate, ['history']); + const vm = this; + vm.filters = ['all', 'interactions', 'notes', 'surveys']; + vm.filter = vm.filters[0]; + vm.historyFeed = null; + vm.interactionTypesVisible = false; + vm.newInteractionType = null; + vm.newInteractionComment = null; + vm.createInteraction = createInteraction; + vm.saveInteraction = saveInteraction; + vm.clearInteraction = clearInteraction; + vm.openInteractionTypeSheet = openInteractionTypeSheet; + vm.closeInteractionTypeSheet = closeInteractionTypeSheet; + vm.removeInteraction = removeInteraction; + vm.$onInit = asyncBindingsService.lazyLoadedActivate(activate, ['history']); - function activate() { - vm.interactionTypes = interactionsService.getInteractionTypes(); - $scope.$watchGroup( - [ - '$ctrl.filter', - '$ctrl.personTab.person.interactions', - '$ctrl.personTab.person.answer_sheets', - ], - buildHistoryFeed, - ); + function activate() { + vm.interactionTypes = interactionsService.getInteractionTypes(); + $scope.$watchGroup( + ['$ctrl.filter', '$ctrl.personTab.person.interactions', '$ctrl.personTab.person.answer_sheets'], + buildHistoryFeed, + ); - vm.organizationId = vm.personTab.organizationId; - } + vm.organizationId = vm.personTab.organizationId; + } - function createInteraction(interactionType) { - vm.newInteractionType = interactionType; - vm.closeInteractionTypeSheet(); + function createInteraction(interactionType) { + vm.newInteractionType = interactionType; + vm.closeInteractionTypeSheet(); - scrollToBottom(); - findAsync('.new-interaction textarea').then(function (input) { - input.focus(); - }); - } + scrollToBottom(); + findAsync('.new-interaction textarea').then(function (input) { + input.focus(); + }); + } - // Save the new interaction on the server - function saveInteraction() { - var interaction = { - interactionTypeId: vm.newInteractionType.id, - comment: vm.newInteractionComment, - }; - var personId = vm.personTab.person.id; - return interactionsService - .recordInteraction(interaction, vm.organizationId, personId) - .then(function () { - vm.clearInteraction(); - }); - } + // Save the new interaction on the server + function saveInteraction() { + const interaction = { + interactionTypeId: vm.newInteractionType.id, + comment: vm.newInteractionComment, + }; + const personId = vm.personTab.person.id; + return interactionsService.recordInteraction(interaction, vm.organizationId, personId).then(function () { + vm.clearInteraction(); + }); + } - // Hide the new interaction form - function clearInteraction() { - vm.newInteractionType = null; - vm.newInteractionComment = null; - } + // Hide the new interaction form + function clearInteraction() { + vm.newInteractionType = null; + vm.newInteractionComment = null; + } - // Open the interaction type sheet - function openInteractionTypeSheet() { - vm.interactionTypesVisible = true; - } + // Open the interaction type sheet + function openInteractionTypeSheet() { + vm.interactionTypesVisible = true; + } - // Close the interaction type sheet - function closeInteractionTypeSheet() { - vm.interactionTypesVisible = false; - } + // Close the interaction type sheet + function closeInteractionTypeSheet() { + vm.interactionTypesVisible = false; + } - // Remove server deleted interaction locally - function removeInteraction($event) { - if ($event.interaction._type === 'interaction') { - _.pull(vm.personTab.person.interactions, $event.interaction); - } else if ($event.interaction._type === 'answer_sheet') { - _.pull(vm.personTab.person.answer_sheets, $event.interaction); - } - buildHistoryFeed(); + // Remove server deleted interaction locally + function removeInteraction($event) { + if ($event.interaction._type === 'interaction') { + _.pull(vm.personTab.person.interactions, $event.interaction); + } else if ($event.interaction._type === 'answer_sheet') { + _.pull(vm.personTab.person.answer_sheets, $event.interaction); } + buildHistoryFeed(); + } - // Scroll to the bottom of the history list - function scrollToBottom() { - const scrollContainer = $window.document.getElementsByClassName( - 'scrollable-area', - )[0]; - scrollContainer.scrollTop = scrollContainer.scrollHeight; - } + // Scroll to the bottom of the history list + function scrollToBottom() { + const scrollContainer = $window.document.getElementsByClassName('scrollable-area')[0]; + scrollContainer.scrollTop = scrollContainer.scrollHeight; + } - // Find an element that may not exist yet and return a promise that resolves to the element when it exists - function findAsync(selector) { - return $q(function (resolve) { - var interval = $interval(function () { - var element = $element.find(selector); - if (element.length > 0) { - $interval.cancel(interval); - resolve(element); - } - }); - }); - } + // Find an element that may not exist yet and return a promise that resolves to the element when it exists + function findAsync(selector) { + return $q(function (resolve) { + var interval = $interval(function () { + const element = $element.find(selector); + if (element.length > 0) { + $interval.cancel(interval); + resolve(element); + } + }); + }); + } - function buildHistoryFeed() { - vm.historyFeed = personHistoryService.buildHistoryFeed( - vm.personTab.person, - vm.filter, - vm.personTab.organizationId, - ); - } + function buildHistoryFeed() { + vm.historyFeed = personHistoryService.buildHistoryFeed(vm.personTab.person, vm.filter, vm.personTab.organizationId); + } } diff --git a/app/assets/javascripts/angular/components/personHistory/personHistory.component.spec.js b/app/assets/javascripts/angular/components/personHistory/personHistory.component.spec.js index 154e187ad3..5179ca1a81 100644 --- a/app/assets/javascripts/angular/components/personHistory/personHistory.component.spec.js +++ b/app/assets/javascripts/angular/components/personHistory/personHistory.component.spec.js @@ -1,56 +1,56 @@ describe('personHistory component', function () { - var $ctrl; + let $ctrl; - beforeEach(inject(function ($componentController) { - $ctrl = $componentController( - 'personHistory', - { - $element: null, - }, - { - personTab: { - person: { - interactions: [ - { - id: 1, - comment: 'interaction 1', - _type: 'interaction', - organization: { - id: 1, - }, - }, - { - id: 2, - comment: 'interaction 2', - _type: 'interaction', - organization: { - id: 1, - }, - }, - ], - }, - organizationId: 1, + beforeEach(inject(function ($componentController) { + $ctrl = $componentController( + 'personHistory', + { + $element: null, + }, + { + personTab: { + person: { + interactions: [ + { + id: 1, + comment: 'interaction 1', + _type: 'interaction', + organization: { + id: 1, }, - }, - ); - })); + }, + { + id: 2, + comment: 'interaction 2', + _type: 'interaction', + organization: { + id: 1, + }, + }, + ], + }, + organizationId: 1, + }, + }, + ); + })); - describe('removeInteraction', function () { - it('should locally remove an interaction from the history feed', function () { - $ctrl.removeInteraction({ - interaction: $ctrl.personTab.person.interactions[0], - }); + describe('removeInteraction', function () { + it('should locally remove an interaction from the history feed', function () { + $ctrl.removeInteraction({ + interaction: $ctrl.personTab.person.interactions[0], + }); - expect($ctrl.historyFeed).toEqual([ - { - id: 2, - comment: 'interaction 2', - _type: 'interaction', - organization: { - id: 1, - }, - }, - ]); - }); + expect($ctrl.historyFeed).toEqual([ + { + id: 2, + comment: 'interaction 2', + _type: 'interaction', + organization: { + id: 1, + }, + }, + ]); }); + }); }); diff --git a/app/assets/javascripts/angular/components/personHistory/personHistory.html b/app/assets/javascripts/angular/components/personHistory/personHistory.html index 3511532e6e..13890fe224 100644 --- a/app/assets/javascripts/angular/components/personHistory/personHistory.html +++ b/app/assets/javascripts/angular/components/personHistory/personHistory.html @@ -1,52 +1,44 @@ -
    - + + {{ 'ministries.people.history.' + filter | t }} + +
    +
    +
    +
    +
    + - {{ 'ministries.people.history.' + filter | t }} - -
    -
    -
    -
    -
    - - - - -
    -
    -
    + - -
    - - -
    - - - -
    -
    -
    - -
    {{ interactionType.title | t }}
    -
    -
    -
    -
    - - +
    + + + +
    +
    +
    + +
    {{ interactionType.title | t }}
    +
    +
    +
    + +
    +
    diff --git a/app/assets/javascripts/angular/components/personHistory/personHistory.service.js b/app/assets/javascripts/angular/components/personHistory/personHistory.service.js index e67dfa904f..8e588c9c95 100644 --- a/app/assets/javascripts/angular/components/personHistory/personHistory.service.js +++ b/app/assets/javascripts/angular/components/personHistory/personHistory.service.js @@ -1,60 +1,51 @@ -angular - .module('campusContactsApp') - .factory('personHistoryService', personHistoryService); +angular.module('campusContactsApp').factory('personHistoryService', personHistoryService); function personHistoryService(_) { - return { - // Build the history feed (interactions and completed surveys) for a person - // feedFilter is a string and must have the value 'interactions', 'notes', 'surveys', or 'all' - buildHistoryFeed: function (person, feedFilter, orgId) { - return _.sortBy( - filterHistoryByType(person, feedFilter, orgId), - getHistorySortKey, - ); - }, - }; + return { + // Build the history feed (interactions and completed surveys) for a person + // feedFilter is a string and must have the value 'interactions', 'notes', 'surveys', or 'all' + buildHistoryFeed: function (person, feedFilter, orgId) { + return _.sortBy(filterHistoryByType(person, feedFilter, orgId), getHistorySortKey); + }, + }; - function filterHistoryByType(person, feedFilter, orgId) { - switch (feedFilter) { - case 'interactions': - return filterInteractionByOrg( - person.interactions, - orgId, - ).filter(function (interaction) { - return interaction.interaction_type_id !== '1'; - }); - case 'notes': - return _.filter( - filterInteractionByOrg(person.interactions, orgId), - ({ interaction_type_id }) => - `${interaction_type_id}` === '1', - ); - case 'surveys': - return filterSurveyByOrg(person.answer_sheets, orgId); - case 'all': - return [].concat( - filterInteractionByOrg(person.interactions, orgId), - filterSurveyByOrg(person.answer_sheets, orgId), - ); - } + function filterHistoryByType(person, feedFilter, orgId) { + switch (feedFilter) { + case 'interactions': + return filterInteractionByOrg(person.interactions, orgId).filter(function (interaction) { + return interaction.interaction_type_id !== '1'; + }); + case 'notes': + return _.filter( + filterInteractionByOrg(person.interactions, orgId), + ({ interaction_type_id }) => `${interaction_type_id}` === '1', + ); + case 'surveys': + return filterSurveyByOrg(person.answer_sheets, orgId); + case 'all': + return [].concat( + filterInteractionByOrg(person.interactions, orgId), + filterSurveyByOrg(person.answer_sheets, orgId), + ); } + } - function filterInteractionByOrg(history, orgId) { - return _.filter(history, ['organization.id', orgId]); - } + function filterInteractionByOrg(history, orgId) { + return _.filter(history, ['organization.id', orgId]); + } - function filterSurveyByOrg(history, orgId) { - return _.filter(history, ['survey.organization_id', orgId]); - } + function filterSurveyByOrg(history, orgId) { + return _.filter(history, ['survey.organization_id', orgId]); + } - function getHistorySortKey(item) { - // Pick the sort key based on whether the item is an interaction or an answer sheet - switch (item._type) { - case 'interaction': - return item.timestamp; - case 'answer_sheet': - // Default to an empty string so that answer sheets without a date will appear first - return item.completed_at || ''; - } + function getHistorySortKey(item) { + // Pick the sort key based on whether the item is an interaction or an answer sheet + switch (item._type) { + case 'interaction': + return item.timestamp; + case 'answer_sheet': + // Default to an empty string so that answer sheets without a date will appear first + return item.completed_at || ''; } + } } diff --git a/app/assets/javascripts/angular/components/personHistory/personHistory.service.spec.js b/app/assets/javascripts/angular/components/personHistory/personHistory.service.spec.js index 559321bfdc..e25a6d5749 100644 --- a/app/assets/javascripts/angular/components/personHistory/personHistory.service.spec.js +++ b/app/assets/javascripts/angular/components/personHistory/personHistory.service.spec.js @@ -1,96 +1,81 @@ import 'angular-mocks'; // Constants -var personHistoryService; +let personHistoryService; describe('personHistoryService', function () { - beforeEach(inject(function (_personHistoryService_) { - personHistoryService = _personHistoryService_; - })); + beforeEach(inject(function (_personHistoryService_) { + personHistoryService = _personHistoryService_; + })); - describe('buildHistoryFeed', function () { - beforeEach(function () { - this.note = { - _type: 'interaction', - interaction_type_id: '1', - organization: { - id: 1, - }, - timestamp: 4, - }; - this.interaction = { - _type: 'interaction', - interaction_type_id: '2', - organization: { - id: 1, - }, - timestamp: 2, - }; - this.answerSheet1 = { - _type: 'answer_sheet', - interaction_type_id: '1', - survey: { - organization_id: 1, - }, - completed_at: 3, - }; - this.answerSheet2 = { - _type: 'answer_sheet', - interaction_type_id: '2', - survey: { - organization_id: 1, - }, - completed_at: 1, - }; - this.person = { - interactions: [this.note, this.interaction], - answer_sheets: [this.answerSheet1, this.answerSheet2], - }; - }); + describe('buildHistoryFeed', function () { + beforeEach(function () { + this.note = { + _type: 'interaction', + interaction_type_id: '1', + organization: { + id: 1, + }, + timestamp: 4, + }; + this.interaction = { + _type: 'interaction', + interaction_type_id: '2', + organization: { + id: 1, + }, + timestamp: 2, + }; + this.answerSheet1 = { + _type: 'answer_sheet', + interaction_type_id: '1', + survey: { + organization_id: 1, + }, + completed_at: 3, + }; + this.answerSheet2 = { + _type: 'answer_sheet', + interaction_type_id: '2', + survey: { + organization_id: 1, + }, + completed_at: 1, + }; + this.person = { + interactions: [this.note, this.interaction], + answer_sheets: [this.answerSheet1, this.answerSheet2], + }; + }); - it('should show all history', function () { - expect( - personHistoryService.buildHistoryFeed(this.person, 'all', 1), - ).toEqual([ - this.answerSheet2, - this.interaction, - this.answerSheet1, - this.note, - ]); - }); + it('should show all history', function () { + expect(personHistoryService.buildHistoryFeed(this.person, 'all', 1)).toEqual([ + this.answerSheet2, + this.interaction, + this.answerSheet1, + this.note, + ]); + }); - it('should show just interactions', function () { - expect( - personHistoryService.buildHistoryFeed( - this.person, - 'interactions', - 1, - ), - ).toEqual([this.interaction]); - }); + it('should show just interactions', function () { + expect(personHistoryService.buildHistoryFeed(this.person, 'interactions', 1)).toEqual([this.interaction]); + }); - it('should show just notes', function () { - expect( - personHistoryService.buildHistoryFeed(this.person, 'notes', 1), - ).toEqual([this.note]); - }); + it('should show just notes', function () { + expect(personHistoryService.buildHistoryFeed(this.person, 'notes', 1)).toEqual([this.note]); + }); - it('should show just surveys', function () { - expect( - personHistoryService.buildHistoryFeed( - this.person, - 'surveys', - 1, - ), - ).toEqual([this.answerSheet2, this.answerSheet1]); - }); + it('should show just surveys', function () { + expect(personHistoryService.buildHistoryFeed(this.person, 'surveys', 1)).toEqual([ + this.answerSheet2, + this.answerSheet1, + ]); + }); - it('should filter out history from other orgs', function () { - this.interaction.organization.id = 2; - this.answerSheet2.survey.organization_id = 2; - expect( - personHistoryService.buildHistoryFeed(this.person, 'all', 1), - ).toEqual([this.answerSheet1, this.note]); - }); + it('should filter out history from other orgs', function () { + this.interaction.organization.id = 2; + this.answerSheet2.survey.organization_id = 2; + expect(personHistoryService.buildHistoryFeed(this.person, 'all', 1)).toEqual([this.answerSheet1, this.note]); }); + }); }); diff --git a/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.component.js b/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.component.js index adcb1107ea..6e1c2d6dd9 100644 --- a/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.component.js +++ b/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.component.js @@ -2,110 +2,99 @@ import template from './personMultiselect.html'; import './personMultiselect.scss'; angular.module('campusContactsApp').component('personMultiselect', { - controller: personMultiselectController, - bindings: { - organizationId: '<', + controller: personMultiselectController, + bindings: { + organizationId: '<', - // An array of the selected people - // This component does not manipulate that array; it relies on addPerson and removePerson to do that - selectedPeople: '<', + // An array of the selected people + // This component does not manipulate that array; it relies on addPerson and removePerson to do that + selectedPeople: '<', - // When passed a person, adds the person to the selected people list and return a promise that resolves - // when the add operation completes - addPerson: '&?', + // When passed a person, adds the person to the selected people list and return a promise that resolves + // when the add operation completes + addPerson: '&?', - // When passed a person, removes the person from the selected people list and return a promise that - // resolves when the remove operation completes - removePerson: '&?', + // When passed a person, removes the person from the selected people list and return a promise that + // resolves when the remove operation completes + removePerson: '&?', - // The label of the phrase used to describe people (i.e. contact, person, leader, member, etc.) that - // will be interpolated into messages - peopleDescriptionLabel: '=peopleDescription', + // The label of the phrase used to describe people (i.e. contact, person, leader, member, etc.) that + // will be interpolated into messages + peopleDescriptionLabel: '=peopleDescription', - focused: '=?', - }, - template: template, + focused: '=?', + }, + template, }); -function personMultiselectController( - $scope, - $q, - RequestDeduper, - assignedPeopleSelectService, - tFilter, - _, -) { - var vm = this; - - vm.search = ''; - vm.selectPerson = selectPerson; - vm.unselectPerson = unselectPerson; - vm.onSearchKeydown = onSearchKeydown; - - vm.$onInit = activate; - - function activate() { - _.defaults(vm, { - focused: true, +function personMultiselectController($scope, $q, RequestDeduper, assignedPeopleSelectService, tFilter, _) { + const vm = this; + + vm.search = ''; + vm.selectPerson = selectPerson; + vm.unselectPerson = unselectPerson; + vm.onSearchKeydown = onSearchKeydown; + + vm.$onInit = activate; + + function activate() { + _.defaults(vm, { + focused: true, + }); + + vm.peopleDescription = tFilter(vm.peopleDescriptionLabel); + + const requestDeduper = new RequestDeduper(); + + // Refresh the person list whenever the search term changes + $scope.$watch('$ctrl.search', function (search) { + if (search === '') { + // Ignore empty searches + vm.searchOptions = []; + return; + } + + vm.searching = true; + assignedPeopleSelectService + .searchPeople(search, vm.organizationId, requestDeduper) + .then(function (people) { + // Filter out people that are already selected + vm.searchOptions = _.differenceBy(people, vm.selectedPeople, 'id'); + }) + .finally(function () { + vm.searching = false; }); - - vm.peopleDescription = tFilter(vm.peopleDescriptionLabel); - - var requestDeduper = new RequestDeduper(); - - // Refresh the person list whenever the search term changes - $scope.$watch('$ctrl.search', function (search) { - if (search === '') { - // Ignore empty searches - vm.searchOptions = []; - return; - } - - vm.searching = true; - assignedPeopleSelectService - .searchPeople(search, vm.organizationId, requestDeduper) - .then(function (people) { - // Filter out people that are already selected - vm.searchOptions = _.differenceBy( - people, - vm.selectedPeople, - 'id', - ); - }) - .finally(function () { - vm.searching = false; - }); - }); - } - - // The default add-person binding appends the person to the selected people array - function defaultAddPerson(context) { - vm.selectedPeople.push(context.person); - } - - // The default add-person binding removes the person from the selected people array - function defaultRemovePerson(context) { - _.pull(vm.selectedPeople, context.person); - } - - function selectPerson(person) { - var addPerson = vm.addPerson || defaultAddPerson; - $q.when(addPerson({ person: person })).then(function () { - vm.search = ''; - }); - } - - function unselectPerson(person) { - var removePerson = vm.removePerson || defaultRemovePerson; - removePerson({ person: person }); - } - - function onSearchKeydown(event) { - if (event.keyCode === 13) { - // Enter key was pressed, so add the person option if it is the only one - if (vm.searchOptions.length === 1) { - selectPerson(vm.searchOptions[0]); - } - } + }); + } + + // The default add-person binding appends the person to the selected people array + function defaultAddPerson(context) { + vm.selectedPeople.push(context.person); + } + + // The default add-person binding removes the person from the selected people array + function defaultRemovePerson(context) { + _.pull(vm.selectedPeople, context.person); + } + + function selectPerson(person) { + const addPerson = vm.addPerson || defaultAddPerson; + $q.when(addPerson({ person })).then(function () { + vm.search = ''; + }); + } + + function unselectPerson(person) { + const removePerson = vm.removePerson || defaultRemovePerson; + removePerson({ person }); + } + + function onSearchKeydown(event) { + if (event.keyCode === 13) { + // Enter key was pressed, so add the person option if it is the only one + if (vm.searchOptions.length === 1) { + selectPerson(vm.searchOptions[0]); + } } + } } diff --git a/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.html b/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.html index 23d7202819..15e69e1d47 100644 --- a/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.html +++ b/app/assets/javascripts/angular/components/personMultiselect/personMultiselect.html @@ -1,35 +1,26 @@
    - - - -
    {{ person | personName }}
    + + + +
    {{ person | personName }}
    - + />
    - {{ 'person_multiselect.searching' | t : { people_description: - $ctrl.peopleDescription } }} + {{ 'person_multiselect.searching' | t : { people_description: $ctrl.peopleDescription } }}
    -
    - {{ 'person_multiselect.no_search_results' | t : { people_description: - $ctrl.peopleDescription, search: $ctrl.search } }} +
    + {{ 'person_multiselect.no_search_results' | t : { people_description: $ctrl.peopleDescription, search: $ctrl.search } + }}
    - - - {{ person | personName }} + + + {{ person | personName }} diff --git a/app/assets/javascripts/angular/components/personPage/personPage.component.js b/app/assets/javascripts/angular/components/personPage/personPage.component.js index 4475786076..d543c437f8 100644 --- a/app/assets/javascripts/angular/components/personPage/personPage.component.js +++ b/app/assets/javascripts/angular/components/personPage/personPage.component.js @@ -4,201 +4,177 @@ import './personPage.scss'; import template from './personPage.html'; angular.module('campusContactsApp').component('personPage', { - controller: personPageController, - template: template, - bindings: { - stateName: '<', - person: '<', - organizationId: '<', - options: '=', - }, + controller: personPageController, + template, + bindings: { + stateName: '<', + person: '<', + organizationId: '<', + options: '=', + }, }); function personPageController( - $scope, - $state, - $filter, - $q, - $transitions, - asyncBindingsService, - personService, - personTabs, - confirmModalService, - personPageService, - _, - loggedInPerson, + $scope, + $state, + $filter, + $q, + $transitions, + asyncBindingsService, + personService, + personTabs, + confirmModalService, + personPageService, + _, + loggedInPerson, ) { - var vm = this; - vm.personTabs = personTabs; - vm.orgLabels = []; - vm.dirty = false; - vm.avatarPausedUploadFile = null; - - vm.uploadAvatar = uploadAvatar; - vm.deleteAvatar = deleteAvatar; - vm.updateLabels = updateLabels; - vm.dismiss = dismiss; - vm.save = save; - vm.updateGroupMemberships = updateGroupMemberships; - vm.$onInit = asyncBindingsService.lazyLoadedActivate(activate, [ - 'person', - 'organizationId', - ]); - - function activate() { - // Disable editing profile pictures of other users - vm.hideProfilePhotoBtns = - vm.person.user && loggedInPerson.person !== vm.person; - - $scope.$on('personModified', function () { - vm.dirty = true; + const vm = this; + vm.personTabs = personTabs; + vm.orgLabels = []; + vm.dirty = false; + vm.avatarPausedUploadFile = null; + + vm.uploadAvatar = uploadAvatar; + vm.deleteAvatar = deleteAvatar; + vm.updateLabels = updateLabels; + vm.dismiss = dismiss; + vm.save = save; + vm.updateGroupMemberships = updateGroupMemberships; + vm.$onInit = asyncBindingsService.lazyLoadedActivate(activate, ['person', 'organizationId']); + + function activate() { + // Disable editing profile pictures of other users + vm.hideProfilePhotoBtns = vm.person.user && loggedInPerson.person !== vm.person; + + $scope.$on('personModified', function () { + vm.dirty = true; + }); + + vm.orgPermission = personService.getOrgPermission(vm.person, vm.organizationId); + vm.assignedTo = personService.getAssignedTo(vm.person, vm.organizationId); + $scope.$watch('$ctrl.person.picture', function (pictureUrl) { + vm.avatarUrl = pictureUrl || noProfileImage; + vm.isFacebookAvatar = personPageService.isFacebookAvatar(vm.avatarUrl); + if (vm.isFacebookAvatar) { + vm.avatarUrl += '?width=120&height=120'; + } + }); + + $scope.$watchCollection('$ctrl.person.email_addresses', function (relationships) { + vm.primaryEmail = _.find(relationships, { primary: true }); + if (!vm.primaryEmail && relationships.length > 0) { + // The primary email address defaults to the first one + vm.primaryEmail = _.first(relationships); + vm.primaryEmail.primary = true; + } + }); + $scope.$watchCollection('$ctrl.person.phone_numbers', function (relationships) { + vm.primaryPhone = _.find(relationships, { primary: true }); + if (!vm.primaryPhone && relationships.length > 0) { + // The primary phone number defaults to the first one + vm.primaryPhone = _.first(relationships); + vm.primaryPhone.primary = true; + } + }); + + updateLabels(); + updateGroupMemberships(); + + beginDismissLock(); + } + + let unsubscribeTransition, unsubscribeClose; + + // Prevent the modal from being closed without a confirmation dialog + function beginDismissLock() { + // Intercept transitions away from this component + unsubscribeTransition = $transitions.onBefore({ exiting: vm.stateName }, function () { + return confirmCancel() + .then(function () { + // Allow the transition to proceede + endDismissLock(); + }) + .catch(function () { + // Cancel the transition + return false; }); - - vm.orgPermission = personService.getOrgPermission( - vm.person, - vm.organizationId, - ); - vm.assignedTo = personService.getAssignedTo( - vm.person, - vm.organizationId, - ); - $scope.$watch('$ctrl.person.picture', function (pictureUrl) { - vm.avatarUrl = pictureUrl || noProfileImage; - vm.isFacebookAvatar = personPageService.isFacebookAvatar( - vm.avatarUrl, - ); - if (vm.isFacebookAvatar) { - vm.avatarUrl += '?width=120&height=120'; - } - }); - - $scope.$watchCollection('$ctrl.person.email_addresses', function ( - relationships, - ) { - vm.primaryEmail = _.find(relationships, { primary: true }); - if (!vm.primaryEmail && relationships.length > 0) { - // The primary email address defaults to the first one - vm.primaryEmail = _.first(relationships); - vm.primaryEmail.primary = true; - } - }); - $scope.$watchCollection('$ctrl.person.phone_numbers', function ( - relationships, - ) { - vm.primaryPhone = _.find(relationships, { primary: true }); - if (!vm.primaryPhone && relationships.length > 0) { - // The primary phone number defaults to the first one - vm.primaryPhone = _.first(relationships); - vm.primaryPhone.primary = true; - } - }); - - updateLabels(); - updateGroupMemberships(); - - beginDismissLock(); + }); + + // Intercept close events, prevent the modal from closing, and display the dismissal confirmation + unsubscribeClose = $scope.$on('modal.closing', function (event) { + event.preventDefault(); + vm.dismiss(); + }); + } + + // Allow the modal to be closed without a confirmation dialog + function endDismissLock() { + unsubscribeTransition(); + unsubscribeClose(); + } + + function uploadAvatar(file) { + if (file) { + if (vm.person.id) { + vm.avatarPausedUploadFile = null; + return personPageService.uploadAvatar(vm.person, file); + } + vm.avatarPausedUploadFile = file; } - - var unsubscribeTransition, unsubscribeClose; - - // Prevent the modal from being closed without a confirmation dialog - function beginDismissLock() { - // Intercept transitions away from this component - unsubscribeTransition = $transitions.onBefore( - { exiting: vm.stateName }, - function () { - return confirmCancel() - .then(function () { - // Allow the transition to proceede - endDismissLock(); - }) - .catch(function () { - // Cancel the transition - return false; - }); - }, - ); - - // Intercept close events, prevent the modal from closing, and display the dismissal confirmation - unsubscribeClose = $scope.$on('modal.closing', function (event) { - event.preventDefault(); - vm.dismiss(); - }); - } - - // Allow the modal to be closed without a confirmation dialog - function endDismissLock() { - unsubscribeTransition(); - unsubscribeClose(); - } - - function uploadAvatar(file) { - if (file) { - if (vm.person.id) { - vm.avatarPausedUploadFile = null; - return personPageService.uploadAvatar(vm.person, file); - } - vm.avatarPausedUploadFile = file; + } + + function deleteAvatar() { + personPageService.deleteAvatar(vm.person); + } + + function updateLabels() { + vm.orgLabels = personService.getOrgLabels(vm.person, vm.organizationId); + } + + // If necessary, display a confirmation dialog asking whether the user wants to cancel their changes to the + // current contact + function confirmCancel() { + return $q.resolve().then(function () { + if (vm.person.id === null && vm.dirty) { + // Receive confirmation before canceling the creation of a new contact + return confirmModalService.create($filter('t')('people.edit.cancel_create_confirm')); + } + }); + } + + // Dismiss this page + function dismiss() { + return confirmCancel().then(function () { + endDismissLock(); + $state.go('^.^'); + }); + } + + // Save the pending changes and dismiss + function save() { + vm.saving = true; + personPageService + .savePerson(vm.person) + .then((person) => { + // Update our person model with the newly-saved one. If it is a newly-created person, it will have + // an id now, and the dismiss call will not ask for a confirmation before navigating away. + vm.person = person; + }) + .then(() => { + if (vm.avatarPausedUploadFile) { + return uploadAvatar(vm.avatarPausedUploadFile); } - } - - function deleteAvatar() { - personPageService.deleteAvatar(vm.person); - } - - function updateLabels() { - vm.orgLabels = personService.getOrgLabels(vm.person, vm.organizationId); - } - - // If necessary, display a confirmation dialog asking whether the user wants to cancel their changes to the - // current contact - function confirmCancel() { - return $q.resolve().then(function () { - if (vm.person.id === null && vm.dirty) { - // Receive confirmation before canceling the creation of a new contact - return confirmModalService.create( - $filter('t')('people.edit.cancel_create_confirm'), - ); - } - }); - } - - // Dismiss this page - function dismiss() { - return confirmCancel().then(function () { - endDismissLock(); - $state.go('^.^'); - }); - } - - // Save the pending changes and dismiss - function save() { - vm.saving = true; - personPageService - .savePerson(vm.person) - .then((person) => { - // Update our person model with the newly-saved one. If it is a newly-created person, it will have - // an id now, and the dismiss call will not ask for a confirmation before navigating away. - vm.person = person; - }) - .then(() => { - if (vm.avatarPausedUploadFile) { - return uploadAvatar(vm.avatarPausedUploadFile); - } - }) - .then(() => { - $scope.$emit('personCreated', vm.person); - vm.dismiss(); - }) - .catch(() => { - vm.saving = false; - }); - } - - function updateGroupMemberships() { - vm.groupMemberships = personService.getGroupMemberships( - vm.person, - vm.organizationId, - ); - } + }) + .then(() => { + $scope.$emit('personCreated', vm.person); + vm.dismiss(); + }) + .catch(() => { + vm.saving = false; + }); + } + + function updateGroupMemberships() { + vm.groupMemberships = personService.getGroupMemberships(vm.person, vm.organizationId); + } } diff --git a/app/assets/javascripts/angular/components/personPage/personPage.html b/app/assets/javascripts/angular/components/personPage/personPage.html index 15622187e4..755cb76815 100644 --- a/app/assets/javascripts/angular/components/personPage/personPage.html +++ b/app/assets/javascripts/angular/components/personPage/personPage.html @@ -1,84 +1,67 @@ -
    -
    - - - - - -
    -
    -
    -
    - {{ $ctrl.person | personName }} - - {{ 'contacts.statuses.uncontacted' | t }} - -
    - - - -
    -
    - - -
    -
    -
    - {{ 'ministries.people.' + tabName + '.header' | t }} -
    -
    +
    +
    + + + + + +
    +
    +
    +
    + {{ $ctrl.person | personName }} + + {{ 'contacts.statuses.uncontacted' | t }} +
    -
    -
    -
    -
    +
    + + +
    +
    +
    - {{ 'general.save' | t }} - - + {{ 'ministries.people.' + tabName + '.header' | t }} +
    +
    +
    +
    +
    + +
    diff --git a/app/assets/javascripts/angular/components/personPage/personPage.service.js b/app/assets/javascripts/angular/components/personPage/personPage.service.js index bee78882bb..3c3a81a473 100644 --- a/app/assets/javascripts/angular/components/personPage/personPage.service.js +++ b/app/assets/javascripts/angular/components/personPage/personPage.service.js @@ -1,94 +1,84 @@ -angular - .module('campusContactsApp') - .factory('personPageService', personPageService); +angular.module('campusContactsApp').factory('personPageService', personPageService); function personPageService(httpProxy, modelsService, _) { - return { - // Determine whether an avatar URL comes from Facebook - isFacebookAvatar: function (avatarUrl) { - return _.startsWith(avatarUrl, 'https://graph.facebook.com/'); - }, + return { + // Determine whether an avatar URL comes from Facebook + isFacebookAvatar: function (avatarUrl) { + return _.startsWith(avatarUrl, 'https://graph.facebook.com/'); + }, - // Upload an image file as the person's new avatar - uploadAvatar: function (person, file) { - var url = modelsService.getModelUrl(person); - var form = { - data: { - attributes: { - picture: file, - }, - }, - }; - return httpProxy.submitForm('PUT', url, form, { - errorMessage: 'error.messages.person_page.upload_avatar', - }); + // Upload an image file as the person's new avatar + uploadAvatar: function (person, file) { + const url = modelsService.getModelUrl(person); + const form = { + data: { + attributes: { + picture: file, + }, }, + }; + return httpProxy.submitForm('PUT', url, form, { + errorMessage: 'error.messages.person_page.upload_avatar', + }); + }, - // Delete a person's existing avatar - deleteAvatar: function (person) { - return httpProxy.put( - modelsService.getModelUrl(person), - { - data: { - type: 'person', - id: person.id, - attributes: { - picture: null, - }, - }, - }, - { - errorMessage: 'error.messages.person_page.delete_avatar', - }, - ); + // Delete a person's existing avatar + deleteAvatar: function (person) { + return httpProxy.put( + modelsService.getModelUrl(person), + { + data: { + type: 'person', + id: person.id, + attributes: { + picture: null, + }, + }, + }, + { + errorMessage: 'error.messages.person_page.delete_avatar', }, + ); + }, - // Save a person to the server along with all of its relationships - savePerson: function (person) { - var attributeNames = [ - 'first_name', - 'last_name', - 'gender', - 'student_status', - ]; - var relationshipNames = [ - 'organizational_permissions', - 'organizational_labels', - 'group_memberships', - 'reverse_contact_assignments', - 'email_addresses', - 'phone_numbers', - 'addresses', - ]; + // Save a person to the server along with all of its relationships + savePerson: function (person) { + const attributeNames = ['first_name', 'last_name', 'gender', 'student_status']; + const relationshipNames = [ + 'organizational_permissions', + 'organizational_labels', + 'group_memberships', + 'reverse_contact_assignments', + 'email_addresses', + 'phone_numbers', + 'addresses', + ]; - var personAttributes = person.serialize({ - attributes: attributeNames, - relationships: [], - }).data; + const personAttributes = person.serialize({ + attributes: attributeNames, + relationships: [], + }).data; - var includedRelationships = _.chain(relationshipNames) - .map(function (relationshipName) { - return httpProxy.includedFromModels( - person[relationshipName], - ); - }) - .flatten() - .value(); + const includedRelationships = _.chain(relationshipNames) + .map(function (relationshipName) { + return httpProxy.includedFromModels(person[relationshipName]); + }) + .flatten() + .value(); - return httpProxy - .post( - modelsService.getModelMetadata('person').url.all, - { - data: personAttributes, - included: includedRelationships, - }, - { - params: { include: relationshipNames.join(',') }, - errorMessage: - 'error.messages.person_page.create_person', - }, - ) - .then(httpProxy.extractModel); - }, - }; + return httpProxy + .post( + modelsService.getModelMetadata('person').url.all, + { + data: personAttributes, + included: includedRelationships, + }, + { + params: { include: relationshipNames.join(',') }, + errorMessage: 'error.messages.person_page.create_person', + }, + ) + .then(httpProxy.extractModel); + }, + }; } diff --git a/app/assets/javascripts/angular/components/personProfile/personProfile.component.js b/app/assets/javascripts/angular/components/personProfile/personProfile.component.js index 30ecec333f..43ce5114f7 100644 --- a/app/assets/javascripts/angular/components/personProfile/personProfile.component.js +++ b/app/assets/javascripts/angular/components/personProfile/personProfile.component.js @@ -2,426 +2,374 @@ import template from './personProfile.html'; import './personProfile.scss'; angular.module('campusContactsApp').component('personProfile', { - controller: personProfileController, - require: { - personTab: '^personPage', - }, - template: template, + controller: personProfileController, + require: { + personTab: '^personPage', + }, + template, }); function personProfileController( - $scope, - $filter, - $uibModal, - JsonApiDataStore, - permissionService, - personService, - personProfileService, - loggedInPerson, - confirmModalService, - _, + $scope, + $filter, + $uibModal, + JsonApiDataStore, + permissionService, + personService, + personProfileService, + loggedInPerson, + confirmModalService, + _, ) { - var vm = this; - - vm.pendingEmailAddress = null; - vm.pendingPhoneNumber = null; - vm.modalInstance = null; - - vm.saveAttribute = saveAttribute; - vm.saveRelationship = saveRelationship; - vm.isContact = isContact; - vm.emailAddressesWithPending = emailAddressesWithPending; - vm.phoneNumbersWithPending = phoneNumbersWithPending; - vm.isPendingEmailAddress = isPendingEmailAddress; - vm.isPendingPhoneNumber = isPendingPhoneNumber; - vm.isEmailAddressValid = isEmailAddressValid; - vm.isPhoneNumberValid = isPhoneNumberValid; - vm.addEmailAddress = addEmailAddress; - vm.addPhoneNumber = addPhoneNumber; - vm.deleteEmailAddress = deleteEmailAddress; - vm.deletePhoneNumber = deletePhoneNumber; - vm.deleteAddress = deleteAddress; - vm.permissionChange = permissionChange; - vm.editTags = editTags; - vm.editGroups = editGroups; - vm.editAddress = editAddress; - vm.unarchive = unarchive; - vm.formatAddress = personProfileService.formatAddress; - - vm.$onInit = activate; - vm.$onDestroy = onDestroy; - - vm.followupStatusOptions = personService.getFollowupStatusOptions(); - vm.cruStatusOptions = personService.getCruStatusOptions(); - vm.permissionOptions = personService.getPermissionOptions(); - vm.enrollmentOptions = personService.getEnrollmentOptions(); - - function activate() { - vm.isNewPerson = !vm.personTab.person.id; - vm.personTab.orgPermission.permission_id = `${vm.personTab.orgPermission.permission_id}`; - // Disable editing name fields of other users - vm.disableNameFields = - vm.personTab.person.user && - loggedInPerson.person !== vm.personTab.person; - - // The personPage needs access to the profile form to determine validity. Because component "require" only - // works upwards (from descendent to ancestor), we have to have the profile component send its profile form - // to the person component. - var unsubscribeForm = $scope.$watch('$ctrl.form', function (form) { - if (form) { - vm.personTab.profileForm = form; - unsubscribeForm(); - } - }); - - var organization = JsonApiDataStore.store.find( - 'organization', - vm.personTab.organizationId, - ); - if (loggedInPerson.person === vm.personTab.person) { - vm.permissionChangeDisabled = true; - } else if (!loggedInPerson.isAdminAt(organization)) { - if ( - `${vm.personTab.orgPermission.permission_id}` === - permissionService.adminId - ) { - vm.permissionChangeDisabled = true; - } else { - vm.permissionOptions.shift(); - } - } - - // Save the changes on the server whenever the primary email or primary phone changes - $scope.$watch('$ctrl.personTab.primaryEmail', updatePrimary); - $scope.$watch('$ctrl.personTab.primaryPhone', updatePrimary); - - $scope.$watchCollection('$ctrl.personTab.assignedTo', function ( - newAssignedTo, - oldAssignedTo, - ) { - if (newAssignedTo === oldAssignedTo) { - return; - } - - $scope.$emit('personModified'); - - var addedPeople = _.difference(newAssignedTo, oldAssignedTo); - personProfileService.addAssignments( - vm.personTab.person, - vm.personTab.organizationId, - addedPeople, - ); - - var removedPeople = _.difference(oldAssignedTo, newAssignedTo); - personProfileService.removeAssignments( - vm.personTab.person, - removedPeople, - ); - }); - - $scope.$watchCollection('$ctrl.personTab.person.gender', function ( - newGender, - oldGender, - ) { - if (newGender !== oldGender) { - saveAttribute(vm.personTab.person, 'gender'); - } - }); - - if (vm.personTab.options.assignToMe) { - // Assign the person to the logged in person - var newAssignment = loggedInPerson.person; - vm.personTab.assignedTo.push(newAssignment); - personProfileService.addAssignments( - vm.personTab.person, - vm.personTab.organizationId, - [newAssignment], - ); - } + const vm = this; + + vm.pendingEmailAddress = null; + vm.pendingPhoneNumber = null; + vm.modalInstance = null; + + vm.saveAttribute = saveAttribute; + vm.saveRelationship = saveRelationship; + vm.isContact = isContact; + vm.emailAddressesWithPending = emailAddressesWithPending; + vm.phoneNumbersWithPending = phoneNumbersWithPending; + vm.isPendingEmailAddress = isPendingEmailAddress; + vm.isPendingPhoneNumber = isPendingPhoneNumber; + vm.isEmailAddressValid = isEmailAddressValid; + vm.isPhoneNumberValid = isPhoneNumberValid; + vm.addEmailAddress = addEmailAddress; + vm.addPhoneNumber = addPhoneNumber; + vm.deleteEmailAddress = deleteEmailAddress; + vm.deletePhoneNumber = deletePhoneNumber; + vm.deleteAddress = deleteAddress; + vm.permissionChange = permissionChange; + vm.editTags = editTags; + vm.editGroups = editGroups; + vm.editAddress = editAddress; + vm.unarchive = unarchive; + vm.formatAddress = personProfileService.formatAddress; + + vm.$onInit = activate; + vm.$onDestroy = onDestroy; + + vm.followupStatusOptions = personService.getFollowupStatusOptions(); + vm.cruStatusOptions = personService.getCruStatusOptions(); + vm.permissionOptions = personService.getPermissionOptions(); + vm.enrollmentOptions = personService.getEnrollmentOptions(); + + function activate() { + vm.isNewPerson = !vm.personTab.person.id; + vm.personTab.orgPermission.permission_id = `${vm.personTab.orgPermission.permission_id}`; + // Disable editing name fields of other users + vm.disableNameFields = vm.personTab.person.user && loggedInPerson.person !== vm.personTab.person; + + // The personPage needs access to the profile form to determine validity. Because component "require" only + // works upwards (from descendent to ancestor), we have to have the profile component send its profile form + // to the person component. + var unsubscribeForm = $scope.$watch('$ctrl.form', function (form) { + if (form) { + vm.personTab.profileForm = form; + unsubscribeForm(); + } + }); + + const organization = JsonApiDataStore.store.find('organization', vm.personTab.organizationId); + if (loggedInPerson.person === vm.personTab.person) { + vm.permissionChangeDisabled = true; + } else if (!loggedInPerson.isAdminAt(organization)) { + if (`${vm.personTab.orgPermission.permission_id}` === permissionService.adminId) { + vm.permissionChangeDisabled = true; + } else { + vm.permissionOptions.shift(); + } } - function onDestroy() { - if (vm.modalInstance) { - vm.modalInstance.close(); - } - } + // Save the changes on the server whenever the primary email or primary phone changes + $scope.$watch('$ctrl.personTab.primaryEmail', updatePrimary); + $scope.$watch('$ctrl.personTab.primaryPhone', updatePrimary); - function updatePrimary(newPrimary, oldPrimary) { - if (newPrimary === oldPrimary) { - // Do nothing if the primary item is not changing - return; - } + $scope.$watchCollection('$ctrl.personTab.assignedTo', function (newAssignedTo, oldAssignedTo) { + if (newAssignedTo === oldAssignedTo) { + return; + } - if (newPrimary && !newPrimary.primary) { - newPrimary.primary = true; - saveAttribute(newPrimary, 'primary'); - } + $scope.$emit('personModified'); - if (oldPrimary) { - oldPrimary.primary = false; - } - } + const addedPeople = _.difference(newAssignedTo, oldAssignedTo); + personProfileService.addAssignments(vm.personTab.person, vm.personTab.organizationId, addedPeople); - function saveAttribute(model, attribute) { - if (_.isUndefined(model[attribute])) { - // The attribute is invalid, so do not attempt to auto-save it - return; - } + const removedPeople = _.difference(oldAssignedTo, newAssignedTo); + personProfileService.removeAssignments(vm.personTab.person, removedPeople); + }); - $scope.$emit('personModified'); + $scope.$watchCollection('$ctrl.personTab.person.gender', function (newGender, oldGender) { + if (newGender !== oldGender) { + saveAttribute(vm.personTab.person, 'gender'); + } + }); - // Only save the attribute if it passes validation - var control = vm.form[attribute]; - if (!control || control.$valid) { - personProfileService.saveAttribute( - vm.personTab.person.id, - model, - attribute, - ); - } + if (vm.personTab.options.assignToMe) { + // Assign the person to the logged in person + const newAssignment = loggedInPerson.person; + vm.personTab.assignedTo.push(newAssignment); + personProfileService.addAssignments(vm.personTab.person, vm.personTab.organizationId, [newAssignment]); } + } - function saveRelationship(relationship, attribute, relationshipName) { - if (_.isUndefined(relationship[attribute])) { - // The attribute is invalid, so do not attempt to auto-save it - return; - } - - $scope.$emit('personModified'); - - const savePromise = personProfileService.saveRelationship( - vm.personTab.person, - relationship, - relationshipName, - attribute, - ); - savePromise.then(function () { - if (relationship === vm.pendingEmailAddress) { - vm.pendingEmailAddress = null; - } else if (relationship === vm.pendingPhoneNumber) { - vm.pendingPhoneNumber = null; - } - }); + function onDestroy() { + if (vm.modalInstance) { + vm.modalInstance.close(); } + } - function deleteRelationship(relationship, relationshipName) { - $scope.$emit('personModified'); - - personProfileService.deleteRelationship( - vm.personTab.person, - relationship, - relationshipName, - ); + function updatePrimary(newPrimary, oldPrimary) { + if (newPrimary === oldPrimary) { + // Do nothing if the primary item is not changing + return; } - function isContact() { - return personService.isContact( - vm.personTab.person, - vm.personTab.organizationId, - ); + if (newPrimary && !newPrimary.primary) { + newPrimary.primary = true; + saveAttribute(newPrimary, 'primary'); } - function emailAddressesWithPending() { - let emailAddresses = vm.personTab.person.email_addresses; - - if (!vm.pendingEmailAddress) { - addEmailAddress(); - // If we add an email address, set the error to null - vm.personTab.orgPermission.$error = null; - } - return emailAddresses.concat(vm.pendingEmailAddress); + if (oldPrimary) { + oldPrimary.primary = false; } + } - function phoneNumbersWithPending() { - var phoneNumbers = vm.personTab.person.phone_numbers; - - if (!vm.pendingPhoneNumber) { - addPhoneNumber(); - } - return phoneNumbers.concat(vm.pendingPhoneNumber); + function saveAttribute(model, attribute) { + if (_.isUndefined(model[attribute])) { + // The attribute is invalid, so do not attempt to auto-save it + return; } - function isPendingEmailAddress(emailAddress) { - return emailAddress === vm.pendingEmailAddress; - } + $scope.$emit('personModified'); - function isPendingPhoneNumber(phoneNumber) { - return phoneNumber === vm.pendingPhoneNumber; + // Only save the attribute if it passes validation + const control = vm.form[attribute]; + if (!control || control.$valid) { + personProfileService.saveAttribute(vm.personTab.person.id, model, attribute); } + } - function isEmailAddressValid(emailAddress) { - var control = - vm.form['email_address_' + (emailAddress.id || 'pending')]; - return ( - control.$valid || - (control.$viewValue === '' && - vm.isPendingEmailAddress(emailAddress)) - ); + function saveRelationship(relationship, attribute, relationshipName) { + if (_.isUndefined(relationship[attribute])) { + // The attribute is invalid, so do not attempt to auto-save it + return; } - function isPhoneNumberValid(phoneNumber) { - var control = vm.form['phone_number_' + (phoneNumber.id || 'pending')]; - return ( - control.$valid || - (control.$viewValue === '' && vm.isPendingPhoneNumber(phoneNumber)) - ); + $scope.$emit('personModified'); + + const savePromise = personProfileService.saveRelationship( + vm.personTab.person, + relationship, + relationshipName, + attribute, + ); + savePromise.then(function () { + if (relationship === vm.pendingEmailAddress) { + vm.pendingEmailAddress = null; + } else if (relationship === vm.pendingPhoneNumber) { + vm.pendingPhoneNumber = null; + } + }); + } + + function deleteRelationship(relationship, relationshipName) { + $scope.$emit('personModified'); + + personProfileService.deleteRelationship(vm.personTab.person, relationship, relationshipName); + } + + function isContact() { + return personService.isContact(vm.personTab.person, vm.personTab.organizationId); + } + + function emailAddressesWithPending() { + const emailAddresses = vm.personTab.person.email_addresses; + + if (!vm.pendingEmailAddress) { + addEmailAddress(); + // If we add an email address, set the error to null + vm.personTab.orgPermission.$error = null; } + return emailAddresses.concat(vm.pendingEmailAddress); + } - // Add a new email address to the person - // The email address is not actually saved to the server until the call to saveAttribute - function addEmailAddress() { - vm.pendingEmailAddress = new JsonApiDataStore.Model('email_address'); - vm.pendingEmailAddress.setAttribute( - 'person_id', - vm.personTab.person.id, - ); - vm.pendingEmailAddress.setAttribute('email', ''); - vm.pendingEmailAddress.setAttribute('primary', false); - vm.pendingEmailAddress.setAttribute('$valid', true); - } + function phoneNumbersWithPending() { + const phoneNumbers = vm.personTab.person.phone_numbers; - // Add a new phone number to the person - // The phone number is not actually saved to the server until the call to saveAttribute - function addPhoneNumber() { - vm.pendingPhoneNumber = new JsonApiDataStore.Model('phone_number'); - vm.pendingPhoneNumber.setAttribute('person_id', vm.personTab.person.id); - vm.pendingPhoneNumber.setAttribute('number', ''); - vm.pendingPhoneNumber.setAttribute('primary', false); - vm.pendingPhoneNumber.setAttribute('$valid', true); + if (!vm.pendingPhoneNumber) { + addPhoneNumber(); } - - function deleteEmailAddress(emailAddress) { - var message = $filter('t')('people.edit.delete_email_confirm'); - var confirmModal = confirmModalService.create(message); - - confirmModal - .then(function () { - deleteRelationship(emailAddress, 'email_addresses'); - }) - .then(() => { - vm.form.email_address_pending = vm.pendingEmailAddress; - }); - } - - function deletePhoneNumber(phoneNumber) { - var message = $filter('t')('people.edit.delete_phone_confirm'); - var confirmModal = confirmModalService.create(message); - - confirmModal - .then(function () { - deleteRelationship(phoneNumber, 'phone_numbers'); - }) - .then(() => { - vm.form.phone_number_pending = vm.pendingPhoneNumber; - }); - } - - function deleteAddress(address) { - var message = $filter('t')('people.edit.delete_address_confirm'); - var confirmModal = confirmModalService.create(message); - - confirmModal.then(function () { - deleteRelationship(address, 'addresses'); - }); - } - - /* + return phoneNumbers.concat(vm.pendingPhoneNumber); + } + + function isPendingEmailAddress(emailAddress) { + return emailAddress === vm.pendingEmailAddress; + } + + function isPendingPhoneNumber(phoneNumber) { + return phoneNumber === vm.pendingPhoneNumber; + } + + function isEmailAddressValid(emailAddress) { + const control = vm.form['email_address_' + (emailAddress.id || 'pending')]; + return control.$valid || (control.$viewValue === '' && vm.isPendingEmailAddress(emailAddress)); + } + + function isPhoneNumberValid(phoneNumber) { + const control = vm.form['phone_number_' + (phoneNumber.id || 'pending')]; + return control.$valid || (control.$viewValue === '' && vm.isPendingPhoneNumber(phoneNumber)); + } + + // Add a new email address to the person + // The email address is not actually saved to the server until the call to saveAttribute + function addEmailAddress() { + vm.pendingEmailAddress = new JsonApiDataStore.Model('email_address'); + vm.pendingEmailAddress.setAttribute('person_id', vm.personTab.person.id); + vm.pendingEmailAddress.setAttribute('email', ''); + vm.pendingEmailAddress.setAttribute('primary', false); + vm.pendingEmailAddress.setAttribute('$valid', true); + } + + // Add a new phone number to the person + // The phone number is not actually saved to the server until the call to saveAttribute + function addPhoneNumber() { + vm.pendingPhoneNumber = new JsonApiDataStore.Model('phone_number'); + vm.pendingPhoneNumber.setAttribute('person_id', vm.personTab.person.id); + vm.pendingPhoneNumber.setAttribute('number', ''); + vm.pendingPhoneNumber.setAttribute('primary', false); + vm.pendingPhoneNumber.setAttribute('$valid', true); + } + + function deleteEmailAddress(emailAddress) { + const message = $filter('t')('people.edit.delete_email_confirm'); + const confirmModal = confirmModalService.create(message); + + confirmModal + .then(function () { + deleteRelationship(emailAddress, 'email_addresses'); + }) + .then(() => { + vm.form.email_address_pending = vm.pendingEmailAddress; + }); + } + + function deletePhoneNumber(phoneNumber) { + const message = $filter('t')('people.edit.delete_phone_confirm'); + const confirmModal = confirmModalService.create(message); + + confirmModal + .then(function () { + deleteRelationship(phoneNumber, 'phone_numbers'); + }) + .then(() => { + vm.form.phone_number_pending = vm.pendingPhoneNumber; + }); + } + + function deleteAddress(address) { + const message = $filter('t')('people.edit.delete_address_confirm'); + const confirmModal = confirmModalService.create(message); + + confirmModal.then(function () { + deleteRelationship(address, 'addresses'); + }); + } + + /* This is used on the profile component with a tricky interpolation that results in it returning the old value. It looks like this: ng-change="$ctrl.permissionChange({{$ctrl.personTab.orgPermission.permission_id}})" Reference: http://stackoverflow.com/a/28047112/879524 */ - function permissionChange(oldValue, choice) { - var hasEmailAddress = vm.personTab.person.email_addresses.length > 0; - - // Set the error to null everytime this run in case the user updated their email - vm.personTab.orgPermission.$error = null; - if (hasEmailAddress) { - vm.saveAttribute(vm.personTab.orgPermission, 'permission_id'); - // Check is the choice the user makes is No permissions, and if so allow them to update without email - } else if (choice === vm.permissionOptions[2].id) { - vm.saveAttribute(vm.personTab.orgPermission, 'permission_id'); - } else { - vm.personTab.orgPermission.permission_id = oldValue; - // Set orgPermission $error to be the needed error message - vm.personTab.orgPermission.$error = $filter('t')( - 'contacts.index.for_this_permission_email_is_required_no_name', - ); - } - } - - function editTags() { - editLabelsOrGroups('organizational_labels', vm.personTab.updateLabels); - } - - function editGroups() { - editLabelsOrGroups( - 'group_memberships', - vm.personTab.updateGroupMemberships, - ); - } - - function editLabelsOrGroups(relationship, updateFunction) { - vm.modalInstance = $uibModal.open({ - animation: true, - component: 'editGroupOrLabelAssignments', - resolve: { - organizationId: function () { - return vm.personTab.organizationId; - }, - person: function () { - return vm.personTab.person; - }, - relationship: function () { - return relationship; - }, - }, - windowClass: 'pivot_theme', - size: 'md', - }); - - vm.modalInstance.result - .then(function () { - $scope.$emit('personModified'); - - updateFunction(); - }) - .finally(function () { - vm.modalInstance = null; - }); - } - - // Open an address for editing in a modal dialog - function editAddress(address) { - var addressModal = $uibModal.open({ - animation: true, - component: 'editAddress', - resolve: { - organizationId: function () { - return vm.personTab.organizationId; - }, - - person: function () { - return vm.personTab.person; - }, - - address: function () { - return address; - }, - }, - windowClass: 'pivot_theme', - size: 'md', - }); - - addressModal.result.then(function () { - $scope.$emit('personModified'); - }); + function permissionChange(oldValue, choice) { + const hasEmailAddress = vm.personTab.person.email_addresses.length > 0; + + // Set the error to null everytime this run in case the user updated their email + vm.personTab.orgPermission.$error = null; + if (hasEmailAddress) { + vm.saveAttribute(vm.personTab.orgPermission, 'permission_id'); + // Check is the choice the user makes is No permissions, and if so allow them to update without email + } else if (choice === vm.permissionOptions[2].id) { + vm.saveAttribute(vm.personTab.orgPermission, 'permission_id'); + } else { + vm.personTab.orgPermission.permission_id = oldValue; + // Set orgPermission $error to be the needed error message + vm.personTab.orgPermission.$error = $filter('t')('contacts.index.for_this_permission_email_is_required_no_name'); } + } + + function editTags() { + editLabelsOrGroups('organizational_labels', vm.personTab.updateLabels); + } + + function editGroups() { + editLabelsOrGroups('group_memberships', vm.personTab.updateGroupMemberships); + } + + function editLabelsOrGroups(relationship, updateFunction) { + vm.modalInstance = $uibModal.open({ + animation: true, + component: 'editGroupOrLabelAssignments', + resolve: { + organizationId: function () { + return vm.personTab.organizationId; + }, + person: function () { + return vm.personTab.person; + }, + relationship: function () { + return relationship; + }, + }, + windowClass: 'pivot_theme', + size: 'md', + }); + + vm.modalInstance.result + .then(function () { + $scope.$emit('personModified'); - function unarchive() { - if (vm.personTab.orgPermission !== null) { - vm.personTab.orgPermission.archive_date = null; - vm.saveAttribute(vm.personTab.orgPermission, 'archive_date'); - } + updateFunction(); + }) + .finally(function () { + vm.modalInstance = null; + }); + } + + // Open an address for editing in a modal dialog + function editAddress(address) { + const addressModal = $uibModal.open({ + animation: true, + component: 'editAddress', + resolve: { + organizationId: function () { + return vm.personTab.organizationId; + }, + + person: function () { + return vm.personTab.person; + }, + + address: function () { + return address; + }, + }, + windowClass: 'pivot_theme', + size: 'md', + }); + + addressModal.result.then(function () { + $scope.$emit('personModified'); + }); + } + + function unarchive() { + if (vm.personTab.orgPermission !== null) { + vm.personTab.orgPermission.archive_date = null; + vm.saveAttribute(vm.personTab.orgPermission, 'archive_date'); } + } } diff --git a/app/assets/javascripts/angular/components/personProfile/personProfile.html b/app/assets/javascripts/angular/components/personProfile/personProfile.html index d5ca00936a..79aa271411 100644 --- a/app/assets/javascripts/angular/components/personProfile/personProfile.html +++ b/app/assets/javascripts/angular/components/personProfile/personProfile.html @@ -1,399 +1,324 @@
    -
    + +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + + {{ $ctrl.personTab.orgPermission.$error }} +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - - -
    -
    - -
    -
    +
    + +
    +
    + {{ 'contact.gender' | t }} + + +
    -
    -
    +
    +
    + +
    +
    +
    - - {{ $ctrl.personTab.orgPermission.$error }} -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    +
    -
    -
    - -
    -
    - -
    -
    - {{ 'contact.gender' | t }} - - - -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    - -
    - +
    +
    + +
    +
    +
    diff --git a/app/assets/javascripts/angular/components/personProfile/personProfile.service.js b/app/assets/javascripts/angular/components/personProfile/personProfile.service.js index a1652b0e78..3a2a83723d 100644 --- a/app/assets/javascripts/angular/components/personProfile/personProfile.service.js +++ b/app/assets/javascripts/angular/components/personProfile/personProfile.service.js @@ -1,270 +1,214 @@ -angular - .module('campusContactsApp') - .factory('personProfileService', personProfileService); - -function personProfileService( - $q, - JsonApiDataStore, - httpProxy, - modelsService, - _, -) { - function updatePerson(personId, params, payload) { - return httpProxy.put( +angular.module('campusContactsApp').factory('personProfileService', personProfileService); + +function personProfileService($q, JsonApiDataStore, httpProxy, modelsService, _) { + function updatePerson(personId, params, payload) { + return httpProxy.put(modelsService.getModelMetadata('person').url.single(personId), payload, { + params, + errorMessage: 'error.messages.person_profile.update_person', + }); + } + + var personProfileService = { + // Persist attribute changes to a person (including changes to attributes of a person's relationship) on + // the server + // "attributes" may either be the name of a single attribute or an array of attribute names + saveAttribute: function (personId, model, attributes) { + if (personId === null) { + // The person is not saved on the server + return $q.resolve(); + } + + const params = {}; + + // Build up the changes object + const changes = { + type: model._type, + }; + + if (model.id) { + // We are updating an existing model + + changes.id = model.id; + + // Persist only the specified attributes + changes.attributes = _.pick(model, attributes); + } else { + // We are creating a new model + + // Persist all model fields + changes.attributes = model; + + // Include the relationship so that the newly-created model will be loaded and not be a placeholder + params.include = modelsService.getModelMetadata(model._type).include; + } + + // Update attributes on a person + if (model._type === 'person') { + return updatePerson(personId, params, { + data: changes, + }); + } + + // Updates attributes on a person's relation + return updatePerson(personId, params, { + data: { + type: 'person', + }, + included: [changes], + }).then(function (res) { + // If the update resulted in a merge, then reload all of the person's relationships because the + // person may have new relationships as a result of the merge + if (res.meta && res.meta.user_merged) { + return httpProxy.get( modelsService.getModelMetadata('person').url.single(personId), - payload, + {}, { - params: params, - errorMessage: 'error.messages.person_profile.update_person', + errorMessage: 'error.messages.person_profile.reload_merged_person', }, - ); - } - - var personProfileService = { - // Persist attribute changes to a person (including changes to attributes of a person's relationship) on - // the server - // "attributes" may either be the name of a single attribute or an array of attribute names - saveAttribute: function (personId, model, attributes) { - if (personId === null) { - // The person is not saved on the server - return $q.resolve(); - } - - var params = {}; - - // Build up the changes object - var changes = { - type: model._type, - }; - - if (model.id) { - // We are updating an existing model - - changes.id = model.id; - - // Persist only the specified attributes - changes.attributes = _.pick(model, attributes); - } else { - // We are creating a new model - - // Persist all model fields - changes.attributes = model; - - // Include the relationship so that the newly-created model will be loaded and not be a placeholder - params.include = modelsService.getModelMetadata( - model._type, - ).include; - } - - // Update attributes on a person - if (model._type === 'person') { - return updatePerson(personId, params, { - data: changes, - }); - } - - // Updates attributes on a person's relation - return updatePerson(personId, params, { - data: { - type: 'person', - }, - included: [changes], - }).then(function (res) { - // If the update resulted in a merge, then reload all of the person's relationships because the - // person may have new relationships as a result of the merge - if (res.meta && res.meta.user_merged) { - return httpProxy.get( - modelsService - .getModelMetadata('person') - .url.single(personId), - {}, - { - errorMessage: - 'error.messages.person_profile.reload_merged_person', - }, - ); - } - - return res; - }); - }, - - // Persist attribute changes to a person's relationship on the server - // "relationshipName" is the property on the person where the relationship is located - saveRelationship: function (person, relationship, relationshipName) { - return personProfileService.saveRelationships( - person, - [relationship], - relationshipName, - ); - }, - - // Persist attribute changes to a person's relationship on the server - // "relationshipName" is the property on the person where the relationship is located - saveRelationships: function (person, relationships, relationshipName) { - if (relationships.length === 0) { - // Nothing needs to be done - return $q.resolve(); - } - - if (person.id === null) { - // The person is not saved on the server, so manually add the relationship to the person instead of - // saving it on the server - person[relationshipName] = _.union( - person[relationshipName], - relationships, - ); - return $q.resolve(); - } - - return updatePerson( - person.id, - { include: relationshipName }, - { - included: httpProxy.includedFromModels(relationships), - }, - ); + ); + } + + return res; + }); + }, + + // Persist attribute changes to a person's relationship on the server + // "relationshipName" is the property on the person where the relationship is located + saveRelationship: function (person, relationship, relationshipName) { + return personProfileService.saveRelationships(person, [relationship], relationshipName); + }, + + // Persist attribute changes to a person's relationship on the server + // "relationshipName" is the property on the person where the relationship is located + saveRelationships: function (person, relationships, relationshipName) { + if (relationships.length === 0) { + // Nothing needs to be done + return $q.resolve(); + } + + if (person.id === null) { + // The person is not saved on the server, so manually add the relationship to the person instead of + // saving it on the server + person[relationshipName] = _.union(person[relationshipName], relationships); + return $q.resolve(); + } + + return updatePerson( + person.id, + { include: relationshipName }, + { + included: httpProxy.includedFromModels(relationships), }, - - // Delete a relationship on the server - deleteRelationship: function (person, relationship, relationshipName) { - return personProfileService.deleteRelationships( - person, - [relationship], - relationshipName, + ); + }, + + // Delete a relationship on the server + deleteRelationship: function (person, relationship, relationshipName) { + return personProfileService.deleteRelationships(person, [relationship], relationshipName); + }, + + // Delete multiple relationships on the server + deleteRelationships: function (person, relationships, relationshipName) { + let deletePromise; + if (person.id === null) { + deletePromise = $q.resolve(); + } else { + // Delete all of the relationships in series + deletePromise = $q.all( + relationships.map(function (relationship) { + return httpProxy.delete( + modelsService.getModelUrl(relationship), + {}, + { + errorMessage: 'error.messages.person_profile.delete_relationships', + }, ); - }, - - // Delete multiple relationships on the server - deleteRelationships: function ( - person, - relationships, - relationshipName, - ) { - var deletePromise; - if (person.id === null) { - deletePromise = $q.resolve(); - } else { - // Delete all of the relationships in series - deletePromise = $q.all( - relationships.map(function (relationship) { - return httpProxy.delete( - modelsService.getModelUrl(relationship), - {}, - { - errorMessage: - 'error.messages.person_profile.delete_relationships', - }, - ); - }), - ); - } - - return deletePromise.then(function () { - // Manually remove the models from the person's relationships - person[relationshipName] = _.difference( - person[relationshipName], - relationships, - ); - }); - }, - - // Assign contacts to a person - addAssignments: function (person, organizationId, contacts) { - var assignments = contacts.map(function (contact) { - var model = new JsonApiDataStore.Model('contact_assignment'); - model.setAttribute('assigned_to_id', contact.id); - model.setAttribute('organization_id', organizationId); - model.setRelationship('assigned_to', contact); - model.setRelationship( - 'organization', - JsonApiDataStore.store.find('organization', organizationId), - ); - return model; - }); - - return personProfileService.saveRelationships( - person, - assignments, - 'reverse_contact_assignments', - ); - }, - - // Unassign contacts from a person - removeAssignments: function (person, contacts) { - var contactIds = _.map(contacts, 'id'); - var deletePromises = _.chain(person.reverse_contact_assignments) - .filter(function (assignment) { - return ( - httpProxy.isLoaded(assignment) && - _.includes(contactIds, assignment.assigned_to.id) - ); - }) - .map(function (assignment) { - return personProfileService.deleteRelationship( - person, - assignment, - 'reverse_contact_assignments', - ); - }) - .value(); - return $q.all(deletePromises); - }, - - // Transform an address into an array of address lines for display in the UI - formatAddress: function (address) { - var lineParts = [ - { content: address.city, prefix: null }, - { content: address.state, prefix: ', ' }, - { content: address.zip, prefix: ' ' }, - ]; - - // Essentially what we are doing here is joining each of the line parts but using a different delimiter - // for each line part - // See the specs for examples of how this function will generate region lines from addresses - var regionLine = _.filter(lineParts, 'content').reduce(function ( - regionLine, - part, - ) { - // Append the prefix to the line unless the line is empty (because the line should not start with a - // part prefix) - // Then append the part content to the line - return ( - regionLine + (regionLine ? part.prefix : '') + part.content - ); + }), + ); + } + + return deletePromise.then(function () { + // Manually remove the models from the person's relationships + person[relationshipName] = _.difference(person[relationshipName], relationships); + }); + }, + + // Assign contacts to a person + addAssignments: function (person, organizationId, contacts) { + const assignments = contacts.map(function (contact) { + const model = new JsonApiDataStore.Model('contact_assignment'); + model.setAttribute('assigned_to_id', contact.id); + model.setAttribute('organization_id', organizationId); + model.setRelationship('assigned_to', contact); + model.setRelationship('organization', JsonApiDataStore.store.find('organization', organizationId)); + return model; + }); + + return personProfileService.saveRelationships(person, assignments, 'reverse_contact_assignments'); + }, + + // Unassign contacts from a person + removeAssignments: function (person, contacts) { + const contactIds = _.map(contacts, 'id'); + const deletePromises = _.chain(person.reverse_contact_assignments) + .filter(function (assignment) { + return httpProxy.isLoaded(assignment) && _.includes(contactIds, assignment.assigned_to.id); + }) + .map(function (assignment) { + return personProfileService.deleteRelationship(person, assignment, 'reverse_contact_assignments'); + }) + .value(); + return $q.all(deletePromises); + }, + + // Transform an address into an array of address lines for display in the UI + formatAddress: function (address) { + const lineParts = [ + { content: address.city, prefix: null }, + { content: address.state, prefix: ', ' }, + { content: address.zip, prefix: ' ' }, + ]; + + // Essentially what we are doing here is joining each of the line parts but using a different delimiter + // for each line part + // See the specs for examples of how this function will generate region lines from addresses + const regionLine = _.filter(lineParts, 'content').reduce(function (regionLine, part) { + // Append the prefix to the line unless the line is empty (because the line should not start with a + // part prefix) + // Then append the part content to the line + return regionLine + (regionLine ? part.prefix : '') + part.content; + }, ''); + + return [ + address.address1, + address.address2, + address.address3, + address.address4, + regionLine, + + // Only show the country line if the country is outside of the US + address.country === 'US' ? null : address.country, + ].filter(_.identity); + }, + + unarchive: function (permission) { + return updatePerson( + permission.person_id, + { include: 'organizational_permissions' }, + { + included: [ + { + type: 'organizational_permission', + id: permission.id, + attributes: { + archive_date: null, + }, }, - ''); - - return [ - address.address1, - address.address2, - address.address3, - address.address4, - regionLine, - - // Only show the country line if the country is outside of the US - address.country === 'US' ? null : address.country, - ].filter(_.identity); - }, - - unarchive: function (permission) { - return updatePerson( - permission.person_id, - { include: 'organizational_permissions' }, - { - included: [ - { - type: 'organizational_permission', - id: permission.id, - attributes: { - archive_date: null, - }, - }, - ], - }, - ); + ], }, - }; + ); + }, + }; - return personProfileService; + return personProfileService; } diff --git a/app/assets/javascripts/angular/components/personProfile/personProfile.service.spec.js b/app/assets/javascripts/angular/components/personProfile/personProfile.service.spec.js index cbe55de906..8d6fc530e7 100644 --- a/app/assets/javascripts/angular/components/personProfile/personProfile.service.spec.js +++ b/app/assets/javascripts/angular/components/personProfile/personProfile.service.spec.js @@ -1,513 +1,405 @@ -var personProfileService, $q, $rootScope, httpProxy, _; +let personProfileService, $q, $rootScope, httpProxy, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('personProfileService', function () { - beforeEach(inject(function ( - _personProfileService_, - _$q_, - _$rootScope_, - _httpProxy_, - ___, - ) { - personProfileService = _personProfileService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - _ = ___; - - this.organizationId = 10; - - this.person = { - _type: 'person', - id: 100, - reverse_contact_assignments: [ - { - _type: 'contact_assignment', - id: 1, - assigned_to: { id: 101 }, - }, - { - _type: 'contact_assignment', - id: 2, - assigned_to: { id: 102 }, - }, - { - _type: 'contact_assignment', - id: 3, - assigned_to: { id: 103 }, - }, - { _type: 'contact_assignment', id: 4, _placeHolder: true }, - ], - }; - - spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); - })); - - describe('saveAttribute', function () { - beforeEach(function () { - this.personId = 123; - this.person = { - _type: 'person', - id: this.personId, - key1: 'value1', - key2: 'value2', - key3: 'value3', - }; - }); - - it('should not save relationships on unpersisted people', function () { - this.person.id = null; - personProfileService.saveAttribute(null, this.person, 'key'); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + beforeEach(inject(function (_personProfileService_, _$q_, _$rootScope_, _httpProxy_, ___) { + personProfileService = _personProfileService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + _ = ___; + + this.organizationId = 10; + + this.person = { + _type: 'person', + id: 100, + reverse_contact_assignments: [ + { + _type: 'contact_assignment', + id: 1, + assigned_to: { id: 101 }, + }, + { + _type: 'contact_assignment', + id: 2, + assigned_to: { id: 102 }, + }, + { + _type: 'contact_assignment', + id: 3, + assigned_to: { id: 103 }, + }, + { _type: 'contact_assignment', id: 4, _placeHolder: true }, + ], + }; - it('should update individual person attributes', function () { - personProfileService.saveAttribute( - this.personId, - this.person, - 'key1', - ); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - data: { - type: 'person', - id: this.personId, - attributes: { - key1: 'value1', - }, - }, - }, - { - params: {}, - errorMessage: jasmine.any(String), - }, - ); - }); + spyOn(httpProxy, 'callHttp').and.returnValue($q.resolve()); + })); + + describe('saveAttribute', function () { + beforeEach(function () { + this.personId = 123; + this.person = { + _type: 'person', + id: this.personId, + key1: 'value1', + key2: 'value2', + key3: 'value3', + }; + }); - it('should update multiple person attributes', function () { - personProfileService.saveAttribute(this.personId, this.person, [ - 'key1', - 'key2', - 'key3', - ]); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - data: { - type: 'person', - id: this.personId, - attributes: { - key1: 'value1', - key2: 'value2', - key3: 'value3', - }, - }, - }, - { - params: {}, - errorMessage: jasmine.any(String), - }, - ); - }); + it('should not save relationships on unpersisted people', function () { + this.person.id = null; + personProfileService.saveAttribute(null, this.person, 'key'); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('should update existing relationships', function () { - var relationship = { - _type: 'organization', - id: 456, - key11: 'value11', - }; - - personProfileService.saveAttribute( - this.personId, - relationship, - 'key11', - ); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - data: { - type: 'person', - }, - included: [ - { - type: 'organization', - id: 456, - attributes: { - key11: 'value11', - }, - }, - ], - }, - { - params: {}, - errorMessage: jasmine.any(String), - }, - ); - }); + it('should update individual person attributes', function () { + personProfileService.saveAttribute(this.personId, this.person, 'key1'); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + data: { + type: 'person', + id: this.personId, + attributes: { + key1: 'value1', + }, + }, + }, + { + params: {}, + errorMessage: jasmine.any(String), + }, + ); + }); - it('should create new relationships', function () { - var relationship = { - _type: 'organization', - key21: 'value21', - key22: 'value21', - key23: 'value23', - }; - - personProfileService.saveAttribute(this.personId, relationship); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - data: { - type: 'person', - }, - included: [ - { - type: 'organization', - attributes: relationship, - }, - ], - }, - { - params: { include: 'organizations' }, - errorMessage: jasmine.any(String), - }, - ); - }); + it('should update multiple person attributes', function () { + personProfileService.saveAttribute(this.personId, this.person, ['key1', 'key2', 'key3']); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + data: { + type: 'person', + id: this.personId, + attributes: { + key1: 'value1', + key2: 'value2', + key3: 'value3', + }, + }, + }, + { + params: {}, + errorMessage: jasmine.any(String), + }, + ); }); - describe('saveRelationship', function () { - beforeEach(function () { - this.person = { - id: null, - relationships: [{ key: 'value' }], - }; + it('should update existing relationships', function () { + const relationship = { + _type: 'organization', + id: 456, + key11: 'value11', + }; + + personProfileService.saveAttribute(this.personId, relationship, 'key11'); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + data: { + type: 'person', + }, + included: [ + { + type: 'organization', + id: 456, + attributes: { + key11: 'value11', + }, + }, + ], + }, + { + params: {}, + errorMessage: jasmine.any(String), + }, + ); + }); - this.newRelationship = { key: 'value2' }; - }); + it('should create new relationships', function () { + const relationship = { + _type: 'organization', + key21: 'value21', + key22: 'value21', + key23: 'value23', + }; + + personProfileService.saveAttribute(this.personId, relationship); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + data: { + type: 'person', + }, + included: [ + { + type: 'organization', + attributes: relationship, + }, + ], + }, + { + params: { include: 'organizations' }, + errorMessage: jasmine.any(String), + }, + ); + }); + }); - it('should not save relationships on unpersisted people', function () { - personProfileService.saveRelationship( - this.person, - this.newRelationship, - 'relationships', - ); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + describe('saveRelationship', function () { + beforeEach(function () { + this.person = { + id: null, + relationships: [{ key: 'value' }], + }; - it('should save relationships on persisted people', function () { - this.person.id = 1; - spyOn(httpProxy, 'includedFromModels').and.returnValue({}); - personProfileService.saveRelationship( - this.person, - this.newRelationship, - 'relationships', - ); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); + this.newRelationship = { key: 'value2' }; + }); - it('should add created relationships on unpersisted people', function () { - personProfileService.saveRelationship( - this.person, - this.newRelationship, - 'relationships', - ); - expect(_.map(this.person.relationships, 'key')).toEqual([ - 'value', - 'value2', - ]); - }); + it('should not save relationships on unpersisted people', function () { + personProfileService.saveRelationship(this.person, this.newRelationship, 'relationships'); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('should not add updated relationships on unpersisted people', function () { - personProfileService.saveRelationship( - this.person, - this.person.relationships[0], - 'relationships', - ); - expect(_.map(this.person.relationships, 'key')).toEqual(['value']); - }); + it('should save relationships on persisted people', function () { + this.person.id = 1; + spyOn(httpProxy, 'includedFromModels').and.returnValue({}); + personProfileService.saveRelationship(this.person, this.newRelationship, 'relationships'); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); - describe('deleteRelationship', function () { - it('should call deleteRelationships', function () { - this.person = { id: 1 }; - this.relationship = { id: 2 }; - - spyOn(personProfileService, 'deleteRelationships'); - personProfileService.deleteRelationship( - this.person, - this.relationship, - 'relationships', - ); - expect( - personProfileService.deleteRelationships, - ).toHaveBeenCalledWith( - this.person, - [this.relationship], - 'relationships', - ); - }); + it('should add created relationships on unpersisted people', function () { + personProfileService.saveRelationship(this.person, this.newRelationship, 'relationships'); + expect(_.map(this.person.relationships, 'key')).toEqual(['value', 'value2']); }); - describe('deleteRelationships', function () { - beforeEach(function () { - this.relationship1 = { key: 'value1' }; - this.relationship2 = { key: 'value2' }; - this.relationship3 = { key: 'value3' }; - this.relationships = [this.relationship1, this.relationship2]; - this.person = { - id: null, - relationships: [ - this.relationship1, - this.relationship2, - this.relationship3, - ], - }; - }); + it('should not add updated relationships on unpersisted people', function () { + personProfileService.saveRelationship(this.person, this.person.relationships[0], 'relationships'); + expect(_.map(this.person.relationships, 'key')).toEqual(['value']); + }); + }); + + describe('deleteRelationship', function () { + it('should call deleteRelationships', function () { + this.person = { id: 1 }; + this.relationship = { id: 2 }; + + spyOn(personProfileService, 'deleteRelationships'); + personProfileService.deleteRelationship(this.person, this.relationship, 'relationships'); + expect(personProfileService.deleteRelationships).toHaveBeenCalledWith( + this.person, + [this.relationship], + 'relationships', + ); + }); + }); + + describe('deleteRelationships', function () { + beforeEach(function () { + this.relationship1 = { key: 'value1' }; + this.relationship2 = { key: 'value2' }; + this.relationship3 = { key: 'value3' }; + this.relationships = [this.relationship1, this.relationship2]; + this.person = { + id: null, + relationships: [this.relationship1, this.relationship2, this.relationship3], + }; + }); - it('should not delete unpersisted models', function () { - personProfileService.deleteRelationships( - this.person, - this.relationships, - 'relationships', - ); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should not delete unpersisted models', function () { + personProfileService.deleteRelationships(this.person, this.relationships, 'relationships'); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('should delete persisted models', function () { - this.person.id = 1; - personProfileService.deleteRelationships( - this.person, - this.relationships, - 'relationships', - ); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); + it('should delete persisted models', function () { + this.person.id = 1; + personProfileService.deleteRelationships(this.person, this.relationships, 'relationships'); + expect(httpProxy.callHttp).toHaveBeenCalled(); + }); - it( - 'should remove deleted models from the relationship', - asynchronous(function () { - var _this = this; - return personProfileService - .deleteRelationships( - this.person, - this.relationships, - 'relationships', - ) - .then(function () { - expect(_this.person.relationships).toEqual([ - _this.relationship3, - ]); - }); - }), - ); + it( + 'should remove deleted models from the relationship', + asynchronous(function () { + const _this = this; + return personProfileService + .deleteRelationships(this.person, this.relationships, 'relationships') + .then(function () { + expect(_this.person.relationships).toEqual([_this.relationship3]); + }); + }), + ); + }); + + describe('addAssignments', function () { + it('should not make a network request when adding assignments to an unpersisted person', function () { + this.person.id = null; + personProfileService.addAssignments(this.person, this.organizationId, [{ id: 104 }, { id: 105 }]); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); }); - describe('addAssignments', function () { - it('should not make a network request when adding assignments to an unpersisted person', function () { - this.person.id = null; - personProfileService.addAssignments( - this.person, - this.organizationId, - [{ id: 104 }, { id: 105 }], - ); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should save assignments locally when adding assignments to an unpersisted person', function () { + this.person.id = null; + personProfileService.addAssignments(this.person, this.organizationId, [{ id: 104 }, { id: 105 }]); + const assignedToIds = _.chain(this.person.reverse_contact_assignments) + .filter(function (assignment) { + return assignment._placeHolder !== true; + }) + .map('assigned_to.id') + .chain(); + expect(assignedToIds, [101, 102, 103, 104, 105]); + }); - it('should save assignments locally when adding assignments to an unpersisted person', function () { - this.person.id = null; - personProfileService.addAssignments( - this.person, - this.organizationId, - [{ id: 104 }, { id: 105 }], - ); - var assignedToIds = _.chain(this.person.reverse_contact_assignments) - .filter(function (assignment) { - return assignment._placeHolder !== true; - }) - .map('assigned_to.id') - .chain(); - expect(assignedToIds, [101, 102, 103, 104, 105]); - }); + it('should not make a network request when adding no assignments', function () { + personProfileService.addAssignments(this.person, this.organizationId, []); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('should not make a network request when adding no assignments', function () { - personProfileService.addAssignments( - this.person, - this.organizationId, - [], - ); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should make a network request when adding assigments', function () { + personProfileService.addAssignments(this.person, this.organizationId, [{ id: 104 }, { id: 105 }]); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + included: [ + { + type: 'contact_assignment', + attributes: { + assigned_to_id: 104, + organization_id: this.organizationId, + }, + }, + { + type: 'contact_assignment', + attributes: { + assigned_to_id: 105, + organization_id: this.organizationId, + }, + }, + ], + }, + { + params: { + include: 'reverse_contact_assignments', + }, + errorMessage: jasmine.any(String), + }, + ); + }); + }); - it('should make a network request when adding assigments', function () { - personProfileService.addAssignments( - this.person, - this.organizationId, - [{ id: 104 }, { id: 105 }], - ); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - included: [ - { - type: 'contact_assignment', - attributes: { - assigned_to_id: 104, - organization_id: this.organizationId, - }, - }, - { - type: 'contact_assignment', - attributes: { - assigned_to_id: 105, - organization_id: this.organizationId, - }, - }, - ], - }, - { - params: { - include: 'reverse_contact_assignments', - }, - errorMessage: jasmine.any(String), - }, - ); - }); + describe('removeAssignments', function () { + beforeEach(function () { + this.removedPeople = [{ id: 101 }, { id: 103 }, { id: 104 }]; }); - describe('removeAssignments', function () { - beforeEach(function () { - this.removedPeople = [{ id: 101 }, { id: 103 }, { id: 104 }]; - }); + it('should not make a network request when removing assignments from an unpersisted person', function () { + this.person.id = null; + personProfileService.removeAssignments(this.person, this.removedPeople); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); - it('should not make a network request when removing assignments from an unpersisted person', function () { - this.person.id = null; - personProfileService.removeAssignments( - this.person, - this.removedPeople, - ); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should make a network request for each removed assignment', function () { + personProfileService.removeAssignments(this.person, this.removedPeople); - it('should make a network request for each removed assignment', function () { - personProfileService.removeAssignments( - this.person, - this.removedPeople, - ); - - var errorMessageConfig = jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }); - - expect(httpProxy.callHttp.calls.allArgs()).toEqual([ - [ - 'DELETE', - jasmine.stringMatching(/\/1$/), - {}, - null, - errorMessageConfig, - ], // ends with "/1" - [ - 'DELETE', - jasmine.stringMatching(/\/3$/), - {}, - null, - errorMessageConfig, - ], // ends with "/3" - ]); - }); + const errorMessageConfig = jasmine.objectContaining({ + errorMessage: jasmine.any(String), + }); - it( - 'should remove deleted contact assignments', - asynchronous(function () { - var _this = this; - return personProfileService - .removeAssignments(this.person, this.removedPeople) - .then(function () { - expect( - _.map( - _this.person.reverse_contact_assignments, - 'id', - ), - ).toEqual([2, 4]); - }); - }), - ); + expect(httpProxy.callHttp.calls.allArgs()).toEqual([ + ['DELETE', jasmine.stringMatching(/\/1$/), {}, null, errorMessageConfig], // ends with "/1" + ['DELETE', jasmine.stringMatching(/\/3$/), {}, null, errorMessageConfig], // ends with "/3" + ]); }); - describe('formatAddress', function () { - it('should remove empty address lines', function () { - expect( - personProfileService.formatAddress({ - address1: '123 Main Street', - address2: 'Apt 1234', - }), - ).toEqual(['123 Main Street', 'Apt 1234']); + it( + 'should remove deleted contact assignments', + asynchronous(function () { + const _this = this; + return personProfileService.removeAssignments(this.person, this.removedPeople).then(function () { + expect(_.map(_this.person.reverse_contact_assignments, 'id')).toEqual([2, 4]); }); + }), + ); + }); + + describe('formatAddress', function () { + it('should remove empty address lines', function () { + expect( + personProfileService.formatAddress({ + address1: '123 Main Street', + address2: 'Apt 1234', + }), + ).toEqual(['123 Main Street', 'Apt 1234']); + }); - it('should generate the region line', function () { - var tests = [ - { - address: { city: 'Orlando', state: 'FL', zip: '32832' }, - lines: ['Orlando, FL 32832'], - }, - { - address: { city: 'Orlando', state: 'FL' }, - lines: ['Orlando, FL'], - }, - { - address: { city: 'Orlando', zip: '32832' }, - lines: ['Orlando 32832'], - }, - { address: { city: 'Orlando' }, lines: ['Orlando'] }, - { address: { state: 'FL', zip: '32832' }, lines: ['FL 32832'] }, - { address: { state: 'FL' }, lines: ['FL'] }, - { address: { zip: '32832' }, lines: ['32832'] }, - { address: {}, lines: [] }, - ]; - tests.forEach(function (test) { - expect( - personProfileService.formatAddress(test.address), - ).toEqual(test.lines); - }); - }); + it('should generate the region line', function () { + const tests = [ + { + address: { city: 'Orlando', state: 'FL', zip: '32832' }, + lines: ['Orlando, FL 32832'], + }, + { + address: { city: 'Orlando', state: 'FL' }, + lines: ['Orlando, FL'], + }, + { + address: { city: 'Orlando', zip: '32832' }, + lines: ['Orlando 32832'], + }, + { address: { city: 'Orlando' }, lines: ['Orlando'] }, + { address: { state: 'FL', zip: '32832' }, lines: ['FL 32832'] }, + { address: { state: 'FL' }, lines: ['FL'] }, + { address: { zip: '32832' }, lines: ['32832'] }, + { address: {}, lines: [] }, + ]; + tests.forEach(function (test) { + expect(personProfileService.formatAddress(test.address)).toEqual(test.lines); + }); + }); - it('should hide non-US country lines', function () { - expect( - personProfileService.formatAddress({ country: 'CA' }), - ).toEqual(['CA']); - expect( - personProfileService.formatAddress({ country: 'US' }), - ).toEqual([]); - }); + it('should hide non-US country lines', function () { + expect(personProfileService.formatAddress({ country: 'CA' })).toEqual(['CA']); + expect(personProfileService.formatAddress({ country: 'US' })).toEqual([]); }); + }); }); diff --git a/app/assets/javascripts/angular/components/preloadState/preloadState.component.js b/app/assets/javascripts/angular/components/preloadState/preloadState.component.js index 52a3e5f576..2b0e2c7986 100644 --- a/app/assets/javascripts/angular/components/preloadState/preloadState.component.js +++ b/app/assets/javascripts/angular/components/preloadState/preloadState.component.js @@ -1,29 +1,28 @@ angular.module('campusContactsApp').component('preloadState', { - controller: preloadStateController, - bindings: { - name: '@', - data: '@', - }, + controller: preloadStateController, + bindings: { + name: '@', + data: '@', + }, }); function preloadStateController(state, $http) { - var vm = this; + const vm = this; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - if (vm.data === 'true' || vm.data === 'false') { - state[vm.name] = vm.data === 'true'; - } else { - state[vm.name] = vm.data; - } - addAuthHeader(); + function activate() { + if (vm.data === 'true' || vm.data === 'false') { + state[vm.name] = vm.data === 'true'; + } else { + state[vm.name] = vm.data; } + addAuthHeader(); + } - function addAuthHeader() { - if (vm.name === 'v4AccessToken') { - $http.defaults.headers.common.Authorization = - 'Bearer ' + state.v4AccessToken; - } + function addAuthHeader() { + if (vm.name === 'v4AccessToken') { + $http.defaults.headers.common.Authorization = 'Bearer ' + state.v4AccessToken; } + } } diff --git a/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.component.js b/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.component.js index ff0fb83c2f..76d88190eb 100644 --- a/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.component.js +++ b/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.component.js @@ -1,8 +1,8 @@ import template from './publicPhoneNumberValidation.html'; angular.module('campusContactsApp').component('publicPhoneNumberValidation', { - bindings: { - phoneNumberValidation: '<', - }, - template, + bindings: { + phoneNumberValidation: '<', + }, + template, }); diff --git a/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.html b/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.html index 8e065be6ed..7fbc30a291 100644 --- a/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.html +++ b/app/assets/javascripts/angular/components/publicPhoneNumberValidation/publicPhoneNumberValidation.html @@ -1,41 +1,30 @@
    -
    -
    -
    -
    -
    - {{ 'phoneNumbers:validations.notFound' | t }} -
    -
    -
    -
    - {{ 'phoneNumbers:validations.inactiveOrInvalid' | t }} -
    -
    -
    -
    -
    - -
    -
    -

    - {{ $ctrl.phoneNumberValidation.survey.title }} -

    -

    - {{ - $ctrl.phoneNumberValidation.survey.validation_success_message - }} -

    - {{ $ctrl.phoneNumberValidation.created_at | date : - 'short' }} -
    -
    +
    +
    +
    +
    +
    {{ 'phoneNumbers:validations.notFound' | t }}
    +
    +
    {{ 'phoneNumbers:validations.inactiveOrInvalid' | t }}
    +
    +
    +
    +
    + +
    +
    +

    {{ $ctrl.phoneNumberValidation.survey.title }}

    +

    + {{ $ctrl.phoneNumberValidation.survey.validation_success_message }} +

    + {{ $ctrl.phoneNumberValidation.created_at | date : 'short' }} +
    +
    +
    diff --git a/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.component.js b/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.component.js index 4cc581450d..3f1a346220 100644 --- a/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.component.js +++ b/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.component.js @@ -1,9 +1,9 @@ import template from './publicSurvey.html'; angular.module('campusContactsApp').component('publicSurvey', { - bindings: { - survey: '<', - preview: '<', - }, - template, + bindings: { + survey: '<', + preview: '<', + }, + template, }); diff --git a/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.html b/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.html index 6f4acd77cb..e804b5c3a6 100644 --- a/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.html +++ b/app/assets/javascripts/angular/components/publicSurvey/publicSurvey.html @@ -1,87 +1,60 @@ -
    -
    -
    -
    -
    - {{ 'surveys:publicView.preview.header' | t }} -
    -
    - {{ 'surveys:publicView.preview.description' | t }} -
    -
    +
    +
    +
    +
    +
    {{ 'surveys:publicView.preview.header' | t }}
    +
    {{ 'surveys:publicView.preview.description' | t }}
    +
    -
    -
    - {{ 'surveys:publicView.preview.inactive' | t }} -
    -
    +
    +
    {{ 'surveys:publicView.preview.inactive' | t }}
    +
    -
    -
    -
    - {{ 'surveys:publicView.surveyNotFound' | t }} -
    -
    +
    +
    +
    {{ 'surveys:publicView.surveyNotFound' | t }}
    +
    -
    -
    - {{ 'surveys:publicView.inactiveOrInvalid' | t }} -
    -
    -
    +
    +
    {{ 'surveys:publicView.inactiveOrInvalid' | t }}
    +
    +
    -
    - -
    -

    - {{ $ctrl.survey.title }} -

    -

    - {{ $ctrl.survey.login_paragraph }} -

    -

    - {{ $ctrl.survey.post_survey_message }} -

    -

    - {{ 'surveys:publicView.post_survey_message' | t }} -

    +
    + +
    +

    {{ $ctrl.survey.title }}

    +

    {{ $ctrl.survey.login_paragraph }}

    +

    + {{ $ctrl.survey.post_survey_message }} +

    +

    + {{ 'surveys:publicView.post_survey_message' | t }} +

    - - -
    - -
    + +
    + +
    +
    diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.component.js b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.component.js index 67931d55a1..d5f1147bf7 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.component.js +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.component.js @@ -7,234 +7,178 @@ import checkIcon from '../../../../../images/icons/icon-check-stylized.svg'; import template from './confirmMovementIndicators.html'; -angular - .module('campusContactsApp') - .component('reportMovementIndicatorsConfirm', { - controller: reportMovementIndicatorsConfirmController, - bindings: { - orgId: '<', - next: '&', - previous: '&', - }, - template, - }); +angular.module('campusContactsApp').component('reportMovementIndicatorsConfirm', { + controller: reportMovementIndicatorsConfirmController, + bindings: { + orgId: '<', + next: '&', + previous: '&', + }, + template, +}); function reportMovementIndicatorsConfirmController(httpProxy, $uibModal) { - this.fieldMap = { - interactions: { - spiritualConversations: { - label: i18next.t( - 'movementIndicators:interactions.spiritualConversations.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.spiritualConversations.tooltip', - ), - apiField: 'spiritual_conversation_interactions', - }, - personalEvangelism: { - label: i18next.t( - 'movementIndicators:interactions.personalEvangelism.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.personalEvangelism.tooltip', - ), - apiField: 'gospel_presentation_interactions', - }, - personalEvangelismDecisions: { - label: i18next.t( - 'movementIndicators:interactions.personalEvangelismDecisions.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.personalEvangelismDecisions.tooltip', - ), - apiField: 'prayed_to_receive_christ_interactions', - }, - holySpiritPresentations: { - label: i18next.t( - 'movementIndicators:interactions.holySpiritPresentations.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.holySpiritPresentations.tooltip', - ), - apiField: 'holy_spirit_presentation_interactions', - }, - groupEvangelism: { - label: i18next.t( - 'movementIndicators:interactions.groupEvangelism.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.groupEvangelism.tooltip', - ), - apiField: 'group_evangelism', - }, - groupEvangelismDecisions: { - label: i18next.t( - 'movementIndicators:interactions.groupEvangelismDecisions.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.groupEvangelismDecisions.tooltip', - ), - apiField: 'group_evangelism_decision', - }, - mediaExposures: { - label: i18next.t( - 'movementIndicators:interactions.mediaExposures.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.mediaExposures.tooltip', - ), - apiField: 'media_exposure', - }, - mediaExposureDecisions: { - label: i18next.t( - 'movementIndicators:interactions.mediaExposureDecisions.label', - ), - tooltip: i18next.t( - 'movementIndicators:interactions.mediaExposureDecisions.tooltip', - ), - apiField: 'media_exposure_decisions', - }, - }, - students: { - involved: { - label: i18next.t('movementIndicators:students.involved.label'), - tooltip: i18next.t( - 'movementIndicators:students.involved.tooltip', - ), - apiField: 'students_involved', - }, - engaged: { - label: i18next.t('movementIndicators:students.engaged.label'), - tooltip: i18next.t( - 'movementIndicators:students.engaged.tooltip', - ), - apiField: 'students_engaged', - }, - leaders: { - label: i18next.t('movementIndicators:students.leaders.label'), - tooltip: i18next.t( - 'movementIndicators:students.leaders.tooltip', - ), - apiField: 'student_leaders', - }, - }, - faculty: { - involved: { - label: i18next.t('movementIndicators:faculty.involved.label'), - tooltip: i18next.t( - 'movementIndicators:faculty.involved.tooltip', - ), - apiField: 'faculty_involved', - }, - engaged: { - label: i18next.t('movementIndicators:faculty.engaged.label'), - tooltip: i18next.t( - 'movementIndicators:faculty.engaged.tooltip', - ), - apiField: 'faculty_engaged', - }, - leaders: { - label: i18next.t('movementIndicators:faculty.leaders.label'), - tooltip: i18next.t( - 'movementIndicators:faculty.leaders.tooltip', - ), - apiField: 'faculty_leaders', - }, - }, - }; - - this.$onInit = () => { - loadMovementIndicators(this.orgId); - }; + this.fieldMap = { + interactions: { + spiritualConversations: { + label: i18next.t('movementIndicators:interactions.spiritualConversations.label'), + tooltip: i18next.t('movementIndicators:interactions.spiritualConversations.tooltip'), + apiField: 'spiritual_conversation_interactions', + }, + personalEvangelism: { + label: i18next.t('movementIndicators:interactions.personalEvangelism.label'), + tooltip: i18next.t('movementIndicators:interactions.personalEvangelism.tooltip'), + apiField: 'gospel_presentation_interactions', + }, + personalEvangelismDecisions: { + label: i18next.t('movementIndicators:interactions.personalEvangelismDecisions.label'), + tooltip: i18next.t('movementIndicators:interactions.personalEvangelismDecisions.tooltip'), + apiField: 'prayed_to_receive_christ_interactions', + }, + holySpiritPresentations: { + label: i18next.t('movementIndicators:interactions.holySpiritPresentations.label'), + tooltip: i18next.t('movementIndicators:interactions.holySpiritPresentations.tooltip'), + apiField: 'holy_spirit_presentation_interactions', + }, + groupEvangelism: { + label: i18next.t('movementIndicators:interactions.groupEvangelism.label'), + tooltip: i18next.t('movementIndicators:interactions.groupEvangelism.tooltip'), + apiField: 'group_evangelism', + }, + groupEvangelismDecisions: { + label: i18next.t('movementIndicators:interactions.groupEvangelismDecisions.label'), + tooltip: i18next.t('movementIndicators:interactions.groupEvangelismDecisions.tooltip'), + apiField: 'group_evangelism_decision', + }, + mediaExposures: { + label: i18next.t('movementIndicators:interactions.mediaExposures.label'), + tooltip: i18next.t('movementIndicators:interactions.mediaExposures.tooltip'), + apiField: 'media_exposure', + }, + mediaExposureDecisions: { + label: i18next.t('movementIndicators:interactions.mediaExposureDecisions.label'), + tooltip: i18next.t('movementIndicators:interactions.mediaExposureDecisions.tooltip'), + apiField: 'media_exposure_decisions', + }, + }, + students: { + involved: { + label: i18next.t('movementIndicators:students.involved.label'), + tooltip: i18next.t('movementIndicators:students.involved.tooltip'), + apiField: 'students_involved', + }, + engaged: { + label: i18next.t('movementIndicators:students.engaged.label'), + tooltip: i18next.t('movementIndicators:students.engaged.tooltip'), + apiField: 'students_engaged', + }, + leaders: { + label: i18next.t('movementIndicators:students.leaders.label'), + tooltip: i18next.t('movementIndicators:students.leaders.tooltip'), + apiField: 'student_leaders', + }, + }, + faculty: { + involved: { + label: i18next.t('movementIndicators:faculty.involved.label'), + tooltip: i18next.t('movementIndicators:faculty.involved.tooltip'), + apiField: 'faculty_involved', + }, + engaged: { + label: i18next.t('movementIndicators:faculty.engaged.label'), + tooltip: i18next.t('movementIndicators:faculty.engaged.tooltip'), + apiField: 'faculty_engaged', + }, + leaders: { + label: i18next.t('movementIndicators:faculty.leaders.label'), + tooltip: i18next.t('movementIndicators:faculty.leaders.tooltip'), + apiField: 'faculty_leaders', + }, + }, + }; - const loadMovementIndicators = (orgId) => { - this.loadingMovementIndicators = true; - return httpProxy - .get( - `/movement_indicators/${orgId}`, - {}, - { - errorMessage: i18next.t( - 'movementIndicators:confirmIndicators.errorLoadingIndicators', - ), - }, - ) - .then(({ data, meta }) => { - this.startDate = meta.start_date; - this.endDate = meta.end_date; - this.submittedInLastWeek = data.submitted_in_last_week; - this.fieldMap = _.mapValues(this.fieldMap, (indicatorGroup) => - _.mapValues(indicatorGroup, (indicator) => ({ - ...indicator, - value: data[indicator.apiField], - })), - ); - delete this.loadingMovementIndicators; - }); - }; + this.$onInit = () => { + loadMovementIndicators(this.orgId); + }; - this.submit = async () => { - const data = { - data: { - type: 'movement_indicator_submission', - attributes: Object.values(this.fieldMap).reduce( - (acc, indicatorGroup) => ({ - ...acc, - ...Object.values(indicatorGroup).reduce( - (acc, indicator) => ({ - ...acc, - [indicator.apiField]: indicator.value, - }), - {}, - ), - }), - {}, - ), - }, - }; + const loadMovementIndicators = (orgId) => { + this.loadingMovementIndicators = true; + return httpProxy + .get( + `/movement_indicators/${orgId}`, + {}, + { + errorMessage: i18next.t('movementIndicators:confirmIndicators.errorLoadingIndicators'), + }, + ) + .then(({ data, meta }) => { + this.startDate = meta.start_date; + this.endDate = meta.end_date; + this.submittedInLastWeek = data.submitted_in_last_week; + this.fieldMap = _.mapValues(this.fieldMap, (indicatorGroup) => + _.mapValues(indicatorGroup, (indicator) => ({ + ...indicator, + value: data[indicator.apiField], + })), + ); + delete this.loadingMovementIndicators; + }); + }; - await $uibModal.open({ - component: 'iconModal', - resolve: { - icon: () => warningIcon, - reducedPadding: () => true, - paragraphs: () => [ - i18next.t('movementIndicators:confirmModal.description'), - ], - dismissLabel: () => i18next.t('goBack'), - closeLabel: () => i18next.t('submit'), - }, - }).result; - try { - await httpProxy.put(`/movement_indicators/${this.orgId}`, data, { - errorMessage: i18next.t( - 'movementIndicators:confirmIndicators.errorSavingIndicators', - ), - ignoreFilter: () => false, // Needed to get the httpProxy to return a promise on failure instead of waiting indefinitely for toast to be clicked to retry the failed request - }); - await $uibModal.open({ - component: 'iconModal', - resolve: { - icon: () => checkIcon, - title: () => - i18next.t('movementIndicators:successModal.title'), - closeLabel: () => i18next.t('ok'), - }, - }).result; - this.next(); - } catch (e) { - await $uibModal.open({ - component: 'iconModal', - resolve: { - icon: () => warningIcon, - title: () => - i18next.t('movementIndicators:errorModal.title'), - paragraphs: () => [ - i18next.t('movementIndicators:errorModal.description'), - ], - closeLabel: () => i18next.t('ok'), - }, - }).result; - } + this.submit = async () => { + const data = { + data: { + type: 'movement_indicator_submission', + attributes: Object.values(this.fieldMap).reduce( + (acc, indicatorGroup) => ({ + ...acc, + ...Object.values(indicatorGroup).reduce( + (acc, indicator) => ({ + ...acc, + [indicator.apiField]: indicator.value, + }), + {}, + ), + }), + {}, + ), + }, }; + + await $uibModal.open({ + component: 'iconModal', + resolve: { + icon: () => warningIcon, + reducedPadding: () => true, + paragraphs: () => [i18next.t('movementIndicators:confirmModal.description')], + dismissLabel: () => i18next.t('goBack'), + closeLabel: () => i18next.t('submit'), + }, + }).result; + try { + await httpProxy.put(`/movement_indicators/${this.orgId}`, data, { + errorMessage: i18next.t('movementIndicators:confirmIndicators.errorSavingIndicators'), + ignoreFilter: () => false, // Needed to get the httpProxy to return a promise on failure instead of waiting indefinitely for toast to be clicked to retry the failed request + }); + await $uibModal.open({ + component: 'iconModal', + resolve: { + icon: () => checkIcon, + title: () => i18next.t('movementIndicators:successModal.title'), + closeLabel: () => i18next.t('ok'), + }, + }).result; + this.next(); + } catch (e) { + await $uibModal.open({ + component: 'iconModal', + resolve: { + icon: () => warningIcon, + title: () => i18next.t('movementIndicators:errorModal.title'), + paragraphs: () => [i18next.t('movementIndicators:errorModal.description')], + closeLabel: () => i18next.t('ok'), + }, + }).result; + } + }; } diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.html b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.html index f4cf89681a..247d142bf7 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.html +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/confirmMovementIndicators.html @@ -1,103 +1,75 @@ -

    - {{ 'movementIndicators:confirmIndicators.title' | t }} -

    +

    {{ 'movementIndicators:confirmIndicators.title' | t }}

    - {{ $ctrl.startDate | date : 'shortDate' }} – {{ $ctrl.endDate | date : - 'shortDate' }} + {{ $ctrl.startDate | date : 'shortDate' }} – {{ $ctrl.endDate | date : 'shortDate' }}

    - {{ 'movementIndicators:confirmIndicators.loading' | t }} + {{ 'movementIndicators:confirmIndicators.loading' | t }}
    -
    -

    - {{ - 'movementIndicators:confirmIndicators.submittedInLastWeek.heading' | - t }} -

    -

    - {{ - 'movementIndicators:confirmIndicators.submittedInLastWeek.description' - | t }} -

    -

    - {{ - 'movementIndicators:confirmIndicators.submittedInLastWeek.descriptionContinued' - | t }} -

    -
    +
    +

    {{ 'movementIndicators:confirmIndicators.submittedInLastWeek.heading' | t }}

    +

    {{ 'movementIndicators:confirmIndicators.submittedInLastWeek.description' | t }}

    +

    {{ 'movementIndicators:confirmIndicators.submittedInLastWeek.descriptionContinued' | t }}

    +
    -
    -

    - {{ 'movementIndicators:confirmIndicators.interactionsHeading' | t }} -

    -
    -

    - {{ 'movementIndicators:interactions.title' | t }} -

    -
    -
    - -
    -
    +
    +

    {{ 'movementIndicators:confirmIndicators.interactionsHeading' | t }}

    +
    +

    {{ 'movementIndicators:interactions.title' | t }}

    +
    +
    +
    +
    +
    -

    - {{ 'movementIndicators:confirmIndicators.labelsHeading' | t }} -

    -
    -
    -

    - {{ 'movementIndicators:students.title' | t }} -

    -
    - -
    -
    -
    -

    - {{ 'movementIndicators:faculty.title' | t }} -

    -
    - -
    -
    +

    {{ 'movementIndicators:confirmIndicators.labelsHeading' | t }}

    +
    +
    +

    {{ 'movementIndicators:students.title' | t }}

    +
    + +
    +
    +
    +

    {{ 'movementIndicators:faculty.title' | t }}

    +
    +
    +
    +
    - - + +
    diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.component.js b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.component.js index fcc122dfd3..3eaed88b60 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.component.js +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.component.js @@ -2,8 +2,8 @@ import template from './tooltip.html'; import './tooltip.scss'; angular.module('campusContactsApp').component('tooltip', { - bindings: { - content: '@', - }, - template, + bindings: { + content: '@', + }, + template, }); diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.html b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.html index 4681f56dc1..24417b5642 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.html +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/confirmMovementIndicators/tooltip/tooltip.html @@ -1,9 +1,4 @@ - - {{ 'help' | t }} - {{ $ctrl.content }} + + {{ 'help' | t }} + {{ $ctrl.content }} diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.component.js b/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.component.js index 4ce2a08173..3582055ea4 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.component.js +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.component.js @@ -1,39 +1,39 @@ import template from './reportMovementIndicators.html'; angular.module('campusContactsApp').component('reportMovementIndicators', { - controller: reportMovementIndicatorsController, - bindings: { - orgId: '<', - }, - template, + controller: reportMovementIndicatorsController, + bindings: { + orgId: '<', + }, + template, }); function reportMovementIndicatorsController($window, $state) { - const ScreenEnum = (this.ScreenEnum = Object.freeze({ - SuggestedActions: 1, - ReportMovementIndicators: 2, - })); - this.currentScreen = ScreenEnum.SuggestedActions; + const ScreenEnum = (this.ScreenEnum = Object.freeze({ + SuggestedActions: 1, + ReportMovementIndicators: 2, + })); + this.currentScreen = ScreenEnum.SuggestedActions; - this.next = () => { - switch (this.currentScreen) { - case ScreenEnum.SuggestedActions: - this.currentScreen = ScreenEnum.ReportMovementIndicators; - break; - case ScreenEnum.ReportMovementIndicators: - $state.go('app.ministries.ministry.people', { - orgId: this.orgId, - }); - break; - } - $window.scrollTo(0, 0); - }; - this.previous = () => { - switch (this.currentScreen) { - case ScreenEnum.ReportMovementIndicators: - this.currentScreen = ScreenEnum.SuggestedActions; - break; - } - $window.scrollTo(0, 0); - }; + this.next = () => { + switch (this.currentScreen) { + case ScreenEnum.SuggestedActions: + this.currentScreen = ScreenEnum.ReportMovementIndicators; + break; + case ScreenEnum.ReportMovementIndicators: + $state.go('app.ministries.ministry.people', { + orgId: this.orgId, + }); + break; + } + $window.scrollTo(0, 0); + }; + this.previous = () => { + switch (this.currentScreen) { + case ScreenEnum.ReportMovementIndicators: + this.currentScreen = ScreenEnum.SuggestedActions; + break; + } + $window.scrollTo(0, 0); + }; } diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.html b/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.html index fa2eedc336..a6978c3ca1 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.html +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/reportMovementIndicators.html @@ -1,19 +1,17 @@
    -

    - {{ 'movementIndicators:title' | t }} -

    +

    {{ 'movementIndicators:title' | t }}

    - - - - + + + +
    diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.component.js b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.component.js index e530b3ef28..c389ea8a63 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.component.js +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.component.js @@ -3,34 +3,30 @@ import i18next from 'i18next'; import template from './suggestedActionsAccordion.html'; import './suggestedActionsAccordion.scss'; -angular - .module('campusContactsApp') - .component('reportMovementIndicatorsSuggestedActionsAccordion', { - controller: reportMovementIndicatorsSuggestedActionsController, - bindings: { - title: '@', - suggestions: '<', - acceptedIds: '<', - rejectedIds: '<', - handleSuggestionActionClick: '<', - handleAllClick: '<', - accordionOpenByDefault: '<', - }, - template, - }); +angular.module('campusContactsApp').component('reportMovementIndicatorsSuggestedActionsAccordion', { + controller: reportMovementIndicatorsSuggestedActionsController, + bindings: { + title: '@', + suggestions: '<', + acceptedIds: '<', + rejectedIds: '<', + handleSuggestionActionClick: '<', + handleAllClick: '<', + accordionOpenByDefault: '<', + }, + template, +}); function reportMovementIndicatorsSuggestedActionsController($sce) { - this.$onInit = () => (this.accordionOpen = this.accordionOpenByDefault); + this.$onInit = () => (this.accordionOpen = this.accordionOpenByDefault); - this.isAccepted = (id) => this.acceptedIds.has(id); - this.isRejected = (id) => this.rejectedIds.has(id); + this.isAccepted = (id) => this.acceptedIds.has(id); + this.isRejected = (id) => this.rejectedIds.has(id); - this.getLabelQuestion = (action) => - $sce.trustAsHtml( - i18next.t('movementIndicators:suggestedActions.applyLabel', { - label: action.label.i18n - ? i18next.t(action.label.i18n) - : action.label.name, - }), - ); + this.getLabelQuestion = (action) => + $sce.trustAsHtml( + i18next.t('movementIndicators:suggestedActions.applyLabel', { + label: action.label.i18n ? i18next.t(action.label.i18n) : action.label.name, + }), + ); } diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.html b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.html index e49b690cef..bd8f34a7c3 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.html +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/accordion/suggestedActionsAccordion.html @@ -1,81 +1,63 @@
    -
    -

    - {{ $ctrl.title | t : { num: $ctrl.suggestions.length } }} -

    +
    +

    + {{ $ctrl.title | t : { num: $ctrl.suggestions.length } }} +

    + +
    +
    +
    +
    + {{ suggestion.person.full_name }} + + + {{ 'movementIndicators:suggestedActions.reasonPhrases.spiritualConversation' | t }} + + + {{ 'movementIndicators:suggestedActions.reasonPhrases.gospelPresentation' | t }} + + + {{ 'movementIndicators:suggestedActions.reasonPhrases.groupMembership' | t }} + + + {{ 'movementIndicators:suggestedActions.reasonPhrases.groupLeader' | t }} + + {{ 'movementIndicators:suggestedActions.reasonPhrases.leader' | t }} + + {{ 'movementIndicators:suggestedActions.reasonPhrases.engagedDisciple' | t }} + + + +
    +
    -
    -
    -
    -
    - - {{ suggestion.person.full_name }} - - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.spiritualConversation' - | t }} - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.gospelPresentation' - | t }} - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.groupMembership' - | t }} - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.groupLeader' - | t }} - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.leader' - | t }} - - - {{ - 'movementIndicators:suggestedActions.reasonPhrases.engagedDisciple' - | t }} - - - -
    -
    - - -
    -
    + {{ 'yes' | t }} + +
    +
    diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.component.js b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.component.js index 40641e96e8..191203562b 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.component.js +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.component.js @@ -2,101 +2,83 @@ import i18next from 'i18next'; import template from './suggestedActions.html'; -angular - .module('campusContactsApp') - .component('reportMovementIndicatorsSuggestedActions', { - controller: reportMovementIndicatorsSuggestedActionsController, - bindings: { - orgId: '<', - next: '&', - }, - template, - }); +angular.module('campusContactsApp').component('reportMovementIndicatorsSuggestedActions', { + controller: reportMovementIndicatorsSuggestedActionsController, + bindings: { + orgId: '<', + next: '&', + }, + template, +}); function reportMovementIndicatorsSuggestedActionsController(httpProxy) { - this.acceptedIds = new Set(); - this.rejectedIds = new Set(); + this.acceptedIds = new Set(); + this.rejectedIds = new Set(); - this.$onInit = () => { - loadSuggestedActions(this.orgId); - }; + this.$onInit = () => { + loadSuggestedActions(this.orgId); + }; - const loadSuggestedActions = (orgId) => { - this.loadingSuggestions = true; - return httpProxy - .post( - '/movement_indicator_suggestions/fetch', - { organization_id: orgId }, - { - errorMessage: i18next.t( - 'movementIndicators:suggestedActions.errorLoadingSuggestedActions', - ), - params: { - include: 'person', - 'fields[movement_indicator_suggestion]': - 'id,person,reason,label,considered', - 'fields[person]': 'full_name', - 'fields[label]': 'name,i18n', - limit: 1000, - }, - }, - ) - .then(({ data }) => { - this.loadingSuggestions = false; + const loadSuggestedActions = (orgId) => { + this.loadingSuggestions = true; + return httpProxy + .post( + '/movement_indicator_suggestions/fetch', + { organization_id: orgId }, + { + errorMessage: i18next.t('movementIndicators:suggestedActions.errorLoadingSuggestedActions'), + params: { + include: 'person', + 'fields[movement_indicator_suggestion]': 'id,person,reason,label,considered', + 'fields[person]': 'full_name', + 'fields[label]': 'name,i18n', + limit: 1000, + }, + }, + ) + .then(({ data }) => { + this.loadingSuggestions = false; - const { newSuggestions, previousSuggestions } = data.reduce( - (acc, action) => ({ - newSuggestions: [ - ...acc.newSuggestions, - ...(action.considered ? [] : [action]), - ], - previousSuggestions: [ - ...acc.previousSuggestions, - ...(action.considered ? [action] : []), - ], - }), - { newSuggestions: [], previousSuggestions: [] }, - ); + const { newSuggestions, previousSuggestions } = data.reduce( + (acc, action) => ({ + newSuggestions: [...acc.newSuggestions, ...(action.considered ? [] : [action])], + previousSuggestions: [...acc.previousSuggestions, ...(action.considered ? [action] : [])], + }), + { newSuggestions: [], previousSuggestions: [] }, + ); - this.newSuggestions = newSuggestions; - this.previousSuggestions = previousSuggestions; - }); - }; + this.newSuggestions = newSuggestions; + this.previousSuggestions = previousSuggestions; + }); + }; - this.saveSuggestedActions = () => { - return httpProxy - .post( - '/movement_indicator_suggestions/bulk', - { - accept_ids: [...this.acceptedIds], - reject_ids: [...this.rejectedIds], - }, - { - errorMessage: i18next.t( - 'movementIndicators:suggestedActions.errorSavingSuggestedActions', - ), - }, - ) - .then(() => { - this.next(); - }); - }; + this.saveSuggestedActions = () => { + return httpProxy + .post( + '/movement_indicator_suggestions/bulk', + { + accept_ids: [...this.acceptedIds], + reject_ids: [...this.rejectedIds], + }, + { + errorMessage: i18next.t('movementIndicators:suggestedActions.errorSavingSuggestedActions'), + }, + ) + .then(() => { + this.next(); + }); + }; - this.handleSuggestionActionClick = (id, accept) => { - const toggleSet = accept ? this.acceptedIds : this.rejectedIds; - const removeSet = accept ? this.rejectedIds : this.acceptedIds; + this.handleSuggestionActionClick = (id, accept) => { + const toggleSet = accept ? this.acceptedIds : this.rejectedIds; + const removeSet = accept ? this.rejectedIds : this.acceptedIds; - removeSet.delete(id); - toggleSet.has(id) ? toggleSet.delete(id) : toggleSet.add(id); - }; + removeSet.delete(id); + toggleSet.has(id) ? toggleSet.delete(id) : toggleSet.add(id); + }; - this.handleAllClick = (suggestions) => { - this.acceptedIds = new Set([ - ...this.acceptedIds, - ...suggestions.map(({ id }) => id), - ]); - this.rejectedIds = new Set( - [...this.rejectedIds].filter((id) => !this.acceptedIds.has(id)), - ); - }; + this.handleAllClick = (suggestions) => { + this.acceptedIds = new Set([...this.acceptedIds, ...suggestions.map(({ id }) => id)]); + this.rejectedIds = new Set([...this.rejectedIds].filter((id) => !this.acceptedIds.has(id))); + }; } diff --git a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.html b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.html index 5e3c7094fb..8d062076e2 100644 --- a/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.html +++ b/app/assets/javascripts/angular/components/reportMovementIndicators/suggestedActions/suggestedActions.html @@ -1,42 +1,36 @@ -

    - {{ 'movementIndicators:suggestedActions.title' | t }} -

    -

    - {{ 'movementIndicators:suggestedActions.subtitle' | t }} -

    +

    {{ 'movementIndicators:suggestedActions.title' | t }}

    +

    {{ 'movementIndicators:suggestedActions.subtitle' | t }}

    -
    - {{ 'movementIndicators:suggestedActions.loading' | t }} -
    +
    {{ 'movementIndicators:suggestedActions.loading' | t }}
    - - + + - - + +
    - +
    diff --git a/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.component.js b/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.component.js index 3f0f2121b4..147a9f2e0d 100644 --- a/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.component.js +++ b/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.component.js @@ -2,13 +2,13 @@ import template from './reportPeriod.html'; import './reportPeriod.scss'; angular.module('campusContactsApp').component('reportPeriod', { - controller: reportPeriodController, - template: template, + controller: reportPeriodController, + template, }); function reportPeriodController(periodService) { - var vm = this; - vm.periods = periodService.getPeriods(); - vm.getPeriod = periodService.getPeriod; - vm.setPeriod = periodService.setPeriod; + const vm = this; + vm.periods = periodService.getPeriods(); + vm.getPeriod = periodService.getPeriod; + vm.setPeriod = periodService.setPeriod; } diff --git a/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.html b/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.html index 34ddccda9c..ed1cee7a69 100644 --- a/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.html +++ b/app/assets/javascripts/angular/components/reportPeriod/reportPeriod.html @@ -1,14 +1,14 @@
    - {{p.label | t}} + {{p.label | t}}
    diff --git a/app/assets/javascripts/angular/components/statsHeader/statsHeader.component.js b/app/assets/javascripts/angular/components/statsHeader/statsHeader.component.js index fbdcf46470..04eb79fff7 100644 --- a/app/assets/javascripts/angular/components/statsHeader/statsHeader.component.js +++ b/app/assets/javascripts/angular/components/statsHeader/statsHeader.component.js @@ -2,17 +2,15 @@ import template from './statsHeader.html'; import './statsHeader.scss'; angular.module('campusContactsApp').component('statsHeader', { - controller: statsHeaderController, - template: template, + controller: statsHeaderController, + template, }); function statsHeaderController(interactionsService) { - var vm = this; + const vm = this; - // Exclude the notes interaction type - vm.interactionTypes = interactionsService - .getInteractionTypes() - .filter(function (interactionType) { - return interactionType.id !== 1; - }); + // Exclude the notes interaction type + vm.interactionTypes = interactionsService.getInteractionTypes().filter(function (interactionType) { + return interactionType.id !== 1; + }); } diff --git a/app/assets/javascripts/angular/components/statsHeader/statsHeader.html b/app/assets/javascripts/angular/components/statsHeader/statsHeader.html index 6ac6cc0ca6..6110436e6d 100644 --- a/app/assets/javascripts/angular/components/statsHeader/statsHeader.html +++ b/app/assets/javascripts/angular/components/statsHeader/statsHeader.html @@ -1,24 +1,18 @@
    - +
    - - - + + +
    diff --git a/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.component.js b/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.component.js index 3b51064f48..6dc7b50e93 100644 --- a/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.component.js +++ b/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.component.js @@ -4,29 +4,29 @@ import chevronLeftIcon from '../../../../images/icons/chevronLeft.svg'; import template from './surveyOverview.html'; angular.module('campusContactsApp').component('surveyOverview', { - controller: surveyOverviewController, - bindings: { - survey: '<', - }, - template: template, + controller: surveyOverviewController, + bindings: { + survey: '<', + }, + template, }); function surveyOverviewController(envService) { - this.chevronLeftIcon = chevronLeftIcon; - this.tabNames = [ - { - id: 'settings', - name: 'surveys:settings.settings', - }, - { - id: 'keyword', - name: 'surveys:keyword.keyword', - }, - { - id: 'questions', - name: 'surveys:questions:questions', - }, - ]; - this.activeTab = this.tabNames[0].id; - this.surveyLinkPrefix = envService.read('surveyLinkPrefix'); + this.chevronLeftIcon = chevronLeftIcon; + this.tabNames = [ + { + id: 'settings', + name: 'surveys:settings.settings', + }, + { + id: 'keyword', + name: 'surveys:keyword.keyword', + }, + { + id: 'questions', + name: 'surveys:questions:questions', + }, + ]; + this.activeTab = this.tabNames[0].id; + this.surveyLinkPrefix = envService.read('surveyLinkPrefix'); } diff --git a/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.html b/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.html index 984c76ffbc..e9c84bbfb3 100644 --- a/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.html +++ b/app/assets/javascripts/angular/components/surveyOverview/surveyOverview.html @@ -1,53 +1,39 @@ -
    -
    -
    - -
    -     - {{ $ctrl.survey.title }} - - {{ 'surveys:preview' | t }} - -
    - -
    -
    - {{ tab.name | t }} -
    -
    +
    +
    +
    + +
    +     + {{ $ctrl.survey.title }} + + {{ 'surveys:preview' | t }} +
    -
    - - - + +
    +
    + {{ tab.name | t }} +
    +
    +
    + + + +
    diff --git a/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.component.js b/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.component.js index 5b9f0f8b0e..4d522af8d4 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.component.js @@ -7,124 +7,106 @@ import clockIcon from '../../../../images/icon-clock.svg'; import template from './surveyOverviewKeyword.html'; angular.module('campusContactsApp').component('surveyOverviewKeyword', { - controller: surveyOverviewKeywordController, - bindings: { - survey: '<', - }, - template: template, + controller: surveyOverviewKeywordController, + bindings: { + survey: '<', + }, + template, }); function surveyOverviewKeywordController( - $scope, - $uibModal, - surveyService, - confirmModalService, - tFilter, - loggedInPerson, + $scope, + $uibModal, + surveyService, + confirmModalService, + tFilter, + loggedInPerson, ) { - this.helpIcon = helpIcon; - this.hasChanged = false; - - const keywordErrorHandler = (response) => { - let { - data: { errors: [{ detail: details } = {}] = [] } = {}, - } = response; - - if (angular.isString(details)) { - this.keywordError = details; - } else if (angular.isObject(details)) { - //display first error - details = Object.values(details); - if (details.length && details[0].length) { - this.keywordError = details[0][0]; - } - } - }; - - this.$onInit = () => { - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt( - this.survey.organization, - ); - this.keyword = angular.copy(this.survey.keyword) || {}; - - this.disableKeywordField = - this.keyword.keyword && - _.includes(['requested', 'active'], this.keyword.state); - }; - - this.requestKeyword = () => { - this.keywordError = ''; - if (!this.keyword.keyword) { - this.keywordError = tFilter( - 'surveys:keyword:errors:missingKeyword', - ); - } else if (!this.keyword.explanation) { - this.keywordError = tFilter( - 'surveys:keyword:errors:missingPurpose', - ); - } else if (!this.keyword.initial_response) { - this.keywordError = tFilter( - 'surveys:keyword:errors:missingTextResponse', - ); - } - - if (this.keywordError) { - return; - } - - surveyService - .requestKeyword({ - surveyId: this.survey.id, - orgId: this.survey.organization_id, - keyword: this.keyword, - }) - .then((keywordData) => { - this.keyword = keywordData; - - $uibModal.open({ - component: 'iconModal', - resolve: { - icon: () => clockIcon, - title: () => i18next.t('surveys:keyword.requested'), - paragraphs: () => [ - i18next.t('surveys:keyword.requested_message'), - ], - closeLabel: () => i18next.t('ok'), - }, - }); - }, keywordErrorHandler); - }; - - this.deleteKeyword = (keywordId) => { - if (!this.directAdminPrivileges) return; - - confirmModalService - .create(tFilter('surveys:keyword:delete:confirm')) - .then(() => { - this.survey.keyword = {}; - this.keyword = {}; - surveyService.deleteKeyword(keywordId); - }); - }; - - this.saveKeyword = () => { - if (!this.directAdminPrivileges) return; - - this.keywordError = ''; - if (!this.keyword.initial_response) { - this.keywordError = tFilter( - 'surveys:keyword:errors:missingTextResponse', - ); - } - - if (this.keywordError) { - return; - } - - surveyService - .updateKeyword({ - keyword: this.keyword, - }) - .then(angular.noop, keywordErrorHandler); - }; + this.helpIcon = helpIcon; + this.hasChanged = false; + + const keywordErrorHandler = (response) => { + let { data: { errors: [{ detail: details } = {}] = [] } = {} } = response; + + if (angular.isString(details)) { + this.keywordError = details; + } else if (angular.isObject(details)) { + // display first error + details = Object.values(details); + if (details.length && details[0].length) { + this.keywordError = details[0][0]; + } + } + }; + + this.$onInit = () => { + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.survey.organization); + this.keyword = angular.copy(this.survey.keyword) || {}; + + this.disableKeywordField = this.keyword.keyword && _.includes(['requested', 'active'], this.keyword.state); + }; + + this.requestKeyword = () => { + this.keywordError = ''; + if (!this.keyword.keyword) { + this.keywordError = tFilter('surveys:keyword:errors:missingKeyword'); + } else if (!this.keyword.explanation) { + this.keywordError = tFilter('surveys:keyword:errors:missingPurpose'); + } else if (!this.keyword.initial_response) { + this.keywordError = tFilter('surveys:keyword:errors:missingTextResponse'); + } + + if (this.keywordError) { + return; + } + + surveyService + .requestKeyword({ + surveyId: this.survey.id, + orgId: this.survey.organization_id, + keyword: this.keyword, + }) + .then((keywordData) => { + this.keyword = keywordData; + + $uibModal.open({ + component: 'iconModal', + resolve: { + icon: () => clockIcon, + title: () => i18next.t('surveys:keyword.requested'), + paragraphs: () => [i18next.t('surveys:keyword.requested_message')], + closeLabel: () => i18next.t('ok'), + }, + }); + }, keywordErrorHandler); + }; + + this.deleteKeyword = (keywordId) => { + if (!this.directAdminPrivileges) return; + + confirmModalService.create(tFilter('surveys:keyword:delete:confirm')).then(() => { + this.survey.keyword = {}; + this.keyword = {}; + surveyService.deleteKeyword(keywordId); + }); + }; + + this.saveKeyword = () => { + if (!this.directAdminPrivileges) return; + + this.keywordError = ''; + if (!this.keyword.initial_response) { + this.keywordError = tFilter('surveys:keyword:errors:missingTextResponse'); + } + + if (this.keywordError) { + return; + } + + surveyService + .updateKeyword({ + keyword: this.keyword, + }) + .then(angular.noop, keywordErrorHandler); + }; } diff --git a/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.html b/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.html index f5e9835150..99d7ce49c6 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.html +++ b/app/assets/javascripts/angular/components/surveyOverviewKeywordTab/surveyOverviewKeyword.html @@ -1,162 +1,116 @@
    -
    -
    -
    - + +
    +
    + - -

    - {{'surveys:keyword.instructions' | t}} - - {{'common:general.help' | t}} - -

    -
    -

    - {{'surveys:keyword.help' | t}} -

    -
    + +

    + {{'surveys:keyword.instructions' | t}} + + {{'common:general.help' | t}} + +

    +
    +

    {{'surveys:keyword.help' | t}}

    +
    -
    - + - -
    -
    -
    - -

    - {{'surveys:keyword.purpose_instructions' | t}} -

    - -
    -
    - -

    - {{'surveys:keyword.response_instructions' | t: - {interpolation: { prefix: '-', suffix: '-'} } }} - - {{'common:general.help' | t}} - -

    -
    -

    - {{'surveys:keyword.response_help' | t: {interpolation: { - prefix: '-', suffix: '-'} } }} -

    -
    - -

    - {{ 'messages.length_limit' | t : { remaining_characters: 140 - - $ctrl.keyword.initial_response.length } }} -

    -
    -
    - - - {{'surveys:keyword.requested' | t}} - - -
    -
    - + ng-disabled="$ctrl.disableKeywordField" + ng-readonly="!$ctrl.directAdminPrivileges" + ng-model="$ctrl.keyword.keyword" + /> + +
    +
    +
    + +

    {{'surveys:keyword.purpose_instructions' | t}}

    + +
    +
    + +

    + {{'surveys:keyword.response_instructions' | t: {interpolation: { prefix: '-', suffix: '-'} } }} + + {{'common:general.help' | t}} + +

    +
    +

    + {{'surveys:keyword.response_help' | t: {interpolation: { prefix: '-', suffix: '-'} } }} +

    +
    + +

    + {{ 'messages.length_limit' | t : { remaining_characters: 140 - $ctrl.keyword.initial_response.length } }} +

    +
    +
    + + + {{'surveys:keyword.requested' | t}} + + +
    + +
    diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.component.js b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.component.js index c9e645864b..b7b3856a40 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.component.js @@ -2,31 +2,27 @@ import template from './autoAssignLabelNotifyModal.html'; import './autoAssignLabelNotifyModal.scss'; angular.module('campusContactsApp').component('autoAssignLabelNotifyModal', { - controller: autoAssignLabelNotifyModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, + controller: autoAssignLabelNotifyModalController, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, }); function autoAssignLabelNotifyModalController() { - this.$onInit = () => { - this.survey = this.resolve.survey; - this.question = this.resolve.question; - this.answer = this.resolve.answer; - this.assignRule = this.question.question_rules.find( - (rule) => - rule.trigger_keywords === this.answer && - rule.rule_code === 'AUTOASSIGN', - ); - this.notifyRule = this.question.question_rules.find( - (rule) => - rule.trigger_keywords === this.answer && - rule.rule_code === 'AUTONOTIFY', - ); - this.addPersonToRule = this.resolve.addPersonToRule; - this.addLabelToRule = this.resolve.addLabelToRule; - }; + this.$onInit = () => { + this.survey = this.resolve.survey; + this.question = this.resolve.question; + this.answer = this.resolve.answer; + this.assignRule = this.question.question_rules.find( + (rule) => rule.trigger_keywords === this.answer && rule.rule_code === 'AUTOASSIGN', + ); + this.notifyRule = this.question.question_rules.find( + (rule) => rule.trigger_keywords === this.answer && rule.rule_code === 'AUTONOTIFY', + ); + this.addPersonToRule = this.resolve.addPersonToRule; + this.addLabelToRule = this.resolve.addLabelToRule; + }; } diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.html b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.html index 15b86a42b4..bcd659dd64 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.html +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/autoAssignLabelNotifyModal.html @@ -1,68 +1,58 @@
    -
    -
    - {{ 'surveys:questions.addAutoAssignLabelNotifyRules' | t }} -
    - - - +
    +
    {{ 'surveys:questions.addAutoAssignLabelNotifyRules' | t }}
    + + + +
    +
    + +

    {{ $ctrl.question.label }}

    + +

    {{ $ctrl.answer }}

    +
    + +
    -
    - -

    - {{ $ctrl.question.label }} -

    - -

    {{ $ctrl.answer }}

    -
    - - -
    -
    - - -
    -
    - - -
    +
    + +
    -
    - - {{ 'common:dashboard.done' | t }} - +
    + +
    +
    +
    + + {{ 'common:dashboard.done' | t }} + +
    diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.component.js b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.component.js index e1ec69b5c2..4f0530a492 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.component.js @@ -1,42 +1,33 @@ import template from './predefinedQuestionsModal.html'; angular.module('campusContactsApp').component('predefinedQuestionsModal', { - controller: predefinedQuestionsModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, + controller: predefinedQuestionsModalController, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, }); function predefinedQuestionsModalController(surveyService) { - this.$onInit = () => { - surveyService - .getReusableQuestions( - this.resolve.orgId, - this.resolve.currentQuestions, - ) - .then(({ predefined, previouslyUsed }) => { - this.predefinedQuestions = predefined; - this.previouslyUsedQuestions = previouslyUsed; - }); - }; + this.$onInit = () => { + surveyService + .getReusableQuestions(this.resolve.orgId, this.resolve.currentQuestions) + .then(({ predefined, previouslyUsed }) => { + this.predefinedQuestions = predefined; + this.previouslyUsedQuestions = previouslyUsed; + }); + }; - this.addQuestion = (question) => { - this.resolve.addQuestion(question); + this.addQuestion = (question) => { + this.resolve.addQuestion(question); - //remove question from list - if (question.predefined) { - this.predefinedQuestions.splice( - this.predefinedQuestions.indexOf(question), - 1, - ); - } else { - this.previouslyUsedQuestions.splice( - this.previouslyUsedQuestions.indexOf(question), - 1, - ); - } - }; + // remove question from list + if (question.predefined) { + this.predefinedQuestions.splice(this.predefinedQuestions.indexOf(question), 1); + } else { + this.previouslyUsedQuestions.splice(this.previouslyUsedQuestions.indexOf(question), 1); + } + }; } diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.html b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.html index 96bb68158b..d9d28c9e87 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.html +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/predefinedQuestionsModal.html @@ -1,45 +1,39 @@
    -
    -
    - {{ 'surveys:questions.addPredefinedQuestion' | t }} -
    - - - +
    +
    {{ 'surveys:questions.addPredefinedQuestion' | t }}
    + + + +
    +
    +
    +

    + {{ 'surveys:questions.predefinedQuestions' | t }} +

    + + {{question.label}} +
    -
    -
    -

    - {{ 'surveys:questions.predefinedQuestions' | t }} -

    - - {{question.label}} - -
    -
    -

    - {{ 'surveys:questions.previouslyUsedQuestions' | t }} -

    - - {{question.label}} - -
    +
    +

    + {{ 'surveys:questions.previouslyUsedQuestions' | t }} +

    + + {{question.label}} +
    - - {{ 'common:dashboard.done' | t }} - +
    + + {{ 'common:dashboard.done' | t }} +
    diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js index f4d5756e72..e0463cd9d8 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js @@ -12,545 +12,459 @@ import warningIcon from '../../../../images/icons/icon-warning-2.svg'; import template from './surveyOverviewQuestions.html'; angular.module('campusContactsApp').component('surveyOverviewQuestions', { - controller: surveyOverviewQuestionsController, - bindings: { - survey: '<', - }, - template: template, + controller: surveyOverviewQuestionsController, + bindings: { + survey: '<', + }, + template, }); -function surveyOverviewQuestionsController( - $uibModal, - surveyService, - $scope, - httpProxy, - loggedInPerson, -) { - this.isExpanded = {}; - this.surveyQuestions = []; - this.icons = { - copy: copyIcon, - help: helpIcon, - sort: sortIcon, - trash: trashIcon, - xWhite: xWhiteIcon, - }; - this.questionTypes = [ - { - kind: 'TextField', - style: 'short', - name: 'Short Answer', - canAdd: true, - }, - { - kind: 'TextField', - style: 'email', - name: 'Email Address', - }, - { - kind: 'ChoiceField', - style: 'radio', - name: 'Radio (Choose one)', - canAdd: true, - }, - { - kind: 'ChoiceField', - style: 'checkbox', - name: 'Checkbox (Choose one or more)', - canAdd: true, - }, +function surveyOverviewQuestionsController($uibModal, surveyService, $scope, httpProxy, loggedInPerson) { + this.isExpanded = {}; + this.surveyQuestions = []; + this.icons = { + copy: copyIcon, + help: helpIcon, + sort: sortIcon, + trash: trashIcon, + xWhite: xWhiteIcon, + }; + this.questionTypes = [ + { + kind: 'TextField', + style: 'short', + name: 'Short Answer', + canAdd: true, + }, + { + kind: 'TextField', + style: 'email', + name: 'Email Address', + }, + { + kind: 'ChoiceField', + style: 'radio', + name: 'Radio (Choose one)', + canAdd: true, + }, + { + kind: 'ChoiceField', + style: 'checkbox', + name: 'Checkbox (Choose one or more)', + canAdd: true, + }, + { + kind: 'ChoiceField', + style: 'drop-down', + name: 'Dropdown (Choose one)', + canAdd: true, + }, + { + kind: 'DateField', + style: 'date_field', + name: 'Date', + }, + ]; + this.people = []; + this.labels = []; + + const loadSurveyData = async () => { + const { data } = await surveyService.getSurveyQuestions(this.survey.id); + this.people = await getPeople(data, this.survey.organization_id); + this.labels = await getLabel(data, this.survey.organization_id); + rebuildQuestions(data); + $scope.$apply(); + }; + + const getLabel = async (questions, organizationId) => { + const labelIds = [ + ...new Set( + questions.reduce((a1, q) => { + const ids = q.question_rules.reduce((a2, r) => { + const labelIds = r.label_ids ? r.label_ids.split(',') : []; + return [...a2, ...labelIds]; + }, []); + return [...a1, ...ids]; + }, []), + ), + ]; + + const orgLabels = await httpProxy + .get( + `/organizations/${organizationId}`, { - kind: 'ChoiceField', - style: 'drop-down', - name: 'Dropdown (Choose one)', - canAdd: true, + include: 'labels', }, { - kind: 'DateField', - style: 'date_field', - name: 'Date', + errorMessage: 'error.messages.surveys.loadQuestions', }, + ) + .then((res) => res.data.labels); + + const currentLabels = orgLabels.filter((label) => labelIds.includes(label.id)); + return currentLabels; + }; + + const getPeople = async (questions, organizationId) => { + const peopleIds = [ + ...new Set( + questions.reduce((a1, q) => { + const ids = q.question_rules.reduce((a2, r) => { + const peopleIds = r.people_ids ? r.people_ids.split(',') : []; + return [...a2, ...peopleIds]; + }, []); + return [...a1, ...ids]; + }, []), + ), ]; - this.people = []; - this.labels = []; - - const loadSurveyData = async () => { - const { data } = await surveyService.getSurveyQuestions(this.survey.id); - this.people = await getPeople(data, this.survey.organization_id); - this.labels = await getLabel(data, this.survey.organization_id); - rebuildQuestions(data); - $scope.$apply(); - }; - - const getLabel = async (questions, organizationId) => { - const labelIds = [ - ...new Set( - questions.reduce((a1, q) => { - const ids = q.question_rules.reduce((a2, r) => { - const labelIds = r.label_ids - ? r.label_ids.split(',') - : []; - return [...a2, ...labelIds]; - }, []); - return [...a1, ...ids]; - }, []), - ), - ]; - - const orgLabels = await httpProxy - .get( - `/organizations/${organizationId}`, - { - include: 'labels', - }, - { - errorMessage: 'error.messages.surveys.loadQuestions', - }, - ) - .then((res) => res.data.labels); - - const currentLabels = orgLabels.filter((label) => - labelIds.includes(label.id), - ); - return currentLabels; - }; - - const getPeople = async (questions, organizationId) => { - const peopleIds = [ - ...new Set( - questions.reduce((a1, q) => { - const ids = q.question_rules.reduce((a2, r) => { - const peopleIds = r.people_ids - ? r.people_ids.split(',') - : []; - return [...a2, ...peopleIds]; - }, []); - return [...a1, ...ids]; - }, []), - ), - ]; - - const { data } = await httpProxy.get( - '/people', - { - 'filters[ids]': peopleIds.join(','), - 'filters[organization_ids]': organizationId, - 'fields[people]': - 'first_name,gender,last_name,primary_email_address,id', - include: '', - }, - { - errorMessage: 'error.messages.surveys.loadQuestions', - }, - ); - - return data; - }; - const rebuildQuestions = (questions) => { - this.surveyQuestions = questions.map(buildQuestion); + const { data } = await httpProxy.get( + '/people', + { + 'filters[ids]': peopleIds.join(','), + 'filters[organization_ids]': organizationId, + 'fields[people]': 'first_name,gender,last_name,primary_email_address,id', + include: '', + }, + { + errorMessage: 'error.messages.surveys.loadQuestions', + }, + ); + + return data; + }; + + const rebuildQuestions = (questions) => { + this.surveyQuestions = questions.map(buildQuestion); + }; + + const rebuildQuestion = (question) => { + const q = buildQuestion(question); + const index = this.surveyQuestions.indexOf(question); + this.surveyQuestions[index] = q; + }; + + const buildQuestion = (question) => { + const a = question.content ? question.content.split('\n') : []; + + if (a) { + const autoassignRules = buildRules(question.question_rules, a, 'AUTOASSIGN'); + const autoNotifyRules = buildRules(question.question_rules, a, 'AUTONOTIFY'); + + return { + ...question, + question_answers: a, + question_rules: [...autoassignRules, ...autoNotifyRules], + }; + } + + return { + ...question, + question_answers: a, }; - - const rebuildQuestion = (question) => { - const q = buildQuestion(question); - const index = this.surveyQuestions.indexOf(question); - this.surveyQuestions[index] = q; + }; + + const buildRules = (questionRules, answerQuestion, type) => { + return answerQuestion.map((answer) => buildRule(answer, questionRules, type)); + }; + + const buildRule = (answer, questionRules, type) => { + const { id = null, label_ids = null, organization_ids = null, people_ids = null } = + questionRules.find((r) => r.trigger_keywords === answer && r.rule_code === type) || {}; + const ids = people_ids ? people_ids.split(',') : []; + const labelIds = label_ids ? label_ids.split(',') : []; + + return { + id, + label_ids, + organization_ids, + people_ids, + rule_code: type, + trigger_keywords: answer, + assigned_labels: id ? this.labels.filter((p) => labelIds.indexOf(p.id) >= 0) : null, + assign_to: id ? this.people.filter((p) => ids.indexOf(p.id) >= 0) : null, }; + }; - const buildQuestion = (question) => { - const a = question.content ? question.content.split('\n') : []; - - if (a) { - const autoassignRules = buildRules( - question.question_rules, - a, - 'AUTOASSIGN', - ); - const autoNotifyRules = buildRules( - question.question_rules, - a, - 'AUTONOTIFY', - ); - - return { - ...question, - question_answers: a, - question_rules: [...autoassignRules, ...autoNotifyRules], - }; - } - + const buildRulesWithChangedAnswer = (question, originalAnswer, newAnswer) => { + return question.question_rules.map((r) => { + if (r.trigger_keywords === originalAnswer) { return { - ...question, - question_answers: a, + ...r, + trigger_keywords: newAnswer, }; - }; - - const buildRules = (questionRules, answerQuestion, type) => { - return answerQuestion.map((answer) => - buildRule(answer, questionRules, type), - ); - }; - - const buildRule = (answer, questionRules, type) => { - const { - id = null, - label_ids = null, - organization_ids = null, - people_ids = null, - } = - questionRules.find( - (r) => r.trigger_keywords === answer && r.rule_code === type, - ) || {}; - let ids = people_ids ? people_ids.split(',') : []; - let labelIds = label_ids ? label_ids.split(',') : []; - - return { - id, - label_ids, - organization_ids, - people_ids, - rule_code: type, - trigger_keywords: answer, - assigned_labels: id - ? this.labels.filter((p) => labelIds.indexOf(p.id) >= 0) - : null, - assign_to: id - ? this.people.filter((p) => ids.indexOf(p.id) >= 0) - : null, - }; - }; + } + return r; + }); + }; - const buildRulesWithChangedAnswer = ( - question, - originalAnswer, - newAnswer, - ) => { - return question.question_rules.map((r) => { - if (r.trigger_keywords === originalAnswer) { - return { - ...r, - trigger_keywords: newAnswer, - }; - } - return r; - }); - }; + this.$onInit = () => { + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.survey.organization); - this.$onInit = () => { - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt( - this.survey.organization, - ); + loadSurveyData(); + }; - loadSurveyData(); - }; + this.addLabelToRule = async (question, rule) => { + const index = question.question_rules.findIndex((currentRule) => currentRule.id === rule.id); - this.addLabelToRule = async (question, rule) => { - const index = question.question_rules.findIndex( - (currentRule) => currentRule.id === rule.id, - ); - - // This is terrible. Somehow the reference isn't preserved when editing multiple times. - question.question_rules[index] = rule; - - if (!question.question_rules[index].assigned_labels) return; - - const ids = [ - ...new Set( - question.question_rules[index].assigned_labels - .filter((a) => a._type === 'label') - .map((b) => b.id), - ), - ]; - - const currentIds = question.question_rules[index].label_ids - ? question.question_rules[index].label_ids.split(',') - : []; - - if (_.isEqual(currentIds.sort(), ids.sort())) { - return; - } - - question.question_rules[index].label_ids = ids.join(','); - question.question_rules[index].assigned_labels.forEach((a) => { - const exists = this.labels.find((p) => p.id === a.id); - if (!exists) { - this.labels.push(a); - } - }); - await this.saveQuestionContent(question, question.question_answers); - }; + // This is terrible. Somehow the reference isn't preserved when editing multiple times. + question.question_rules[index] = rule; - this.addPersonToRule = async (question, rule) => { - const index = question.question_rules.findIndex( - (currentRule) => currentRule.id === rule.id, - ); + if (!question.question_rules[index].assigned_labels) return; - // This is terrible. Somehow the reference isn't preserved when editing multiple times. - question.question_rules[index] = rule; + const ids = [ + ...new Set(question.question_rules[index].assigned_labels.filter((a) => a._type === 'label').map((b) => b.id)), + ]; - if (!question.question_rules[index].assign_to) return; + const currentIds = question.question_rules[index].label_ids + ? question.question_rules[index].label_ids.split(',') + : []; + + if (_.isEqual(currentIds.sort(), ids.sort())) { + return; + } + + question.question_rules[index].label_ids = ids.join(','); + question.question_rules[index].assigned_labels.forEach((a) => { + const exists = this.labels.find((p) => p.id === a.id); + if (!exists) { + this.labels.push(a); + } + }); + await this.saveQuestionContent(question, question.question_answers); + }; + + this.addPersonToRule = async (question, rule) => { + const index = question.question_rules.findIndex((currentRule) => currentRule.id === rule.id); + + // This is terrible. Somehow the reference isn't preserved when editing multiple times. + question.question_rules[index] = rule; + + if (!question.question_rules[index].assign_to) return; + + question.question_rules[index].assign_to.map((a) => { + if (a._type !== 'person') { + return null; + } + }); + const ids = [ + ...new Set(question.question_rules[index].assign_to.filter((a) => a._type === 'person').map((b) => b.id)), + ]; - question.question_rules[index].assign_to.map((a) => { - if (a._type !== 'person') { - return null; - } - }); - const ids = [ - ...new Set( - question.question_rules[index].assign_to - .filter((a) => a._type === 'person') - .map((b) => b.id), - ), - ]; - - const currentIds = question.question_rules[index].people_ids - ? question.question_rules[index].people_ids.split(',') - : []; - - if (_.isEqual(currentIds.sort(), ids.sort())) { - return; - } - - question.question_rules[index].people_ids = ids.join(','); - question.question_rules[index].assign_to.forEach((a) => { - const exists = this.people.find((p) => p.id === a.id); - if (!exists) { - this.people.push(a); - } + const currentIds = question.question_rules[index].people_ids + ? question.question_rules[index].people_ids.split(',') + : []; + + if (_.isEqual(currentIds.sort(), ids.sort())) { + return; + } + + question.question_rules[index].people_ids = ids.join(','); + question.question_rules[index].assign_to.forEach((a) => { + const exists = this.people.find((p) => p.id === a.id); + if (!exists) { + this.people.push(a); + } + }); + + await this.saveQuestionContent(question, question.question_answers); + }; + + this.getQuestionType = (kind, style) => { + return _.find(this.questionTypes, { kind, style }); + }; + + this.sortableOptions = { + handle: '.sort', + ghostClass: 'o-40', + forceFallback: true, // Needed to make sticky header and scrollSensitivity work + scrollSensitivity: 100, + onEnd: ({ scope: { question } }) => { + this.saveQuestionContent(question, question.question_answers); + }, + }; + + this.questionSortableOptions = { + handle: '.question-sort', + ghostClass: 'o-40', + forceFallback: true, // Needed to make sticky header and scrollSensitivity work + scrollSensitivity: 100, + onEnd: () => this.updatePosition(this.surveyQuestions), + }; + + this.updatePosition = async (questions) => { + if (!this.directAdminPrivileges) return; + // Use for of loop to allow for async/await so the updateSurveyQuestions function fires in sequence of each other + for (const question of questions) { + if (question.position !== questions.indexOf(question) + 1) { + question.position = questions.indexOf(question) + 1; + const { id, position } = question; + await surveyService.updateSurveyQuestion(this.survey.id, { + id, + position, }); - - await this.saveQuestionContent(question, question.question_answers); - }; - - this.getQuestionType = (kind, style) => { - return _.find(this.questionTypes, { kind: kind, style: style }); - }; - - this.sortableOptions = { - handle: '.sort', - ghostClass: 'o-40', - forceFallback: true, // Needed to make sticky header and scrollSensitivity work - scrollSensitivity: 100, - onEnd: ({ scope: { question } }) => { - this.saveQuestionContent(question, question.question_answers); + } + } + }; + + this.addPredefinedQuestion = () => { + $uibModal.open({ + component: 'predefinedQuestionsModal', + size: 'md', + resolve: { + orgId: () => this.survey.organization_id, + currentQuestions: () => this.surveyQuestions.map(({ id }) => id), + addQuestion: () => (question) => { + this.addQuestion(question); }, - }; - - this.questionSortableOptions = { - handle: '.question-sort', - ghostClass: 'o-40', - forceFallback: true, // Needed to make sticky header and scrollSensitivity work - scrollSensitivity: 100, - onEnd: () => this.updatePosition(this.surveyQuestions), - }; - - this.updatePosition = async (questions) => { - if (!this.directAdminPrivileges) return; - // Use for of loop to allow for async/await so the updateSurveyQuestions function fires in sequence of each other - for (let question of questions) { - if (question.position !== questions.indexOf(question) + 1) { - question.position = questions.indexOf(question) + 1; - const { id, position } = question; - await surveyService.updateSurveyQuestion(this.survey.id, { - id, - position, - }); - } - } - }; - - this.addPredefinedQuestion = () => { - $uibModal.open({ - component: 'predefinedQuestionsModal', - size: 'md', - resolve: { - orgId: () => this.survey.organization_id, - currentQuestions: () => - this.surveyQuestions.map(({ id }) => id), - addQuestion: () => (question) => { - this.addQuestion(question); - }, - }, - }); - }; - - this.addQuestion = (question) => { - if (!this.directAdminPrivileges) return; - - if (!question.content) { - question.content = ''; - } - - surveyService - .createSurveyQuestion(this.survey.id, question) - .then((newQuestion) => { - this.surveyQuestions.push(newQuestion); - - if (!newQuestion.predefined) { - this.isExpanded[newQuestion.id] = true; - } - }); - }; - - this.copyQuestion = (question) => { - if (!this.directAdminPrivileges) return; - - this.addQuestion(_.omit(question, ['id'])); - }; - - this.deleteQuestion = (questionId) => { - if (!this.directAdminPrivileges) return; - - $uibModal - .open({ - component: 'iconModal', - resolve: { - icon: () => warningIcon, - paragraphs: () => [ - i18next.t('surveys:questions.delete_confirm'), - ], - dismissLabel: () => i18next.t('cancel'), - closeLabel: () => i18next.t('general.delete'), - }, - }) - .result.then(() => { - surveyService - .deleteSurveyQuestion(this.survey.id, questionId) - .then(() => { - _.remove(this.surveyQuestions, { id: questionId }); - }); - }); - }; - - this.saveQuestion = (question) => { - if (!this.directAdminPrivileges) return; - - const { - id, - label, - kind, - style, - column_title, - content, - position, - } = question; - - return surveyService.updateSurveyQuestion( - this.survey.id, - { - id, - label, - kind, - style, - column_title, - content, - position, - }, - question.question_rules, - ); - }; - - this.updateQuestion = async (question) => { - await this.saveQuestion(question); - rebuildQuestion(question); - $scope.$apply(); - }; - - this.addEmptyQuestionContent = (question) => { - if (!question.question_answers) question.question_answers = []; - - question.question_answers.push(''); - question.question_rules.push( - buildRule('', question.question_rules, 'AUTOASSIGN'), - ); - question.question_rules.push( - buildRule('', question.question_rules, 'AUTONOTIFY'), - ); - }; - - this.setNotifyVia = (question, via) => { - question.notify_via = via; - this.saveQuestionContent(question, question.question_answers); - }; - - const deleteQuestionRule = (ruleId) => { - return surveyService.deleteSurveyQuestionRule(this.survey.id, ruleId); - }; - - this.deleteQuestionContent = async (question, answers, index) => { - const keyword = question.content; - const ruleIdsToDelete = question.question_rules.reduce( - (accumulator, r) => { - if (r.trigger_keywords === keyword && r.id) { - return [...new Set([...accumulator, r.id])]; - } - - return accumulator; - }, - [], - ); - - if (ruleIdsToDelete.length > 0) { - await Promise.all( - ruleIdsToDelete.map((ruleId) => deleteQuestionRule(ruleId)), - ); - - const newRules = question.question_rules.filter((r) => { - if (r.trigger_keywords !== keyword) return r; - }); - - question.question_rules = newRules; - } - - question.question_answers.splice(index, 1); - question.content = answers.join('\n'); - this.saveQuestionContent(question, answers); - }; - - this.updateQuestionAnswer = async (question, answerIndex) => { - const oldAnswers = question.content.split('\n'); - const newAnswer = question.question_answers[answerIndex]; - - const originalAnswer = oldAnswers.find( - (a) => question.question_answers.indexOf(a) === -1, - ); - - question.question_rules = buildRulesWithChangedAnswer( - question, - originalAnswer, - newAnswer, - ); - - this.saveQuestionContent(question, question.question_answers); - }; - - this.saveQuestionContent = async (question, answers) => { - question.content = answers.join('\n'); - const { data } = await this.saveQuestion(question); - - if (data.question_rules) { - const index = this.surveyQuestions.findIndex( - (currentQuestion) => currentQuestion.id === question.id, - ); - this.surveyQuestions[index].question_rules = data.question_rules; - rebuildQuestion(this.surveyQuestions[index]); - $scope.$apply(); - } - }; - - this.openAutoAssignLabelNotifyModal = (question, answer) => { - $uibModal.open({ - component: 'autoAssignLabelNotifyModal', - size: 'md', - resolve: { - survey: () => this.survey, - question: () => question, - answer: () => answer, - addPersonToRule: () => (question, rule) => - this.addPersonToRule(question, rule), - addLabelToRule: () => (question, rule) => - this.addLabelToRule(question, rule), - }, + }, + }); + }; + + this.addQuestion = (question) => { + if (!this.directAdminPrivileges) return; + + if (!question.content) { + question.content = ''; + } + + surveyService.createSurveyQuestion(this.survey.id, question).then((newQuestion) => { + this.surveyQuestions.push(newQuestion); + + if (!newQuestion.predefined) { + this.isExpanded[newQuestion.id] = true; + } + }); + }; + + this.copyQuestion = (question) => { + if (!this.directAdminPrivileges) return; + + this.addQuestion(_.omit(question, ['id'])); + }; + + this.deleteQuestion = (questionId) => { + if (!this.directAdminPrivileges) return; + + $uibModal + .open({ + component: 'iconModal', + resolve: { + icon: () => warningIcon, + paragraphs: () => [i18next.t('surveys:questions.delete_confirm')], + dismissLabel: () => i18next.t('cancel'), + closeLabel: () => i18next.t('general.delete'), + }, + }) + .result.then(() => { + surveyService.deleteSurveyQuestion(this.survey.id, questionId).then(() => { + _.remove(this.surveyQuestions, { id: questionId }); }); - }; + }); + }; + + this.saveQuestion = (question) => { + if (!this.directAdminPrivileges) return; + + const { id, label, kind, style, column_title, content, position } = question; + + return surveyService.updateSurveyQuestion( + this.survey.id, + { + id, + label, + kind, + style, + column_title, + content, + position, + }, + question.question_rules, + ); + }; + + this.updateQuestion = async (question) => { + await this.saveQuestion(question); + rebuildQuestion(question); + $scope.$apply(); + }; + + this.addEmptyQuestionContent = (question) => { + if (!question.question_answers) question.question_answers = []; + + question.question_answers.push(''); + question.question_rules.push(buildRule('', question.question_rules, 'AUTOASSIGN')); + question.question_rules.push(buildRule('', question.question_rules, 'AUTONOTIFY')); + }; + + this.setNotifyVia = (question, via) => { + question.notify_via = via; + this.saveQuestionContent(question, question.question_answers); + }; + + const deleteQuestionRule = (ruleId) => { + return surveyService.deleteSurveyQuestionRule(this.survey.id, ruleId); + }; + + this.deleteQuestionContent = async (question, answers, index) => { + const keyword = question.content; + const ruleIdsToDelete = question.question_rules.reduce((accumulator, r) => { + if (r.trigger_keywords === keyword && r.id) { + return [...new Set([...accumulator, r.id])]; + } + + return accumulator; + }, []); + + if (ruleIdsToDelete.length > 0) { + await Promise.all(ruleIdsToDelete.map((ruleId) => deleteQuestionRule(ruleId))); + + const newRules = question.question_rules.filter((r) => { + if (r.trigger_keywords !== keyword) return r; + }); + + question.question_rules = newRules; + } + + question.question_answers.splice(index, 1); + question.content = answers.join('\n'); + this.saveQuestionContent(question, answers); + }; + + this.updateQuestionAnswer = async (question, answerIndex) => { + const oldAnswers = question.content.split('\n'); + const newAnswer = question.question_answers[answerIndex]; + + const originalAnswer = oldAnswers.find((a) => question.question_answers.indexOf(a) === -1); + + question.question_rules = buildRulesWithChangedAnswer(question, originalAnswer, newAnswer); + + this.saveQuestionContent(question, question.question_answers); + }; + + this.saveQuestionContent = async (question, answers) => { + question.content = answers.join('\n'); + const { data } = await this.saveQuestion(question); + + if (data.question_rules) { + const index = this.surveyQuestions.findIndex((currentQuestion) => currentQuestion.id === question.id); + this.surveyQuestions[index].question_rules = data.question_rules; + rebuildQuestion(this.surveyQuestions[index]); + $scope.$apply(); + } + }; + + this.openAutoAssignLabelNotifyModal = (question, answer) => { + $uibModal.open({ + component: 'autoAssignLabelNotifyModal', + size: 'md', + resolve: { + survey: () => this.survey, + question: () => question, + answer: () => answer, + addPersonToRule: () => (question, rule) => this.addPersonToRule(question, rule), + addLabelToRule: () => (question, rule) => this.addLabelToRule(question, rule), + }, + }); + }; } diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.html b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.html index 9206824593..04677d0e85 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.html +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.html @@ -1,242 +1,191 @@
    -
    -

    +

    - - {{ 'surveys:questions.sort' | t }} - - - {{ question.label }} - - + > + + {{ 'surveys:questions.sort' | t }} + + + {{ question.label }} + + + + + {{ 'general:delete' | t }} + + + Copy + + +

    +
    +
    +
    +
    + +
    + + {{ $ctrl.getQuestionType( question.kind, question.style ).name }} + + +
    +
    +
    + - +
    + +
    +
    +
    + {{ 'general:delete' | t }} - - - Copy - - - -
    -
    -
    -
    - -
    - - {{ $ctrl.getQuestionType( question.kind, - question.style ).name }} - - -
    -
    -
    - - -
    -
    - -
    -
    +
    +
    +
    +
    - +
    +
    +
    -
    +
    + + {{ 'surveys:questions.addPredefinedQuestion' | t }} + +
    +
    + + {{ 'surveys:questions.addNewQuestion' | t }} + +
    -
    - - {{ 'surveys:questions.addNewQuestion' | t }} - - -
    + >{{ type.name }} + + +
    diff --git a/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.component.js b/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.component.js index 97d70429c5..e6e0cfd0b5 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.component.js @@ -6,115 +6,99 @@ import template from './surveyOverviewSettings.html'; import './surveyOverviewSettings.scss'; angular.module('campusContactsApp').component('surveyOverviewSettings', { - controller: surveyOverviewSettingsController, - bindings: { - survey: '<', - }, - template: template, + controller: surveyOverviewSettingsController, + bindings: { + survey: '<', + }, + template, }); -function surveyOverviewSettingsController( - surveyService, - confirmModalService, - tFilter, - loggedInPerson, -) { - this.helpIcon = helpIcon; - this.saveSurvey = _.throttle( - () => { - if (!this.directAdminPrivileges) return; - - this.survey.title = this.surveyEdit.title; - this.survey.login_paragraph = this.surveyEdit.login_paragraph; - this.survey.post_survey_message = this.surveyEdit.post_survey_message; - this.survey.logo = this.surveyEdit.logo; - this.survey.validate_phone_number = this.surveyEdit.validate_phone_number; - this.survey.validation_message = this.surveyEdit.validation_message; - this.survey.validation_success_message = this.surveyEdit.validation_success_message; - - surveyService - .updateSurvey(this.survey) - .then((updatedSurveyData) => { - // clear logo base64 data after upload - delete this.surveyEdit.logo; - this.surveyEdit.logo_url = updatedSurveyData.logo_url; - }); - }, - 1500, - { leading: false }, - ); - - this.$onInit = () => { - this.directAdminPrivileges = loggedInPerson.isDirectAdminAt( - this.survey.organization, - ); - - this.surveyEdit = { - title: this.survey.title, - login_paragraph: this.survey.login_paragraph, - post_survey_message: this.survey.post_survey_message, - logo_url: this.survey.logo_url, - validate_phone_number: this.survey.validate_phone_number, - validation_message: this.survey.validation_message, - validation_success_message: this.survey.validation_success_message, - }; +function surveyOverviewSettingsController(surveyService, confirmModalService, tFilter, loggedInPerson) { + this.helpIcon = helpIcon; + this.saveSurvey = _.throttle( + () => { + if (!this.directAdminPrivileges) return; + + this.survey.title = this.surveyEdit.title; + this.survey.login_paragraph = this.surveyEdit.login_paragraph; + this.survey.post_survey_message = this.surveyEdit.post_survey_message; + this.survey.logo = this.surveyEdit.logo; + this.survey.validate_phone_number = this.surveyEdit.validate_phone_number; + this.survey.validation_message = this.surveyEdit.validation_message; + this.survey.validation_success_message = this.surveyEdit.validation_success_message; + + surveyService.updateSurvey(this.survey).then((updatedSurveyData) => { + // clear logo base64 data after upload + delete this.surveyEdit.logo; + this.surveyEdit.logo_url = updatedSurveyData.logo_url; + }); + }, + 1500, + { leading: false }, + ); + + this.$onInit = () => { + this.directAdminPrivileges = loggedInPerson.isDirectAdminAt(this.survey.organization); + + this.surveyEdit = { + title: this.survey.title, + login_paragraph: this.survey.login_paragraph, + post_survey_message: this.survey.post_survey_message, + logo_url: this.survey.logo_url, + validate_phone_number: this.survey.validate_phone_number, + validation_message: this.survey.validation_message, + validation_success_message: this.survey.validation_success_message, }; + }; - this.selectImage = () => { - if (!this.directAdminPrivileges) return; + this.selectImage = () => { + if (!this.directAdminPrivileges) return; - // eslint-disable-next-line angular/document-service - const input = document.createElement('input'); - input.setAttribute('type', 'file'); - input.setAttribute('style', 'display: none'); - input.addEventListener('click', (event) => event.stopPropagation()); + // eslint-disable-next-line angular/document-service + const input = document.createElement('input'); + input.setAttribute('type', 'file'); + input.setAttribute('style', 'display: none'); + input.addEventListener('click', (event) => event.stopPropagation()); - // We append the input to the DOM to support iOS Safari which doesn't seem to fire the click event. + // We append the input to the DOM to support iOS Safari which doesn't seem to fire the click event. + // eslint-disable-next-line angular/document-service + document.body.appendChild(input); + input.click(); + + input.addEventListener( + 'change', + () => { // eslint-disable-next-line angular/document-service - document.body.appendChild(input); - input.click(); - - input.addEventListener( - 'change', - () => { - // eslint-disable-next-line angular/document-service - document.body.removeChild(input); - this.selectedImage = input.files[0]; - - //validate type - if ( - !_.includes( - ['image/jpeg', 'image/png'], - this.selectedImage.type, - ) - ) { - return; - } - - //clear current logo - this.surveyEdit.logo_url = null; - - //base 64 encode image - const reader = new FileReader(); - reader.onload = (event) => { - this.surveyEdit.logo = event.target.result; - this.saveSurvey(); - }; - reader.readAsDataURL(this.selectedImage); - }, - false, - ); - }; + document.body.removeChild(input); + this.selectedImage = input.files[0]; + + // validate type + if (!_.includes(['image/jpeg', 'image/png'], this.selectedImage.type)) { + return; + } + + // clear current logo + this.surveyEdit.logo_url = null; + + // base 64 encode image + const reader = new FileReader(); + reader.onload = (event) => { + this.surveyEdit.logo = event.target.result; + this.saveSurvey(); + }; + reader.readAsDataURL(this.selectedImage); + }, + false, + ); + }; - this.deleteImage = () => { - if (!this.directAdminPrivileges) return; + this.deleteImage = () => { + if (!this.directAdminPrivileges) return; - confirmModalService - .create(tFilter('surveys:settings:image_delete_confirm')) - .then(() => { - this.surveyEdit.logo_url = null; - this.surveyEdit.logo = null; - this.saveSurvey(); - }); - }; + confirmModalService.create(tFilter('surveys:settings:image_delete_confirm')).then(() => { + this.surveyEdit.logo_url = null; + this.surveyEdit.logo = null; + this.saveSurvey(); + }); + }; } diff --git a/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.html b/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.html index 99c5838625..a8e59d59de 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.html +++ b/app/assets/javascripts/angular/components/surveyOverviewSettingsTab/surveyOverviewSettings.html @@ -1,177 +1,130 @@
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    - -
    - - -
    -
    -
    - - -

    - {{'surveys:settings.validate_phone_number_hint' | t}} -

    -
    -
    - -

    - {{'surveys:settings.validation_message_hint' | t}} - - {{'common:general.help' | t}} - -

    -
    -

    - {{'surveys:settings.validation_message_help' | t}} -

    -
    - -

    - {{ 'messages.length_limit' | t : { remaining_characters: - 110 - $ctrl.surveyEdit.validation_message.length } }} -

    -
    -
    - -

    - {{'surveys:settings.validation_success_message_hint' | - t}} -

    - -
    -
    -
    -
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    + + +
    +
    +
    + + +

    {{'surveys:settings.validate_phone_number_hint' | t}}

    +
    +
    + +

    + {{'surveys:settings.validation_message_hint' | t}} + + {{'common:general.help' | t}} + +

    +
    +

    {{'surveys:settings.validation_message_help' | t}}

    +
    + +

    + {{ 'messages.length_limit' | t : { remaining_characters: 110 - $ctrl.surveyEdit.validation_message.length } + }} +

    +
    +
    + +

    {{'surveys:settings.validation_success_message_hint' | t}}

    + +
    +
    +
    +
    diff --git a/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.component.js b/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.component.js index cca80a909a..ec333fb14d 100644 --- a/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.component.js +++ b/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.component.js @@ -3,10 +3,10 @@ import template from './addSurveyResponseModal.html'; import './addSurveyResponseModal.scss'; angular.module('campusContactsApp').component('addSurveyResponseModal', { - bindings: { - resolve: '<', - dismiss: '&', - close: '&', - }, - template: template, + bindings: { + resolve: '<', + dismiss: '&', + close: '&', + }, + template, }); diff --git a/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.html b/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.html index 27fc95dd22..90aef29f23 100644 --- a/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.html +++ b/app/assets/javascripts/angular/components/surveyResponses/addSurveyResponseModal.html @@ -1,40 +1,37 @@
    -
    -

    - {{ 'contacts.add_contact_to' | t : {survey: - $ctrl.resolve.survey.title} }} -

    -
    - - - +
    +

    {{ 'contacts.add_contact_to' | t : {survey: $ctrl.resolve.survey.title} }}

    +
    + + +
    - - + +
    - - + +
    diff --git a/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.component.js b/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.component.js index 23b583e206..4cda4b2454 100644 --- a/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.component.js +++ b/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.component.js @@ -4,43 +4,43 @@ import chevronLeftIcon from '../../../../images/icons/chevronLeft.svg'; import template from './surveyResponses.html'; angular.module('campusContactsApp').component('surveyResponses', { - controller: surveyResponsesController, - bindings: { - survey: '<', - }, - template: template, + controller: surveyResponsesController, + bindings: { + survey: '<', + }, + template, }); function surveyResponsesController($state, httpProxy, $uibModal) { - this.chevronLeftIcon = chevronLeftIcon; - this.orgId = $state.params.orgId; + this.chevronLeftIcon = chevronLeftIcon; + this.orgId = $state.params.orgId; - this.$onInit = async () => { - this.questions = await loadQuestions(); - }; + this.$onInit = async () => { + this.questions = await loadQuestions(); + }; - const loadQuestions = async () => { - const { data } = await httpProxy.get( - `/surveys/${this.survey.id}/questions`, - {}, - { errorMessage: 'error.messages.surveyResponses.loadQuestions' }, - ); - return data.map((question) => ({ - id: question.id, - label: question.column_title || question.label, - kind: question.kind, - style: question.style, - })); - }; + const loadQuestions = async () => { + const { data } = await httpProxy.get( + `/surveys/${this.survey.id}/questions`, + {}, + { errorMessage: 'error.messages.surveyResponses.loadQuestions' }, + ); + return data.map((question) => ({ + id: question.id, + label: question.column_title || question.label, + kind: question.kind, + style: question.style, + })); + }; - this.addSurveyResponse = () => { - $uibModal.open({ - component: 'addSurveyResponseModal', - resolve: { - survey: () => this.survey, - }, - windowClass: 'pivot_theme', - backdrop: 'static', - keyboard: false, - }); - }; + this.addSurveyResponse = () => { + $uibModal.open({ + component: 'addSurveyResponseModal', + resolve: { + survey: () => this.survey, + }, + windowClass: 'pivot_theme', + backdrop: 'static', + keyboard: false, + }); + }; } diff --git a/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.html b/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.html index fc70ab9da6..1871211e50 100644 --- a/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.html +++ b/app/assets/javascripts/angular/components/surveyResponses/surveyResponses.html @@ -1,27 +1,18 @@
    -
    -
    - -
    -     - {{ $ctrl.survey.title }} -
    - +
    +
    + +
    +     + {{ $ctrl.survey.title }}
    + +
    - +
    diff --git a/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.component.js b/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.component.js index 06fd2265fa..1fa7117d64 100644 --- a/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.component.js +++ b/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.component.js @@ -4,25 +4,23 @@ import template from './surveyTypeformModal.html'; import './surveyTypeformModal.scss'; angular.module('campusContactsApp').component('surveyTypeformModal', { - controller: surveyTypeformModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - }, + controller: surveyTypeformModalController, + template, + bindings: { + resolve: '<', + close: '&', + }, }); function surveyTypeformModalController($document, $sce) { - var vm = this; - vm.$document = $document; - this.ministriesSurveysTypeformStep1 = $sce.trustAsHtml( - i18next.t('ministries.surveys.typeform.step1'), - ); + const vm = this; + vm.$document = $document; + this.ministriesSurveysTypeformStep1 = $sce.trustAsHtml(i18next.t('ministries.surveys.typeform.step1')); - vm.copy = () => { - const el = vm.$document[0].getElementById('campus-contacts-url'); - el.select(); - vm.$document[0].execCommand('copy'); - vm.copied = true; - }; + vm.copy = () => { + const el = vm.$document[0].getElementById('campus-contacts-url'); + el.select(); + vm.$document[0].execCommand('copy'); + vm.copied = true; + }; } diff --git a/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.html b/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.html index 5aef77a3d2..34fcbd959d 100644 --- a/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.html +++ b/app/assets/javascripts/angular/components/surveyTypeformModal/surveyTypeformModal.html @@ -1,41 +1,33 @@
    -
    -

    - {{ 'ministries.surveys.typeform.header' | t }} -

    -
    - {{ 'ministries.surveys.typeform.subheader' | t }} -
    -
    - - - +
    +

    {{ 'ministries.surveys.typeform.header' | t }}

    +
    {{ 'ministries.surveys.typeform.subheader' | t }}
    +
    + + +
    -
      -
    1. -
    2. {{ 'ministries.surveys.typeform.step2' | t }}
      3. -
    3. {{ 'ministries.surveys.typeform.step3' | t }}
      4. -
    4. {{ 'ministries.surveys.typeform.step4' | t }}
      5. -
    5. {{ 'ministries.surveys.typeform.step5' | t }}
      6. -
    -

    {{ 'ministries.surveys.typeform.conclusion' | t }}

    - - - {{ 'ministries.surveys.typeform.copied' | t }} +
      +
    1. +
    2. {{ 'ministries.surveys.typeform.step2' | t }}
      3. +
    3. {{ 'ministries.surveys.typeform.step3' | t }}
      4. +
    4. {{ 'ministries.surveys.typeform.step4' | t }}
      5. +
    5. {{ 'ministries.surveys.typeform.step5' | t }}
      6. +
    +

    {{ 'ministries.surveys.typeform.conclusion' | t }}

    + + + {{ 'ministries.surveys.typeform.copied' | t }}
    - +
    diff --git a/app/assets/javascripts/angular/components/surveys/surveyForm.component.js b/app/assets/javascripts/angular/components/surveys/surveyForm.component.js index 308da6067e..f0826ad3c7 100644 --- a/app/assets/javascripts/angular/components/surveys/surveyForm.component.js +++ b/app/assets/javascripts/angular/components/surveys/surveyForm.component.js @@ -7,124 +7,119 @@ import surveyFormUserTemplate from './surveyFormUser.html'; import surveyFormPublicTemplate from './surveyFormPublic.html'; const bindings = { - survey: '<', - onInit: '&', - onSavingChange: '&', - onSuccess: '&', + survey: '<', + onInit: '&', + onSavingChange: '&', + onSuccess: '&', }; // Note: angularjs-annotate doesn't work if you try move the controller part of the component config to a shared object angular - .module('campusContactsApp') - .component('surveyFormUser', { - controller: surveyFormController, - bindings, - template: surveyFormUserTemplate, - }) - .component('surveyFormPublic', { - controller: surveyFormController, - bindings, - template: surveyFormPublicTemplate, - }); + .module('campusContactsApp') + .component('surveyFormUser', { + controller: surveyFormController, + bindings, + template: surveyFormUserTemplate, + }) + .component('surveyFormPublic', { + controller: surveyFormController, + bindings, + template: surveyFormPublicTemplate, + }); function surveyFormController($window, surveyService) { - const getChoices = (content, includeEmptyOption) => { - let choices = content.split('\n'); - - choices = _.map(choices, (choice) => { - return { - value: choice, - name: choice, - }; - }); + const getChoices = (content, includeEmptyOption) => { + let choices = content.split('\n'); + + choices = _.map(choices, (choice) => { + return { + value: choice, + name: choice, + }; + }); - //add undefined option - if (includeEmptyOption) { - choices.unshift({ - name: i18next.t('select'), - }); + // add undefined option + if (includeEmptyOption) { + choices.unshift({ + name: i18next.t('select'), + }); + } + + return choices; + }; + + this.$onInit = () => { + this.onInit({ $event: { save: this.save } }); + this.answers = {}; + this.questionChoices = {}; + + surveyService.getSurveyQuestions(this.survey.id).then((questions) => { + this.surveyQuestions = questions.data; + _.forEach(questions.data, (question) => { + if (question.content) { + this.questionChoices[question.id] = getChoices(question.content, question.style === 'drop-down'); } - - return choices; - }; - - this.$onInit = () => { - this.onInit({ $event: { save: this.save } }); - this.answers = {}; - this.questionChoices = {}; - - surveyService.getSurveyQuestions(this.survey.id).then((questions) => { - this.surveyQuestions = questions.data; - _.forEach(questions.data, (question) => { - if (question.content) { - this.questionChoices[question.id] = getChoices( - question.content, - question.style === 'drop-down', - ); - } - }); - }); - }; - - this.save = (addAnother) => { - delete this.importError; - this.onSavingChange({ $event: true }); - - let postData = { + }); + }); + }; + + this.save = (addAnother) => { + delete this.importError; + this.onSavingChange({ $event: true }); + + const postData = { + data: { + type: 'answer_sheet', + attributes: {}, + relationships: { + survey: { data: { - type: 'answer_sheet', - attributes: {}, - relationships: { - survey: { - data: { - type: 'survey', - id: this.survey.id, - }, - }, - }, + type: 'survey', + id: this.survey.id, }, - included: [], - }; - - _.forEach(_.keys(this.answers), (id) => { - let answer = this.answers[id]; - - if (_.isObject(answer)) { - //checkbox answers - answer = _.keys(_.pickBy(answer, _.identity)); - } else { - answer = [answer]; - } - - _.forEach(answer, (answer) => { - postData.included.push({ - type: 'answer', - attributes: { - question_id: Number(id), - value: answer, - }, - }); - }); + }, + }, + }, + included: [], + }; + + _.forEach(_.keys(this.answers), (id) => { + let answer = this.answers[id]; + + if (_.isObject(answer)) { + // checkbox answers + answer = _.keys(_.pickBy(answer, _.identity)); + } else { + answer = [answer]; + } + + _.forEach(answer, (answer) => { + postData.included.push({ + type: 'answer', + attributes: { + question_id: Number(id), + value: answer, + }, }); + }); + }); - surveyService.importAnswerSheet(postData).then( - () => { - if (addAnother) { - this.answers = {}; - this.onSavingChange({ $event: false }); - } else { - this.onSuccess(); - } - }, - (response) => { - const { - data: { errors: [{ detail: details } = {}] = [] } = {}, - } = response; - this.importError = details; - $window.scrollTo(0, 0); - this.onSavingChange({ $event: false }); - }, - ); - }; + surveyService.importAnswerSheet(postData).then( + () => { + if (addAnother) { + this.answers = {}; + this.onSavingChange({ $event: false }); + } else { + this.onSuccess(); + } + }, + (response) => { + const { data: { errors: [{ detail: details } = {}] = [] } = {} } = response; + this.importError = details; + $window.scrollTo(0, 0); + this.onSavingChange({ $event: false }); + }, + ); + }; } diff --git a/app/assets/javascripts/angular/components/surveys/surveyFormPublic.html b/app/assets/javascripts/angular/components/surveys/surveyFormPublic.html index fbca35fc94..0207b9a1f0 100644 --- a/app/assets/javascripts/angular/components/surveys/surveyFormPublic.html +++ b/app/assets/javascripts/angular/components/surveys/surveyFormPublic.html @@ -1,98 +1,68 @@
    -
    -
    - {{$ctrl.importError}} -
    +
    +
    {{$ctrl.importError}}
    -
    - +
    + -
    +
    +
    + diff --git a/app/assets/javascripts/angular/components/surveys/surveyFormUser.html b/app/assets/javascripts/angular/components/surveys/surveyFormUser.html index 1eba0391e2..c7b0770e22 100644 --- a/app/assets/javascripts/angular/components/surveys/surveyFormUser.html +++ b/app/assets/javascripts/angular/components/surveys/surveyFormUser.html @@ -1,61 +1,40 @@
    -
    -
    - {{$ctrl.importError}} -
    - -
    - +
    +
    {{$ctrl.importError}}
    -
    -
    - +
    + -
    - -
    +
    +
    + -
    - -
    -
    +
    + +
    - -
    +
    + +
    -
    + + +
    +
    + diff --git a/app/assets/javascripts/angular/components/transferModal/transferModal.component.js b/app/assets/javascripts/angular/components/transferModal/transferModal.component.js index 0518b7bb09..6e0056fe52 100644 --- a/app/assets/javascripts/angular/components/transferModal/transferModal.component.js +++ b/app/assets/javascripts/angular/components/transferModal/transferModal.component.js @@ -2,95 +2,81 @@ import template from './transferModal.html'; import './transferModal.scss'; angular.module('campusContactsApp').component('transferModal', { - controller: transferModalController, - template: template, - bindings: { - resolve: '<', - close: '&', - dismiss: '&', - }, + controller: transferModalController, + template, + bindings: { + resolve: '<', + close: '&', + dismiss: '&', + }, }); -function transferModalController( - $scope, - JsonApiDataStore, - transferService, - organizationService, - RequestDeduper, -) { - var vm = this; +function transferModalController($scope, JsonApiDataStore, transferService, organizationService, RequestDeduper) { + const vm = this; - vm.search = ''; - vm.searching = false; - vm.searchOptions = []; - vm.selectedOrg = null; - vm.selectOrg = selectOrg; - vm.options = { - copyContact: false, - copyAnswers: false, - copyInteractions: false, - }; + vm.search = ''; + vm.searching = false; + vm.searchOptions = []; + vm.selectedOrg = null; + vm.selectOrg = selectOrg; + vm.options = { + copyContact: false, + copyAnswers: false, + copyInteractions: false, + }; - vm.save = save; - vm.cancel = cancel; + vm.save = save; + vm.cancel = cancel; - vm.$onInit = activate; + vm.$onInit = activate; - function activate() { - vm.selection = vm.resolve.selection; - vm.sourceOrg = JsonApiDataStore.store.find( - 'organization', - vm.selection.orgId, - ); + function activate() { + vm.selection = vm.resolve.selection; + vm.sourceOrg = JsonApiDataStore.store.find('organization', vm.selection.orgId); - var requestDeduper = new RequestDeduper(); + const requestDeduper = new RequestDeduper(); - // Refresh the org list whenever the search term changes - $scope.$watch('$ctrl.search', function (search) { - // Unselect the org because it may not be shown anymore - vm.selectedOrg = null; + // Refresh the org list whenever the search term changes + $scope.$watch('$ctrl.search', function (search) { + // Unselect the org because it may not be shown anymore + vm.selectedOrg = null; - if (search === '') { - // Ignore empty searches - vm.searchOptions = []; - return; - } + if (search === '') { + // Ignore empty searches + vm.searchOptions = []; + return; + } - vm.searching = true; - organizationService - .searchOrgs(vm.sourceOrg, search, requestDeduper) - .then(function (orgs) { - // Filter out people that are already selected - vm.searchOptions = orgs; - }) - .finally(function () { - vm.searching = false; - }); + vm.searching = true; + organizationService + .searchOrgs(vm.sourceOrg, search, requestDeduper) + .then(function (orgs) { + // Filter out people that are already selected + vm.searchOptions = orgs; + }) + .finally(function () { + vm.searching = false; }); - } + }); + } - function selectOrg(org) { - vm.selectedOrg = org; - } + function selectOrg(org) { + vm.selectedOrg = org; + } - function save() { - vm.saving = true; - transferService - .transfer( - vm.selection, - vm.selectedOrg, - vm.options, - vm.resolve.surveyId, - ) - .then(function () { - vm.close({ $value: vm.options.copyContact }); - }) - .catch(function () { - vm.saving = false; - }); - } + function save() { + vm.saving = true; + transferService + .transfer(vm.selection, vm.selectedOrg, vm.options, vm.resolve.surveyId) + .then(function () { + vm.close({ $value: vm.options.copyContact }); + }) + .catch(function () { + vm.saving = false; + }); + } - function cancel() { - vm.dismiss(); - } + function cancel() { + vm.dismiss(); + } } diff --git a/app/assets/javascripts/angular/components/transferModal/transferModal.html b/app/assets/javascripts/angular/components/transferModal/transferModal.html index 4f8e681dc4..bbe72298bb 100644 --- a/app/assets/javascripts/angular/components/transferModal/transferModal.html +++ b/app/assets/javascripts/angular/components/transferModal/transferModal.html @@ -1,72 +1,54 @@
    -

    {{ 'transfer.title' | t }}

    -

    - {{ 'transfer.subtitle' | t : { contact_count: - $ctrl.selection.totalSelectedPeople } }} -

    - - - +

    {{ 'transfer.title' | t }}

    +

    {{ 'transfer.subtitle' | t : { contact_count: $ctrl.selection.totalSelectedPeople } }}

    + + +
    -
    - + -
    -
    - {{ 'person_multiselect.searching' | t : { people_description: - ('transfer.organizations' | t) } }} -
    -
    - {{ 'person_multiselect.no_search_results' | t : { people_description: - ('transfer.organizations' | t), search: $ctrl.search } }} -
    - - - -
    -
    - {{ org.name }} -
    + /> +
    +
    + {{ 'person_multiselect.searching' | t : { people_description: ('transfer.organizations' | t) } }} +
    +
    + {{ 'person_multiselect.no_search_results' | t : { people_description: ('transfer.organizations' | t), search: + $ctrl.search } }} +
    + + + +
    +
    + {{ org.name }}
    +
    - - + +
    diff --git a/app/assets/javascripts/angular/components/transferModal/transferModal.service.js b/app/assets/javascripts/angular/components/transferModal/transferModal.service.js index 2ce105ed55..79f4e3d5a4 100644 --- a/app/assets/javascripts/angular/components/transferModal/transferModal.service.js +++ b/app/assets/javascripts/angular/components/transferModal/transferModal.service.js @@ -1,39 +1,29 @@ angular.module('campusContactsApp').factory('transferService', transferService); function transferService(httpProxy, JsonApiDataStore, personSelectionService) { - return { - // Transfer the contacts in the selection to the specified organization - transfer: function (selection, org, options, surveyId) { - var filters = personSelectionService.convertToFilters( - selection, - surveyId, - ); + return { + // Transfer the contacts in the selection to the specified organization + transfer: function (selection, org, options, surveyId) { + const filters = personSelectionService.convertToFilters(selection, surveyId); - var bulkTransfer = new JsonApiDataStore.Model('bulk_transfer'); - bulkTransfer.setAttribute('person_ids', filters.ids); - bulkTransfer.setAttribute('from_organization_id', selection.orgId); - bulkTransfer.setAttribute('to_organization_id', org.id); - bulkTransfer.setAttribute('keep_copy', options.copyContact); - bulkTransfer.setAttribute( - 'copy_answer_sheets', - options.copyAnswers, - ); - bulkTransfer.setAttribute( - 'copy_interactions', - options.copyInteractions, - ); + const bulkTransfer = new JsonApiDataStore.Model('bulk_transfer'); + bulkTransfer.setAttribute('person_ids', filters.ids); + bulkTransfer.setAttribute('from_organization_id', selection.orgId); + bulkTransfer.setAttribute('to_organization_id', org.id); + bulkTransfer.setAttribute('keep_copy', options.copyContact); + bulkTransfer.setAttribute('copy_answer_sheets', options.copyAnswers); + bulkTransfer.setAttribute('copy_interactions', options.copyInteractions); - return httpProxy.post( - '/bulk_transfers', - { - data: bulkTransfer.serialize().data, - filters: filters, - }, - { - errorMessage: - 'error.messages.bulk_transfer_modal.transfer_contacts', - }, - ); + return httpProxy.post( + '/bulk_transfers', + { + data: bulkTransfer.serialize().data, + filters, }, - }; + { + errorMessage: 'error.messages.bulk_transfer_modal.transfer_contacts', + }, + ); + }, + }; } diff --git a/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.component.js b/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.component.js index 885e9bad8b..df24998a74 100644 --- a/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.component.js +++ b/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.component.js @@ -2,35 +2,35 @@ import template from './unsubscribe.html'; import './unsubscribe.scss'; angular.module('campusContactsApp').component('unsubscribe', { - controller: unsubscribeController, - template: template, - bindings: { - token: '<', - organizationId: '<', - organizationName: '<', - }, + controller: unsubscribeController, + template, + bindings: { + token: '<', + organizationId: '<', + organizationName: '<', + }, }); function unsubscribeController(httpProxy, $scope) { - this.isUnsubscribed = false; - this.isError = false; + this.isUnsubscribed = false; + this.isError = false; - this.unsubscribe = async () => { - try { - await httpProxy.post('/unsubscriptions', { - data: { - type: 'unsubscription', - attributes: { - organization_id: this.organizationId, - token: this.token, - }, - }, - }); + this.unsubscribe = async () => { + try { + await httpProxy.post('/unsubscriptions', { + data: { + type: 'unsubscription', + attributes: { + organization_id: this.organizationId, + token: this.token, + }, + }, + }); - this.isUnsubscribed = true; - } catch (error) { - this.isError = true; - } - $scope.$apply(); - }; + this.isUnsubscribed = true; + } catch (error) { + this.isError = true; + } + $scope.$apply(); + }; } diff --git a/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.html b/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.html index 52a3a77c29..8dc346e9ab 100644 --- a/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.html +++ b/app/assets/javascripts/angular/components/unsubscribe/unsubscribe.html @@ -1,28 +1,20 @@
    -
    -

    {{ 'unsubscribe:error' | t }}

    +
    +

    {{ 'unsubscribe:error' | t }}

    +
    +
    +
    +

    {{ 'unsubscribe:confirmation' | t }} {{ $ctrl.organizationName }}?

    +

    {{ 'unsubscribe:noMoreEmails' | t }} {{ $ctrl.organizationName }}.

    +
    -
    -
    -

    - {{ 'unsubscribe:confirmation' | t }} {{ $ctrl.organizationName - }}? -

    -

    - {{ 'unsubscribe:noMoreEmails' | t }} {{ $ctrl.organizationName - }}. -

    - -
    -
    -

    - {{ 'unsubscribe:success' | t }} {{ $ctrl.organizationName }}. -

    -
    +
    +

    {{ 'unsubscribe:success' | t }} {{ $ctrl.organizationName }}.

    +
    diff --git a/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.js b/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.js index 318a27c1cd..4d41f6b0e7 100644 --- a/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.js +++ b/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.js @@ -5,45 +5,41 @@ import template from './user-preferences.html'; import './user-preferences.scss'; class UserPreferences { - constructor(loggedInPerson, $scope) { - this.loggedInPerson = loggedInPerson; - this.$scope = $scope; - const { user } = this.loggedInPerson.person; - this.language = user.language; - const { - person_moved = true, - person_assigned = true, - weekly_digest = true, - } = user.notification_settings || {}; - this.personMoved = person_moved; - this.personAssigned = person_assigned; - this.weeklyDigest = weekly_digest; - } + constructor(loggedInPerson, $scope) { + this.loggedInPerson = loggedInPerson; + this.$scope = $scope; + const { user } = this.loggedInPerson.person; + this.language = user.language; + const { person_moved = true, person_assigned = true, weekly_digest = true } = user.notification_settings || {}; + this.personMoved = person_moved; + this.personAssigned = person_assigned; + this.weeklyDigest = weekly_digest; + } - async $onInit() { - this.languages = await getNamesOfLoadedTranslations(); - this.$scope.$apply(); - } + async $onInit() { + this.languages = await getNamesOfLoadedTranslations(); + this.$scope.$apply(); + } - onChangeLanguage(language) { - if (language) { - i18next.changeLanguage(language); - this.loggedInPerson.updatePreferences({ language }); - } + onChangeLanguage(language) { + if (language) { + i18next.changeLanguage(language); + this.loggedInPerson.updatePreferences({ language }); } + } - onChangeNotificationSettings() { - this.loggedInPerson.updatePreferences({ - notification_settings: { - person_moved: this.personMoved, - person_assigned: this.personAssigned, - weekly_digest: this.weeklyDigest, - }, - }); - } + onChangeNotificationSettings() { + this.loggedInPerson.updatePreferences({ + notification_settings: { + person_moved: this.personMoved, + person_assigned: this.personAssigned, + weekly_digest: this.weeklyDigest, + }, + }); + } } angular.module('campusContactsApp').component('userPreferences', { - controller: UserPreferences, - template: template, + controller: UserPreferences, + template, }); diff --git a/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.spec.js b/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.spec.js index ad2050fbbd..423c86d984 100644 --- a/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.spec.js +++ b/app/assets/javascripts/angular/components/user-preferences/user-preferences.component.spec.js @@ -2,52 +2,48 @@ import 'angular-mocks'; import i18next from 'i18next'; describe('userPreferences component', () => { - let $ctrl; + let $ctrl; - beforeEach(inject(($componentController) => { - $ctrl = $componentController('userPreferences', { - loggedInPerson: { - updatePreferences: jasmine.createSpy('updatePreferences'), - person: { - user: { - notification_settings: { - person_moved: false, - person_assigned: false, - weekly_digest: false, - }, - }, - }, + beforeEach(inject(($componentController) => { + $ctrl = $componentController('userPreferences', { + loggedInPerson: { + updatePreferences: jasmine.createSpy('updatePreferences'), + person: { + user: { + notification_settings: { + person_moved: false, + person_assigned: false, + weekly_digest: false, }, - }); - })); + }, + }, + }, + }); + })); - describe('onChangeLanguage', () => { - it("should change the user's language", () => { - $ctrl.onChangeLanguage('es-419'); + describe('onChangeLanguage', () => { + it("should change the user's language", () => { + $ctrl.onChangeLanguage('es-419'); - expect(i18next.language).toEqual('es-419'); - expect($ctrl.loggedInPerson.updatePreferences).toHaveBeenCalledWith( - { - language: 'es-419', - }, - ); - }); + expect(i18next.language).toEqual('es-419'); + expect($ctrl.loggedInPerson.updatePreferences).toHaveBeenCalledWith({ + language: 'es-419', + }); }); + }); - describe('onChangeNotificationSettings', () => { - it("should change the user's notification settings", () => { - $ctrl.personMoved = true; - $ctrl.onChangeNotificationSettings(); + describe('onChangeNotificationSettings', () => { + it("should change the user's notification settings", () => { + $ctrl.personMoved = true; + $ctrl.onChangeNotificationSettings(); - expect($ctrl.loggedInPerson.updatePreferences).toHaveBeenCalledWith( - { - notification_settings: { - person_moved: true, - person_assigned: false, - weekly_digest: false, - }, - }, - ); - }); + expect($ctrl.loggedInPerson.updatePreferences).toHaveBeenCalledWith({ + notification_settings: { + person_moved: true, + person_assigned: false, + weekly_digest: false, + }, + }); }); + }); }); diff --git a/app/assets/javascripts/angular/components/user-preferences/user-preferences.html b/app/assets/javascripts/angular/components/user-preferences/user-preferences.html index a989d437a0..93761292b0 100644 --- a/app/assets/javascripts/angular/components/user-preferences/user-preferences.html +++ b/app/assets/javascripts/angular/components/user-preferences/user-preferences.html @@ -1,85 +1,67 @@
    -

    {{ 'userPreferences:title' | t }}

    +

    {{ 'userPreferences:title' | t }}

    -
    -
    - -
    +
    +
    + +
    -

    - {{ 'userPreferences:notificationsHeader' | t }} -

    -
    -
    -
    - {{ 'userPreferences:enabledByDefault' | t }} -
    -
    -
    -
    - {{ 'userPreferences:personTransferred' | t }} -
    -
    - - -
    -
    -
    -
    - {{ 'userPreferences:personAssigned' | t }} -
    -
    - - -
    -
    -
    -
    - {{ 'userPreferences:weeklyDigest' | t }} -
    -
    - - -
    -
    +

    {{ 'userPreferences:notificationsHeader' | t }}

    +
    +
    +
    {{ 'userPreferences:enabledByDefault' | t }}
    +
    +
    +
    + {{ 'userPreferences:personTransferred' | t }} +
    +
    + + +
    +
    +
    +
    + {{ 'userPreferences:personAssigned' | t }} +
    +
    + + +
    +
    +
    +
    + {{ 'userPreferences:weeklyDigest' | t }} +
    +
    + + +
    +
    diff --git a/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.js b/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.js index 6af4afd5f0..89682868ce 100644 --- a/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.js +++ b/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.js @@ -3,48 +3,36 @@ import isoLanguages from 'iso-639-1'; import m49Regions from 'm49-regions'; const recursiveFind = (arr, findKey, findValue, recurseKey) => { - return arr.reduce((acc, item) => { - if (acc) { - return acc; - } + return arr.reduce((acc, item) => { + if (acc) { + return acc; + } - if (item[findKey] === findValue) { - return item; - } + if (item[findKey] === findValue) { + return item; + } - return item[recurseKey] - ? recursiveFind(item[recurseKey], findKey, findValue, recurseKey) - : undefined; - }, undefined); + return item[recurseKey] ? recursiveFind(item[recurseKey], findKey, findValue, recurseKey) : undefined; + }, undefined); }; export const getNamesOfLoadedTranslations = async () => { - const countrilyData = Object.values( - await import(/* webpackChunkName: "countrily-data" */ 'countrily-data'), - ); - return Object.keys(i18next.store.data) - .map((code) => { - const [language, country] = code.split('-'); + const countrilyData = Object.values(await import(/* webpackChunkName: "countrily-data" */ 'countrily-data')); + return Object.keys(i18next.store.data) + .map((code) => { + const [language, country] = code.split('-'); - const languageName = isoLanguages.getName(language); - const countryName = - country && - (country.match(/^\d{3}$/) - ? (recursiveFind(m49Regions, 'code', country, 'sub') || {}) - .name - : ( - countrilyData.find( - (countrilyCountry) => - countrilyCountry.ISO.alpha2 === country, - ) || {} - ).demonym); + const languageName = isoLanguages.getName(language); + const countryName = + country && + (country.match(/^\d{3}$/) + ? (recursiveFind(m49Regions, 'code', country, 'sub') || {}).name + : (countrilyData.find((countrilyCountry) => countrilyCountry.ISO.alpha2 === country) || {}).demonym); - return { - code, - name: `${languageName}${ - countryName ? ` - ${countryName}` : '' - } (${code})`, - }; - }) - .sort((a, b) => a.name.localeCompare(b.name)); + return { + code, + name: `${languageName}${countryName ? ` - ${countryName}` : ''} (${code})`, + }; + }) + .sort((a, b) => a.name.localeCompare(b.name)); }; diff --git a/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.spec.js b/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.spec.js index 4401b4f8fd..24886b3617 100644 --- a/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.spec.js +++ b/app/assets/javascripts/angular/components/user-preferences/user-preferences.service.spec.js @@ -1,9 +1,7 @@ import { getNamesOfLoadedTranslations } from './user-preferences.service'; describe('getNamesOfLoadedTranslations', () => { - it('should load the English locale', async () => { - expect(await getNamesOfLoadedTranslations()).toEqual([ - { code: 'en-US', name: 'English - American (en-US)' }, - ]); - }); + it('should load the English locale', async () => { + expect(await getNamesOfLoadedTranslations()).toEqual([{ code: 'en-US', name: 'English - American (en-US)' }]); + }); }); diff --git a/app/assets/javascripts/angular/decorators/templateRequest.js b/app/assets/javascripts/angular/decorators/templateRequest.js index 36b5e44b07..afaf8154db 100644 --- a/app/assets/javascripts/angular/decorators/templateRequest.js +++ b/app/assets/javascripts/angular/decorators/templateRequest.js @@ -1,41 +1,37 @@ /* * Decorate $templateRequest so that failures can be retried. */ -angular - .module('campusContactsApp') - .decorator('$templateRequest', $templateRequest); +angular.module('campusContactsApp').decorator('$templateRequest', $templateRequest); function $templateRequest($delegate, errorService, tFilter, _) { - var retryConfig = _.defaults( - { - // Retry all errors - retryFilter: _.constant(true), - }, - errorService.networkRetryConfig, - ); + const retryConfig = _.defaults( + { + // Retry all errors + retryFilter: _.constant(true), + }, + errorService.networkRetryConfig, + ); - // Wrap $templateRequest in the autoRetry decorator so that failed template loads can be retried - var decorated = errorService.autoRetry(function () { - return $delegate.apply(null, arguments).catch(function (err) { - // Add a user-friendly error message to the original error - err.message = tFilter( - 'error.messages.template_request.load_template', - ); - throw err; - }); - }, retryConfig); - - // Delegate get and sets on the totalPendingRequests property to the original $templateRequest function - Object.defineProperty(decorated, 'totalPendingRequests', { - configurable: true, - enumerable: true, - get: function () { - return $delegate.totalPendingRequests; - }, - set: function (value) { - $delegate.totalPendingRequests = value; - }, + // Wrap $templateRequest in the autoRetry decorator so that failed template loads can be retried + const decorated = errorService.autoRetry(function () { + return $delegate.apply(null, arguments).catch(function (err) { + // Add a user-friendly error message to the original error + err.message = tFilter('error.messages.template_request.load_template'); + throw err; }); + }, retryConfig); + + // Delegate get and sets on the totalPendingRequests property to the original $templateRequest function + Object.defineProperty(decorated, 'totalPendingRequests', { + configurable: true, + enumerable: true, + get: function () { + return $delegate.totalPendingRequests; + }, + set: function (value) { + $delegate.totalPendingRequests = value; + }, + }); - return decorated; + return decorated; } diff --git a/app/assets/javascripts/angular/directives/autoGrow.directive.js b/app/assets/javascripts/angular/directives/autoGrow.directive.js index 56b12de11f..5d781cac44 100644 --- a/app/assets/javascripts/angular/directives/autoGrow.directive.js +++ b/app/assets/javascripts/angular/directives/autoGrow.directive.js @@ -1,63 +1,57 @@ // Copied from https://gist.github.com/thomseddon/4703968 angular.module('campusContactsApp').directive('autoGrow', function ($document) { - function link(scope, element) { - var minHeight = element[0].offsetHeight; - var paddingLeft = element.css('paddingLeft'); - var paddingRight = element.css('paddingRight'); + function link(scope, element) { + const minHeight = element[0].offsetHeight; + const paddingLeft = element.css('paddingLeft'); + const paddingRight = element.css('paddingRight'); - var $shadow = angular.element('
    ').css({ - position: 'absolute', - top: -10000, - left: -10000, - width: - element[0].offsetWidth - - parseInt(paddingLeft || 0, 10) - - parseInt(paddingRight || 0, 10), - fontSize: element.css('fontSize'), - fontFamily: element.css('fontFamily'), - lineHeight: element.css('lineHeight'), - resize: 'none', - }); - angular.element($document[0].body).append($shadow); - - function update() { - function times(string, number) { - var r = ''; - for (var i = 0; i < number; i++) { - r += string; - } - return r; - } - - var val = element - .val() - .replace(//g, '>') - .replace(/&/g, '&') - .replace(/\n$/, '
     ') - .replace(/\n/g, '
    ') - .replace(/\s{2,}/g, function (space) { - return times(' ', space.length - 1) + ' '; - }); - $shadow.html(val); + const $shadow = angular.element('
    ').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: element[0].offsetWidth - parseInt(paddingLeft || 0, 10) - parseInt(paddingRight || 0, 10), + fontSize: element.css('fontSize'), + fontFamily: element.css('fontFamily'), + lineHeight: element.css('lineHeight'), + resize: 'none', + }); + angular.element($document[0].body).append($shadow); - var threshold = 10; - element.css( - 'height', - Math.max($shadow[0].offsetHeight + threshold, minHeight) + 'px', - ); + function update() { + function times(string, number) { + let r = ''; + for (let i = 0; i < number; i++) { + r += string; } + return r; + } - scope.$on('$destroy', function () { - $shadow.remove(); + const val = element + .val() + .replace(//g, '>') + .replace(/&/g, '&') + .replace(/\n$/, '
     ') + .replace(/\n/g, '
    ') + .replace(/\s{2,}/g, function (space) { + return times(' ', space.length - 1) + ' '; }); + $shadow.html(val); - element.bind('keyup keydown keypress change', update); - update(); + const threshold = 10; + element.css('height', Math.max($shadow[0].offsetHeight + threshold, minHeight) + 'px'); } - return { - link: link, - restrict: 'AC', - }; + scope.$on('$destroy', function () { + $shadow.remove(); + }); + + element.bind('keyup keydown keypress change', update); + update(); + } + + return { + link, + restrict: 'AC', + }; }); diff --git a/app/assets/javascripts/angular/directives/exposeSelect.js b/app/assets/javascripts/angular/directives/exposeSelect.js index 6ed0719d21..077d647000 100644 --- a/app/assets/javascripts/angular/directives/exposeSelect.js +++ b/app/assets/javascripts/angular/directives/exposeSelect.js @@ -1,9 +1,9 @@ angular.module('campusContactsApp').directive('exposeSelect', function () { - return { - controller: function ($scope) { - // Put the $select instance from the ui-select component on the parent scope so that the parent of - // ui-select will have access to it - $scope.$parent.$select = $scope.$select; - }, - }; + return { + controller: function ($scope) { + // Put the $select instance from the ui-select component on the parent scope so that the parent of + // ui-select will have access to it + $scope.$parent.$select = $scope.$select; + }, + }; }); diff --git a/app/assets/javascripts/angular/directives/focus.js b/app/assets/javascripts/angular/directives/focus.js index 4211661e1f..4e16e13e4c 100644 --- a/app/assets/javascripts/angular/directives/focus.js +++ b/app/assets/javascripts/angular/directives/focus.js @@ -1,12 +1,12 @@ // This directive focuses the element if the "focus" attribute is truthy. angular.module('campusContactsApp').directive('focus', function () { - return { - restrict: 'A', - scope: { focus: '<' }, - link: function (scope, element) { - if (scope.focus) { - element[0].focus(); - } - }, - }; + return { + restrict: 'A', + scope: { focus: '<' }, + link: function (scope, element) { + if (scope.focus) { + element[0].focus(); + } + }, + }; }); diff --git a/app/assets/javascripts/angular/directives/onClickAway.directive.js b/app/assets/javascripts/angular/directives/onClickAway.directive.js index 4a11c6185e..bea430a99c 100644 --- a/app/assets/javascripts/angular/directives/onClickAway.directive.js +++ b/app/assets/javascripts/angular/directives/onClickAway.directive.js @@ -1,25 +1,23 @@ -angular - .module('campusContactsApp') - .directive('onClickAway', function ($window, $parse, $timeout) { - return { - restrict: 'A', - link: function (scope, element, attrs) { - // Click event that added this directive to the DOM may still be propagating - // so wait a digest cycle to add the listener - $timeout(function () { - $window.addEventListener('click', handleClick); - }); +angular.module('campusContactsApp').directive('onClickAway', function ($window, $parse, $timeout) { + return { + restrict: 'A', + link: function (scope, element, attrs) { + // Click event that added this directive to the DOM may still be propagating + // so wait a digest cycle to add the listener + $timeout(function () { + $window.addEventListener('click', handleClick); + }); - scope.$on('$destroy', function () { - $window.removeEventListener('click', handleClick); - }); + scope.$on('$destroy', function () { + $window.removeEventListener('click', handleClick); + }); - function handleClick(e) { - // Call the onClickAway expression when the click was not on a child of the directive's element - if (!element[0].contains(e.target)) { - scope.$apply(attrs.onClickAway); - } - } - }, - }; - }); + function handleClick(e) { + // Call the onClickAway expression when the click was not on a child of the directive's element + if (!element[0].contains(e.target)) { + scope.$apply(attrs.onClickAway); + } + } + }, + }; +}); diff --git a/app/assets/javascripts/angular/directives/safeSubmit.directive.js b/app/assets/javascripts/angular/directives/safeSubmit.directive.js index acb9c85421..7a75e4ca3b 100644 --- a/app/assets/javascripts/angular/directives/safeSubmit.directive.js +++ b/app/assets/javascripts/angular/directives/safeSubmit.directive.js @@ -1,44 +1,44 @@ // ng-safe-submit is similar to ng-submit except that it automatically prevents double-submissions. The // ng-safe-submit event handler can return a promise. If it does, the form is disabled until the promise resolves. angular.module('campusContactsApp').directive('ngSafeSubmit', function ($q, _) { - return { - restrict: 'A', - scope: { ngSafeSubmit: '&' }, - link: function (scope, element) { - // Set the enabled status of the form - function setFormEnabled(enabled) { - // Update the form enabled status by enabling/disabling the submit button if present - _.each(element.find('button'), function (button) { - if (button.type === 'submit') { - button.disabled = !enabled; - } - }); - } + return { + restrict: 'A', + scope: { ngSafeSubmit: '&' }, + link: function (scope, element) { + // Set the enabled status of the form + function setFormEnabled(enabled) { + // Update the form enabled status by enabling/disabling the submit button if present + _.each(element.find('button'), function (button) { + if (button.type === 'submit') { + button.disabled = !enabled; + } + }); + } - var submissionPending = false; - element.on('submit', function (event) { - if (submissionPending) { - // A submission is in progress, so ignore this form submission - return false; - } + let submissionPending = false; + element.on('submit', function (event) { + if (submissionPending) { + // A submission is in progress, so ignore this form submission + return false; + } - // Disable the form - submissionPending = true; - setFormEnabled(false); + // Disable the form + submissionPending = true; + setFormEnabled(false); - scope.$apply(function () { - // Call the submission event handler - var submissionPromise = scope.ngSafeSubmit(scope, { - $event: event, - }); + scope.$apply(function () { + // Call the submission event handler + const submissionPromise = scope.ngSafeSubmit(scope, { + $event: event, + }); - // After the promise returned by the submission handler resolves,enable the form again - $q.resolve(submissionPromise).then(function () { - submissionPending = false; - setFormEnabled(true); - }); - }); - }); - }, - }; + // After the promise returned by the submission handler resolves,enable the form again + $q.resolve(submissionPromise).then(function () { + submissionPending = false; + setFormEnabled(true); + }); + }); + }); + }, + }; }); diff --git a/app/assets/javascripts/angular/filters/mailto.filter.js b/app/assets/javascripts/angular/filters/mailto.filter.js index 16cb019f45..f8554ea760 100644 --- a/app/assets/javascripts/angular/filters/mailto.filter.js +++ b/app/assets/javascripts/angular/filters/mailto.filter.js @@ -6,7 +6,7 @@ * even though it really is not. */ angular.module('campusContactsApp').filter('mailto', function () { - return function (address) { - return address ? 'mailto:' + address : null; - }; + return function (address) { + return address ? 'mailto:' + address : null; + }; }); diff --git a/app/assets/javascripts/angular/filters/personName.filter.js b/app/assets/javascripts/angular/filters/personName.filter.js index 24586f74cf..8d1de9a404 100644 --- a/app/assets/javascripts/angular/filters/personName.filter.js +++ b/app/assets/javascripts/angular/filters/personName.filter.js @@ -2,18 +2,16 @@ * The personName filter takes a person and converts it into the person's name. */ angular.module('campusContactsApp').filter('personName', function (_) { - return function (person, type) { - if (!person) { - return null; - } - // Ignore missing name parts and if the type is firstAndLastInitial only return the first character of the users last name. - return [ - person.first_name, - type === 'firstAndLastInitial' && person.last_name - ? `${person.last_name.charAt(0)}.` - : person.last_name, - ] - .filter(_.identity) - .join(' '); - }; + return function (person, type) { + if (!person) { + return null; + } + // Ignore missing name parts and if the type is firstAndLastInitial only return the first character of the users last name. + return [ + person.first_name, + type === 'firstAndLastInitial' && person.last_name ? `${person.last_name.charAt(0)}.` : person.last_name, + ] + .filter(_.identity) + .join(' '); + }; }); diff --git a/app/assets/javascripts/angular/filters/phone.filter.js b/app/assets/javascripts/angular/filters/phone.filter.js index a4c5e2232f..0d1a138826 100644 --- a/app/assets/javascripts/angular/filters/phone.filter.js +++ b/app/assets/javascripts/angular/filters/phone.filter.js @@ -1,44 +1,44 @@ // Adapted from: http://stackoverflow.com/questions/12700145/how-to-format-a-telephone-number-in-angularjs angular.module('campusContactsApp').filter('phone', function () { - return function (inputNumber) { - if (!inputNumber) { - return ''; - } - - var value = inputNumber.toString().trim().replace(/\D/g, ''); - - var country, city, number; - - switch (value.length) { - case 10: // +1PPP####### -> C (PPP) ###-#### - country = 1; - city = value.slice(0, 3); - number = value.slice(3); - break; - - case 11: // +CPPP####### -> CCC (PP) ###-#### - country = value[0]; - city = value.slice(1, 4); - number = value.slice(4); - break; - - case 12: // +CCCPP####### -> CCC (PP) ###-#### - country = value.slice(0, 3); - city = value.slice(3, 5); - number = value.slice(5); - break; - - default: - return inputNumber; - } - - if (country === 1) { - country = ''; - } - - number = number.slice(0, 3) + '-' + number.slice(3); - - return (country + ' (' + city + ') ' + number).trim(); - }; + return function (inputNumber) { + if (!inputNumber) { + return ''; + } + + const value = inputNumber.toString().trim().replace(/\D/g, ''); + + let country, city, number; + + switch (value.length) { + case 10: // +1PPP####### -> C (PPP) ###-#### + country = 1; + city = value.slice(0, 3); + number = value.slice(3); + break; + + case 11: // +CPPP####### -> CCC (PP) ###-#### + country = value[0]; + city = value.slice(1, 4); + number = value.slice(4); + break; + + case 12: // +CCCPP####### -> CCC (PP) ###-#### + country = value.slice(0, 3); + city = value.slice(3, 5); + number = value.slice(5); + break; + + default: + return inputNumber; + } + + if (country === 1) { + country = ''; + } + + number = number.slice(0, 3) + '-' + number.slice(3); + + return (country + ' (' + city + ') ' + number).trim(); + }; }); diff --git a/app/assets/javascripts/angular/filters/translation.filter.js b/app/assets/javascripts/angular/filters/translation.filter.js index 387d71529a..ec53f4977d 100644 --- a/app/assets/javascripts/angular/filters/translation.filter.js +++ b/app/assets/javascripts/angular/filters/translation.filter.js @@ -1,9 +1,9 @@ import i18next from 'i18next'; angular.module('campusContactsApp').filter('t', function () { - function translateFilter(key, options) { - return i18next.t(key, options); - } - translateFilter.$stateful = true; - return translateFilter; + function translateFilter(key, options) { + return i18next.t(key, options); + } + translateFilter.$stateful = true; + return translateFilter; }); diff --git a/app/assets/javascripts/angular/main.js b/app/assets/javascripts/angular/main.js index da99d64515..dfdfe4ffc1 100644 --- a/app/assets/javascripts/angular/main.js +++ b/app/assets/javascripts/angular/main.js @@ -19,9 +19,5 @@ import '../../../components/authentication/authLanding.component'; import '../../stylesheets/main.scss'; /* global require */ -const srcFilesContext = require.context( - './', - true, - /^(?!.*\.spec\.js$).*\.js$/, -); +const srcFilesContext = require.context('./', true, /^(?!.*\.spec\.js$).*\.js$/); srcFilesContext.keys().forEach(srcFilesContext); diff --git a/app/assets/javascripts/angular/rollbar.config.js b/app/assets/javascripts/angular/rollbar.config.js index b23982d9a6..e333ae1ae0 100644 --- a/app/assets/javascripts/angular/rollbar.config.js +++ b/app/assets/javascripts/angular/rollbar.config.js @@ -1,159 +1,135 @@ import rollbar from 'rollbar'; import StackTrace from 'stacktrace-js'; -angular - .module('campusContactsApp') - .config(function (rollbarAccessToken, envServiceProvider, $provide, _) { - var rollbarConfig = { - accessToken: rollbarAccessToken, - captureUncaught: true, - captureUnhandledRejections: false, - environment: envServiceProvider.get(), - enabled: !envServiceProvider.is('development'), // Disable rollbar in development environment - transform: transformRollbarPayload, - payload: { - client: { - javascript: { - source_map_enabled: true, - guess_uncaught_frames: true, - }, - }, - }, - }; - var Rollbar = rollbar.init(rollbarConfig); - - $provide.decorator('$log', function ($delegate) { - // Add rollbar functionality to each $log method - angular.forEach( - ['log', 'debug', 'info', 'warn', 'error'], - function (ngLogLevel) { - var rollbarLogLevel = - ngLogLevel === 'warn' ? 'warning' : ngLogLevel; - - var originalFunction = $delegate[ngLogLevel]; // Call below to keep angular $log functionality - - $delegate[ngLogLevel] = function () { - originalFunction.apply(null, arguments); - - var origin = - arguments[0] && arguments[0].stack - ? '$ExceptionHandler' - : '$log'; - var stackFramesPromise, message; - - if (origin === '$ExceptionHandler') { - message = arguments[0].message; - - // Parse the exception to get the stack - stackFramesPromise = StackTrace.fromError( - arguments[0], - { offline: true }, - ); - } else { - if ( - arguments[0] && - (arguments[0].status === -1 || - arguments[0].status === 401) - ) { - return; // Drop browser network errors and unauthorized api errors due to expired tokens - } - - // Join $log arguments - message = - arguments[0] && - arguments[0].message + - '\n' + - _.map(arguments, function (arg) { - // Mask Auth header if present - _.update( - arg, - 'config.headers.Authorization', - function (val) { - // eslint-disable-next-line no-undefined - return val ? '***' : undefined; - }, - ); - return angular.toJson(arg, true); - }).join('\n'); - - // Log came from app so we get the stacktrace from this file - stackFramesPromise = StackTrace.get({ - offline: true, - }); - } - - stackFramesPromise - .then(function (stackFrames) { - // For logs, ignore first stack frame which is this file - if (origin === '$log') { - stackFrames.shift(); - } - - // Send combined message and stack trace to rollbar - Rollbar[rollbarLogLevel](message, { - stackTrace: stackFrames, - origin: origin, - }); - }) - .catch(function (error) { - // Send message without stack trace to rollbar - Rollbar[rollbarLogLevel](message, { - origin: origin, - }); - - // Send warning about the issue loading stackframes - Rollbar.warning( - 'Error loading stackframes: ' + error, - ); - }); - }; - - // copy properties of original $log function which specs use - _.defaults($delegate[ngLogLevel], originalFunction); - }, - ); - - return $delegate; - }); - - $provide.value('updateRollbarPerson', function (person) { - Rollbar.configure({ - payload: { - person: { - id: person.user.id, - person_id: person.id, - username: person.full_name, - email: person.user.username, - }, - }, - }); - }); - - function transformRollbarPayload(payload) { - if (_.get(payload, 'body.message.extra.stackTrace')) { - // Convert message format to trace format - payload.body.trace = { - frames: formatStacktraceForRollbar( - payload.body.message.extra.stackTrace, - ), - exception: { - message: payload.body.message.body, - class: payload.body.message.extra.origin, - }, - }; - delete payload.body.message; - } - return payload; +angular.module('campusContactsApp').config(function (rollbarAccessToken, envServiceProvider, $provide, _) { + const rollbarConfig = { + accessToken: rollbarAccessToken, + captureUncaught: true, + captureUnhandledRejections: false, + environment: envServiceProvider.get(), + enabled: !envServiceProvider.is('development'), // Disable rollbar in development environment + transform: transformRollbarPayload, + payload: { + client: { + javascript: { + source_map_enabled: true, + guess_uncaught_frames: true, + }, + }, + }, + }; + const Rollbar = rollbar.init(rollbarConfig); + + $provide.decorator('$log', function ($delegate) { + // Add rollbar functionality to each $log method + angular.forEach(['log', 'debug', 'info', 'warn', 'error'], function (ngLogLevel) { + const rollbarLogLevel = ngLogLevel === 'warn' ? 'warning' : ngLogLevel; + + const originalFunction = $delegate[ngLogLevel]; // Call below to keep angular $log functionality + + $delegate[ngLogLevel] = function () { + originalFunction.apply(null, arguments); + + const origin = arguments[0] && arguments[0].stack ? '$ExceptionHandler' : '$log'; + let stackFramesPromise, message; + + if (origin === '$ExceptionHandler') { + message = arguments[0].message; + + // Parse the exception to get the stack + stackFramesPromise = StackTrace.fromError(arguments[0], { offline: true }); + } else { + if (arguments[0] && (arguments[0].status === -1 || arguments[0].status === 401)) { + return; // Drop browser network errors and unauthorized api errors due to expired tokens + } + + // Join $log arguments + message = + arguments[0] && + arguments[0].message + + '\n' + + _.map(arguments, function (arg) { + // Mask Auth header if present + _.update(arg, 'config.headers.Authorization', function (val) { + // eslint-disable-next-line no-undefined + return val ? '***' : undefined; + }); + return angular.toJson(arg, true); + }).join('\n'); + + // Log came from app so we get the stacktrace from this file + stackFramesPromise = StackTrace.get({ + offline: true, + }); } - function formatStacktraceForRollbar(stackFrames) { - return _.map(stackFrames, function (frame) { - return { - method: frame.functionName, - lineno: frame.lineNumber, - colno: frame.columnNumber, - filename: frame.fileName, - }; + stackFramesPromise + .then(function (stackFrames) { + // For logs, ignore first stack frame which is this file + if (origin === '$log') { + stackFrames.shift(); + } + + // Send combined message and stack trace to rollbar + Rollbar[rollbarLogLevel](message, { + stackTrace: stackFrames, + origin, }); - } + }) + .catch(function (error) { + // Send message without stack trace to rollbar + Rollbar[rollbarLogLevel](message, { + origin, + }); + + // Send warning about the issue loading stackframes + Rollbar.warning('Error loading stackframes: ' + error); + }); + }; + + // copy properties of original $log function which specs use + _.defaults($delegate[ngLogLevel], originalFunction); + }); + + return $delegate; + }); + + $provide.value('updateRollbarPerson', function (person) { + Rollbar.configure({ + payload: { + person: { + id: person.user.id, + person_id: person.id, + username: person.full_name, + email: person.user.username, + }, + }, + }); + }); + + function transformRollbarPayload(payload) { + if (_.get(payload, 'body.message.extra.stackTrace')) { + // Convert message format to trace format + payload.body.trace = { + frames: formatStacktraceForRollbar(payload.body.message.extra.stackTrace), + exception: { + message: payload.body.message.body, + class: payload.body.message.extra.origin, + }, + }; + delete payload.body.message; + } + return payload; + } + + function formatStacktraceForRollbar(stackFrames) { + return _.map(stackFrames, function (frame) { + return { + method: frame.functionName, + lineno: frame.lineNumber, + colno: frame.columnNumber, + filename: frame.fileName, + }; }); + } +}); diff --git a/app/assets/javascripts/angular/services/analyticsService.js b/app/assets/javascripts/angular/services/analyticsService.js index 70ed694be2..a849b31fa0 100644 --- a/app/assets/javascripts/angular/services/analyticsService.js +++ b/app/assets/javascripts/angular/services/analyticsService.js @@ -1,168 +1,147 @@ -angular - .module('campusContactsApp') - .factory('analyticsService', analyticsService); - -function analyticsService( - $window, - envService, - $location, - loggedInPerson, - authenticationService, -) { - const initGoogle = () => { - if (!angular.isFunction($window.ga)) return; - - $window.ga('create', envService.read('googleAnalytics'), 'auto', { - allowLinker: true, - sampleRate: 100, - }); - - $window.ga((tracker) => { - $window.ga('set', 'dimension2', tracker.get('clientId')); - }); - }; - - const setupGoogleData = (ssoUid) => { - if (!angular.isFunction($window.ga)) return; - - if (ssoUid) { - $window.ga('set', 'dimension3', ssoUid); - $window.ga('set', 'userId', ssoUid); - } - }; - - const initAdobeData = () => { - $window.digitalData = { - page: { - pageInfo: { - pageName: 'Campus Contacts', - }, - }, - }; - }; - - const setupAdobeData = (ssoUid, facebookId, grMasterPersonId) => { - $window.digitalData = { - page: { - pageInfo: { - pageName: 'Campus Contacts', - }, - }, - ...(ssoUid - ? { - user: [ - { - profile: [ - { - profileInfo: { - ssoGuid: ssoUid, - grMasterPersonId: grMasterPersonId, - }, - social: { - facebook: facebookId, - }, - }, - ], - }, - ], - } - : {}), - }; +angular.module('campusContactsApp').factory('analyticsService', analyticsService); + +function analyticsService($window, envService, $location, loggedInPerson, authenticationService) { + const initGoogle = () => { + if (!angular.isFunction($window.ga)) return; + + $window.ga('create', envService.read('googleAnalytics'), 'auto', { + allowLinker: true, + sampleRate: 100, + }); + + $window.ga((tracker) => { + $window.ga('set', 'dimension2', tracker.get('clientId')); + }); + }; + + const setupGoogleData = (ssoUid) => { + if (!angular.isFunction($window.ga)) return; + + if (ssoUid) { + $window.ga('set', 'dimension3', ssoUid); + $window.ga('set', 'userId', ssoUid); + } + }; + + const initAdobeData = () => { + $window.digitalData = { + page: { + pageInfo: { + pageName: 'Campus Contacts', + }, + }, }; + }; - const setupAuthenitcatedAnalyticData = () => { - return loggedInPerson - .loadOnce() - .then(({ thekey_uid, fb_uid, global_registry_mdm_id }) => { - setupGoogleData(thekey_uid); - setupAdobeData(thekey_uid, fb_uid, global_registry_mdm_id); - }); + const setupAdobeData = (ssoUid, facebookId, grMasterPersonId) => { + $window.digitalData = { + page: { + pageInfo: { + pageName: 'Campus Contacts', + }, + }, + ...(ssoUid + ? { + user: [ + { + profile: [ + { + profileInfo: { + ssoGuid: ssoUid, + grMasterPersonId, + }, + social: { + facebook: facebookId, + }, + }, + ], + }, + ], + } + : {}), }; + }; - const loadScript = (url, id) => { - return function (d) { - const ref = d.getElementsByTagName('script')[0]; - - if (d.getElementById(id)) { - return; - } + const setupAuthenitcatedAnalyticData = () => { + return loggedInPerson.loadOnce().then(({ thekey_uid, fb_uid, global_registry_mdm_id }) => { + setupGoogleData(thekey_uid); + setupAdobeData(thekey_uid, fb_uid, global_registry_mdm_id); + }); + }; - let js = d.createElement('script'); - js.id = id; - js.async = true; - js.src = url; + const loadScript = (url, id) => { + return function (d) { + const ref = d.getElementsByTagName('script')[0]; - ref.parentNode.insertBefore(js, ref); - }; - }; + if (d.getElementById(id)) { + return; + } - const loadAdobeScript = () => { - const url = - envService.is('production') || - envService.is('productionCampusContacts') - ? '//assets.adobedtm.com/launch-EN541f7d1d75de45f78e4e3881d6264bae.min.js' - : '//assets.adobedtm.com/launch-ENe4ca7f50fed34edd995d7c6294e6b509-development.min.js'; + const js = d.createElement('script'); + js.id = id; + js.async = true; + js.src = url; - return loadScript(url, 'adobe-analytics'); - }; - - const trackAdobe = () => - CustomEvent !== undefined && - $window.document - .querySelector('body') - .dispatchEvent(new CustomEvent('content: all pages')); - - return { - init: () => { - initAdobeData(); - initGoogle(); - loadAdobeScript()(document); - - if (authenticationService.isTokenValid()) { - setupAuthenitcatedAnalyticData(); - } - }, - setupAuthenitcatedAnalyticData: setupAuthenitcatedAnalyticData, - clearAuthenticatedData: () => { - initAdobeData(); - $window.ga('set', 'dimension3'); - $window.ga('set', 'userId'); - }, - track: (transition) => { - const newState = transition.$to(); - const currentUrl = newState.path.reduce((acc, p) => { - if (p.self.url === '^') return acc; - - const url = Object.entries(transition.params()).reduce( - (acc, [paramId, paramValue]) => { - return acc.replace(`:${paramId}`, paramValue); - }, - p.self.url, - ); - - return acc + url; - }, ''); - - const fields = { - page: currentUrl, - location: `https://${$location.host()}/${currentUrl}`, - title: newState.name, - }; - - if ( - authenticationService.isTokenValid() && - !$window.digitalData.user - ) { - setupAuthenitcatedAnalyticData().then(() => { - trackAdobe(); - angular.isFunction($window.ga) && - $window.ga('send', 'pageview', fields); - }); - } else { - trackAdobe(); - angular.isFunction($window.ga) && - $window.ga('send', 'pageview', fields); - } - }, + ref.parentNode.insertBefore(js, ref); }; + }; + + const loadAdobeScript = () => { + const url = + envService.is('production') || envService.is('productionCampusContacts') + ? '//assets.adobedtm.com/launch-EN541f7d1d75de45f78e4e3881d6264bae.min.js' + : '//assets.adobedtm.com/launch-ENe4ca7f50fed34edd995d7c6294e6b509-development.min.js'; + + return loadScript(url, 'adobe-analytics'); + }; + + const trackAdobe = () => + CustomEvent !== undefined && + $window.document.querySelector('body').dispatchEvent(new CustomEvent('content: all pages')); + + return { + init: () => { + initAdobeData(); + initGoogle(); + loadAdobeScript()(document); + + if (authenticationService.isTokenValid()) { + setupAuthenitcatedAnalyticData(); + } + }, + setupAuthenitcatedAnalyticData, + clearAuthenticatedData: () => { + initAdobeData(); + $window.ga('set', 'dimension3'); + $window.ga('set', 'userId'); + }, + track: (transition) => { + const newState = transition.$to(); + const currentUrl = newState.path.reduce((acc, p) => { + if (p.self.url === '^') return acc; + + const url = Object.entries(transition.params()).reduce((acc, [paramId, paramValue]) => { + return acc.replace(`:${paramId}`, paramValue); + }, p.self.url); + + return acc + url; + }, ''); + + const fields = { + page: currentUrl, + location: `https://${$location.host()}/${currentUrl}`, + title: newState.name, + }; + + if (authenticationService.isTokenValid() && !$window.digitalData.user) { + setupAuthenitcatedAnalyticData().then(() => { + trackAdobe(); + angular.isFunction($window.ga) && $window.ga('send', 'pageview', fields); + }); + } else { + trackAdobe(); + angular.isFunction($window.ga) && $window.ga('send', 'pageview', fields); + } + }, + }; } diff --git a/app/assets/javascripts/angular/services/asyncBindings.service.js b/app/assets/javascripts/angular/services/asyncBindings.service.js index 94a8a67e71..ad7de8aa45 100644 --- a/app/assets/javascripts/angular/services/asyncBindings.service.js +++ b/app/assets/javascripts/angular/services/asyncBindings.service.js @@ -1,57 +1,50 @@ -angular - .module('campusContactsApp') - .factory('asyncBindingsService', asyncBindingsService); +angular.module('campusContactsApp').factory('asyncBindingsService', asyncBindingsService); function asyncBindingsService($injector, $q, _) { - return { - // This function decorator takes a resolve function and returns a new resolve function that will not block - // the transition - lazyLoadedResolve: function (resolve) { - var dependencies = $injector.annotate(resolve); - return dependencies.concat([ - function () { - // Extract the resolve function if the resolve uses inline array annotation - var resolveFn = _.isArray(resolve) - ? _.last(resolve) - : resolve; + return { + // This function decorator takes a resolve function and returns a new resolve function that will not block + // the transition + lazyLoadedResolve: function (resolve) { + const dependencies = $injector.annotate(resolve); + return dependencies.concat([ + function () { + // Extract the resolve function if the resolve uses inline array annotation + const resolveFn = _.isArray(resolve) ? _.last(resolve) : resolve; - // Return the original resolve value wrapped in an object. Because this object is not promise, this - // the will not block the transition, even if the wrapped value is a promise. - return { wrapped: resolveFn.apply(null, arguments) }; - }, - ]); + // Return the original resolve value wrapped in an object. Because this object is not promise, this + // the will not block the transition, even if the wrapped value is a promise. + return { wrapped: resolveFn.apply(null, arguments) }; }, + ]); + }, - // This function decorator takes a controller activate function and returns a new activate function that - // waits for lazy loaded resolves before calling the original activate function - lazyLoadedActivate: function (activate, bindingNames) { - return function preactivate() { - var vm = this; + // This function decorator takes a controller activate function and returns a new activate function that + // waits for lazy loaded resolves before calling the original activate function + lazyLoadedActivate: function (activate, bindingNames) { + return function preactivate() { + const vm = this; - var resolvePromises = bindingNames.map(function (bindingName) { - // If the resolve was decorated by lazyLoadedResolve, then we need to unwrap the binding value - // to get the real value - var bindingValue = vm[bindingName]; - var unwrappedValue = - bindingValue && bindingValue.wrapped - ? bindingValue.wrapped - : bindingValue; + const resolvePromises = bindingNames.map(function (bindingName) { + // If the resolve was decorated by lazyLoadedResolve, then we need to unwrap the binding value + // to get the real value + const bindingValue = vm[bindingName]; + const unwrappedValue = bindingValue && bindingValue.wrapped ? bindingValue.wrapped : bindingValue; - // Wait for the binding value to resolve if it is a promise - return $q.when(unwrappedValue).then(function (value) { - // Replace the binding with the resolved value - vm[bindingName] = value; - }); - }); + // Wait for the binding value to resolve if it is a promise + return $q.when(unwrappedValue).then(function (value) { + // Replace the binding with the resolved value + vm[bindingName] = value; + }); + }); - // Wait for all lazy loaded bindings to resolve - $q.all(resolvePromises).then(function () { - vm.ready = true; + // Wait for all lazy loaded bindings to resolve + $q.all(resolvePromises).then(function () { + vm.ready = true; - // Now call the original activate - activate.call(vm); - }); - }; - }, - }; + // Now call the original activate + activate.call(vm); + }); + }; + }, + }; } diff --git a/app/assets/javascripts/angular/services/authentication.service.js b/app/assets/javascripts/angular/services/authentication.service.js index 24d44f1dc5..3b4224d52b 100644 --- a/app/assets/javascripts/angular/services/authentication.service.js +++ b/app/assets/javascripts/angular/services/authentication.service.js @@ -1,212 +1,201 @@ import i18next from 'i18next'; -angular - .module('campusContactsApp') - .factory('authenticationService', authenticationService); +angular.module('campusContactsApp').factory('authenticationService', authenticationService); function authenticationService( - envService, - $http, - $location, - $rootScope, - updateRollbarPerson, - $state, - state, - sessionStorageService, - localStorageService, - loggedInPerson, - errorService, - $window, - JsonApiDataStore, + envService, + $http, + $location, + $rootScope, + updateRollbarPerson, + $state, + state, + sessionStorageService, + localStorageService, + loggedInPerson, + errorService, + $window, + JsonApiDataStore, ) { - const oktaLogoutUrl = `${envService.read('oktaUrl')}/login/signout`; - - const getJwtToken = () => { - return localStorageService.get('jwtToken') || false; - }; - - const updateUserData = async () => { - const me = await loggedInPerson.load(); - - setState(me); - }; - - const setupUserSettings = async () => { - JsonApiDataStore.store.reset(); - const me = await loggedInPerson.load(); - setState(me); - i18next.changeLanguage(me.user.language); - updateRollbarPerson(me); - }; - - const setHttpHeaders = (token) => { - if (!token) return; - $http.defaults.headers.common.Authorization = 'Bearer ' + token; - }; - - const clearToken = () => { - state.v4AccessToken = null; - localStorageService.destroy('jwtToken'); - $http.defaults.headers.common.Authorization = null; - }; - - const storeJwtToken = (token) => { - if (!token) return; - - state.v4AccessToken = token; - localStorageService.set('jwtToken', token); - }; - - const setAuthorizationAndState = (token) => { - if (token) { - storeJwtToken(token); - setHttpHeaders(token); - setupUserSettings(); - } - }; - - const requestFacebookV4Token = (token) => - $http.post(`${envService.read('apiUrl')}/auth/facebook`, { - fb_access_token: token, - provider: 'facebook', - }); - - const requestOktaV4Token = (token) => - $http.post(`${envService.read('apiUrl')}/auth/okta`, { - okta_access_token: token, - provider: 'okta', - }); - - const authorizeFacebookAccess = async (accessToken) => { - try { - const { data } = await requestFacebookV4Token(accessToken); - setAuthorizationAndState(data.token); - postAuthRedirect(); - } catch (e) { - errorService.displayError(e, false); - } - }; - - const authorizeOktaAccess = async (accessToken) => { - try { - const { data } = await requestOktaV4Token(accessToken); - setAuthorizationAndState(data.token); - postAuthRedirect(); - } catch (e) { - errorService.displayError(e, false); - } - }; - - const loadState = () => { - const currentState = localStorageService.get('state'); - - if (!currentState) return; - - state.hasCampusContactsAccess = - currentState.hasCampusContactsAccess || - currentState.hasMissionhubAccess; // hasMissionhubAccess can be deleted during another deployment 2 days after this one when user JWTs have expired and a sign in will happen again - state.organization_with_missing_signatures_ids = - currentState.organization_with_missing_signatures_ids; - state.loggedIn = true; - - $rootScope.$broadcast('state:changed', state); - }; - - const setState = (person) => { - const newState = { - hasCampusContactsAccess: true, - organization_with_missing_signatures_ids: person - ? person.organization_with_missing_signatures_ids - : [], - }; - - localStorageService.set('state', newState); - - loadState(); - }; - - const clearState = () => { - localStorageService.destroy('state'); - state.hasCampusContactsAccess = null; - state.organization_with_missing_signatures_ids = null; - state.loggedIn = false; - JsonApiDataStore.store.reset(); - loggedInPerson.clearLoadingPromise(); - - $rootScope.$broadcast('state:changed', state); - }; - - const impersonateUser = async (userId) => { - try { - const { data } = await $http.get( - `${envService.read('apiUrl')}/impersonations/${userId}`, - ); - setAuthorizationAndState(data.token); - } catch (e) { - errorService.displayError(e, false); - } - }; - - const stopImpersonatingUser = async () => { - try { - const { data } = await $http.delete( - `${envService.read('apiUrl')}/impersonations`, - ); - setAuthorizationAndState(data.token); - } catch (e) { - errorService.displayError(e, false); - } - }; - - const adminRedirect = async () => { - const apiDomain = envService.read('apiUrl').replace('/apis/v4', ''); - try { - const { data } = await $http.post(`${apiDomain}/admin/auth`, null, { - withCredentials: true, // support cross domain cookie setting - }); - location.replace(`${apiDomain}/admin`); - } catch (e) { - $state.go('app.people'); - } - }; - - const postAuthRedirect = () => { - const { previousUri } = $location.search(); - if (previousUri) { - $location.url(previousUri); - $location.replace(); - } else { - $state.go('app.people'); - } - }; - - return { - destroyOktaAccess: () => { - clearToken(); - clearState(); - $window.location.href = oktaLogoutUrl; - }, - authorizeFacebookAccess: authorizeFacebookAccess, - authorizeOktaAccess: authorizeOktaAccess, - storeJwtToken: storeJwtToken, - removeAccess: () => { - clearToken(); - clearState(); - $state.go('app.signIn'); - }, - setupAuthenticationState: () => { - const token = getJwtToken(); - - if (!token) return; - - setHttpHeaders(token); - loadState(); - }, - impersonateUser, - stopImpersonatingUser, - adminRedirect, - postAuthRedirect, - isTokenValid: getJwtToken, - updateUserData, - }; + const oktaLogoutUrl = `${envService.read('oktaUrl')}/login/signout`; + + const getJwtToken = () => { + return localStorageService.get('jwtToken') || false; + }; + + const updateUserData = async () => { + const me = await loggedInPerson.load(); + + setState(me); + }; + + const setupUserSettings = async () => { + JsonApiDataStore.store.reset(); + const me = await loggedInPerson.load(); + setState(me); + i18next.changeLanguage(me.user.language); + updateRollbarPerson(me); + }; + + const setHttpHeaders = (token) => { + if (!token) return; + $http.defaults.headers.common.Authorization = 'Bearer ' + token; + }; + + const clearToken = () => { + state.v4AccessToken = null; + localStorageService.destroy('jwtToken'); + $http.defaults.headers.common.Authorization = null; + }; + + const storeJwtToken = (token) => { + if (!token) return; + + state.v4AccessToken = token; + localStorageService.set('jwtToken', token); + }; + + const setAuthorizationAndState = (token) => { + if (token) { + storeJwtToken(token); + setHttpHeaders(token); + setupUserSettings(); + } + }; + + const requestFacebookV4Token = (token) => + $http.post(`${envService.read('apiUrl')}/auth/facebook`, { + fb_access_token: token, + provider: 'facebook', + }); + + const requestOktaV4Token = (token) => + $http.post(`${envService.read('apiUrl')}/auth/okta`, { + okta_access_token: token, + provider: 'okta', + }); + + const authorizeFacebookAccess = async (accessToken) => { + try { + const { data } = await requestFacebookV4Token(accessToken); + setAuthorizationAndState(data.token); + postAuthRedirect(); + } catch (e) { + errorService.displayError(e, false); + } + }; + + const authorizeOktaAccess = async (accessToken) => { + try { + const { data } = await requestOktaV4Token(accessToken); + setAuthorizationAndState(data.token); + postAuthRedirect(); + } catch (e) { + errorService.displayError(e, false); + } + }; + + const loadState = () => { + const currentState = localStorageService.get('state'); + + if (!currentState) return; + + state.hasCampusContactsAccess = currentState.hasCampusContactsAccess || currentState.hasMissionhubAccess; // hasMissionhubAccess can be deleted during another deployment 2 days after this one when user JWTs have expired and a sign in will happen again + state.organization_with_missing_signatures_ids = currentState.organization_with_missing_signatures_ids; + state.loggedIn = true; + + $rootScope.$broadcast('state:changed', state); + }; + + const setState = (person) => { + const newState = { + hasCampusContactsAccess: true, + organization_with_missing_signatures_ids: person ? person.organization_with_missing_signatures_ids : [], + }; + + localStorageService.set('state', newState); + + loadState(); + }; + + const clearState = () => { + localStorageService.destroy('state'); + state.hasCampusContactsAccess = null; + state.organization_with_missing_signatures_ids = null; + state.loggedIn = false; + JsonApiDataStore.store.reset(); + loggedInPerson.clearLoadingPromise(); + + $rootScope.$broadcast('state:changed', state); + }; + + const impersonateUser = async (userId) => { + try { + const { data } = await $http.get(`${envService.read('apiUrl')}/impersonations/${userId}`); + setAuthorizationAndState(data.token); + } catch (e) { + errorService.displayError(e, false); + } + }; + + const stopImpersonatingUser = async () => { + try { + const { data } = await $http.delete(`${envService.read('apiUrl')}/impersonations`); + setAuthorizationAndState(data.token); + } catch (e) { + errorService.displayError(e, false); + } + }; + + const adminRedirect = async () => { + const apiDomain = envService.read('apiUrl').replace('/apis/v4', ''); + try { + const { data } = await $http.post(`${apiDomain}/admin/auth`, null, { + withCredentials: true, // support cross domain cookie setting + }); + location.replace(`${apiDomain}/admin`); + } catch (e) { + $state.go('app.people'); + } + }; + + const postAuthRedirect = () => { + const { previousUri } = $location.search(); + if (previousUri) { + $location.url(previousUri); + $location.replace(); + } else { + $state.go('app.people'); + } + }; + + return { + destroyOktaAccess: () => { + clearToken(); + clearState(); + $window.location.href = oktaLogoutUrl; + }, + authorizeFacebookAccess, + authorizeOktaAccess, + storeJwtToken, + removeAccess: () => { + clearToken(); + clearState(); + $state.go('app.signIn'); + }, + setupAuthenticationState: () => { + const token = getJwtToken(); + + if (!token) return; + + setHttpHeaders(token); + loadState(); + }, + impersonateUser, + stopImpersonatingUser, + adminRedirect, + postAuthRedirect, + isTokenValid: getJwtToken, + updateUserData, + }; } diff --git a/app/assets/javascripts/angular/services/confirmModal.service.js b/app/assets/javascripts/angular/services/confirmModal.service.js index 6085b3366f..b2e7f2b5b3 100644 --- a/app/assets/javascripts/angular/services/confirmModal.service.js +++ b/app/assets/javascripts/angular/services/confirmModal.service.js @@ -1,31 +1,29 @@ -angular - .module('campusContactsApp') - .factory('confirmModalService', confirmModalService); +angular.module('campusContactsApp').factory('confirmModalService', confirmModalService); function confirmModalService($uibModal) { - return { - create: function (message, options) { - // eslint-disable-next-line no-param-reassign - options = { - showCancel: true, - title: 'Confirm', - ...options, - }; - var modalInstance = $uibModal.open({ - animation: true, - controller: function ($uibModalInstance) { - var vm = this; - vm.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; - vm.confirm = function () { - $uibModalInstance.close('delete'); - }; - }, - controllerAs: 'vm', - windowClass: 'pivot_theme', - size: 'sm', - template: `
    + return { + create: function (message, options) { + // eslint-disable-next-line no-param-reassign + options = { + showCancel: true, + title: 'Confirm', + ...options, + }; + const modalInstance = $uibModal.open({ + animation: true, + controller: function ($uibModalInstance) { + const vm = this; + vm.cancel = function () { + $uibModalInstance.dismiss('cancel'); + }; + vm.confirm = function () { + $uibModalInstance.close('delete'); + }; + }, + controllerAs: 'vm', + windowClass: 'pivot_theme', + size: 'sm', + template: `
    `, - }); + }); - return modalInstance.result; - }, - }; + return modalInstance.result; + }, + }; } diff --git a/app/assets/javascripts/angular/services/error.service.spec.js b/app/assets/javascripts/angular/services/error.service.spec.js index a60f2608c9..a3150ffe80 100644 --- a/app/assets/javascripts/angular/services/error.service.spec.js +++ b/app/assets/javascripts/angular/services/error.service.spec.js @@ -1,144 +1,125 @@ import 'angular-mocks'; // Constants -var errorService, $q, $rootScope, _; +let errorService, $q, $rootScope, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('errorService', function () { - beforeEach(function () { - angular.mock.module(function ($provide) { - // Mock $timeout so that it always returns a resolved promise - $provide.factory('$timeout', function ($q) { - return function () { - return $q.resolve(); - }; - }); - }); + beforeEach(function () { + angular.mock.module(function ($provide) { + // Mock $timeout so that it always returns a resolved promise + $provide.factory('$timeout', function ($q) { + return function () { + return $q.resolve(); + }; + }); }); + }); - beforeEach(inject(function (_errorService_, _$q_, _$rootScope_, ___) { - errorService = _errorService_; - $q = _$q_; - $rootScope = _$rootScope_; - _ = ___; - })); + beforeEach(inject(function (_errorService_, _$q_, _$rootScope_, ___) { + errorService = _errorService_; + $q = _$q_; + $rootScope = _$rootScope_; + _ = ___; + })); - describe('autoRetry', function () { - it( - 'does nothing when the promise resolves', - asynchronous(function () { - var result = 123; - var getPromise = jasmine - .createSpy('getPromise') - .and.returnValue($q.resolve(result)); - var decorated = errorService.autoRetry(getPromise); - return decorated('arg1', 'arg2', 'arg3').then(function (value) { - expect(value).toBe(result); - expect(getPromise).toHaveBeenCalledTimes(1); - expect(getPromise).toHaveBeenCalledWith( - 'arg1', - 'arg2', - 'arg3', - ); - }); - }), - ); + describe('autoRetry', function () { + it( + 'does nothing when the promise resolves', + asynchronous(function () { + const result = 123; + const getPromise = jasmine.createSpy('getPromise').and.returnValue($q.resolve(result)); + const decorated = errorService.autoRetry(getPromise); + return decorated('arg1', 'arg2', 'arg3').then(function (value) { + expect(value).toBe(result); + expect(getPromise).toHaveBeenCalledTimes(1); + expect(getPromise).toHaveBeenCalledWith('arg1', 'arg2', 'arg3'); + }); + }), + ); - it( - 'retries and eventually resolves when the promise rejects once', - asynchronous(function () { - var result = 123; - var getPromise = jasmine - .createSpy('getPromise') - .and.returnValues($q.reject(), $q.resolve(result)); - var decorated = errorService.autoRetry(getPromise, { - retryCount: 3, - }); - return decorated().then(function (value) { - expect(value).toBe(result); - expect(getPromise).toHaveBeenCalledTimes(2); - }); - }), - ); + it( + 'retries and eventually resolves when the promise rejects once', + asynchronous(function () { + const result = 123; + const getPromise = jasmine.createSpy('getPromise').and.returnValues($q.reject(), $q.resolve(result)); + const decorated = errorService.autoRetry(getPromise, { + retryCount: 3, + }); + return decorated().then(function (value) { + expect(value).toBe(result); + expect(getPromise).toHaveBeenCalledTimes(2); + }); + }), + ); - it( - 'retries and eventually rejects when the promise always rejects', - asynchronous(function () { - var error = new Error(); - var getPromise = jasmine - .createSpy('getPromise') - .and.returnValue($q.reject(error)); - var decorated = errorService.autoRetry(getPromise, { - retryCount: 3, - }); - spyOn(errorService, 'displayError').and.callFake(function ( - err, - ) { - return $q.reject(err); - }); - return decorated().catch(function (value) { - expect(value).toBe(error); - expect(getPromise).toHaveBeenCalledTimes(4); - expect(errorService.displayError).toHaveBeenCalledWith( - error, - true, - ); - }); - }), - ); + it( + 'retries and eventually rejects when the promise always rejects', + asynchronous(function () { + const error = new Error(); + const getPromise = jasmine.createSpy('getPromise').and.returnValue($q.reject(error)); + const decorated = errorService.autoRetry(getPromise, { + retryCount: 3, + }); + spyOn(errorService, 'displayError').and.callFake(function (err) { + return $q.reject(err); + }); + return decorated().catch(function (value) { + expect(value).toBe(error); + expect(getPromise).toHaveBeenCalledTimes(4); + expect(errorService.displayError).toHaveBeenCalledWith(error, true); + }); + }), + ); - it( - 'does not retry errors that do not match the filter', - asynchronous(function () { - var error = new Error(); - var result = 123; - var getPromise = jasmine - .createSpy('getPromise') - .and.returnValues($q.reject(error), $q.resolve(result)); - var decorated = errorService.autoRetry(getPromise, { - retryCount: 3, - retryFilter: _.constant(false), - }); - return decorated().catch(function (err) { - expect(err).toBe(error); - expect(getPromise).toHaveBeenCalledTimes(1); - }); - }), - ); + it( + 'does not retry errors that do not match the filter', + asynchronous(function () { + const error = new Error(); + const result = 123; + const getPromise = jasmine.createSpy('getPromise').and.returnValues($q.reject(error), $q.resolve(result)); + const decorated = errorService.autoRetry(getPromise, { + retryCount: 3, + retryFilter: _.constant(false), + }); + return decorated().catch(function (err) { + expect(err).toBe(error); + expect(getPromise).toHaveBeenCalledTimes(1); + }); + }), + ); - it( - 'ignores errors that match the criteria', - asynchronous(function () { - var error = new Error(); - var getPromise = jasmine - .createSpy('getPromise') - .and.returnValue($q.reject(error)); - var decorated = errorService.autoRetry(getPromise, { - retryCount: 3, - ignoreFilter: _.constant(true), - }); - return decorated().catch(function (err) { - expect(err).toBe(error); - expect(getPromise).toHaveBeenCalledTimes(1); - }); - }), - ); - }); + it( + 'ignores errors that match the criteria', + asynchronous(function () { + const error = new Error(); + const getPromise = jasmine.createSpy('getPromise').and.returnValue($q.reject(error)); + const decorated = errorService.autoRetry(getPromise, { + retryCount: 3, + ignoreFilter: _.constant(true), + }); + return decorated().catch(function (err) { + expect(err).toBe(error); + expect(getPromise).toHaveBeenCalledTimes(1); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/services/error/error.service.js b/app/assets/javascripts/angular/services/error/error.service.js index af96cda291..67469f361d 100644 --- a/app/assets/javascripts/angular/services/error/error.service.js +++ b/app/assets/javascripts/angular/services/error/error.service.js @@ -3,127 +3,123 @@ import './errorRetryToastTemplate.directive'; angular.module('campusContactsApp').factory('errorService', errorService); function errorService($timeout, $q, $log, toaster, _) { - var errorService = { - displayError: displayError, - autoRetry: autoRetry, - - // Default retry configuration for network requests - networkRetryConfig: { - retryDelay: 1000, - - retryFilter: function (err) { - // Retry network errors and 500 errors - return err.status === -1 || err.status === 500; - }, + const errorService = { + displayError, + autoRetry, + + // Default retry configuration for network requests + networkRetryConfig: { + retryDelay: 1000, + + retryFilter: function (err) { + // Retry network errors and 500 errors + return err.status === -1 || err.status === 500; + }, + }, + }; + + // Display UI that informs the user about an error that occurred and allows them to retry the failed operation + // if it is retryable + // Return a promise that will resolve when the user chooses to retry the operation and reject with the + // original error if the user chooses not to retry + function displayError(err, retryable) { + return new $q(function (resolve, reject) { + if (!retryable) { + // We don't need to wait to find out whether the user will retry the operation + reject(err); + } + + // No popup for logged out needed + if (err.status === 401) { + resolve(); + return; + } + + toaster.pop({ + title: 'Error', + body: 'error-retry-toast-template', + bodyOutputType: 'directive', + directiveData: { + error: err, + retryable, }, + type: 'error', + + // Never automatically dismiss retryable prompts + timeout: retryable ? 0 : 10000, + + // Retry when the toast is clicked + clickHandler: function (toast, isCloseButton) { + if (!isCloseButton) { + resolve(); + } + + // Remove the toast + return true; + }, + + // Reject when the toast is closed + onHideCallback: function () { + reject(err); + }, + }); + }); + } + + // This function decorator wraps a function that returns a promise in a function that will retry errors + function autoRetry(getPromise, rawOptions) { + const options = _.defaults(rawOptions, { + // Retry once + retryCount: 1, + + // Retry immediately + retryDelay: 0, + + // Retry all errors + retryFilter: _.constant(true), + + // Ignore no errors + ignoreFilter: _.constant(false), + }); + + // Return the wrapper function that decorates the original getPromise function + return function wrapped() { + let retriesRemaining = options.retryCount; + + // This error handler determines whether an error should be retried and retries the failed operation if + // necessary + function possiblyRetryError(err) { + const ignore = options.ignoreFilter(err); + if (ignore) { + // Ignore the error; don't show an error message for it and don't retry it + throw err; + } + + // Stop retrying if we are out of retries or the filter says to not retry this error + const retryable = options.retryFilter(err); + if (retriesRemaining === 0 || !retryable) { + $log.error(err); + + // Wait for the user to manually initiate a retry, then try again + return errorService.displayError(err, retryable).then(attempt); + } + + // Wait out the delay, then try again + retriesRemaining--; + return $timeout(options.retryDelay).then(attempt); + } + + const originalContext = this; // eslint-disable-line consistent-this + const originalArgs = arguments; + + function attempt() { + // Take all of the arguments passed to the wrapper function and pass them to the original function + return getPromise.apply(originalContext, originalArgs).catch(possiblyRetryError); + } + + return attempt(); }; + } - // Display UI that informs the user about an error that occurred and allows them to retry the failed operation - // if it is retryable - // Return a promise that will resolve when the user chooses to retry the operation and reject with the - // original error if the user chooses not to retry - function displayError(err, retryable) { - return new $q(function (resolve, reject) { - if (!retryable) { - // We don't need to wait to find out whether the user will retry the operation - reject(err); - } - - //No popup for logged out needed - if (err.status === 401) { - resolve(); - return; - } - - toaster.pop({ - title: 'Error', - body: 'error-retry-toast-template', - bodyOutputType: 'directive', - directiveData: { - error: err, - retryable: retryable, - }, - type: 'error', - - // Never automatically dismiss retryable prompts - timeout: retryable ? 0 : 10000, - - // Retry when the toast is clicked - clickHandler: function (toast, isCloseButton) { - if (!isCloseButton) { - resolve(); - } - - // Remove the toast - return true; - }, - - // Reject when the toast is closed - onHideCallback: function () { - reject(err); - }, - }); - }); - } - - // This function decorator wraps a function that returns a promise in a function that will retry errors - function autoRetry(getPromise, rawOptions) { - var options = _.defaults(rawOptions, { - // Retry once - retryCount: 1, - - // Retry immediately - retryDelay: 0, - - // Retry all errors - retryFilter: _.constant(true), - - // Ignore no errors - ignoreFilter: _.constant(false), - }); - - // Return the wrapper function that decorates the original getPromise function - return function wrapped() { - var retriesRemaining = options.retryCount; - - // This error handler determines whether an error should be retried and retries the failed operation if - // necessary - function possiblyRetryError(err) { - var ignore = options.ignoreFilter(err); - if (ignore) { - // Ignore the error; don't show an error message for it and don't retry it - throw err; - } - - // Stop retrying if we are out of retries or the filter says to not retry this error - var retryable = options.retryFilter(err); - if (retriesRemaining === 0 || !retryable) { - $log.error(err); - - // Wait for the user to manually initiate a retry, then try again - return errorService - .displayError(err, retryable) - .then(attempt); - } - - // Wait out the delay, then try again - retriesRemaining--; - return $timeout(options.retryDelay).then(attempt); - } - - var originalContext = this; // eslint-disable-line consistent-this - var originalArgs = arguments; - - function attempt() { - // Take all of the arguments passed to the wrapper function and pass them to the original function - return getPromise - .apply(originalContext, originalArgs) - .catch(possiblyRetryError); - } - - return attempt(); - }; - } - - return errorService; + return errorService; } diff --git a/app/assets/javascripts/angular/services/error/errorRetryToastTemplate.directive.js b/app/assets/javascripts/angular/services/error/errorRetryToastTemplate.directive.js index 82ee8597d2..2e5b600452 100644 --- a/app/assets/javascripts/angular/services/error/errorRetryToastTemplate.directive.js +++ b/app/assets/javascripts/angular/services/error/errorRetryToastTemplate.directive.js @@ -1,9 +1,7 @@ import template from './errorRetryToastTemplate.html'; -angular - .module('campusContactsApp') - .directive('errorRetryToastTemplate', function () { - return { - template: template, - }; - }); +angular.module('campusContactsApp').directive('errorRetryToastTemplate', function () { + return { + template, + }; +}); diff --git a/app/assets/javascripts/angular/services/facebookService.js b/app/assets/javascripts/angular/services/facebookService.js index b62cac0fa9..620d72e5b2 100644 --- a/app/assets/javascripts/angular/services/facebookService.js +++ b/app/assets/javascripts/angular/services/facebookService.js @@ -1,51 +1,47 @@ angular.module('campusContactsApp').factory('facebookService', facebookService); function facebookService(authenticationService, envService) { - return { - init: () => { - FB.init({ - appId: envService.read('facebookAppId'), - status: true, - cookie: true, - xfbml: true, - version: 'v7.0', - }); - }, - loadSDK: () => { - return function (d) { - const id = 'facebook-jssdk'; - const fjs = d.getElementsByTagName('script')[0]; + return { + init: () => { + FB.init({ + appId: envService.read('facebookAppId'), + status: true, + cookie: true, + xfbml: true, + version: 'v7.0', + }); + }, + loadSDK: () => { + return function (d) { + const id = 'facebook-jssdk'; + const fjs = d.getElementsByTagName('script')[0]; - if (d.getElementById(id)) { - return; - } + if (d.getElementById(id)) { + return; + } - const js = d.createElement('script'); - js.id = id; - js.async = true; - js.src = 'https://connect.facebook.net/en_US/sdk.js'; + const js = d.createElement('script'); + js.id = id; + js.async = true; + js.src = 'https://connect.facebook.net/en_US/sdk.js'; - fjs.parentNode.insertBefore(js, fjs); - }; - }, - signOut: () => { - FB.logout((response) => {}); - }, - signIn: () => { - FB.login( - (response) => { - if (response.authResponse) { - authenticationService.authorizeFacebookAccess( - response.authResponse.accessToken, - ); - } else { - throw new Error( - 'User cancelled login or did not fully authorize.', - ); - } - }, - { scope: 'email' }, - ); + fjs.parentNode.insertBefore(js, fjs); + }; + }, + signOut: () => { + FB.logout((response) => {}); + }, + signIn: () => { + FB.login( + (response) => { + if (response.authResponse) { + authenticationService.authorizeFacebookAccess(response.authResponse.accessToken); + } else { + throw new Error('User cancelled login or did not fully authorize.'); + } }, - }; + { scope: 'email' }, + ); + }, + }; } diff --git a/app/assets/javascripts/angular/services/geoData.service.js b/app/assets/javascripts/angular/services/geoData.service.js index 5a90c423db..3cb6ff9d18 100644 --- a/app/assets/javascripts/angular/services/geoData.service.js +++ b/app/assets/javascripts/angular/services/geoData.service.js @@ -1,23 +1,23 @@ angular.module('campusContactsApp').factory('geoDataService', geoDataService); function geoDataService(_) { - return { - // Return a promise that resolves to the countries list - getCountries: function () { - return import( - // webpackChunkName: "country-region-data" - 'country-region-data' - ).then(function ({ default: countries }) { - // Manipulate the data schema - return countries.map(function (country) { - // Rename the country name and short code fields - return { - name: country.countryName, - shortCode: country.countryShortCode, - regions: _.sortBy(country.regions, 'name'), - }; - }); - }); - }, - }; + return { + // Return a promise that resolves to the countries list + getCountries: function () { + return import( + // webpackChunkName: "country-region-data" + 'country-region-data' + ).then(function ({ default: countries }) { + // Manipulate the data schema + return countries.map(function (country) { + // Rename the country name and short code fields + return { + name: country.countryName, + shortCode: country.countryShortCode, + regions: _.sortBy(country.regions, 'name'), + }; + }); + }); + }, + }; } diff --git a/app/assets/javascripts/angular/services/geoData.service.spec.js b/app/assets/javascripts/angular/services/geoData.service.spec.js index 501b17bf0f..1128a6907c 100644 --- a/app/assets/javascripts/angular/services/geoData.service.spec.js +++ b/app/assets/javascripts/angular/services/geoData.service.spec.js @@ -1,32 +1,32 @@ import 'angular-mocks'; // Constants -var geoDataService; +let geoDataService; describe('geoDataService', function () { - beforeEach(inject(function (_geoDataService_) { - geoDataService = _geoDataService_; - })); + beforeEach(inject(function (_geoDataService_) { + geoDataService = _geoDataService_; + })); - describe('getCountries', function () { - it('should return a list of countries', function () { - return geoDataService.getCountries().then(function (countries) { - expect(countries[234]).toEqual({ - name: 'United States', - shortCode: 'US', - regions: jasmine.any(Object), - }); - expect(countries[234].regions.slice(0, 2)).toEqual([ - { - name: 'Alabama', - shortCode: 'AL', - }, - { - name: 'Alaska', - shortCode: 'AK', - }, - ]); - }); + describe('getCountries', function () { + it('should return a list of countries', function () { + return geoDataService.getCountries().then(function (countries) { + expect(countries[234]).toEqual({ + name: 'United States', + shortCode: 'US', + regions: jasmine.any(Object), }); + expect(countries[234].regions.slice(0, 2)).toEqual([ + { + name: 'Alabama', + shortCode: 'AL', + }, + { + name: 'Alaska', + shortCode: 'AK', + }, + ]); + }); }); + }); }); diff --git a/app/assets/javascripts/angular/services/groups.service.js b/app/assets/javascripts/angular/services/groups.service.js index 77f1768196..74c9f57837 100644 --- a/app/assets/javascripts/angular/services/groups.service.js +++ b/app/assets/javascripts/angular/services/groups.service.js @@ -1,285 +1,245 @@ angular.module('campusContactsApp').factory('groupsService', groupsService); -function groupsService( - $q, - httpProxy, - JsonApiDataStore, - modelsService, - moment, - _, -) { - var groupsService = { - // Return a group with default field values - getGroupTemplate: function (orgId) { - var group = new JsonApiDataStore.Model('group'); - group.setAttribute('name', ''); - group.setAttribute('location', ''); - group.setAttribute('meets', 'weekly'); - group.setAttribute('meeting_day', 0); - group.setAttribute('start_time', 6 * 60 * 60 * 1000); - group.setAttribute('end_time', 7 * 60 * 60 * 1000); - group.setRelationship( - 'organization', - JsonApiDataStore.store.find('organization', orgId), - ); - group.setRelationship('group_memberships', []); - return group; - }, - - // Save a new group on the server - createGroup: function (group, leaders) { - // Include group_memberships so that we will have the group memberships for any newly-created leaders - var payload = payloadFromGroup(group, leaders); - return httpProxy - .post( - modelsService.getModelMetadata('group').url.all, - payload, - { - params: { include: 'group_memberships' }, - errorMessage: 'error.messages.groups.create_group', - }, - ) - .then(httpProxy.extractModel) - .then(function (group) { - var org = group.organization; - if (org && org.groups) { - org.groups.push(group); - } - return group; - }); - }, - - // Save an existing group on the server - updateGroup: function (group, leaders) { - // Include group_memberships so that we will have the group memberships for any newly-created leaders - var payload = payloadFromGroup(group, leaders); - return httpProxy - .put( - modelsService - .getModelMetadata('group') - .url.single(group.id), - payload, - { - params: { include: 'group_memberships' }, - errorMessage: 'error.messages.groups.update_group', - }, - ) - .then(httpProxy.extractModel); - }, - - // Save a group that may or may not yet exist - saveGroup: function (group, leaders) { - if (group.id) { - return groupsService.updateGroup(group, leaders); - } - return groupsService.createGroup(group, leaders); - }, - - // Delete a group on the server - deleteGroup: function (group) { - return httpProxy - .delete( - modelsService - .getModelMetadata('group') - .url.single(group.id), - {}, - { - errorMessage: 'error.messages.groups.delete_group', - }, - ) - .then(function () { - var org = group.organization; - if (org && org.groups) { - _.pull(org.groups, group); - } - return group; - }); - }, - - // Convert a time in milliseconds since midnight into a JavaScript Date object - timeToDate: function (time) { - return moment() - .startOf('day') - .milliseconds(time || 0) - .toDate(); - }, - - // Convert a JavaScript Date object into a time in milliseconds since midnight - dateToTime: function (date) { - return moment(date).diff(moment(date).startOf('day')); +function groupsService($q, httpProxy, JsonApiDataStore, modelsService, moment, _) { + var groupsService = { + // Return a group with default field values + getGroupTemplate: function (orgId) { + const group = new JsonApiDataStore.Model('group'); + group.setAttribute('name', ''); + group.setAttribute('location', ''); + group.setAttribute('meets', 'weekly'); + group.setAttribute('meeting_day', 0); + group.setAttribute('start_time', 6 * 60 * 60 * 1000); + group.setAttribute('end_time', 7 * 60 * 60 * 1000); + group.setRelationship('organization', JsonApiDataStore.store.find('organization', orgId)); + group.setRelationship('group_memberships', []); + return group; + }, + + // Save a new group on the server + createGroup: function (group, leaders) { + // Include group_memberships so that we will have the group memberships for any newly-created leaders + const payload = payloadFromGroup(group, leaders); + return httpProxy + .post(modelsService.getModelMetadata('group').url.all, payload, { + params: { include: 'group_memberships' }, + errorMessage: 'error.messages.groups.create_group', + }) + .then(httpProxy.extractModel) + .then(function (group) { + const org = group.organization; + if (org && org.groups) { + org.groups.push(group); + } + return group; + }); + }, + + // Save an existing group on the server + updateGroup: function (group, leaders) { + // Include group_memberships so that we will have the group memberships for any newly-created leaders + const payload = payloadFromGroup(group, leaders); + return httpProxy + .put(modelsService.getModelMetadata('group').url.single(group.id), payload, { + params: { include: 'group_memberships' }, + errorMessage: 'error.messages.groups.update_group', + }) + .then(httpProxy.extractModel); + }, + + // Save a group that may or may not yet exist + saveGroup: function (group, leaders) { + if (group.id) { + return groupsService.updateGroup(group, leaders); + } + return groupsService.createGroup(group, leaders); + }, + + // Delete a group on the server + deleteGroup: function (group) { + return httpProxy + .delete( + modelsService.getModelMetadata('group').url.single(group.id), + {}, + { + errorMessage: 'error.messages.groups.delete_group', + }, + ) + .then(function () { + const org = group.organization; + if (org && org.groups) { + _.pull(org.groups, group); + } + return group; + }); + }, + + // Convert a time in milliseconds since midnight into a JavaScript Date object + timeToDate: function (time) { + return moment() + .startOf('day') + .milliseconds(time || 0) + .toDate(); + }, + + // Convert a JavaScript Date object into a time in milliseconds since midnight + dateToTime: function (date) { + return moment(date).diff(moment(date).startOf('day')); + }, + + // Load the leaders of all of an organization's groups + loadLeaders: function (organization) { + return loadMemberships(organization).then(function () { + return loadMissingLeaders(organization); + }); + }, + + // Return as a list of people the members in a group + getAllMembers: function (group) { + return _.reduce( + group.group_memberships, + function (allMembers, groupMembership) { + // Skip all unloaded group_memberships. They seem to be loaded later + if (!groupMembership._placeHolder && groupMembership.person) { + // Map groupMembership to person + allMembers.push(groupMembership.person); + } + return allMembers; }, + [], + ); + }, + + // Return as a list of people the members in a group with a particular role + getMembersWithRole: function (group, role) { + return _.chain(group.group_memberships).filter({ role }).map('person').value(); + }, + + // Find the group membership for a particular person + findMember: function (group, person) { + return _.find(group.group_memberships, { person }) || null; + }, + + // Internal methods exposed for testing purposes + payloadFromGroup, + loadMemberships, + loadMissingLeaders, + }; + + // Return a JSON API model that represents the change in the role of a person in the group + function modelFromRoleChange(group, person, newRole) { + const groupMembership = _.find(group.group_memberships, { + person, + }); + groupMembership.role = newRole; + return groupMembership.serialize({ + attributes: ['role'], + relationships: [], + }).data; + } + + // Convert a group into it's JSON API payload + function payloadFromGroup(group, leaders) { + const previousLeaders = groupsService.getMembersWithRole(group, 'leader'); + const previousMembers = groupsService.getMembersWithRole(group, 'member'); + const previousAnyRole = groupsService.getAllMembers(group); + + // Determine which leaders were removed + const demotedLeaders = _.difference(previousLeaders, leaders); + + // Change the demoted members' role to "member" + const demoteModels = demotedLeaders.map(function (person) { + return modelFromRoleChange(group, person, 'member'); + }); + + // Determine which added leaders were previously members + const promotedMembers = _.intersection(leaders, previousMembers); + + // Change the promoted members' role to "leader" + const promoteModels = promotedMembers.map(function (person) { + return modelFromRoleChange(group, person, 'leader'); + }); + + // Determine which of the added leaders were not previously members + const createdLeaders = _.difference(leaders, previousAnyRole); + + // Create the new members + const createModels = createdLeaders.map(function (person) { + const groupMembership = new JsonApiDataStore.Model('group_membership'); + groupMembership.setAttribute('role', 'leader'); + groupMembership.setAttribute('group_id', group.id); + groupMembership.setAttribute('person_id', person.id); + return groupMembership.serialize().data; + }); + + // Apply the changes + const includedAttrs = ['name', 'location', 'meets', 'meeting_day', 'start_time', 'end_time']; + let relationships = []; + if (_.isUndefined(group.id)) { + relationships = ['organization']; + } + return { + data: group.serialize({ + attributes: includedAttrs, + relationships, + }).data, + included: [].concat(demoteModels, promoteModels, createModels), + }; + } + + // Load all of the group memberships for an organization + function loadMemberships(organization) { + // Don't load the groups if all of the organization's groups and memberships are loaded + const allModelsLoaded = organization.groups.every(function (group) { + return httpProxy.isLoaded(group) && group.group_memberships.every(httpProxy.isLoaded); + }); + if (allModelsLoaded) { + return $q.resolve(); + } - // Load the leaders of all of an organization's groups - loadLeaders: function (organization) { - return loadMemberships(organization).then(function () { - return loadMissingLeaders(organization); - }); + return httpProxy + .get( + modelsService.getModelMetadata('group').url.all, + { + include: 'group_memberships', + 'filters[organization_ids]': organization.id, }, - - // Return as a list of people the members in a group - getAllMembers: function (group) { - return _.reduce( - group.group_memberships, - function (allMembers, groupMembership) { - // Skip all unloaded group_memberships. They seem to be loaded later - if ( - !groupMembership._placeHolder && - groupMembership.person - ) { - // Map groupMembership to person - allMembers.push(groupMembership.person); - } - return allMembers; - }, - [], - ); + { + errorMessage: 'error.messages.groups.load_leaders', }, + ) + .then(httpProxy.extractModels); + } + + // Load all of the unloaded leaders in an organization + function loadMissingLeaders(organization) { + // Find the ids of all unloaded leaders across all of the groups + const missingLeaderIds = _.chain(organization.groups) + .flatMap('group_memberships') + .filter({ role: 'leader' }) + .filter(function (membership) { + return !httpProxy.isLoaded(membership.person); + }) + .map('person.id') + .value(); + if (missingLeaderIds.length === 0) { + return $q.resolve([]); + } - // Return as a list of people the members in a group with a particular role - getMembersWithRole: function (group, role) { - return _.chain(group.group_memberships) - .filter({ role: role }) - .map('person') - .value(); + return httpProxy + .get( + modelsService.getModelMetadata('person').url.all, + { + include: '', + 'filters[ids]': missingLeaderIds.join(','), + 'page[limit]': missingLeaderIds.length, }, - - // Find the group membership for a particular person - findMember: function (group, person) { - return _.find(group.group_memberships, { person: person }) || null; + { + errorMessage: 'error.messages.groups.load_leaders', }, + ) + .then(httpProxy.extractModels); + } - // Internal methods exposed for testing purposes - payloadFromGroup: payloadFromGroup, - loadMemberships: loadMemberships, - loadMissingLeaders: loadMissingLeaders, - }; - - // Return a JSON API model that represents the change in the role of a person in the group - function modelFromRoleChange(group, person, newRole) { - var groupMembership = _.find(group.group_memberships, { - person: person, - }); - groupMembership.role = newRole; - return groupMembership.serialize({ - attributes: ['role'], - relationships: [], - }).data; - } - - // Convert a group into it's JSON API payload - function payloadFromGroup(group, leaders) { - var previousLeaders = groupsService.getMembersWithRole(group, 'leader'); - var previousMembers = groupsService.getMembersWithRole(group, 'member'); - var previousAnyRole = groupsService.getAllMembers(group); - - // Determine which leaders were removed - var demotedLeaders = _.difference(previousLeaders, leaders); - - // Change the demoted members' role to "member" - var demoteModels = demotedLeaders.map(function (person) { - return modelFromRoleChange(group, person, 'member'); - }); - - // Determine which added leaders were previously members - var promotedMembers = _.intersection(leaders, previousMembers); - - // Change the promoted members' role to "leader" - var promoteModels = promotedMembers.map(function (person) { - return modelFromRoleChange(group, person, 'leader'); - }); - - // Determine which of the added leaders were not previously members - var createdLeaders = _.difference(leaders, previousAnyRole); - - // Create the new members - var createModels = createdLeaders.map(function (person) { - var groupMembership = new JsonApiDataStore.Model( - 'group_membership', - ); - groupMembership.setAttribute('role', 'leader'); - groupMembership.setAttribute('group_id', group.id); - groupMembership.setAttribute('person_id', person.id); - return groupMembership.serialize().data; - }); - - // Apply the changes - var includedAttrs = [ - 'name', - 'location', - 'meets', - 'meeting_day', - 'start_time', - 'end_time', - ]; - var relationships = []; - if (_.isUndefined(group.id)) { - relationships = ['organization']; - } - return { - data: group.serialize({ - attributes: includedAttrs, - relationships: relationships, - }).data, - included: [].concat(demoteModels, promoteModels, createModels), - }; - } - - // Load all of the group memberships for an organization - function loadMemberships(organization) { - // Don't load the groups if all of the organization's groups and memberships are loaded - var allModelsLoaded = organization.groups.every(function (group) { - return ( - httpProxy.isLoaded(group) && - group.group_memberships.every(httpProxy.isLoaded) - ); - }); - if (allModelsLoaded) { - return $q.resolve(); - } - - return httpProxy - .get( - modelsService.getModelMetadata('group').url.all, - { - include: 'group_memberships', - 'filters[organization_ids]': organization.id, - }, - { - errorMessage: 'error.messages.groups.load_leaders', - }, - ) - .then(httpProxy.extractModels); - } - - // Load all of the unloaded leaders in an organization - function loadMissingLeaders(organization) { - // Find the ids of all unloaded leaders across all of the groups - var missingLeaderIds = _.chain(organization.groups) - .flatMap('group_memberships') - .filter({ role: 'leader' }) - .filter(function (membership) { - return !httpProxy.isLoaded(membership.person); - }) - .map('person.id') - .value(); - if (missingLeaderIds.length === 0) { - return $q.resolve([]); - } - - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - { - include: '', - 'filters[ids]': missingLeaderIds.join(','), - 'page[limit]': missingLeaderIds.length, - }, - { - errorMessage: 'error.messages.groups.load_leaders', - }, - ) - .then(httpProxy.extractModels); - } - - return groupsService; + return groupsService; } diff --git a/app/assets/javascripts/angular/services/groups.service.spec.js b/app/assets/javascripts/angular/services/groups.service.spec.js index b52c1b9209..66484344bb 100644 --- a/app/assets/javascripts/angular/services/groups.service.spec.js +++ b/app/assets/javascripts/angular/services/groups.service.spec.js @@ -1,422 +1,366 @@ import 'angular-mocks'; // Constants -var groupsService, $q, $rootScope, httpProxy, JsonApiDataStore, _; +let groupsService, $q, $rootScope, httpProxy, JsonApiDataStore, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('groupsService', function () { - beforeEach(inject(function ( - _groupsService_, - _$q_, - _$rootScope_, - _httpProxy_, - _JsonApiDataStore_, - ___, - ) { - var _this = this; - - groupsService = _groupsService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - JsonApiDataStore = _JsonApiDataStore_; - _ = ___; - - function generateMembership(attributes) { - var membership = new JsonApiDataStore.Model( - 'group_membership', - attributes.id, - ); - membership.setRelationship( - 'person', - new JsonApiDataStore.Model('person', attributes.person_id), - ); - membership.setAttribute('role', attributes.role); - return membership; - } - - this.organization = new JsonApiDataStore.Model('organization', 1); - this.organization.setRelationship('groups', []); - - this.group = new JsonApiDataStore.Model('group'); - this.group.setAttribute('name', 'Test group'); - this.group.setAttribute('location', 'Somwhere great'); - this.group.setAttribute('meets', 'weekly'); - this.group.setAttribute('meeting_day', 'Thursday'); - this.group.setAttribute('start_time', 64800); - this.group.setAttribute('end_time', 69300); - this.group.setRelationship('organization', this.organization); - this.group.setRelationship('group_memberships', [ - generateMembership({ id: 11, person_id: 21, role: 'leader' }), - generateMembership({ id: 12, person_id: 22, role: 'member' }), - generateMembership({ id: 13, person_id: 23, role: 'leader' }), - ]); - - // Can be changed in individual tests - this.httpResponse = $q.resolve({ - data: this.group, - }); - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return _this.httpResponse; - }); - })); - - describe('createGroup', function () { - it('should make a network request', function () { - groupsService.createGroup(this.group); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); - - it( - 'should return a promise that resolves to the new group', - asynchronous(function () { - var _this = this; - return groupsService - .createGroup(this.group) - .then(function (group) { - expect(group).toBe(_this.group); - }); - }), - ); - - it( - 'should add the group to the organization', - asynchronous(function () { - var _this = this; - this.organization.groups = []; - return groupsService - .createGroup(this.group) - .then(function (group) { - expect(_this.organization.groups).toEqual([group]); - }); - }), - ); + beforeEach(inject(function (_groupsService_, _$q_, _$rootScope_, _httpProxy_, _JsonApiDataStore_, ___) { + const _this = this; + + groupsService = _groupsService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + JsonApiDataStore = _JsonApiDataStore_; + _ = ___; + + function generateMembership(attributes) { + const membership = new JsonApiDataStore.Model('group_membership', attributes.id); + membership.setRelationship('person', new JsonApiDataStore.Model('person', attributes.person_id)); + membership.setAttribute('role', attributes.role); + return membership; + } + + this.organization = new JsonApiDataStore.Model('organization', 1); + this.organization.setRelationship('groups', []); + + this.group = new JsonApiDataStore.Model('group'); + this.group.setAttribute('name', 'Test group'); + this.group.setAttribute('location', 'Somwhere great'); + this.group.setAttribute('meets', 'weekly'); + this.group.setAttribute('meeting_day', 'Thursday'); + this.group.setAttribute('start_time', 64800); + this.group.setAttribute('end_time', 69300); + this.group.setRelationship('organization', this.organization); + this.group.setRelationship('group_memberships', [ + generateMembership({ id: 11, person_id: 21, role: 'leader' }), + generateMembership({ id: 12, person_id: 22, role: 'member' }), + generateMembership({ id: 13, person_id: 23, role: 'leader' }), + ]); + + // Can be changed in individual tests + this.httpResponse = $q.resolve({ + data: this.group, }); - - describe('deleteGroup', function () { - it( - 'should remove the group from the organization', - asynchronous(function () { - var _this = this; - this.organization.groups = [this.group]; - return groupsService.deleteGroup(this.group).then(function () { - expect(_this.organization.groups).toEqual([]); - }); - }), - ); + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return _this.httpResponse; }); + })); - describe('timeToDate', function () { - it('should convert milliseconds since midnight into a date object', function () { - // 12:34:56.789 - var date = groupsService.timeToDate( - 12 * 60 * 60 * 1000 + 34 * 60 * 1000 + 56 * 1000 + 789, - ); - - expect(date.getMilliseconds()).toBe(789); - expect(date.getSeconds()).toBe(56); - expect(date.getMinutes()).toBe(34); - expect(date.getHours()).toBe(12); - }); + describe('createGroup', function () { + it('should make a network request', function () { + groupsService.createGroup(this.group); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); - describe('dateToTime', function () { - it('should convert a date object into milliseconds since midnight', function () { - var date = new Date(); - date.setMilliseconds(789); - date.setSeconds(56); - date.setMinutes(34); - date.setHours(12); - - // 12:34:56.789 - expect(groupsService.dateToTime(date)).toBe( - 12 * 60 * 60 * 1000 + 34 * 60 * 1000 + 56 * 1000 + 789, - ); + it( + 'should return a promise that resolves to the new group', + asynchronous(function () { + const _this = this; + return groupsService.createGroup(this.group).then(function (group) { + expect(group).toBe(_this.group); }); - }); - - describe('getAllMembers', function () { - it('should return all the members of a group', function () { - expect( - _.map(groupsService.getAllMembers(this.group), 'id'), - ).toEqual([21, 22, 23]); + }), + ); + + it( + 'should add the group to the organization', + asynchronous(function () { + const _this = this; + this.organization.groups = []; + return groupsService.createGroup(this.group).then(function (group) { + expect(_this.organization.groups).toEqual([group]); }); - it('should ignore unloaded group_memberships', function () { - this.group.group_memberships[0]._placeHolder = true; - expect( - _.map(groupsService.getAllMembers(this.group), 'id'), - ).toEqual([22, 23]); + }), + ); + }); + + describe('deleteGroup', function () { + it( + 'should remove the group from the organization', + asynchronous(function () { + const _this = this; + this.organization.groups = [this.group]; + return groupsService.deleteGroup(this.group).then(function () { + expect(_this.organization.groups).toEqual([]); }); + }), + ); + }); + + describe('timeToDate', function () { + it('should convert milliseconds since midnight into a date object', function () { + // 12:34:56.789 + const date = groupsService.timeToDate(12 * 60 * 60 * 1000 + 34 * 60 * 1000 + 56 * 1000 + 789); + + expect(date.getMilliseconds()).toBe(789); + expect(date.getSeconds()).toBe(56); + expect(date.getMinutes()).toBe(34); + expect(date.getHours()).toBe(12); }); - - describe('getMembersWithRole', function () { - it('should return all the members of a group with the specified role', function () { - expect( - _.map( - groupsService.getMembersWithRole(this.group, 'leader'), - 'id', - ), - ).toEqual([21, 23]); - }); + }); + + describe('dateToTime', function () { + it('should convert a date object into milliseconds since midnight', function () { + const date = new Date(); + date.setMilliseconds(789); + date.setSeconds(56); + date.setMinutes(34); + date.setHours(12); + + // 12:34:56.789 + expect(groupsService.dateToTime(date)).toBe(12 * 60 * 60 * 1000 + 34 * 60 * 1000 + 56 * 1000 + 789); }); + }); - describe('findMember', function () { - it('should return the membership for the person', function () { - var membership = this.group.group_memberships[0]; - expect( - groupsService.findMember(this.group, membership.person), - ).toBe(membership); - }); + describe('getAllMembers', function () { + it('should return all the members of a group', function () { + expect(_.map(groupsService.getAllMembers(this.group), 'id')).toEqual([21, 22, 23]); + }); + it('should ignore unloaded group_memberships', function () { + this.group.group_memberships[0]._placeHolder = true; + expect(_.map(groupsService.getAllMembers(this.group), 'id')).toEqual([22, 23]); + }); + }); - it('should return null if the person is not a member', function () { - expect( - groupsService.findMember( - this.group, - new JsonApiDataStore.Model('person', 123), - ), - ).toBe(null); - }); + describe('getMembersWithRole', function () { + it('should return all the members of a group with the specified role', function () { + expect(_.map(groupsService.getMembersWithRole(this.group, 'leader'), 'id')).toEqual([21, 23]); }); + }); - describe('payloadFromGroup', function () { - it('should generate a JSON API payload', function () { - this.people = [ - new JsonApiDataStore.Model('person', 11), - new JsonApiDataStore.Model('person', 12), - new JsonApiDataStore.Model('person', 13), - ]; - - var groupMembership1 = new JsonApiDataStore.Model( - 'group_membership', - 1, - ); - groupMembership1.setAttribute('role', 'leader'); - groupMembership1.setRelationship('person', this.people[0]); - - var groupMembership2 = new JsonApiDataStore.Model( - 'group_membership', - 2, - ); - groupMembership2.setAttribute('role', 'member'); - groupMembership2.setRelationship('person', this.people[1]); - - this.group = new JsonApiDataStore.Model('group', 3); - this.group.setAttribute('name', 'Group'); - this.group.setAttribute('location', 'Place'); - this.group.setAttribute('meets', 'monthly'); - this.group.setAttribute('meeting_day', 1); - this.group.setAttribute('start_time', 0); - this.group.setAttribute('end_time', 1); - this.group.setAttribute('extra_key', 'extra_value'); // attribute that should not be serialized - this.group.setRelationship('group_memberships', [ - groupMembership1, - groupMembership2, - ]); - this.group.setRelationship('organization', this.organization); - - var newLeaders = [this.people[1], this.people[2]]; - expect( - groupsService.payloadFromGroup(this.group, newLeaders), - ).toEqual({ - data: { - type: 'group', - id: 3, - attributes: { - name: 'Group', - location: 'Place', - meets: 'monthly', - meeting_day: 1, - start_time: 0, - end_time: 1, - }, - }, - included: [ - // demoted - { - type: 'group_membership', - id: 1, - attributes: { role: 'member' }, - }, - - // promoted - { - type: 'group_membership', - id: 2, - attributes: { role: 'leader' }, - }, - - // created - { - type: 'group_membership', - attributes: { - group_id: 3, - person_id: 13, - role: 'leader', - }, - }, - ], - }); - }); + describe('findMember', function () { + it('should return the membership for the person', function () { + const membership = this.group.group_memberships[0]; + expect(groupsService.findMember(this.group, membership.person)).toBe(membership); + }); - it('should include organization id if it is a new group', function () { - this.people = []; - - this.group = new JsonApiDataStore.Model('group'); - this.group.setAttribute('name', 'Group'); - this.group.setAttribute('location', 'Place'); - this.group.setAttribute('meets', 'monthly'); - this.group.setAttribute('meeting_day', 1); - this.group.setAttribute('start_time', 0); - this.group.setAttribute('end_time', 1); - this.group.setRelationship('organization', this.organization); - - var newLeaders = []; - expect( - groupsService.payloadFromGroup(this.group, newLeaders), - ).toEqual({ - data: { - type: 'group', - attributes: { - name: 'Group', - location: 'Place', - meets: 'monthly', - meeting_day: 1, - start_time: 0, - end_time: 1, - }, - relationships: { - organization: { - data: { - id: 1, - type: 'organization', - }, - }, - }, - }, - included: [], - }); - }); + it('should return null if the person is not a member', function () { + expect(groupsService.findMember(this.group, new JsonApiDataStore.Model('person', 123))).toBe(null); + }); + }); + + describe('payloadFromGroup', function () { + it('should generate a JSON API payload', function () { + this.people = [ + new JsonApiDataStore.Model('person', 11), + new JsonApiDataStore.Model('person', 12), + new JsonApiDataStore.Model('person', 13), + ]; + + const groupMembership1 = new JsonApiDataStore.Model('group_membership', 1); + groupMembership1.setAttribute('role', 'leader'); + groupMembership1.setRelationship('person', this.people[0]); + + const groupMembership2 = new JsonApiDataStore.Model('group_membership', 2); + groupMembership2.setAttribute('role', 'member'); + groupMembership2.setRelationship('person', this.people[1]); + + this.group = new JsonApiDataStore.Model('group', 3); + this.group.setAttribute('name', 'Group'); + this.group.setAttribute('location', 'Place'); + this.group.setAttribute('meets', 'monthly'); + this.group.setAttribute('meeting_day', 1); + this.group.setAttribute('start_time', 0); + this.group.setAttribute('end_time', 1); + this.group.setAttribute('extra_key', 'extra_value'); // attribute that should not be serialized + this.group.setRelationship('group_memberships', [groupMembership1, groupMembership2]); + this.group.setRelationship('organization', this.organization); + + const newLeaders = [this.people[1], this.people[2]]; + expect(groupsService.payloadFromGroup(this.group, newLeaders)).toEqual({ + data: { + type: 'group', + id: 3, + attributes: { + name: 'Group', + location: 'Place', + meets: 'monthly', + meeting_day: 1, + start_time: 0, + end_time: 1, + }, + }, + included: [ + // demoted + { + type: 'group_membership', + id: 1, + attributes: { role: 'member' }, + }, + + // promoted + { + type: 'group_membership', + id: 2, + attributes: { role: 'leader' }, + }, + + // created + { + type: 'group_membership', + attributes: { + group_id: 3, + person_id: 13, + role: 'leader', + }, + }, + ], + }); }); - describe('loadMemberships', function () { - beforeEach(function () { - this.loaded = {}; - this.unloaded = { _placeHolder: true }; - }); + it('should include organization id if it is a new group', function () { + this.people = []; + + this.group = new JsonApiDataStore.Model('group'); + this.group.setAttribute('name', 'Group'); + this.group.setAttribute('location', 'Place'); + this.group.setAttribute('meets', 'monthly'); + this.group.setAttribute('meeting_day', 1); + this.group.setAttribute('start_time', 0); + this.group.setAttribute('end_time', 1); + this.group.setRelationship('organization', this.organization); + + const newLeaders = []; + expect(groupsService.payloadFromGroup(this.group, newLeaders)).toEqual({ + data: { + type: 'group', + attributes: { + name: 'Group', + location: 'Place', + meets: 'monthly', + meeting_day: 1, + start_time: 0, + end_time: 1, + }, + relationships: { + organization: { + data: { + id: 1, + type: 'organization', + }, + }, + }, + }, + included: [], + }); + }); + }); - it('should load the groups and memberships of an organization when a group is unloaded', function () { - groupsService.loadMemberships({ - groups: [{ group_memberships: [this.loaded] }, this.unloaded], - }); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); + describe('loadMemberships', function () { + beforeEach(function () { + this.loaded = {}; + this.unloaded = { _placeHolder: true }; + }); - it('should load the groups and memberships of an organization when a membership is unloaded', function () { - groupsService.loadMemberships({ - groups: [ - { group_memberships: [this.loaded] }, - { group_memberships: [this.loaded, this.unloaded] }, - ], - }); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); + it('should load the groups and memberships of an organization when a group is unloaded', function () { + groupsService.loadMemberships({ + groups: [{ group_memberships: [this.loaded] }, this.unloaded], + }); + expect(httpProxy.callHttp).toHaveBeenCalled(); + }); - it('should do nothing when all groups and memberships are loaded', function () { - groupsService.loadMemberships({ - groups: [ - { group_memberships: [this.loaded, this.loaded] }, - { group_memberships: [this.loaded, this.loaded] }, - ], - }); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should load the groups and memberships of an organization when a membership is unloaded', function () { + groupsService.loadMemberships({ + groups: [{ group_memberships: [this.loaded] }, { group_memberships: [this.loaded, this.unloaded] }], + }); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); - describe('loadMissingLeaders', function () { - it('should load all missing leaders across all groups', function () { - groupsService.loadMissingLeaders({ - groups: [ - { - group_memberships: [ - { - role: 'member', - person: { id: 1, _placeHolder: true }, - }, - { role: 'leader', person: { id: 2 } }, - { - role: 'leader', - person: { id: 3, _placeHolder: true }, - }, - ], - }, - { - group_memberships: [ - { - role: 'leader', - person: { id: 4, _placeHolder: true }, - }, - { role: 'member', person: { id: 5 } }, - ], - }, - ], - }); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { - include: '', - 'filters[ids]': '3,4', - 'page[limit]': 2, - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + it('should do nothing when all groups and memberships are loaded', function () { + groupsService.loadMemberships({ + groups: [{ group_memberships: [this.loaded, this.loaded] }, { group_memberships: [this.loaded, this.loaded] }], + }); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); + }); + + describe('loadMissingLeaders', function () { + it('should load all missing leaders across all groups', function () { + groupsService.loadMissingLeaders({ + groups: [ + { + group_memberships: [ + { + role: 'member', + person: { id: 1, _placeHolder: true }, + }, + { role: 'leader', person: { id: 2 } }, + { + role: 'leader', + person: { id: 3, _placeHolder: true }, + }, + ], + }, + { + group_memberships: [ + { + role: 'leader', + person: { id: 4, _placeHolder: true }, + }, + { role: 'member', person: { id: 5 } }, + ], + }, + ], + }); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { + include: '', + 'filters[ids]': '3,4', + 'page[limit]': 2, + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('should do nothing when there are no unloaded leaders', function () { - groupsService.loadMissingLeaders({ - groups: [ - { - group_memberships: [ - { - role: 'member', - person: { id: 1, _placeHolder: true }, - }, - { role: 'leader', person: { id: 2 } }, - { role: 'leader', person: { id: 3 } }, - ], - }, - { - group_memberships: [ - { role: 'leader', person: { id: 4 } }, - { - role: 'member', - person: { id: 5, _placeHolder: true }, - }, - ], - }, - ], - }); - - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should do nothing when there are no unloaded leaders', function () { + groupsService.loadMissingLeaders({ + groups: [ + { + group_memberships: [ + { + role: 'member', + person: { id: 1, _placeHolder: true }, + }, + { role: 'leader', person: { id: 2 } }, + { role: 'leader', person: { id: 3 } }, + ], + }, + { + group_memberships: [ + { role: 'leader', person: { id: 4 } }, + { + role: 'member', + person: { id: 5, _placeHolder: true }, + }, + ], + }, + ], + }); + + expect(httpProxy.callHttp).not.toHaveBeenCalled(); }); + }); }); diff --git a/app/assets/javascripts/angular/services/httpProxy.service.js b/app/assets/javascripts/angular/services/httpProxy.service.js index d01995c6e9..3a7736640b 100644 --- a/app/assets/javascripts/angular/services/httpProxy.service.js +++ b/app/assets/javascripts/angular/services/httpProxy.service.js @@ -2,269 +2,211 @@ import { JsonApiDataStore as JsonApiDataStoreIsolated } from 'jsonapi-datastore' angular.module('campusContactsApp').factory('httpProxy', proxyService); function proxyService( - $http, - $log, - $q, - envService, - JsonApiDataStore, - modelsService, - Upload, - tFilter, - errorService, - _, - $injector, - sessionStorageService, - $window, + $http, + $log, + $q, + envService, + JsonApiDataStore, + modelsService, + Upload, + tFilter, + errorService, + _, + $injector, + sessionStorageService, + $window, ) { - // Extract and return the data portion of a JSON API payload - function extractData(response) { - return response.data; - } - - // Send a network request using a generic provider that uses the same API as $http. - // This was added because Uploader.upload provides functionality on top of $http, but we - // want to be able to reuse the authorization token, JSON API store syncing, and - // other logic that was originally in callHttp. - function networkRequest(provider, method, url, params, data, extraConfig) { - function makeRequest(dedupeConfig) { - const EXPIRED_ACCESS_TOKEN = 'Expired access token'; - const INVALID_ACCESS_TOKEN = 'Invalid access token'; - const INVALID_GRANT = 'invalid_grant'; - const MISSING_TOKEN = 'Missing access token'; - - var config = { - method: method, - url: envService.read('apiUrl') + url, - data: data, - - // Default value - errorMessage: 'error.messages.http_proxy.default_network_error', - - ...extraConfig, - params: { ...params, ...extraConfig?.params }, - ...dedupeConfig, - }; - - if (!extraConfig || !extraConfig.errorMessage) { - $log.warn(new Error('No error message specified')); + // Extract and return the data portion of a JSON API payload + function extractData(response) { + return response.data; + } + + // Send a network request using a generic provider that uses the same API as $http. + // This was added because Uploader.upload provides functionality on top of $http, but we + // want to be able to reuse the authorization token, JSON API store syncing, and + // other logic that was originally in callHttp. + function networkRequest(provider, method, url, params, data, extraConfig) { + function makeRequest(dedupeConfig) { + const EXPIRED_ACCESS_TOKEN = 'Expired access token'; + const INVALID_ACCESS_TOKEN = 'Invalid access token'; + const INVALID_GRANT = 'invalid_grant'; + const MISSING_TOKEN = 'Missing access token'; + + const config = { + method, + url: envService.read('apiUrl') + url, + data, + + // Default value + errorMessage: 'error.messages.http_proxy.default_network_error', + + ...extraConfig, + params: { ...params, ...extraConfig?.params }, + ...dedupeConfig, + }; + + if (!extraConfig || !extraConfig.errorMessage) { + $log.warn(new Error('No error message specified')); + } + + // Angular throws a circular dependency. Happens since the authenticationService also calls on another service that httpProxyService calls. So only way around is the injector. + const authenticationService = $injector.get('authenticationService'); + + return provider(config) + .then((res) => { + // store rolling access token + const token = res.headers('x-mh-session'); + + if (token) { + $http.defaults.headers.common.Authorization = 'Bearer ' + token; + + authenticationService.storeJwtToken(token); + } + + if (extraConfig && extraConfig.bypassStore) { + return new JsonApiDataStoreIsolated().syncWithMeta(res.data); + } + + return JsonApiDataStore.store.syncWithMeta(res.data); + }) + .catch((err) => { + const { data } = err || {}; + + if (data && data.errors && data.errors[0] && data.errors[0].detail) { + const errorDetail = data.errors[0].detail; + + if ( + EXPIRED_ACCESS_TOKEN === errorDetail || + INVALID_ACCESS_TOKEN === errorDetail || + MISSING_TOKEN === errorDetail || + INVALID_GRANT === errorDetail + ) { + authenticationService.removeAccess(); } + } - //Angular throws a circular dependency. Happens since the authenticationService also calls on another service that httpProxyService calls. So only way around is the injector. - const authenticationService = $injector.get( - 'authenticationService', - ); - - return provider(config) - .then((res) => { - // store rolling access token - const token = res.headers('x-mh-session'); - - if (token) { - $http.defaults.headers.common.Authorization = - 'Bearer ' + token; - - authenticationService.storeJwtToken(token); - } - - if (extraConfig && extraConfig.bypassStore) { - return new JsonApiDataStoreIsolated().syncWithMeta( - res.data, - ); - } - - return JsonApiDataStore.store.syncWithMeta(res.data); - }) - .catch((err) => { - const { data } = err || {}; - - if ( - data && - data.errors && - data.errors[0] && - data.errors[0].detail - ) { - const errorDetail = data.errors[0].detail; - - if ( - EXPIRED_ACCESS_TOKEN === errorDetail || - INVALID_ACCESS_TOKEN === errorDetail || - MISSING_TOKEN === errorDetail || - INVALID_GRANT === errorDetail - ) { - authenticationService.removeAccess(); - } - } - - err.message = - (config.showApiMessage && data?.errors?.[0]?.detail) || - tFilter(config.errorMessage); - throw err; - }); - } - - if (extraConfig && extraConfig.deduper) { - return extraConfig.deduper.request(makeRequest); - } - return makeRequest({}); + err.message = (config.showApiMessage && data?.errors?.[0]?.detail) || tFilter(config.errorMessage); + throw err; + }); } - var proxy = { - callHttp: errorService.autoRetry(function ( - method, - url, - params, - data, - extraConfig, - ) { - return networkRequest( - $http, - method, - url, - params, - data, - extraConfig, - ); - }, - errorService.networkRetryConfig), - - submitForm: errorService.autoRetry(function ( - method, - url, - form, - extraConfig, - ) { - return networkRequest( - Upload.upload, - method, - url, - null, - form, - extraConfig, - ); - }, - errorService.networkRetryConfig), - - get: function (url, params, config) { - return this.callHttp('GET', url, params, null, config); - }, - - post: function (url, data, config) { - return this.callHttp('POST', url, null, data, config); - }, - - put: function (url, data, config) { - return this.callHttp('PUT', url, null, data, config); - }, - - delete: function (url, params, config) { - return this.callHttp('DELETE', url, params, null, config); - }, - - // Extract the model(s) from a JSON API response - // These methods are intended to be used as the 'then' callback in the promise returned by callHttp, e.g. - // - // httpProxy.get(url, params).then(httpProxy.extractModels).then(function (models) {}); - // - // extractModel and extractModels are aliases for one another. - extractModel: extractData, - extractModels: extractData, - - // Determine whether a model has been loaded - isLoaded: function (model) { - return Boolean(model && !model._placeHolder); - }, - - // Given a model and an array of needed relationships, determine which of those relationships have not yet - // been loaded - getUnloadedRelationships: function (model, relationships) { - if (!proxy.isLoaded(model)) { - // All relationships of unloaded models and placeholder models are considered unloaded - return relationships; - } + if (extraConfig && extraConfig.deduper) { + return extraConfig.deduper.request(makeRequest); + } + return makeRequest({}); + } + + var proxy = { + callHttp: errorService.autoRetry(function (method, url, params, data, extraConfig) { + return networkRequest($http, method, url, params, data, extraConfig); + }, errorService.networkRetryConfig), + + submitForm: errorService.autoRetry(function (method, url, form, extraConfig) { + return networkRequest(Upload.upload, method, url, null, form, extraConfig); + }, errorService.networkRetryConfig), + + get: function (url, params, config) { + return this.callHttp('GET', url, params, null, config); + }, + + post: function (url, data, config) { + return this.callHttp('POST', url, null, data, config); + }, + + put: function (url, data, config) { + return this.callHttp('PUT', url, null, data, config); + }, + + delete: function (url, params, config) { + return this.callHttp('DELETE', url, params, null, config); + }, + + // Extract the model(s) from a JSON API response + // These methods are intended to be used as the 'then' callback in the promise returned by callHttp, e.g. + // + // httpProxy.get(url, params).then(httpProxy.extractModels).then(function (models) {}); + // + // extractModel and extractModels are aliases for one another. + extractModel: extractData, + extractModels: extractData, + + // Determine whether a model has been loaded + isLoaded: function (model) { + return Boolean(model && !model._placeHolder); + }, + + // Given a model and an array of needed relationships, determine which of those relationships have not yet + // been loaded + getUnloadedRelationships: function (model, relationships) { + if (!proxy.isLoaded(model)) { + // All relationships of unloaded models and placeholder models are considered unloaded + return relationships; + } + + // Unloaded relationships contain unloaded models + return relationships.filter(function (relationshipPath) { + const relationshipParts = relationshipPath.split('.'); + const relationshipHead = _.head(relationshipParts); + const relationshipTail = _.tail(relationshipParts); + + if (!model[relationshipHead]) { + // The relationship is not even present on the model, and is therefore considered unloaded + return true; + } - // Unloaded relationships contain unloaded models - return relationships.filter(function (relationshipPath) { - var relationshipParts = relationshipPath.split('.'); - var relationshipHead = _.head(relationshipParts); - var relationshipTail = _.tail(relationshipParts); - - if (!model[relationshipHead]) { - // The relationship is not even present on the model, and is therefore considered unloaded - return true; - } - - // Try to find an an unloaded model - // If an unloaded model is found, this relationship will pass the filter and will be considered - // to be a unloaded relationship - return _.find(model[relationshipHead], function (item) { - // If the relationship path consisted of multiple parts, reach into the item to pull out - // the right property - return !proxy.isLoaded( - relationshipTail.length > 0 - ? _.get(item, relationshipTail, null) - : item, - ); - }); - }); - }, - - // Return a promise that resolves to the model of the specified type and with the specified id - // If the model is already loaded, it is returned (wrapped in a promise) without a network request - // If the model's required relationships are not fully loaded, those are loaded as well - getModel: function ( + // Try to find an an unloaded model + // If an unloaded model is found, this relationship will pass the filter and will be considered + // to be a unloaded relationship + return _.find(model[relationshipHead], function (item) { + // If the relationship path consisted of multiple parts, reach into the item to pull out + // the right property + return !proxy.isLoaded(relationshipTail.length > 0 ? _.get(item, relationshipTail, null) : item); + }); + }); + }, + + // Return a promise that resolves to the model of the specified type and with the specified id + // If the model is already loaded, it is returned (wrapped in a promise) without a network request + // If the model's required relationships are not fully loaded, those are loaded as well + getModel: function (url, type, id, relationships, extraConfig, extraParameters) { + const model = JsonApiDataStore.store.find(type, id); + const unloadedRelationships = proxy.getUnloadedRelationships(model, relationships); + return $q + .resolve() + .then(function () { + if (proxy.isLoaded(model) && unloadedRelationships.length === 0) { + // All of the necessary data is already loaded + return; + } + + // Load the required relationships + return proxy.get( url, - type, - id, - relationships, + { + include: unloadedRelationships.join(','), + ...extraParameters, + }, extraConfig, - extraParameters, - ) { - var model = JsonApiDataStore.store.find(type, id); - var unloadedRelationships = proxy.getUnloadedRelationships( - model, - relationships, - ); - return $q - .resolve() - .then(function () { - if ( - proxy.isLoaded(model) && - unloadedRelationships.length === 0 - ) { - // All of the necessary data is already loaded - return; - } - - // Load the required relationships - return proxy.get( - url, - { - include: unloadedRelationships.join(','), - ...extraParameters, - }, - extraConfig, - ); - }) - .then(function () { - return JsonApiDataStore.store.find(type, id); - }); - }, - - // Return the URL for a JSON API model - getModelUrl: function (model) { - return modelsService - .getModelMetadata(model._type) - .url.single(model.id); - }, - - // Generate a JSON API "included" array from an array of models - includedFromModels: function (models) { - return models.map(function (model) { - // Don't send the relationships' relationships - return model.serialize({ relationships: [] }).data; - }); - }, - }; - - return proxy; + ); + }) + .then(function () { + return JsonApiDataStore.store.find(type, id); + }); + }, + + // Return the URL for a JSON API model + getModelUrl: function (model) { + return modelsService.getModelMetadata(model._type).url.single(model.id); + }, + + // Generate a JSON API "included" array from an array of models + includedFromModels: function (models) { + return models.map(function (model) { + // Don't send the relationships' relationships + return model.serialize({ relationships: [] }).data; + }); + }, + }; + + return proxy; } diff --git a/app/assets/javascripts/angular/services/httpProxy.service.spec.js b/app/assets/javascripts/angular/services/httpProxy.service.spec.js index 20f5ca976d..eb06a81d18 100644 --- a/app/assets/javascripts/angular/services/httpProxy.service.spec.js +++ b/app/assets/javascripts/angular/services/httpProxy.service.spec.js @@ -1,450 +1,331 @@ import 'angular-mocks'; // Constants -var httpProxy, $rootScope, $http, $q, JsonApiDataStore, RequestDeduper; +let httpProxy, $rootScope, $http, $q, JsonApiDataStore, RequestDeduper; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('HttpProxyService Tests', function () { - beforeEach(function () { - var _this = this; - this.token = null; - this.responseData = {}; - this.responseHeaders = { - get 'x-mh-session'() { - return _this.token; - }, - }; - this.httpResponse = { - headers: function (header) { - return _this.responseHeaders[header]; - }, - get data() { - return _this.responseData; - }, - }; + beforeEach(function () { + const _this = this; + this.token = null; + this.responseData = {}; + this.responseHeaders = { + get 'x-mh-session'() { + return _this.token; + }, + }; + this.httpResponse = { + headers: function (header) { + return _this.responseHeaders[header]; + }, + get data() { + return _this.responseData; + }, + }; - // Mock out the $http service - angular.mock.module(function ($provide) { - $provide.factory('$http', function ($q) { - var $http = jasmine - .createSpy('$http') - .and.returnValue($q.resolve(_this.httpResponse)); - $http.defaults = { headers: { common: {} } }; - $http.get = jasmine.createSpy('$http.get'); - return $http; - }); - }); + // Mock out the $http service + angular.mock.module(function ($provide) { + $provide.factory('$http', function ($q) { + const $http = jasmine.createSpy('$http').and.returnValue($q.resolve(_this.httpResponse)); + $http.defaults = { headers: { common: {} } }; + $http.get = jasmine.createSpy('$http.get'); + return $http; + }); }); - - beforeEach(inject(function ( - _httpProxy_, - _$rootScope_, - _$http_, - _$q_, - _JsonApiDataStore_, - _RequestDeduper_, - ) { - httpProxy = _httpProxy_; - $rootScope = _$rootScope_; - $http = _$http_; - $q = _$q_; - JsonApiDataStore = _JsonApiDataStore_; - RequestDeduper = _RequestDeduper_; + }); + + beforeEach(inject(function (_httpProxy_, _$rootScope_, _$http_, _$q_, _JsonApiDataStore_, _RequestDeduper_) { + httpProxy = _httpProxy_; + $rootScope = _$rootScope_; + $http = _$http_; + $q = _$q_; + JsonApiDataStore = _JsonApiDataStore_; + RequestDeduper = _RequestDeduper_; + })); + + describe('callHttp', function () { + beforeEach(inject(function (envService) { + this.apiUrl = 'http://localhost:4000'; + this.method = 'GET'; + this.url = '/'; + this.params = { key1: 'value1' }; + this.data = { key2: 'value2' }; + this.config = { key3: 'value3', errorMessage: 'error' }; + + spyOn(envService, 'read').and.returnValue(this.apiUrl); })); - describe('callHttp', function () { - beforeEach(inject(function (envService) { - this.apiUrl = 'http://localhost:4000'; - this.method = 'GET'; - this.url = '/'; - this.params = { key1: 'value1' }; - this.data = { key2: 'value2' }; - this.config = { key3: 'value3', errorMessage: 'error' }; - - spyOn(envService, 'read').and.returnValue(this.apiUrl); - })); - - it('should get the base API url from envService', inject(function ( - envService, - ) { - httpProxy.callHttp(this.method, this.url, this.params, this.data); - expect(envService.read).toHaveBeenCalledWith('apiUrl'); - - var httpConfig = $http.calls.argsFor(0)[0]; - expect(httpConfig.url.indexOf(this.apiUrl)).toBe(0); - })); - - it('should call $http', function () { - httpProxy.callHttp( - this.method, - this.url, - this.params, - this.data, - this.config, - ); - expect($http).toHaveBeenCalledWith({ - method: this.method, - url: this.apiUrl + this.url, - data: this.data, - params: this.params, - key3: 'value3', - errorMessage: 'error', - }); - }); - - it( - 'should set the Authorization header when a token is received', - asynchronous(function () { - var _this = this; - this.token = 'abcde'; - this.responseData = { data: [] }; - spyOn(this.httpResponse, 'headers').and.callThrough(); - return httpProxy - .callHttp(this.method, this.url, this.params, this.data) - .then(function () { - expect(_this.httpResponse.headers).toHaveBeenCalledWith( - 'x-mh-session', - ); - expect( - $http.defaults.headers.common.Authorization, - ).toBe('Bearer ' + _this.token); - }); - }), - ); + it('should get the base API url from envService', inject(function (envService) { + httpProxy.callHttp(this.method, this.url, this.params, this.data); + expect(envService.read).toHaveBeenCalledWith('apiUrl'); - it( - 'should not set the Authorization header when a token is not received', - asynchronous(function () { - var originalAuthorization = 'Bearer old'; - this.token = null; - $http.defaults.headers.common.Authorization = originalAuthorization; - return httpProxy - .callHttp(this.method, this.url, this.params, this.data) - .then(function () { - expect( - $http.defaults.headers.common.Authorization, - ).toBe(originalAuthorization); - }); - }), - ); - - it( - 'should sync the JSON store with the response', - asynchronous(function () { - var _this = this; - spyOn(JsonApiDataStore.store, 'syncWithMeta'); - return httpProxy - .callHttp(this.method, this.url, this.params, this.data) - .then(function () { - expect( - JsonApiDataStore.store.syncWithMeta, - ).toHaveBeenCalledWith(_this.responseData); - }); - }), - ); - - it( - 'should use the deduper instance when provided', - asynchronous(function () { - var deduper = new RequestDeduper(); - spyOn(deduper, 'request').and.returnValue($q.resolve()); - var config = { - deduper: deduper, - }; - - return httpProxy - .callHttp( - this.method, - this.url, - this.params, - this.data, - config, - ) - .then(function () { - expect(deduper.request).toHaveBeenCalledWith( - jasmine.any(Function), - ); - }); - }), - ); - - describe('aliases', function () { - beforeEach(function () { - spyOn(httpProxy, 'callHttp'); - }); + const httpConfig = $http.calls.argsFor(0)[0]; + expect(httpConfig.url.indexOf(this.apiUrl)).toBe(0); + })); - it('should contain get', function () { - httpProxy.get(this.url, this.params, this.config); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - this.url, - this.params, - null, - this.config, - ); - }); + it('should call $http', function () { + httpProxy.callHttp(this.method, this.url, this.params, this.data, this.config); + expect($http).toHaveBeenCalledWith({ + method: this.method, + url: this.apiUrl + this.url, + data: this.data, + params: this.params, + key3: 'value3', + errorMessage: 'error', + }); + }); - it('should contain post', function () { - httpProxy.post(this.url, this.data, this.config); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'POST', - this.url, - null, - this.data, - this.config, - ); - }); + it( + 'should set the Authorization header when a token is received', + asynchronous(function () { + const _this = this; + this.token = 'abcde'; + this.responseData = { data: [] }; + spyOn(this.httpResponse, 'headers').and.callThrough(); + return httpProxy.callHttp(this.method, this.url, this.params, this.data).then(function () { + expect(_this.httpResponse.headers).toHaveBeenCalledWith('x-mh-session'); + expect($http.defaults.headers.common.Authorization).toBe('Bearer ' + _this.token); + }); + }), + ); - it('should contain put', function () { - httpProxy.put(this.url, this.data, this.config); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - this.url, - null, - this.data, - this.config, - ); - }); + it( + 'should not set the Authorization header when a token is not received', + asynchronous(function () { + const originalAuthorization = 'Bearer old'; + this.token = null; + $http.defaults.headers.common.Authorization = originalAuthorization; + return httpProxy.callHttp(this.method, this.url, this.params, this.data).then(function () { + expect($http.defaults.headers.common.Authorization).toBe(originalAuthorization); + }); + }), + ); + + it( + 'should sync the JSON store with the response', + asynchronous(function () { + const _this = this; + spyOn(JsonApiDataStore.store, 'syncWithMeta'); + return httpProxy.callHttp(this.method, this.url, this.params, this.data).then(function () { + expect(JsonApiDataStore.store.syncWithMeta).toHaveBeenCalledWith(_this.responseData); + }); + }), + ); + + it( + 'should use the deduper instance when provided', + asynchronous(function () { + const deduper = new RequestDeduper(); + spyOn(deduper, 'request').and.returnValue($q.resolve()); + const config = { + deduper, + }; - it('should contain delete', function () { - httpProxy.delete(this.url, this.params, this.config); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'DELETE', - this.url, - this.params, - null, - this.config, - ); - }); + return httpProxy.callHttp(this.method, this.url, this.params, this.data, config).then(function () { + expect(deduper.request).toHaveBeenCalledWith(jasmine.any(Function)); }); + }), + ); + + describe('aliases', function () { + beforeEach(function () { + spyOn(httpProxy, 'callHttp'); + }); + + it('should contain get', function () { + httpProxy.get(this.url, this.params, this.config); + expect(httpProxy.callHttp).toHaveBeenCalledWith('GET', this.url, this.params, null, this.config); + }); + + it('should contain post', function () { + httpProxy.post(this.url, this.data, this.config); + expect(httpProxy.callHttp).toHaveBeenCalledWith('POST', this.url, null, this.data, this.config); + }); + + it('should contain put', function () { + httpProxy.put(this.url, this.data, this.config); + expect(httpProxy.callHttp).toHaveBeenCalledWith('PUT', this.url, null, this.data, this.config); + }); + + it('should contain delete', function () { + httpProxy.delete(this.url, this.params, this.config); + expect(httpProxy.callHttp).toHaveBeenCalledWith('DELETE', this.url, this.params, null, this.config); + }); }); + }); - describe('model loading', function () { - beforeEach(function () { - this.loadedModel = {}; - this.placeholderModel = { _placeHolder: true }; - }); + describe('model loading', function () { + beforeEach(function () { + this.loadedModel = {}; + this.placeholderModel = { _placeHolder: true }; + }); - describe('isLoaded', function () { - it('should treat null models as unloaded', function () { - expect(httpProxy.isLoaded(null)).toBe(false); - }); + describe('isLoaded', function () { + it('should treat null models as unloaded', function () { + expect(httpProxy.isLoaded(null)).toBe(false); + }); - it('should treat a placeholder model as unloaded', function () { - expect(httpProxy.isLoaded(this.placeholderModel)).toBe(false); - }); + it('should treat a placeholder model as unloaded', function () { + expect(httpProxy.isLoaded(this.placeholderModel)).toBe(false); + }); - it('should treat a model as loaded', function () { - expect(httpProxy.isLoaded(this.loadedModel)).toBe(true); - }); - }); + it('should treat a model as loaded', function () { + expect(httpProxy.isLoaded(this.loadedModel)).toBe(true); + }); + }); - describe('getUnloadedRelationships', function () { - it('should treat all relationships as unloaded when the model is null', function () { - this.relationships = ['a', 'b', 'c']; - expect( - httpProxy.getUnloadedRelationships( - null, - this.relationships, - ), - ).toEqual(this.relationships); - }); + describe('getUnloadedRelationships', function () { + it('should treat all relationships as unloaded when the model is null', function () { + this.relationships = ['a', 'b', 'c']; + expect(httpProxy.getUnloadedRelationships(null, this.relationships)).toEqual(this.relationships); + }); - it('should treat all relationships as unloaded when the model is a placeholder', function () { - this.relationships = ['a', 'b', 'c']; - expect( - httpProxy.getUnloadedRelationships( - this.placeholderModel, - this.relationships, - ), - ).toEqual(this.relationships); - }); + it('should treat all relationships as unloaded when the model is a placeholder', function () { + this.relationships = ['a', 'b', 'c']; + expect(httpProxy.getUnloadedRelationships(this.placeholderModel, this.relationships)).toEqual( + this.relationships, + ); + }); + + it('should correctly detect unloaded relationships', function () { + this.model = { + // a is undefined + b: [], + c: [this.loadedModel], + d: [this.placeholderModel], + e: [this.loadedModel, this.placeholderModel], + f: [{ a: this.loadedModel }], + g: [{ a: this.placeholderModel }], + h: [{ a: this.loadedModel }, { a: this.placeholderModel }], + i: [{ a: { b: { c: this.loadedModel } } }], + j: [{ a: { b: { c: this.placeholderModel } } }], + k: [{ a: this.placeholderModel }], + }; + this.relationships = ['a', 'b', 'c', 'd', 'e', 'f.a', 'g.a', 'h.a', 'i.a.b.c', 'j.a.b.c', 'k.a.b.c']; + expect(httpProxy.getUnloadedRelationships(this.model, this.relationships)).toEqual([ + 'a', + 'd', + 'e', + 'g.a', + 'h.a', + 'j.a.b.c', + 'k.a.b.c', + ]); + }); + }); - it('should correctly detect unloaded relationships', function () { - this.model = { - // a is undefined - b: [], - c: [this.loadedModel], - d: [this.placeholderModel], - e: [this.loadedModel, this.placeholderModel], - f: [{ a: this.loadedModel }], - g: [{ a: this.placeholderModel }], - h: [{ a: this.loadedModel }, { a: this.placeholderModel }], - i: [{ a: { b: { c: this.loadedModel } } }], - j: [{ a: { b: { c: this.placeholderModel } } }], - k: [{ a: this.placeholderModel }], - }; - this.relationships = [ - 'a', - 'b', - 'c', - 'd', - 'e', - 'f.a', - 'g.a', - 'h.a', - 'i.a.b.c', - 'j.a.b.c', - 'k.a.b.c', - ]; - expect( - httpProxy.getUnloadedRelationships( - this.model, - this.relationships, - ), - ).toEqual(['a', 'd', 'e', 'g.a', 'h.a', 'j.a.b.c', 'k.a.b.c']); + describe('getModel', function () { + beforeEach(function () { + this.url = '/'; + this.type = 'abc'; + this.id = 123; + this.model = { id: this.id }; + this.relationships = ['a', 'b', 'c']; + this.config = { key: 'value' }; + + spyOn(httpProxy, 'callHttp'); + }); + + it( + 'should not make a network request when the model is already loaded', + asynchronous(function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValues(this.model, this.model); + spyOn(httpProxy, 'getUnloadedRelationships').and.returnValue([]); + + const _this = this; + return httpProxy.getModel(this.url, this.type, this.id, this.relationships).then(function (model) { + expect(model).toBe(_this.model); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); + }); + }), + ); + + it( + 'should make a network request when the model is not already loaded', + asynchronous(function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValues(null, this.model); + spyOn(httpProxy, 'getUnloadedRelationships').and.returnValue([]); + + const _this = this; + return httpProxy + .getModel(this.url, this.type, this.id, this.relationships, this.config) + .then(function (model) { + expect(model).toBe(_this.model); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + _this.url, + { + include: '', + }, + null, + _this.config, + ); }); - }); - - describe('getModel', function () { - beforeEach(function () { - this.url = '/'; - this.type = 'abc'; - this.id = 123; - this.model = { id: this.id }; - this.relationships = ['a', 'b', 'c']; - this.config = { key: 'value' }; - - spyOn(httpProxy, 'callHttp'); + }), + ); + + it( + 'should make a network request when the model relationships are not already loaded', + asynchronous(function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValues(this.model, this.model); + spyOn(httpProxy, 'getUnloadedRelationships').and.returnValue(this.relationships); + + const _this = this; + return httpProxy + .getModel(this.url, this.type, this.id, this.relationships, this.config) + .then(function (model) { + expect(model).toBe(_this.model); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + _this.url, + { + include: 'a,b,c', + }, + null, + _this.config, + ); }); + }), + ); + }); - it( - 'should not make a network request when the model is already loaded', - asynchronous(function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValues( - this.model, - this.model, - ); - spyOn( - httpProxy, - 'getUnloadedRelationships', - ).and.returnValue([]); - - var _this = this; - return httpProxy - .getModel( - this.url, - this.type, - this.id, - this.relationships, - ) - .then(function (model) { - expect(model).toBe(_this.model); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); - }), - ); - - it( - 'should make a network request when the model is not already loaded', - asynchronous(function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValues( - null, - this.model, - ); - spyOn( - httpProxy, - 'getUnloadedRelationships', - ).and.returnValue([]); - - var _this = this; - return httpProxy - .getModel( - this.url, - this.type, - this.id, - this.relationships, - this.config, - ) - .then(function (model) { - expect(model).toBe(_this.model); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - _this.url, - { - include: '', - }, - null, - _this.config, - ); - }); - }), - ); - - it( - 'should make a network request when the model relationships are not already loaded', - asynchronous(function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValues( - this.model, - this.model, - ); - spyOn( - httpProxy, - 'getUnloadedRelationships', - ).and.returnValue(this.relationships); - - var _this = this; - return httpProxy - .getModel( - this.url, - this.type, - this.id, - this.relationships, - this.config, - ) - .then(function (model) { - expect(model).toBe(_this.model); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - _this.url, - { - include: 'a,b,c', - }, - null, - _this.config, - ); - }); - }), - ); - }); - - describe('extractModel', function () { - it('should return the model of a JSON API response', function () { - var model = { id: 1 }; - expect( - httpProxy.extractModel({ - data: model, - }), - ).toBe(model); - }); - }); + describe('extractModel', function () { + it('should return the model of a JSON API response', function () { + const model = { id: 1 }; + expect( + httpProxy.extractModel({ + data: model, + }), + ).toBe(model); + }); + }); - describe('extractModels', function () { - it('should return the model of a JSON API response', function () { - var models = [{ id: 1 }, { id: 2 }, { id: 3 }]; - expect( - httpProxy.extractModel({ - data: models, - }), - ).toBe(models); - }); - }); + describe('extractModels', function () { + it('should return the model of a JSON API response', function () { + const models = [{ id: 1 }, { id: 2 }, { id: 3 }]; + expect( + httpProxy.extractModel({ + data: models, + }), + ).toBe(models); + }); }); + }); }); diff --git a/app/assets/javascripts/angular/services/interactions.service.js b/app/assets/javascripts/angular/services/interactions.service.js index 70affb7382..19c7877d73 100644 --- a/app/assets/javascripts/angular/services/interactions.service.js +++ b/app/assets/javascripts/angular/services/interactions.service.js @@ -1,202 +1,161 @@ -angular - .module('campusContactsApp') - .factory('interactionsService', interactionsService); +angular.module('campusContactsApp').factory('interactionsService', interactionsService); // This service contains action logic that is shared across components -function interactionsService( - httpProxy, - modelsService, - JsonApiDataStore, - reportsService, - loggedInPerson, - _, -) { - // Fields: - // id: matches interaction_type_id - // icon: ng-md-icon icon name - // title: i18n key - // anonmyous: whether or not this interaction may be anonymous - // deprecated: whether or not this interaction type is deprecated - var interactionTypes = [ - { - id: '1', - icon: 'note', - title: 'application.interaction_types.comment', - anonymous: false, - deprecated: false, - }, - { - id: '2', - icon: 'spiritualConversation', - title: 'application.interaction_types.spiritual_conversation', - anonymous: true, - deprecated: false, - }, - { - id: '3', - icon: 'evangelism', - title: 'application.interaction_types.gospel_presentation', - anonymous: true, - deprecated: false, - }, - { - id: '4', - icon: 'personalDecision', - title: 'application.interaction_types.prayed_to_receive_christ', - anonymous: true, - deprecated: false, - }, - { - id: '5', - icon: 'holySpirit', - title: 'application.interaction_types.holy_spirit_presentation', - anonymous: true, - deprecated: false, +function interactionsService(httpProxy, modelsService, JsonApiDataStore, reportsService, loggedInPerson, _) { + // Fields: + // id: matches interaction_type_id + // icon: ng-md-icon icon name + // title: i18n key + // anonmyous: whether or not this interaction may be anonymous + // deprecated: whether or not this interaction type is deprecated + const interactionTypes = [ + { + id: '1', + icon: 'note', + title: 'application.interaction_types.comment', + anonymous: false, + deprecated: false, + }, + { + id: '2', + icon: 'spiritualConversation', + title: 'application.interaction_types.spiritual_conversation', + anonymous: true, + deprecated: false, + }, + { + id: '3', + icon: 'evangelism', + title: 'application.interaction_types.gospel_presentation', + anonymous: true, + deprecated: false, + }, + { + id: '4', + icon: 'personalDecision', + title: 'application.interaction_types.prayed_to_receive_christ', + anonymous: true, + deprecated: false, + }, + { + id: '5', + icon: 'holySpirit', + title: 'application.interaction_types.holy_spirit_presentation', + anonymous: true, + deprecated: false, + }, + { + id: '6', + icon: 'graduatingOnMission', + title: 'application.interaction_types.graduating_on_mission', + anonymous: true, + deprecated: true, + }, + { + id: '9', + icon: 'discipleship', + title: 'application.interaction_types.discipleship', + anonymous: false, + deprecated: false, + }, + ]; + + return { + // Return an array containing information about the available interaction types + getInteractionTypes: function () { + // Excluded deprecated interaction types + return _.filter(interactionTypes, { deprecated: false }); + }, + + // Lookup and return the interaction type with the specified id + getInteractionType: function (interactionTypeId) { + return _.find(interactionTypes, { id: `${interactionTypeId}` }); + }, + + // Create a new interaction and save it on the server + // interaction.interactionTypeId is the interaction_type_id, interaction.comment is the interaction + // comment, organizationId is the organization_id of the associated organization, and personId is + // the receiver of the interaction, or null if this is an anonymous interaction + // Also, the initiator of the interaction is the currently logged-in user + recordInteraction: function (interaction, organizationId, personId) { + // Build up the relationships object + const relationships = { + organization: { + data: { id: organizationId, type: 'organization' }, }, - { - id: '6', - icon: 'graduatingOnMission', - title: 'application.interaction_types.graduating_on_mission', - anonymous: true, - deprecated: true, + }; + if (personId) { + relationships.receiver = { + data: { id: personId, type: 'person' }, + }; + } + const newInteraction = JsonApiDataStore.store.sync({ + data: { + type: 'interaction', + attributes: { + comment: interaction.comment, + interaction_type_id: interaction.interactionTypeId, + }, + relationships, }, + }); + const createJson = newInteraction.serialize(); + createJson.included = [ { - id: '9', - icon: 'discipleship', - title: 'application.interaction_types.discipleship', - anonymous: false, - deprecated: false, - }, - ]; - - return { - // Return an array containing information about the available interaction types - getInteractionTypes: function () { - // Excluded deprecated interaction types - return _.filter(interactionTypes, { deprecated: false }); - }, - - // Lookup and return the interaction type with the specified id - getInteractionType: function (interactionTypeId) { - return _.find(interactionTypes, { id: `${interactionTypeId}` }); + type: 'interaction_initiator', + attributes: { + person_id: loggedInPerson.person.id, + }, }, + ]; + return httpProxy + .post(modelsService.getModelMetadata('interaction').url.root, createJson, { + errorMessage: 'error.messages.interactions.create_interaction', + }) + .then(httpProxy.extractModel) + .then(function (interaction) { + // Filter out extra initiator + const filteredInteraction = interaction.initiators.filter( + (initiator, index) => interaction.initiators.indexOf(initiator) >= index, + ); + interaction.initiators = filteredInteraction; - // Create a new interaction and save it on the server - // interaction.interactionTypeId is the interaction_type_id, interaction.comment is the interaction - // comment, organizationId is the organization_id of the associated organization, and personId is - // the receiver of the interaction, or null if this is an anonymous interaction - // Also, the initiator of the interaction is the currently logged-in user - recordInteraction: function (interaction, organizationId, personId) { - // Build up the relationships object - var relationships = { - organization: { - data: { id: organizationId, type: 'organization' }, - }, - }; - if (personId) { - relationships.receiver = { - data: { id: personId, type: 'person' }, - }; - } - var newInteraction = JsonApiDataStore.store.sync({ - data: { - type: 'interaction', - attributes: { - comment: interaction.comment, - interaction_type_id: interaction.interactionTypeId, - }, - relationships: relationships, - }, - }); - var createJson = newInteraction.serialize(); - createJson.included = [ - { - type: 'interaction_initiator', - attributes: { - person_id: loggedInPerson.person.id, - }, - }, - ]; - return httpProxy - .post( - modelsService.getModelMetadata('interaction').url.root, - createJson, - { - errorMessage: - 'error.messages.interactions.create_interaction', - }, - ) - .then(httpProxy.extractModel) - .then(function (interaction) { - // Filter out extra initiator - const filteredInteraction = interaction.initiators.filter( - (initiator, index) => - interaction.initiators.indexOf(initiator) >= index, - ); - interaction.initiators = filteredInteraction; + interaction.initiators.forEach(function (initiator) { + // Add the new interaction to the person report + const report = reportsService.lookupPersonReport(interaction.organization.id, initiator.id); + reportsService.incrementReportInteraction(report, interaction.interaction_type_id); + }); - interaction.initiators.forEach(function (initiator) { - // Add the new interaction to the person report - var report = reportsService.lookupPersonReport( - interaction.organization.id, - initiator.id, - ); - reportsService.incrementReportInteraction( - report, - interaction.interaction_type_id, - ); - }); + // Add the new interaction to the organization report + const report = reportsService.lookupOrganizationReport(interaction.organization.id); + reportsService.incrementReportInteraction(report, interaction.interaction_type_id); - // Add the new interaction to the organization report - var report = reportsService.lookupOrganizationReport( - interaction.organization.id, - ); - reportsService.incrementReportInteraction( - report, - interaction.interaction_type_id, - ); + // Try to add the interaction to the person's interaction list + const person = JsonApiDataStore.store.find('person', personId); + if (person && person.interactions) { + person.interactions = person.interactions.concat(interaction); + } - // Try to add the interaction to the person's interaction list - var person = JsonApiDataStore.store.find( - 'person', - personId, - ); - if (person && person.interactions) { - person.interactions = person.interactions.concat( - interaction, - ); - } + return interaction; + }); + }, - return interaction; - }); - }, + updateInteraction: function (interaction) { + return httpProxy + .put(modelsService.getModelMetadata('interaction').url.single(interaction.id), interaction.serialize(), { + errorMessage: 'error.messages.interactions.update_interaction', + }) + .then(httpProxy.extractModel); + }, - updateInteraction: function (interaction) { - return httpProxy - .put( - modelsService - .getModelMetadata('interaction') - .url.single(interaction.id), - interaction.serialize(), - { - errorMessage: - 'error.messages.interactions.update_interaction', - }, - ) - .then(httpProxy.extractModel); - }, - - deleteInteraction: function (interaction) { - return httpProxy.delete( - modelsService - .getModelMetadata('interaction') - .url.single(interaction.id), - interaction.serialize(), - { - errorMessage: - 'error.messages.interactions.delete_interaction', - }, - ); + deleteInteraction: function (interaction) { + return httpProxy.delete( + modelsService.getModelMetadata('interaction').url.single(interaction.id), + interaction.serialize(), + { + errorMessage: 'error.messages.interactions.delete_interaction', }, - }; + ); + }, + }; } diff --git a/app/assets/javascripts/angular/services/interactions.service.spec.js b/app/assets/javascripts/angular/services/interactions.service.spec.js index c72e466590..cbeb47f17b 100644 --- a/app/assets/javascripts/angular/services/interactions.service.spec.js +++ b/app/assets/javascripts/angular/services/interactions.service.spec.js @@ -1,318 +1,266 @@ import 'angular-mocks'; // Constants -var interactionsService, - $q, - $rootScope, - httpProxy, - reportsService, - JsonApiDataStore, - _; +let interactionsService, $q, $rootScope, httpProxy, reportsService, JsonApiDataStore, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('interactionsService', function () { - beforeEach(function () { - var _this = this; + beforeEach(function () { + const _this = this; - // Mock out the loggedInPerson service - angular.mock.module(function ($provide) { - $provide.factory('loggedInPerson', function () { - return { - person: { - get id() { - return _this.loggedInPersonId; - }, - }, - }; - }); - }); + // Mock out the loggedInPerson service + angular.mock.module(function ($provide) { + $provide.factory('loggedInPerson', function () { + return { + person: { + get id() { + return _this.loggedInPersonId; + }, + }, + }; + }); }); + }); - beforeEach(inject(function ( - _interactionsService_, - _$q_, - _$rootScope_, - _httpProxy_, - _reportsService_, - ___, - _JsonApiDataStore_, - ) { - var _this = this; + beforeEach(inject(function ( + _interactionsService_, + _$q_, + _$rootScope_, + _httpProxy_, + _reportsService_, + ___, + _JsonApiDataStore_, + ) { + const _this = this; - interactionsService = _interactionsService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - reportsService = _reportsService_; - _ = ___; - JsonApiDataStore = _JsonApiDataStore_; + interactionsService = _interactionsService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + reportsService = _reportsService_; + _ = ___; + JsonApiDataStore = _JsonApiDataStore_; - this.interaction = { - interactionTypeId: 1, - comment: 'Additional info', - }; - this.organizationId = 2; - this.initiatorId = 3; - this.loggedInPersonId = 123; - this.interactionModel = { - interaction_type_id: this.interaction.interactionTypeId, - organization: { id: this.organizationId }, - initiators: [{ id: this.initiatorId }], - }; + this.interaction = { + interactionTypeId: 1, + comment: 'Additional info', + }; + this.organizationId = 2; + this.initiatorId = 3; + this.loggedInPersonId = 123; + this.interactionModel = { + interaction_type_id: this.interaction.interactionTypeId, + organization: { id: this.organizationId }, + initiators: [{ id: this.initiatorId }], + }; - this.httpResponse = { data: {} }; - spyOn(httpProxy, 'post').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); - spyOn(httpProxy, 'put').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); - spyOn(httpProxy, 'delete').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); - })); + this.httpResponse = { data: {} }; + spyOn(httpProxy, 'post').and.callFake(function () { + return $q.resolve(_this.httpResponse); + }); + spyOn(httpProxy, 'put').and.callFake(function () { + return $q.resolve(_this.httpResponse); + }); + spyOn(httpProxy, 'delete').and.callFake(function () { + return $q.resolve(_this.httpResponse); + }); + })); - describe('getInteractionTypes', function () { - it('should not include deprecated interaction types', function () { - expect( - _.find(interactionsService.getInteractionTypes(), { id: 6 }), - ).not.toBeDefined(); - }); + describe('getInteractionTypes', function () { + it('should not include deprecated interaction types', function () { + expect(_.find(interactionsService.getInteractionTypes(), { id: 6 })).not.toBeDefined(); }); + }); - describe('getInteractionType', function () { - it('should find interaction types', function () { - expect(interactionsService.getInteractionType(1)).toBeDefined(); - }); + describe('getInteractionType', function () { + it('should find interaction types', function () { + expect(interactionsService.getInteractionType(1)).toBeDefined(); + }); - it('should find deprecated interaction types', function () { - expect(interactionsService.getInteractionType(6)).toBeDefined(); - }); + it('should find deprecated interaction types', function () { + expect(interactionsService.getInteractionType(6)).toBeDefined(); }); + }); - describe('recordInteraction', function () { - it('with no personId should create an anyonymous interaction', function () { - interactionsService.recordInteraction( - this.interaction, - this.organizationId, - ); - expect(httpProxy.post).toHaveBeenCalledWith( - '/interactions', - { - data: { - type: 'interaction', - attributes: { - comment: this.interaction.comment, - interaction_type_id: this.interaction - .interactionTypeId, - }, - relationships: { - organization: { - data: { - id: this.organizationId, - type: 'organization', - }, - }, - }, - }, - included: [ - { - type: 'interaction_initiator', - attributes: { - person_id: this.loggedInPersonId, - }, - }, - ], + describe('recordInteraction', function () { + it('with no personId should create an anyonymous interaction', function () { + interactionsService.recordInteraction(this.interaction, this.organizationId); + expect(httpProxy.post).toHaveBeenCalledWith( + '/interactions', + { + data: { + type: 'interaction', + attributes: { + comment: this.interaction.comment, + interaction_type_id: this.interaction.interactionTypeId, + }, + relationships: { + organization: { + data: { + id: this.organizationId, + type: 'organization', }, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + }, + }, + }, + included: [ + { + type: 'interaction_initiator', + attributes: { + person_id: this.loggedInPersonId, + }, + }, + ], + }, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('with personId should create a personal interaction', function () { - interactionsService.recordInteraction( - this.interaction, - this.organizationId, - this.initiatorId, - ); - expect(httpProxy.post).toHaveBeenCalledWith( - '/interactions', - { - data: { - type: 'interaction', - attributes: { - comment: this.interaction.comment, - interaction_type_id: this.interaction - .interactionTypeId, - }, - relationships: { - organization: { - data: { - id: this.organizationId, - type: 'organization', - }, - }, - receiver: { - data: { id: this.initiatorId, type: 'person' }, - }, - }, - }, - included: [ - { - type: 'interaction_initiator', - attributes: { - person_id: this.loggedInPersonId, - }, - }, - ], + it('with personId should create a personal interaction', function () { + interactionsService.recordInteraction(this.interaction, this.organizationId, this.initiatorId); + expect(httpProxy.post).toHaveBeenCalledWith( + '/interactions', + { + data: { + type: 'interaction', + attributes: { + comment: this.interaction.comment, + interaction_type_id: this.interaction.interactionTypeId, + }, + relationships: { + organization: { + data: { + id: this.organizationId, + type: 'organization', }, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); - - it( - 'extracts and returns returns the new interaction model', - asynchronous(function () { - var _this = this; - spyOn(httpProxy, 'extractModel').and.returnValue( - this.interactionModel, - ); - return interactionsService - .recordInteraction( - this.interaction, - this.organizationId, - this.initiatorId, - ) - .then(function (newInteraction) { - expect(newInteraction).toBe(_this.interactionModel); - }); - }), - ); + }, + receiver: { + data: { id: this.initiatorId, type: 'person' }, + }, + }, + }, + included: [ + { + type: 'interaction_initiator', + attributes: { + person_id: this.loggedInPersonId, + }, + }, + ], + }, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it( - 'updates person and organization reports', - asynchronous(function () { - var _this = this; - var personReport = {}; - var organizationReport = {}; - spyOn(httpProxy, 'extractModel').and.returnValue( - this.interactionModel, - ); - spyOn(reportsService, 'lookupPersonReport').and.returnValue( - personReport, - ); - spyOn( - reportsService, - 'lookupOrganizationReport', - ).and.returnValue(organizationReport); - spyOn(reportsService, 'incrementReportInteraction'); - return interactionsService - .recordInteraction( - this.interaction, - this.organizationId, - this.initiatorId, - ) - .then(function () { - expect( - reportsService.lookupPersonReport, - ).toHaveBeenCalledWith( - _this.organizationId, - _this.initiatorId, - ); + it( + 'extracts and returns returns the new interaction model', + asynchronous(function () { + const _this = this; + spyOn(httpProxy, 'extractModel').and.returnValue(this.interactionModel); + return interactionsService + .recordInteraction(this.interaction, this.organizationId, this.initiatorId) + .then(function (newInteraction) { + expect(newInteraction).toBe(_this.interactionModel); + }); + }), + ); - expect( - reportsService.lookupOrganizationReport, - ).toHaveBeenCalledWith(_this.organizationId); + it( + 'updates person and organization reports', + asynchronous(function () { + const _this = this; + const personReport = {}; + const organizationReport = {}; + spyOn(httpProxy, 'extractModel').and.returnValue(this.interactionModel); + spyOn(reportsService, 'lookupPersonReport').and.returnValue(personReport); + spyOn(reportsService, 'lookupOrganizationReport').and.returnValue(organizationReport); + spyOn(reportsService, 'incrementReportInteraction'); + return interactionsService + .recordInteraction(this.interaction, this.organizationId, this.initiatorId) + .then(function () { + expect(reportsService.lookupPersonReport).toHaveBeenCalledWith(_this.organizationId, _this.initiatorId); - expect( - reportsService.incrementReportInteraction.calls.allArgs(), - ).toEqual([ - [ - organizationReport, - _this.interaction.interactionTypeId, - ], - [personReport, _this.interaction.interactionTypeId], - ]); - }); - }), - ); - }); + expect(reportsService.lookupOrganizationReport).toHaveBeenCalledWith(_this.organizationId); - describe('updateInteraction', function () { - beforeEach(function () { - setupUpdateDelete.bind(this)(); - }); + expect(reportsService.incrementReportInteraction.calls.allArgs()).toEqual([ + [organizationReport, _this.interaction.interactionTypeId], + [personReport, _this.interaction.interactionTypeId], + ]); + }); + }), + ); + }); - it( - 'should save interaction changes to the server', - asynchronous(function () { - var _this = this; + describe('updateInteraction', function () { + beforeEach(function () { + setupUpdateDelete.bind(this)(); + }); - return interactionsService - .updateInteraction(this.interaction) - .then(function (savedInteraction) { - expect(httpProxy.put).toHaveBeenCalledWith( - jasmine.any(String), - _this.interaction.serialize(), - jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }), - ); + it( + 'should save interaction changes to the server', + asynchronous(function () { + const _this = this; - expect(savedInteraction).toEqual( - _this.httpResponse.data, - ); - }); + return interactionsService.updateInteraction(this.interaction).then(function (savedInteraction) { + expect(httpProxy.put).toHaveBeenCalledWith( + jasmine.any(String), + _this.interaction.serialize(), + jasmine.objectContaining({ + errorMessage: jasmine.any(String), }), - ); - }); + ); - describe('deleteInteraction', function () { - beforeEach(function () { - setupUpdateDelete.bind(this)(); + expect(savedInteraction).toEqual(_this.httpResponse.data); }); + }), + ); + }); + + describe('deleteInteraction', function () { + beforeEach(function () { + setupUpdateDelete.bind(this)(); + }); - it( - 'should delete interactions from the server', - asynchronous(function () { - var _this = this; + it( + 'should delete interactions from the server', + asynchronous(function () { + const _this = this; - return interactionsService - .deleteInteraction(this.interaction) - .then(function () { - expect(httpProxy.delete).toHaveBeenCalledWith( - jasmine.any(String), - _this.interaction.serialize(), - jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }), - ); - }); + return interactionsService.deleteInteraction(this.interaction).then(function () { + expect(httpProxy.delete).toHaveBeenCalledWith( + jasmine.any(String), + _this.interaction.serialize(), + jasmine.objectContaining({ + errorMessage: jasmine.any(String), }), - ); - }); + ); + }); + }), + ); + }); - function setupUpdateDelete() { - this.interaction = new JsonApiDataStore.Model('interaction'); - this.interaction.setAttribute('id', 1); - this.interaction.setAttribute('comment', 'Test Interaction'); + function setupUpdateDelete() { + this.interaction = new JsonApiDataStore.Model('interaction'); + this.interaction.setAttribute('id', 1); + this.interaction.setAttribute('comment', 'Test Interaction'); - this.httpResponse = this.interaction.serialize(); - } + this.httpResponse = this.interaction.serialize(); + } }); diff --git a/app/assets/javascripts/angular/services/labels.service.js b/app/assets/javascripts/angular/services/labels.service.js index e3b005299a..eaaee0f3eb 100644 --- a/app/assets/javascripts/angular/services/labels.service.js +++ b/app/assets/javascripts/angular/services/labels.service.js @@ -1,103 +1,88 @@ angular.module('campusContactsApp').factory('labelsService', labelsService); function labelsService(httpProxy, JsonApiDataStore, modelsService, _) { - var labelsService = { - // Return a label with default field values - getLabelTemplate: function (orgId) { - var label = new JsonApiDataStore.Model('label'); - label.setAttribute('name', ''); - label.setRelationship( - 'organization', - JsonApiDataStore.store.find('organization', orgId), - ); - return label; - }, + var labelsService = { + // Return a label with default field values + getLabelTemplate: function (orgId) { + const label = new JsonApiDataStore.Model('label'); + label.setAttribute('name', ''); + label.setRelationship('organization', JsonApiDataStore.store.find('organization', orgId)); + return label; + }, - // Save a new label on the server - createLabel: function (label) { - var payload = payloadFromLabel(label); - return httpProxy - .post( - modelsService.getModelMetadata('label').url.all, - payload, - { - errorMessage: 'error.messages.labels.create_label', - }, - ) - .then(httpProxy.extractModel) - .then(function (savedLabel) { - var org = savedLabel.organization; - if (org && org.labels) { - org.labels.push(savedLabel); - } - return savedLabel; - }); - }, + // Save a new label on the server + createLabel: function (label) { + const payload = payloadFromLabel(label); + return httpProxy + .post(modelsService.getModelMetadata('label').url.all, payload, { + errorMessage: 'error.messages.labels.create_label', + }) + .then(httpProxy.extractModel) + .then(function (savedLabel) { + const org = savedLabel.organization; + if (org && org.labels) { + org.labels.push(savedLabel); + } + return savedLabel; + }); + }, - // Save an existing label on the server - updateLabel: function (label) { - var payload = payloadFromLabel(label); - return httpProxy - .put( - modelsService - .getModelMetadata('label') - .url.single(label.id), - payload, - { - errorMessage: 'error.messages.labels.update_label', - }, - ) - .then(httpProxy.extractModel); - }, + // Save an existing label on the server + updateLabel: function (label) { + const payload = payloadFromLabel(label); + return httpProxy + .put(modelsService.getModelMetadata('label').url.single(label.id), payload, { + errorMessage: 'error.messages.labels.update_label', + }) + .then(httpProxy.extractModel); + }, - // Save a label that may or may not yet exist - saveLabel: function (label) { - if (label.id) { - return labelsService.updateLabel(label); - } - return labelsService.createLabel(label); - }, + // Save a label that may or may not yet exist + saveLabel: function (label) { + if (label.id) { + return labelsService.updateLabel(label); + } + return labelsService.createLabel(label); + }, - // Delete a label on the server - deleteLabel: function (label) { - return httpProxy - .delete( - modelsService - .getModelMetadata('label') - .url.single(label.id), - {}, - { - errorMessage: 'error.messages.labels.delete_label', - }, - ) - .then(function () { - var org = label.organization; - if (org && org.labels) { - _.pull(org.labels, label); - } - return label; - }); - }, + // Delete a label on the server + deleteLabel: function (label) { + return httpProxy + .delete( + modelsService.getModelMetadata('label').url.single(label.id), + {}, + { + errorMessage: 'error.messages.labels.delete_label', + }, + ) + .then(function () { + const org = label.organization; + if (org && org.labels) { + _.pull(org.labels, label); + } + return label; + }); + }, - // Internal methods exposed for testing purposes - payloadFromLabel: payloadFromLabel, - }; + // Internal methods exposed for testing purposes + payloadFromLabel, + }; - // Convert a label into it's JSON API payload - function payloadFromLabel(label) { - // Apply the changes - var includedAttrs = ['name']; - var relationships = []; - if (_.isUndefined(label.id)) { - relationships = ['organization']; - } - return { - data: label.serialize({ - attributes: includedAttrs, - relationships: relationships, - }).data, - }; + // Convert a label into it's JSON API payload + function payloadFromLabel(label) { + // Apply the changes + const includedAttrs = ['name']; + let relationships = []; + if (_.isUndefined(label.id)) { + relationships = ['organization']; } + return { + data: label.serialize({ + attributes: includedAttrs, + relationships, + }).data, + }; + } - return labelsService; + return labelsService; } diff --git a/app/assets/javascripts/angular/services/labels.service.spec.js b/app/assets/javascripts/angular/services/labels.service.spec.js index f8f117c620..b435d0e3b5 100644 --- a/app/assets/javascripts/angular/services/labels.service.spec.js +++ b/app/assets/javascripts/angular/services/labels.service.spec.js @@ -1,230 +1,214 @@ import 'angular-mocks'; // Constants -var labelsService, $q, $rootScope, httpProxy, JsonApiDataStore; +let labelsService, $q, $rootScope, httpProxy, JsonApiDataStore; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('labelsService', function () { - beforeEach(inject(function ( - _labelsService_, - _$q_, - _$rootScope_, - _httpProxy_, - _JsonApiDataStore_, - ) { - var _this = this; - - labelsService = _labelsService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - JsonApiDataStore = _JsonApiDataStore_; - - this.organization = new JsonApiDataStore.Model('organization', 1); - this.organization.setRelationship('labels', []); - JsonApiDataStore.store.sync(this.organization.serialize()); - - this.label = new JsonApiDataStore.Model('label'); - this.label.setAttribute('name', 'Test label'); - this.label.setRelationship('organization', this.organization); - - // Can be changed in individual tests - this.httpResponse = $q.resolve({ - data: this.label, - }); - spyOn(httpProxy, 'post').and.callFake(function () { - return _this.httpResponse; - }); - spyOn(httpProxy, 'put').and.callFake(function () { - return _this.httpResponse; - }); - spyOn(httpProxy, 'delete').and.callFake(function () { - return _this.httpResponse; - }); - })); - - describe('getLabelTemplate', function () { - it('should create an empty label', function () { - expect( - labelsService.getLabelTemplate(this.organization.id), - ).toEqual( - jasmine.objectContaining({ - id: undefined, - _type: 'label', - _attributes: ['name'], - _relationships: ['organization'], - name: '', - organization: this.organization, - }), - ); - }); + beforeEach(inject(function (_labelsService_, _$q_, _$rootScope_, _httpProxy_, _JsonApiDataStore_) { + const _this = this; + + labelsService = _labelsService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + JsonApiDataStore = _JsonApiDataStore_; + + this.organization = new JsonApiDataStore.Model('organization', 1); + this.organization.setRelationship('labels', []); + JsonApiDataStore.store.sync(this.organization.serialize()); + + this.label = new JsonApiDataStore.Model('label'); + this.label.setAttribute('name', 'Test label'); + this.label.setRelationship('organization', this.organization); + + // Can be changed in individual tests + this.httpResponse = $q.resolve({ + data: this.label, }); + spyOn(httpProxy, 'post').and.callFake(function () { + return _this.httpResponse; + }); + spyOn(httpProxy, 'put').and.callFake(function () { + return _this.httpResponse; + }); + spyOn(httpProxy, 'delete').and.callFake(function () { + return _this.httpResponse; + }); + })); + + describe('getLabelTemplate', function () { + it('should create an empty label', function () { + expect(labelsService.getLabelTemplate(this.organization.id)).toEqual( + jasmine.objectContaining({ + id: undefined, + _type: 'label', + _attributes: ['name'], + _relationships: ['organization'], + name: '', + organization: this.organization, + }), + ); + }); + }); - describe('createLabel', function () { - it('should make a network request', function () { - labelsService.createLabel(this.label); - - expect(httpProxy.post).toHaveBeenCalled(); - }); + describe('createLabel', function () { + it('should make a network request', function () { + labelsService.createLabel(this.label); - it( - 'should return a promise that resolves to the new label', - asynchronous(function () { - var _this = this; - - return labelsService - .createLabel(this.label) - .then(function (label) { - expect(label).toBe(_this.label); - }); - }), - ); - - it( - 'should add the label to the organization', - asynchronous(function () { - var _this = this; - this.organization.labels = []; - return labelsService - .createLabel(this.label) - .then(function (label) { - expect(_this.organization.labels).toEqual([label]); - }); - }), - ); + expect(httpProxy.post).toHaveBeenCalled(); }); - describe('updateLabel', function () { - beforeEach(function () { - this.label.setAttribute('id', 1); - }); + it( + 'should return a promise that resolves to the new label', + asynchronous(function () { + const _this = this; - it('should make a network request', function () { - labelsService.updateLabel(this.label); - - expect(httpProxy.put).toHaveBeenCalled(); + return labelsService.createLabel(this.label).then(function (label) { + expect(label).toBe(_this.label); + }); + }), + ); + + it( + 'should add the label to the organization', + asynchronous(function () { + const _this = this; + this.organization.labels = []; + return labelsService.createLabel(this.label).then(function (label) { + expect(_this.organization.labels).toEqual([label]); }); + }), + ); + }); - it( - 'should return a promise that resolves to the label', - asynchronous(function () { - var _this = this; - - return labelsService - .updateLabel(this.label) - .then(function (label) { - expect(label).toBe(_this.label); - }); - }), - ); - - it( - 'should edit the label in the organization', - asynchronous(function () { - var _this = this; - this.organization.setRelationship('labels', [this.label]); - this.label.name = 'New Name'; - - return labelsService - .updateLabel(this.label) - .then(function (label) { - expect(_this.organization.labels).toEqual([label]); - }); - }), - ); + describe('updateLabel', function () { + beforeEach(function () { + this.label.setAttribute('id', 1); }); - describe('saveLabel', function () { - it('should create a new label if the label has no id', function () { - spyOn(labelsService, 'createLabel'); + it('should make a network request', function () { + labelsService.updateLabel(this.label); + + expect(httpProxy.put).toHaveBeenCalled(); + }); - labelsService.saveLabel(this.label); + it( + 'should return a promise that resolves to the label', + asynchronous(function () { + const _this = this; - expect(labelsService.createLabel).toHaveBeenCalledWith(this.label); + return labelsService.updateLabel(this.label).then(function (label) { + expect(label).toBe(_this.label); + }); + }), + ); + + it( + 'should edit the label in the organization', + asynchronous(function () { + const _this = this; + this.organization.setRelationship('labels', [this.label]); + this.label.name = 'New Name'; + + return labelsService.updateLabel(this.label).then(function (label) { + expect(_this.organization.labels).toEqual([label]); }); + }), + ); + }); - it('should update a label if the label has an id', function () { - this.label.setAttribute('id', 1); - spyOn(labelsService, 'updateLabel'); + describe('saveLabel', function () { + it('should create a new label if the label has no id', function () { + spyOn(labelsService, 'createLabel'); - labelsService.saveLabel(this.label); + labelsService.saveLabel(this.label); - expect(labelsService.updateLabel).toHaveBeenCalledWith(this.label); - }); + expect(labelsService.createLabel).toHaveBeenCalledWith(this.label); }); - describe('deleteLabel', function () { - it( - 'should remove the label from the organization', - asynchronous(function () { - var _this = this; - this.organization.labels = [this.label]; - - return labelsService.deleteLabel(this.label).then(function () { - expect(_this.organization.labels).toEqual([]); - expect(httpProxy.delete).toHaveBeenCalled(); - }); - }), - ); - }); + it('should update a label if the label has an id', function () { + this.label.setAttribute('id', 1); + spyOn(labelsService, 'updateLabel'); - describe('payloadFromLabel', function () { - it('should generate a JSON API payload', function () { - this.label = new JsonApiDataStore.Model('label', 3); - this.label.setAttribute('name', 'Label'); - this.label.setRelationship('organization', this.organization); - - expect(labelsService.payloadFromLabel(this.label)).toEqual({ - data: { - type: 'label', - id: 3, - attributes: { - name: 'Label', - }, - }, - }); - }); + labelsService.saveLabel(this.label); - it('should include organization id if it is a new label', function () { - this.people = []; - - this.label = new JsonApiDataStore.Model('label'); - this.label.setAttribute('name', 'Label'); - this.label.setRelationship('organization', this.organization); - - expect(labelsService.payloadFromLabel(this.label)).toEqual({ - data: { - type: 'label', - attributes: { - name: 'Label', - }, - relationships: { - organization: { - data: { - id: this.organization.id, - type: 'organization', - }, - }, - }, - }, - }); + expect(labelsService.updateLabel).toHaveBeenCalledWith(this.label); + }); + }); + + describe('deleteLabel', function () { + it( + 'should remove the label from the organization', + asynchronous(function () { + const _this = this; + this.organization.labels = [this.label]; + + return labelsService.deleteLabel(this.label).then(function () { + expect(_this.organization.labels).toEqual([]); + expect(httpProxy.delete).toHaveBeenCalled(); }); + }), + ); + }); + + describe('payloadFromLabel', function () { + it('should generate a JSON API payload', function () { + this.label = new JsonApiDataStore.Model('label', 3); + this.label.setAttribute('name', 'Label'); + this.label.setRelationship('organization', this.organization); + + expect(labelsService.payloadFromLabel(this.label)).toEqual({ + data: { + type: 'label', + id: 3, + attributes: { + name: 'Label', + }, + }, + }); + }); + + it('should include organization id if it is a new label', function () { + this.people = []; + + this.label = new JsonApiDataStore.Model('label'); + this.label.setAttribute('name', 'Label'); + this.label.setRelationship('organization', this.organization); + + expect(labelsService.payloadFromLabel(this.label)).toEqual({ + data: { + type: 'label', + attributes: { + name: 'Label', + }, + relationships: { + organization: { + data: { + id: this.organization.id, + type: 'organization', + }, + }, + }, + }, + }); }); + }); }); diff --git a/app/assets/javascripts/angular/services/localStorage.service.js b/app/assets/javascripts/angular/services/localStorage.service.js index e6a006e442..32cafca301 100644 --- a/app/assets/javascripts/angular/services/localStorage.service.js +++ b/app/assets/javascripts/angular/services/localStorage.service.js @@ -1,19 +1,19 @@ angular.module('campusContactsApp').service('localStorageService', () => { - const storage = { - set: (key, value) => { - localStorage.setItem(key, angular.toJson(value)); - }, - get: (key) => { - const value = localStorage.getItem(key); - return angular.fromJson(value); - }, - destroy: (key) => { - localStorage.removeItem(key); - }, - clear: () => { - localStorage.clear(); - }, - }; + const storage = { + set: (key, value) => { + localStorage.setItem(key, angular.toJson(value)); + }, + get: (key) => { + const value = localStorage.getItem(key); + return angular.fromJson(value); + }, + destroy: (key) => { + localStorage.removeItem(key); + }, + clear: () => { + localStorage.clear(); + }, + }; - return storage; + return storage; }); diff --git a/app/assets/javascripts/angular/services/loggedInPerson.service.js b/app/assets/javascripts/angular/services/loggedInPerson.service.js index ae32788a64..c70ce35ff3 100644 --- a/app/assets/javascripts/angular/services/loggedInPerson.service.js +++ b/app/assets/javascripts/angular/services/loggedInPerson.service.js @@ -1,105 +1,89 @@ angular.module('campusContactsApp').factory('loggedInPerson', loggedInPerson); -function loggedInPerson( - httpProxy, - modelsService, - organizationService, - permissionService, - _, -) { - var person = null; - var loadingPromise = null; +function loggedInPerson(httpProxy, modelsService, organizationService, permissionService, _) { + let person = null; + let loadingPromise = null; - // Load the logged-in user's profile - function loadMe() { - return httpProxy - .get( - modelsService.getModelMetadata('person').url.single('me'), - { - include: 'user,organizational_permissions', - }, - { - errorMessage: 'error.messages.logged_in_person.load_user', - }, - ) - .then(httpProxy.extractModel); - } + // Load the logged-in user's profile + function loadMe() { + return httpProxy + .get( + modelsService.getModelMetadata('person').url.single('me'), + { + include: 'user,organizational_permissions', + }, + { + errorMessage: 'error.messages.logged_in_person.load_user', + }, + ) + .then(httpProxy.extractModel); + } - function load() { - loadingPromise = loadMe().then(function (me) { - person = me; - return me; - }); - return loadingPromise; - } + function load() { + loadingPromise = loadMe().then(function (me) { + person = me; + return me; + }); + return loadingPromise; + } - // This service exposes an object with a person property that will be set to person model, or null if it has - // not yet been loaded. - return { - // Return the person mode, or null if it has not yet been loaded - get person() { - return person; - }, + // This service exposes an object with a person property that will be set to person model, or null if it has + // not yet been loaded. + return { + // Return the person mode, or null if it has not yet been loaded + get person() { + return person; + }, - set person(newPerson) { - throw new Error('loggedInPerson.person is not settable!'); - }, + set person(newPerson) { + throw new Error('loggedInPerson.person is not settable!'); + }, - get loadingPromise() { - return loadingPromise; - }, + get loadingPromise() { + return loadingPromise; + }, - // Load (or reload) the person - load: load, + // Load (or reload) the person + load, - loadOnce: function () { - if (!loadingPromise) { - load(); - } - return loadingPromise; - }, + loadOnce: function () { + if (!loadingPromise) { + load(); + } + return loadingPromise; + }, - // check if you have admin access on the org or any above it - isAdminAt: function (org) { - var adminOrgIds = _.chain(person.organizational_permissions) - .filter( - (orgPermission) => - `${orgPermission.permission_id}` === - permissionService.adminId, - ) - .map('organization_id') - .value(); - var orgAndAncestry = organizationService.getOrgHierarchyIds(org); - return _.intersection(adminOrgIds, orgAndAncestry).length !== 0; - }, + // check if you have admin access on the org or any above it + isAdminAt: function (org) { + const adminOrgIds = _.chain(person.organizational_permissions) + .filter((orgPermission) => `${orgPermission.permission_id}` === permissionService.adminId) + .map('organization_id') + .value(); + const orgAndAncestry = organizationService.getOrgHierarchyIds(org); + return _.intersection(adminOrgIds, orgAndAncestry).length !== 0; + }, - // check if you have admin access on the org itself. access to any org above it don't count - isDirectAdminAt: (org) => { - return person.organizational_permissions.some( - ({ permission_id, organization_id }) => - `${permission_id}` === permissionService.adminId && - organization_id === org.id, - ); - }, + // check if you have admin access on the org itself. access to any org above it don't count + isDirectAdminAt: (org) => { + return person.organizational_permissions.some( + ({ permission_id, organization_id }) => + `${permission_id}` === permissionService.adminId && organization_id === org.id, + ); + }, - updatePreferences: function (preferences) { - var model = { - data: { - attributes: preferences, - }, - }; - return httpProxy.put( - modelsService.getModelMetadata('user').url.single('me'), - model, - { - errorMessage: - 'error.messages.preferences_page.update_preferences', - }, - ); + updatePreferences: function (preferences) { + const model = { + data: { + attributes: preferences, }, + }; + return httpProxy.put(modelsService.getModelMetadata('user').url.single('me'), model, { + errorMessage: 'error.messages.preferences_page.update_preferences', + }); + }, - clearLoadingPromise: () => { - loadingPromise = null; - }, - }; + clearLoadingPromise: () => { + loadingPromise = null; + }, + }; } diff --git a/app/assets/javascripts/angular/services/loggedInPerson.service.spec.js b/app/assets/javascripts/angular/services/loggedInPerson.service.spec.js index 7d949afd1d..9fc23772ef 100644 --- a/app/assets/javascripts/angular/services/loggedInPerson.service.spec.js +++ b/app/assets/javascripts/angular/services/loggedInPerson.service.spec.js @@ -1,117 +1,111 @@ import 'angular-mocks'; // Constants -var loggedInPerson, $q, $rootScope, httpProxy, JsonApiDataStore; +let loggedInPerson, $q, $rootScope, httpProxy, JsonApiDataStore; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('loggedInPerson service', function () { - beforeEach(inject(function ( - _loggedInPerson_, - _$q_, - _$rootScope_, - _httpProxy_, - _JsonApiDataStore_, - ) { - var _this = this; - - loggedInPerson = _loggedInPerson_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - JsonApiDataStore = _JsonApiDataStore_; + beforeEach(inject(function (_loggedInPerson_, _$q_, _$rootScope_, _httpProxy_, _JsonApiDataStore_) { + const _this = this; - this.person = { - id: 123, - name: 'John Doe', - }; + loggedInPerson = _loggedInPerson_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; + JsonApiDataStore = _JsonApiDataStore_; - // Can be changed in individual tests - this.httpResponse = $q.resolve({ - data: this.person, - }); - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return _this.httpResponse; - }); + this.person = { + id: 123, + name: 'John Doe', + }; - spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.person); - })); + // Can be changed in individual tests + this.httpResponse = $q.resolve({ + data: this.person, + }); + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return _this.httpResponse; + }); - describe('loggedInPerson.load', function () { - it('should GET a URL', function () { - loggedInPerson.load(); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { include: jasmine.any(String) }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.person); + })); - it( - 'should return a promise', - asynchronous(function () { - var _this = this; - return loggedInPerson.load().then(function (loadedPerson) { - expect(loadedPerson).toBe(_this.person); - }); - }), - ); + describe('loggedInPerson.load', function () { + it('should GET a URL', function () { + loggedInPerson.load(); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { include: jasmine.any(String) }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); }); - describe('loggedInPerson.person', function () { - it('should initially be null', function () { - expect(loggedInPerson.person).toBe(null); + it( + 'should return a promise', + asynchronous(function () { + const _this = this; + return loggedInPerson.load().then(function (loadedPerson) { + expect(loadedPerson).toBe(_this.person); }); + }), + ); + }); - it( - 'should eventually be a person', - asynchronous(function () { - var _this = this; - return loggedInPerson.load().then(function () { - expect(loggedInPerson.person).toBe(_this.person); - }); - }), - ); + describe('loggedInPerson.person', function () { + it('should initially be null', function () { + expect(loggedInPerson.person).toBe(null); + }); - it( - 'should still be null after an error', - asynchronous(function () { - this.httpResponse = $q.reject(new Error()); - return loggedInPerson.load().catch(function () { - expect(loggedInPerson.person).toBe(null); - }); - }), - ); + it( + 'should eventually be a person', + asynchronous(function () { + const _this = this; + return loggedInPerson.load().then(function () { + expect(loggedInPerson.person).toBe(_this.person); + }); + }), + ); - it('should not be settable', function () { - expect(function () { - loggedInPerson.person = this.person; - }).toThrow(); + it( + 'should still be null after an error', + asynchronous(function () { + this.httpResponse = $q.reject(new Error()); + return loggedInPerson.load().catch(function () { + expect(loggedInPerson.person).toBe(null); }); + }), + ); + + it('should not be settable', function () { + expect(function () { + loggedInPerson.person = this.person; + }).toThrow(); }); + }); - describe('loggedInPerson.loadingPromise', function () { - it('should be the return value of loggedInPerson.load()', function () { - var loadingPromise = loggedInPerson.load(); - expect(loggedInPerson.loadingPromise).toBe(loadingPromise); - }); + describe('loggedInPerson.loadingPromise', function () { + it('should be the return value of loggedInPerson.load()', function () { + const loadingPromise = loggedInPerson.load(); + expect(loggedInPerson.loadingPromise).toBe(loadingPromise); }); + }); }); diff --git a/app/assets/javascripts/angular/services/ministryViewTabs.service.js b/app/assets/javascripts/angular/services/ministryViewTabs.service.js index db1a3d3e84..e64c06c97b 100644 --- a/app/assets/javascripts/angular/services/ministryViewTabs.service.js +++ b/app/assets/javascripts/angular/services/ministryViewTabs.service.js @@ -1,13 +1,5 @@ -const ministryViewTabs = [ - 'suborgs', - 'team', - 'groups', - 'people', - 'surveys', - 'surveyResponses', - 'labels', -]; +const ministryViewTabs = ['suborgs', 'team', 'groups', 'people', 'surveys', 'surveyResponses', 'labels']; angular - .module('campusContactsApp') - .constant('ministryViewTabs', ministryViewTabs) - .constant('ministryViewDefaultTab', ministryViewTabs[0]); + .module('campusContactsApp') + .constant('ministryViewTabs', ministryViewTabs) + .constant('ministryViewDefaultTab', ministryViewTabs[0]); diff --git a/app/assets/javascripts/angular/services/models.service.js b/app/assets/javascripts/angular/services/models.service.js index 6b7fd2f698..9f347b5dbc 100644 --- a/app/assets/javascripts/angular/services/models.service.js +++ b/app/assets/javascripts/angular/services/models.service.js @@ -1,120 +1,120 @@ angular.module('campusContactsApp').factory('modelsService', modelsService); function modelsService(_) { - function generateUrls(root, extras) { - return { - // The base URL - root: root, + function generateUrls(root, extras) { + return { + // The base URL + root, - // The URL for a single model - single: function (id) { - return root + '/' + id; - }, + // The URL for a single model + single: function (id) { + return root + '/' + id; + }, - // The URL for all models - all: root, - }; - } - - var modelMetadata = { - person: { - include: 'people', - url: generateUrls('/people'), - }, - user: { - include: 'users', - url: generateUrls('/users'), - }, - email_address: { - include: 'email_addresses', - url: generateUrls('/email_addresses'), - }, - phone_number: { - include: 'phone_numbers', - url: generateUrls('/phone_numbers'), - }, - phone_number_validation: { - include: 'phone_number_validations', - url: generateUrls('/phone_numbers/validations'), - }, - address: { - include: 'addresses', - url: generateUrls('/addresses'), - }, - organization: { - include: 'organizations', - url: generateUrls('/organizations'), - }, - person_report: { - include: 'person_reports', - url: generateUrls('/reports/people'), - }, - organization_report: { - include: 'organization_reports', - url: generateUrls('/reports/organizations'), - }, - label: { - include: 'labels', - url: generateUrls('/labels'), - }, - organizational_label: { - url: generateUrls('/organizational_labels'), - }, - interaction: { - include: 'interactions', - url: generateUrls('/interactions'), - }, - contact_assignment: { - include: 'contact_assignments', - url: generateUrls('/contact_assignments'), - }, - group: { - include: 'groups', - url: generateUrls('/groups'), - }, - group_membership: { - url: generateUrls('/group_memberships'), - }, - filter_stats: { - url: generateUrls('/filter_stats'), - }, - survey: { - include: 'surveys', - url: generateUrls('/surveys'), - }, - sms_keyword: { - include: 'sms_keywords', - url: generateUrls('/sms_keywords'), - }, - survey_report: { - include: 'survey_reports', - url: generateUrls('/reports/survey'), - }, - survey_questions: { - include: 'survey_questions', - url: generateUrls('/survey/questions'), - }, - bulk_create_job: { - include: 'bulk_create_jobs', - url: generateUrls('/answer_sheets/bulk_create_jobs'), - }, - answer_sheet: { - url: generateUrls('/answer_sheets'), - }, + // The URL for all models + all: root, }; + } - var modelsService = { - // Return the metadata for a particular model - getModelMetadata: function (model) { - return modelMetadata[model]; - }, + const modelMetadata = { + person: { + include: 'people', + url: generateUrls('/people'), + }, + user: { + include: 'users', + url: generateUrls('/users'), + }, + email_address: { + include: 'email_addresses', + url: generateUrls('/email_addresses'), + }, + phone_number: { + include: 'phone_numbers', + url: generateUrls('/phone_numbers'), + }, + phone_number_validation: { + include: 'phone_number_validations', + url: generateUrls('/phone_numbers/validations'), + }, + address: { + include: 'addresses', + url: generateUrls('/addresses'), + }, + organization: { + include: 'organizations', + url: generateUrls('/organizations'), + }, + person_report: { + include: 'person_reports', + url: generateUrls('/reports/people'), + }, + organization_report: { + include: 'organization_reports', + url: generateUrls('/reports/organizations'), + }, + label: { + include: 'labels', + url: generateUrls('/labels'), + }, + organizational_label: { + url: generateUrls('/organizational_labels'), + }, + interaction: { + include: 'interactions', + url: generateUrls('/interactions'), + }, + contact_assignment: { + include: 'contact_assignments', + url: generateUrls('/contact_assignments'), + }, + group: { + include: 'groups', + url: generateUrls('/groups'), + }, + group_membership: { + url: generateUrls('/group_memberships'), + }, + filter_stats: { + url: generateUrls('/filter_stats'), + }, + survey: { + include: 'surveys', + url: generateUrls('/surveys'), + }, + sms_keyword: { + include: 'sms_keywords', + url: generateUrls('/sms_keywords'), + }, + survey_report: { + include: 'survey_reports', + url: generateUrls('/reports/survey'), + }, + survey_questions: { + include: 'survey_questions', + url: generateUrls('/survey/questions'), + }, + bulk_create_job: { + include: 'bulk_create_jobs', + url: generateUrls('/answer_sheets/bulk_create_jobs'), + }, + answer_sheet: { + url: generateUrls('/answer_sheets'), + }, + }; - // Return the single URL for a model - getModelUrl: function (model) { - var metadata = modelsService.getModelMetadata(model._type); - return metadata && metadata.url.single(model.id); - }, - }; + var modelsService = { + // Return the metadata for a particular model + getModelMetadata: function (model) { + return modelMetadata[model]; + }, + + // Return the single URL for a model + getModelUrl: function (model) { + const metadata = modelsService.getModelMetadata(model._type); + return metadata && metadata.url.single(model.id); + }, + }; - return modelsService; + return modelsService; } diff --git a/app/assets/javascripts/angular/services/models.service.spec.js b/app/assets/javascripts/angular/services/models.service.spec.js index c4ee83226c..e2f53d4aab 100644 --- a/app/assets/javascripts/angular/services/models.service.spec.js +++ b/app/assets/javascripts/angular/services/models.service.spec.js @@ -1,33 +1,27 @@ import 'angular-mocks'; // Constants -var modelsService; +let modelsService; describe('modelsService', function () { - beforeEach(inject(function (_modelsService_) { - modelsService = _modelsService_; - })); + beforeEach(inject(function (_modelsService_) { + modelsService = _modelsService_; + })); - describe('getModelUrl', function () { - it('should return the URL for models', function () { - expect(modelsService.getModelUrl({ _type: 'person', id: 1 })).toBe( - '/people/1', - ); - expect( - modelsService.getModelUrl({ _type: 'organization', id: 2 }), - ).toBe('/organizations/2'); - expect(modelsService.getModelUrl({ _type: 'group', id: 3 })).toBe( - '/groups/3', - ); - }); + describe('getModelUrl', function () { + it('should return the URL for models', function () { + expect(modelsService.getModelUrl({ _type: 'person', id: 1 })).toBe('/people/1'); + expect(modelsService.getModelUrl({ _type: 'organization', id: 2 })).toBe('/organizations/2'); + expect(modelsService.getModelUrl({ _type: 'group', id: 3 })).toBe('/groups/3'); + }); - it('should return undefined for invalid model types', function () { - expect( - modelsService.getModelUrl({ - _type: 'organizational_permission', - id: 1, - }), - ).toBeUndefined(); - }); + it('should return undefined for invalid model types', function () { + expect( + modelsService.getModelUrl({ + _type: 'organizational_permission', + id: 1, + }), + ).toBeUndefined(); }); + }); }); diff --git a/app/assets/javascripts/angular/services/oktaService.js b/app/assets/javascripts/angular/services/oktaService.js index ba85d3cfa7..421129921e 100644 --- a/app/assets/javascripts/angular/services/oktaService.js +++ b/app/assets/javascripts/angular/services/oktaService.js @@ -4,48 +4,43 @@ let idToken = 'none'; let accessToken = 'none'; function setIdToken(token) { - idToken = token; + idToken = token; } function setAccessToken(token) { - accessToken = token; + accessToken = token; } function oktaService(authenticationService, envService) { - const authClient = new OktaAuth({ - issuer: 'https://signon.okta.com/oauth2/default', - clientId: envService.read('oktaClientId'), - pkce: true, - tokenManager: { - secure: true, - }, - devMode: true, - }); + const authClient = new OktaAuth({ + issuer: 'https://signon.okta.com/oauth2/default', + clientId: envService.read('oktaClientId'), + pkce: true, + tokenManager: { + secure: true, + }, + devMode: true, + }); - return { - init: () => { - authClient.start(); - }, - signOut: () => { - authClient.signOut(); - }, - signIn: async () => { - // There are other options like full page redirects or passing username/password directly but this seemed like the nicest to me. - const response = await authClient.token.getWithPopup({ - scopes: ['openid', 'email', 'profile'], - }); + return { + init: () => { + authClient.start(); + }, + signOut: () => { + authClient.signOut(); + }, + signIn: async () => { + // There are other options like full page redirects or passing username/password directly but this seemed like the nicest to me. + const response = await authClient.token.getWithPopup({ + scopes: ['openid', 'email', 'profile'], + }); - setIdToken(response.tokens.idToken.value); - setAccessToken(response.tokens.accessToken.value); - authClient.tokenManager.add('idToken', response.tokens.idToken); - authClient.tokenManager.add( - 'accessToken', - response.tokens.accessToken, - ); + setIdToken(response.tokens.idToken.value); + setAccessToken(response.tokens.accessToken.value); + authClient.tokenManager.add('idToken', response.tokens.idToken); + authClient.tokenManager.add('accessToken', response.tokens.accessToken); - authenticationService.authorizeOktaAccess( - response.tokens.accessToken.accessToken, - ); - }, - }; + authenticationService.authorizeOktaAccess(response.tokens.accessToken.accessToken); + }, + }; } diff --git a/app/assets/javascripts/angular/services/organization.service.js b/app/assets/javascripts/angular/services/organization.service.js index bf31bac185..cd15425249 100644 --- a/app/assets/javascripts/angular/services/organization.service.js +++ b/app/assets/javascripts/angular/services/organization.service.js @@ -1,172 +1,139 @@ -angular - .module('campusContactsApp') - .factory('organizationService', organizationService); +angular.module('campusContactsApp').factory('organizationService', organizationService); -function organizationService( - $q, - httpProxy, - modelsService, - JsonApiDataStore, - _, -) { - // Keep track of the orgs that the user does not have access to - let inaccessibleOrgs = new Set(); +function organizationService($q, httpProxy, modelsService, JsonApiDataStore, _) { + // Keep track of the orgs that the user does not have access to + let inaccessibleOrgs = new Set(); - const organizationService = { - // Load a list of organizations - loadOrgsById: function (orgIds, errorMessage) { - if (orgIds.length === 0) { - return $q.resolve([]); - } + const organizationService = { + // Load a list of organizations + loadOrgsById: function (orgIds, errorMessage) { + if (orgIds.length === 0) { + return $q.resolve([]); + } - return httpProxy - .get( - modelsService.getModelMetadata('organization').url.all, - { - 'filters[ids]': orgIds.join(','), - 'filters[user_created]': false, - }, - { - errorMessage: errorMessage, - }, - ) - .then(httpProxy.extractModels); - }, + return httpProxy + .get( + modelsService.getModelMetadata('organization').url.all, + { + 'filters[ids]': orgIds.join(','), + 'filters[user_created]': false, + }, + { + errorMessage, + }, + ) + .then(httpProxy.extractModels); + }, - // Lookup and return the org with the specified id if it is loaded - lookupOrg: function (orgId) { - return JsonApiDataStore.store.find('organization', orgId); - }, + // Lookup and return the org with the specified id if it is loaded + lookupOrg: function (orgId) { + return JsonApiDataStore.store.find('organization', orgId); + }, - // Generate an array of the organization's ancestors as org ids (including the organization itself) - getOrgHierarchyIds: function (org) { - if (!org) { - return []; - } - return (org.ancestry ? org.ancestry.split('/') : []).concat(org.id); - }, + // Generate an array of the organization's ancestors as org ids (including the organization itself) + getOrgHierarchyIds: function (org) { + if (!org) { + return []; + } + return (org.ancestry ? org.ancestry.split('/') : []).concat(org.id); + }, - // Return a promise that resolves to an array of the organization's ancestors (including the organization - // itself) - getOrgHierarchy: function (org) { - var hierarchyIds = _.difference( - organizationService.getOrgHierarchyIds(org), - [...inaccessibleOrgs], - ); - var unloadedOrgIds = hierarchyIds.filter(function (orgId) { - return !httpProxy.isLoaded( - organizationService.lookupOrg(orgId), - ); - }); + // Return a promise that resolves to an array of the organization's ancestors (including the organization + // itself) + getOrgHierarchy: function (org) { + const hierarchyIds = _.difference(organizationService.getOrgHierarchyIds(org), [...inaccessibleOrgs]); + const unloadedOrgIds = hierarchyIds.filter(function (orgId) { + return !httpProxy.isLoaded(organizationService.lookupOrg(orgId)); + }); - return organizationService - .loadOrgsById( - unloadedOrgIds, - 'error.messages.organization.load_ancestry', - ) - .then(function (loadedOrgs) { - // Mark as inaccessible orgs that we attempted to load but were not included in the response - const newInaccessibleOrgs = _.difference( - unloadedOrgIds, - _.map(loadedOrgs, 'id'), - ); - inaccessibleOrgs = new Set([ - ...inaccessibleOrgs, - ...newInaccessibleOrgs, - ]); + return organizationService + .loadOrgsById(unloadedOrgIds, 'error.messages.organization.load_ancestry') + .then(function (loadedOrgs) { + // Mark as inaccessible orgs that we attempted to load but were not included in the response + const newInaccessibleOrgs = _.difference(unloadedOrgIds, _.map(loadedOrgs, 'id')); + inaccessibleOrgs = new Set([...inaccessibleOrgs, ...newInaccessibleOrgs]); - // Filter out organizations that were not loaded because the user does not have access to them - return hierarchyIds - .map(organizationService.lookupOrg) - .filter(_.identity); - }); - }, + // Filter out organizations that were not loaded because the user does not have access to them + return hierarchyIds.map(organizationService.lookupOrg).filter(_.identity); + }); + }, - // Search for organizations in the same org tree as the specified org that match the query - searchOrgs: function (org, query, deduper) { - var rootOrgId = organizationService.getOrgHierarchyIds(org)[0]; - return httpProxy - .get( - '/organization_search', - { - q: query, - ancestry_roots: rootOrgId, - limit: 10, - }, - { - deduper: deduper, - errorMessage: - 'error.messages.organization.search_organizations', - }, - ) - .then(httpProxy.extractModels); - }, + // Search for organizations in the same org tree as the specified org that match the query + searchOrgs: function (org, query, deduper) { + const rootOrgId = organizationService.getOrgHierarchyIds(org)[0]; + return httpProxy + .get( + '/organization_search', + { + q: query, + ancestry_roots: rootOrgId, + limit: 10, + }, + { + deduper, + errorMessage: 'error.messages.organization.search_organizations', + }, + ) + .then(httpProxy.extractModels); + }, - createOrg: (org, parentOrg) => { - return httpProxy - .post( - modelsService.getModelMetadata('organization').url.all, - { - data: { - type: 'organization', - attributes: { - name: org.name, - terminology: org.terminology, - show_sub_orgs: org.show_sub_orgs, - }, - relationships: { - parent: { - data: { - type: 'organization', - id: parentOrg.id, - }, - }, - }, - }, - }, - { - errorMessage: 'error.messages.organization.create', - }, - ) - .then(httpProxy.extractModels); - }, + createOrg: (org, parentOrg) => { + return httpProxy + .post( + modelsService.getModelMetadata('organization').url.all, + { + data: { + type: 'organization', + attributes: { + name: org.name, + terminology: org.terminology, + show_sub_orgs: org.show_sub_orgs, + }, + relationships: { + parent: { + data: { + type: 'organization', + id: parentOrg.id, + }, + }, + }, + }, + }, + { + errorMessage: 'error.messages.organization.create', + }, + ) + .then(httpProxy.extractModels); + }, - saveOrg: (org) => { - return httpProxy - .put( - modelsService - .getModelMetadata('organization') - .url.single(org.id), - { - data: { - type: 'organization', - attributes: { - name: org.name, - terminology: org.terminology, - show_sub_orgs: org.show_sub_orgs, - }, - }, - }, - { - errorMessage: 'error.messages.organization.update', - }, - ) - .then(httpProxy.extractModels); - }, + saveOrg: (org) => { + return httpProxy + .put( + modelsService.getModelMetadata('organization').url.single(org.id), + { + data: { + type: 'organization', + attributes: { + name: org.name, + terminology: org.terminology, + show_sub_orgs: org.show_sub_orgs, + }, + }, + }, + { + errorMessage: 'error.messages.organization.update', + }, + ) + .then(httpProxy.extractModels); + }, - deleteOrg: (org) => { - return httpProxy.delete( - modelsService - .getModelMetadata('organization') - .url.single(org.id), - null, - { - errorMessage: 'error.messages.organization.delete', - showApiMessage: true, - }, - ); - }, - }; + deleteOrg: (org) => { + return httpProxy.delete(modelsService.getModelMetadata('organization').url.single(org.id), null, { + errorMessage: 'error.messages.organization.delete', + showApiMessage: true, + }); + }, + }; - return organizationService; + return organizationService; } diff --git a/app/assets/javascripts/angular/services/organization.service.spec.js b/app/assets/javascripts/angular/services/organization.service.spec.js index 55f792c6cd..cb222a16f6 100644 --- a/app/assets/javascripts/angular/services/organization.service.spec.js +++ b/app/assets/javascripts/angular/services/organization.service.spec.js @@ -1,145 +1,106 @@ import 'angular-mocks'; // Constants -var organizationService, $rootScope, $q, JsonApiDataStore, _; +let organizationService, $rootScope, $q, JsonApiDataStore, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('organizationService', function () { - beforeEach(inject(function ( - _organizationService_, - _$rootScope_, - _$q_, - _JsonApiDataStore_, - ___, - ) { - organizationService = _organizationService_; - $rootScope = _$rootScope_; - $q = _$q_; - JsonApiDataStore = _JsonApiDataStore_; - _ = ___; + beforeEach(inject(function (_organizationService_, _$rootScope_, _$q_, _JsonApiDataStore_, ___) { + organizationService = _organizationService_; + $rootScope = _$rootScope_; + $q = _$q_; + JsonApiDataStore = _JsonApiDataStore_; + _ = ___; - var _this = this; + const _this = this; - this.orgs = { - 1: { id: '1', ancestry: null }, - 2: { id: '2', ancestry: '1' }, - 3: { id: '3', ancestry: '1/2' }, - 5: { id: '5', ancestry: '1/2/3/4' }, - }; + this.orgs = { + 1: { id: '1', ancestry: null }, + 2: { id: '2', ancestry: '1' }, + 3: { id: '3', ancestry: '1/2' }, + 5: { id: '5', ancestry: '1/2/3/4' }, + }; - spyOn(JsonApiDataStore.store, 'find').and.callFake(function ( - type, - orgId, - ) { - return _this.orgs[orgId]; - }); - })); + spyOn(JsonApiDataStore.store, 'find').and.callFake(function (type, orgId) { + return _this.orgs[orgId]; + }); + })); - describe('getOrgHierarchyIds', function () { - it('should handle null orgs', function () { - expect( - organizationService.getOrgHierarchyIds(this.orgs[0]), - ).toEqual([]); - }); + describe('getOrgHierarchyIds', function () { + it('should handle null orgs', function () { + expect(organizationService.getOrgHierarchyIds(this.orgs[0])).toEqual([]); + }); - it('should handle orgs with no ancestry', function () { - expect( - organizationService.getOrgHierarchyIds(this.orgs[1]), - ).toEqual(['1']); - }); + it('should handle orgs with no ancestry', function () { + expect(organizationService.getOrgHierarchyIds(this.orgs[1])).toEqual(['1']); + }); - it('should handle orgs with ancestry', function () { - expect( - organizationService.getOrgHierarchyIds(this.orgs[3]), - ).toEqual(['1', '2', '3']); - }); + it('should handle orgs with ancestry', function () { + expect(organizationService.getOrgHierarchyIds(this.orgs[3])).toEqual(['1', '2', '3']); }); + }); - describe('getOrgHierarchy', function () { - it( - 'should not load orgs when all orgs are loaded', - asynchronous(function () { - spyOn(organizationService, 'loadOrgsById').and.returnValue( - $q.resolve([]), - ); - return organizationService - .getOrgHierarchy(this.orgs[3]) - .then(function (orgs) { - expect(_.map(orgs, 'id')).toEqual(['1', '2', '3']); - expect( - organizationService.loadOrgsById, - ).toHaveBeenCalledWith([], jasmine.any(String)); - }); - }), - ); + describe('getOrgHierarchy', function () { + it( + 'should not load orgs when all orgs are loaded', + asynchronous(function () { + spyOn(organizationService, 'loadOrgsById').and.returnValue($q.resolve([])); + return organizationService.getOrgHierarchy(this.orgs[3]).then(function (orgs) { + expect(_.map(orgs, 'id')).toEqual(['1', '2', '3']); + expect(organizationService.loadOrgsById).toHaveBeenCalledWith([], jasmine.any(String)); + }); + }), + ); - it( - 'should load missing orgs when not all orgs are loaded', - asynchronous(function () { - var _this = this; - spyOn(organizationService, 'loadOrgsById').and.callFake( - function () { - // Simulate the load of org 4 - _this.orgs[4] = { id: '4', ancestry: '1/2/3/4' }; - return $q.resolve(); - }, - ); + it( + 'should load missing orgs when not all orgs are loaded', + asynchronous(function () { + const _this = this; + spyOn(organizationService, 'loadOrgsById').and.callFake(function () { + // Simulate the load of org 4 + _this.orgs[4] = { id: '4', ancestry: '1/2/3/4' }; + return $q.resolve(); + }); - return organizationService - .getOrgHierarchy(this.orgs[5]) - .then(function (orgs) { - expect(_.map(orgs, 'id')).toEqual([ - '1', - '2', - '3', - '4', - '5', - ]); - expect( - organizationService.loadOrgsById, - ).toHaveBeenCalledWith(['4'], jasmine.any(String)); - }); - }), - ); + return organizationService.getOrgHierarchy(this.orgs[5]).then(function (orgs) { + expect(_.map(orgs, 'id')).toEqual(['1', '2', '3', '4', '5']); + expect(organizationService.loadOrgsById).toHaveBeenCalledWith(['4'], jasmine.any(String)); + }); + }), + ); - it( - 'should ignore unloadable orgs', - asynchronous(function () { - var _this = this; - spyOn(organizationService, 'loadOrgsById').and.returnValue( - $q.resolve([]), - ); - return organizationService - .getOrgHierarchy(this.orgs[5]) - .then(function (orgs) { - // Should not include org 4 - expect(_.map(orgs, 'id')).toEqual(['1', '2', '3', '5']); + it( + 'should ignore unloadable orgs', + asynchronous(function () { + const _this = this; + spyOn(organizationService, 'loadOrgsById').and.returnValue($q.resolve([])); + return organizationService.getOrgHierarchy(this.orgs[5]).then(function (orgs) { + // Should not include org 4 + expect(_.map(orgs, 'id')).toEqual(['1', '2', '3', '5']); - // Should not attempt to reload org 4 - organizationService.loadOrgsById.calls.reset(); - organizationService.getOrgHierarchy(_this.orgs[5]); - expect( - organizationService.loadOrgsById, - ).toHaveBeenCalledWith([], jasmine.any(String)); - }); - }), - ); - }); + // Should not attempt to reload org 4 + organizationService.loadOrgsById.calls.reset(); + organizationService.getOrgHierarchy(_this.orgs[5]); + expect(organizationService.loadOrgsById).toHaveBeenCalledWith([], jasmine.any(String)); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/services/peopleSearch.service.js b/app/assets/javascripts/angular/services/peopleSearch.service.js index 390f5104c3..58f529a514 100644 --- a/app/assets/javascripts/angular/services/peopleSearch.service.js +++ b/app/assets/javascripts/angular/services/peopleSearch.service.js @@ -1,23 +1,21 @@ -angular - .module('campusContactsApp') - .factory('peopleSearchService', peopleSearchService); +angular.module('campusContactsApp').factory('peopleSearchService', peopleSearchService); function peopleSearchService(httpProxy, modelsService) { - return { - search: function (searchQuery) { - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - { - 'filters[name]': searchQuery, - include: 'organizational_permissions.organization', - 'fields[organization]': 'name', - }, - { - errorMessage: 'error.messages.person.search', - }, - ) - .then(httpProxy.extractModel); - }, - }; + return { + search: function (searchQuery) { + return httpProxy + .get( + modelsService.getModelMetadata('person').url.all, + { + 'filters[name]': searchQuery, + include: 'organizational_permissions.organization', + 'fields[organization]': 'name', + }, + { + errorMessage: 'error.messages.person.search', + }, + ) + .then(httpProxy.extractModel); + }, + }; } diff --git a/app/assets/javascripts/angular/services/peopleSearch.service.spec.js b/app/assets/javascripts/angular/services/peopleSearch.service.spec.js index 222252e37b..a6fad27b1c 100644 --- a/app/assets/javascripts/angular/services/peopleSearch.service.spec.js +++ b/app/assets/javascripts/angular/services/peopleSearch.service.spec.js @@ -1,71 +1,63 @@ import 'angular-mocks'; // Constants -var peopleSearchService, $q, $rootScope, httpProxy; +let peopleSearchService, $q, $rootScope, httpProxy; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('peopleSearchService', function () { - beforeEach(inject(function ( - _peopleSearchService_, - _$q_, - _$rootScope_, - _httpProxy_, - ) { - var _this = this; + beforeEach(inject(function (_peopleSearchService_, _$q_, _$rootScope_, _httpProxy_) { + const _this = this; - peopleSearchService = _peopleSearchService_; - $q = _$q_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; + peopleSearchService = _peopleSearchService_; + $q = _$q_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; - spyOn(httpProxy, 'get').and.callFake(function () { - return _this.httpResponse; - }); - })); + spyOn(httpProxy, 'get').and.callFake(function () { + return _this.httpResponse; + }); + })); - describe('search', function () { - it( - 'should make a request for search results', - asynchronous(function () { - var _this = this; + describe('search', function () { + it( + 'should make a request for search results', + asynchronous(function () { + const _this = this; - _this.httpResponse = $q.resolve({ - data: 'results', - }); + _this.httpResponse = $q.resolve({ + data: 'results', + }); - return peopleSearchService - .search('query') - .then(function (results) { - expect(httpProxy.get).toHaveBeenCalledWith( - '/people', - { - 'filters[name]': 'query', - include: - 'organizational_permissions.organization', - 'fields[organization]': 'name', - }, - { errorMessage: jasmine.any(String) }, - ); - expect(results).toEqual('results'); - }); - }), - ); - }); + return peopleSearchService.search('query').then(function (results) { + expect(httpProxy.get).toHaveBeenCalledWith( + '/people', + { + 'filters[name]': 'query', + include: 'organizational_permissions.organization', + 'fields[organization]': 'name', + }, + { errorMessage: jasmine.any(String) }, + ); + expect(results).toEqual('results'); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/services/period.service.js b/app/assets/javascripts/angular/services/period.service.js index 00bfcb9149..bfb6d0e1a7 100644 --- a/app/assets/javascripts/angular/services/period.service.js +++ b/app/assets/javascripts/angular/services/period.service.js @@ -2,62 +2,61 @@ angular.module('campusContactsApp').factory('periodService', periodService); // This service contains action logic that is shared across components function periodService($window, $rootScope) { - var defaultPeriod = 'P3M'; - var period = null; - var changeEventName = 'periodService.period-change'; - - // Load the report period from localStorage - function loadPeriod() { - try { - period = - $window.localStorage.getItem('reportPeriod') || defaultPeriod; - } catch (e) { - period = defaultPeriod; - } + const defaultPeriod = 'P3M'; + let period = null; + const changeEventName = 'periodService.period-change'; + + // Load the report period from localStorage + function loadPeriod() { + try { + period = $window.localStorage.getItem('reportPeriod') || defaultPeriod; + } catch (e) { + period = defaultPeriod; } - - // Save the report period to localStorage - function savePeriod() { - try { - $window.localStorage.setItem('reportPeriod', period); - } catch (e) { - // Period cannot be saved - } + } + + // Save the report period to localStorage + function savePeriod() { + try { + $window.localStorage.setItem('reportPeriod', period); + } catch (e) { + // Period cannot be saved } - - loadPeriod(); - - return { - // Return the current report period - getPeriod: function () { - return period; - }, - - // Set the current report period - setPeriod: function (newPeriod) { - period = newPeriod; - $rootScope.$emit(changeEventName, newPeriod); - savePeriod(); - }, - - // Return an array of the possible periods - getPeriods: function () { - return [ - { label: 'dashboard.report_periods.one_week', period: 'P1W' }, - { label: 'dashboard.report_periods.one_month', period: 'P1M' }, - { - label: 'dashboard.report_periods.three_months', - period: 'P3M', - }, - { label: 'dashboard.report_periods.six_months', period: 'P6M' }, - { label: 'dashboard.report_periods.one_year', period: 'P1Y' }, - ]; - }, - - // Request that a callback be called withenver the period changes - subscribe: function ($scope, callback) { - var unsubscribe = $rootScope.$on(changeEventName, callback); - $scope.$on('$destroy', unsubscribe); + } + + loadPeriod(); + + return { + // Return the current report period + getPeriod: function () { + return period; + }, + + // Set the current report period + setPeriod: function (newPeriod) { + period = newPeriod; + $rootScope.$emit(changeEventName, newPeriod); + savePeriod(); + }, + + // Return an array of the possible periods + getPeriods: function () { + return [ + { label: 'dashboard.report_periods.one_week', period: 'P1W' }, + { label: 'dashboard.report_periods.one_month', period: 'P1M' }, + { + label: 'dashboard.report_periods.three_months', + period: 'P3M', }, - }; + { label: 'dashboard.report_periods.six_months', period: 'P6M' }, + { label: 'dashboard.report_periods.one_year', period: 'P1Y' }, + ]; + }, + + // Request that a callback be called withenver the period changes + subscribe: function ($scope, callback) { + const unsubscribe = $rootScope.$on(changeEventName, callback); + $scope.$on('$destroy', unsubscribe); + }, + }; } diff --git a/app/assets/javascripts/angular/services/permission.service.js b/app/assets/javascripts/angular/services/permission.service.js index fb1016a046..6e7081cb86 100644 --- a/app/assets/javascripts/angular/services/permission.service.js +++ b/app/assets/javascripts/angular/services/permission.service.js @@ -1,13 +1,11 @@ -angular - .module('campusContactsApp') - .factory('permissionService', permissionService); +angular.module('campusContactsApp').factory('permissionService', permissionService); // This service contains action logic that is shared across components function permissionService() { - return { - adminId: '1', - noPermissionId: '2', - userId: '4', - adminAndUserIds: ['1', '4'], - }; + return { + adminId: '1', + noPermissionId: '2', + userId: '4', + adminAndUserIds: ['1', '4'], + }; } diff --git a/app/assets/javascripts/angular/services/person.service.js b/app/assets/javascripts/angular/services/person.service.js index f10ea94a97..710cf05cbd 100644 --- a/app/assets/javascripts/angular/services/person.service.js +++ b/app/assets/javascripts/angular/services/person.service.js @@ -1,388 +1,291 @@ angular.module('campusContactsApp').factory('personService', personService); -function personService( - httpProxy, - modelsService, - JsonApiDataStore, - permissionService, - _, - $log, -) { - // Convert an array of string ids into an array of options with the schema { id, i18n } - // Used by personService.get*Options() - function generateOptionsFromIds(ids, i18nPrefix) { - return ids.map(function (id) { - return { - id: id, - i18n: i18nPrefix + '.' + id, - }; - }); - } - - var personService = { - // Return a new person model without any data - getNewPerson: function (orgId) { - var orgPermission = new JsonApiDataStore.Model( - 'organizational_permission', - ); - orgPermission.setAttribute('organization_id', orgId); - orgPermission.setAttribute('followup_status', 'uncontacted'); - orgPermission.setAttribute( - 'permission_id', - permissionService.noPermissionId, - ); - orgPermission.setAttribute('cru_status', 'none'); - orgPermission.setRelationship( - 'organization', - JsonApiDataStore.store.find('organization', orgId), - ); - - var person = new JsonApiDataStore.Model('person', null); - person.setAttribute('first_name', ''); - person.setAttribute('last_name', ''); - person.setAttribute('gender', ''); - person.setAttribute('student_status', 'collegiate'); - person.setRelationship('organizational_permissions', [ - orgPermission, - ]); - person.setRelationship('email_addresses', []); - person.setRelationship('phone_numbers', []); - person.setRelationship('addresses', []); - person.setRelationship('reverse_contact_assignments', []); - person.setRelationship('answer_sheets', []); - person.setRelationship('interactions', []); - person.setRelationship('contact_assignments', []); - person.setRelationship('organizational_labels', []); - person.setRelationship('group_memberships', []); - return person; - }, - - // Find and return a person's organizational permission for a particular organization - getOrgPermission: function (person, organizationId) { - return _.chain(person.organizational_permissions) - .find({ organization_id: organizationId }) - .thru(function (orgPermission) { - if (orgPermission) { - orgPermission.permission_id = `${orgPermission.permission_id}`; - return orgPermission; - } - - // double check the data store - var matchParams = { - person_id: person.id, - organization_id: organizationId, - }; - return ( - _.find( - JsonApiDataStore.store.findAll( - 'organizational_permission', - ), - matchParams, - ) || null - ); - }) - .value(); - }, - - // Return a boolean indicating whether a person in a contact in a particular organization - isContact: function (person, organizationId) { - var orgPermission = personService.getOrgPermission( - person, - organizationId, - ); - return orgPermission - ? `${orgPermission.permission_id}` === - permissionService.noPermissionId - : false; - }, - - getOrgLabels: function (person, organizationId) { - return _.filter(person.organizational_labels, { - organization_id: organizationId, - }); +function personService(httpProxy, modelsService, JsonApiDataStore, permissionService, _, $log) { + // Convert an array of string ids into an array of options with the schema { id, i18n } + // Used by personService.get*Options() + function generateOptionsFromIds(ids, i18nPrefix) { + return ids.map(function (id) { + return { + id, + i18n: i18nPrefix + '.' + id, + }; + }); + } + + var personService = { + // Return a new person model without any data + getNewPerson: function (orgId) { + const orgPermission = new JsonApiDataStore.Model('organizational_permission'); + orgPermission.setAttribute('organization_id', orgId); + orgPermission.setAttribute('followup_status', 'uncontacted'); + orgPermission.setAttribute('permission_id', permissionService.noPermissionId); + orgPermission.setAttribute('cru_status', 'none'); + orgPermission.setRelationship('organization', JsonApiDataStore.store.find('organization', orgId)); + + const person = new JsonApiDataStore.Model('person', null); + person.setAttribute('first_name', ''); + person.setAttribute('last_name', ''); + person.setAttribute('gender', ''); + person.setAttribute('student_status', 'collegiate'); + person.setRelationship('organizational_permissions', [orgPermission]); + person.setRelationship('email_addresses', []); + person.setRelationship('phone_numbers', []); + person.setRelationship('addresses', []); + person.setRelationship('reverse_contact_assignments', []); + person.setRelationship('answer_sheets', []); + person.setRelationship('interactions', []); + person.setRelationship('contact_assignments', []); + person.setRelationship('organizational_labels', []); + person.setRelationship('group_memberships', []); + return person; + }, + + // Find and return a person's organizational permission for a particular organization + getOrgPermission: function (person, organizationId) { + return _.chain(person.organizational_permissions) + .find({ organization_id: organizationId }) + .thru(function (orgPermission) { + if (orgPermission) { + orgPermission.permission_id = `${orgPermission.permission_id}`; + return orgPermission; + } + + // double check the data store + const matchParams = { + person_id: person.id, + organization_id: organizationId, + }; + return _.find(JsonApiDataStore.store.findAll('organizational_permission'), matchParams) || null; + }) + .value(); + }, + + // Return a boolean indicating whether a person in a contact in a particular organization + isContact: function (person, organizationId) { + const orgPermission = personService.getOrgPermission(person, organizationId); + return orgPermission ? `${orgPermission.permission_id}` === permissionService.noPermissionId : false; + }, + + getOrgLabels: function (person, organizationId) { + return _.filter(person.organizational_labels, { + organization_id: organizationId, + }); + }, + + // Return the follow-up status of the person in a particular organization + getFollowupStatus: function (person, organizationId) { + const orgPermission = personService.getOrgPermission(person, organizationId); + return orgPermission && orgPermission.followup_status; + }, + + getLastSurvey: (person) => { + if (!person.answer_sheets) return null; + + return person.answer_sheets.reduce((acc, s) => { + const d1 = Date.parse(acc); + const d2 = Date.parse(s.updated_at); + + if (!d1) return s.updated_at; + + return d1 < d2 ? s.updated_at : acc; + }, ''); + }, + + // Return the Cru status of the person in a particular organization + getCruStatus: function (person, organizationId) { + const orgPermission = personService.getOrgPermission(person, organizationId); + return orgPermission && orgPermission.cru_status; + }, + + // Given a person in a particular organization, return the people that that person is assigned to + getAssignedTo: function (person, organizationId) { + return _.chain(person.reverse_contact_assignments) + .filter(['organization.id', organizationId]) + .sortBy('created_at') + .map('assigned_to') + .value(); + }, + + // Return the person's primary phone number + getPhoneNumber: function (person) { + return _.chain(person.phone_numbers).find({ primary: true }).defaultTo(null).value(); + }, + + // Return the person's primary email address + getEmailAddress: function (person) { + return _.chain(person.email_addresses).find({ primary: true }).defaultTo(null).value(); + }, + + // Return the person's group memberships + getGroupMemberships: function (person, organizationId) { + return _.filter(person.group_memberships, ['group.organization.id', organizationId]); + }, + + // These methods return array of all possible options for a particular person attribute + // Each option has an "id" property that is the database value and an "i18n" value that is the label path + + // Return an array of followup status options + getFollowupStatusOptions: function () { + return generateOptionsFromIds( + ['attempted_contact', 'completed', 'contacted', 'do_not_contact', 'uncontacted'], + 'followup_status', + ); + }, + + // Return an array of Cru status options + getCruStatusOptions: function () { + return generateOptionsFromIds( + ['none', 'volunteer', 'affiliate', 'intern', 'part_time_staff', 'full_time_staff'], + 'cru_status', + ); + }, + + // Return an array of permission options + getPermissionOptions: function () { + return [ + { id: permissionService.adminId, i18n: 'permissions.admin' }, + { id: permissionService.userId, i18n: 'permissions.user' }, + { + id: permissionService.noPermissionId, + i18n: 'permissions.no_permissions', }, - - // Return the follow-up status of the person in a particular organization - getFollowupStatus: function (person, organizationId) { - var orgPermission = personService.getOrgPermission( - person, - organizationId, - ); - return orgPermission && orgPermission.followup_status; - }, - - getLastSurvey: (person) => { - if (!person.answer_sheets) return null; - - return person.answer_sheets.reduce((acc, s) => { - const d1 = Date.parse(acc); - const d2 = Date.parse(s.updated_at); - - if (!d1) return s.updated_at; - - return d1 < d2 ? s.updated_at : acc; - }, ''); - }, - - // Return the Cru status of the person in a particular organization - getCruStatus: function (person, organizationId) { - var orgPermission = personService.getOrgPermission( - person, - organizationId, - ); - return orgPermission && orgPermission.cru_status; - }, - - // Given a person in a particular organization, return the people that that person is assigned to - getAssignedTo: function (person, organizationId) { - return _.chain(person.reverse_contact_assignments) - .filter(['organization.id', organizationId]) - .sortBy('created_at') - .map('assigned_to') - .value(); - }, - - // Return the person's primary phone number - getPhoneNumber: function (person) { - return _.chain(person.phone_numbers) - .find({ primary: true }) - .defaultTo(null) - .value(); + ]; + }, + + // Return an array of enrollment options + getEnrollmentOptions: function () { + return generateOptionsFromIds( + ['not_student', 'middle_school', 'high_school', 'collegiate', 'masters_or_doctorate'], + 'student_status', + ); + }, + + // Return an array of gender options + getGenderOptions: function () { + return [ + { id: 'Male', i18n: 'general.male' }, + { id: 'Female', i18n: 'general.female' }, + ]; + }, + + // Archive the person in a particular organization + archivePerson: function (person, organizationId) { + const organizationalPermission = personService.getOrgPermission(person, organizationId); + const updateJson = { + data: { + type: 'person', + attributes: {}, }, - - // Return the person's primary email address - getEmailAddress: function (person) { - return _.chain(person.email_addresses) - .find({ primary: true }) - .defaultTo(null) - .value(); - }, - - // Return the person's group memberships - getGroupMemberships: function (person, organizationId) { - return _.filter(person.group_memberships, [ - 'group.organization.id', - organizationId, - ]); - }, - - // These methods return array of all possible options for a particular person attribute - // Each option has an "id" property that is the database value and an "i18n" value that is the label path - - // Return an array of followup status options - getFollowupStatusOptions: function () { - return generateOptionsFromIds( - [ - 'attempted_contact', - 'completed', - 'contacted', - 'do_not_contact', - 'uncontacted', - ], - 'followup_status', - ); - }, - - // Return an array of Cru status options - getCruStatusOptions: function () { - return generateOptionsFromIds( - [ - 'none', - 'volunteer', - 'affiliate', - 'intern', - 'part_time_staff', - 'full_time_staff', - ], - 'cru_status', - ); - }, - - // Return an array of permission options - getPermissionOptions: function () { - return [ - { id: permissionService.adminId, i18n: 'permissions.admin' }, - { id: permissionService.userId, i18n: 'permissions.user' }, + included: [ + { + type: 'organizational_permission', + id: organizationalPermission.id, + attributes: { + archive_date: new Date().toUTCString(), + }, + }, + ], + }; + return httpProxy + .put(modelsService.getModelUrl(person), updateJson, { + errorMessage: 'error.messages.person.archive_person', + }) + .then(function () { + // Remove the archived person from the organization's list of people + _.remove(organizationalPermission.organization.people, { + id: person.id, + }); + }); + }, + + // Return a promise that resolves to an array of the contact assignments for people assigned to a + // particular person + // If organization is null, return all contact assignments, otherwise filter the returned assignments to + // those related to a particular organization + getContactAssignments: function (person, organizationId, additionalIncludes) { + let include = additionalIncludes || []; + + // When we have an organization, we do not need to load the contact assignments' organizations + include = include.concat( + _.isNil(organizationId) ? 'reverse_contact_assignments.organization' : 'reverse_contact_assignments', + 'organizational_permissions', + ); + + const pageLimit = 500; + return httpProxy + .get( + modelsService.getModelMetadata('person').url.all, + { + include: include.join(','), + 'filters[assigned_tos]': person.id, + 'filters[organizations_id]': _.isNil(organizationId) ? '' : organizationId, + 'page[limit]': pageLimit, + }, + { + errorMessage: 'error.messages.person.get_contact_assignments', + }, + ) + .then(function (response) { + const assignedPeople = response.data; + try { + if (assignedPeople.length >= pageLimit) { + $log.warn( + `While loading people, we hit the page limit of ${pageLimit}. There may be more people that were not loaded`, { - id: permissionService.noPermissionId, - i18n: 'permissions.no_permissions', + numLoadedPeople: assignedPeople.length, + numTotalPeople: response.meta.total, + organizationId, + assignedToPersonId: person.id, }, - ]; - }, - - // Return an array of enrollment options - getEnrollmentOptions: function () { - return generateOptionsFromIds( - [ - 'not_student', - 'middle_school', - 'high_school', - 'collegiate', - 'masters_or_doctorate', - ], - 'student_status', - ); - }, - - // Return an array of gender options - getGenderOptions: function () { - return [ - { id: 'Male', i18n: 'general.male' }, - { id: 'Female', i18n: 'general.female' }, - ]; - }, - - // Archive the person in a particular organization - archivePerson: function (person, organizationId) { - var organizationalPermission = personService.getOrgPermission( - person, - organizationId, - ); - var updateJson = { - data: { - type: 'person', - attributes: {}, - }, - included: [ - { - type: 'organizational_permission', - id: organizationalPermission.id, - attributes: { - archive_date: new Date().toUTCString(), - }, - }, - ], - }; - return httpProxy - .put(modelsService.getModelUrl(person), updateJson, { - errorMessage: 'error.messages.person.archive_person', - }) - .then(function () { - // Remove the archived person from the organization's list of people - _.remove(organizationalPermission.organization.people, { - id: person.id, - }); - }); - }, - - // Return a promise that resolves to an array of the contact assignments for people assigned to a - // particular person - // If organization is null, return all contact assignments, otherwise filter the returned assignments to - // those related to a particular organization - getContactAssignments: function ( - person, - organizationId, - additionalIncludes, - ) { - var include = additionalIncludes || []; - - // When we have an organization, we do not need to load the contact assignments' organizations - include = include.concat( - _.isNil(organizationId) - ? 'reverse_contact_assignments.organization' - : 'reverse_contact_assignments', - 'organizational_permissions', + ); + } + } catch (e) { + $log.warn('Encounterd error while logging people loading limit', e); + } + + // Check whether the person is assigned to the person that we are getting assignments for + function isAssignmentForCurrentPerson(assignment) { + return assignment.assigned_to.id === person.id; + } + + // Check whether the assignment is in the organization that we are getting assignments for + function isAssignmentInCurrentOrganization(assignment) { + return _.isNil(organizationId) || _.get(assignment, 'organization.id') === organizationId; + } + + // Check whether the assigned person is in the organization that the assignment is in + function isAssignedPersonInAssignmentOrganization(assignment, assignedPerson) { + if (!assignment.organization) { + // we currently don't support non-organization people + return false; + } + return _.find(assignedPerson.organizational_permissions, { + organization_id: assignment.organization.id, + }); + } + + // Determine whether the assignment should be included in the returned list + function isRelevantAssignment(assignment, assignedPerson) { + return ( + isAssignmentForCurrentPerson(assignment) && + isAssignmentInCurrentOrganization(assignment) && + isAssignedPersonInAssignmentOrganization(assignment, assignedPerson) ); + } + + // Start with the array of assigned people, map it to an array of contact assignment arrays, + // then flatten it into a one-dimensional array + return _.flatten( + assignedPeople.map(function (assignedPerson) { + // Include only the relevant contact assignments + return assignedPerson.reverse_contact_assignments.filter(function (assignment) { + return isRelevantAssignment(assignment, assignedPerson); + }); + }), + ); + }); + }, + }; - const pageLimit = 500; - return httpProxy - .get( - modelsService.getModelMetadata('person').url.all, - { - include: include.join(','), - 'filters[assigned_tos]': person.id, - 'filters[organizations_id]': _.isNil(organizationId) - ? '' - : organizationId, - 'page[limit]': pageLimit, - }, - { - errorMessage: - 'error.messages.person.get_contact_assignments', - }, - ) - .then(function (response) { - const assignedPeople = response.data; - try { - if (assignedPeople.length >= pageLimit) { - $log.warn( - `While loading people, we hit the page limit of ${pageLimit}. There may be more people that were not loaded`, - { - numLoadedPeople: assignedPeople.length, - numTotalPeople: response.meta.total, - organizationId, - assignedToPersonId: person.id, - }, - ); - } - } catch (e) { - $log.warn( - 'Encounterd error while logging people loading limit', - e, - ); - } - - // Check whether the person is assigned to the person that we are getting assignments for - function isAssignmentForCurrentPerson(assignment) { - return assignment.assigned_to.id === person.id; - } - - // Check whether the assignment is in the organization that we are getting assignments for - function isAssignmentInCurrentOrganization(assignment) { - return ( - _.isNil(organizationId) || - _.get(assignment, 'organization.id') === - organizationId - ); - } - - // Check whether the assigned person is in the organization that the assignment is in - function isAssignedPersonInAssignmentOrganization( - assignment, - assignedPerson, - ) { - if (!assignment.organization) { - // we currently don't support non-organization people - return false; - } - return _.find( - assignedPerson.organizational_permissions, - { - organization_id: assignment.organization.id, - }, - ); - } - - // Determine whether the assignment should be included in the returned list - function isRelevantAssignment(assignment, assignedPerson) { - return ( - isAssignmentForCurrentPerson(assignment) && - isAssignmentInCurrentOrganization(assignment) && - isAssignedPersonInAssignmentOrganization( - assignment, - assignedPerson, - ) - ); - } - - // Start with the array of assigned people, map it to an array of contact assignment arrays, - // then flatten it into a one-dimensional array - return _.flatten( - assignedPeople.map(function (assignedPerson) { - // Include only the relevant contact assignments - return assignedPerson.reverse_contact_assignments.filter( - function (assignment) { - return isRelevantAssignment( - assignment, - assignedPerson, - ); - }, - ); - }), - ); - }); - }, - }; - - return personService; + return personService; } diff --git a/app/assets/javascripts/angular/services/person.service.spec.js b/app/assets/javascripts/angular/services/person.service.spec.js index 79919159f6..74debe651a 100644 --- a/app/assets/javascripts/angular/services/person.service.spec.js +++ b/app/assets/javascripts/angular/services/person.service.spec.js @@ -1,354 +1,308 @@ import 'angular-mocks'; // Constants -var personService, $rootScope, httpProxy; +let personService, $rootScope, httpProxy; function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('personService', function () { - beforeEach(inject(function ( - _personService_, - _$rootScope_, - $q, - _httpProxy_, - ) { - personService = _personService_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - - this.organizationalPermission = { - id: 21, - organization_id: 1, - permission_id: 4, - organization: { - people: [{ id: 11 }, { id: 12 }], - }, - }; - this.person = { - _type: 'person', - id: 11, - organizational_permissions: [ - this.organizationalPermission, - { id: 22, organization_id: 2 }, - { id: 23, organization_id: 3 }, - ], - reverse_contact_assignments: [ - { - organization: { id: 1 }, - assigned_to: { name: 'Adam' }, - created_at: '2', - }, - { - organization: { id: 1 }, - assigned_to: { name: 'Alice' }, - created_at: '1', - }, - { - organization: { id: 2 }, - assigned_to: { name: 'Bill' }, - }, - { - organization: { id: 3 }, - assigned_to: { name: 'Charles' }, - }, - ], - phone_numbers: [ - { number: '000000000', primary: false }, - { number: '000000001', primary: true }, - { number: '000000002', primary: false }, - ], - email_addresses: [ - { address: 'a@domain.com', primary: false }, - { address: 'b@domain.com', primary: false }, - { address: 'c@domain.com', primary: true }, - ], - }; - - var _this = this; + beforeEach(inject(function (_personService_, _$rootScope_, $q, _httpProxy_) { + personService = _personService_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; - this.httpResponse = {}; - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); - })); + this.organizationalPermission = { + id: 21, + organization_id: 1, + permission_id: 4, + organization: { + people: [{ id: 11 }, { id: 12 }], + }, + }; + this.person = { + _type: 'person', + id: 11, + organizational_permissions: [ + this.organizationalPermission, + { id: 22, organization_id: 2 }, + { id: 23, organization_id: 3 }, + ], + reverse_contact_assignments: [ + { + organization: { id: 1 }, + assigned_to: { name: 'Adam' }, + created_at: '2', + }, + { + organization: { id: 1 }, + assigned_to: { name: 'Alice' }, + created_at: '1', + }, + { + organization: { id: 2 }, + assigned_to: { name: 'Bill' }, + }, + { + organization: { id: 3 }, + assigned_to: { name: 'Charles' }, + }, + ], + phone_numbers: [ + { number: '000000000', primary: false }, + { number: '000000001', primary: true }, + { number: '000000002', primary: false }, + ], + email_addresses: [ + { address: 'a@domain.com', primary: false }, + { address: 'b@domain.com', primary: false }, + { address: 'c@domain.com', primary: true }, + ], + }; - describe('getOrgPermission', function () { - it("should find the person's organizational permission", function () { - expect(personService.getOrgPermission(this.person, 1)).toEqual( - this.organizationalPermission, - ); - }); - it('should set the permission_id to be a string', function () { - expect( - personService.getOrgPermission(this.person, 1).permission_id, - ).toEqual('4'); - }); + const _this = this; - it('should return null when the user has no organizational permission', function () { - expect(personService.getOrgPermission(this.person, 4)).toBe(null); - }); + this.httpResponse = {}; + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return $q.resolve(_this.httpResponse); }); + })); - describe('isContact', function () { - it('should return true for contacts', function () { - this.person.organizational_permissions = [ - { organization_id: 1, permission_id: 2 }, - ]; - expect(personService.isContact(this.person, 1)).toBe(true); - }); + describe('getOrgPermission', function () { + it("should find the person's organizational permission", function () { + expect(personService.getOrgPermission(this.person, 1)).toEqual(this.organizationalPermission); + }); + it('should set the permission_id to be a string', function () { + expect(personService.getOrgPermission(this.person, 1).permission_id).toEqual('4'); + }); - it('should return false for users', function () { - this.person.organizational_permissions = [ - { organization_id: 1, permission_id: 4 }, - ]; - expect(personService.isContact(this.person, 1)).toBe(false); - }); + it('should return null when the user has no organizational permission', function () { + expect(personService.getOrgPermission(this.person, 4)).toBe(null); + }); + }); - it('should return false for admins', function () { - this.person.organizational_permissions = [ - { organization_id: 1, permission_id: 1 }, - ]; - expect(personService.isContact(this.person, 1)).toBe(false); - }); + describe('isContact', function () { + it('should return true for contacts', function () { + this.person.organizational_permissions = [{ organization_id: 1, permission_id: 2 }]; + expect(personService.isContact(this.person, 1)).toBe(true); + }); - it('should return false for people not on the org', function () { - this.person.organizational_permissions = []; - expect(personService.isContact(this.person, 1)).toBe(false); - }); + it('should return false for users', function () { + this.person.organizational_permissions = [{ organization_id: 1, permission_id: 4 }]; + expect(personService.isContact(this.person, 1)).toBe(false); }); - describe('getAssignedTo', function () { - it("should find the person's assignments", function () { - expect(personService.getAssignedTo(this.person, 1)).toEqual([ - { name: 'Alice' }, - { name: 'Adam' }, - ]); - expect(personService.getAssignedTo(this.person, 4)).toEqual([]); - }); + it('should return false for admins', function () { + this.person.organizational_permissions = [{ organization_id: 1, permission_id: 1 }]; + expect(personService.isContact(this.person, 1)).toBe(false); }); - describe('getPhoneNumber', function () { - it("should find the person's primary phone number", function () { - expect(personService.getPhoneNumber(this.person)).toEqual({ - number: '000000001', - primary: true, - }); - }); + it('should return false for people not on the org', function () { + this.person.organizational_permissions = []; + expect(personService.isContact(this.person, 1)).toBe(false); }); + }); - describe('getEmailAddress', function () { - it("should find the person's primary email address", function () { - expect(personService.getEmailAddress(this.person)).toEqual({ - address: 'c@domain.com', - primary: true, - }); - }); + describe('getAssignedTo', function () { + it("should find the person's assignments", function () { + expect(personService.getAssignedTo(this.person, 1)).toEqual([{ name: 'Alice' }, { name: 'Adam' }]); + expect(personService.getAssignedTo(this.person, 4)).toEqual([]); }); + }); - describe('archivePerson', function () { - it('should make a network request', function () { - personService.archivePerson(this.person, 1); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'PUT', - jasmine.any(String), - null, - { - data: { - type: 'person', - attributes: {}, - }, - included: [ - { - type: 'organizational_permission', - id: 21, - attributes: { - archive_date: jasmine.any(String), - }, - }, - ], - }, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + describe('getPhoneNumber', function () { + it("should find the person's primary phone number", function () { + expect(personService.getPhoneNumber(this.person)).toEqual({ + number: '000000001', + primary: true, + }); + }); + }); - it( - "should remove the person from their org's people list", - asynchronous(function () { - var _this = this; - return personService - .archivePerson(this.person, 1) - .then(function () { - expect( - _this.organizationalPermission.organization.people, - ).toEqual([{ id: 12 }]); - }); - }), - ); + describe('getEmailAddress', function () { + it("should find the person's primary email address", function () { + expect(personService.getEmailAddress(this.person)).toEqual({ + address: 'c@domain.com', + primary: true, + }); }); + }); - describe('getContactAssignments', function () { - beforeEach(function () { - this.organizationId = 1; + describe('archivePerson', function () { + it('should make a network request', function () { + personService.archivePerson(this.person, 1); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'PUT', + jasmine.any(String), + null, + { + data: { + type: 'person', + attributes: {}, + }, + included: [ + { + type: 'organizational_permission', + id: 21, + attributes: { + archive_date: jasmine.any(String), + }, + }, + ], + }, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - this.personRelevant = { - id: 101, - reverse_contact_assignments: [ - { - assigned_to: { id: this.person.id }, - organization: { id: this.organizationId }, - }, - ], - organizational_permissions: [ - { organization_id: this.organizationId }, - ], - }; - this.personNotAssigned = { - id: 102, - reverse_contact_assignments: [ - { - assigned_to: { id: 123 }, - organization: { id: this.organizationId }, - }, - ], - organizational_permissions: [ - { organization_id: this.organizationId }, - ], - }; - this.personNotOnOrg = { - id: 103, - reverse_contact_assignments: [ - { - assigned_to: { id: this.person.id }, - organization: { id: this.organizationId }, - }, - ], - organizational_permissions: [{ organization_id: 123 }], - }; - this.personWrongOrg = { - id: 104, - reverse_contact_assignments: [ - { - assigned_to: { id: this.person.id }, - organization: { id: 123 }, - }, - ], - organizational_permissions: [{ organization_id: 123 }], - }; - this.personOnNoOrg = { - id: 103, - reverse_contact_assignments: [ - { - assigned_to: { id: this.person.id }, - }, - ], - }; + it( + "should remove the person from their org's people list", + asynchronous(function () { + const _this = this; + return personService.archivePerson(this.person, 1).then(function () { + expect(_this.organizationalPermission.organization.people).toEqual([{ id: 12 }]); }); + }), + ); + }); - describe('scoped to organization', function () { - it('should make a network request', function () { - personService.getContactAssignments( - this.person, - this.organizationId, - ); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ - include: - 'reverse_contact_assignments,organizational_permissions', - 'filters[assigned_tos]': this.person.id, - 'filters[organizations_id]': this.organizationId, - }), - null, - jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }), - ); - }); + describe('getContactAssignments', function () { + beforeEach(function () { + this.organizationId = 1; - it( - 'should asynchronously return the relevant contact assignments', - asynchronous(function () { - var _this = this; + this.personRelevant = { + id: 101, + reverse_contact_assignments: [ + { + assigned_to: { id: this.person.id }, + organization: { id: this.organizationId }, + }, + ], + organizational_permissions: [{ organization_id: this.organizationId }], + }; + this.personNotAssigned = { + id: 102, + reverse_contact_assignments: [ + { + assigned_to: { id: 123 }, + organization: { id: this.organizationId }, + }, + ], + organizational_permissions: [{ organization_id: this.organizationId }], + }; + this.personNotOnOrg = { + id: 103, + reverse_contact_assignments: [ + { + assigned_to: { id: this.person.id }, + organization: { id: this.organizationId }, + }, + ], + organizational_permissions: [{ organization_id: 123 }], + }; + this.personWrongOrg = { + id: 104, + reverse_contact_assignments: [ + { + assigned_to: { id: this.person.id }, + organization: { id: 123 }, + }, + ], + organizational_permissions: [{ organization_id: 123 }], + }; + this.personOnNoOrg = { + id: 103, + reverse_contact_assignments: [ + { + assigned_to: { id: this.person.id }, + }, + ], + }; + }); - this.httpResponse = { - data: [ - this.personRelevant, - this.personNotAssigned, - this.personNotOnOrg, - this.personWrongOrg, - this.personOnNoOrg, - ], - }; + describe('scoped to organization', function () { + it('should make a network request', function () { + personService.getContactAssignments(this.person, this.organizationId); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ + include: 'reverse_contact_assignments,organizational_permissions', + 'filters[assigned_tos]': this.person.id, + 'filters[organizations_id]': this.organizationId, + }), + null, + jasmine.objectContaining({ + errorMessage: jasmine.any(String), + }), + ); + }); - return personService - .getContactAssignments(this.person, this.organizationId) - .then(function (assignments) { - expect(assignments).toEqual([ - _this.personRelevant - .reverse_contact_assignments[0], - ]); - }); - }), - ); - }); + it( + 'should asynchronously return the relevant contact assignments', + asynchronous(function () { + const _this = this; - describe('not scoped to organization', function () { - it('should make a network request', function () { - personService.getContactAssignments(this.person); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ - include: - 'reverse_contact_assignments.organization,organizational_permissions', - 'filters[assigned_tos]': this.person.id, - 'filters[organizations_id]': '', - }), - null, - jasmine.objectContaining({ - errorMessage: jasmine.any(String), - }), - ); - }); + this.httpResponse = { + data: [ + this.personRelevant, + this.personNotAssigned, + this.personNotOnOrg, + this.personWrongOrg, + this.personOnNoOrg, + ], + }; - it( - 'should asynchronously return the relevant contact assignments', - asynchronous(function () { - var _this = this; + return personService.getContactAssignments(this.person, this.organizationId).then(function (assignments) { + expect(assignments).toEqual([_this.personRelevant.reverse_contact_assignments[0]]); + }); + }), + ); + }); - this.httpResponse = { - data: [ - this.personRelevant, - this.personNotAssigned, - this.personNotOnOrg, - this.personOnNoOrg, - ], - }; + describe('not scoped to organization', function () { + it('should make a network request', function () { + personService.getContactAssignments(this.person); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ + include: 'reverse_contact_assignments.organization,organizational_permissions', + 'filters[assigned_tos]': this.person.id, + 'filters[organizations_id]': '', + }), + null, + jasmine.objectContaining({ + errorMessage: jasmine.any(String), + }), + ); + }); - return personService - .getContactAssignments(this.person) - .then(function (assignments) { - expect(assignments).toEqual([ - _this.personRelevant - .reverse_contact_assignments[0], - ]); - }); - }), - ); - }); + it( + 'should asynchronously return the relevant contact assignments', + asynchronous(function () { + const _this = this; + + this.httpResponse = { + data: [this.personRelevant, this.personNotAssigned, this.personNotOnOrg, this.personOnNoOrg], + }; + + return personService.getContactAssignments(this.person).then(function (assignments) { + expect(assignments).toEqual([_this.personRelevant.reverse_contact_assignments[0]]); + }); + }), + ); }); + }); }); diff --git a/app/assets/javascripts/angular/services/personSelection.js b/app/assets/javascripts/angular/services/personSelection.js index a6f0fdafbc..8880493cc8 100644 --- a/app/assets/javascripts/angular/services/personSelection.js +++ b/app/assets/javascripts/angular/services/personSelection.js @@ -1,56 +1,52 @@ -angular - .module('campusContactsApp') - .factory('personSelectionService', personSelectionService); +angular.module('campusContactsApp').factory('personSelectionService', personSelectionService); function personSelectionService(_) { - var personSelectionService = { - // Return a boolean indicating whether a selection contains people that are not included in the id list - containsUnincludedPeople: function (selection) { - // The selection contains unincluded people when all people are selected and not all of those people - // are included in the person id list - return selection.allSelected && !selection.allIncluded; - }, + var personSelectionService = { + // Return a boolean indicating whether a selection contains people that are not included in the id list + containsUnincludedPeople: function (selection) { + // The selection contains unincluded people when all people are selected and not all of those people + // are included in the person id list + return selection.allSelected && !selection.allIncluded; + }, - // Convert a filters object into the form expected by the server-side API - convertToFilters: function (selection) { - if (!personSelectionService.containsUnincludedPeople(selection)) { - // Use the id filters when we have the ids of all the people who are selected - return { - ids: (selection.selectedPeople || []).join(','), - }; - } + // Convert a filters object into the form expected by the server-side API + convertToFilters: function (selection) { + if (!personSelectionService.containsUnincludedPeople(selection)) { + // Use the id filters when we have the ids of all the people who are selected + return { + ids: (selection.selectedPeople || []).join(','), + }; + } - // Use the filters when all people are selected - var filters = selection.filters; - return _.pickBy({ - organization_ids: selection.orgId, - exclude_ids: (selection.unselectedPeople || []).join(','), - assigned_tos: (filters.assignedTos || []).join(','), - label_ids: (filters.labels || []).join(','), - group_ids: (filters.groups || []).join(','), - name: filters.searchString || '', - statuses: filters.statuses, - genders: filters.genders, - permissions: filters.permissions, - include_archived: filters.includeArchived, - ...(selection.surveyId || - filters.questions || - filters.answerMatchingOptions - ? { - answer_sheets: { - survey_ids: selection.surveyId, - answers: { - ...filters.questions, - }, - answers_options: { - ...filters.answerMatchingOptions, - }, - }, - } - : {}), - }); - }, - }; + // Use the filters when all people are selected + const filters = selection.filters; + return _.pickBy({ + organization_ids: selection.orgId, + exclude_ids: (selection.unselectedPeople || []).join(','), + assigned_tos: (filters.assignedTos || []).join(','), + label_ids: (filters.labels || []).join(','), + group_ids: (filters.groups || []).join(','), + name: filters.searchString || '', + statuses: filters.statuses, + genders: filters.genders, + permissions: filters.permissions, + include_archived: filters.includeArchived, + ...(selection.surveyId || filters.questions || filters.answerMatchingOptions + ? { + answer_sheets: { + survey_ids: selection.surveyId, + answers: { + ...filters.questions, + }, + answers_options: { + ...filters.answerMatchingOptions, + }, + }, + } + : {}), + }); + }, + }; - return personSelectionService; + return personSelectionService; } diff --git a/app/assets/javascripts/angular/services/personSelection.service.spec.js b/app/assets/javascripts/angular/services/personSelection.service.spec.js index 1ae358641f..98d5380e07 100644 --- a/app/assets/javascripts/angular/services/personSelection.service.spec.js +++ b/app/assets/javascripts/angular/services/personSelection.service.spec.js @@ -1,124 +1,124 @@ -var personSelectionService; +let personSelectionService; describe('personSelectionService', function () { - beforeEach(inject(function (_personSelectionService_) { - personSelectionService = _personSelectionService_; - })); + beforeEach(inject(function (_personSelectionService_) { + personSelectionService = _personSelectionService_; + })); - describe('containsUnincludedPeople', function () { - it('should return true when all people are selected and all people are not included', function () { - expect( - personSelectionService.containsUnincludedPeople({ - allSelected: true, - allIncluded: false, - }), - ).toBe(true); - }); + describe('containsUnincludedPeople', function () { + it('should return true when all people are selected and all people are not included', function () { + expect( + personSelectionService.containsUnincludedPeople({ + allSelected: true, + allIncluded: false, + }), + ).toBe(true); + }); - it('should return false otherwise', function () { - expect( - personSelectionService.containsUnincludedPeople({ - allSelected: false, - allIncluded: true, - }), - ).toBe(false); - expect( - personSelectionService.containsUnincludedPeople({ - allSelected: true, - allIncluded: true, - }), - ).toBe(false); - }); + it('should return false otherwise', function () { + expect( + personSelectionService.containsUnincludedPeople({ + allSelected: false, + allIncluded: true, + }), + ).toBe(false); + expect( + personSelectionService.containsUnincludedPeople({ + allSelected: true, + allIncluded: true, + }), + ).toBe(false); }); + }); - describe('convertToFilters', function () { - beforeEach(function () { - this.orgId = 123; - }); + describe('convertToFilters', function () { + beforeEach(function () { + this.orgId = 123; + }); - it('should filter by id when all people are not selected', function () { - expect( - personSelectionService.convertToFilters({ - orgId: this.orgId, - allSelected: false, - selectedPeople: [1, 2, 3], - }), - ).toEqual({ - ids: '1,2,3', - }); - }); + it('should filter by id when all people are not selected', function () { + expect( + personSelectionService.convertToFilters({ + orgId: this.orgId, + allSelected: false, + selectedPeople: [1, 2, 3], + }), + ).toEqual({ + ids: '1,2,3', + }); + }); - it('should correctly transform filter attribute names and values', function () { - expect( - personSelectionService.convertToFilters({ - orgId: this.orgId, - surveyId: '10', - allSelected: true, - allIncluded: false, - unselectedPeople: [31, 32, 33], - filters: { - assignedTos: [1, 2, 3], - labels: [11, 12, 13], - groups: [21, 22, 23], - searchString: 'John', - statuses: ['attempted_contact'], - genders: ['Female'], - includeArchived: true, - questions: { 5: ['One'] }, - answerMatchingOptions: { 5: 'contains' }, - }, - }), - ).toEqual({ - organization_ids: this.orgId, - assigned_tos: '1,2,3', - label_ids: '11,12,13', - group_ids: '21,22,23', - exclude_ids: '31,32,33', - name: 'John', - statuses: ['attempted_contact'], - genders: ['Female'], - include_archived: true, - answer_sheets: { - survey_ids: '10', - answers: { 5: ['One'] }, - answers_options: { 5: 'contains' }, - }, - }); - }); + it('should correctly transform filter attribute names and values', function () { + expect( + personSelectionService.convertToFilters({ + orgId: this.orgId, + surveyId: '10', + allSelected: true, + allIncluded: false, + unselectedPeople: [31, 32, 33], + filters: { + assignedTos: [1, 2, 3], + labels: [11, 12, 13], + groups: [21, 22, 23], + searchString: 'John', + statuses: ['attempted_contact'], + genders: ['Female'], + includeArchived: true, + questions: { 5: ['One'] }, + answerMatchingOptions: { 5: 'contains' }, + }, + }), + ).toEqual({ + organization_ids: this.orgId, + assigned_tos: '1,2,3', + label_ids: '11,12,13', + group_ids: '21,22,23', + exclude_ids: '31,32,33', + name: 'John', + statuses: ['attempted_contact'], + genders: ['Female'], + include_archived: true, + answer_sheets: { + survey_ids: '10', + answers: { 5: ['One'] }, + answers_options: { 5: 'contains' }, + }, + }); + }); - it('should default missing filter attributes', function () { - expect( - personSelectionService.convertToFilters({ - orgId: this.orgId, - allSelected: true, - allIncluded: false, - filters: { - searchString: 'John', - }, - }), - ).toEqual({ - organization_ids: this.orgId, - name: 'John', - }); - }); + it('should default missing filter attributes', function () { + expect( + personSelectionService.convertToFilters({ + orgId: this.orgId, + allSelected: true, + allIncluded: false, + filters: { + searchString: 'John', + }, + }), + ).toEqual({ + organization_ids: this.orgId, + name: 'John', + }); + }); - it('should ignore empty filter attributes', function () { - expect( - personSelectionService.convertToFilters({ - orgId: this.orgId, - allSelected: true, - allIncluded: false, - filters: { - assignedTos: [], - labels: [], - groups: [], - searchString: '', - }, - exclude_ids: [], - }), - ).toEqual({ - organization_ids: this.orgId, - }); - }); + it('should ignore empty filter attributes', function () { + expect( + personSelectionService.convertToFilters({ + orgId: this.orgId, + allSelected: true, + allIncluded: false, + filters: { + assignedTos: [], + labels: [], + groups: [], + searchString: '', + }, + exclude_ids: [], + }), + ).toEqual({ + organization_ids: this.orgId, + }); }); + }); }); diff --git a/app/assets/javascripts/angular/services/personTabs.service.js b/app/assets/javascripts/angular/services/personTabs.service.js index 6ee8e6eedc..1b3d6b79ba 100644 --- a/app/assets/javascripts/angular/services/personTabs.service.js +++ b/app/assets/javascripts/angular/services/personTabs.service.js @@ -1,5 +1,2 @@ -var personTabs = ['profile', 'history', 'assigned', 'activity']; -angular - .module('campusContactsApp') - .constant('personTabs', personTabs) - .constant('personDefaultTab', personTabs[0]); +const personTabs = ['profile', 'history', 'assigned', 'activity']; +angular.module('campusContactsApp').constant('personTabs', personTabs).constant('personDefaultTab', personTabs[0]); diff --git a/app/assets/javascripts/angular/services/progressiveListLoader.service.js b/app/assets/javascripts/angular/services/progressiveListLoader.service.js index 7d7da7b8b7..0d50346ee0 100644 --- a/app/assets/javascripts/angular/services/progressiveListLoader.service.js +++ b/app/assets/javascripts/angular/services/progressiveListLoader.service.js @@ -1,69 +1,58 @@ -angular - .module('campusContactsApp') - .factory('ProgressiveListLoader', progressiveListLoader); +angular.module('campusContactsApp').factory('ProgressiveListLoader', progressiveListLoader); function progressiveListLoader(httpProxy, modelsService, _) { - const pageSize = 25; - const overlapMargin = 1; - - function ProgressiveListLoader(options) { - const modelType = options.modelType; - const requestDeduper = options.requestDeduper; - const errorMessage = options.errorMessage; - let list = []; - - this.loadMore = function ( - params = {}, - transformData = (params) => (data) => data, - ) { - // There are two situations where our length gets out of sync from our offset: - // 1. The already-loaded portion of the data set becomes larger on the server. In this - // case, we would be requesting the next set after #10, but what we think is #10 is - // really 11th, so we would see #10 again in the response. This duplication is covered - // by union-ing the response data with the existing loaded records. - // 2. The already-loaded portion of the data set becomes smaller on the server. In this - // case, we would be requesting the next set after #10, but what we think is #10 is - // now 9th, so we would never load #11 as the server picks up with the 11th item (#12). - // This off-by-one issue is covered by loading one extra row every 'page' and throwing - // away duplicates. `overlapMargin` defines how many extra rows to load. - const page = { - limit: pageSize + overlapMargin, - offset: Math.max(list.length - overlapMargin, 0), - }; - params['page[limit]'] = page.limit; - params['page[offset]'] = page.offset; - - return httpProxy - .get( - modelsService.getModelMetadata(modelType).url.all, - params, - { - deduper: requestDeduper, - errorMessage: - errorMessage || - 'error.messages.progressive_list_loader.load_chunk', - }, - ) - .then(function (resp) { - const data = resp.data.map(transformData(params)); - - list = _.unionBy(list, data, 'id'); - const loadedAll = resp.meta.total <= list.length; - - return { - nextBatch: data, - list: list, - loadedAll: loadedAll, - total: resp.meta.total, - }; - }); - }; - - this.reset = function (newList) { - list = newList || []; - return this; - }; - } - - return ProgressiveListLoader; + const pageSize = 25; + const overlapMargin = 1; + + function ProgressiveListLoader(options) { + const modelType = options.modelType; + const requestDeduper = options.requestDeduper; + const errorMessage = options.errorMessage; + let list = []; + + this.loadMore = function (params = {}, transformData = (params) => (data) => data) { + // There are two situations where our length gets out of sync from our offset: + // 1. The already-loaded portion of the data set becomes larger on the server. In this + // case, we would be requesting the next set after #10, but what we think is #10 is + // really 11th, so we would see #10 again in the response. This duplication is covered + // by union-ing the response data with the existing loaded records. + // 2. The already-loaded portion of the data set becomes smaller on the server. In this + // case, we would be requesting the next set after #10, but what we think is #10 is + // now 9th, so we would never load #11 as the server picks up with the 11th item (#12). + // This off-by-one issue is covered by loading one extra row every 'page' and throwing + // away duplicates. `overlapMargin` defines how many extra rows to load. + const page = { + limit: pageSize + overlapMargin, + offset: Math.max(list.length - overlapMargin, 0), + }; + params['page[limit]'] = page.limit; + params['page[offset]'] = page.offset; + + return httpProxy + .get(modelsService.getModelMetadata(modelType).url.all, params, { + deduper: requestDeduper, + errorMessage: errorMessage || 'error.messages.progressive_list_loader.load_chunk', + }) + .then(function (resp) { + const data = resp.data.map(transformData(params)); + + list = _.unionBy(list, data, 'id'); + const loadedAll = resp.meta.total <= list.length; + + return { + nextBatch: data, + list, + loadedAll, + total: resp.meta.total, + }; + }); + }; + + this.reset = function (newList) { + list = newList || []; + return this; + }; + } + + return ProgressiveListLoader; } diff --git a/app/assets/javascripts/angular/services/progressiveListLoader.service.spec.js b/app/assets/javascripts/angular/services/progressiveListLoader.service.spec.js index ab4cfed1df..fc09b51e3f 100644 --- a/app/assets/javascripts/angular/services/progressiveListLoader.service.spec.js +++ b/app/assets/javascripts/angular/services/progressiveListLoader.service.spec.js @@ -1,137 +1,124 @@ import 'angular-mocks'; // Constants -var ProgressiveListLoader, $rootScope, $q, httpProxy, _; +let ProgressiveListLoader, $rootScope, $q, httpProxy, _; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('ProgressiveListLoader', function () { - beforeEach(inject(function ( - _ProgressiveListLoader_, - _$rootScope_, - _$q_, - _httpProxy_, - ___, - ) { - ProgressiveListLoader = _ProgressiveListLoader_; - $rootScope = _$rootScope_; - $q = _$q_; - httpProxy = _httpProxy_; - _ = ___; - - this.listLoader = new ProgressiveListLoader({ modelType: 'person' }); - - var _this = this; - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return $q.resolve({ - data: _this.responsePeople, - meta: { total: _this.responseTotal }, - }); - }); - })); - - describe('loadMore', function () { - it( - 'loads first batch of people', - asynchronous(function () { - this.responsePeople = [{ id: 1 }, { id: 2 }, { id: 3 }]; - this.responseTotal = 4; - - return this.listLoader - .loadMore({ include: 'phone_numbers' }) - .then(function (resp) { - var respIds = _.map(resp.list, 'id'); - expect(respIds).toEqual([1, 2, 3]); - expect(resp.loadedAll).toBe(false); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ - 'page[limit]': 26, - 'page[offset]': 0, - }), - null, - jasmine.any(Object), - ); - }); + beforeEach(inject(function (_ProgressiveListLoader_, _$rootScope_, _$q_, _httpProxy_, ___) { + ProgressiveListLoader = _ProgressiveListLoader_; + $rootScope = _$rootScope_; + $q = _$q_; + httpProxy = _httpProxy_; + _ = ___; + + this.listLoader = new ProgressiveListLoader({ modelType: 'person' }); + + const _this = this; + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return $q.resolve({ + data: _this.responsePeople, + meta: { total: _this.responseTotal }, + }); + }); + })); + + describe('loadMore', function () { + it( + 'loads first batch of people', + asynchronous(function () { + this.responsePeople = [{ id: 1 }, { id: 2 }, { id: 3 }]; + this.responseTotal = 4; + + return this.listLoader.loadMore({ include: 'phone_numbers' }).then(function (resp) { + const respIds = _.map(resp.list, 'id'); + expect(respIds).toEqual([1, 2, 3]); + expect(resp.loadedAll).toBe(false); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ + 'page[limit]': 26, + 'page[offset]': 0, }), - ); - - it( - 'loads second batch with more to come', - asynchronous(function () { - // put some in the list - this.listLoader.reset([{ id: 1 }, { id: 2 }, { id: 3 }]); - - this.responsePeople = [ - { id: 3 }, - { id: 4 }, - { id: 5 }, - { id: 6 }, - ]; - this.responseTotal = 7; - - return this.listLoader.loadMore().then(function (resp) { - var respIds = _.map(resp.list, 'id'); - expect(respIds).toEqual([1, 2, 3, 4, 5, 6]); - expect(resp.loadedAll).toBe(false); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ - 'page[limit]': 26, - 'page[offset]': 2, - }), - null, - jasmine.any(Object), - ); - }); + null, + jasmine.any(Object), + ); + }); + }), + ); + + it( + 'loads second batch with more to come', + asynchronous(function () { + // put some in the list + this.listLoader.reset([{ id: 1 }, { id: 2 }, { id: 3 }]); + + this.responsePeople = [{ id: 3 }, { id: 4 }, { id: 5 }, { id: 6 }]; + this.responseTotal = 7; + + return this.listLoader.loadMore().then(function (resp) { + const respIds = _.map(resp.list, 'id'); + expect(respIds).toEqual([1, 2, 3, 4, 5, 6]); + expect(resp.loadedAll).toBe(false); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ + 'page[limit]': 26, + 'page[offset]': 2, }), - ); - - it( - 'loads second and final batch', - asynchronous(function () { - this.listLoader.reset([{ id: 1 }, { id: 2 }]); - - this.responsePeople = [{ id: 2 }, { id: 3 }]; - this.responseTotal = 3; - - return this.listLoader.loadMore().then(function (resp) { - var respIds = _.map(resp.list, 'id'); - expect(respIds).toEqual([1, 2, 3]); - expect(resp.loadedAll).toBe(true); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - jasmine.objectContaining({ - 'page[limit]': 26, - 'page[offset]': 1, - }), - null, - jasmine.any(Object), - ); - }); + null, + jasmine.any(Object), + ); + }); + }), + ); + + it( + 'loads second and final batch', + asynchronous(function () { + this.listLoader.reset([{ id: 1 }, { id: 2 }]); + + this.responsePeople = [{ id: 2 }, { id: 3 }]; + this.responseTotal = 3; + + return this.listLoader.loadMore().then(function (resp) { + const respIds = _.map(resp.list, 'id'); + expect(respIds).toEqual([1, 2, 3]); + expect(resp.loadedAll).toBe(true); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + jasmine.objectContaining({ + 'page[limit]': 26, + 'page[offset]': 1, }), - ); - }); + null, + jasmine.any(Object), + ); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/services/reports.service.js b/app/assets/javascripts/angular/services/reports.service.js index 64201476a4..a4e011b7c1 100644 --- a/app/assets/javascripts/angular/services/reports.service.js +++ b/app/assets/javascripts/angular/services/reports.service.js @@ -1,190 +1,164 @@ angular.module('campusContactsApp').factory('reportsService', reportsService); // This service contains action logic that is shared across components -function reportsService( - $q, - httpProxy, - modelsService, - JsonApiDataStore, - periodService, - _, -) { - // Create an empty report for the specified report type and id - function createReport(type, reportId) { - var record = JsonApiDataStore.store.sync({ - data: { - type: type, - id: reportId, - attributes: { - contact_count: 0, - uncontacted_count: 0, - placeholder: true, - interactions: [], - }, - }, - }); - record._placeHolder = true; - return record; - } - - // Calculate the id of the report for the specified organization - function calculateOrganizationReportId(organizationId) { - return [organizationId, periodService.getPeriod()].join('-'); - } - - // Calculate the id of the report for the specified person in the specified organization - function calculatePersonReportId(organizationId, personId) { - return [organizationId, personId, periodService.getPeriod()].join('-'); - } - - // Create an empty report for the specified report type and id - function findReport(type, reportId) { - return JsonApiDataStore.store.find(type, reportId); - } - - function findOrCreateReport(type, reportId) { - return findReport(type, reportId) || createReport(type, reportId); - } - - var reportsService = { - // Find and return the report for the given organization - lookupOrganizationReport: function (organizationId) { - return findOrCreateReport( - 'organization_report', - calculateOrganizationReportId(organizationId), - ); - }, - - // Find and return the report for the given person - lookupPersonReport: function (organizationId, personId) { - return findOrCreateReport( - 'person_report', - calculatePersonReportId(organizationId, personId), - ); - }, - - // Load the person report for the given person - loadPersonReport: function (organizationId, personId) { - // Try to find the report - var reportId = calculatePersonReportId(organizationId, personId); - var report = findReport('person_report', reportId); - - if (report) { - // The report is already loaded, so simply return it - return $q.resolve(report); - } - - // Load the report and return it - return httpProxy - .get( - modelsService.getModelMetadata('person_report').url.all, - { - period: periodService.getPeriod(), - organization_ids: organizationId.toString(), - people_ids: personId.toString(), - }, - { - errorMessage: - 'error.messages.reports.load_person_report', - }, - ) - .then(httpProxy.extractModels) - .then(function (people) { - return people[0]; - }); - }, - - // Load reports for specific people and organizations - loadMultiplePeopleReports: function (orgs, people) { - return httpProxy.get( - modelsService.getModelMetadata('person_report').url.all, - { - period: periodService.getPeriod(), - organization_ids: _.map(orgs, 'id').join(','), - people_ids: _.map(people, 'id').join(','), - }, - { - errorMessage: - 'error.messages.my_people_dashboard.load_reports', - }, - ); +function reportsService($q, httpProxy, modelsService, JsonApiDataStore, periodService, _) { + // Create an empty report for the specified report type and id + function createReport(type, reportId) { + const record = JsonApiDataStore.store.sync({ + data: { + type, + id: reportId, + attributes: { + contact_count: 0, + uncontacted_count: 0, + placeholder: true, + interactions: [], }, - - // Load organization reports for the given organizations - loadOrganizationReports: function (orgs) { - var organizationIds = _.map(orgs, 'id'); - - // Return an array of the organization reports for the requested organization ids. Any reports that are - // not yet loaded will be represented as a null value. - function lookupReports() { - return organizationIds.map(function (organizationId) { - return reportsService.lookupOrganizationReport( - organizationId, - ); - }); - } - - // Determine which organization reports have not been loaded yet and actually need to be loaded - var unloadedOrgIds = organizationIds.filter(function ( - organizationId, - ) { - var report = reportsService.lookupOrganizationReport( - organizationId, - ); - - // The report needs to be loaded if the report could not be found or if it is just a placeholder - return !report || report._placeHolder; - }); - - if (unloadedOrgIds.length === 0) { - // All requested organization report are already loaded, so no network request is necessary - return $q.resolve(lookupReports()); - } - - return httpProxy - .get( - modelsService.getModelMetadata('organization_report').url - .all, - { - period: periodService.getPeriod(), - organization_ids: unloadedOrgIds.join(','), - }, - { - errorMessage: 'error.messages.reports.load_org_reports', - }, - ) - .then(function () { - return lookupReports(); - }); - }, - - // Return the number of interactions of a specific type in a particular report - getInteractionCount: function (report, interactionTypeId) { - var interaction = - report && - _.find( - report.interactions, - ({ interaction_type_id }) => - `${interaction_type_id}` === interactionTypeId, - ); - return _.isNil(interaction) ? '-' : interaction.interaction_count; + }, + }); + record._placeHolder = true; + return record; + } + + // Calculate the id of the report for the specified organization + function calculateOrganizationReportId(organizationId) { + return [organizationId, periodService.getPeriod()].join('-'); + } + + // Calculate the id of the report for the specified person in the specified organization + function calculatePersonReportId(organizationId, personId) { + return [organizationId, personId, periodService.getPeriod()].join('-'); + } + + // Create an empty report for the specified report type and id + function findReport(type, reportId) { + return JsonApiDataStore.store.find(type, reportId); + } + + function findOrCreateReport(type, reportId) { + return findReport(type, reportId) || createReport(type, reportId); + } + + var reportsService = { + // Find and return the report for the given organization + lookupOrganizationReport: function (organizationId) { + return findOrCreateReport('organization_report', calculateOrganizationReportId(organizationId)); + }, + + // Find and return the report for the given person + lookupPersonReport: function (organizationId, personId) { + return findOrCreateReport('person_report', calculatePersonReportId(organizationId, personId)); + }, + + // Load the person report for the given person + loadPersonReport: function (organizationId, personId) { + // Try to find the report + const reportId = calculatePersonReportId(organizationId, personId); + const report = findReport('person_report', reportId); + + if (report) { + // The report is already loaded, so simply return it + return $q.resolve(report); + } + + // Load the report and return it + return httpProxy + .get( + modelsService.getModelMetadata('person_report').url.all, + { + period: periodService.getPeriod(), + organization_ids: organizationId.toString(), + people_ids: personId.toString(), + }, + { + errorMessage: 'error.messages.reports.load_person_report', + }, + ) + .then(httpProxy.extractModels) + .then(function (people) { + return people[0]; + }); + }, + + // Load reports for specific people and organizations + loadMultiplePeopleReports: function (orgs, people) { + return httpProxy.get( + modelsService.getModelMetadata('person_report').url.all, + { + period: periodService.getPeriod(), + organization_ids: _.map(orgs, 'id').join(','), + people_ids: _.map(people, 'id').join(','), }, - - // Add a new interaction to a report - incrementReportInteraction: function (report, interactionTypeId) { - var interaction = _.find(report.interactions, { - interaction_type_id: interactionTypeId, - }); - if (interaction) { - interaction.interaction_count++; - } else { - report.interactions.push({ - interaction_type_id: interactionTypeId, - interaction_count: 1, - }); - } + { + errorMessage: 'error.messages.my_people_dashboard.load_reports', }, - }; + ); + }, + + // Load organization reports for the given organizations + loadOrganizationReports: function (orgs) { + const organizationIds = _.map(orgs, 'id'); + + // Return an array of the organization reports for the requested organization ids. Any reports that are + // not yet loaded will be represented as a null value. + function lookupReports() { + return organizationIds.map(function (organizationId) { + return reportsService.lookupOrganizationReport(organizationId); + }); + } + + // Determine which organization reports have not been loaded yet and actually need to be loaded + const unloadedOrgIds = organizationIds.filter(function (organizationId) { + const report = reportsService.lookupOrganizationReport(organizationId); + + // The report needs to be loaded if the report could not be found or if it is just a placeholder + return !report || report._placeHolder; + }); + + if (unloadedOrgIds.length === 0) { + // All requested organization report are already loaded, so no network request is necessary + return $q.resolve(lookupReports()); + } + + return httpProxy + .get( + modelsService.getModelMetadata('organization_report').url.all, + { + period: periodService.getPeriod(), + organization_ids: unloadedOrgIds.join(','), + }, + { + errorMessage: 'error.messages.reports.load_org_reports', + }, + ) + .then(function () { + return lookupReports(); + }); + }, + + // Return the number of interactions of a specific type in a particular report + getInteractionCount: function (report, interactionTypeId) { + const interaction = + report && + _.find(report.interactions, ({ interaction_type_id }) => `${interaction_type_id}` === interactionTypeId); + return _.isNil(interaction) ? '-' : interaction.interaction_count; + }, + + // Add a new interaction to a report + incrementReportInteraction: function (report, interactionTypeId) { + const interaction = _.find(report.interactions, { + interaction_type_id: interactionTypeId, + }); + if (interaction) { + interaction.interaction_count++; + } else { + report.interactions.push({ + interaction_type_id: interactionTypeId, + interaction_count: 1, + }); + } + }, + }; - return reportsService; + return reportsService; } diff --git a/app/assets/javascripts/angular/services/reports.service.spec.js b/app/assets/javascripts/angular/services/reports.service.spec.js index 152c799308..4fbd14d03c 100644 --- a/app/assets/javascripts/angular/services/reports.service.spec.js +++ b/app/assets/javascripts/angular/services/reports.service.spec.js @@ -1,338 +1,279 @@ import 'angular-mocks'; // Constants -var $q, $rootScope, reportsService, httpProxy, JsonApiDataStore, periodService; +let $q, $rootScope, reportsService, httpProxy, JsonApiDataStore, periodService; function async(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('reportsService', function () { - beforeEach(inject(function ( - _$q_, - _$rootScope_, - _reportsService_, - _httpProxy_, - _JsonApiDataStore_, - _periodService_, - ) { - var _this = this; - - $q = _$q_; - $rootScope = _$rootScope_; - reportsService = _reportsService_; - httpProxy = _httpProxy_; - JsonApiDataStore = _JsonApiDataStore_; - periodService = _periodService_; - - this.period = '1d'; - this.orgId = 1; - this.personId = 2; - this.organizationReport = { id: '1-1d' }; - this.personReport = { id: '1-2-1d' }; - this.orgs = [{ id: 123 }, { id: 456 }, { id: 789 }]; - this.report1 = { id: '123-1d' }; - this.report2 = { id: '456-1d' }; - this.report3 = { id: '789-1d' }; - - this.report = { - interactions: [ - { interaction_type_id: '1', interaction_count: 1 }, - { interaction_type_id: '2', interaction_count: 5 }, - { interaction_type_id: '3', interaction_count: 10 }, - ], - }; - - this.httpResponse = {}; - spyOn(httpProxy, 'callHttp').and.callFake(function () { - return $q.resolve(_this.httpResponse); - }); - spyOn(periodService, 'getPeriod').and.returnValue(this.period); - })); - - describe('lookupOrganizationReport', function () { - it('should return the found report if it exists', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue( - this.organizationReport, - ); - expect(reportsService.lookupOrganizationReport(this.orgId)).toBe( - this.organizationReport, - ); - }); + beforeEach(inject(function (_$q_, _$rootScope_, _reportsService_, _httpProxy_, _JsonApiDataStore_, _periodService_) { + const _this = this; + + $q = _$q_; + $rootScope = _$rootScope_; + reportsService = _reportsService_; + httpProxy = _httpProxy_; + JsonApiDataStore = _JsonApiDataStore_; + periodService = _periodService_; + + this.period = '1d'; + this.orgId = 1; + this.personId = 2; + this.organizationReport = { id: '1-1d' }; + this.personReport = { id: '1-2-1d' }; + this.orgs = [{ id: 123 }, { id: 456 }, { id: 789 }]; + this.report1 = { id: '123-1d' }; + this.report2 = { id: '456-1d' }; + this.report3 = { id: '789-1d' }; + + this.report = { + interactions: [ + { interaction_type_id: '1', interaction_count: 1 }, + { interaction_type_id: '2', interaction_count: 5 }, + { interaction_type_id: '3', interaction_count: 10 }, + ], + }; - it('should return a placeholder report if it does not exist', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); - expect(reportsService.lookupOrganizationReport(this.orgId)).toEqual( - jasmine.objectContaining({ - id: this.organizationReport.id, - contact_count: 0, - uncontacted_count: 0, - _placeHolder: true, - interactions: [], - }), - ); - }); + this.httpResponse = {}; + spyOn(httpProxy, 'callHttp').and.callFake(function () { + return $q.resolve(_this.httpResponse); }); + spyOn(periodService, 'getPeriod').and.returnValue(this.period); + })); - describe('lookupPersonReport', function () { - it('should return the found report if it exists', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue( - this.personReport, - ); - expect( - reportsService.lookupPersonReport(this.orgId, this.personId), - ).toBe(this.personReport); - }); - - it('should return a placeholder report if it does not exist', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); - expect( - reportsService.lookupPersonReport(this.orgId, this.personId), - ).toEqual( - jasmine.objectContaining({ - id: this.personReport.id, - contact_count: 0, - uncontacted_count: 0, - _placeHolder: true, - interactions: [], - }), - ); - }); + describe('lookupOrganizationReport', function () { + it('should return the found report if it exists', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.organizationReport); + expect(reportsService.lookupOrganizationReport(this.orgId)).toBe(this.organizationReport); }); - describe('loadPersonReport', function () { - it('should try to find the existing person report', function () { - spyOn(JsonApiDataStore.store, 'find'); - reportsService.loadPersonReport(this.orgId, this.personId); - expect(JsonApiDataStore.store.find).toHaveBeenCalledWith( - 'person_report', - this.orgId + '-' + this.personId + '-' + this.period, - ); - }); + it('should return a placeholder report if it does not exist', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); + expect(reportsService.lookupOrganizationReport(this.orgId)).toEqual( + jasmine.objectContaining({ + id: this.organizationReport.id, + contact_count: 0, + uncontacted_count: 0, + _placeHolder: true, + interactions: [], + }), + ); + }); + }); - it('should make a network request if the report is not loaded', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); - reportsService.loadPersonReport(this.orgId, this.personId); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { - period: this.period, - organization_ids: this.orgId.toString(), - people_ids: this.personId.toString(), - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + describe('lookupPersonReport', function () { + it('should return the found report if it exists', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.personReport); + expect(reportsService.lookupPersonReport(this.orgId, this.personId)).toBe(this.personReport); + }); - it('should not make a network request if the report is loaded', function () { - spyOn(JsonApiDataStore.store, 'find').and.returnValue( - this.personReport, - ); - reportsService.loadPersonReport(this.orgId, this.personId); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should return a placeholder report if it does not exist', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); + expect(reportsService.lookupPersonReport(this.orgId, this.personId)).toEqual( + jasmine.objectContaining({ + id: this.personReport.id, + contact_count: 0, + uncontacted_count: 0, + _placeHolder: true, + interactions: [], + }), + ); + }); + }); + + describe('loadPersonReport', function () { + it('should try to find the existing person report', function () { + spyOn(JsonApiDataStore.store, 'find'); + reportsService.loadPersonReport(this.orgId, this.personId); + expect(JsonApiDataStore.store.find).toHaveBeenCalledWith( + 'person_report', + this.orgId + '-' + this.personId + '-' + this.period, + ); + }); - it('should return a promise that resolves to the report if it is already loaded', async(function () { - var _this = this; - spyOn(JsonApiDataStore.store, 'find').and.returnValue( - this.personReport, - ); - return reportsService - .loadPersonReport(this.orgId, this.personId) - .then(function (personReport) { - expect(personReport).toBe(_this.personReport); - }); - })); - - it('should return a promise that resolves to the report if it is not already loaded', async(function () { - var _this = this; - spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); - this.httpResponse = { - data: [this.personReport], - }; - return reportsService - .loadPersonReport(this.orgId, this.personId) - .then(function (personReport) { - expect(personReport).toBe(_this.personReport); - }); - })); + it('should make a network request if the report is not loaded', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); + reportsService.loadPersonReport(this.orgId, this.personId); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { + period: this.period, + organization_ids: this.orgId.toString(), + people_ids: this.personId.toString(), + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); }); - describe('loadMultiplePeopleReports', function () { - it('should call GET loadMultiplePeopleReports URL and return the reports', async(function () { - this.httpResponse = { - reportId: 123, - }; - - reportsService.loadMultiplePeopleReports( - [{ id: 123 }], - [{ id: 1 }, { id: 2 }], - ); - - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - jasmine.any(String), - { organization_ids: '123', people_ids: '1,2', period: '1d' }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - - return reportsService - .loadMultiplePeopleReports( - [{ id: 123 }], - [{ id: 1 }, { id: 2 }], - ) - .then(function (loadedPeopleReports) { - expect(loadedPeopleReports).toEqual({ - reportId: 123, - }); - }); - })); + it('should not make a network request if the report is loaded', function () { + spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.personReport); + reportsService.loadPersonReport(this.orgId, this.personId); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); }); - describe('loadOrganizationReports', function () { - it('should GET the organization reports URL', function () { - spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( - null, - null, - null, - ); - reportsService.loadOrganizationReports(this.orgs); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - '/reports/organizations', - { - organization_ids: '123,456,789', - period: this.period, - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); - }); + it('should return a promise that resolves to the report if it is already loaded', async(function () { + const _this = this; + spyOn(JsonApiDataStore.store, 'find').and.returnValue(this.personReport); + return reportsService.loadPersonReport(this.orgId, this.personId).then(function (personReport) { + expect(personReport).toBe(_this.personReport); + }); + })); - it('should only load reports that are not already loaded', function () { - spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( - null, - this.report2, - null, - ); - reportsService.loadOrganizationReports(this.orgs); - expect(httpProxy.callHttp).toHaveBeenCalledWith( - 'GET', - '/reports/organizations', - { - organization_ids: '123,789', - period: this.period, - }, - null, - jasmine.objectContaining({ errorMessage: jasmine.any(String) }), - ); + it('should return a promise that resolves to the report if it is not already loaded', async(function () { + const _this = this; + spyOn(JsonApiDataStore.store, 'find').and.returnValue(null); + this.httpResponse = { + data: [this.personReport], + }; + return reportsService.loadPersonReport(this.orgId, this.personId).then(function (personReport) { + expect(personReport).toBe(_this.personReport); + }); + })); + }); + + describe('loadMultiplePeopleReports', function () { + it('should call GET loadMultiplePeopleReports URL and return the reports', async(function () { + this.httpResponse = { + reportId: 123, + }; + + reportsService.loadMultiplePeopleReports([{ id: 123 }], [{ id: 1 }, { id: 2 }]); + + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + jasmine.any(String), + { organization_ids: '123', people_ids: '1,2', period: '1d' }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + + return reportsService + .loadMultiplePeopleReports([{ id: 123 }], [{ id: 1 }, { id: 2 }]) + .then(function (loadedPeopleReports) { + expect(loadedPeopleReports).toEqual({ + reportId: 123, + }); }); + })); + }); + + describe('loadOrganizationReports', function () { + it('should GET the organization reports URL', function () { + spyOn(reportsService, 'lookupOrganizationReport').and.returnValues(null, null, null); + reportsService.loadOrganizationReports(this.orgs); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + '/reports/organizations', + { + organization_ids: '123,456,789', + period: this.period, + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('should not make a network request when all reports are already loaded', function () { - spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( - this.report1, - this.report2, - this.report3, - ); - reportsService.loadOrganizationReports(this.orgs); - expect(httpProxy.callHttp).not.toHaveBeenCalled(); - }); + it('should only load reports that are not already loaded', function () { + spyOn(reportsService, 'lookupOrganizationReport').and.returnValues(null, this.report2, null); + reportsService.loadOrganizationReports(this.orgs); + expect(httpProxy.callHttp).toHaveBeenCalledWith( + 'GET', + '/reports/organizations', + { + organization_ids: '123,789', + period: this.period, + }, + null, + jasmine.objectContaining({ errorMessage: jasmine.any(String) }), + ); + }); - it('should asynchronously return an array of organization reports when a network request is required', async(function () { - var _this = this; - spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( - null, - null, - null, - this.report1, - this.report2, - this.report3, - ); - - return reportsService - .loadOrganizationReports(this.orgs) - .then(function (loadedOrganizationReports) { - expect(loadedOrganizationReports).toEqual([ - _this.report1, - _this.report2, - _this.report3, - ]); - }); - })); - - it('should asynchronously return an array of organization reports when a network request is not required', async(function () { - var _this = this; - spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( - this.report1, - this.report2, - this.report3, - this.report1, - this.report2, - this.report3, - ); - - return reportsService - .loadOrganizationReports(this.orgs) - .then(function (loadedOrganizationReports) { - expect(loadedOrganizationReports).toEqual([ - _this.report1, - _this.report2, - _this.report3, - ]); - }); - })); + it('should not make a network request when all reports are already loaded', function () { + spyOn(reportsService, 'lookupOrganizationReport').and.returnValues(this.report1, this.report2, this.report3); + reportsService.loadOrganizationReports(this.orgs); + expect(httpProxy.callHttp).not.toHaveBeenCalled(); }); - describe('getInteractionCount', function () { - it('should return the interaction count', function () { - expect(reportsService.getInteractionCount(this.report, '1')).toBe( - 1, - ); - }); + it('should asynchronously return an array of organization reports when a network request is required', async(function () { + const _this = this; + spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( + null, + null, + null, + this.report1, + this.report2, + this.report3, + ); + + return reportsService.loadOrganizationReports(this.orgs).then(function (loadedOrganizationReports) { + expect(loadedOrganizationReports).toEqual([_this.report1, _this.report2, _this.report3]); + }); + })); - it('should return no data with a report not containing interactions of a certain type', function () { - expect(reportsService.getInteractionCount(this.report, '5')).toBe( - '-', - ); - }); + it('should asynchronously return an array of organization reports when a network request is not required', async(function () { + const _this = this; + spyOn(reportsService, 'lookupOrganizationReport').and.returnValues( + this.report1, + this.report2, + this.report3, + this.report1, + this.report2, + this.report3, + ); + + return reportsService.loadOrganizationReports(this.orgs).then(function (loadedOrganizationReports) { + expect(loadedOrganizationReports).toEqual([_this.report1, _this.report2, _this.report3]); + }); + })); + }); - it('should return no data with no report', function () { - expect(reportsService.getInteractionCount(null, '1')).toBe('-'); - }); + describe('getInteractionCount', function () { + it('should return the interaction count', function () { + expect(reportsService.getInteractionCount(this.report, '1')).toBe(1); }); - describe('incrementReportInteraction', function () { - it('increment existing interaction counts', function () { - reportsService.incrementReportInteraction(this.report, '1'); - expect(this.report.interactions).toEqual([ - { interaction_type_id: '1', interaction_count: 2 }, - { interaction_type_id: '2', interaction_count: 5 }, - { interaction_type_id: '3', interaction_count: 10 }, - ]); - }); + it('should return no data with a report not containing interactions of a certain type', function () { + expect(reportsService.getInteractionCount(this.report, '5')).toBe('-'); + }); - it('create non-existent interaction counts', function () { - reportsService.incrementReportInteraction(this.report, '5'); - expect(this.report.interactions).toEqual([ - { interaction_type_id: '1', interaction_count: 1 }, - { interaction_type_id: '2', interaction_count: 5 }, - { interaction_type_id: '3', interaction_count: 10 }, - { interaction_type_id: '5', interaction_count: 1 }, - ]); - }); + it('should return no data with no report', function () { + expect(reportsService.getInteractionCount(null, '1')).toBe('-'); + }); + }); + + describe('incrementReportInteraction', function () { + it('increment existing interaction counts', function () { + reportsService.incrementReportInteraction(this.report, '1'); + expect(this.report.interactions).toEqual([ + { interaction_type_id: '1', interaction_count: 2 }, + { interaction_type_id: '2', interaction_count: 5 }, + { interaction_type_id: '3', interaction_count: 10 }, + ]); + }); + + it('create non-existent interaction counts', function () { + reportsService.incrementReportInteraction(this.report, '5'); + expect(this.report.interactions).toEqual([ + { interaction_type_id: '1', interaction_count: 1 }, + { interaction_type_id: '2', interaction_count: 5 }, + { interaction_type_id: '3', interaction_count: 10 }, + { interaction_type_id: '5', interaction_count: 1 }, + ]); }); + }); }); diff --git a/app/assets/javascripts/angular/services/requestDeduper.service.js b/app/assets/javascripts/angular/services/requestDeduper.service.js index c42da637da..d75aaf1903 100644 --- a/app/assets/javascripts/angular/services/requestDeduper.service.js +++ b/app/assets/javascripts/angular/services/requestDeduper.service.js @@ -1,44 +1,42 @@ angular.module('campusContactsApp').factory('RequestDeduper', requestDeduper); function requestDeduper($q, _) { - /* - * This class facilitates network request deduplication, i.e. preventing there from being multiple outstanding - * requests. An instance of this class can be passed to httpProxy to enable deduplication of all requests that - * use the same deduplicator instance. - */ - function RequestDeduper() { - var nextRequestStart = $q.defer(); + /* + * This class facilitates network request deduplication, i.e. preventing there from being multiple outstanding + * requests. An instance of this class can be passed to httpProxy to enable deduplication of all requests that + * use the same deduplicator instance. + */ + function RequestDeduper() { + let nextRequestStart = $q.defer(); - // This request should timeout when the next load request starts (if this request has not already - // completed) so that only one request is in progress at a time and to avoid race conditions in .then - // handlers. - this.request = function (makeRequest) { - // Keep track of whether or not the request was canceled by a later duplicate - var canceled = false; + // This request should timeout when the next load request starts (if this request has not already + // completed) so that only one request is in progress at a time and to avoid race conditions in .then + // handlers. + this.request = function (makeRequest) { + // Keep track of whether or not the request was canceled by a later duplicate + let canceled = false; - // Inform the previous request that another request is starting, which will abort it if it has not - // already completed - nextRequestStart.resolve(); + // Inform the previous request that another request is starting, which will abort it if it has not + // already completed + nextRequestStart.resolve(); - // Create a new deferred that will be resolved by the next request - nextRequestStart = $q.defer(); - nextRequestStart.promise.then(function () { - canceled = true; - }); + // Create a new deferred that will be resolved by the next request + nextRequestStart = $q.defer(); + nextRequestStart.promise.then(function () { + canceled = true; + }); - return makeRequest({ timeout: nextRequestStart.promise }).catch( - function (err) { - if (canceled) { - // This error was the result of it being a duplicate request, so keep the promise that request() - // returns to the caller from ever settling - return $q(_.noop); - } + return makeRequest({ timeout: nextRequestStart.promise }).catch(function (err) { + if (canceled) { + // This error was the result of it being a duplicate request, so keep the promise that request() + // returns to the caller from ever settling + return $q(_.noop); + } - throw err; - }, - ); - }; - } + throw err; + }); + }; + } - return RequestDeduper; + return RequestDeduper; } diff --git a/app/assets/javascripts/angular/services/requestDeduper.service.spec.js b/app/assets/javascripts/angular/services/requestDeduper.service.spec.js index 03d3ec7d39..d2100fc383 100644 --- a/app/assets/javascripts/angular/services/requestDeduper.service.spec.js +++ b/app/assets/javascripts/angular/services/requestDeduper.service.spec.js @@ -1,103 +1,99 @@ import 'angular-mocks'; // Constants -var RequestDeduper, $rootScope, $q; +let RequestDeduper, $rootScope, $q; // Add better asynchronous support to a test function // The test function must return a promise // The promise will automatically be bound to "done" and the $rootScope will be automatically digested function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('RequestDeduper', function () { - beforeEach(inject(function (_RequestDeduper_, _$rootScope_, _$q_) { - RequestDeduper = _RequestDeduper_; - $rootScope = _$rootScope_; - $q = _$q_; - - this.requestDeduper = new RequestDeduper(); - })); - - describe('request', function () { - function makeSuccessfulRequest() { - return $q.resolve(); - } - - it('should call makeRequest with a timeout promise', function () { - var makeRequest = jasmine.createSpy().and.returnValue($q.resolve()); - this.requestDeduper.request(makeRequest); - expect(makeRequest).toHaveBeenCalledWith({ - timeout: jasmine.any(Object), - }); - - var timeoutPromise = makeRequest.calls.argsFor(0)[0].timeout; - expect(timeoutPromise.then).toEqual(jasmine.any(Function)); - }); - - it('should resolve the timeout promise when making the second request', function () { - var unresolvedPromise = $q(function () {}); - var makeRequest = jasmine - .createSpy() - .and.returnValue(unresolvedPromise); + beforeEach(inject(function (_RequestDeduper_, _$rootScope_, _$q_) { + RequestDeduper = _RequestDeduper_; + $rootScope = _$rootScope_; + $q = _$q_; + + this.requestDeduper = new RequestDeduper(); + })); + + describe('request', function () { + function makeSuccessfulRequest() { + return $q.resolve(); + } + + it('should call makeRequest with a timeout promise', function () { + const makeRequest = jasmine.createSpy().and.returnValue($q.resolve()); + this.requestDeduper.request(makeRequest); + expect(makeRequest).toHaveBeenCalledWith({ + timeout: jasmine.any(Object), + }); + + const timeoutPromise = makeRequest.calls.argsFor(0)[0].timeout; + expect(timeoutPromise.then).toEqual(jasmine.any(Function)); + }); - // Make the first request - this.requestDeduper.request(makeRequest); + it('should resolve the timeout promise when making the second request', function () { + const unresolvedPromise = $q(function () {}); + const makeRequest = jasmine.createSpy().and.returnValue(unresolvedPromise); - // Save off the first request's timeout promise - var timeoutPromise = makeRequest.calls.argsFor(0)[0].timeout; + // Make the first request + this.requestDeduper.request(makeRequest); - // Make the second request - this.requestDeduper.request(makeSuccessfulRequest); + // Save off the first request's timeout promise + const timeoutPromise = makeRequest.calls.argsFor(0)[0].timeout; - // Check whether timeoutPromise is resolved - var resolved = false; - timeoutPromise.then(function () { - resolved = true; - }); - $rootScope.$digest(); + // Make the second request + this.requestDeduper.request(makeSuccessfulRequest); - // Expect the timeout promise from the first request to be resolved - expect(resolved).toBe(true); - }); + // Check whether timeoutPromise is resolved + let resolved = false; + timeoutPromise.then(function () { + resolved = true; + }); + $rootScope.$digest(); - it( - 'should keep the promise for a canceled request from settling', - asynchronous(function () { - // Make the first request - var firstRequestCompletion = $q.defer(); - var catchHandler = jasmine.createSpy('catchHandler'); - this.requestDeduper - .request(function () { - return firstRequestCompletion.promise; - }) - .catch(catchHandler); - - // Make the second request - var secondRequest = this.requestDeduper.request( - makeSuccessfulRequest, - ); - - // Fail the first request to simulate $http timeout behavior - firstRequestCompletion.reject(new Error()); - - // Wrap the promise from the second request so that the catch handler from the first request has a - // chance to be called first - return $q.resolve(secondRequest).then(function () { - expect(catchHandler).not.toHaveBeenCalled(); - }); - }), - ); + // Expect the timeout promise from the first request to be resolved + expect(resolved).toBe(true); }); + + it( + 'should keep the promise for a canceled request from settling', + asynchronous(function () { + // Make the first request + const firstRequestCompletion = $q.defer(); + const catchHandler = jasmine.createSpy('catchHandler'); + this.requestDeduper + .request(function () { + return firstRequestCompletion.promise; + }) + .catch(catchHandler); + + // Make the second request + const secondRequest = this.requestDeduper.request(makeSuccessfulRequest); + + // Fail the first request to simulate $http timeout behavior + firstRequestCompletion.reject(new Error()); + + // Wrap the promise from the second request so that the catch handler from the first request has a + // chance to be called first + return $q.resolve(secondRequest).then(function () { + expect(catchHandler).not.toHaveBeenCalled(); + }); + }), + ); + }); }); diff --git a/app/assets/javascripts/angular/services/routes.service.js b/app/assets/javascripts/angular/services/routes.service.js index a56bf9f63d..edf8bcb463 100644 --- a/app/assets/javascripts/angular/services/routes.service.js +++ b/app/assets/javascripts/angular/services/routes.service.js @@ -2,98 +2,85 @@ angular.module('campusContactsApp').factory('routesService', routesService); // This service contains logic used by the routes function routesService(httpProxy, modelsService) { - return { - // Return a promise that resolves to the specified person in the specified organization, loading that - // person if necessary - getPerson: function (personId) { - var url = modelsService - .getModelMetadata('person') - .url.single(personId); - return httpProxy.getModel( - url, - 'person', - personId, - [ - 'phone_numbers', - 'email_addresses', - 'addresses', - 'organizational_permissions', - 'organizational_labels.label', - 'group_memberships', - 'reverse_contact_assignments.assigned_to', - ], - { - params: { 'filters[include_archived]': true }, - errorMessage: 'error.messages.routes.get_person', - }, - ); + return { + // Return a promise that resolves to the specified person in the specified organization, loading that + // person if necessary + getPerson: function (personId) { + const url = modelsService.getModelMetadata('person').url.single(personId); + return httpProxy.getModel( + url, + 'person', + personId, + [ + 'phone_numbers', + 'email_addresses', + 'addresses', + 'organizational_permissions', + 'organizational_labels.label', + 'group_memberships', + 'reverse_contact_assignments.assigned_to', + ], + { + params: { 'filters[include_archived]': true }, + errorMessage: 'error.messages.routes.get_person', }, + ); + }, - // Return a promise that resolves to the specified organization, loading that organization if necessary - getOrganization: function (organizationId) { - var url = modelsService - .getModelMetadata('organization') - .url.single(organizationId); - return httpProxy.getModel( - url, - 'organization', - organizationId, - ['labels', 'groups'], - { - errorMessage: 'error.messages.routes.get_organization', - }, - { - 'fields[group]': - 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests,group_memberships,organization', - }, - ); + // Return a promise that resolves to the specified organization, loading that organization if necessary + getOrganization: function (organizationId) { + const url = modelsService.getModelMetadata('organization').url.single(organizationId); + return httpProxy.getModel( + url, + 'organization', + organizationId, + ['labels', 'groups'], + { + errorMessage: 'error.messages.routes.get_organization', }, + { + 'fields[group]': + 'name,location,meets,meeting_day,start_time,end_time,list_publicly,approve_join_requests,group_memberships,organization', + }, + ); + }, - // Load a person's interaction history (which consists of interactions as well as survey responses) - getHistory: function (personId) { - var url = modelsService - .getModelMetadata('person') - .url.single(personId); - return httpProxy.getModel( - url, - 'person', - personId, - [ - 'interactions', - 'answer_sheets.answers.question', - 'answer_sheets.survey', - ], - { - errorMessage: 'error.messages.routes.get_history', - }, - ); + // Load a person's interaction history (which consists of interactions as well as survey responses) + getHistory: function (personId) { + const url = modelsService.getModelMetadata('person').url.single(personId); + return httpProxy.getModel( + url, + 'person', + personId, + ['interactions', 'answer_sheets.answers.question', 'answer_sheets.survey'], + { + errorMessage: 'error.messages.routes.get_history', }, + ); + }, - getSurvey: function (surveyId) { - return httpProxy.getModel( - modelsService.getModelMetadata('survey').url.single(surveyId), - 'survey', - surveyId, - ['keyword'], - { - errorMessage: 'error.messages.routes.get_survey', - }, - ); + getSurvey: function (surveyId) { + return httpProxy.getModel( + modelsService.getModelMetadata('survey').url.single(surveyId), + 'survey', + surveyId, + ['keyword'], + { + errorMessage: 'error.messages.routes.get_survey', }, + ); + }, - getPhoneNumberValidation: function (code, id) { - return httpProxy.getModel( - modelsService - .getModelMetadata('phone_number_validation') - .url.single(code), - 'phone_number_validation', - id, - ['survey', 'phone_number'], - { - errorMessage: - 'error.messages.routes.get_phone_number_validation', - }, - ); + getPhoneNumberValidation: function (code, id) { + return httpProxy.getModel( + modelsService.getModelMetadata('phone_number_validation').url.single(code), + 'phone_number_validation', + id, + ['survey', 'phone_number'], + { + errorMessage: 'error.messages.routes.get_phone_number_validation', }, - }; + ); + }, + }; } diff --git a/app/assets/javascripts/angular/services/sessionStorage.service.js b/app/assets/javascripts/angular/services/sessionStorage.service.js index cd13a95a52..f6b5a5c44a 100644 --- a/app/assets/javascripts/angular/services/sessionStorage.service.js +++ b/app/assets/javascripts/angular/services/sessionStorage.service.js @@ -1,19 +1,19 @@ angular.module('campusContactsApp').service('sessionStorageService', () => { - const storage = { - set: (key, value) => { - sessionStorage.setItem(key, angular.toJson(value)); - }, - get: (key) => { - const value = sessionStorage.getItem(key); - return angular.fromJson(value); - }, - destroy: (key) => { - sessionStorage.removeItem(key); - }, - clear: () => { - sessionStorage.clear(); - }, - }; + const storage = { + set: (key, value) => { + sessionStorage.setItem(key, angular.toJson(value)); + }, + get: (key) => { + const value = sessionStorage.getItem(key); + return angular.fromJson(value); + }, + destroy: (key) => { + sessionStorage.removeItem(key); + }, + clear: () => { + sessionStorage.clear(); + }, + }; - return storage; + return storage; }); diff --git a/app/assets/javascripts/angular/services/state.service.js b/app/assets/javascripts/angular/services/state.service.js index 52441f5d6d..b2ee49d28f 100644 --- a/app/assets/javascripts/angular/services/state.service.js +++ b/app/assets/javascripts/angular/services/state.service.js @@ -1,8 +1,8 @@ angular.module('campusContactsApp').factory('state', stateService); function stateService() { - var service = { - v4AccessToken: '', - }; - return service; + const service = { + v4AccessToken: '', + }; + return service; } diff --git a/app/assets/javascripts/angular/services/survey.service.js b/app/assets/javascripts/angular/services/survey.service.js index b9b311f15a..a402a4ce9a 100644 --- a/app/assets/javascripts/angular/services/survey.service.js +++ b/app/assets/javascripts/angular/services/survey.service.js @@ -1,381 +1,308 @@ -function surveyService( - envService, - $q, - $http, - httpProxy, - modelsService, - loggedInPerson, - periodService, - $log, -) { - return { - getSurveyQuestions: (surveyId) => { - return httpProxy.get( - `/surveys/${surveyId}/questions`, - { - include: 'question_rules', - }, - { - errorMessage: 'error.messages.surveys.loadQuestions', - }, - ); +function surveyService(envService, $q, $http, httpProxy, modelsService, loggedInPerson, periodService, $log) { + return { + getSurveyQuestions: (surveyId) => { + return httpProxy.get( + `/surveys/${surveyId}/questions`, + { + include: 'question_rules', }, - - getReusableQuestions: (orgId, currentQuestions) => { - return httpProxy - .get( - `/organizations/${orgId}`, - { - include: 'active_survey_elements.question', - }, - { - errorMessage: 'error.messages.surveys.loadQuestions', - }, - ) - .then(({ data }) => { - return [ - ...new Set( // Use set to remove duplicate questions found in separate surveys - data.active_survey_elements.map( - (element) => element.question, - ), - ), - ] - .filter( - (question) => - (question.label || question.column_title) && // Hide questions with no name - !currentQuestions.includes(question.id), // Hide questions already in current survey - ) - .reduce( - ({ predefined, previouslyUsed }, question) => ({ - predefined: [ - ...predefined, - ...(question.predefined ? [question] : []), - ], - previouslyUsed: [ - ...previouslyUsed, - ...(question.predefined ? [] : [question]), - ], - }), - { - predefined: [], - previouslyUsed: [], - }, - ); - }); + { + errorMessage: 'error.messages.surveys.loadQuestions', }, + ); + }, - // Create a new survey - createSurvey: (title, organization) => { - const payload = { - data: { - type: 'survey', - attributes: { - title: title, - }, - relationships: { - organization: { - data: { - type: 'organization', - id: organization, - }, - }, - }, - }, - }; + getReusableQuestions: (orgId, currentQuestions) => { + return httpProxy + .get( + `/organizations/${orgId}`, + { + include: 'active_survey_elements.question', + }, + { + errorMessage: 'error.messages.surveys.loadQuestions', + }, + ) + .then(({ data }) => { + return [ + ...new Set(data.active_survey_elements.map((element) => element.question)), // Use set to remove duplicate questions found in separate surveys + ] + .filter( + (question) => + (question.label || question.column_title) && // Hide questions with no name + !currentQuestions.includes(question.id), // Hide questions already in current survey + ) + .reduce( + ({ predefined, previouslyUsed }, question) => ({ + predefined: [...predefined, ...(question.predefined ? [question] : [])], + previouslyUsed: [...previouslyUsed, ...(question.predefined ? [] : [question])], + }), + { + predefined: [], + previouslyUsed: [], + }, + ); + }); + }, - return httpProxy - .post( - modelsService.getModelMetadata('survey').url.all, - payload, - { - errorMessage: 'surveyTab:errors.createSurvey', - }, - ) - .then((survey) => { - return survey.data; - }); + // Create a new survey + createSurvey: (title, organization) => { + const payload = { + data: { + type: 'survey', + attributes: { + title, + }, + relationships: { + organization: { + data: { + type: 'organization', + id: organization, + }, + }, + }, }, + }; - createSurveyQuestion: (surveyId, attributes) => { - const isPredefinedQuestion = !!attributes.id; - const payload = isPredefinedQuestion - ? { - data: { - type: 'question', - id: attributes.id, - }, - } - : { - data: { - type: 'question', - attributes: attributes, - }, - }; + return httpProxy + .post(modelsService.getModelMetadata('survey').url.all, payload, { + errorMessage: 'surveyTab:errors.createSurvey', + }) + .then((survey) => { + return survey.data; + }); + }, - return isPredefinedQuestion - ? httpProxy - .put( - `/surveys/${surveyId}/questions/${attributes.id}`, - payload, - { - errorMessage: - 'surveyTab:errors.addSurveyQuestion', - }, - ) - .then((survey) => { - return survey.data; - }) - : httpProxy - .post(`/surveys/${surveyId}/questions`, payload, { - errorMessage: 'surveyTab:errors.createSurvey', - }) - .then((survey) => { - return survey.data; - }); - }, + createSurveyQuestion: (surveyId, attributes) => { + const isPredefinedQuestion = !!attributes.id; + const payload = isPredefinedQuestion + ? { + data: { + type: 'question', + id: attributes.id, + }, + } + : { + data: { + type: 'question', + attributes, + }, + }; - updateSurveyQuestion: (surveyId, attributes, rules) => { - let payload = { - data: { - type: 'question', - attributes: attributes, - }, - }; + return isPredefinedQuestion + ? httpProxy + .put(`/surveys/${surveyId}/questions/${attributes.id}`, payload, { + errorMessage: 'surveyTab:errors.addSurveyQuestion', + }) + .then((survey) => { + return survey.data; + }) + : httpProxy + .post(`/surveys/${surveyId}/questions`, payload, { + errorMessage: 'surveyTab:errors.createSurvey', + }) + .then((survey) => { + return survey.data; + }); + }, - if (rules) { - let ruleRelationship = []; - let ruleIncludes = []; + updateSurveyQuestion: (surveyId, attributes, rules) => { + const payload = { + data: { + type: 'question', + attributes, + }, + }; - rules.forEach((r) => { - if (r.id) { - ruleRelationship.push({ - type: 'question_rule', - id: r.id, - }); - } + if (rules) { + const ruleRelationship = []; + const ruleIncludes = []; - if (!r.trigger_keywords || r.trigger_keywords === '') { - return; - } + rules.forEach((r) => { + if (r.id) { + ruleRelationship.push({ + type: 'question_rule', + id: r.id, + }); + } - ruleIncludes.push({ - id: r.id, - type: 'question_rule', - attributes: { - label_ids: r.label_ids, - organization_ids: null, - people_ids: r.people_ids, - rule_code: r.rule_code, - trigger_keywords: r.trigger_keywords, - }, - }); - }); + if (!r.trigger_keywords || r.trigger_keywords === '') { + return; + } - payload.data.relationships = { - question_rules: { - data: ruleRelationship, - }, - }; + ruleIncludes.push({ + id: r.id, + type: 'question_rule', + attributes: { + label_ids: r.label_ids, + organization_ids: null, + people_ids: r.people_ids, + rule_code: r.rule_code, + trigger_keywords: r.trigger_keywords, + }, + }); + }); - payload.included = ruleIncludes; - } + payload.data.relationships = { + question_rules: { + data: ruleRelationship, + }, + }; - return httpProxy.put( - `/surveys/${surveyId}/questions/${attributes.id}`, - payload, - { - errorMessage: 'surveyTab:errors.createSurvey', - }, - ); - }, + payload.included = ruleIncludes; + } - deleteSurveyQuestion: (surveyId, questionId) => { - return httpProxy.delete( - `/surveys/${surveyId}/questions/${questionId}`, - null, - { - errorMessage: 'surveyTab:errors.createSurvey', - }, - ); - }, + return httpProxy.put(`/surveys/${surveyId}/questions/${attributes.id}`, payload, { + errorMessage: 'surveyTab:errors.createSurvey', + }); + }, - deleteSurveyQuestionRule: (surveyId, ruleId) => { - return httpProxy.delete( - `/surveys/${surveyId}/question_rules/${ruleId}`, - null, - { - errorMessage: 'surveyTab:errors.createSurvey', - }, - ); - }, + deleteSurveyQuestion: (surveyId, questionId) => { + return httpProxy.delete(`/surveys/${surveyId}/questions/${questionId}`, null, { + errorMessage: 'surveyTab:errors.createSurvey', + }); + }, - updateSurvey: (survey) => { - return httpProxy - .put( - modelsService - .getModelMetadata('survey') - .url.single(survey.id), - { - data: { - type: 'survey', - attributes: { - title: survey.title, - is_frozen: survey.is_frozen, - post_survey_message: survey.post_survey_message, - login_paragraph: survey.login_paragraph, - validate_phone_number: - survey.validate_phone_number, - validation_message: survey.validation_message, - validation_success_message: - survey.validation_success_message, - ...(survey.logo === undefined - ? {} - : { logo: survey.logo }), // Only send logo field to API when it is a base64 string or null (to allow deletion) - }, - }, - }, - { - errorMessage: 'surveyTab:errors.updateSurvey', - }, - ) - .then((survey) => { - return survey.data; - }); - }, + deleteSurveyQuestionRule: (surveyId, ruleId) => { + return httpProxy.delete(`/surveys/${surveyId}/question_rules/${ruleId}`, null, { + errorMessage: 'surveyTab:errors.createSurvey', + }); + }, - deleteSurvey: (survey) => { - return httpProxy.delete( - modelsService.getModelMetadata('survey').url.single(survey.id), - null, - { - errorMessage: 'surveyTab:errors.deleteSurvey', - }, - ); - }, + updateSurvey: (survey) => { + return httpProxy + .put( + modelsService.getModelMetadata('survey').url.single(survey.id), + { + data: { + type: 'survey', + attributes: { + title: survey.title, + is_frozen: survey.is_frozen, + post_survey_message: survey.post_survey_message, + login_paragraph: survey.login_paragraph, + validate_phone_number: survey.validate_phone_number, + validation_message: survey.validation_message, + validation_success_message: survey.validation_success_message, + ...(survey.logo === undefined ? {} : { logo: survey.logo }), // Only send logo field to API when it is a base64 string or null (to allow deletion) + }, + }, + }, + { + errorMessage: 'surveyTab:errors.updateSurvey', + }, + ) + .then((survey) => { + return survey.data; + }); + }, - copySurvey: (surveyId, org, title) => { - return httpProxy.post( - `/surveys/${surveyId}/copy`, - { - data: { - type: 'survey', - attributes: { - parent_organization: org, - title: title, - }, - }, - }, - { - errorMessage: 'surveyTab:errors.createSurvey', - }, - ); - }, + deleteSurvey: (survey) => { + return httpProxy.delete(modelsService.getModelMetadata('survey').url.single(survey.id), null, { + errorMessage: 'surveyTab:errors.deleteSurvey', + }); + }, - deleteKeyword: (keywordId) => { - return httpProxy.delete( - modelsService - .getModelMetadata('sms_keyword') - .url.single(keywordId), - null, - { - errorMessage: 'surveys:keyword:errors.deleteKeyword', - }, - ); + copySurvey: (surveyId, org, title) => { + return httpProxy.post( + `/surveys/${surveyId}/copy`, + { + data: { + type: 'survey', + attributes: { + parent_organization: org, + title, + }, + }, }, + { + errorMessage: 'surveyTab:errors.createSurvey', + }, + ); + }, - requestKeyword: (data) => { - const payload = { - data: { - type: 'sms_keyword', - attributes: { - state: 'requested', - user_id: loggedInPerson.person.user.id, - keyword: data.keyword.keyword, - initial_response: data.keyword.initial_response, - explanation: data.keyword.explanation, - survey_id: data.surveyId, - organization_id: data.orgId, - }, - }, - }; + deleteKeyword: (keywordId) => { + return httpProxy.delete(modelsService.getModelMetadata('sms_keyword').url.single(keywordId), null, { + errorMessage: 'surveys:keyword:errors.deleteKeyword', + }); + }, - return httpProxy - .post( - modelsService.getModelMetadata('sms_keyword').url.all, - payload, - { - errorMessage: 'surveys:keyword:errors.requestKeyword', - }, - ) - .then(function (keyword) { - return keyword.data; - }); + requestKeyword: (data) => { + const payload = { + data: { + type: 'sms_keyword', + attributes: { + state: 'requested', + user_id: loggedInPerson.person.user.id, + keyword: data.keyword.keyword, + initial_response: data.keyword.initial_response, + explanation: data.keyword.explanation, + survey_id: data.surveyId, + organization_id: data.orgId, + }, }, + }; - updateKeyword: (data) => { - const payload = { - data: { - type: 'sms_keyword', - attributes: { - initial_response: data.keyword.initial_response, - }, - }, - }; + return httpProxy + .post(modelsService.getModelMetadata('sms_keyword').url.all, payload, { + errorMessage: 'surveys:keyword:errors.requestKeyword', + }) + .then(function (keyword) { + return keyword.data; + }); + }, - return httpProxy - .put( - modelsService - .getModelMetadata('sms_keyword') - .url.single(data.keyword.id), - payload, - ) - .then(function (keyword) { - return keyword.data; - }); + updateKeyword: (data) => { + const payload = { + data: { + type: 'sms_keyword', + attributes: { + initial_response: data.keyword.initial_response, + }, }, + }; - getStats: (surveyId) => { - return httpProxy - .get( - modelsService.getModelMetadata('survey_report').url.all, - { - period: periodService.getPeriod(), - survey_id: surveyId.toString(), - }, - { - errorMessage: 'surveyTab:errors.getStats', - }, - ) - .then(httpProxy.extractModels); - }, + return httpProxy + .put(modelsService.getModelMetadata('sms_keyword').url.single(data.keyword.id), payload) + .then(function (keyword) { + return keyword.data; + }); + }, - importContacts: (payload) => { - return httpProxy - .post( - modelsService.getModelMetadata('bulk_create_job').url.all, - payload, - { - errorMessage: 'contact_import:errors.bulkImport', - }, - ) - .then(httpProxy.extractModels); - }, + getStats: (surveyId) => { + return httpProxy + .get( + modelsService.getModelMetadata('survey_report').url.all, + { + period: periodService.getPeriod(), + survey_id: surveyId.toString(), + }, + { + errorMessage: 'surveyTab:errors.getStats', + }, + ) + .then(httpProxy.extractModels); + }, - importAnswerSheet: (payload) => { - return httpProxy - .post( - modelsService.getModelMetadata('answer_sheet').url.all, - payload, - { - errorMessage: 'contact_import:errors.save', - params: { - include: 'person', - }, - }, - ) - .then(httpProxy.extractModels); - }, - }; + importContacts: (payload) => { + return httpProxy + .post(modelsService.getModelMetadata('bulk_create_job').url.all, payload, { + errorMessage: 'contact_import:errors.bulkImport', + }) + .then(httpProxy.extractModels); + }, + + importAnswerSheet: (payload) => { + return httpProxy + .post(modelsService.getModelMetadata('answer_sheet').url.all, payload, { + errorMessage: 'contact_import:errors.save', + params: { + include: 'person', + }, + }) + .then(httpProxy.extractModels); + }, + }; } angular.module('campusContactsApp').factory('surveyService', surveyService); diff --git a/app/assets/javascripts/angular/services/survey.service.spec.js b/app/assets/javascripts/angular/services/survey.service.spec.js index bc632c4bed..4f5a48fba9 100644 --- a/app/assets/javascripts/angular/services/survey.service.spec.js +++ b/app/assets/javascripts/angular/services/survey.service.spec.js @@ -1,91 +1,82 @@ import 'angular-mocks'; // Constants -var surveyService, $rootScope, httpProxy; +let surveyService, $rootScope, httpProxy; function asynchronous(fn) { - return function (done) { - var returnValue = fn.call(this, done); - returnValue - .then(function () { - done(); - }) - .catch(function (err) { - done.fail(err); - }); - $rootScope.$apply(); - return returnValue; - }; + return function (done) { + const returnValue = fn.call(this, done); + returnValue + .then(function () { + done(); + }) + .catch(function (err) { + done.fail(err); + }); + $rootScope.$apply(); + return returnValue; + }; } describe('surveyService', function () { - beforeEach(inject(function ( - _surveyService_, - _$rootScope_, - $q, - _httpProxy_, - ) { - surveyService = _surveyService_; - $rootScope = _$rootScope_; - httpProxy = _httpProxy_; - - this.survey = { - _type: 'survey', - id: 11, - attributes: { - title: 'Survey 1', - is_frozen: false, - }, - }; + beforeEach(inject(function (_surveyService_, _$rootScope_, $q, _httpProxy_) { + surveyService = _surveyService_; + $rootScope = _$rootScope_; + httpProxy = _httpProxy_; - this.httpResponse = { - data: this.survey, - }; - spyOn(httpProxy, 'callHttp').and.callFake(() => { - return $q.resolve(this.httpResponse); - }); - })); + this.survey = { + _type: 'survey', + id: 11, + attributes: { + title: 'Survey 1', + is_frozen: false, + }, + }; - describe('createSurvey', function () { - it('should make a network request', function () { - surveyService.createSurvey(this.survey); - expect(httpProxy.callHttp).toHaveBeenCalled(); - }); + this.httpResponse = { + data: this.survey, + }; + spyOn(httpProxy, 'callHttp').and.callFake(() => { + return $q.resolve(this.httpResponse); + }); + })); - it( - 'should return a promise that resolves to the new survey', - asynchronous(function () { - return surveyService - .createSurvey(this.survey) - .then((survey) => { - expect(survey).toBe(this.survey); - }); - }), - ); + describe('createSurvey', function () { + it('should make a network request', function () { + surveyService.createSurvey(this.survey); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); - describe('updateSurvey', function () { - it('should make a network request', function () { - surveyService.updateSurvey(this.survey); - expect(httpProxy.callHttp).toHaveBeenCalled(); + it( + 'should return a promise that resolves to the new survey', + asynchronous(function () { + return surveyService.createSurvey(this.survey).then((survey) => { + expect(survey).toBe(this.survey); }); + }), + ); + }); - it( - 'should return a promise that resolves to the updated survey', - asynchronous(function () { - return surveyService - .updateSurvey(this.survey) - .then((survey) => { - expect(survey).toBe(this.survey); - }); - }), - ); + describe('updateSurvey', function () { + it('should make a network request', function () { + surveyService.updateSurvey(this.survey); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); - describe('deleteSurvey', function () { - it('should make a network request', function () { - surveyService.deleteSurvey(this.survey); - expect(httpProxy.callHttp).toHaveBeenCalled(); + it( + 'should return a promise that resolves to the updated survey', + asynchronous(function () { + return surveyService.updateSurvey(this.survey).then((survey) => { + expect(survey).toBe(this.survey); }); + }), + ); + }); + + describe('deleteSurvey', function () { + it('should make a network request', function () { + surveyService.deleteSurvey(this.survey); + expect(httpProxy.callHttp).toHaveBeenCalled(); }); + }); }); diff --git a/app/assets/javascripts/angular/services/urlHashParserService.js b/app/assets/javascripts/angular/services/urlHashParserService.js index c5e5249341..237fbbab2d 100644 --- a/app/assets/javascripts/angular/services/urlHashParserService.js +++ b/app/assets/javascripts/angular/services/urlHashParserService.js @@ -1,24 +1,22 @@ -angular - .module('campusContactsApp') - .factory('urlHashParserService', urlHashParserService); +angular.module('campusContactsApp').factory('urlHashParserService', urlHashParserService); function urlHashParserService($location) { - return { - param: (name) => { - return $location - .hash() - .split('&') - .reduce((acc, v) => { - const found = v.split('=').find((f) => { - return f === name; - }); + return { + param: (name) => { + return $location + .hash() + .split('&') + .reduce((acc, v) => { + const found = v.split('=').find((f) => { + return f === name; + }); - if (found === name) { - return v.split('=')[1]; - } + if (found === name) { + return v.split('=')[1]; + } - return acc; - }, false); - }, - }; + return acc; + }, false); + }, + }; } diff --git a/app/assets/javascripts/angular/services/userPreferences.service.js b/app/assets/javascripts/angular/services/userPreferences.service.js index 0b10c1ef59..774dcd58fd 100644 --- a/app/assets/javascripts/angular/services/userPreferences.service.js +++ b/app/assets/javascripts/angular/services/userPreferences.service.js @@ -1,98 +1,91 @@ -angular - .module('campusContactsApp') - .factory('userPreferencesService', userPreferencesService); +angular.module('campusContactsApp').factory('userPreferencesService', userPreferencesService); function userPreferencesService(httpProxy, modelsService, loggedInPerson, _) { - var factory = { - organizationOrderChange: organizationOrderChange, - toggleOrganizationVisibility: toggleOrganizationVisibility, - applyUserOrgDisplayPreferences: applyUserOrgDisplayPreferences, - _updateUserPreferences: updateUserPreferences, - }; + const factory = { + organizationOrderChange, + toggleOrganizationVisibility, + applyUserOrgDisplayPreferences, + _updateUserPreferences: updateUserPreferences, + }; - return factory; + return factory; - function organizationOrderChange(organizations) { - var orgOrder = _.map(organizations, 'id'); - factory._updateUserPreferences( - { - organization_order: orgOrder, - }, - 'error.messages.my_people_dashboard.update_org_order', - ); - } + function organizationOrderChange(organizations) { + const orgOrder = _.map(organizations, 'id'); + factory._updateUserPreferences( + { + organization_order: orgOrder, + }, + 'error.messages.my_people_dashboard.update_org_order', + ); + } - function toggleOrganizationVisibility(organization) { - organization.visible = !organization.visible; + function toggleOrganizationVisibility(organization) { + organization.visible = !organization.visible; - var hiddenOrgs = loggedInPerson.person.user.hidden_organizations || []; - if (organization.visible) { - // The organization is now visible, so remove it from the user's list of hidden organizations - hiddenOrgs = _.remove(hiddenOrgs, organization.id); - } else { - // The organization is now hidden, so add it to the user's list of hidden organizations - hiddenOrgs.push(organization.id); - } - - // Commit the changes - factory._updateUserPreferences( - { - hidden_organizations: hiddenOrgs, - }, - 'error.messages.my_people_dashboard.update_org_visibility', - ); + let hiddenOrgs = loggedInPerson.person.user.hidden_organizations || []; + if (organization.visible) { + // The organization is now visible, so remove it from the user's list of hidden organizations + hiddenOrgs = _.remove(hiddenOrgs, organization.id); + } else { + // The organization is now hidden, so add it to the user's list of hidden organizations + hiddenOrgs.push(organization.id); } - function applyUserOrgDisplayPreferences(organizations) { - // For a given org, map the org id to the sort key - var orgOrderPreference = _.invert( - loggedInPerson.person.user.organization_order, - ); + // Commit the changes + factory._updateUserPreferences( + { + hidden_organizations: hiddenOrgs, + }, + 'error.messages.my_people_dashboard.update_org_visibility', + ); + } - var partitionedOrgs = _.reduce( - organizations, - function (result, org) { - // Update org visible flag - org.visible = !_.includes( - loggedInPerson.person.user.hidden_organizations, - org.id.toString(), - ); + function applyUserOrgDisplayPreferences(organizations) { + // For a given org, map the org id to the sort key + const orgOrderPreference = _.invert(loggedInPerson.person.user.organization_order); - var userPreferredOrgKey = orgOrderPreference[org.id]; - if (userPreferredOrgKey) { - // if sort key found put it at that index - result.userPreferredOrgs[userPreferredOrgKey] = org; - } else { - // otherwise put it in otherOrgs to sort later - result.otherOrgs.push(org); - } - return result; - }, - { - userPreferredOrgs: [], - otherOrgs: [], - }, - ); + const partitionedOrgs = _.reduce( + organizations, + function (result, org) { + // Update org visible flag + org.visible = !_.includes(loggedInPerson.person.user.hidden_organizations, org.id.toString()); - // Result is user ordered orgs first and then the rest ordered by ancestry then by name - return _.concat( - _.compact(partitionedOrgs.userPreferredOrgs), - _.orderBy(partitionedOrgs.otherOrgs, ['ancestry', 'name']), - ); - } + const userPreferredOrgKey = orgOrderPreference[org.id]; + if (userPreferredOrgKey) { + // if sort key found put it at that index + result.userPreferredOrgs[userPreferredOrgKey] = org; + } else { + // otherwise put it in otherOrgs to sort later + result.otherOrgs.push(org); + } + return result; + }, + { + userPreferredOrgs: [], + otherOrgs: [], + }, + ); - function updateUserPreferences(changedPreferences, errorMessage) { - return httpProxy.put( - modelsService.getModelMetadata('user').url.single('me'), - { - data: { - type: 'user', - attributes: changedPreferences, - }, - }, - { - errorMessage: errorMessage, - }, - ); - } + // Result is user ordered orgs first and then the rest ordered by ancestry then by name + return _.concat( + _.compact(partitionedOrgs.userPreferredOrgs), + _.orderBy(partitionedOrgs.otherOrgs, ['ancestry', 'name']), + ); + } + + function updateUserPreferences(changedPreferences, errorMessage) { + return httpProxy.put( + modelsService.getModelMetadata('user').url.single('me'), + { + data: { + type: 'user', + attributes: changedPreferences, + }, + }, + { + errorMessage, + }, + ); + } } diff --git a/app/assets/javascripts/angular/services/userPreferences.service.spec.js b/app/assets/javascripts/angular/services/userPreferences.service.spec.js index 310c77a4ac..0d8511d58b 100644 --- a/app/assets/javascripts/angular/services/userPreferences.service.spec.js +++ b/app/assets/javascripts/angular/services/userPreferences.service.spec.js @@ -1,170 +1,156 @@ import 'angular-mocks'; // Constants -var userPreferencesService, _; -var httpProxy = jasmine.createSpyObj('httpProxy', ['put']); +let userPreferencesService, _; +const httpProxy = jasmine.createSpyObj('httpProxy', ['put']); describe('userPreferences service', function () { - beforeEach(function () { - var _this = this; + beforeEach(function () { + const _this = this; - // Mock out the loggedInPerson service - angular.mock.module(function ($provide) { - $provide.factory('loggedInPerson', function () { - return { - person: { - user: { - get organization_order() { - return _this.orgOrder; - }, - get hidden_organizations() { - return _this.hiddenOrgs; - }, - }, - }, - }; - }); + // Mock out the loggedInPerson service + angular.mock.module(function ($provide) { + $provide.factory('loggedInPerson', function () { + return { + person: { + user: { + get organization_order() { + return _this.orgOrder; + }, + get hidden_organizations() { + return _this.hiddenOrgs; + }, + }, + }, + }; + }); - $provide.factory('httpProxy', function () { - return httpProxy; - }); - }); + $provide.factory('httpProxy', function () { + return httpProxy; + }); }); + }); - beforeEach(inject(function (_userPreferencesService_, ___) { - userPreferencesService = _userPreferencesService_; - _ = ___; + beforeEach(inject(function (_userPreferencesService_, ___) { + userPreferencesService = _userPreferencesService_; + _ = ___; - // The org order returned by loggedInPerson.person.user.organization_order - // It be changed by individual tests - this.orgOrder = null; + // The org order returned by loggedInPerson.person.user.organization_order + // It be changed by individual tests + this.orgOrder = null; - this.orgs = [ - (this.org1 = { id: '1', name: 'Alpha', ancestry: null }), - (this.org2 = { id: '2', name: 'Charlie', ancestry: '1' }), - (this.org3 = { id: '3', name: 'Bravo', ancestry: '1' }), - (this.org4 = { id: '4', name: 'Delta', ancestry: null }), - (this.org5 = { id: '5', name: 'Echo', ancestry: '4' }), - ]; - })); + this.orgs = [ + (this.org1 = { id: '1', name: 'Alpha', ancestry: null }), + (this.org2 = { id: '2', name: 'Charlie', ancestry: '1' }), + (this.org3 = { id: '3', name: 'Bravo', ancestry: '1' }), + (this.org4 = { id: '4', name: 'Delta', ancestry: null }), + (this.org5 = { id: '5', name: 'Echo', ancestry: '4' }), + ]; + })); - describe('updateUserPreference', function () { - it('should save the changed preferences to the server', function () { - userPreferencesService._updateUserPreferences( - { - somePreference: 'newValue', - }, - 'error message', - ); - expect(httpProxy.put).toHaveBeenCalledWith( - '/users/me', - { - data: { - type: 'user', - attributes: { - somePreference: 'newValue', - }, - }, - }, - { - errorMessage: 'error message', - }, - ); - }); + describe('updateUserPreference', function () { + it('should save the changed preferences to the server', function () { + userPreferencesService._updateUserPreferences( + { + somePreference: 'newValue', + }, + 'error message', + ); + expect(httpProxy.put).toHaveBeenCalledWith( + '/users/me', + { + data: { + type: 'user', + attributes: { + somePreference: 'newValue', + }, + }, + }, + { + errorMessage: 'error message', + }, + ); }); + }); - describe('organizationOrderChange', function () { - it('should save the new organization order', function () { - spyOn(userPreferencesService, '_updateUserPreferences'); - userPreferencesService.organizationOrderChange( - [ - { - id: '2', - }, - { - id: '1', - }, - ], - 'error message', - ); - expect( - userPreferencesService._updateUserPreferences, - ).toHaveBeenCalledWith( - { - organization_order: ['2', '1'], - }, - 'error.messages.my_people_dashboard.update_org_order', - ); - }); + describe('organizationOrderChange', function () { + it('should save the new organization order', function () { + spyOn(userPreferencesService, '_updateUserPreferences'); + userPreferencesService.organizationOrderChange( + [ + { + id: '2', + }, + { + id: '1', + }, + ], + 'error message', + ); + expect(userPreferencesService._updateUserPreferences).toHaveBeenCalledWith( + { + organization_order: ['2', '1'], + }, + 'error.messages.my_people_dashboard.update_org_order', + ); }); + }); - describe('toggleOrganizationVisibility', function () { - it('should hide an org save the updated hiddenOrgs list', function () { - spyOn(userPreferencesService, '_updateUserPreferences'); - this.hiddenOrgs = ['4', '5']; + describe('toggleOrganizationVisibility', function () { + it('should hide an org save the updated hiddenOrgs list', function () { + spyOn(userPreferencesService, '_updateUserPreferences'); + this.hiddenOrgs = ['4', '5']; - userPreferencesService.toggleOrganizationVisibility({ - id: '2', - visible: true, - }); - expect( - userPreferencesService._updateUserPreferences, - ).toHaveBeenCalledWith( - { - hidden_organizations: ['4', '5', '2'], - }, - 'error.messages.my_people_dashboard.update_org_visibility', - ); - }); + userPreferencesService.toggleOrganizationVisibility({ + id: '2', + visible: true, + }); + expect(userPreferencesService._updateUserPreferences).toHaveBeenCalledWith( + { + hidden_organizations: ['4', '5', '2'], + }, + 'error.messages.my_people_dashboard.update_org_visibility', + ); }); + }); - describe('applyUserOrgDisplayPreferences', function () { - it('should sort by ancestry and name with no org order', function () { - this.orgOrder = null; - expect( - _.map( - userPreferencesService.applyUserOrgDisplayPreferences( - this.orgs, - ), - 'id', - ), - ).toEqual(['3', '2', '5', '1', '4']); - }); + describe('applyUserOrgDisplayPreferences', function () { + it('should sort by ancestry and name with no org order', function () { + this.orgOrder = null; + expect(_.map(userPreferencesService.applyUserOrgDisplayPreferences(this.orgs), 'id')).toEqual([ + '3', + '2', + '5', + '1', + '4', + ]); + }); - it('should sort by org order with complete org order', function () { - this.orgOrder = ['2', '5', '3', '1', '4']; - expect( - _.map( - userPreferencesService.applyUserOrgDisplayPreferences( - this.orgs, - ), - 'id', - ), - ).toEqual(this.orgOrder); - }); + it('should sort by org order with complete org order', function () { + this.orgOrder = ['2', '5', '3', '1', '4']; + expect(_.map(userPreferencesService.applyUserOrgDisplayPreferences(this.orgs), 'id')).toEqual(this.orgOrder); + }); - it('should sort by org order then by ancestry and name with incomplete org order', function () { - this.orgOrder = ['2', '5']; - expect( - _.map( - userPreferencesService.applyUserOrgDisplayPreferences( - this.orgs, - ), - 'id', - ), - ).toEqual(['2', '5', '3', '1', '4']); - }); + it('should sort by org order then by ancestry and name with incomplete org order', function () { + this.orgOrder = ['2', '5']; + expect(_.map(userPreferencesService.applyUserOrgDisplayPreferences(this.orgs), 'id')).toEqual([ + '2', + '5', + '3', + '1', + '4', + ]); + }); - it('should handle old user preferences', function () { - this.orgOrder = ['6', '9', '2', '5']; - expect( - _.map( - userPreferencesService.applyUserOrgDisplayPreferences( - this.orgs, - ), - 'id', - ), - ).toEqual(['2', '5', '3', '1', '4']); - }); + it('should handle old user preferences', function () { + this.orgOrder = ['6', '9', '2', '5']; + expect(_.map(userPreferencesService.applyUserOrgDisplayPreferences(this.orgs), 'id')).toEqual([ + '2', + '5', + '3', + '1', + '4', + ]); }); + }); }); diff --git a/app/assets/javascripts/angular/workboxServiceWorker.ts b/app/assets/javascripts/angular/workboxServiceWorker.ts index 9b366d19ee..93620e4270 100644 --- a/app/assets/javascripts/angular/workboxServiceWorker.ts +++ b/app/assets/javascripts/angular/workboxServiceWorker.ts @@ -1,14 +1,14 @@ /* eslint-disable angular/log */ if ('serviceWorker' in navigator) { - window.addEventListener('load', () => { - navigator.serviceWorker - .register('/service-worker.js') - .then((registration) => { - console.log('SW registered: ', registration); - }) - .catch((registrationError) => { - console.log('SW registration failed: ', registrationError); - }); - }); + window.addEventListener('load', () => { + navigator.serviceWorker + .register('/service-worker.js') + .then((registration) => { + console.log('SW registered: ', registration); + }) + .catch((registrationError) => { + console.log('SW registration failed: ', registrationError); + }); + }); } diff --git a/app/components/authentication/authLanding.component.js b/app/components/authentication/authLanding.component.js index 73521136ee..16e10d7e09 100644 --- a/app/components/authentication/authLanding.component.js +++ b/app/components/authentication/authLanding.component.js @@ -1,5 +1,5 @@ import template from './authLanding.html'; angular.module('campusContactsApp').component('authLanding', { - template: template, + template, }); diff --git a/app/components/authentication/authLanding.html b/app/components/authentication/authLanding.html index 208b8dff8b..2a10814f07 100644 --- a/app/components/authentication/authLanding.html +++ b/app/components/authentication/authLanding.html @@ -1,7 +1,7 @@
    - -

    {{ 'authLanding.title' | t }}

    -

    {{ 'authLanding.thanksForVerifying' | t }}

    -

    {{ 'authLanding.allSet' | t }}

    -

    {{ 'authLanding.excitedForYouToGrow' | t }}

    + +

    {{ 'authLanding.title' | t }}

    +

    {{ 'authLanding.thanksForVerifying' | t }}

    +

    {{ 'authLanding.allSet' | t }}

    +

    {{ 'authLanding.excitedForYouToGrow' | t }}

    diff --git a/app/components/authentication/impersonateUser.component.js b/app/components/authentication/impersonateUser.component.js index 2524dbe179..3f694b2bc7 100644 --- a/app/components/authentication/impersonateUser.component.js +++ b/app/components/authentication/impersonateUser.component.js @@ -1,23 +1,23 @@ import template from './impersonateUser.html'; angular.module('campusContactsApp').component('impersonateUser', { - controller: impersonatePersonController, - template: template, - bindings: { - userId: '<', - }, + controller: impersonatePersonController, + template, + bindings: { + userId: '<', + }, }); function impersonatePersonController(authenticationService, $state, $scope) { - this.$onInit = async () => { - if (!authenticationService.isTokenValid()) $state.go('app.people'); + this.$onInit = async () => { + if (!authenticationService.isTokenValid()) $state.go('app.people'); - this.userId - ? await authenticationService.impersonateUser(this.userId) - : await authenticationService.stopImpersonatingUser(); + this.userId + ? await authenticationService.impersonateUser(this.userId) + : await authenticationService.stopImpersonatingUser(); - $scope.$apply(); + $scope.$apply(); - $state.go('app.people'); - }; + $state.go('app.people'); + }; } diff --git a/app/components/authentication/inviteLink.component.js b/app/components/authentication/inviteLink.component.js index b2b5600faa..0f2c2d5c36 100644 --- a/app/components/authentication/inviteLink.component.js +++ b/app/components/authentication/inviteLink.component.js @@ -1,76 +1,69 @@ import template from './inviteLink.html'; angular.module('campusContactsApp').component('inviteLink', { - controller: inviteLinkController, - template: template, - bindings: { - rememberCode: '<', - userId: '<', - orgId: '<', - }, + controller: inviteLinkController, + template, + bindings: { + rememberCode: '<', + userId: '<', + orgId: '<', + }, }); function inviteLinkController( - authenticationService, - $state, - sessionStorageService, - httpProxy, - loggedInPerson, - $location, - $scope, - $sce, - $filter, + authenticationService, + $state, + sessionStorageService, + httpProxy, + loggedInPerson, + $location, + $scope, + $sce, + $filter, ) { - this.errorWithLink = false; + this.errorWithLink = false; - const setInviteState = (rememberCode, userId, orgId) => { - const inviteState = { - rememberCode: this.rememberCode, - userId: this.userId, - orgId: this.orgId, - }; - sessionStorageService.set('inviteState', inviteState); - return inviteState; + const setInviteState = (rememberCode, userId, orgId) => { + const inviteState = { + rememberCode: this.rememberCode, + userId: this.userId, + orgId: this.orgId, }; + sessionStorageService.set('inviteState', inviteState); + return inviteState; + }; - this.$onInit = async () => { - this.expiredText = $sce.trustAsHtml( - $filter('t')('mergeAccount.inviteLinkExpiredMessage'), - ); + this.$onInit = async () => { + this.expiredText = $sce.trustAsHtml($filter('t')('mergeAccount.inviteLinkExpiredMessage')); - const inviteState = setInviteState( - this.rememberCode, - this.userId, - this.orgId, - ); + const inviteState = setInviteState(this.rememberCode, this.userId, this.orgId); - if (!authenticationService.isTokenValid()) $state.go('app.signIn'); + if (!authenticationService.isTokenValid()) $state.go('app.signIn'); - if (authenticationService.isTokenValid()) { - try { - const { data } = await httpProxy.get( - `/user_remember_tokens/${this.rememberCode}`, - {}, - { - errorMessage: - 'error.messages.inviteLink.loadRemeberToken', - }, - ); + if (authenticationService.isTokenValid()) { + try { + const { data } = await httpProxy.get( + `/user_remember_tokens/${this.rememberCode}`, + {}, + { + errorMessage: 'error.messages.inviteLink.loadRemeberToken', + }, + ); - const me = await loggedInPerson.load(); + const me = await loggedInPerson.load(); - if (me.user.id.toString() === data.user_id.toString()) { - sessionStorageService.destroy('inviteState'); - $location.url(`/ministries/${this.orgId}/suborgs`); - $scope.$apply(); - } else { - $state.go('appWithoutMenus.mergeAccount', inviteState); - } - } catch (e) { - this.errorWithLink = true; - sessionStorageService.destroy('inviteState'); - $scope.$apply(); - } + if (me.user.id.toString() === data.user_id.toString()) { + sessionStorageService.destroy('inviteState'); + $location.url(`/ministries/${this.orgId}/suborgs`); + $scope.$apply(); + } else { + $state.go('appWithoutMenus.mergeAccount', inviteState); } - }; + } catch (e) { + this.errorWithLink = true; + sessionStorageService.destroy('inviteState'); + $scope.$apply(); + } + } + }; } diff --git a/app/components/authentication/inviteLink.html b/app/components/authentication/inviteLink.html index 5dcdb0f556..2ee59ed0bb 100644 --- a/app/components/authentication/inviteLink.html +++ b/app/components/authentication/inviteLink.html @@ -1,13 +1,7 @@
    -

    - {{ 'mergeAccount.inviteLinkExpiredTitle' | t }} -

    -

    - - {{ 'mergeAccount.continueAfterError' | t }} - +

    {{ 'mergeAccount.inviteLinkExpiredTitle' | t }}

    +

    + + {{ 'mergeAccount.continueAfterError' | t }} +
    diff --git a/app/components/authentication/mergeAccount.component.js b/app/components/authentication/mergeAccount.component.js index 1c73ba05e6..99fd4458f8 100644 --- a/app/components/authentication/mergeAccount.component.js +++ b/app/components/authentication/mergeAccount.component.js @@ -1,59 +1,50 @@ import template from './mergeAccount.html'; angular.module('campusContactsApp').component('mergeAccount', { - controller: mergeAccountController, - template: template, - bindings: { - rememberCode: '<', - userId: '<', - orgId: '<', - loggedInUser: '<', - }, + controller: mergeAccountController, + template, + bindings: { + rememberCode: '<', + userId: '<', + orgId: '<', + loggedInUser: '<', + }, }); -function mergeAccountController( - authenticationService, - $state, - httpProxy, - $scope, - sessionStorageService, -) { - this.inviteFullName = ''; - this.inviteUsername = ''; - this.accountMerged = false; - - this.$onInit = async () => { - if (!authenticationService.isTokenValid()) $state.go('app.signIn'); - - const { data } = await httpProxy.get( - `/user_remember_tokens/${this.rememberCode}`, - {}, - { - errorMessage: 'error.messages.inviteLink.loadRemeberToken', - }, - ); - - this.inviteFullName = data.full_name; - this.inviteUsername = data.username; - - $scope.$apply(); - }; - - this.cancelMerge = () => { - authenticationService.destroyOktaAccess(); - }; - - this.mergeAccount = async () => { - try { - await httpProxy.post( - `/user_remember_tokens/${this.rememberCode}/merge`, - { - errorMessage: 'error.messages.inviteLink.mergeAccount', - }, - ); - - sessionStorageService.destroy('inviteState'); - this.accountMerged = true; - } catch (e) {} - }; +function mergeAccountController(authenticationService, $state, httpProxy, $scope, sessionStorageService) { + this.inviteFullName = ''; + this.inviteUsername = ''; + this.accountMerged = false; + + this.$onInit = async () => { + if (!authenticationService.isTokenValid()) $state.go('app.signIn'); + + const { data } = await httpProxy.get( + `/user_remember_tokens/${this.rememberCode}`, + {}, + { + errorMessage: 'error.messages.inviteLink.loadRemeberToken', + }, + ); + + this.inviteFullName = data.full_name; + this.inviteUsername = data.username; + + $scope.$apply(); + }; + + this.cancelMerge = () => { + authenticationService.destroyOktaAccess(); + }; + + this.mergeAccount = async () => { + try { + await httpProxy.post(`/user_remember_tokens/${this.rememberCode}/merge`, { + errorMessage: 'error.messages.inviteLink.mergeAccount', + }); + + sessionStorageService.destroy('inviteState'); + this.accountMerged = true; + } catch (e) {} + }; } diff --git a/app/components/authentication/mergeAccount.html b/app/components/authentication/mergeAccount.html index 0731f1aabb..4858ea4ed4 100644 --- a/app/components/authentication/mergeAccount.html +++ b/app/components/authentication/mergeAccount.html @@ -1,41 +1,34 @@
    -
    - -

    - {{ 'mergeAccount.loggedInAs' | t : { fullName: - $ctrl.loggedInUser.full_name, email: - $ctrl.loggedInUser.user.username } }} -

    -

    - {{ 'mergeAccount.continue' | t }} -

    -

    - {{ 'mergeAccount.mergeAccount' | t : { fullName: - $ctrl.inviteFullName, username: $ctrl.inviteUsername } }} -

    -

    - {{ 'mergeAccount.cancelMerge' | t }} -

    -
    -
    -

    - {{ 'mergeAccount.successAccountMerged' | t : { oldAccountFullName: - $ctrl.inviteFullName, oldAccountUsername: $ctrl.inviteUsername, - mergedAccountFullName: $ctrl.loggedInUser.full_name, - mergedAccountEmail: $ctrl.loggedInUser.user.username } }} -

    -

    - - {{ 'mergeAccount.continueAccountMerged' | t }} - -

    -
    +
    + +

    + {{ 'mergeAccount.loggedInAs' | t : { fullName: $ctrl.loggedInUser.full_name, email: + $ctrl.loggedInUser.user.username } }} +

    +

    {{ 'mergeAccount.continue' | t }}

    +

    + {{ 'mergeAccount.mergeAccount' | t : { fullName: $ctrl.inviteFullName, username: $ctrl.inviteUsername } }} +

    +

    + {{ 'mergeAccount.cancelMerge' | t }} +

    +
    +
    +

    + {{ 'mergeAccount.successAccountMerged' | t : { oldAccountFullName: $ctrl.inviteFullName, oldAccountUsername: + $ctrl.inviteUsername, mergedAccountFullName: $ctrl.loggedInUser.full_name, mergedAccountEmail: + $ctrl.loggedInUser.user.username } }} +

    +

    + + {{ 'mergeAccount.continueAccountMerged' | t }} + +

    +
    diff --git a/app/components/authentication/signIn.component.js b/app/components/authentication/signIn.component.js index b7413ef2de..d437ec33b3 100644 --- a/app/components/authentication/signIn.component.js +++ b/app/components/authentication/signIn.component.js @@ -4,37 +4,37 @@ import template from './signIn.html'; import './signIn.scss'; angular.module('campusContactsApp').component('signIn', { - controller: signInController, - template: template, - bindings: { - accessToken: '<', - }, + controller: signInController, + template, + bindings: { + accessToken: '<', + }, }); function signInController( - authenticationService, - envService, - $state, - facebookService, - oktaService, - sessionStorageService, + authenticationService, + envService, + $state, + facebookService, + oktaService, + sessionStorageService, ) { - this.showLogin = false; - this.facebookService = facebookService; - this.oktaService = oktaService; - this.campusContactsLogo = campusContactsLogo; + this.showLogin = false; + this.facebookService = facebookService; + this.oktaService = oktaService; + this.campusContactsLogo = campusContactsLogo; - this.$onInit = async () => { - if (authenticationService.isTokenValid()) { - authenticationService.postAuthRedirect(); - } + this.$onInit = async () => { + if (authenticationService.isTokenValid()) { + authenticationService.postAuthRedirect(); + } - if (this.accessToken) { - await authenticationService.authorizeOktaAccess(this.accessToken); - } + if (this.accessToken) { + await authenticationService.authorizeOktaAccess(this.accessToken); + } - if (!this.accessToken) this.showLogin = true; + if (!this.accessToken) this.showLogin = true; - this.inviteState = sessionStorageService.get('inviteState'); - }; + this.inviteState = sessionStorageService.get('inviteState'); + }; } diff --git a/app/components/authentication/signIn.html b/app/components/authentication/signIn.html index 7cf9bff1c1..f870e7988f 100644 --- a/app/components/authentication/signIn.html +++ b/app/components/authentication/signIn.html @@ -1,35 +1,31 @@
    -
    - -
    -
    Campus Contacts
    -

    - A simple contact management tool to find, connect, and communicate with - people on your campus -

    +
    + +
    +
    Campus Contacts
    +

    + A simple contact management tool to find, connect, and communicate with people on your campus +

    -

    - {{ 'login.inviteInProgress' | t }} -

    -
    - - {{ $ctrl.inviteState? 'login.signUpWithEmail' : - 'login.signInWithEmail' | t }} - - - {{ 'login.continueWithFacebook' | t }} - -
    +

    {{ 'login.inviteInProgress' | t }}

    +
    + + {{ $ctrl.inviteState? 'login.signUpWithEmail' : 'login.signInWithEmail' | t }} + + + {{ 'login.continueWithFacebook' | t }} + +
    diff --git a/app/components/navigation/navHeader.component.js b/app/components/navigation/navHeader.component.js index d0bf33a261..fd8de8e44a 100644 --- a/app/components/navigation/navHeader.component.js +++ b/app/components/navigation/navHeader.component.js @@ -6,27 +6,22 @@ import './navHeader.scss'; import './navSearch.component'; angular.module('campusContactsApp').component('navHeader', { - controller: navHeaderController, - template: template, - bindings: { - hideMenuLinks: '<', - }, + controller: navHeaderController, + template, + bindings: { + hideMenuLinks: '<', + }, }); -function navHeaderController( - state, - loggedInPerson, - envService, - authenticationService, -) { - this.loggedInPerson = loggedInPerson; - this.state = state; - this.searchIcon = searchIcon; - this.campusContactsLogo = campusContactsLogo; +function navHeaderController(state, loggedInPerson, envService, authenticationService) { + this.loggedInPerson = loggedInPerson; + this.state = state; + this.searchIcon = searchIcon; + this.campusContactsLogo = campusContactsLogo; - this.logout = () => { - authenticationService.destroyOktaAccess(); - }; + this.logout = () => { + authenticationService.destroyOktaAccess(); + }; - this.toggleSearchBar = () => (this.showSearchBar = !this.showSearchBar); + this.toggleSearchBar = () => (this.showSearchBar = !this.showSearchBar); } diff --git a/app/components/navigation/navHeader.html b/app/components/navigation/navHeader.html index 4b1b96dbde..7154bc91cf 100644 --- a/app/components/navigation/navHeader.html +++ b/app/components/navigation/navHeader.html @@ -1,125 +1,90 @@ -
    - + + + Campus Contacts + + + + - - - +
    diff --git a/app/components/navigation/navSearch.component.js b/app/components/navigation/navSearch.component.js index d043063c22..3bdb1894a7 100644 --- a/app/components/navigation/navSearch.component.js +++ b/app/components/navigation/navSearch.component.js @@ -2,12 +2,12 @@ import template from './navSearch.html'; import './navSearch.scss'; angular.module('campusContactsApp').component('navSearch', { - controller: navSearchController, - template: template, + controller: navSearchController, + template, }); function navSearchController(peopleSearchService) { - this.$onInit = () => { - this.searchPeople = peopleSearchService.search; - }; + this.$onInit = () => { + this.searchPeople = peopleSearchService.search; + }; } diff --git a/app/components/navigation/navSearch.html b/app/components/navigation/navSearch.html index 5dff2bc313..6eabcb1dd5 100644 --- a/app/components/navigation/navSearch.html +++ b/app/components/navigation/navSearch.html @@ -1,67 +1,62 @@
    -
    - -
    -
    -
    -
    -
    -
    - {{ 'navSearch:noPeopleFound' | t }} +
    + +
    +
    +
    +
    +
    {{ 'navSearch:noPeopleFound' | t }}
    - + - +
    + +
    diff --git a/babel.config.js b/babel.config.js index d7c78d9823..04ad362b03 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,6 +1,4 @@ module.exports = { - presets: [ - '@babel/preset-env', - ], - plugins: ['@babel/plugin-transform-runtime'], + presets: ['@babel/preset-env'], + plugins: ['@babel/plugin-transform-runtime'], }; diff --git a/bin/oneskyDownload.js b/bin/oneskyDownload.js index 75f318704e..61b9ba1124 100644 --- a/bin/oneskyDownload.js +++ b/bin/oneskyDownload.js @@ -8,30 +8,27 @@ import oneSky from '@brainly/onesky-utils'; dotenv.config({ path: '.env.local' }); async function downloadTranslations() { - const options = { - apiKey: process.env.ONESKY_API_KEY, - secret: process.env.ONESKY_SECRET_KEY, - projectId: '240181', - fileName: 'en-US.json', - format: 'I18NEXT_MULTILINGUAL_JSON', - }; + const options = { + apiKey: process.env.ONESKY_API_KEY, + secret: process.env.ONESKY_SECRET_KEY, + projectId: '240181', + fileName: 'en-US.json', + format: 'I18NEXT_MULTILINGUAL_JSON', + }; - console.log('Downloading from OneSky...'); - try { - const content = await oneSky.getMultilingualFile(options); - console.log('Successfully Downloaded.'); + console.log('Downloading from OneSky...'); + try { + const content = await oneSky.getMultilingualFile(options); + console.log('Successfully Downloaded.'); - console.log('Writing translations.json...'); - fs.writeFileSync( - path.resolve(__dirname, '../src/i18n/locales/translations.json'), - content, - ); - console.log('Done.'); - } catch (error) { - console.log('Error downloading from OneSky:'); - console.log(error); - process.exit(1); - } + console.log('Writing translations.json...'); + fs.writeFileSync(path.resolve(__dirname, '../src/i18n/locales/translations.json'), content); + console.log('Done.'); + } catch (error) { + console.log('Error downloading from OneSky:'); + console.log(error); + process.exit(1); + } } downloadTranslations(); diff --git a/bin/oneskyUpload.js b/bin/oneskyUpload.js index 188ddae99a..f363500b00 100644 --- a/bin/oneskyUpload.js +++ b/bin/oneskyUpload.js @@ -7,26 +7,26 @@ import translations from '../src/i18n/locales/en-US'; dotenv.config({ path: '.env.local' }); async function uploadTranslations() { - const options = { - language: 'en-US', - apiKey: process.env.ONESKY_API_KEY, - secret: process.env.ONESKY_SECRET_KEY, - projectId: '240181', - fileName: 'en-US.json', - format: 'HIERARCHICAL_JSON', - content: JSON.stringify(translations), - keepStrings: true, - }; + const options = { + language: 'en-US', + apiKey: process.env.ONESKY_API_KEY, + secret: process.env.ONESKY_SECRET_KEY, + projectId: '240181', + fileName: 'en-US.json', + format: 'HIERARCHICAL_JSON', + content: JSON.stringify(translations), + keepStrings: true, + }; - console.log('Uploading to OneSky...'); - try { - await oneSky.postFile(options); - console.log('Successfully Uploaded.'); - } catch (error) { - console.log('Error uploading to OneSky:'); - console.log(error); - process.exit(1); - } + console.log('Uploading to OneSky...'); + try { + await oneSky.postFile(options); + console.log('Successfully Uploaded.'); + } catch (error) { + console.log('Error uploading to OneSky:'); + console.log(error); + process.exit(1); + } } uploadTranslations(); diff --git a/karma.conf.js b/karma.conf.js index 2453336069..d54c6f0f1b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,72 +4,61 @@ const path = require('path'); const webpack = require('webpack'); -const { - entry, - devServer, - optimization, - ...webpackConfig -} = require('./webpack.config.js')({ test: true }); +const { entry, devServer, optimization, ...webpackConfig } = require('./webpack.config.js')({ test: true }); const karmaWebpackConfig = { - ...webpackConfig, - devtool: 'inline-source-map', - module: { - ...webpackConfig.module, - rules: [ - ...webpackConfig.module.rules, - ...(process.env.npm_lifecycle_event === 'test-debug' - ? [] - : [ - { - test: /^(?!.*\.(spec|fixture)\.js$).*\.js$/, - include: path.resolve('app/'), - loader: 'istanbul-instrumenter-loader', - enforce: 'post', - query: { - esModules: true, - }, - }, - ]), - ], - }, - plugins: [ - ...webpackConfig.plugins, - new webpack.NormalModuleReplacementPlugin( - /\.(svg|gif|png|jpg|jpeg|(sa|sc|c)ss)$/, - 'node-noop', - ), + ...webpackConfig, + devtool: 'inline-source-map', + module: { + ...webpackConfig.module, + rules: [ + ...webpackConfig.module.rules, + ...(process.env.npm_lifecycle_event === 'test-debug' + ? [] + : [ + { + test: /^(?!.*\.(spec|fixture)\.js$).*\.js$/, + include: path.resolve('app/'), + loader: 'istanbul-instrumenter-loader', + enforce: 'post', + query: { + esModules: true, + }, + }, + ]), ], + }, + plugins: [ + ...webpackConfig.plugins, + new webpack.NormalModuleReplacementPlugin(/\.(svg|gif|png|jpg|jpeg|(sa|sc|c)ss)$/, 'node-noop'), + ], }; -module.exports = function(config) { - config.set({ - frameworks: ['jasmine'], +module.exports = function (config) { + config.set({ + frameworks: ['jasmine'], - browsers: ['ChromeHeadlessNoSandbox'], - customLaunchers: { - ChromeHeadlessNoSandbox: { - base: 'ChromeHeadless', - flags: ['--no-sandbox'], - }, - }, + browsers: ['ChromeHeadlessNoSandbox'], + customLaunchers: { + ChromeHeadlessNoSandbox: { + base: 'ChromeHeadless', + flags: ['--no-sandbox'], + }, + }, - reporters: ['mocha', 'coverage-istanbul'], + reporters: ['mocha', 'coverage-istanbul'], - files: ['app/assets/javascripts/angular/all-tests.spec.js'], + files: ['app/assets/javascripts/angular/all-tests.spec.js'], - preprocessors: { - 'app/assets/javascripts/angular/all-tests.spec.js': [ - 'webpack', - 'sourcemap', - ], - }, + preprocessors: { + 'app/assets/javascripts/angular/all-tests.spec.js': ['webpack', 'sourcemap'], + }, - webpack: karmaWebpackConfig, + webpack: karmaWebpackConfig, - coverageIstanbulReporter: { - reports: ['lcov'], - fixWebpackSourcePaths: true, - }, - }); + coverageIstanbulReporter: { + reports: ['lcov'], + fixWebpackSourcePaths: true, + }, + }); }; diff --git a/src/i18n/i18next.config.js b/src/i18n/i18next.config.js index 3b941712ad..7119bac09f 100644 --- a/src/i18n/i18next.config.js +++ b/src/i18n/i18next.config.js @@ -5,24 +5,24 @@ import translations from './locales/translations.json'; import en_US from './locales/en-US'; export default i18n.init({ - fallbackLng: 'en-US', + fallbackLng: 'en-US', - // Use downloaded translations if available but use en-US from source to make development easier - resources: { - ...mapValues(translations, 'translation'), - ...{ 'en-US': en_US }, - }, + // Use downloaded translations if available but use en-US from source to make development easier + resources: { + ...mapValues(translations, 'translation'), + ...{ 'en-US': en_US }, + }, - // have a common namespace used around the full app - ns: ['common'], - defaultNS: 'common', - fallbackNS: 'common', + // have a common namespace used around the full app + ns: ['common'], + defaultNS: 'common', + fallbackNS: 'common', - interpolation: { - escapeValue: false, // AngularJS seems to escape the value again, resulting in HTML Character Entities being printed. React didn't need this. - }, - react: { - wait: true, - nsMode: 'fallback', - }, + interpolation: { + escapeValue: false, // AngularJS seems to escape the value again, resulting in HTML Character Entities being printed. React didn't need this. + }, + react: { + wait: true, + nsMode: 'fallback', + }, }); diff --git a/src/i18n/locales/en-US.js b/src/i18n/locales/en-US.js index aaa934f4ef..e6558d81c3 100644 --- a/src/i18n/locales/en-US.js +++ b/src/i18n/locales/en-US.js @@ -1,1185 +1,1074 @@ export default { - common: { - select: 'Select', - submit: 'Submit', - yes: 'Yes', - no: 'No', - back: 'Back', - goBack: 'Go Back', - continue: 'Continue', - ok: 'Ok', - cancel: 'Cancel', - choose: 'Choose', - help: 'Help', - became_curious: 'Became curious', - became_open_to_change: 'Became open to change', - engaged_disciple: 'Engaged Disciple', - growing_disciple: 'Growing disciple', - involved: 'Involved', - knows_and_trusts_christian: 'Knows and trusts a Christian', - made_decision: 'Made a decision', - ministering_disciple: 'Ministering disciple', - multiplying_disciple: 'Multiplying disciple', - seeker: 'Seeker', - seeking_god: 'Seeking God', - address_types: { - current: 'Current', - emergency1: 'Emergency 1', - emergency2: 'Emergency 2', - permanent: 'Permanent', + common: { + select: 'Select', + submit: 'Submit', + yes: 'Yes', + no: 'No', + back: 'Back', + goBack: 'Go Back', + continue: 'Continue', + ok: 'Ok', + cancel: 'Cancel', + choose: 'Choose', + help: 'Help', + became_curious: 'Became curious', + became_open_to_change: 'Became open to change', + engaged_disciple: 'Engaged Disciple', + growing_disciple: 'Growing disciple', + involved: 'Involved', + knows_and_trusts_christian: 'Knows and trusts a Christian', + made_decision: 'Made a decision', + ministering_disciple: 'Ministering disciple', + multiplying_disciple: 'Multiplying disciple', + seeker: 'Seeker', + seeking_god: 'Seeking God', + address_types: { + current: 'Current', + emergency1: 'Emergency 1', + emergency2: 'Emergency 2', + permanent: 'Permanent', + }, + application: { + add_contact: { + title_permission: 'Permissions', + }, + assign_search: { + me: 'Me', + assign_label: 'Type the label you want to assign', + assign_person: 'Type the name of a person you want to assign', + notify_person: 'Type the name of a person you want us to notify', + }, + interaction_types: { + comment: 'Comment Only', + discipleship: 'Discipleship Conversation', + gospel_presentation: 'Personal Evangelism', + graduating_on_mission: 'Graduating on Mission', + holy_spirit_presentation: 'Holy Spirit Presentation', + prayed_to_receive_christ: 'Personal Evangelism Decisions', + spiritual_conversation: 'Spiritual Conversation', + }, + }, + assignments: { + assigned: 'Assigned', + assignment: 'Assigned to', + unassigned: 'Unassigned', + }, + cru_status: { + none: 'None', + volunteer: 'Volunteer', + affiliate: 'Affiliate', + intern: 'Intern', + part_time_staff: 'Part Time Field Staff', + full_time_staff: 'Full Time Supported Staff', + }, + contact: { + add: 'Add', + assigned_to: 'Assigned To', + assigned_tos: 'Assignments', + cru_status: 'Role', + delete: 'Delete', + edit: 'Edit', + email_address: 'Email', + first_name: 'First', + followup_status: 'Status', + gender: 'Gender', + groups: 'Groups', + labels: 'Labels', + last_name: 'Last', + phone_number: 'Phone', + primary_email: 'Primary', + primary_phone: 'Primary', + student_status: 'Enrollment', + }, + contacts: { + add_contact: 'Add Contact', + add_contact_to: 'Add Contact to {{survey}}', + all_contacts: { + title: 'All Contacts', + }, + index: { + filter: 'Search', + for_this_permission_email_is_required: "Email is required for '{{permission}}' permission.", + for_this_permission_email_is_required_no_name: 'Email is required for this permission.', + import_contacts: 'Import Contacts', + search_contact_results_description: 'Please use the form to find a contact.', + search_locate_contact_button: 'Go find', + unassigned: 'Unassigned', + }, + statuses: { + uncontacted: 'Uncontacted', + }, + }, + dashboard: { + anonymous: { + add: 'Add an Anonymous Interaction', + note: 'Notes for New Anonymous', + }, + done: 'Done', + edit_org_order: 'Edit Organization Order', + edit_org_order_help: { + part1: 'Want to customize your view? Press', + part2: 'above to reorder and hide ministries.', + }, + + error_archiving_person: 'Error archiving person! Please try again or contact support.', + loading_contacts: 'Loading Contacts', + no_contacts: { + welcome: 'WELCOME {{name}}!', + }, + no_contacts_help: { + part1: 'When you add a new person', + part2: 'or someone gets assigned to you, they will show up here.', + }, + + notes_for_new_interaction: 'Notes for new', + organizations_assigned_to_you: 'Ministries', + people_assigned_to_you: 'People', + report_periods: { + one_month: '1m', + one_week: '1w', + one_year: '1y', + six_months: '6m', + three_months: '3m', + }, + show_more: 'Show more', + uncontacted: 'Uncontacted', + suggestLandscape: { + suggestion: 'Pro tip: Use landscape mode!', + dismiss: 'Tap to dismiss', + }, + suggestIosAddToHomeScreen: { + title: 'Add Campus Contacts', + description: "Add Campus Contacts on your home screen for quick access when you're on the go.", + actionPart1: 'Just tap', + actionPart2: 'then ‘Add to Home Screen’', + }, + }, + date: { + day_names: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], + }, + error: { + default_error_message: 'An unknown error occurred', + messages: { + assigned_select: { + search_people: 'Error occurred while loading the assignment choices', }, - application: { - add_contact: { - title_permission: 'Permissions', - }, - assign_search: { - me: 'Me', - assign_label: 'Type the label you want to assign', - assign_person: 'Type the name of a person you want to assign', - notify_person: - 'Type the name of a person you want us to notify', - }, - interaction_types: { - comment: 'Comment Only', - discipleship: 'Discipleship Conversation', - gospel_presentation: 'Personal Evangelism', - graduating_on_mission: 'Graduating on Mission', - holy_spirit_presentation: 'Holy Spirit Presentation', - prayed_to_receive_christ: 'Personal Evangelism Decisions', - spiritual_conversation: 'Spiritual Conversation', - }, + bulk_message_modal: { + send_message: 'Error occurred while trying to send message', }, - assignments: { - assigned: 'Assigned', - assignment: 'Assigned to', - unassigned: 'Unassigned', + bulk_transfer_modal: { + transfer_contacts: 'Error occurred while trying to transfer contacts', }, - cru_status: { - none: 'None', - volunteer: 'Volunteer', - affiliate: 'Affiliate', - intern: 'Intern', - part_time_staff: 'Part Time Field Staff', - full_time_staff: 'Full Time Supported Staff', + edit_group_or_label_assignments: { + load_groups: "Error occurred while loading the user's groups", + load_labels: "Error occurred while loading the user's labels", }, - contact: { - add: 'Add', - assigned_to: 'Assigned To', - assigned_tos: 'Assignments', - cru_status: 'Role', - delete: 'Delete', - edit: 'Edit', - email_address: 'Email', - first_name: 'First', - followup_status: 'Status', - gender: 'Gender', - groups: 'Groups', - labels: 'Labels', - last_name: 'Last', - phone_number: 'Phone', - primary_email: 'Primary', - primary_phone: 'Primary', - student_status: 'Enrollment', + group_members: { + add_member: 'Error occurred while adding the person to the group', + load_member_chunk: 'Error occurred while loading the next batch of group members', + remove_member: 'Error occurred while removing the person from the group', }, - contacts: { - add_contact: 'Add Contact', - add_contact_to: 'Add Contact to {{survey}}', - all_contacts: { - title: 'All Contacts', - }, - index: { - filter: 'Search', - for_this_permission_email_is_required: - "Email is required for '{{permission}}' permission.", - for_this_permission_email_is_required_no_name: - 'Email is required for this permission.', - import_contacts: 'Import Contacts', - search_contact_results_description: - 'Please use the form to find a contact.', - search_locate_contact_button: 'Go find', - unassigned: 'Unassigned', - }, - statuses: { - uncontacted: 'Uncontacted', - }, + groups: { + create_group: 'Error occurred while creating the group', + delete_group: 'Error occurred while deleting the group', + load_leaders: "Error occurred while loading the group's leaders", + update_group: 'Error occurred while updating the group', }, - dashboard: { - anonymous: { - add: 'Add an Anonymous Interaction', - note: 'Notes for New Anonymous', - }, - done: 'Done', - edit_org_order: 'Edit Organization Order', - edit_org_order_help: { - part1: 'Want to customize your view? Press', - part2: 'above to reorder and hide ministries.', - }, - - error_archiving_person: - 'Error archiving person! Please try again or contact support.', - loading_contacts: 'Loading Contacts', - no_contacts: { - welcome: 'WELCOME {{name}}!', - }, - no_contacts_help: { - part1: 'When you add a new person', - part2: - 'or someone gets assigned to you, they will show up here.', - }, - - notes_for_new_interaction: 'Notes for new', - organizations_assigned_to_you: 'Ministries', - people_assigned_to_you: 'People', - report_periods: { - one_month: '1m', - one_week: '1w', - one_year: '1y', - six_months: '6m', - three_months: '3m', - }, - show_more: 'Show more', - uncontacted: 'Uncontacted', - suggestLandscape: { - suggestion: 'Pro tip: Use landscape mode!', - dismiss: 'Tap to dismiss', - }, - suggestIosAddToHomeScreen: { - title: 'Add Campus Contacts', - description: - "Add Campus Contacts on your home screen for quick access when you're on the go.", - actionPart1: 'Just tap', - actionPart2: 'then ‘Add to Home Screen’', - }, + http_proxy: { + default_network_error: 'An unknown network error occured', }, - date: { - day_names: [ - 'Sunday', - 'Monday', - 'Tuesday', - 'Wednesday', - 'Thursday', - 'Friday', - 'Saturday', - ], + interactions: { + create_interaction: 'Error occurred while creating the interaction', + delete_interaction: 'Error occurred while deleting the interaction', + update_interaction: 'Error occurred while updating the interaction', }, - error: { - default_error_message: 'An unknown error occurred', - messages: { - assigned_select: { - search_people: - 'Error occurred while loading the assignment choices', - }, - bulk_message_modal: { - send_message: 'Error occurred while trying to send message', - }, - bulk_transfer_modal: { - transfer_contacts: - 'Error occurred while trying to transfer contacts', - }, - edit_group_or_label_assignments: { - load_groups: - "Error occurred while loading the user's groups", - load_labels: - "Error occurred while loading the user's labels", - }, - group_members: { - add_member: - 'Error occurred while adding the person to the group', - load_member_chunk: - 'Error occurred while loading the next batch of group members', - remove_member: - 'Error occurred while removing the person from the group', - }, - groups: { - create_group: 'Error occurred while creating the group', - delete_group: 'Error occurred while deleting the group', - load_leaders: - "Error occurred while loading the group's leaders", - update_group: 'Error occurred while updating the group', - }, - http_proxy: { - default_network_error: 'An unknown network error occured', - }, - interactions: { - create_interaction: - 'Error occurred while creating the interaction', - delete_interaction: - 'Error occurred while deleting the interaction', - update_interaction: - 'Error occurred while updating the interaction', - }, - labels: { - create_label: 'Error occurred while creating the label', - delete_label: 'Error occurred while deleting the label', - update_label: 'Error occurred while updating the label', - }, - logged_in_person: { - load_user: - 'Error occurred while loading your user information', - }, - mass_edit: { - apply_mass_edit: - 'Error occurred while mass editing the contacts', - load_options: 'Error occurred while loading options', - load_relationships: 'Error occurred while loading options', - }, - merge_winner: { - load_users: 'Error occurred while loading the users', - }, - my_people_dashboard: { - load_orgs: 'Error occurred while loading the organizations', - load_people: 'Error occurred while loading the people', - load_reports: 'Error occurred while loading the reports', - update_org_order: - 'Error occurred while updating the organization order', - update_org_visibility: - 'Error occurred while updating the organization visibility', - }, - organization: { - create: 'Error occurred while create the organization.', - update: 'Error occurred while updating the organization.', - delete: 'Error occurred while deleting the organization.', - load_ancestry: - "Error occurred while loading the organization's ancestors", - cleanup: 'Error occurred while archviving contacts', - loadAll: 'Error occurred while loading your organizations', - }, - organization_overview: { - load_org_relationships: - "Error occurred while loading the organization's groups and surveys", - }, - organization_overview_people: { - load_assignments: - 'Error occurred while loading the people assigned to these people', - load_org_people_count: - 'Error occurred while loading the number of people in the organization', - load_people_chunk: - 'Error occurred while loading the next batch of people', - }, - organization_overview_suborgs: { - load_org_chunk: - 'Error occurred while loading the next batch of sub-organizations', - load_org_suborg_count: - 'Error occurred while loading the number of sub-organizations in the organization', - }, - organization_overview_team: { - load_org_team_count: - 'Error occurred while loading the number of team members in the organization', - load_team_chunk: - 'Error occurred while loading the next batch of team members', - }, - people_filters_panel: { - load_filter_stats: - 'Error occurred while loading the filter counts', - }, - person: { - archive_person: 'Error occurred while archiving the person', - get_contact_assignments: - 'Error occurred while loading load the people this person is assigned to', - search: 'Error loading search results', - }, - person_page: { - create_person: 'Error occurred while creating the person', - delete_avatar: - 'Error occurred while removing the profile picture', - upload_avatar: - 'Error occurred while uploading the profile picture', - }, - person_profile: { - delete_relationships: - 'Error occurred while updating the person', - reload_merged_person: - 'Error occurred while refreshing the person', - update_person: 'Error occurred while updating the person', - }, - preferences_page: { - update_preferences: - 'Error occurred while updating the preferences', - }, - progressive_list_loader: { - load_chunk: 'Error occurred while loading the items', - }, - reports: { - load_org_reports: - "Error occurred while loading the organization's reports", - load_person_report: - "Error occurred while loading the person's report", - }, - routes: { - get_history: - "Error occurred while loading the person's history", - get_organization: - 'Error occurred while loading the organization', - get_person: 'Error occurred while loading the person', - get_survey: 'Error occurred while getting survey data', - }, - surveys: { - loadQuestions: - 'Error occurred while loading survey questions', - }, - surveyResponses: { - loadQuestions: 'Error loading survey questions', - }, - template_request: { - load_template: 'Error occurred while loading the page', - }, - requestAccess: 'Error occurred while processing your request', - inviteLink: { - loadRemeberToken: - 'Error occurred while loading invite information', - mergeAccount: 'Error occurred while merging your accounts', - }, - signature_request: - 'Error occurred, the agreement could not be processed', - impersonate_request: 'Error occurred, impersonation failed', - }, - retry_instructions: 'Click to retry', + labels: { + create_label: 'Error occurred while creating the label', + delete_label: 'Error occurred while deleting the label', + update_label: 'Error occurred while updating the label', }, - followup_status: { - attempted_contact: 'Attempted Contact', - completed: 'Completed', - contacted: 'Contacted', - do_not_contact: 'Do Not Contact', - uncontacted: 'Uncontacted', - archived: 'Archived', + logged_in_person: { + load_user: 'Error occurred while loading your user information', }, - student_status: { - not_student: 'Not currently a student', - middle_school: 'Middle School', - high_school: 'High School', - collegiate: 'Collegiate', - masters_or_doctorate: 'Masters/Doctorate', + mass_edit: { + apply_mass_edit: 'Error occurred while mass editing the contacts', + load_options: 'Error occurred while loading options', + load_relationships: 'Error occurred while loading options', }, - general: { - add: 'Add', - address: 'Address', - address_type: 'Address Type', - address1: 'Address 1', - address2: 'Address 2', - address3: 'Address 3', - address4: 'Address 4', - city: 'City', - country: 'Country', - archive: 'Archive', - cancel: 'Cancel', - close: 'Close', - loading_more: 'Loading more...', - message: 'Message:', - ok: 'OK', - save: 'Save', - send: 'Send', - state: 'State', - subject: 'Subject:', - zip: 'Zip', - female: 'Female', - male: 'Male', - other: 'Other', - none: 'None', - required: 'Required', - help: 'Help', - delete: 'Delete', + merge_winner: { + load_users: 'Error occurred while loading the users', }, - group: 'Group', - groups: { - confirm_delete_group: - 'Are you sure you want to delete "{{group_name}}"?', - edit: { - edit_group: 'Editing {{group}}', - }, - form: { - from: 'From', - meets_on: 'On', - to: 'To', - }, - index: { - group_name: 'Group Name', - }, - members: { - columns: { - name: 'Members', - }, - contacts: 'contacts', - leader: 'Leader', - remove_confirm: - 'Are you sure you want to this member from the group?', - subtitle: 'Members of "{{group_name}}"', - title: 'Group Members', - }, - new: { - new_group: 'Create a New Group', - }, - show: { - leaders: 'Group Leaders', - location: 'Location', - meets: 'Meets', - }, + my_people_dashboard: { + load_orgs: 'Error occurred while loading the organizations', + load_people: 'Error occurred while loading the people', + load_reports: 'Error occurred while loading the reports', + update_org_order: 'Error occurred while updating the organization order', + update_org_visibility: 'Error occurred while updating the organization visibility', }, - interactions: { - delete_confirmation: - 'Are you sure you want to delete this interaction?', + organization: { + create: 'Error occurred while create the organization.', + update: 'Error occurred while updating the organization.', + delete: 'Error occurred while deleting the organization.', + load_ancestry: "Error occurred while loading the organization's ancestors", + cleanup: 'Error occurred while archviving contacts', + loadAll: 'Error occurred while loading your organizations', }, - label: 'Label', - labels: { - delete: { - confirm: - 'Are you sure you want to delete the "{{label_name}}" label?', - }, - edit: { - edit_label: 'Edit Label', - }, - index: { - label_name: 'Name', - }, - new: { - new_label: 'Create a New Label', - }, + organization_overview: { + load_org_relationships: "Error occurred while loading the organization's groups and surveys", }, - login: { - signIn: 'Sign in', - inviteInProgress: - 'To complete your invite, create account or sign in.', - signUpWithEmail: 'Sign Up with Email', - signInWithEmail: 'Sign In with Email', - continueWithFacebook: 'Continue with Facebook', + organization_overview_people: { + load_assignments: 'Error occurred while loading the people assigned to these people', + load_org_people_count: 'Error occurred while loading the number of people in the organization', + load_people_chunk: 'Error occurred while loading the next batch of people', }, - mergeAccount: { - loggedInAs: - 'You are current logged in as {{fullName}} <{{email}}>.', - continue: 'Do you want to continue?', - mergeAccount: - 'Yes, merge {{fullName}} <{{username}}> into my account.', - cancelMerge: 'No, I want to login to my own account.', - successAccountMerged: - 'Congratulations, you have successfully merged {{oldAccountFullName}} <{{oldAccountUsername}}> into {{mergedAccountFullName}} <{{mergedAccountEmail}}>.', - continueAccountMerged: 'Continue to your new ministry', - inviteLinkExpiredTitle: - 'Sorry, the invite link has expired or is no longer valid.', - inviteLinkExpiredMessage: - 'Please try again. If the problem persists contact Campus Contacts support.', - continueAfterError: 'Continue to Campus Contacts', + organization_overview_suborgs: { + load_org_chunk: 'Error occurred while loading the next batch of sub-organizations', + load_org_suborg_count: 'Error occurred while loading the number of sub-organizations in the organization', }, - impersonation: { - loading: 'Please wait...', + organization_overview_team: { + load_org_team_count: 'Error occurred while loading the number of team members in the organization', + load_team_chunk: 'Error occurred while loading the next batch of team members', }, - authLanding: { - title: 'SUCCESS!', - thanksForVerifying: - 'Hi, so it is you! Thanks for verifying your new Campus Contacts account.', - allSet: "You're all set to Sign In on your mobile app.", - excitedForYouToGrow: - "We're excited for you to grow closer to God by helping others experience him.", + people_filters_panel: { + load_filter_stats: 'Error occurred while loading the filter counts', }, - leader: 'Leader', - mass_edit: { - save: 'Edit {{contactCount}} contacts', - title: 'Edit Contacts', - unchanged: 'Unchanged', + person: { + archive_person: 'Error occurred while archiving the person', + get_contact_assignments: 'Error occurred while loading load the people this person is assigned to', + search: 'Error loading search results', }, - member: 'Member', - messages: { - email_title: 'Email Contacts', - email_subtitle: 'Send an email to {{recipients}}.', - sms_title: 'Text Contacts', - sms_subtitle: 'Send a text message to {{recipients}}.', - length_limit: '{{remaining_characters}} characters left', - recipients: { - contacts: '{{contact_count}} contacts', - organization: 'in organization "{{name}}"', - search: 'matching "{{search}}"', - groups: 'in groups "{{names}}"', - labels: 'with labels "{{names}}"', - assigned_tos: 'assigned to "{{names}}"', - exclusions: 'except "{{names}}"', - }, + person_page: { + create_person: 'Error occurred while creating the person', + delete_avatar: 'Error occurred while removing the profile picture', + upload_avatar: 'Error occurred while uploading the profile picture', }, - ministries: { - groups: { - columns: { - leaders: 'Leader(s)', - location: 'Location', - name: 'Groups ({{group_count}})', - time: 'Meeting Time', - }, - header: 'Groups', - meeting_time: { - monthly: 'Monthly on the {{day}} from {{time}}', - sporadically: 'Sporadically', - time_range: '{{start}} - {{end}}', - weekly: 'Weekly on {{day}}s {{time}}', - }, - ordinal_suffixes: ['th', 'st', 'nd', 'rd'], - }, - labels: { - columns: { - name: 'Label Name', - }, - }, - cleanup: { - title: 'Organization Cleanup', - description: { - part1: - "People are messy — and so are databases. Every year your database gets clogged up with people who may have come to a meeting once upon a time, or filled out a survey once, but never got involved and don't intend to. If you are a campus ministry, you will also have a good number of people who graduate from your ministry each year. How do you get your database trimmed up and ready for the fall?", - part2: - ' An annual clean up can help! Simply walk through one of the steps below once a year (or however often you want) and Campus Contacts will again be a well-oiled machine, ready to help you transform the world!', - }, - - archive_alumni: 'Archive Alumni', - archive_alumni_description: - 'Go to the Contacts screen, select the people who have graduated from your ministry and label them a "Alumni". If your ministry hasn\'t created that label yet, you can do so by adding it in Manage Labels under Tools. ', - archive_by_date: 'Archive by date', - archive_by_date_description: - 'Archive contacts who have been added before:', - archive_by_date_confirm_message: - 'Are you sure you want to archive these contacts by date?', - archive_by_inactivity: 'Archive by inactivity', - archive_by_inactivity_confirm_message: - 'Are you sure you want to archive these contacts by inactivity?', - archive_by_inactivity_description: - 'Archive people who have been inactive since:', - open_contacts: 'Open Contacts', - success_message: 'Your contacts have been archived!', - success_title: 'You Rock!', - success_cta: 'Take Me Home', - }, - people: { - activity: { - header: 'Activity', - }, - archive_hover: 'Archive the selected contacts', - archive_people_confirm: - 'Are you sure you want to archive {{contact_count}} contacts?', - assigned: { - header: 'Assigned', - }, - clear_selection_hover: 'Unselect all of the selected contacts', - delete_hover: 'Delete the selected contacts', - delete_people_confirm: - 'Are you sure you want to delete {{contact_count}} contacts?', - email_hover: 'Email the selected contacts', - export_hover: 'Export the selected contacts as CSV', - gender: 'M/F', - female: 'F', - male: 'M', - other: 'O', - none: '-', - header: 'Contacts', - history: { - all: 'All', - anonymous: 'Anonymous', - header: 'History', - interactions: 'Interactions', - me: 'Me', - note_for_interaction: 'Note for {{interaction}}', - notes: 'Notes', - surveys: 'Surveys', - }, - leaders: 'leaders', - mass_edit_hover: 'Mass edit the selected contacts', - name: 'Name', - profile: { - header: 'Profile', - }, - remove_self_confirm: - 'You are removing yourself. If you continue, you will no longer have access to this ministry.', - selected_contacts: '{{contactCount}} contacts selected', - sms_hover: 'Text the selected contacts', - status: 'Status', - transfer_hover: - 'Transfer the selected contacts to another organization', - contactActions: 'Contact Actions', - lastSurvey: 'Last Survey', - showFilters: 'Show Filters', - }, - roots: 'Ministries', - suborgs: { - header: 'Ministries', - }, - surveyResponses: { - header: 'Survey Responses', - editSurveyResponse: 'Edit Survey Response', - }, - surveys: { - header: 'Surveys', - typeform: { - header: 'Campus Contacts now integrates with Typeform!', - subheader: - 'Get more creative with your surveys using Typeform while driving your ministry forward with Campus Contacts.', - step1: - 'Sign up for an account at typeform.com.', - step2: - ' Create a new form there in Typeform - be sure you have a question on the new form asking for their "first name". Then go to the "Connect" tab followed by the "Webhooks" sub tab.', - step3: - 'Copy the Campus Contacts URL below into the Destination URL field on Typeform.', - step4: - 'Click "test webhook". You should see a green checkmark under recent requests. A new survey with a test submission should be visible in Campus Contacts.', - step5: - 'Next to the webhooks title click the slider to enable webhooks.', - conclusion: - 'Future form submissions for this survey will be sent to Campus Contacts automatically.', - campusContactsUrl: 'Campus Contacts URL', - copy: 'Copy URL', - copied: 'URL copied to clipboard', - }, - }, - team: { - header: 'Team', - }, - tools: { - header: 'Tools', - }, - noMinistriesFound: - 'Sorry you have no ministries linked to this account.', + person_profile: { + delete_relationships: 'Error occurred while updating the person', + reload_merged_person: 'Error occurred while refreshing the person', + update_person: 'Error occurred while updating the person', }, - monthly: 'Monthly', - nav: { - about: { - copyright: 'Copyright', - title: 'About Campus Contacts', - }, - cleanup: 'Organization Cleanup', - contacts: 'Contacts', - blog: 'Blog', - email_us: 'Email Us', - groups: 'Groups', - logout: 'Sign Out', - login: 'Sign In', - requestAccess: 'Request Access', - manage: 'Manage Ministries', - my_profile: 'My Profile', - powered_by_cru: 'Powered by Cru', - report_movement_indicators: 'Report Movement Indicators', - search: { - in: 'in', - }, - preferences: 'Preferences', - support: 'Support', - terms: 'Terms of Service', - privacy: 'Privacy', - copyright: 'Copyright {{ year }} Cru. All Rights Reserved.', - warning: { - title: 'Warning', - body: - 'These tools will be removed when we shut down Legacy. We are working to bring you a better dashboard experience in the near future!', - }, + preferences_page: { + update_preferences: 'Error occurred while updating the preferences', }, - organizations: { - manage: 'Manage Ministries', - new: 'New Ministry', - edit: 'Edit Ministry', - name: 'Ministry Name', - type: 'Type', - type_help: - 'This is how you want to identify this specific ministry. Some people use church, group, or team.', - show_sub: 'Show Sub-Ministries', - sub_help: - 'Checking this box allows any of the sub-ministries to appear for any involved team member when navigating Campus Contacts.', - none_found: 'No ministries found', - deleteConfirmModal: { - title: 'Are you sure you want to delete "{{org_name}}"?', - description: - 'This will remove access to interactions, assignments and contacts from any of the sub-ministries.', - }, - cleanup: { - confirm_archive: - 'Are you sure you wanted to archive the desired contacts?', - }, + progressive_list_loader: { + load_chunk: 'Error occurred while loading the items', }, - people: { - edit: { - cancel_create_confirm: - 'Are you sure you want to discard this unsaved contact?', - delete_address_confirm: - 'Are you sure you want to delete this address?', - delete_email_confirm: - 'Are you sure you want to delete this email address?', - delete_phone_confirm: - 'Are you sure you want to delete this phone number?', - }, - index: { - add_address: 'Add Address', - create_address: 'Create Address', - edit_address: 'Edit Address', - labels: 'Labels', - manage_groups: 'Manage Groups', - manage_labels: 'Manage Labels', - }, - search: { - search_placeholder: 'Search by first name, last name or email.', - }, - show: { - apply_labels: 'Apply the following labels to {{name}}.', - apply_labels_undefined: - 'Apply the following labels to this person.', - apply_groups: 'Assign {{name}} to the following groups.', - apply_groups_undefined: - 'Assign this person to the following groups.', - no_groups: 'No groups assigned.', - no_labels: 'No labels assigned.', - }, + reports: { + load_org_reports: "Error occurred while loading the organization's reports", + load_person_report: "Error occurred while loading the person's report", }, - permissions: { - admin: 'Admin', - no_permissions: 'No Permissions', - no_permission: 'No Permission', - user: 'User', - owner: 'Owner', + routes: { + get_history: "Error occurred while loading the person's history", + get_organization: 'Error occurred while loading the organization', + get_person: 'Error occurred while loading the person', + get_survey: 'Error occurred while getting survey data', }, - person_multiselect: { - no_search_results: - 'No {{people_description}} found matching "{{search}}"', - search_placeholder: 'Search {{people_description}}', - searching: 'Searching {{people_description}}...', + surveys: { + loadQuestions: 'Error occurred while loading survey questions', }, - search: { - assignments: { - title: 'Assigned To', - }, - groups: { - title: 'Groups', - }, - labels: { - title: 'Labels', - }, - status: { - title: 'Status', - }, - gender: { - title: 'Gender', - }, - questions: { - title: 'Survey Questions', - }, - permission: { - title: 'Permission', - }, - sidebar: { - include_archived: 'Include archived contacts', - }, + surveyResponses: { + loadQuestions: 'Error loading survey questions', }, - signatures: { - clear: 'Clear filters', - title: 'Signatures', - agreements: { - accept: 'Accept', - decline: 'Decline', - button: 'Continue to the Campus Contacts App', - accepted: { - message: 'Thank you! You may now use Campus Contacts.', - }, - declined: { - title: 'You have declined!', - mainBlurb: - 'Admins will need to accept the Code of Conduct and Statement of Faith before proceeding to Campus Contacts. Please talk this over with your local staff and student leadership.', - requestAccessBlurb: - 'You will need to request access again after having this discussion.', - }, - codeOfConduct: { - title: 'Code of Conduct', - text: - '

    Power to Change seeks to glorify God by making a maximum contribution toward helping to fulfill the Great Commission in Canada and around the world by developing movements of evangelism and discipleship. As the person and work of Jesus Christ is central to our mission, I desire Jesus Christ to be in the center of my life and want to honour and please Him by the way I conduct myself, thus validating the gospel of Christ and contributing to the mission. (Col. 1:10) As a follower of Jesus Christ I am committed to obeying the Great Commandment to love God with all my heart, soul and mind and to love my neighbour as myself (Matt. 22:36-40). This will involve the following:

    • Growing in Christlikeness: I commit to growing in personal holiness of life characterized by honesty, truthfulness and generosity, maintaining the highest ethical standards (1 Peter 1:14-16). I commit to having the attitude of Christ in showing compassion, demonstrating humility and patience, forgiving others and considering the interests of others ahead of my own (Phil. 2:1-5; Col. 3:12-14).

    • Practising Respect and Love for others: As a representative of God’s love for people, I commit to treating others with love, respect, and regard for their value and dignity as persons. I will handle my relationships with integrity and maturity, keeping in mind my responsibility as a role model (1 Tim. 4:12), and making lifestyle choices with consideration for those around me (Rom. 14; 1 Cor. 10:23-33). I renounce all forms of hate, malicious behaviour, and harassment of others, and I will practice welcoming and respectful treatment to all people regardless of background, identity, and orientation which may be different from my own. (Eph. 5:1, 2; Titus 3:2) I will respect the sanctity of life at all stages (Psalm 139:13, 14).

    • Living a life of faith: I commit myself to relying upon God for His grace to meet every need (2 Cor. 12:9; Phil. 4:19) and living in dependence upon the Holy Spirit in my daily life and ministry (Gal. 5:16, Eph. 5:18-21).

    • Evangelism and Discipleship: I commit myself to present the gospel of Jesus Christ to people in my sphere of influence and beyond, encouraging them to become disciples of Christ through the direction and empowerment of the Holy Spirit (Mark 16:15; Acts 1:8).

    • Serving others: I commit to following Jesus by serving the people I lead and work with (Matt. 20:25-28; John 12:14-15).

    • Stewardship: I commit to honouring God with my body, as my body is the temple of the Holy Spirit (1 Cor. 6:19,20). I will make choices that build up my emotional,mental and physical health and will strive for purity of thought and respectful modesty (Phil. 4:8; 1 Tim. 2:9-10). I will abstain from drunkenness, illegal or mind-altering substances, unless prescribed by a physician, as well as abstaining from the habitual use of tobacco. I commit to reserving sexual expressions of intimacy for marriage, a sacred covenant between one man and one woman (Mark 10:6-9; Heb. 13:4).

    • Community: I commit myself to meeting with other believers in a local church on a regular basis, edifying others and growing together as a caring community of followers of Christ (Heb. 10:24-25).

    I am in agreement with and hereby commit myself to this Code of Conduct, depending upon the Holy Spirit to guide and empower me.

    ', - }, - statementOfFaith: { - title: 'Statement of Faith', - text: - "

    The sole basis of our beliefs is the Bible, God's inerrant written Word, the 66 books of the Old and New Testaments. We believe that it was uniquely, verbally and fully inspired by the Holy Spirit, and that it was written without factual error in the original manuscripts. It is the supreme and final authority in all matters on which it speaks.

    We accept those large areas of doctrinal teaching on which, historically, there has been general agreement among all true Christians. Because of the specialized calling of our movement, we desire to allow for freedom of conviction on other doctrinal matters, provided that any interpretation is based upon the Bible alone, and that no such interpretation shall become an issue which hinders the ministry to which God has called us. We explicitly affirm our belief in basic Bible teachings as follows:

    1. There is one true God, eternally existing in three persons—the Father, Son and Holy Spirit—each of whom possesses equally all the attributes of Deity and the characteristics of personality.

    2. Jesus Christ is God, the living Word, who became flesh through His miraculous conception by the Holy Spirit and His virgin birth. Hence, He is perfect Deity and true humanity united in one person forever.

    3. He lived a sinless life and voluntarily atoned for our sins by dying on the cross as our substitute, thus satisfying divine justice and accomplishing salvation for all who trust in Him alone.

    4. He rose from the dead in the same body, though glorified, in which He had lived and died.

    5. He ascended bodily into heaven and sat down at the right hand of God the Father, where He, the only mediator between God and mankind, continually makes intercession for His own.

    6. We were originally created in the image of God. We sinned by disobeying God; thus, we were alienated from our Creator.That historic fall brought all mankind under divine condemnation.

    7. Our nature is corrupted, and we are thus totally unable to please God. Every person is in need of regeneration and renewal by the Holy Spirit.

    8. Our salvation is wholly a work of God's free grace and is not the work, in whole or in part, of human works or goodness or religious ceremony. God imputes His righteousness to those who put their faith in Christ alone for their salvation, and thereby justifies them in His sight.

    9. It is the privilege of all who are born again of the Spirit to be assured of their salvation from the very moment in which they trust Christ as their Saviour. This assurance is not based upon any kind of human merit, but is produced by the witness of the Holy Spirit, who confirms in the believer the testimony of God in His written Word.

    10. The Holy Spirit has come into the world to reveal and glorify Christ and to apply the saving work of Christ to men and women. He convicts and draws sinners to Christ, imparts new life to them, continually indwells them from the moment of spiritual birth and seals them until the day of redemption. His fullness, power and control are appropriated in the believer's life by faith.

    11. We, as believers, are called to live in the power of the indwelling Spirit so that we will not fulfill the lust of the flesh but will bear fruit to the glory of God.

    12. Jesus Christ is the Head of the Church, His Body, which is composed of all men and women, living and dead, who have been joined to Him through saving faith.

    13. God admonishes His people to assemble together regularly for worship, for participation in ordinances, for edification through the Scriptures and for mutual encouragement.

    14. At physical death the believers enter immediately into eternal conscious fellowship with the Lord, and await the resurrection of their bodies to everlasting glory and blessing.

    15. At physical death the unbelievers enter immediately into eternal conscious separation from the Lord and await the resurrection of their bodies to everlasting judgment and condemnation.

    16. Jesus Christ will come again to the earth—personally, visibly and bodily—to consummate history and the eternal plan of God.

    17. The Lord Jesus Christ commanded all believers to proclaim the gospel throughout the world and to disciple men and women of every nation. The fulfillment of that Great Commission requires that all worldly and personal ambition be subordinated to a total commitment to \"Him who loved us and gave Himself for us.\"

    Without mental reservation, I hereby subscribe to the above statements and pledge myself to help fulfil the Great Commission in our generation, depending upon the Holy Spirit to guide and empower me.

    ", - }, - }, - downloadCsv: 'Download Csv', - grid: { - dateSigned: 'Date Signed', - firstName: 'First Name', - lastName: 'Last Name', - codeOfConduct: 'Code of Conduct', - statementOfFaith: 'Statement of Faith', - notAccecptedYet: 'Not Accepted Yet', - organization: 'Organization', - accepted: 'Accepted', - declined: 'Declined', - notFound: 'No Signatures found', - loading: 'Loading...', - }, - searchPlaceholder: 'Search', + template_request: { + load_template: 'Error occurred while loading the page', }, - sporadically: 'Sporadically', - transfer: { - options: { - copy_answers: 'Copy survey answers with contact', - copy_contact: 'Leave a copy of the contact in the organization', - copy_interactions: 'Copy interactions with contact', - }, - organizations: 'organizations', - subtitle: - 'Transfer {{contact_count}} contact(s) to another organization.', - title: 'Transfer Contacts', - transfer: 'Transfer {{contact_count}} Contact(s)', + requestAccess: 'Error occurred while processing your request', + inviteLink: { + loadRemeberToken: 'Error occurred while loading invite information', + mergeAccount: 'Error occurred while merging your accounts', }, - weekly: 'Weekly', + signature_request: 'Error occurred, the agreement could not be processed', + impersonate_request: 'Error occurred, impersonation failed', + }, + retry_instructions: 'Click to retry', + }, + followup_status: { + attempted_contact: 'Attempted Contact', + completed: 'Completed', + contacted: 'Contacted', + do_not_contact: 'Do Not Contact', + uncontacted: 'Uncontacted', + archived: 'Archived', + }, + student_status: { + not_student: 'Not currently a student', + middle_school: 'Middle School', + high_school: 'High School', + collegiate: 'Collegiate', + masters_or_doctorate: 'Masters/Doctorate', }, - navSearch: { - noPeopleFound: 'No people found', + general: { + add: 'Add', + address: 'Address', + address_type: 'Address Type', + address1: 'Address 1', + address2: 'Address 2', + address3: 'Address 3', + address4: 'Address 4', + city: 'City', + country: 'Country', + archive: 'Archive', + cancel: 'Cancel', + close: 'Close', + loading_more: 'Loading more...', + message: 'Message:', + ok: 'OK', + save: 'Save', + send: 'Send', + state: 'State', + subject: 'Subject:', + zip: 'Zip', + female: 'Female', + male: 'Male', + other: 'Other', + none: 'None', + required: 'Required', + help: 'Help', + delete: 'Delete', }, - surveyTab: { - createSurvey: 'Create Survey', - copySurvey: 'Copy Survey', - searchMinistry: 'Search Ministry', - surveyName: 'Survey Name', + group: 'Group', + groups: { + confirm_delete_group: 'Are you sure you want to delete "{{group_name}}"?', + edit: { + edit_group: 'Editing {{group}}', + }, + form: { + from: 'From', + meets_on: 'On', + to: 'To', + }, + index: { + group_name: 'Group Name', + }, + members: { columns: { - survey: 'Survey', - contacts: 'Contacts', - unassigned: 'Unassigned', - uncontacted: 'Uncontacted', - keyword: 'Keyword', - link: 'Link', - status: 'Status', - typeform: 'Typeform', - }, - status: { - live: 'Live', - off: 'Off', - }, - menu: { - edit: 'Edit', - preview: 'Preview', - delete: 'Delete', - copy: 'Copy', - import: 'Import Survey Results', - mass: 'Mass Entry', - autoAssignLabelNotify: 'Auto Assign/Label/Notify', - }, - errors: { - createSurvey: 'Error occurred while creating survey', - updateSurvey: 'Error occurred while updating survey', - deleteSurvey: 'Error occurred while deleting survey', - getStats: 'Error occurred while retrieving survey stats', - addSurveyQuestion: 'Error occurred while adding survey question', + name: 'Members', }, + contacts: 'contacts', + leader: 'Leader', + remove_confirm: 'Are you sure you want to this member from the group?', + subtitle: 'Members of "{{group_name}}"', + title: 'Group Members', + }, + new: { + new_group: 'Create a New Group', + }, + show: { + leaders: 'Group Leaders', + location: 'Location', + meets: 'Meets', + }, }, - phoneNumbers: { - validations: { - notFound: 'Your survey submission could not be found', - inactiveOrInvalid: - 'Your survey submission is inactive or your link is invalid.', - }, + interactions: { + delete_confirmation: 'Are you sure you want to delete this interaction?', }, - surveys: { - preview: 'Preview', - publicView: { - preview: { - header: 'This is a preview.', - inactive: 'The survey you are viewing is inactive.', - description: - 'While in preview mode, you cannot submit survey responses.', - }, - post_survey_message: - 'Thanks! Your survey has been successfully submitted.', - surveyNotFound: 'This survey could not be found', - inactiveOrInvalid: - 'The survey you are trying to view is inactive or your link is invalid.', - }, - delete: { - confirm: 'Are you sure you want to delete this survey?', + label: 'Label', + labels: { + delete: { + confirm: 'Are you sure you want to delete the "{{label_name}}" label?', + }, + edit: { + edit_label: 'Edit Label', + }, + index: { + label_name: 'Name', + }, + new: { + new_label: 'Create a New Label', + }, + }, + login: { + signIn: 'Sign in', + inviteInProgress: 'To complete your invite, create account or sign in.', + signUpWithEmail: 'Sign Up with Email', + signInWithEmail: 'Sign In with Email', + continueWithFacebook: 'Continue with Facebook', + }, + mergeAccount: { + loggedInAs: 'You are current logged in as {{fullName}} <{{email}}>.', + continue: 'Do you want to continue?', + mergeAccount: 'Yes, merge {{fullName}} <{{username}}> into my account.', + cancelMerge: 'No, I want to login to my own account.', + successAccountMerged: + 'Congratulations, you have successfully merged {{oldAccountFullName}} <{{oldAccountUsername}}> into {{mergedAccountFullName}} <{{mergedAccountEmail}}>.', + continueAccountMerged: 'Continue to your new ministry', + inviteLinkExpiredTitle: 'Sorry, the invite link has expired or is no longer valid.', + inviteLinkExpiredMessage: + 'Please try again. If the problem persists contact Campus Contacts support.', + continueAfterError: 'Continue to Campus Contacts', + }, + impersonation: { + loading: 'Please wait...', + }, + authLanding: { + title: 'SUCCESS!', + thanksForVerifying: 'Hi, so it is you! Thanks for verifying your new Campus Contacts account.', + allSet: "You're all set to Sign In on your mobile app.", + excitedForYouToGrow: "We're excited for you to grow closer to God by helping others experience him.", + }, + leader: 'Leader', + mass_edit: { + save: 'Edit {{contactCount}} contacts', + title: 'Edit Contacts', + unchanged: 'Unchanged', + }, + member: 'Member', + messages: { + email_title: 'Email Contacts', + email_subtitle: 'Send an email to {{recipients}}.', + sms_title: 'Text Contacts', + sms_subtitle: 'Send a text message to {{recipients}}.', + length_limit: '{{remaining_characters}} characters left', + recipients: { + contacts: '{{contact_count}} contacts', + organization: 'in organization "{{name}}"', + search: 'matching "{{search}}"', + groups: 'in groups "{{names}}"', + labels: 'with labels "{{names}}"', + assigned_tos: 'assigned to "{{names}}"', + exclusions: 'except "{{names}}"', + }, + }, + ministries: { + groups: { + columns: { + leaders: 'Leader(s)', + location: 'Location', + name: 'Groups ({{group_count}})', + time: 'Meeting Time', }, - settings: { - settings: 'Settings', - welcome_message: 'Welcome Message', - success_message: 'Success Message', - image: 'Image', - image_upload: 'Upload Image', - image_delete: 'Delete Image', - image_delete_confirm: 'Are you sure you want to delete this image?', - validate_phone_number: 'Validate Phone Number', - validate_phone_number_hint: - 'If the person filling out your survey provides a phone number Campus Contacts can send them an SMS with a short link for them to validate their phone number.', - validation_message: 'Validation Message', - validation_message_hint: - 'This message will be sent via SMS with a short link.', - validation_message_help: - 'You can use the %{first_name} template and Campus Contacts will automatically substitute their first name in place. A short link will be appended to this message they will need to click on!', - validation_success_message: 'Validation Success Message', - validation_success_message_hint: - 'When they visit the short link in the SMS this message will be shown.', + header: 'Groups', + meeting_time: { + monthly: 'Monthly on the {{day}} from {{time}}', + sporadically: 'Sporadically', + time_range: '{{start}} - {{end}}', + weekly: 'Weekly on {{day}}s {{time}}', }, - keyword: { - keyword: 'Keyword', - keyword_example: 'Example: Cookies', - instructions: - 'Use at least 3 letters (no special characters/spaces)', - help: - 'Choosing a keyword for your community or event enables you to have people fill out your survey questions via the web, interactive texting, and smartphones.\n' + - 'They will text your keyword to the number 85005 and your survey questions will appear on their device. Note: The process of acquiring new keywords requires manual intervention.\n' + - 'Once you request your keyword expect to wait up to 24 hours before we notify you via email that your keyword is approved and ready for use.', - purpose: 'Keyword Purpose', - purpose_instructions: 'What do you plan to use the keyword for?', - purpose_example: 'Example: Weekly Meeting', - response: 'Text Response', - response_instructions: 'Response must include {{ link }} exactly.', - response_help: - "When someone texts in the keyword, this is the message they will receive. The {{ link }} will automatically be replaced with a link to the survey. If you want to include a link to your specific website, don't include it here.", - response_example: - 'Example: Thanks for taking our survey! Press {{ link }}.', - request: 'Request Keyword', - requested: 'Keyword Requested', - requested_message: - 'We will notify you within 24 hours by email if/when your keyword is approved and ready for use.', - errors: { - requestKeyword: 'Error occurred while requesting a keyword', - deleteKeyword: 'Error occurred while deleting a keyword', - missingKeyword: 'A keyword is required', - missingPurpose: 'A keyword purpose is required', - missingTextResponse: 'A text response is required', - }, - delete: { - confirm: 'Are you sure you want to delete this keyword?', - }, + ordinal_suffixes: ['th', 'st', 'nd', 'rd'], + }, + labels: { + columns: { + name: 'Label Name', }, - questions: { - questions: 'Questions', - question: 'Question', - answers: 'Answers', - answer: 'Answer', - type: 'Type', - sort: 'Sort', - columnTitle: 'Column Title', - labelPlaceholder: '[Enter question here.]', - newAnswer: 'New Answer', - addPredefinedQuestion: 'Add Predefined/Previously Used Question', - addNewQuestion: 'Add New Question', - predefinedQuestions: 'Predefined Questions', - previouslyUsedQuestions: 'Previously Used Questions', - delete_confirm: 'Are you sure you want to delete this question?', - addAutoAssignLabelNotifyRules: 'Add Auto Assign/Label/Notify Rules', - autoAssign: 'Auto Assign', - autoNotify: 'Auto Notify', - autoLabel: 'Auto Label', - sendNotificationsViaEmail: 'Send notifications via email', + }, + cleanup: { + title: 'Organization Cleanup', + description: { + part1: + "People are messy — and so are databases. Every year your database gets clogged up with people who may have come to a meeting once upon a time, or filled out a survey once, but never got involved and don't intend to. If you are a campus ministry, you will also have a good number of people who graduate from your ministry each year. How do you get your database trimmed up and ready for the fall?", + part2: + ' An annual clean up can help! Simply walk through one of the steps below once a year (or however often you want) and Campus Contacts will again be a well-oiled machine, ready to help you transform the world!', }, - }, - contact_import: { - step_1: { - title: 'Select Survey and Upload CSV File', - select_survey: 'Select Survey', - create_survey: 'Create a new survey', - instructions: - 'Select a survey to import your contacts from the drop down menu below.', - instructions_b: "if you don't have a survey to import contacts to.", - upload: 'Upload CSV File', - select: 'Select CSV File', - rowCount: '{{count}} rows', - rowCount_plural: '{{count}} rows', - parseErrors: { - summary: 'Warning: There were some issues parsing your CSV', - message: - 'Please review these issues we encountered while parsing your CSV file. You may try and continue but be aware that some data may not match up with columns you expect.', - note: 'Note: Row and Character position both start at 1.', - row: 'CSV Row', - characterPos: 'Character position in row', - error: 'Error Message', - }, - fileTypeError: 'You must select a CSV file.', + + archive_alumni: 'Archive Alumni', + archive_alumni_description: + 'Go to the Contacts screen, select the people who have graduated from your ministry and label them a "Alumni". If your ministry hasn\'t created that label yet, you can do so by adding it in Manage Labels under Tools. ', + archive_by_date: 'Archive by date', + archive_by_date_description: 'Archive contacts who have been added before:', + archive_by_date_confirm_message: 'Are you sure you want to archive these contacts by date?', + archive_by_inactivity: 'Archive by inactivity', + archive_by_inactivity_confirm_message: 'Are you sure you want to archive these contacts by inactivity?', + archive_by_inactivity_description: 'Archive people who have been inactive since:', + open_contacts: 'Open Contacts', + success_message: 'Your contacts have been archived!', + success_title: 'You Rock!', + success_cta: 'Take Me Home', + }, + people: { + activity: { + header: 'Activity', }, - step_2: { - title: 'Match Columns', - instructions: - 'Match the column headings from your CSV file with the corresponding questions/column headers in the dropdown boxes.', - csv_column: 'CSV Column', - preview: 'Preview Row {{current}} of {{max}}', - question_column: 'Question Column/Answer', - do_not_import: 'Do Not Import', - loadingQuestions: 'Loading Questions...', + archive_hover: 'Archive the selected contacts', + archive_people_confirm: 'Are you sure you want to archive {{contact_count}} contacts?', + assigned: { + header: 'Assigned', }, - step_3: { - title: 'Add Labels to New Contacts', - instructions: - "You are almost ready to upload {{count}} new contacts! Use the list below to select any additional labels for these contact, or you can create a new one. When you're done, click Import.", - labels: 'Labels', - add_label: 'Add Label', + clear_selection_hover: 'Unselect all of the selected contacts', + delete_hover: 'Delete the selected contacts', + delete_people_confirm: 'Are you sure you want to delete {{contact_count}} contacts?', + email_hover: 'Email the selected contacts', + export_hover: 'Export the selected contacts as CSV', + gender: 'M/F', + female: 'F', + male: 'M', + other: 'O', + none: '-', + header: 'Contacts', + history: { + all: 'All', + anonymous: 'Anonymous', + header: 'History', + interactions: 'Interactions', + me: 'Me', + note_for_interaction: 'Note for {{interaction}}', + notes: 'Notes', + surveys: 'Surveys', }, - step_4: { - title: 'You Rock!', - instructions: - 'Your CSV upload is now being processed. You will receive an email when it finishes.', - home: 'Take Me Home', + leaders: 'leaders', + mass_edit_hover: 'Mass edit the selected contacts', + name: 'Name', + profile: { + header: 'Profile', }, - errors: { - bulkImport: - 'Error occurred while importing contacts from your CSV file', - save: 'Error occurred while saving contact', + remove_self_confirm: + 'You are removing yourself. If you continue, you will no longer have access to this ministry.', + selected_contacts: '{{contactCount}} contacts selected', + sms_hover: 'Text the selected contacts', + status: 'Status', + transfer_hover: 'Transfer the selected contacts to another organization', + contactActions: 'Contact Actions', + lastSurvey: 'Last Survey', + showFilters: 'Show Filters', + }, + roots: 'Ministries', + suborgs: { + header: 'Ministries', + }, + surveyResponses: { + header: 'Survey Responses', + editSurveyResponse: 'Edit Survey Response', + }, + surveys: { + header: 'Surveys', + typeform: { + header: 'Campus Contacts now integrates with Typeform!', + subheader: + 'Get more creative with your surveys using Typeform while driving your ministry forward with Campus Contacts.', + step1: 'Sign up for an account at typeform.com.', + step2: + ' Create a new form there in Typeform - be sure you have a question on the new form asking for their "first name". Then go to the "Connect" tab followed by the "Webhooks" sub tab.', + step3: 'Copy the Campus Contacts URL below into the Destination URL field on Typeform.', + step4: + 'Click "test webhook". You should see a green checkmark under recent requests. A new survey with a test submission should be visible in Campus Contacts.', + step5: 'Next to the webhooks title click the slider to enable webhooks.', + conclusion: 'Future form submissions for this survey will be sent to Campus Contacts automatically.', + campusContactsUrl: 'Campus Contacts URL', + copy: 'Copy URL', + copied: 'URL copied to clipboard', }, + }, + team: { + header: 'Team', + }, + tools: { + header: 'Tools', + }, + noMinistriesFound: 'Sorry you have no ministries linked to this account.', }, - unsubscribe: { - confirmation: - 'Are you sure you want to unsubscribe from all emails from', - noMoreEmails: - 'By unsubscribing, you will no longer receive emails from', - success: - 'Thanks! You have successfully unsubscribed and will no longer receive emails from', - label: 'Unsubscribe', - error: - 'We are sorry, but an error has occurred. Please try again by refreshing the page.', + monthly: 'Monthly', + nav: { + about: { + copyright: 'Copyright', + title: 'About Campus Contacts', + }, + cleanup: 'Organization Cleanup', + contacts: 'Contacts', + blog: 'Blog', + email_us: 'Email Us', + groups: 'Groups', + logout: 'Sign Out', + login: 'Sign In', + requestAccess: 'Request Access', + manage: 'Manage Ministries', + my_profile: 'My Profile', + powered_by_cru: 'Powered by Cru', + report_movement_indicators: 'Report Movement Indicators', + search: { + in: 'in', + }, + preferences: 'Preferences', + support: 'Support', + terms: 'Terms of Service', + privacy: 'Privacy', + copyright: 'Copyright {{ year }} Cru. All Rights Reserved.', + warning: { + title: 'Warning', + body: + 'These tools will be removed when we shut down Legacy. We are working to bring you a better dashboard experience in the near future!', + }, }, - userPreferences: { - title: 'User Preferences', - language: 'Language', - notificationsHeader: 'Let me know...', - enabledByDefault: '(Enabled by default)', - personTransferred: - 'When a person is transferred to one of my organizations', - personAssigned: 'When a person is assigned to me', - weeklyDigest: 'Weekly Ministry Digest', + organizations: { + manage: 'Manage Ministries', + new: 'New Ministry', + edit: 'Edit Ministry', + name: 'Ministry Name', + type: 'Type', + type_help: 'This is how you want to identify this specific ministry. Some people use church, group, or team.', + show_sub: 'Show Sub-Ministries', + sub_help: + 'Checking this box allows any of the sub-ministries to appear for any involved team member when navigating Campus Contacts.', + none_found: 'No ministries found', + deleteConfirmModal: { + title: 'Are you sure you want to delete "{{org_name}}"?', + description: + 'This will remove access to interactions, assignments and contacts from any of the sub-ministries.', + }, + cleanup: { + confirm_archive: 'Are you sure you wanted to archive the desired contacts?', + }, }, - peopleScreen: { - filterSearchPlaceholder: 'Search answers', - answerMatchingOptions: { - exactly: 'Exactly', - contains: 'Contains', - doesNotContain: 'Does not contain', - noResponse: 'No response', - anyResponse: 'Any response', - }, + people: { + edit: { + cancel_create_confirm: 'Are you sure you want to discard this unsaved contact?', + delete_address_confirm: 'Are you sure you want to delete this address?', + delete_email_confirm: 'Are you sure you want to delete this email address?', + delete_phone_confirm: 'Are you sure you want to delete this phone number?', + }, + index: { + add_address: 'Add Address', + create_address: 'Create Address', + edit_address: 'Edit Address', + labels: 'Labels', + manage_groups: 'Manage Groups', + manage_labels: 'Manage Labels', + }, + search: { + search_placeholder: 'Search by first name, last name or email.', + }, + show: { + apply_labels: 'Apply the following labels to {{name}}.', + apply_labels_undefined: 'Apply the following labels to this person.', + apply_groups: 'Assign {{name}} to the following groups.', + apply_groups_undefined: 'Assign this person to the following groups.', + no_groups: 'No groups assigned.', + no_labels: 'No labels assigned.', + }, }, - movementIndicators: { - title: 'Report Movement Indicators', - suggestedActions: { - title: 'Suggested Movement Indicator Actions', - subtitle: - 'These suggestions are designed to reinforce the proper labeling of contacts for the Involved, Engaged Disciple, and Leader categories, which will be reported on the next page.', - loading: 'Loading suggestions…', - newSuggestions: 'New Suggestions ({{num}})', - previousSuggestions: 'Previous Suggestions ({{num}})', - applyAll: 'Apply All', - reasonPhrases: { - spiritualConversation: - 'had a spiritual conversation with someone.', - gospelPresentation: 'shared the gospel with someone.', - groupMembership: 'was added to a group.', - groupLeader: 'became a group leader.', - leader: 'was labeled as a leader.', - engagedDisciple: 'was labeled as an engaged disciple.', - }, - applyLabel: - 'Apply the "{{label}}" label?', - errorLoadingSuggestedActions: - 'Error occurred while loading the suggested actions', - errorSavingSuggestedActions: - 'Error occurred while saving the suggested actions', - }, - confirmIndicators: { - title: 'Confirm Movement Indicators', - loading: 'Loading movement indicators…', - submittedInLastWeek: { - heading: - 'Movement Indicators for this ministry are up to date.', - description: - 'Movement Indicators have been submitted for the past week. Please check back next week to submit these again.', - descriptionContinued: - "If you'd like to change any numbers previously submitted, please do so in Infobase.", - }, - interactionsHeading: - 'The pre-filled numbers below are a compilation of all activity in Campus Contacts within the date range specified. Any activity recorded between the end date and today will not be reflected below.', - labelsHeading: - 'The pre-filled label indicators below display the most recently entered information. If these numbers have changed, feel free to update them below. These numbers will appear consistently week-to-week.', - errorLoadingIndicators: - 'Error occurred while loading movement indicators to pre-fill fields', - errorSavingIndicators: - 'Error occurred while saving movement indicators', - }, - interactions: { - title: 'Interactions', - spiritualConversations: { - label: 'Spiritual Conversations', - tooltip: - 'How many Spiritual Conversations have you engaged in whether you did or did not present the gospel and bring them to a point of decision. (Each time you engage the same person count it.)', - }, - personalEvangelism: { - label: 'Personal Evangelism', - tooltip: - 'How many gospel presentations through personal evangelism, where you brought him/her to a point of decision? (Each time you share the gospel with the same person count it) (Includes staff, student, faculty & volunteer evangelism and personal internet evangelism)', - }, - personalEvangelismDecisions: { - label: 'Personal Evangelism Decisions', - tooltip: - 'How many people have indicated a decision to receive Christ as their Savior and Lord after hearing a personal presentation of the gospel?', - }, - holySpiritPresentations: { - label: 'Holy Spirit Presentations', - tooltip: - 'How many people have heard a presentation of the ministry of the Holy Spirit and been given the opportunity to respond?', - }, - groupEvangelism: { - label: 'Group Evangelism', - tooltip: - 'What was the total number of people who heard the gospel and were brought to a point of decision through group evangelism?', - }, - groupEvangelismDecisions: { - label: 'Group Evangelism Decisions', - tooltip: - 'How many people have indicated a decision to receive Christ as their Savior and Lord after hearing a large group presentation of the gospel?', - }, - mediaExposures: { - label: 'Media Exposures', - tooltip: - 'How many people have been exposed to gospel content with an opportunity to respond through media exposures?', - }, - mediaExposureDecisions: { - label: 'Media Exposure Decisions', - tooltip: - 'How many people have indicated a decision to receive Christ as their Savior and Lord after being exposed to the gospel via media?', - }, - }, - students: { - title: 'Students', - involved: { - label: 'Involved', - tooltip: - 'How many students are regularly involved and attending movement events?', - }, - engaged: { - label: 'Engaged Disciples', - tooltip: - 'How many students have intentionally engaged a non believer in a spiritual conversation within the past semester? (The heart is that they have gone from merely attending movement events and begun to look outside of themselves to pass on their faith. Include all who are also leaders since to be a leader, one needs to be an engaged disciple.)', - }, - leaders: { - label: 'Leaders', - tooltip: - 'How many students are engaged disciples and are leading small groups of Win-Build-Send ministry? (Examples: groups focused on reaching target audiences, launching movements, etc. This number will be smaller than engaged disciples.)', - }, - }, - faculty: { - title: 'Faculty', - involved: { - label: 'Involved', - tooltip: 'How many faculty are regularly involved? ', - }, - engaged: { - label: 'Engaged Disciples', - tooltip: - 'How many faculty have intentionally engaged in a spiritual conversation within the past semester? (The heart is that they have gone from merely attending movement events and begun to look outside of themselves to pass on their faith. Include all who are also leaders.)', - }, - leaders: { - label: 'Leaders', - tooltip: - 'How many faculty who are engaged disciples are leading Win-Build-Send activities? (Examples: groups focused on reaching target audiences, evangelistic Bible study, discipleship groups etc. This number will be smaller than engaged disciples.)', - }, + permissions: { + admin: 'Admin', + no_permissions: 'No Permissions', + no_permission: 'No Permission', + user: 'User', + owner: 'Owner', + }, + person_multiselect: { + no_search_results: 'No {{people_description}} found matching "{{search}}"', + search_placeholder: 'Search {{people_description}}', + searching: 'Searching {{people_description}}...', + }, + search: { + assignments: { + title: 'Assigned To', + }, + groups: { + title: 'Groups', + }, + labels: { + title: 'Labels', + }, + status: { + title: 'Status', + }, + gender: { + title: 'Gender', + }, + questions: { + title: 'Survey Questions', + }, + permission: { + title: 'Permission', + }, + sidebar: { + include_archived: 'Include archived contacts', + }, + }, + signatures: { + clear: 'Clear filters', + title: 'Signatures', + agreements: { + accept: 'Accept', + decline: 'Decline', + button: 'Continue to the Campus Contacts App', + accepted: { + message: 'Thank you! You may now use Campus Contacts.', }, - confirmModal: { - description: - 'Ready to submit your movement indicators? If you want to change these numbers later you will need to go to Infobase to do so.', + declined: { + title: 'You have declined!', + mainBlurb: + 'Admins will need to accept the Code of Conduct and Statement of Faith before proceeding to Campus Contacts. Please talk this over with your local staff and student leadership.', + requestAccessBlurb: 'You will need to request access again after having this discussion.', }, - successModal: { - title: 'Movement Indicators Submitted!', + codeOfConduct: { + title: 'Code of Conduct', + text: + '

    Power to Change seeks to glorify God by making a maximum contribution toward helping to fulfill the Great Commission in Canada and around the world by developing movements of evangelism and discipleship. As the person and work of Jesus Christ is central to our mission, I desire Jesus Christ to be in the center of my life and want to honour and please Him by the way I conduct myself, thus validating the gospel of Christ and contributing to the mission. (Col. 1:10) As a follower of Jesus Christ I am committed to obeying the Great Commandment to love God with all my heart, soul and mind and to love my neighbour as myself (Matt. 22:36-40). This will involve the following:

    • Growing in Christlikeness: I commit to growing in personal holiness of life characterized by honesty, truthfulness and generosity, maintaining the highest ethical standards (1 Peter 1:14-16). I commit to having the attitude of Christ in showing compassion, demonstrating humility and patience, forgiving others and considering the interests of others ahead of my own (Phil. 2:1-5; Col. 3:12-14).

    • Practising Respect and Love for others: As a representative of God’s love for people, I commit to treating others with love, respect, and regard for their value and dignity as persons. I will handle my relationships with integrity and maturity, keeping in mind my responsibility as a role model (1 Tim. 4:12), and making lifestyle choices with consideration for those around me (Rom. 14; 1 Cor. 10:23-33). I renounce all forms of hate, malicious behaviour, and harassment of others, and I will practice welcoming and respectful treatment to all people regardless of background, identity, and orientation which may be different from my own. (Eph. 5:1, 2; Titus 3:2) I will respect the sanctity of life at all stages (Psalm 139:13, 14).

    • Living a life of faith: I commit myself to relying upon God for His grace to meet every need (2 Cor. 12:9; Phil. 4:19) and living in dependence upon the Holy Spirit in my daily life and ministry (Gal. 5:16, Eph. 5:18-21).

    • Evangelism and Discipleship: I commit myself to present the gospel of Jesus Christ to people in my sphere of influence and beyond, encouraging them to become disciples of Christ through the direction and empowerment of the Holy Spirit (Mark 16:15; Acts 1:8).

    • Serving others: I commit to following Jesus by serving the people I lead and work with (Matt. 20:25-28; John 12:14-15).

    • Stewardship: I commit to honouring God with my body, as my body is the temple of the Holy Spirit (1 Cor. 6:19,20). I will make choices that build up my emotional,mental and physical health and will strive for purity of thought and respectful modesty (Phil. 4:8; 1 Tim. 2:9-10). I will abstain from drunkenness, illegal or mind-altering substances, unless prescribed by a physician, as well as abstaining from the habitual use of tobacco. I commit to reserving sexual expressions of intimacy for marriage, a sacred covenant between one man and one woman (Mark 10:6-9; Heb. 13:4).

    • Community: I commit myself to meeting with other believers in a local church on a regular basis, edifying others and growing together as a caring community of followers of Christ (Heb. 10:24-25).

    I am in agreement with and hereby commit myself to this Code of Conduct, depending upon the Holy Spirit to guide and empower me.

    ', }, - errorModal: { - title: 'Something went wrong…', - description: - 'There was an error connecting to Infobase. Please try again. If you receive this message multiple times, please contact help.campuscontacts@cru.org.', + statementOfFaith: { + title: 'Statement of Faith', + text: + "

    The sole basis of our beliefs is the Bible, God's inerrant written Word, the 66 books of the Old and New Testaments. We believe that it was uniquely, verbally and fully inspired by the Holy Spirit, and that it was written without factual error in the original manuscripts. It is the supreme and final authority in all matters on which it speaks.

    We accept those large areas of doctrinal teaching on which, historically, there has been general agreement among all true Christians. Because of the specialized calling of our movement, we desire to allow for freedom of conviction on other doctrinal matters, provided that any interpretation is based upon the Bible alone, and that no such interpretation shall become an issue which hinders the ministry to which God has called us. We explicitly affirm our belief in basic Bible teachings as follows:

    1. There is one true God, eternally existing in three persons—the Father, Son and Holy Spirit—each of whom possesses equally all the attributes of Deity and the characteristics of personality.

    2. Jesus Christ is God, the living Word, who became flesh through His miraculous conception by the Holy Spirit and His virgin birth. Hence, He is perfect Deity and true humanity united in one person forever.

    3. He lived a sinless life and voluntarily atoned for our sins by dying on the cross as our substitute, thus satisfying divine justice and accomplishing salvation for all who trust in Him alone.

    4. He rose from the dead in the same body, though glorified, in which He had lived and died.

    5. He ascended bodily into heaven and sat down at the right hand of God the Father, where He, the only mediator between God and mankind, continually makes intercession for His own.

    6. We were originally created in the image of God. We sinned by disobeying God; thus, we were alienated from our Creator.That historic fall brought all mankind under divine condemnation.

    7. Our nature is corrupted, and we are thus totally unable to please God. Every person is in need of regeneration and renewal by the Holy Spirit.

    8. Our salvation is wholly a work of God's free grace and is not the work, in whole or in part, of human works or goodness or religious ceremony. God imputes His righteousness to those who put their faith in Christ alone for their salvation, and thereby justifies them in His sight.

    9. It is the privilege of all who are born again of the Spirit to be assured of their salvation from the very moment in which they trust Christ as their Saviour. This assurance is not based upon any kind of human merit, but is produced by the witness of the Holy Spirit, who confirms in the believer the testimony of God in His written Word.

    10. The Holy Spirit has come into the world to reveal and glorify Christ and to apply the saving work of Christ to men and women. He convicts and draws sinners to Christ, imparts new life to them, continually indwells them from the moment of spiritual birth and seals them until the day of redemption. His fullness, power and control are appropriated in the believer's life by faith.

    11. We, as believers, are called to live in the power of the indwelling Spirit so that we will not fulfill the lust of the flesh but will bear fruit to the glory of God.

    12. Jesus Christ is the Head of the Church, His Body, which is composed of all men and women, living and dead, who have been joined to Him through saving faith.

    13. God admonishes His people to assemble together regularly for worship, for participation in ordinances, for edification through the Scriptures and for mutual encouragement.

    14. At physical death the believers enter immediately into eternal conscious fellowship with the Lord, and await the resurrection of their bodies to everlasting glory and blessing.

    15. At physical death the unbelievers enter immediately into eternal conscious separation from the Lord and await the resurrection of their bodies to everlasting judgment and condemnation.

    16. Jesus Christ will come again to the earth—personally, visibly and bodily—to consummate history and the eternal plan of God.

    17. The Lord Jesus Christ commanded all believers to proclaim the gospel throughout the world and to disciple men and women of every nation. The fulfillment of that Great Commission requires that all worldly and personal ambition be subordinated to a total commitment to \"Him who loved us and gave Himself for us.\"

    Without mental reservation, I hereby subscribe to the above statements and pledge myself to help fulfil the Great Commission in our generation, depending upon the Holy Spirit to guide and empower me.

    ", }, + }, + downloadCsv: 'Download Csv', + grid: { + dateSigned: 'Date Signed', + firstName: 'First Name', + lastName: 'Last Name', + codeOfConduct: 'Code of Conduct', + statementOfFaith: 'Statement of Faith', + notAccecptedYet: 'Not Accepted Yet', + organization: 'Organization', + accepted: 'Accepted', + declined: 'Declined', + notFound: 'No Signatures found', + loading: 'Loading...', + }, + searchPlaceholder: 'Search', + }, + sporadically: 'Sporadically', + transfer: { + options: { + copy_answers: 'Copy survey answers with contact', + copy_contact: 'Leave a copy of the contact in the organization', + copy_interactions: 'Copy interactions with contact', + }, + organizations: 'organizations', + subtitle: 'Transfer {{contact_count}} contact(s) to another organization.', + title: 'Transfer Contacts', + transfer: 'Transfer {{contact_count}} Contact(s)', + }, + weekly: 'Weekly', + }, + navSearch: { + noPeopleFound: 'No people found', + }, + surveyTab: { + createSurvey: 'Create Survey', + copySurvey: 'Copy Survey', + searchMinistry: 'Search Ministry', + surveyName: 'Survey Name', + columns: { + survey: 'Survey', + contacts: 'Contacts', + unassigned: 'Unassigned', + uncontacted: 'Uncontacted', + keyword: 'Keyword', + link: 'Link', + status: 'Status', + typeform: 'Typeform', + }, + status: { + live: 'Live', + off: 'Off', + }, + menu: { + edit: 'Edit', + preview: 'Preview', + delete: 'Delete', + copy: 'Copy', + import: 'Import Survey Results', + mass: 'Mass Entry', + autoAssignLabelNotify: 'Auto Assign/Label/Notify', + }, + errors: { + createSurvey: 'Error occurred while creating survey', + updateSurvey: 'Error occurred while updating survey', + deleteSurvey: 'Error occurred while deleting survey', + getStats: 'Error occurred while retrieving survey stats', + addSurveyQuestion: 'Error occurred while adding survey question', + }, + }, + phoneNumbers: { + validations: { + notFound: 'Your survey submission could not be found', + inactiveOrInvalid: 'Your survey submission is inactive or your link is invalid.', + }, + }, + surveys: { + preview: 'Preview', + publicView: { + preview: { + header: 'This is a preview.', + inactive: 'The survey you are viewing is inactive.', + description: 'While in preview mode, you cannot submit survey responses.', + }, + post_survey_message: 'Thanks! Your survey has been successfully submitted.', + surveyNotFound: 'This survey could not be found', + inactiveOrInvalid: 'The survey you are trying to view is inactive or your link is invalid.', + }, + delete: { + confirm: 'Are you sure you want to delete this survey?', + }, + settings: { + settings: 'Settings', + welcome_message: 'Welcome Message', + success_message: 'Success Message', + image: 'Image', + image_upload: 'Upload Image', + image_delete: 'Delete Image', + image_delete_confirm: 'Are you sure you want to delete this image?', + validate_phone_number: 'Validate Phone Number', + validate_phone_number_hint: + 'If the person filling out your survey provides a phone number Campus Contacts can send them an SMS with a short link for them to validate their phone number.', + validation_message: 'Validation Message', + validation_message_hint: 'This message will be sent via SMS with a short link.', + validation_message_help: + 'You can use the %{first_name} template and Campus Contacts will automatically substitute their first name in place. A short link will be appended to this message they will need to click on!', + validation_success_message: 'Validation Success Message', + validation_success_message_hint: 'When they visit the short link in the SMS this message will be shown.', + }, + keyword: { + keyword: 'Keyword', + keyword_example: 'Example: Cookies', + instructions: 'Use at least 3 letters (no special characters/spaces)', + help: + 'Choosing a keyword for your community or event enables you to have people fill out your survey questions via the web, interactive texting, and smartphones.\n' + + 'They will text your keyword to the number 85005 and your survey questions will appear on their device. Note: The process of acquiring new keywords requires manual intervention.\n' + + 'Once you request your keyword expect to wait up to 24 hours before we notify you via email that your keyword is approved and ready for use.', + purpose: 'Keyword Purpose', + purpose_instructions: 'What do you plan to use the keyword for?', + purpose_example: 'Example: Weekly Meeting', + response: 'Text Response', + response_instructions: 'Response must include {{ link }} exactly.', + response_help: + "When someone texts in the keyword, this is the message they will receive. The {{ link }} will automatically be replaced with a link to the survey. If you want to include a link to your specific website, don't include it here.", + response_example: 'Example: Thanks for taking our survey! Press {{ link }}.', + request: 'Request Keyword', + requested: 'Keyword Requested', + requested_message: + 'We will notify you within 24 hours by email if/when your keyword is approved and ready for use.', + errors: { + requestKeyword: 'Error occurred while requesting a keyword', + deleteKeyword: 'Error occurred while deleting a keyword', + missingKeyword: 'A keyword is required', + missingPurpose: 'A keyword purpose is required', + missingTextResponse: 'A text response is required', + }, + delete: { + confirm: 'Are you sure you want to delete this keyword?', + }, + }, + questions: { + questions: 'Questions', + question: 'Question', + answers: 'Answers', + answer: 'Answer', + type: 'Type', + sort: 'Sort', + columnTitle: 'Column Title', + labelPlaceholder: '[Enter question here.]', + newAnswer: 'New Answer', + addPredefinedQuestion: 'Add Predefined/Previously Used Question', + addNewQuestion: 'Add New Question', + predefinedQuestions: 'Predefined Questions', + previouslyUsedQuestions: 'Previously Used Questions', + delete_confirm: 'Are you sure you want to delete this question?', + addAutoAssignLabelNotifyRules: 'Add Auto Assign/Label/Notify Rules', + autoAssign: 'Auto Assign', + autoNotify: 'Auto Notify', + autoLabel: 'Auto Label', + sendNotificationsViaEmail: 'Send notifications via email', + }, + }, + contact_import: { + step_1: { + title: 'Select Survey and Upload CSV File', + select_survey: 'Select Survey', + create_survey: 'Create a new survey', + instructions: 'Select a survey to import your contacts from the drop down menu below.', + instructions_b: "if you don't have a survey to import contacts to.", + upload: 'Upload CSV File', + select: 'Select CSV File', + rowCount: '{{count}} rows', + rowCount_plural: '{{count}} rows', + parseErrors: { + summary: 'Warning: There were some issues parsing your CSV', + message: + 'Please review these issues we encountered while parsing your CSV file. You may try and continue but be aware that some data may not match up with columns you expect.', + note: 'Note: Row and Character position both start at 1.', + row: 'CSV Row', + characterPos: 'Character position in row', + error: 'Error Message', + }, + fileTypeError: 'You must select a CSV file.', + }, + step_2: { + title: 'Match Columns', + instructions: + 'Match the column headings from your CSV file with the corresponding questions/column headers in the dropdown boxes.', + csv_column: 'CSV Column', + preview: 'Preview Row {{current}} of {{max}}', + question_column: 'Question Column/Answer', + do_not_import: 'Do Not Import', + loadingQuestions: 'Loading Questions...', + }, + step_3: { + title: 'Add Labels to New Contacts', + instructions: + "You are almost ready to upload {{count}} new contacts! Use the list below to select any additional labels for these contact, or you can create a new one. When you're done, click Import.", + labels: 'Labels', + add_label: 'Add Label', + }, + step_4: { + title: 'You Rock!', + instructions: 'Your CSV upload is now being processed. You will receive an email when it finishes.', + home: 'Take Me Home', + }, + errors: { + bulkImport: 'Error occurred while importing contacts from your CSV file', + save: 'Error occurred while saving contact', + }, + }, + unsubscribe: { + confirmation: 'Are you sure you want to unsubscribe from all emails from', + noMoreEmails: 'By unsubscribing, you will no longer receive emails from', + success: 'Thanks! You have successfully unsubscribed and will no longer receive emails from', + label: 'Unsubscribe', + error: 'We are sorry, but an error has occurred. Please try again by refreshing the page.', + }, + userPreferences: { + title: 'User Preferences', + language: 'Language', + notificationsHeader: 'Let me know...', + enabledByDefault: '(Enabled by default)', + personTransferred: 'When a person is transferred to one of my organizations', + personAssigned: 'When a person is assigned to me', + weeklyDigest: 'Weekly Ministry Digest', + }, + peopleScreen: { + filterSearchPlaceholder: 'Search answers', + answerMatchingOptions: { + exactly: 'Exactly', + contains: 'Contains', + doesNotContain: 'Does not contain', + noResponse: 'No response', + anyResponse: 'Any response', + }, + }, + movementIndicators: { + title: 'Report Movement Indicators', + suggestedActions: { + title: 'Suggested Movement Indicator Actions', + subtitle: + 'These suggestions are designed to reinforce the proper labeling of contacts for the Involved, Engaged Disciple, and Leader categories, which will be reported on the next page.', + loading: 'Loading suggestions…', + newSuggestions: 'New Suggestions ({{num}})', + previousSuggestions: 'Previous Suggestions ({{num}})', + applyAll: 'Apply All', + reasonPhrases: { + spiritualConversation: 'had a spiritual conversation with someone.', + gospelPresentation: 'shared the gospel with someone.', + groupMembership: 'was added to a group.', + groupLeader: 'became a group leader.', + leader: 'was labeled as a leader.', + engagedDisciple: 'was labeled as an engaged disciple.', + }, + applyLabel: 'Apply the "{{label}}" label?', + errorLoadingSuggestedActions: 'Error occurred while loading the suggested actions', + errorSavingSuggestedActions: 'Error occurred while saving the suggested actions', + }, + confirmIndicators: { + title: 'Confirm Movement Indicators', + loading: 'Loading movement indicators…', + submittedInLastWeek: { + heading: 'Movement Indicators for this ministry are up to date.', + description: + 'Movement Indicators have been submitted for the past week. Please check back next week to submit these again.', + descriptionContinued: "If you'd like to change any numbers previously submitted, please do so in Infobase.", + }, + interactionsHeading: + 'The pre-filled numbers below are a compilation of all activity in Campus Contacts within the date range specified. Any activity recorded between the end date and today will not be reflected below.', + labelsHeading: + 'The pre-filled label indicators below display the most recently entered information. If these numbers have changed, feel free to update them below. These numbers will appear consistently week-to-week.', + errorLoadingIndicators: 'Error occurred while loading movement indicators to pre-fill fields', + errorSavingIndicators: 'Error occurred while saving movement indicators', + }, + interactions: { + title: 'Interactions', + spiritualConversations: { + label: 'Spiritual Conversations', + tooltip: + 'How many Spiritual Conversations have you engaged in whether you did or did not present the gospel and bring them to a point of decision. (Each time you engage the same person count it.)', + }, + personalEvangelism: { + label: 'Personal Evangelism', + tooltip: + 'How many gospel presentations through personal evangelism, where you brought him/her to a point of decision? (Each time you share the gospel with the same person count it) (Includes staff, student, faculty & volunteer evangelism and personal internet evangelism)', + }, + personalEvangelismDecisions: { + label: 'Personal Evangelism Decisions', + tooltip: + 'How many people have indicated a decision to receive Christ as their Savior and Lord after hearing a personal presentation of the gospel?', + }, + holySpiritPresentations: { + label: 'Holy Spirit Presentations', + tooltip: + 'How many people have heard a presentation of the ministry of the Holy Spirit and been given the opportunity to respond?', + }, + groupEvangelism: { + label: 'Group Evangelism', + tooltip: + 'What was the total number of people who heard the gospel and were brought to a point of decision through group evangelism?', + }, + groupEvangelismDecisions: { + label: 'Group Evangelism Decisions', + tooltip: + 'How many people have indicated a decision to receive Christ as their Savior and Lord after hearing a large group presentation of the gospel?', + }, + mediaExposures: { + label: 'Media Exposures', + tooltip: + 'How many people have been exposed to gospel content with an opportunity to respond through media exposures?', + }, + mediaExposureDecisions: { + label: 'Media Exposure Decisions', + tooltip: + 'How many people have indicated a decision to receive Christ as their Savior and Lord after being exposed to the gospel via media?', + }, + }, + students: { + title: 'Students', + involved: { + label: 'Involved', + tooltip: 'How many students are regularly involved and attending movement events?', + }, + engaged: { + label: 'Engaged Disciples', + tooltip: + 'How many students have intentionally engaged a non believer in a spiritual conversation within the past semester? (The heart is that they have gone from merely attending movement events and begun to look outside of themselves to pass on their faith. Include all who are also leaders since to be a leader, one needs to be an engaged disciple.)', + }, + leaders: { + label: 'Leaders', + tooltip: + 'How many students are engaged disciples and are leading small groups of Win-Build-Send ministry? (Examples: groups focused on reaching target audiences, launching movements, etc. This number will be smaller than engaged disciples.)', + }, + }, + faculty: { + title: 'Faculty', + involved: { + label: 'Involved', + tooltip: 'How many faculty are regularly involved? ', + }, + engaged: { + label: 'Engaged Disciples', + tooltip: + 'How many faculty have intentionally engaged in a spiritual conversation within the past semester? (The heart is that they have gone from merely attending movement events and begun to look outside of themselves to pass on their faith. Include all who are also leaders.)', + }, + leaders: { + label: 'Leaders', + tooltip: + 'How many faculty who are engaged disciples are leading Win-Build-Send activities? (Examples: groups focused on reaching target audiences, evangelistic Bible study, discipleship groups etc. This number will be smaller than engaged disciples.)', + }, + }, + confirmModal: { + description: + 'Ready to submit your movement indicators? If you want to change these numbers later you will need to go to Infobase to do so.', + }, + successModal: { + title: 'Movement Indicators Submitted!', }, - contactActions: { - call: 'Call', - text: 'Text', - email: 'Email', - copy: 'Copy Phone Number or Email', - copyPhone: 'Copy Phone Number', - copyEmail: 'Copy Email', + errorModal: { + title: 'Something went wrong…', + description: + 'There was an error connecting to Infobase. Please try again. If you receive this message multiple times, please contact help.campuscontacts@cru.org.', }, + }, + contactActions: { + call: 'Call', + text: 'Text', + email: 'Email', + copy: 'Copy Phone Number or Email', + copyPhone: 'Copy Phone Number', + copyEmail: 'Copy Email', + }, }; diff --git a/webpack.config.js b/webpack.config.js index 4fe729a0c1..272a93ce6b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,8 +4,7 @@ const path = require('path'); const webpack = require('webpack'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer') - .BundleAnalyzerPlugin; +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const HtmlWebpackPlugin = require('html-webpack-plugin'); const FaviconsWebpackPlugin = require('favicons-webpack-plugin'); const SriPlugin = require('webpack-subresource-integrity'); @@ -16,190 +15,188 @@ const isBuild = (process.env.npm_lifecycle_event || '').startsWith('build'); const prod = process.env.TRAVIS_BRANCH === 'master'; const htmlMinDefaults = { - removeComments: true, - removeCommentsFromCDATA: true, - removeCDATASectionsFromCDATA: true, - collapseWhitespace: true, - conservativeCollapse: true, - removeAttributeQuotes: true, - useShortDoctype: true, - keepClosingSlash: true, - minifyJS: true, - minifyCSS: true, - removeScriptTypeAttributes: true, - removeStyleTypeAttributes: true, + removeComments: true, + removeCommentsFromCDATA: true, + removeCDATASectionsFromCDATA: true, + collapseWhitespace: true, + conservativeCollapse: true, + removeAttributeQuotes: true, + useShortDoctype: true, + keepClosingSlash: true, + minifyJS: true, + minifyCSS: true, + removeScriptTypeAttributes: true, + removeStyleTypeAttributes: true, }; module.exports = (env = {}) => { - const isTest = env.test; - return { - mode: isBuild ? 'production' : 'development', - entry: { - app: 'assets/javascripts/angular/main.js', + const isTest = env.test; + return { + mode: isBuild ? 'production' : 'development', + entry: { + app: 'assets/javascripts/angular/main.js', + }, + output: { + filename: '[name].[chunkhash].js', + chunkFilename: '[name].[chunkhash].js', + path: path.resolve(__dirname, 'dist'), + devtoolModuleFilenameTemplate: (info) => info.resourcePath.replace(/^\.\//, ''), + crossOriginLoading: 'anonymous', + }, + optimization: { + splitChunks: { + cacheGroups: { + commons: { + test: /[\\/]node_modules[\\/]/, + name: 'vendor', + chunks: 'initial', + }, }, - output: { - filename: '[name].[chunkhash].js', - chunkFilename: '[name].[chunkhash].js', - path: path.resolve(__dirname, 'dist'), - devtoolModuleFilenameTemplate: (info) => - info.resourcePath.replace(/^\.\//, ''), - crossOriginLoading: 'anonymous', - }, - optimization: { - splitChunks: { - cacheGroups: { - commons: { - test: /[\\/]node_modules[\\/]/, - name: 'vendor', - chunks: 'initial', - }, - }, - }, - }, - plugins: [ - new MiniCssExtractPlugin({ - filename: '[name].[contenthash].css', + }, + }, + plugins: [ + new MiniCssExtractPlugin({ + filename: '[name].[contenthash].css', + }), + ...(isTest + ? [] + : [ + new HtmlWebpackPlugin({ + template: 'index.ejs', + prod, + minify: htmlMinDefaults, }), - ...(isTest - ? [] - : [ - new HtmlWebpackPlugin({ - template: 'index.ejs', - prod: prod, - minify: htmlMinDefaults, - }), - ]), - ...(isBuild - ? [ - new webpack.NamedModulesPlugin(), - new FaviconsWebpackPlugin({ - logo: './app/assets/images/favicon.svg', - favicons: { - appName: 'Campus Contacts', - developerName: 'Cru', - theme_color: '#007398', - background: '#FFFFFF', - icons: { - appleIcon: { offset: 10 }, // Create Apple touch icons. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` - appleStartup: { offset: 10 }, // Create Apple startup images. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` - coast: { offset: 10 }, // Create Opera Coast icon. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` - windows: { offset: 10 }, // Create Windows 8 tile icons. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` - }, - }, - }), - new SriPlugin({ - hashFuncNames: ['sha512'], - }), - new CopyPlugin({ - patterns: [ - { - from: - 'app/assets/images/campuscontacts-the-key-logo.svg', - }, - ], - }), - new WorkboxPlugin.GenerateSW({ - clientsClaim: true, - skipWaiting: true, - }), - ] - : []), - ...(env.analyze ? [new BundleAnalyzerPlugin()] : []), - ], - module: { - rules: [ - { - test: /\.(ts|js)x?$/, - exclude: /node_modules/, - use: [ - { - loader: 'babel-loader', - options: { - plugins: [ - '@babel/plugin-transform-runtime', - '@babel/plugin-syntax-dynamic-import', - '@babel/plugin-transform-template-literals', - ...(isTest ? [] : ['angularjs-annotate']), - ], - }, - }, - ], - }, - { - test: /\.html$/, - use: ['html-loader'], - }, - { - test: /\.(ts|js)x?$/, - exclude: /node_modules/, - loader: 'eslint-loader', - enforce: 'pre', - options: { - // Show errors as warnings to prevent webpack from exiting - failOnError: false, - emitWarning: true, - }, - }, - { - test: /\.(scss|css)$/, - use: [ - MiniCssExtractPlugin.loader, - { - loader: 'css-loader', - options: { - sourceMap: true, - }, - }, - { - loader: 'sass-loader', - options: { - sourceMap: true, - sassOptions: { - quietDeps: true, - }, - }, - }, - ], + ]), + ...(isBuild + ? [ + new webpack.NamedModulesPlugin(), + new FaviconsWebpackPlugin({ + logo: './app/assets/images/favicon.svg', + favicons: { + appName: 'Campus Contacts', + developerName: 'Cru', + theme_color: '#007398', + background: '#FFFFFF', + icons: { + appleIcon: { offset: 10 }, // Create Apple touch icons. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` + appleStartup: { offset: 10 }, // Create Apple startup images. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` + coast: { offset: 10 }, // Create Opera Coast icon. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` + windows: { offset: 10 }, // Create Windows 8 tile icons. `boolean` or `{ offset, background, mask, overlayGlow, overlayShadow }` }, + }, + }), + new SriPlugin({ + hashFuncNames: ['sha512'], + }), + new CopyPlugin({ + patterns: [ { - test: /\.(woff|ttf|eot|ico)/, - use: [ - { - loader: 'file-loader', - options: { - name: '[name].[hash].[ext]', - }, - }, - ], + from: 'app/assets/images/campuscontacts-the-key-logo.svg', }, - { - test: /\.(svg|png|jpe?g|gif)/, - use: [ - { - loader: 'file-loader', - options: { - name: '[name].[hash].[ext]', - }, - }, - { - loader: 'image-webpack-loader', - options: {}, - }, - ], + ], + }), + new WorkboxPlugin.GenerateSW({ + clientsClaim: true, + skipWaiting: true, + }), + ] + : []), + ...(env.analyze ? [new BundleAnalyzerPlugin()] : []), + ], + module: { + rules: [ + { + test: /\.(ts|js)x?$/, + exclude: /node_modules/, + use: [ + { + loader: 'babel-loader', + options: { + plugins: [ + '@babel/plugin-transform-runtime', + '@babel/plugin-syntax-dynamic-import', + '@babel/plugin-transform-template-literals', + ...(isTest ? [] : ['angularjs-annotate']), + ], + }, + }, + ], + }, + { + test: /\.html$/, + use: ['html-loader'], + }, + { + test: /\.(ts|js)x?$/, + exclude: /node_modules/, + loader: 'eslint-loader', + enforce: 'pre', + options: { + // Show errors as warnings to prevent webpack from exiting + failOnError: false, + emitWarning: true, + }, + }, + { + test: /\.(scss|css)$/, + use: [ + MiniCssExtractPlugin.loader, + { + loader: 'css-loader', + options: { + sourceMap: true, + }, + }, + { + loader: 'sass-loader', + options: { + sourceMap: true, + sassOptions: { + quietDeps: true, }, - ], + }, + }, + ], }, - resolve: { - modules: [path.resolve(__dirname, 'app'), 'node_modules'], - extensions: ['.mjs', '.ts', '.tsx', '.js', '.jsx'], + { + test: /\.(woff|ttf|eot|ico)/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[hash].[ext]', + }, + }, + ], }, - devtool: 'source-map', - devServer: { - historyApiFallback: true, - https: true, - headers: { - 'Access-Control-Allow-Origin': '*', + { + test: /\.(svg|png|jpe?g|gif)/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[hash].[ext]', + }, + }, + { + loader: 'image-webpack-loader', + options: {}, }, + ], }, - }; + ], + }, + resolve: { + modules: [path.resolve(__dirname, 'app'), 'node_modules'], + extensions: ['.mjs', '.ts', '.tsx', '.js', '.jsx'], + }, + devtool: 'source-map', + devServer: { + historyApiFallback: true, + https: true, + headers: { + 'Access-Control-Allow-Origin': '*', + }, + }, + }; }; diff --git a/yarn.lock b/yarn.lock index 30a576555a..bd5ff142e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -937,6 +937,18 @@ request "^2.88.0" request-promise "^4.2.2" +"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.6.0": + version "4.9.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4" + integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA== + "@eslint/eslintrc@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" @@ -2578,6 +2590,13 @@ builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" +builtins@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== + dependencies: + semver "^7.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -4139,6 +4158,11 @@ eslint-config-prettier@^6.15.0: dependencies: get-stdin "^6.0.0" +eslint-config-standard@^17.1.0: + version "17.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975" + integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q== + eslint-import-resolver-node@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" @@ -4171,6 +4195,14 @@ eslint-plugin-angular@^4.0.1: resolved "https://registry.yarnpkg.com/eslint-plugin-angular/-/eslint-plugin-angular-4.0.1.tgz#f6c01d2a1e549d603e29eceb8615b5a989863a5e" integrity sha512-OaW5G461C2lIkOG+/bhnBoXB9UQm/r0Dj2Qf9uiIN0/ncvf2Llp30L0q1tqWkN8/CxyBwQKh1v0hpCLLDjaIKQ== +eslint-plugin-es-x@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es-x/-/eslint-plugin-es-x-7.2.0.tgz#5779d742ad31f8fd780b9481331481e142b72311" + integrity sha512-9dvv5CcvNjSJPqnS5uZkqb3xmbeqRLnvXKK7iI5+oK/yTusyc46zbBZKENGsOfojm/mKfszyZb+wNqNPAPeGXA== + dependencies: + "@eslint-community/eslint-utils" "^4.1.2" + "@eslint-community/regexpp" "^4.6.0" + eslint-plugin-import@^2.20.2: version "2.20.2" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" @@ -4189,6 +4221,21 @@ eslint-plugin-import@^2.20.2: read-pkg-up "^2.0.0" resolve "^1.12.0" +eslint-plugin-n@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.2.0.tgz#3f98ca9fadd9f7bdaaf60068533118ecb685bfb5" + integrity sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + builtins "^5.0.1" + eslint-plugin-es-x "^7.1.0" + get-tsconfig "^4.7.0" + ignore "^5.2.4" + is-core-module "^2.12.1" + minimatch "^3.1.2" + resolve "^1.22.2" + semver "^7.5.3" + eslint-plugin-prettier@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2" @@ -4196,6 +4243,16 @@ eslint-plugin-prettier@^3.1.4: dependencies: prettier-linter-helpers "^1.0.0" +eslint-plugin-promise@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816" + integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== + +eslint-plugin-standard@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4" + integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== + eslint-scope@5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" @@ -4237,6 +4294,11 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== +eslint-visitor-keys@^3.3.0: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + eslint@^7.13.0: version "7.13.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da" @@ -5070,6 +5132,13 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-tsconfig@^4.7.0: + version "4.7.2" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce" + integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A== + dependencies: + resolve-pkg-maps "^1.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -5658,6 +5727,11 @@ ignore@^5.1.1, ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +ignore@^5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + image-q@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056" @@ -5931,6 +6005,13 @@ is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" +is-core-module@^2.12.1, is-core-module@^2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== + dependencies: + has "^1.0.3" + is-cwebp-readable@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-cwebp-readable/-/is-cwebp-readable-3.0.0.tgz#0554aaa400977a2fc4de366d8c0244f13cde58cb" @@ -7096,6 +7177,13 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" @@ -7984,6 +8072,11 @@ path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -8796,6 +8889,11 @@ resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -8807,6 +8905,15 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3 dependencies: path-parse "^1.0.6" +resolve@^1.22.2: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -9052,6 +9159,13 @@ semver@^6.0.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.0.0, semver@^7.5.3: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@^7.2.1, semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" @@ -9829,6 +9943,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + svgo@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" From 413c52cbbe27d184c919662b487b023c86f39812 Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Wed, 11 Oct 2023 09:43:10 -0400 Subject: [PATCH 3/6] Manually fixing es lint issues --- .eslintrc.json | 1 + .../answerSheet/editAnswerSheetModal.component.js | 4 ++-- .../assignedLabelSelect/assignedLabelSelect.component.js | 6 ++++-- .../ministryViewGroup/ministryViewGroup.service.spec.js | 2 +- .../myOrganizationsDashboardList.component.js | 4 +--- .../myPeopleDashboard/myPeopleDashboard.service.spec.js | 3 +-- .../organizationCleanup/organizationCleanup.component.js | 4 ++-- .../organizationContactImportStep1.component.js | 2 +- .../organizationContactImportStep2.component.js | 1 - .../organizationContactImportStep3.component.js | 1 - .../angular/components/peopleScreen/peopleScreen.service.js | 5 ++++- .../surveyOverviewQuestions.component.js | 6 ++---- app/assets/javascripts/angular/filters/personName.filter.js | 3 ++- .../javascripts/angular/services/authentication.service.js | 2 +- app/assets/javascripts/angular/services/facebookService.js | 3 +++ .../javascripts/angular/services/httpProxy.service.js | 4 +++- app/assets/javascripts/angular/services/oktaService.js | 6 +++++- 17 files changed, 33 insertions(+), 24 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index bb2829b83c..213e8b4d1a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -36,6 +36,7 @@ "angular/no-service-method": "off", "angular/window-service": "off", "block-scoped-var": "error", + "camelcase": "off", "consistent-this": ["error", "_this", "vm"], "dot-notation": "error", "eqeqeq": ["error", "smart"], diff --git a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js index 4173e50ce7..252f5b51bb 100644 --- a/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js +++ b/app/assets/javascripts/angular/components/answerSheet/editAnswerSheetModal.component.js @@ -13,7 +13,7 @@ angular.module('campusContactsApp').component('editAnswerSheetModal', { }); function editAnswerSheetModalController(httpProxy, modelsService) { - this.save = async (answerId) => { + this.save = async () => { const answers = this.resolve.answerSheet.answers; const includedAnswers = answers.map((a) => { @@ -28,7 +28,7 @@ function editAnswerSheetModalController(httpProxy, modelsService) { const url = modelsService.getModelMetadata('answer_sheet').url.single(this.resolve.answerSheet.id); - const { data } = await httpProxy.put( + await httpProxy.put( url, { data: { diff --git a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js index c0a1f4f508..a699c8881e 100644 --- a/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js +++ b/app/assets/javascripts/angular/components/assignedLabelSelect/assignedLabelSelect.component.js @@ -16,7 +16,8 @@ function assignedLabelSelectController($scope, assignedLabelSelectService) { this.labels = []; this.originalLabels = []; this.$onInit = () => { - // When this loads, get all the labels and set this.originalLabels to all the labels. We do this once instead of every time the user types. + // When this loads, get all the labels and set this.originalLabels to all the labels. + // We do this once instead of every time the user types. assignedLabelSelectService.searchLabels(this.organizationId).then((labels) => { this.originalLabels = labels; }); @@ -27,7 +28,8 @@ function assignedLabelSelectController($scope, assignedLabelSelectService) { this.labels = [...this.originalLabels]; return; } - // Here we filter out all the labels from the originalLabels array that do not include what the user is currently typing + // Here we filter out all the labels from the originalLabels array + // that do not include what the user is currently typing this.labels = this.originalLabels.filter((label) => label.name.toLowerCase().includes(search.toLowerCase())); }); diff --git a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js index 10c17f836a..a48c56c0b0 100644 --- a/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js +++ b/app/assets/javascripts/angular/components/ministryViewGroup/ministryViewGroup.service.spec.js @@ -1,7 +1,7 @@ import 'angular-mocks'; // Constants -let ministryViewGroupService, tFilter; +let ministryViewGroupService; describe('ministryViewGroupService service', function () { beforeEach(inject(function (_ministryViewGroupService_) { diff --git a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js index 8f7d590f42..583f676b97 100644 --- a/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js +++ b/app/assets/javascripts/angular/components/myOrganizationsDashboardList/myOrganizationsDashboardList.component.js @@ -6,9 +6,7 @@ angular.module('campusContactsApp').component('myOrganizationsDashboardList', { rootOrgs: '<', }, controller: /* @ngInject */ function (userPreferencesService, $scope) { - let deregisterEditOrganizationsEvent; - - deregisterEditOrganizationsEvent = $scope.$on('editOrganizations', (event, value) => { + const deregisterEditOrganizationsEvent = $scope.$on('editOrganizations', (_, value) => { this.editOrganizations = value; }); diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js index dc94792943..d6a683ee7e 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.service.spec.js @@ -66,8 +66,7 @@ describe('myPeopleDashboardService Tests', function () { it('should call GET loadPeople URL', function () { const params = { 'page[limit]': 250, - include: - 'phone_numbers,email_addresses,reverse_contact_assignments.organization,' + 'organizational_permissions', + include: 'phone_numbers,email_addresses,reverse_contact_assignments.organization,organizational_permissions', 'filters[assigned_tos]': 'me', }; myPeopleDashboardService.loadPeople(params); diff --git a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js index f46b30d410..033389bd5c 100644 --- a/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js +++ b/app/assets/javascripts/angular/components/organizationCleanup/organizationCleanup.component.js @@ -40,7 +40,7 @@ function organizationCleanupController(httpProxy, $scope, $uibModal, $state) { }); try { - const modalResponse = await confirmModal.result; + await confirmModal.result; archiveContacts(archiveValue)(archiveDate); } catch (err) {} }; @@ -82,7 +82,7 @@ function organizationCleanupController(httpProxy, $scope, $uibModal, $state) { keyboard: false, }); - const result = await modalInstance.result; + await modalInstance.result; $state.go('app.ministries.ministry.people', { orgId: this.orgId, }); diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js index 2e67122d2a..75e96157c8 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep1.component.js @@ -71,7 +71,7 @@ function organizationContactImportStep1Controller($scope, $uibModal, $state) { }; this.createSurvey = () => { - const modal = $uibModal + $uibModal .open({ component: 'createSurvey', resolve: { diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js index 6bfbc61725..96b580f1e2 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep2.component.js @@ -1,4 +1,3 @@ -import * as Papa from 'papaparse'; import _ from 'lodash'; import template from './organizationContactImportStep2.html'; diff --git a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js index 5dac244249..5578e0e530 100644 --- a/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js +++ b/app/assets/javascripts/angular/components/organizationContactImport/organizationContactImportStep3.component.js @@ -1,4 +1,3 @@ -import * as Papa from 'papaparse'; import _ from 'lodash'; import uuidv1 from 'uuid'; diff --git a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js index 57e02c8b30..872db31e46 100644 --- a/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js +++ b/app/assets/javascripts/angular/components/peopleScreen/peopleScreen.service.js @@ -161,7 +161,10 @@ function peopleScreenService( }, transformData: (params) => (data) => { - // We MUST mutate this object here to keep Angular watchers watching the JsonApiDataStore for changes which is stupid. Everything should work with immutable data but it wasn't implemented that way... An example where creating a new object broke something is updating a contact assignment on the peopleScreen. + // We MUST mutate this object here to keep Angular watchers watching the JsonApiDataStore for + // changes which is stupid. Everything should work with immutable data + // but it wasn't implemented that way... An example where creating a new object broke + // something is updating a contact assignment on the peopleScreen. return Object.assign(data, { answers: ( _.findLast( diff --git a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js index e0463cd9d8..f27dee31c2 100644 --- a/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js +++ b/app/assets/javascripts/angular/components/surveyOverviewQuestionsTab/surveyOverviewQuestions.component.js @@ -242,7 +242,7 @@ function surveyOverviewQuestionsController($uibModal, surveyService, $scope, htt if (!question.question_rules[index].assign_to) return; - question.question_rules[index].assign_to.map((a) => { + question.question_rules[index].assign_to.forEach((a) => { if (a._type !== 'person') { return null; } @@ -419,9 +419,7 @@ function surveyOverviewQuestionsController($uibModal, surveyService, $scope, htt if (ruleIdsToDelete.length > 0) { await Promise.all(ruleIdsToDelete.map((ruleId) => deleteQuestionRule(ruleId))); - const newRules = question.question_rules.filter((r) => { - if (r.trigger_keywords !== keyword) return r; - }); + const newRules = question.question_rules.filter((r) => r.trigger_keywords !== keyword); question.question_rules = newRules; } diff --git a/app/assets/javascripts/angular/filters/personName.filter.js b/app/assets/javascripts/angular/filters/personName.filter.js index 8d1de9a404..9e6c6b0436 100644 --- a/app/assets/javascripts/angular/filters/personName.filter.js +++ b/app/assets/javascripts/angular/filters/personName.filter.js @@ -6,7 +6,8 @@ angular.module('campusContactsApp').filter('personName', function (_) { if (!person) { return null; } - // Ignore missing name parts and if the type is firstAndLastInitial only return the first character of the users last name. + // Ignore missing name parts and if the type is firstAndLastInitial only + // return the first character of the users last name. return [ person.first_name, type === 'firstAndLastInitial' && person.last_name ? `${person.last_name.charAt(0)}.` : person.last_name, diff --git a/app/assets/javascripts/angular/services/authentication.service.js b/app/assets/javascripts/angular/services/authentication.service.js index 3b4224d52b..39bd682f91 100644 --- a/app/assets/javascripts/angular/services/authentication.service.js +++ b/app/assets/javascripts/angular/services/authentication.service.js @@ -150,7 +150,7 @@ function authenticationService( const adminRedirect = async () => { const apiDomain = envService.read('apiUrl').replace('/apis/v4', ''); try { - const { data } = await $http.post(`${apiDomain}/admin/auth`, null, { + await $http.post(`${apiDomain}/admin/auth`, null, { withCredentials: true, // support cross domain cookie setting }); location.replace(`${apiDomain}/admin`); diff --git a/app/assets/javascripts/angular/services/facebookService.js b/app/assets/javascripts/angular/services/facebookService.js index 620d72e5b2..b9aab42c86 100644 --- a/app/assets/javascripts/angular/services/facebookService.js +++ b/app/assets/javascripts/angular/services/facebookService.js @@ -3,6 +3,7 @@ angular.module('campusContactsApp').factory('facebookService', facebookService); function facebookService(authenticationService, envService) { return { init: () => { + // eslint-disable-next-line no-undef FB.init({ appId: envService.read('facebookAppId'), status: true, @@ -29,9 +30,11 @@ function facebookService(authenticationService, envService) { }; }, signOut: () => { + // eslint-disable-next-line no-undef FB.logout((response) => {}); }, signIn: () => { + // eslint-disable-next-line no-undef FB.login( (response) => { if (response.authResponse) { diff --git a/app/assets/javascripts/angular/services/httpProxy.service.js b/app/assets/javascripts/angular/services/httpProxy.service.js index 3a7736640b..f1f66050fa 100644 --- a/app/assets/javascripts/angular/services/httpProxy.service.js +++ b/app/assets/javascripts/angular/services/httpProxy.service.js @@ -49,7 +49,9 @@ function proxyService( $log.warn(new Error('No error message specified')); } - // Angular throws a circular dependency. Happens since the authenticationService also calls on another service that httpProxyService calls. So only way around is the injector. + // Angular throws a circular dependency. Happens since the authenticationService + // also calls on another service that httpProxyService calls. + // So only way around is the injector. const authenticationService = $injector.get('authenticationService'); return provider(config) diff --git a/app/assets/javascripts/angular/services/oktaService.js b/app/assets/javascripts/angular/services/oktaService.js index 421129921e..76c942cb55 100644 --- a/app/assets/javascripts/angular/services/oktaService.js +++ b/app/assets/javascripts/angular/services/oktaService.js @@ -4,14 +4,17 @@ let idToken = 'none'; let accessToken = 'none'; function setIdToken(token) { + // eslint-disable-next-line no-unused-vars idToken = token; } function setAccessToken(token) { + // eslint-disable-next-line no-unused-vars accessToken = token; } function oktaService(authenticationService, envService) { + // eslint-disable-next-line no-undef const authClient = new OktaAuth({ issuer: 'https://signon.okta.com/oauth2/default', clientId: envService.read('oktaClientId'), @@ -30,7 +33,8 @@ function oktaService(authenticationService, envService) { authClient.signOut(); }, signIn: async () => { - // There are other options like full page redirects or passing username/password directly but this seemed like the nicest to me. + // There are other options like full page redirects or passing username/password + // directly but this seemed like the nicest to me. const response = await authClient.token.getWithPopup({ scopes: ['openid', 'email', 'profile'], }); From 7cd5582c655d8ea38dca984a20df9706004bbb15 Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Wed, 11 Oct 2023 09:55:09 -0400 Subject: [PATCH 4/6] PR Template --- .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..d8947265b2 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +## Description +Please include a summary of the changes. List any PRs that this PR is dependent on. + +## Changes +Please include a bullet-point of the changes. +- +- +- + +## Checklist: +- [ ] I have given my PR a title with the format "CC-(JIRA#) (summary sentence max 80 chars)" +- [ ] I have applied the appropriate labels +- [ ] I have requested a review from another person on the project From 17488e5bd44b82be56269d668d312339834973ee Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Fri, 13 Oct 2023 17:15:57 -0400 Subject: [PATCH 5/6] Adding some tests to boost up the Codecov --- .../myPeopleDashboard.component.spec.js | 35 +++++++------- .../organizationSignatures.component.spec.js | 48 +++++++++++++++++++ .../peopleFiltersPanel.component.spec.js | 34 +++++++++++++ yarn.lock | 2 +- 4 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.spec.js create mode 100644 app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.spec.js diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js index 63862c25c8..93fb9f9d71 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js @@ -1,37 +1,38 @@ import 'angular-mocks'; // Constants -let $controller, myPeopleDashboardService, $scope, loggedInPerson; +let $controller, myPeopleDashboardService, userPreferencesService, $scope, loggedInPerson; describe('myPeopleDashboard Components Tests', function () { beforeEach(inject(function ($rootScope, $componentController, _loggedInPerson_) { $scope = $rootScope.$new(); loggedInPerson = _loggedInPerson_; - spyOn(loggedInPerson, 'person').andReturn({ first_name: 'John' }); - $controller = $componentController( 'myPeopleDashboard', { $scope }, { myBinding: { period: '<', editMode: '<' } }, loggedInPerson, ); + myPeopleDashboardService = jasmine.createSpyObj('myPeopleDashboardService', ['loadPeople', 'loadReports']); + + userPreferencesService = jasmine.createSpyObj('userPreferencesService', ['applyUserOrgDisplayPreferences']); + })); - myPeopleDashboardService = jasmine.createSpyObj('myPeopleDashboardService', [ - 'loadPeople', - 'loadReports', - 'loadOrganizations', - ]); + describe('Components.Controller', function () { + it('should exist', function () { + expect($controller).toBeDefined(); + }); - describe('Components.Controller', function () { - it('should exist', function () { - expect($controller).toBeDefined(); - }); + it('loadPeople should have been called', function () { + myPeopleDashboardService.loadPeople(); + expect(myPeopleDashboardService.loadPeople).toHaveBeenCalled(); + }); + }); - it('loadPeople should have been called', function () { - myPeopleDashboardService.loadPeople(); - expect(myPeopleDashboardService.loadPeople).toHaveBeenCalled(); - }); + describe('People Tests', function () { + it('should contain loadPeople', function () { + expect(myPeopleDashboardService.loadPeople).toBeDefined(); }); - })); + }); }); diff --git a/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.spec.js b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.spec.js new file mode 100644 index 0000000000..a3669694cc --- /dev/null +++ b/app/assets/javascripts/angular/components/organizationSignatures/organizationSignatures.component.spec.js @@ -0,0 +1,48 @@ +import 'angular-mocks'; + +// Constants +let $controller, $scope; + +describe('organizationSignatures Components Tests', function () { + beforeEach(inject(function ($rootScope, $componentController) { + $scope = $rootScope.$new(); + + $controller = $componentController('organizationSignatures', { $scope }, { myBinding: { orgId: '<' } }); + })); + + describe('Components.Controller', function () { + it('should exist', function () { + expect($controller).toBeDefined(); + }); + + it('should set tableState', function () { + const tableState = { + pagination: { + start: 0, + currentPage: 0, + numberOfPages: 2, + pages: [0, 1, 2], + totalItemCount: 50, + }, + }; + $controller.load(tableState); + + expect($controller.tableState).toEqual(tableState); + expect($controller.isLoading).toBeTrue(); + }); + + it('should set pagination start', function () { + $controller.tableState = { + pagination: { + start: 0, + currentPage: 0, + numberOfPages: 2, + pages: [0, 1, 2], + totalItemCount: 50, + }, + }; + $controller.setPage(10, 'test Search'); + expect($controller.tableState.pagination.start).toEqual(500); + }); + }); +}); diff --git a/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.spec.js b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.spec.js new file mode 100644 index 0000000000..4714ee7287 --- /dev/null +++ b/app/assets/javascripts/angular/components/peopleFiltersPanel/peopleFiltersPanel.component.spec.js @@ -0,0 +1,34 @@ +import 'angular-mocks'; + +// Constants +let $controller, $scope; + +describe('peopleFiltersPanel Components Tests', function () { + beforeEach(inject(function ($rootScope, $componentController) { + $scope = $rootScope.$new(); + + $controller = $componentController('peopleFiltersPanel', { $scope }, { myBinding: { period: '<', editMode: '<' } }); + })); + + describe('Components.Controller', function () { + it('should exist', function () { + expect($controller).toBeDefined(); + }); + + it('should hideNonFilterableQuestionAnswerResponse return true', function () { + expect( + $controller.hideNonFilterableQuestionAnswerResponse({ + kind: 'TextField', + label: 'last name', + }), + ).toEqual(true); + + expect( + $controller.hideNonFilterableQuestionAnswerResponse({ + kind: 'CheckboxField', + label: 'last name', + }), + ).toEqual(false); + }); + }); +}); diff --git a/yarn.lock b/yarn.lock index bd5ff142e6..0d271f7b41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -928,7 +928,7 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@brainly/onesky-utils@^1.4.1": +"@brainly/onesky-utils@^1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@brainly/onesky-utils/-/onesky-utils-1.4.2.tgz#6087295e6813e55b36774395378342b1c977285b" integrity sha512-r8IZmIqCQQQbljqn9eulMl2S+UHf93lWqMmmLv3zJzfGP9ilpAmkolnVvVKyI2ppq1CR92JmqthRtmImaOFxbw== From 9c6899b275e7811fd0b7e80347ce9a1b37fe1eb4 Mon Sep 17 00:00:00 2001 From: Daniel Bisgrove Date: Mon, 16 Oct 2023 10:26:34 -0400 Subject: [PATCH 6/6] fixing lint issues --- .../myPeopleDashboard/myPeopleDashboard.component.spec.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js index 93fb9f9d71..263af40feb 100644 --- a/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js +++ b/app/assets/javascripts/angular/components/myPeopleDashboard/myPeopleDashboard.component.spec.js @@ -1,7 +1,7 @@ import 'angular-mocks'; // Constants -let $controller, myPeopleDashboardService, userPreferencesService, $scope, loggedInPerson; +let $controller, myPeopleDashboardService, $scope, loggedInPerson; describe('myPeopleDashboard Components Tests', function () { beforeEach(inject(function ($rootScope, $componentController, _loggedInPerson_) { @@ -15,8 +15,6 @@ describe('myPeopleDashboard Components Tests', function () { loggedInPerson, ); myPeopleDashboardService = jasmine.createSpyObj('myPeopleDashboardService', ['loadPeople', 'loadReports']); - - userPreferencesService = jasmine.createSpyObj('userPreferencesService', ['applyUserOrgDisplayPreferences']); })); describe('Components.Controller', function () {