Update Ember to 4.4

.ember-cli

@@ -6,5 +6,12 @@
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
   "disableAnalytics": false,
+
+  /**
+  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false,
+
   "port": 4300
 }

.eslintignore

@@ -19,7 +19,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
-
+# custom
 /mirage/mirage

.eslintrc.js

@@ -62,7 +62,7 @@ module.exports = {
       },
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

.gitignore

@@ -23,6 +23,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
-.travis/*.key
+# broccoli-debug
+/DEBUG/

.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

README.md

@@ -8,7 +8,7 @@ You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with npm)
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -49,7 +49,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/components/calendar-slot.gjs

@@ -90,11 +90,11 @@ export default class CalendarSlot extends Component {
   }
 
   get hidden() {
-    return !this.slot?.isNotFull && !this.isCommittedTo;
+    return !this.isNotFull && !this.isCommittedTo;
   }
 
   get disabled() {
-    const isNotFull = this.slot?.isNotFull;
+    const isNotFull = this.isNotFull;
     const start = this.slot?.start;
     const toggleIsRunning = this.toggle.isRunning;
 
@@ -118,6 +118,13 @@ export default class CalendarSlot extends Component {
     return `${dividend}/${divisor}`;
   }
 
+  get isNotFull() {
+    const count = this.slot?.count ?? 0;
+    const commitmentCount = this.slot?.commitments?.length ?? 0;
+
+    return count === 0 || commitmentCount < count;
+  }
+
   toggle = task({ drop: true }, async (event) => {
     event.preventDefault();
 
@@ -142,7 +149,7 @@ export default class CalendarSlot extends Component {
         const errorDetail = error?.errors?.[0]?.detail;
         this.args.setError(errorDetail || 'Couldn’t save your change');
       }
-    } else if (this.slot?.isNotFull) {
+    } else if (this.isNotFull) {
       const newRecord = this.store.createRecord('commitment', {
         slot: this.slot,
         person: this.person,

app/components/ride-form.gjs

@@ -710,12 +710,12 @@ export default class RideForm extends Component {
   @action
   handleSubmit(event) {
     event?.preventDefault?.();
-    this.save?.();
+    return this.save?.();
   }
 
   @action
   handleCancel(event) {
     event?.preventDefault?.();
-    this.cancel?.();
+    return this.cancel?.();
   }
 }

app/controllers/admin-calendar.js

@@ -75,17 +75,18 @@ export default class AdminCalendarController extends CalendarController {
   @setDiff('activePeople', 'people')
   remainingPeople;
 
-  @mapBy('viewingSlot.commitments', 'person')
-  viewingSlotPeople;
-
-  @mapBy('viewingSlotPeople', 'id')
-  viewingSlotPeopleIds;
-
-  @computed('activePeople.[]', 'viewingSlotPeopleIds.[]')
+  @computed('activePeople.[]', 'viewingSlot.commitments.{[],@each.person}')
   get uncommittedPeople() {
-    const alreadyCommittedPeople = this.viewingSlotPeopleIds;
-    return this.activePeople.reject((person) =>
-      alreadyCommittedPeople.includes(person.id),
+    const commitments = this.viewingSlot?.commitments || [];
+    const committedIds = new Set(
+      Array.from(commitments)
+        .map((commitment) => commitment.person?.id)
+        .filter(Boolean),
+    );
+    const activePeople = this.activePeople || [];
+
+    return Array.from(activePeople).filter(
+      (person) => !committedIds.has(person.id),
     );
   }
 
@@ -105,27 +106,26 @@ export default class AdminCalendarController extends CalendarController {
   }
 
   @action
-  createCommitment(person) {
+  async createCommitment(person) {
     const slot = this.viewingSlot;
     const commitment = this.store.createRecord('commitment', {
       slot: this.viewingSlot,
       person: person,
     });
 
-    commitment
-      .save()
-      .then(() => {
-        this.set('errorMessage', undefined);
-        this.toasts.show(
-          `Committed ${person.get('name')} to drive on ${moment(
-            slot.get('start'),
-          ).format('MMMM D')}`,
-        );
-      })
-      .catch((error) => {
-        const errorDetail = get(error, 'errors.firstObject.detail');
-        this.set('errorMessage', errorDetail || 'Couldn’t save your change');
-      });
+    try {
+      await commitment.save();
+      this.set('errorMessage', undefined);
+      this.notifyPropertyChange('viewingSlot');
+      this.toasts.show(
+        `Committed ${person.get('name')} to drive on ${moment(
+          slot.get('start'),
+        ).format('MMMM D')}`,
+      );
+    } catch (error) {
+      const errorDetail = get(error, 'errors.firstObject.detail');
+      this.set('errorMessage', errorDetail || 'Couldn’t save your change');
+    }
   }
 
   @action
@@ -137,6 +137,7 @@ export default class AdminCalendarController extends CalendarController {
       .destroyRecord()
       .then(() => {
         this.set('errorMessage', undefined);
+        this.notifyPropertyChange('viewingSlot');
         this.toasts.show(`Deleted ${name}’s commitment on ${date}`);
       })
       .catch((error) => {

app/controllers/drivers.js

@@ -7,6 +7,9 @@ import BufferedProxy from 'ember-buffered-proxy/proxy';
 
 @classic
 export default class DriversController extends Controller {
+  @service('people')
+  peopleService;
+
   @service
   store;
 
@@ -18,9 +21,15 @@ export default class DriversController extends Controller {
   sortDir = 'asc';
   errorMessage = undefined;
 
-  @computed('model.@each.{name,lastRide}', 'sortProp', 'sortDir')
+  @computed(
+    'model',
+    'model.[]',
+    'model.@each.{name,lastRide}',
+    'sortProp',
+    'sortDir',
+  )
   get sortedPeople() {
-    const people = this.model ? this.model.toArray() : [];
+    const people = Array.from(this.model || []);
     const sorted = people.slice().sort((a, b) => {
       let comparison;
 
@@ -82,7 +91,7 @@ export default class DriversController extends Controller {
     this.set(
       'editingPerson',
       BufferedProxy.create({
-        content: this.store.createRecord('person'),
+        content: this.store.createRecord('person', { active: true }),
       }),
     );
   }
@@ -95,24 +104,24 @@ export default class DriversController extends Controller {
   }
 
   @action
-  savePerson(event) {
+  async savePerson(event) {
     event?.preventDefault();
 
     const proxy = this.editingPerson;
     proxy.applyBufferedChanges();
-    return proxy
-      .get('content')
-      .save()
-      .then(() => {
-        this.set('editingPerson', undefined);
-        this.set('errorMessage', undefined);
-      })
-      .catch(() => {
-        this.set(
-          'errorMessage',
-          'There was an error saving this driver. Please try again.',
-        );
-      });
+
+    try {
+      await proxy.get('content').save();
+      await this.peopleService.load();
+
+      this.set('editingPerson', undefined);
+      this.set('errorMessage', undefined);
+    } catch {
+      this.set(
+        'errorMessage',
+        'There was an error saving this driver. Please try again.',
+      );
+    }
   }
 
   @action

app/controllers/reimbursements.js

@@ -10,9 +10,11 @@ import moment from 'moment-timezone';
 
 @classic
 export default class ReimbursementsController extends Controller {
-  queryParams = {
-    showProcessed: 'processed',
-  };
+  queryParams = [
+    {
+      showProcessed: 'processed',
+    },
+  ];
 
   @alias('model')
   reimbursements;

app/controllers/reports/new.js

@@ -1,5 +1,5 @@
 import classic from 'ember-classic-decorator';
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
@@ -19,6 +19,12 @@ export default class NewController extends Controller {
   editingRide;
   errorMessage = undefined;
 
+  @computed('model', 'model.{[],@each.complete}')
+  get reportableRides() {
+    const rides = Array.from(this.model || []);
+    return rides.filter((ride) => !ride.complete);
+  }
+
   _setNumberProperty(property, event) {
     const ride = this.editingRide;
 
@@ -83,28 +89,27 @@ export default class NewController extends Controller {
   }
 
   @action
-  submitReport(event) {
+  async submitReport(event) {
     event?.preventDefault?.();
 
     let editingRide = this.editingRide;
 
     if (editingRide) {
-      return editingRide.save().then(
-        () => {
-          this.set('errorMessage', undefined);
-          this.toasts.show('Your report was saved');
-
-          // Remove the ride from the store before reloading from the server
-          this.store.unloadRecord(this.editingRide);
-
-          this.set('editingRide', undefined);
-          this.router.transitionTo('application');
-          window.scrollTo(0, 0);
-        },
-        () => {
-          this.set('errorMessage', 'There was an error saving your report!');
-        },
-      );
+      try {
+        await editingRide.save();
+        editingRide.set('complete', true);
+
+        this.set('errorMessage', undefined);
+        this.toasts.show('Your report was saved');
+
+        await this.store.findAll('ride', { reload: true });
+
+        this.set('editingRide', undefined);
+        this.router.transitionTo('application');
+        window.scrollTo(0, 0);
+      } catch {
+        this.set('errorMessage', 'There was an error saving your report!');
+      }
     } else {
       this.set('errorMessage', 'Please choose a ride');
     }