merging main with staging

CruGlobal · Aug 18, 2023 · 29013d1 · 29013d1
2 parents 837155d + f6c2331
commit 29013d1
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/app/scripts/directives/blockEditor.js b/app/scripts/directives/blockEditor.js
@@ -178,9 +178,12 @@ angular.module('confRegistrationWebApp').directive('blockEditor', function () {
       $scope.typeToProfile.addressQuestion = 'ADDRESS';
       $scope.typeToProfile.genderQuestion = 'GENDER';
       $scope.typeToProfile.yearInSchoolQuestion = 'YEAR_IN_SCHOOL';
+      $scope.typeToProfile.opportunitiesQuestion = 'OPPORTUNITIES';
       $scope.typeToProfile.birthDateQuestion = 'BIRTH_DATE';
       $scope.typeToProfile.campusQuestion = 'CAMPUS';
       $scope.typeToProfile.dormitoryQuestion = 'DORMITORY';
+      $scope.typeToProfile.graduationDateQuestion = 'GRADUATION_DATE';
+      $scope.typeToProfile.ethnicityQuestion = 'ETHNICITY';
 
       $scope.profileCheck = !_.isNull($scope.block.profileType);
       $scope.profileOption = _.has($scope.typeToProfile, $scope.block.type);

diff --git a/app/scripts/directives/questionToolbar.js b/app/scripts/directives/questionToolbar.js
@@ -171,7 +171,7 @@ angular
           {
             id: 'campusQuestion',
             defaultTitle:
-              'Campus- Type the full name of your campus and choose from the list that appears',
+              'Campus - Type the full name of your campus and choose from the list that appears',
             defaultProfile: 'CAMPUS',
             iconClass: 'fa-university',
             name: 'Campus',
@@ -203,7 +203,7 @@ angular
           {
             id: 'ethnicityQuestion',
             defaultTitle: 'Which race or ethnicity best describes you?',
-            defaultExportFieldTitle: 'Ethnicity',
+            defaultExportFieldTitle: 'Race/Ethnicity',
             defaultProfile: 'ETHNICITY',
             iconClass: 'fa-globe',
             name: 'Racial/Ethnic Identity',

diff --git a/app/views/blocks/campusQuestion.html b/app/views/blocks/campusQuestion.html
@@ -2,15 +2,16 @@
   <input
     type="text"
     ng-model="answer.value"
-    ng-model-options="{ debounce: 100 }"
     placeholder=""
+    autocomplete="off"
+    aria-autocomplete="none"
     class="form-control"
     show-errors
     ng-required="block.required"
     uib-typeahead="campus for campus in searchCampuses($viewValue)"
     typeahead-loading="loadingCampuses"
     typeahead-min-length="2"
-    typeahead-wait-ms="100"
+    typeahead-wait-ms="200"
     typeahead-editable="false"
     typeahead-no-results="campusNotFound"
     typeahead-show-hint="true"

diff --git a/app/views/components/blockEditor.html b/app/views/components/blockEditor.html
@@ -289,18 +289,6 @@
           >
         </div>
 
-        <div
-          class="help-block"
-          ng-if="block.type === 'opportunitiesQuestion' && !eventHasQuestionType('phoneQuestion')"
-        >
-          <i
-            ><translate
-              >*Please remember to add a 'Telephone' question to this
-              form.</translate
-            ></i
-          >
-        </div>
-
         <div class="checkbox" ng-if="requiredOption && !block.adminOnly">
           <label
             ><input type="checkbox" ng-model="block.required" />

diff --git a/test/spec/directives/block.spec.js b/test/spec/directives/block.spec.js
@@ -178,7 +178,8 @@ describe('Directive: blocks', () => {
       $scope.block.content.showInternationalCampuses = true;
     }));
 
-    it('searchCampuses params are formed correctly', () => {
+    it('forms the searchCampuses params correctly', () => {
+      $scope.block.content.showInternationalCampuses = true;
       $compile('<campus-question></campus-question>')($scope);
       $scope.$digest();
 
@@ -188,6 +189,16 @@ describe('Directive: blocks', () => {
 
       expect($scope.params.includeInternational).toBeDefined();
     });
+
+    it("doesn't add includeInternational", () => {
+      $scope.block.content.showInternationalCampuses = false;
+      $compile('<campus-question></campus-question>')($scope);
+      $scope.$digest();
+
+      $scope.searchCampuses('San');
+
+      expect($scope.params.includeInternational).not.toBeDefined();
+    });
   });
 
   describe('ethnicityQuestion', () => {

diff --git a/test/spec/directives/blockEditor.spec.js b/test/spec/directives/blockEditor.spec.js
@@ -76,4 +76,15 @@ describe('Directive: blockEditor', function () {
 
     expect(scope.pType).toBe('Sex');
   });
+
+  it('returns whether a question type exists or not using eventHasQuestionType()', function () {
+    const block = _.find(testData.conference.registrationPages[1].blocks, {
+      id: '9b83eebd-b064-4edf-92d0-7982a330272a',
+    });
+    scope.block = block;
+
+    expect(scope.eventHasQuestionType('genderQuestion')).toBe(true);
+
+    expect(scope.eventHasQuestionType('ethnicityQuestion')).toBe(false);
+  });
 });