Fix Variables

Author: RyCarpenter

package-lock.json

@@ -55,7 +55,7 @@ module.exports = function (app, security) {
         return res.sendStatus(403);
       }
 
-      var tasks = [];
+      const tasks = [];
       if (validateObservationId) {
         tasks.push(function (done) {
           /*
@@ -181,7 +181,7 @@ module.exports = function (app, security) {
   }
 
   function getUserForObservation(req, res, next) {
-    var userId = req.observation.userId;
+    let userId = req.observation.userId;
     if (!userId) return next();
 
     new api.User().getById(userId, function (err, user) {
@@ -193,19 +193,19 @@ module.exports = function (app, security) {
   }
 
   function getIconForObservation(req, res, next) {
-    var form = {};
-    var primary;
-    var secondary;
+    let form = {};
+    let primary;
+    let secondary;
     if (req.observation.properties.forms.length) {
-      var formId = req.observation.properties.forms[0].formId;
-      var formDefinitions = req.event.forms.filter(function (form) {
+      let formId = req.observation.properties.forms[0].formId;
+      let formDefinitions = req.event.forms.filter(function (form) {
         return form._id === formId;
       });
 
       if (formDefinitions.length) {
         form = formDefinitions[0];
         primary = req.observation.properties.forms[0][form.primaryField];
-        secondary = req.observation.properties.forms[0][form.variantField];
+        secondary = req.observation.properties.forms[0][form.letiantField];
       }
     }
 

service/src/routes/observations.js

@@ -398,7 +398,7 @@ export class EventService {
   }
 
   addObservationFavorite(observation) {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.observationService
       .addObservationFavorite(event, observation)
       .pipe(
@@ -410,7 +410,7 @@ export class EventService {
   }
 
   removeObservationFavorite(observation) {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.observationService
       .removeObservationFavorite(event, observation)
       .pipe(
@@ -425,7 +425,7 @@ export class EventService {
     observation: Observation,
     important
   ): Observable<Observation> {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.observationService
       .markObservationAsImportantForEvent(event, observation, important)
       .pipe(
@@ -439,7 +439,7 @@ export class EventService {
   clearObservationAsImportant(
     observation: Observation
   ): Observable<Observation> {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.observationService
       .clearObservationAsImportantForEvent(event, observation)
       .pipe(
@@ -451,7 +451,7 @@ export class EventService {
   }
 
   archiveObservation(observation): Observable<Observation> {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.observationService
       .archiveObservationForEvent(event, observation)
       .pipe(
@@ -486,13 +486,13 @@ export class EventService {
   }
 
   getForms(observation: Observation, options?: any) {
-    var event = this.eventsById[observation.eventId];
+    let event = this.eventsById[observation.eventId];
     return this.getFormsForEvent(event, options);
   }
 
   getFormsForEvent(event: Event, options?: any) {
     options = options || {};
-    var forms = event.forms;
+    let forms = event.forms;
     if (options.archived === false) {
       forms = forms.filter((form: Form) => !form.archived);
     }
@@ -669,24 +669,24 @@ export class EventService {
   }
 
   parseObservations(event: Event, observations: Observation[]): void {
-    var added = [];
-    var updated = [];
-    var removed = [];
+    const added = [];
+    const updated = [];
+    const removed = [];
 
-    var observationsById = {};
-    var filteredObservationsById =
+    const observationsById = {};
+    let filteredObservationsById =
       this.eventsById[event.id].filteredObservationsById;
     observations.forEach((observation: Observation) => {
       // Check if this observation passes the current filter
       if (this.filterService.observationInFilter(observation)) {
         // Check if we already have this observation, if so update, otherwise add
-        var localObservation = filteredObservationsById[observation.id];
+        let localObservation = filteredObservationsById[observation.id];
         if (localObservation) {
           if (localObservation.lastModified !== observation.lastModified) {
             updated.push(observation);
           } else if (observation.attachments) {
-            var some = _.some(observation.attachments, function (attachment) {
-              var localAttachment = _.find(
+            let some = _.some(observation.attachments, function (attachment) {
+              let localAttachment = _.find(
                 localObservation.attachments,
                 function (a) {
                   return a.id === attachment.id;
@@ -713,7 +713,7 @@ export class EventService {
     });
 
     // remaining elements were not pulled from the server, hence we should remove them
-    removed = Object.values(filteredObservationsById);
+    removed.push(Object.values(filteredObservationsById));
 
     this.eventsById[event.id].observationsById = _.keyBy(observations, "id");
     this.eventsById[event.id].filteredObservationsById = observationsById;
@@ -741,7 +741,7 @@ export class EventService {
       delete userLocation.locations;
 
       if (userLocation.user.iconUrl) {
-        var params = new HttpParams();
+        let params = new HttpParams();
         params = params.append(
           "access_token",
           this.localStorageService.getToken()

web-app/src/app/event/event.service.ts

@@ -75,7 +75,7 @@ export class FilterComponent implements OnInit {
     this.selectedUsers = users;
     this.selectedForms = forms;
     if (!this.eventUsers.length) {
-      var eUsers = await this.getUsers(event);
+      let eUsers = await this.getUsers(event);
       this.eventUsers.push(...eUsers);
     }
     if (!this.eventForms.length && event.forms) this.eventForms = event.forms;
@@ -218,8 +218,8 @@ export class FilterComponent implements OnInit {
     this.userControl.setValue("");
     this.formControl.setValue("");
 
-    var newEvent: Event = event.option.value;
-    var eUsers = await this.getUsers(newEvent);
+    let newEvent: Event = event.option.value;
+    let eUsers = await this.getUsers(newEvent);
 
     this.eventUsers = eUsers;
     this.eventForms = newEvent.forms;
@@ -312,7 +312,7 @@ export class FilterComponent implements OnInit {
    */
 
   onFilter(): void {
-    var options: IntervalOptions = {};
+    const options: IntervalOptions = {};
     if (this.intervalChoice.filter === "custom") {
       options.startDate = this.startDate;
       options.endDate = this.endDate;

web-app/src/app/filter/filter.component.ts

@@ -103,12 +103,12 @@ export class FilterService {
    */
 
   setFilter(filter: Filter): void {
-    var eventChanged = null;
-    var teamsChanged = null;
-    var usersChanged = null;
-    var formsChanged = null;
-    var timeIntervalChanged = null;
-    var actionFilterChanged = null;
+    let eventChanged = null;
+    let teamsChanged = null;
+    let usersChanged = null;
+    let formsChanged = null;
+    let timeIntervalChanged = null;
+    let actionFilterChanged = null;
 
     if (filter.users) usersChanged = this.setUsers(filter.users);
 
@@ -124,9 +124,9 @@ export class FilterService {
       // if they changed the event, and didn't set teams filter
       // then reset teams filter to empty array
       if (!filter.teams) {
-        var oldTeamIds = this.localStorageService.getTeams() || [];
-        var teams = [];
-        for (var i = 0; i < filter.event.teams.length; i++) {
+        let oldTeamIds = this.localStorageService.getTeams() || [];
+        const teams = [];
+        for (let i = 0; i < filter.event.teams.length; i++) {
           if (oldTeamIds.indexOf(this.event.teams[i].id) != -1) {
             teams.push(this.event.teams[i]);
           }
@@ -144,7 +144,7 @@ export class FilterService {
       timeIntervalChanged = filter.timeInterval;
     }
 
-    var changed: Changes = {};
+    const changed: Changes = {};
     if (eventChanged) changed.event = eventChanged;
     if (teamsChanged) changed.teams = teamsChanged;
     if (usersChanged) changed.users = usersChanged;
@@ -156,7 +156,7 @@ export class FilterService {
   }
 
   removeFilters() {
-    var changed: Changes = {};
+    const changed: Changes = {};
     if (this.event) {
       changed.event = { removed: [this.event] };
       this.event = null;
@@ -180,8 +180,8 @@ export class FilterService {
         removed: [this.event],
       };
     } else if ((newEvent && !this.event) || this.event.id !== newEvent.id) {
-      var added = [newEvent];
-      var removed = this.event ? [this.event] : [];
+      const added = [newEvent];
+      const removed = this.event ? [this.event] : [];
 
       this.userService.addRecentEvent(newEvent).subscribe({
         error: (e) => console.error("Error adding recent event", e),
@@ -209,8 +209,8 @@ export class FilterService {
    */
 
   setUsers(newUsers: User[]): filterChanges {
-    var added = [];
-    var removed = [];
+    const added = [];
+    const removed = [];
 
     newUsers.forEach((user: User) => {
       if (this.users.findIndex((u) => u.id === user.id) < 0) added.push(user);
@@ -236,8 +236,8 @@ export class FilterService {
    */
 
   setForms(newForms: Form[]): filterChanges {
-    var added = [];
-    var removed = [];
+    const added = [];
+    const removed = [];
 
     newForms.forEach((form: Form) => {
       if (this.forms.findIndex((f) => f.id === form.id) < 0) added.push(form);
@@ -263,16 +263,16 @@ export class FilterService {
    */
 
   setTeams(newTeams: Team[]): filterChanges {
-    var added = [];
-    var removed = [];
+    const added = [];
+    const removed = [];
 
     newTeams.forEach((team: Team) => {
       if (!this.teamsById[team.id]) {
         added.push(team);
       }
     });
 
-    var newTeamsById = _.keyBy(newTeams, "id");
+    let newTeamsById = _.keyBy(newTeams, "id");
     Object.values(this.teamsById).forEach((team: Team) => {
       if (!newTeamsById[team.id]) {
         removed.push(team);
@@ -386,7 +386,7 @@ export class FilterService {
 
   hasFormInList(observationForms: FormProperties[]): boolean {
     if (this.forms.length <= 0) return true;
-    var intersection = this.forms
+    const intersection = this.forms
       .map((x) => x.id)
       .filter((fID) => observationForms.map((y) => y.formId).includes(fID));
     return intersection.length > 0;
@@ -399,9 +399,9 @@ export class FilterService {
    */
 
   isObservationInTimeFilter(o: Observation): boolean {
-    var time: SearchInterval = this.formatInterval(this.interval);
+    const time: SearchInterval = this.formatInterval(this.interval);
     if (time) {
-      var properties = o.properties;
+      const properties = o.properties;
       if (time?.start && time?.end) {
         return moment(properties.timestamp).isBetween(time.start, time.end);
       } else if (time?.start) {
@@ -434,23 +434,23 @@ export class FilterService {
 
   formatInterval(interval: Interval): SearchInterval  {
     if (!interval) return null;
-    var choice = interval.choice;
-    var options = interval.options;
-    var start: string = null;
-    var end: string = null;
+    const choice = interval.choice;
+    const options = interval.options;
+    let start: string = null;
+    let end: string = null;
 
     if (choice.filter === "all") {
       return null;
     } else if (choice.filter === "today") {
       start = moment().startOf("day").toISOString();
       end = moment().endOf("day").toISOString();
     } else if (choice.filter === "custom") {
-      var startDate = moment(options.startDate);
+      let startDate = moment(options.startDate);
       if (startDate) {
         startDate = options.localTime ? startDate.utc() : startDate;
         start = startDate.utc().toISOString();
       }
-      var endDate = moment(options.endDate);
+      let endDate = moment(options.endDate);
       if (endDate) {
         endDate = options.localTime ? endDate.utc() : endDate;
         end = endDate.utc().toISOString();