Some changes to appease the Uppy gods

Author: pedantic-git

Gemfile

@@ -9,8 +9,8 @@ gem 'rails', '~> 7.1.3'
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
 gem 'puma', '~> 6.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '>= 6'
+# We still use Sprockets/Sass for serviceworker-rails/activeadmin FIXME
+gem 'sass-rails'
 # Transpile JavaScript/CSS
 gem 'cssbundling-rails', '~> 1.1'
 gem 'jsbundling-rails', '~> 1.1'

Gemfile.lock

@@ -635,7 +635,7 @@ DEPENDENCIES
   rswag-api (~> 2.4)
   rswag-specs (~> 2.4)
   rswag-ui (~> 2.4)
-  sass-rails (>= 6)
+  sass-rails
   serviceworker-rails (~> 0.6.0)!
   simple_form (~> 5.0)
   spicy-proton (~> 2.1)

app/javascript/controllers/likeness_uploader_controller.ts

@@ -1,6 +1,6 @@
 import { Controller } from "@hotwired/stimulus"
 
-import Uppy from '@uppy/core'
+import Uppy, { Meta } from '@uppy/core'
 import XHRUpload from '@uppy/xhr-upload'
 import Dashboard from '@uppy/dashboard'
 import ImageEditor from '@uppy/image-editor'
@@ -31,14 +31,12 @@ export default class extends Controller {
   override connect(): void {
     this.uploader
     .use(Dashboard, {
-      autoOpenFileEditor: true,
+      autoOpen: 'imageEditor'
     })
     .use(Webcam, {
-      target: Dashboard,
       modes: ['picture']
     })
     .use(ImageEditor, {
-      target: Dashboard,
       quality: 0.8,
       cropperOptions: {
         aspectRatio: 1,
@@ -58,7 +56,6 @@ export default class extends Controller {
     })
     .use(XHRUpload, {
       endpoint: this.endpointValue,
-      // @ts-expect-error until https://github.com/transloadit/uppy/pull/5279
       method: 'PATCH',
       fieldName: this.fieldNameValue,
       headers: {
@@ -73,20 +70,21 @@ export default class extends Controller {
       this.uploader.cancelAll()
     })
     this.uploader.on('complete', result => {
-      if (result.successful.length > 0) {
+      if (result.successful && result.successful.length > 0) {
         let img = document.createElement('img')
-        img.setAttribute('src', result.successful[0].uploadURL)
+        img.setAttribute('src', result.successful[0].uploadURL ?? '')
         this.previewTarget.innerHTML = ''
         this.previewTarget.appendChild(img)
         this.deleteTarget.disabled = false;
-        (this.uploader.getPlugin('Dashboard') as Dashboard).closeModal()
+        // FIXME: Should have a stricter type than 'any'
+        (this.uploader.getPlugin('Dashboard') as any).closeModal()
         this.uploader.cancelAll()
       }
     })
   }
 
   public start(): void {
-    (this.uploader.getPlugin('Dashboard') as Dashboard).openModal()
+    (this.uploader.getPlugin('Dashboard') as any).openModal()
   }
 
 }