From 6d71de2730626eaf66e01e049babc457362aeede Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 25 May 2021 12:54:58 -0400 Subject: [PATCH] Remove ad-hoc client-side variable in favor of the one already available CiviCRM core already sets `CRM.config.cid` so there is no need to reinvent it. --- ang/civicase-base/constants.js | 2 +- ang/civicase.ang.php | 1 - ang/civicase/case/search/directives/search.directive.js | 8 ++++---- ang/civicase/contact/services/contact.service.js | 2 +- ang/civicase/dashboard/directives/dashboard.directive.js | 6 +++--- .../case/search/directives/search.directive.spec.js | 8 ++++---- .../dashboard/directives/dashboard.directive.spec.js | 8 ++++---- ang/test/mocks/data/crm.data.js | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ang/civicase-base/constants.js b/ang/civicase-base/constants.js index 6a5662be4..a070b7e30 100644 --- a/ang/civicase-base/constants.js +++ b/ang/civicase-base/constants.js @@ -10,7 +10,7 @@ .constant('includeActivitiesForInvolvedContact', configuration.includeActivitiesForInvolvedContact) .constant('civicaseSingleCaseRolePerType', configuration.civicaseSingleCaseRolePerType) .constant('dateInputFormatValue', civiCrmConfig.dateInputFormat) - .constant('loggedInContactId', civiCrmConfig.user_contact_id) + .constant('loggedInContactId', civiCrmConfig.cid) .constant('webformsList', { isVisible: configuration.showWebformsListSeparately, buttonLabel: configuration.webformsDropdownButtonLabel diff --git a/ang/civicase.ang.php b/ang/civicase.ang.php index 9f50bb362..7cbd87aca 100644 --- a/ang/civicase.ang.php +++ b/ang/civicase.ang.php @@ -67,7 +67,6 @@ function load_resources() { ->addSetting([ 'config' => [ 'enableComponents' => CRM_Core_Config::singleton()->enableComponents, - 'user_contact_id' => (int) CRM_Core_Session::getLoggedInContactID(), ], ]); } diff --git a/ang/civicase/case/search/directives/search.directive.js b/ang/civicase/case/search/directives/search.directive.js index ae7940d92..0424e8d11 100644 --- a/ang/civicase/case/search/directives/search.directive.js +++ b/ang/civicase/case/search/directives/search.directive.js @@ -182,7 +182,7 @@ */ function caseManagerIsMe () { return !!$scope.filters.case_manager && $scope.filters.case_manager.length === 1 && - parseInt($scope.filters.case_manager[0], 10) === CRM.config.user_contact_id; + parseInt($scope.filters.case_manager[0], 10) === CRM.config.cid; } /** @@ -373,7 +373,7 @@ function isFilterEqualToLoggedInUser (filterName) { var filterValue = $scope.filters[filterName]; var isEqualToUserContactId = filterValue === 'user_contact_id'; - var isSelectingLoggedInUser = _.isEqual(filterValue, [CRM.config.user_contact_id]); + var isSelectingLoggedInUser = _.isEqual(filterValue, [CRM.config.cid]); return isEqualToUserContactId || isSelectingLoggedInUser; } @@ -400,11 +400,11 @@ function relationshipTypeWatcher () { if ($scope.relationshipType) { $scope.relationshipType[0] === 'is_case_manager' - ? $scope.filters.case_manager = [CRM.config.user_contact_id] + ? $scope.filters.case_manager = [CRM.config.cid] : delete ($scope.filters.case_manager); if ($scope.relationshipType[0] === 'is_involved') { - $scope.filters.contact_involved = [CRM.config.user_contact_id]; + $scope.filters.contact_involved = [CRM.config.cid]; $scope.filters.has_activities_for_involved_contact = includeActivitiesForInvolvedContact ? 1 : 0; } else { diff --git a/ang/civicase/contact/services/contact.service.js b/ang/civicase/contact/services/contact.service.js index 13313e1d1..a541eebc5 100644 --- a/ang/civicase/contact/services/contact.service.js +++ b/ang/civicase/contact/services/contact.service.js @@ -10,7 +10,7 @@ this.getCurrentContactID = function () { var url = new URL(window.location.href); - return url.searchParams.get('cid') !== null ? url.searchParams.get('cid') : CRM.config.user_contact_id; + return url.searchParams.get('cid') !== null ? url.searchParams.get('cid') : CRM.config.cid; }; }); })(angular, CRM.$, CRM._, CRM); diff --git a/ang/civicase/dashboard/directives/dashboard.directive.js b/ang/civicase/dashboard/directives/dashboard.directive.js index 7c1204b0b..58d5a8ec9 100644 --- a/ang/civicase/dashboard/directives/dashboard.directive.js +++ b/ang/civicase/dashboard/directives/dashboard.directive.js @@ -53,7 +53,7 @@ */ $scope.linkToManageCase = function (type, status) { var cf = { case_type_category: $scope.currentCaseCategory }; - var userContactId = [CRM.config.user_contact_id]; + var userContactId = [CRM.config.cid]; if (type) { cf.case_type_id = [type]; @@ -107,11 +107,11 @@ */ function caseRelationshipTypeWatcher (newValue) { newValue === 'is_case_manager' - ? $scope.activityFilters.case_filter.case_manager = CRM.config.user_contact_id + ? $scope.activityFilters.case_filter.case_manager = CRM.config.cid : delete ($scope.activityFilters.case_filter.case_manager); if (newValue === 'is_involved') { - $scope.activityFilters.case_filter.contact_involved = { IN: [CRM.config.user_contact_id] }; + $scope.activityFilters.case_filter.contact_involved = { IN: [CRM.config.cid] }; $scope.activityFilters.case_filter.has_activities_for_involved_contact = includeActivitiesForInvolvedContact ? 1 : 0; } else { diff --git a/ang/test/civicase/case/search/directives/search.directive.spec.js b/ang/test/civicase/case/search/directives/search.directive.spec.js index e8c733bae..34e9f0ec9 100644 --- a/ang/test/civicase/case/search/directives/search.directive.spec.js +++ b/ang/test/civicase/case/search/directives/search.directive.spec.js @@ -162,7 +162,7 @@ }); it('sets the case manager filter equal to my id', () => { - expect($scope.filters.case_manager).toEqual([CRM.config.user_contact_id]); + expect($scope.filters.case_manager).toEqual([CRM.config.cid]); }); }); @@ -173,7 +173,7 @@ }); it('sets the contact id filter equal to my id', function () { - expect($scope.filters.contact_involved).toEqual([CRM.config.user_contact_id]); + expect($scope.filters.contact_involved).toEqual([CRM.config.cid]); }); it('filters by case activities related to the involved contact', () => { @@ -304,7 +304,7 @@ }); it('sets the case manager filter equal to the current logged in user id', () => { - expect($scope.filters.case_manager).toEqual([CRM.config.user_contact_id]); + expect($scope.filters.case_manager).toEqual([CRM.config.cid]); }); }); @@ -324,7 +324,7 @@ }); it('sets the contact involved filter equal to the current logged in user id', () => { - expect($scope.filters.contact_involved).toEqual([CRM.config.user_contact_id]); + expect($scope.filters.contact_involved).toEqual([CRM.config.cid]); }); }); }); diff --git a/ang/test/civicase/dashboard/directives/dashboard.directive.spec.js b/ang/test/civicase/dashboard/directives/dashboard.directive.spec.js index 7766cfd0a..6deda4fe4 100644 --- a/ang/test/civicase/dashboard/directives/dashboard.directive.spec.js +++ b/ang/test/civicase/dashboard/directives/dashboard.directive.spec.js @@ -64,7 +64,7 @@ it('filters the cases and activties where the user is the manager', function () { expect($scope.activityFilters.case_filter).toEqual(jasmine.objectContaining({ - case_manager: CRM.config.user_contact_id + case_manager: CRM.config.cid })); }); }); @@ -78,7 +78,7 @@ it('filters the cases and activties where the user is involved', function () { expect($scope.activityFilters.case_filter).toEqual(jasmine.objectContaining({ - contact_involved: { IN: [CRM.config.user_contact_id] } + contact_involved: { IN: [CRM.config.cid] } })); }); @@ -129,7 +129,7 @@ case_type_category: '1', case_type_id: ['type'], status_id: ['status'], - case_manager: [CRM.config.user_contact_id] + case_manager: [CRM.config.cid] }) })); }); @@ -150,7 +150,7 @@ case_type_category: '1', case_type_id: ['type'], status_id: ['status'], - contact_involved: [CRM.config.user_contact_id] + contact_involved: [CRM.config.cid] }) })); }); diff --git a/ang/test/mocks/data/crm.data.js b/ang/test/mocks/data/crm.data.js index 29689bd1d..cb5daf96e 100644 --- a/ang/test/mocks/data/crm.data.js +++ b/ang/test/mocks/data/crm.data.js @@ -6,7 +6,7 @@ 'CiviReport', 'CiviCase' ], - user_contact_id: 203, + cid: 203, isFrontend: false, wysisygScriptLocation: '/sites/all/modules/civicrm/js/wysiwyg/crm.ckeditor.js', CKEditorCustomConfig: {