Account import & export

Gemfile

@@ -34,7 +34,7 @@ gem "platform_agent"
 gem "aws-sdk-s3", require: false
 gem "web-push"
 gem "net-http-persistent"
-gem "rubyzip", require: "zip"
+gem "zip_kit"
 gem "mittens"
 gem "useragent", bc: "useragent"
 

Gemfile.lock

@@ -479,6 +479,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.7.4)
+    zip_kit (6.3.4)
 
 PLATFORMS
   aarch64-linux
@@ -523,7 +524,6 @@ DEPENDENCIES
   rouge
   rqrcode
   rubocop-rails-omakase
-  rubyzip
   selenium-webdriver
   solid_cable (>= 3.0)
   solid_cache (~> 1.0)
@@ -538,6 +538,7 @@ DEPENDENCIES
   web-console
   web-push
   webmock
+  zip_kit
 
 BUNDLED WITH
    2.7.2

Gemfile.saas.lock

@@ -628,6 +628,7 @@ GEM
       railties
       yabeda (~> 0.8)
     zeitwerk (2.7.4)
+    zip_kit (6.3.4)
 
 PLATFORMS
   aarch64-linux
@@ -678,7 +679,6 @@ DEPENDENCIES
   rouge
   rqrcode
   rubocop-rails-omakase
-  rubyzip
   selenium-webdriver
   sentry-rails
   sentry-ruby
@@ -705,6 +705,7 @@ DEPENDENCIES
   yabeda-prometheus-mmap
   yabeda-puma-plugin
   yabeda-rails
+  zip_kit
 
 BUNDLED WITH
    2.7.2

app/assets/stylesheets/inputs.css

@@ -57,18 +57,12 @@
     }
   }
 
