More TS fixes

Author: RobbieTheWagner

app/controllers/palettes.ts

@@ -168,10 +168,10 @@ export default class PalettesController extends Controller {
       };
       const colorsList = targetList.map((c) => c.$identity);
 
-      const existingColor = targetList.findBy('hex', sourceColor.hex);
+      const existingColor = targetList.find((c) => c.hex === sourceColor.hex);
 
       if (existingColor) {
-        const colorToRemove = colorsList.findBy('id', existingColor.id);
+        const colorToRemove = colorsList.find((c) => c.id === existingColor.id);
 
         if (colorToRemove) {
           colorsList.removeObject(colorToRemove);

app/data-sources/backup.ts

@@ -44,11 +44,11 @@ export default {
         const newColors: InitializedRecord[] = [];
 
         for (const color of oldColors) {
-          if (color.relationships?.palettes) {
-            const paletteIdentities = color.relationships.palettes
+          if (color.relationships?.['palettes']) {
+            const paletteIdentities = color.relationships['palettes']
               .data as RecordIdentity[];
 
-            delete color.relationships.palettes;
+            delete color.relationships['palettes'];
 
             if (paletteIdentities?.length) {
               color.relationships.palette = { data: paletteIdentities[0] };
@@ -74,18 +74,18 @@ export default {
                       : { type: 'color', id: colorCopy.id };
                   };
 
-                  if (palette.relationships?.colors.data) {
+                  if (palette.relationships?.['colors']?.data) {
                     // Replace color in palette with color copy
-                    palette.relationships.colors.data =
-                      palette.relationships.colors.data.map(
+                    palette.relationships['colors'].data =
+                      palette.relationships['colors'].data.map(
                         replaceColorIdWithCopy,
                       );
                   }
 
-                  if (palette.attributes?.colorOrder) {
+                  if (palette.attributes?.['colorOrder']) {
                     // Replace color id in colorOrder
-                    palette.attributes.colorOrder =
-                      palette.attributes.colorOrder.map(replaceColorIdWithCopy);
+                    palette.attributes['colorOrder'] =
+                      palette.attributes['colorOrder'].map(replaceColorIdWithCopy);
                   }
                 }
               }

tests/acceptance/settings/cloud-test.ts

@@ -28,6 +28,7 @@ module('Acceptance | settings/cloud', function (hooks) {
           assert.ok(true, 'signUp has been called');
 
           return MockUser.create({
+            // @ts-expect-error TODO: maybe fix this?
             username: 'testuser@gmail.com',
             attributes: {
               sub: 'aaaabbbb-cccc-dddd-eeee-ffffgggghhhh',

tests/helpers.ts

@@ -2,12 +2,22 @@ import { getContext, settled } from '@ember/test-helpers';
 import { animationsSettled } from 'ember-animated/test-support';
 import { waitForSource } from 'ember-orbit/test-support';
 
+import type Owner from '@ember/owner';
+
+import type Coordinator from '@orbit/coordinator';
+import type { IndexedDBSource } from '@orbit/indexeddb';
+import type BucketClass from '@orbit/indexeddb-bucket';
+
+// @ts-expect-error TODO: not yet typed
 import seedOrbit from './orbit/seed';
 
 export async function waitForAll() {
-  const { owner } = getContext();
+  const { owner } = getContext() as { owner: Owner };
+  // @ts-expect-error Not sure why it says this does not exist
   const { services } = owner.resolveRegistration('ember-orbit:config');
-  const coordinator = owner.lookup(`service:${services.coordinator}`);
+  const coordinator = owner.lookup(
+    `service:${services.coordinator}`,
+  ) as unknown as Coordinator;
 
   for (let source of coordinator.sources) {
     await waitForSource(source);
@@ -17,7 +27,10 @@ export async function waitForAll() {
   await animationsSettled();
 }
 
-export function resetStorage(hooks, options = {}) {
+export function resetStorage(
+  hooks: NestedHooks,
+  options: { seed?: { source?: string; scenario?: string } } = {},
+) {
   hooks.beforeEach(async function () {
     if (options.seed) {
       const sourceName = options.seed.source ?? 'backup';
@@ -28,11 +41,15 @@ export function resetStorage(hooks, options = {}) {
   });
 
   hooks.afterEach(async function () {
-    const backup = this.owner.lookup('data-source:backup');
+    const backup = this.owner.lookup(
+      'data-source:backup',
+    ) as unknown as IndexedDBSource;
 
     await backup.cache.deleteDB();
 
-    const bucket = this.owner.lookup('data-bucket:main');
+    const bucket = this.owner.lookup('data-bucket:main') as unknown as
+      | BucketClass
+      | undefined;
 
     await bucket?.clear();
 

tests/unit/services/data-test.ts

@@ -9,6 +9,7 @@ import type IndexedDBSource from '@orbit/indexeddb';
 import type Palette from 'swach/data-models/palette';
 import type DataService from 'swach/services/data';
 import { resetStorage } from 'swach/tests/helpers';
+// @ts-expect-error TODO: not yet typed
 import seedOrbit from 'swach/tests/orbit/seed';
 
 module('Unit | Service | data', function (hooks) {
@@ -61,9 +62,9 @@ module('Unit | Service | data', function (hooks) {
 
       try {
         await dataService.synchronize();
-      } catch (e) {
+      } catch (e: unknown) {
         assert.strictEqual(
-          e.message,
+          (e as Error).message,
           'Data service: synchronize cannot be called prior to activate',
         );
       }