Merge remote-tracking branch 'scorecard-gridsome-internal/dev' into dev

package.json

@@ -1,7 +1,7 @@
 {
   "name": "college-scorecard",
   "private": true,
-  "version": "2.9.1",
+  "version": "2.9.2",
   "scripts": {
     "build": "gridsome build",
     "develop": "gridsome develop",
@@ -32,7 +32,8 @@
     "semver-regex": "^3.1.3",
     "trim-newlines": "^3.0.1",
     "glob-parent": "^5.1.2",
-    "moment": "^2.29.2",
-    "sharp": "^0.30.5"
+    "moment": "^2.29.4",
+    "sharp": "^0.30.5",
+    "terser": "^4.8.1"
   }
 }

src/components/CompareHeader.vue

@@ -10,7 +10,7 @@
 
       Ready to Compare:
     </div>
-    <div v-if="currentSchoolCount < 10" class="compare-header-text mb-1 ml-4">
+    <div v-if="currentSchoolCount < 10" class="compare-header-text mb-1 ml-4 mr-2">
       <div
         class="compare-icon-wrapper d-inline-block mr-2"
         style="background: #83c38c;"
@@ -21,7 +21,7 @@
       </div>
       {{ currentSchoolCount }} {{ schoolText }} &nbsp;&nbsp;
     </div>
-    <div v-else class="compare-header-text mb-1 ml-4">
+    <div v-else class="compare-header-text mb-1 ml-4 mr-2">
       <div class="compare-icon-wrapper d-inline-block mr-2 mt-n1">
         <v-icon
           class="mt-1"
@@ -36,7 +36,7 @@
     </div>
     <div
       v-if="currentFieldOfStudyCount < 10"
-      class="compare-header-text mb-1 ml-6"
+      class="compare-header-text mb-1 ml-4"
     >
       <div
         class="compare-icon-wrapper d-inline-block mr-2"
@@ -96,6 +96,9 @@
   align-items: center;
   white-space: nowrap;
   height: 40px;
+  @media only screen and (max-width: 600px) {
+    display:inline;
+  }  
 }
 </style>
 

src/components/NetPriceLink.vue

@@ -28,7 +28,7 @@ export default {
   computed: {
     fixedUrl() {
       if (this.url == "#") return false
-      else if (this.url.match(/^http/)) this.url
+      else if (this.url.match(/^http/)) return this.url
       else return "http://" + this.url
     },
   },

src/components/SearchForm.vue

@@ -74,6 +74,7 @@
         aria-labelledby="location-label"
         :placeholder="utility.location ? undefined : 'Select an option'"
         clearable
+         @keydown.enter="$event.preventDefault()"
       />
 
       <div class="d-flex align-center" v-if="utility.location === 'ZIP Code'">
@@ -84,6 +85,8 @@
           hideDetails
           class="mb-3 mr-3"
           type="number"
+          :rules="[utility.rules.zip]"
+          min="0"
         ></v-text-field>
         <v-text-field
           v-model="input.distance"
@@ -531,6 +534,7 @@ export default {
             const pattern = /^\d+$/
             return pattern.test(value) || "Numerical"
           },
+          zip: (value) => /(^\d{5}$)|(^\d{5}-\d{4}$)/.test(value) || 'Must be ZIP code format',
         },
         // Hold Default state of form data.
         formDefault: {},

src/components/compare/Block.vue

@@ -45,10 +45,13 @@
             }`,
         }"
         @click="
+        currentHighlight != `fos-${school.unit_id}-${school.code}-${school['credential.level']}` ?
           $emit(
             'update-highlight',
             `fos-${school.unit_id}-${school.code}-${school['credential.level']}`
-          )
+          ) : 
+          $emit(
+            'update-highlight', '')
         "
       >
         <div class="pb-5 pb-md-1 px-md-5 px-1">

src/components/compare/Row.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     :class="classes"
-    @click="$emit('update-highlight', 'school-' + school.id)"
+    @click="currentHighlight != 'school-' + school.id ? $emit('update-highlight', 'school-' + school.id) : $emit('update-highlight','')"
   >
     <p class="subtitle-2 pb-1 mb-0 pb-2">
       <a :href="$url(schoolLink)">{{ _.get(school, fields["NAME"]) }}</a>
@@ -284,7 +284,7 @@ export default {
       } else if (this.config.currentIncomeFilter) {
         return this.income[this.config.currentIncomeFilter]
       } else if (this.config.type == "percent") {
-        console.log(this.config.altComputedField + " : " + this[this.config.computedField])
+        //console.log(this.config.altComputedField + " : " + this[this.config.computedField])
           if (this.config.showPellOnly)
             return Math.round(this[this.config.altComputedField] * 100)
           else if (_.get(this.school, this.fields["OPEN_ADMISSIONS"]) == 1 && this.config.computedField == 'acceptanceRateActual')

src/main.js

@@ -111,11 +111,7 @@ export default function (Vue, { router, head, isClient, appOptions }) {
         }
       },
       toggleDrawer(state, value = null) {
-        if (state.fos.length == 0 && state.institutions.length == 0)
-        {
-          state.drawerOpen = false;
-        }        
-        else if (value != null) {
+      if (value != null) {
           state.drawerOpen = value
         }
         else

src/pages/search/Index.vue

@@ -203,6 +203,7 @@
                           <v-list-item-group
                             v-model="input.sort"
                             color="primary"
+                            mandatory
                           >
                             <v-list-item
                               v-for="(item, index) in sorts"
@@ -709,7 +710,7 @@ export default {
         params.page = this.input.page - 1
       }
 
-      params.sort = this.input.sort
+      params.sort = this.input.sort ? this.input.sort : this.defaultSort
 
       let query = this.prepareParams(params)
 
@@ -813,7 +814,8 @@ export default {
     },
     resort(sort) {
       this.input.sort = sort
-      this.debounceSearchUpdate(this.parseURLParams())
+      var params =this.parseURLParams()
+      this.debounceSearchUpdate(params)
     },
     clearSearchForm() {
       this.input = {
@@ -877,7 +879,7 @@ export default {
 
         fields.FIELD_OF_STUDY,
       ].join(",")
-
+      
       this.searchAPI(params, returnFields)
     },
     handleFieldOfStudySearch(params) {