-  .input--file {
+  .input--file,
+  .input--upload {
     cursor: pointer;
-    display: grid;
-    inline-size: auto;
-    place-items: center;
-
-    > * {
-      grid-area: 1 / 1;
-    }
 
-    img {
-      border-radius: 0.4em;
+    &:has(input[type="file"]:focus-visible) {
+      outline: 0.15rem solid var(--color-selected-dark);
     }
 
     input[type="file"] {
@@ -88,10 +82,19 @@
         opacity: 0;
       }
     }
+  }
 
-    &:has(input[type="file"]:focus),
-    &:has(input[type="file"]:focus-visible) {
-      outline: 0.15rem solid var(--color-selected-dark);
+  .input--file {
+    display: grid;
+    inline-size: auto;
+    place-items: center;
+
+    > * {
+      grid-area: 1 / 1;
+    }
+
+    img {
+      border-radius: 0.4em;
     }
 
     &:is(.avatar) {
@@ -101,6 +104,25 @@
     }
   }
 
+  .input--upload {
+    --btn-border-color: var(--color-ink);
+    --btn-border-radius: 1ch;
+
+    border-style: dashed;
+    position: relative;
+
+    input[type="file"] {
+      inset: 0;
+      outline: none;
+      position: absolute;
+    }
+
+    &:has([data-upload-preview-target="fileName"]:not([hidden])) {
+      --btn-border-color: var(--color-positive);
+      --btn-color: var(--color-positive);
+    }
+  }
+
   .input--select {
     --input-border-radius: 2em;
     --input-padding: 0.5em 1.8em 0.5em 1.2em;

app/assets/stylesheets/notifications.css

@@ -95,12 +95,12 @@
     display: none;
 
     .notifications--on & {
-      display: block;
+      display: inline;
     }
   }
 
   .notifications__off-message {
-    display: block;
+    display: inline;
 
     .notifications--on & {
       display: none;

app/assets/stylesheets/settings.css

@@ -13,18 +13,21 @@
     }
   }
 
+  /* Sections & Panels
+  /* -------------------------------------------------------------------------- */
+
   .settings__panel {
     --panel-size: 100%;
     --panel-padding: calc(var(--settings-spacer) / 1);
 
     display: flex;
     flex-direction: column;
-    gap: calc(var(--settings-spacer) / 2);
+    gap: var(--panel-padding);
     min-block-size: 100%;
     min-inline-size: 0;
 
-    @media (min-width: 960px) {
-      --panel-padding: calc(var(--settings-spacer) * 1.5) calc(var(--settings-spacer) * 2);
+    @media (min-width: 640px) {
+      --panel-padding: calc(var(--settings-spacer) * 2);
     }
   }
 
@@ -38,6 +41,20 @@
     }
   }
 
+  .settings__section {
+    h2 {
+      font-size: var(--text-large);
+    }
+
+    > * + * {
+      margin-block-start: calc(var(--panel-padding) / 2);
+    }
+
+    &:is(:first-child):has(h2) {
+      margin-top: -0.33lh; /* Align h2 letters caps with panel padding */
+    }
+  }
+
   /* Users
   /* ------------------------------------------------------------------------ */
 

app/controllers/account/exports_controller.rb

@@ -1,4 +1,5 @@
 class Account::ExportsController < ApplicationController
+  before_action :ensure_admin_or_owner
   before_action :ensure_export_limit_not_exceeded, only: :create
   before_action :set_export, only: :show
 
@@ -13,8 +14,12 @@ def create
   end
 
   private
+    def ensure_admin_or_owner
+      head :forbidden unless Current.user.admin? || Current.user.owner?
+    end
+
     def ensure_export_limit_not_exceeded
-      head :too_many_requests if Current.user.exports.current.count >= CURRENT_EXPORT_LIMIT
+      head :too_many_requests if Current.account.exports.current.count >= CURRENT_EXPORT_LIMIT
     end
 
     def set_export

app/controllers/account/imports_controller.rb

@@ -0,0 +1,44 @@
+class Account::ImportsController < ApplicationController
+  layout "public"
+
+  disallow_account_scope only: %i[ new create ]
+  allow_unauthorized_access only: :show
+  before_action :set_import, only: %i[ show ]
+  before_action :ensure_accessed_by_owner, only: %i[ show ]
+
+  def new
+  end
+
+  def create
+    signup = Signup.new(identity: Current.identity, full_name: "Import", skip_account_seeding: true)
+
+    if signup.complete
+      start_import(signup.account)
+    else
+      render :new, alert: "Couldn't create account."
+    end
+  end
+
+  def show
+  end
+
+  private
+    def set_import
+      @import = Current.account.imports.find(params[:id])
+    end
+
+    def ensure_accessed_by_owner
+      head :forbidden unless @import.identity == Current.identity
+    end
+
+    def start_import(account)
+      import = nil
+
+      Current.set(account: account) do
+        import = account.imports.create!(identity: Current.identity, file: params[:file])
+        import.process_later
+      end
+
+      redirect_to account_import_path(import, script_name: account.slug)
+    end
+end

app/controllers/users/data_exports_controller.rb

@@ -0,0 +1,33 @@
+class Users::DataExportsController < ApplicationController
+  before_action :set_user
+  before_action :ensure_current_user
+  before_action :ensure_export_limit_not_exceeded, only: :create
+  before_action :set_export, only: :show
+
+  CURRENT_EXPORT_LIMIT = 10
+
+  def show
+  end
+
+  def create
+    @user.data_exports.create!(account: Current.account).build_later
+    redirect_to @user, notice: "Export started. You'll receive an email when it's ready."
+  end
+
+  private
+    def set_user
+      @user = Current.account.users.find(params[:user_id])
+    end
+
+    def ensure_current_user
+      head :forbidden unless @user == Current.user
+    end
+
+    def ensure_export_limit_not_exceeded
+      head :too_many_requests if @user.data_exports.current.count >= CURRENT_EXPORT_LIMIT
+    end
+
+    def set_export
+      @export = @user.data_exports.completed.find_by(id: params[:id])
+    end
+end

app/javascript/controllers/upload_preview_controller.js

@@ -1,14 +1,31 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = [ "image", "input" ]
+  static targets = [ "image", "input", "fileName", "placeholder" ]
 
   previewImage() {
-    const file = this.inputTarget.files[0]
-
-    if (file) {
-      this.imageTarget.src = URL.createObjectURL(file)
+    if (this.#file) {
+      this.imageTarget.src = URL.createObjectURL(this.#file)
       this.imageTarget.onload = () => URL.revokeObjectURL(this.imageTarget.src)
     }
   }
+
+  previewFileName() {
+    this.#file ? this.#showFileName() : this.#showPlaceholder()
+  }
+
+  #showFileName() {
+    this.fileNameTarget.innerHTML = this.#file.name
+    this.fileNameTarget.removeAttribute("hidden")
+    this.placeholderTarget.setAttribute("hidden", true)
+  }
+
+  #showPlaceholder() {
+    this.placeholderTarget.removeAttribute("hidden")
+    this.fileNameTarget.setAttribute("hidden", true)
+  }
+
+  get #file() {
+    return this.inputTarget.files[0]
+  }
 }

app/jobs/account/data_import_job.rb

@@ -0,0 +1,20 @@
+class Account::DataImportJob < ApplicationJob
+  include ActiveJob::Continuable
+
+  queue_as :backend
+  discard_on Account::DataTransfer::RecordSet::IntegrityError
+
+  def perform(import)
+    step :check do |step|
+      import.check \
+        start: step.cursor,
+        callback: ->(record_set:, file:) { step.set!([ record_set.model.name, file ]) }
+    end
+
+    step :process do |step|
+      import.process \
+        start: step.cursor,
+        callback: ->(record_set:, files:) { step.set!([ record_set.model.name, files.last ]) }
+    end
+  end
+end

app/jobs/export_account_data_job.rb → app/jobs/data_export_job.rb

@@ -1,4 +1,4 @@
-class ExportAccountDataJob < ApplicationJob
+class DataExportJob < ApplicationJob
   queue_as :backend
 
   discard_on ActiveJob::DeserializationError

app/mailers/export_mailer.rb

@@ -1,8 +1,19 @@
 class ExportMailer < ApplicationMailer
+  helper_method :export_download_url
+
   def completed(export)
     @export = export
     @user = export.user
 
     mail to: @user.identity.email_address, subject: "Your Fizzy data export is ready for download"
   end
+
+  private
+    def export_download_url(export)
+      if export.is_a?(User::DataExport)
+        user_data_export_url(export.user, export)
+      else
+        account_export_url(export)
+      end
+    end
 end