Another one

Author: RobbieTheWagner

app/components/colors-list.ts

@@ -34,7 +34,7 @@ export default class ColorsListComponent extends Component<ColorsListSignature>
         return palette.colors.sortBy('createdAt').reverse();
       } else {
         return palette.colorOrder.map((color: ColorModel) => {
-          return palette.colors.findBy('id', color.id);
+          return palette.colors.find((c) => c.id === color.id);
         });
       }
     }
@@ -77,7 +77,7 @@ export default class ColorsListComponent extends Component<ColorsListSignature>
         return { type: 'color', id: color.id };
       });
 
-      const colorToRemove = colorsList.findBy('id', color.id);
+      const colorToRemove = colorsList.find((c) => c.id === color.id);
 
       if (colorToRemove) {
         colorsList.removeObject(colorToRemove);

app/components/palette-row.ts

@@ -157,6 +157,7 @@ export default class PaletteRowComponent extends Component<PaletteRowSignature>
       ),
     ];
 
+    // @ts-expect-error dragSort.on does not seem to exist in TS
     this.dragSort.on(
       'start',
       (event: { draggedItem: { hex: string | null } }) => {
@@ -175,7 +176,7 @@ export default class PaletteRowComponent extends Component<PaletteRowSignature>
   get sortedColors(): (ColorModel | undefined)[] {
     return this.args?.palette?.colorOrder?.map(
       (color: { type: string; id: string }) => {
-        return this.args.palette.colors.findBy('id', color.id);
+        return this.args.palette.colors.find((c) => c.id === color.id);
       },
     );
   }

app/components/palettes-list.ts

@@ -61,7 +61,7 @@ export default class PalettesListComponent extends Component<PalettesListSignatu
   }): Promise<void> {
     if (sourceList === targetList && sourceIndex === targetIndex) return;
 
-    const movedItem = sourceList.objectAt(sourceIndex) as PaletteModel;
+    const movedItem = sourceList[sourceIndex] as PaletteModel;
 
     sourceList.removeAt(sourceIndex);
     targetList.insertAt(targetIndex, movedItem);

app/components/settings-data.ts

@@ -52,7 +52,7 @@ export default class SettingsData extends Component {
 
         IDBExportImport.exportToJsonString(
           idbDatabase,
-          (err: Event, jsonString: string) => {
+          (err: Event | null, jsonString: string) => {
             if (err) {
               this.flashMessages.danger('An error occurred.');
               // eslint-disable-next-line no-console
@@ -83,13 +83,13 @@ export default class SettingsData extends Component {
           DBOpenRequest.onsuccess = () => {
             const idbDatabase = DBOpenRequest.result;
 
-            IDBExportImport.clearDatabase(idbDatabase, (err: Event) => {
+            IDBExportImport.clearDatabase(idbDatabase, (err: Event | null) => {
               if (!err) {
                 // cleared data successfully
                 IDBExportImport.importFromJsonString(
                   idbDatabase,
                   jsonString,
-                  async (err: Event) => {
+                  async (err: Event | null) => {
                     if (!err) {
                       idbDatabase.close();
 
@@ -106,8 +106,8 @@ export default class SettingsData extends Component {
 
                         await this.store.sync((t) =>
                           records.map((r) => {
-                            if (r?.attributes?.hex) {
-                              delete r.attributes.hex;
+                            if (r?.attributes?.['hex']) {
+                              delete r.attributes['hex'];
                             }
 
                             return t.addRecord(r);

app/controllers/palettes.ts

@@ -107,7 +107,7 @@ export default class PalettesController extends Controller {
     // If the palette is locked, we should not allow dragging colors into or out of it
     if (sourcePalette?.isLocked || targetPalette?.isLocked) return;
 
-    const sourceColor = sourceList.objectAt(sourceIndex);
+    const sourceColor = sourceList[sourceIndex];
 
     if (sourceColor) {
       if (sourceArgs.isColorHistory) {