easy_flow 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c0c3c1f15a0c2791aef81b34ea0e04562ccb4b6a4b79ed7299c044d8f6a523
-  data.tar.gz: f60e7006ea24aa9f1f5e316caadd710ec4ce0be74379c8bb1fc1be2ab68cd0ca
+  metadata.gz: f7f3a5cbb2c164df9c3c513c7de107dcb30123987e5392853e76554c242aff84
+  data.tar.gz: 320ffff05f4107aa8573b2be17a41b5a4e7aa49759b6228c74f7cd7905501b5a
 SHA512:
-  metadata.gz: f42450ecaf979014f966086feb96cbb82d0d1104f6043f0d2542e3c841973f19fd43075d935256102951bdc273bb856ed0bce9da1c4cf4b1c5b8597d635b8f45
-  data.tar.gz: 66418965532ea2a4eb09f71ed575fb7279e9fa06864005be4ab606820115a918bbe86c9013fdce16f6f5509dd8193c6583bcccdfc7efaf4be6ec47237c9c0611
+  metadata.gz: 40887692880f1f9f468d11818cac2912b2debb61bdce99a2e238d9be4338c4c915e61df7db046938f371c97eaf2e296ee2c8985a1a930960ef9ffc4bd45a25cb
+  data.tar.gz: e01daf58e09f740dd57a5e3690028755abd7c5b77f604bdf765c60637f0fb8974852eab79ed6ebc200225cca7ac4471fde33a75420ad7e00f87cd4ab786ac7f4

data/app/controllers/concerns/easy_flow/manage/draws_canvas.rb

@@ -6,7 +6,7 @@ module EasyFlow
       private
 
       def canvas_payload(flow)
-        Canvas.new(canvas_document(flow), host: flow_host, flows: hosted_flows.order(:title), flow_path: ->(id) { manage_flow_path(id, from: flow.id) }, flow: flow).to_h
+        Canvas.new(canvas_document(flow), host: flow_host, flows: hosted_flows.order(:title), flow_path: ->(id) { manage_flow_path(hosted_flows.find_by(id: id) || id, from: flow) }, flow: flow).to_h
           .merge("undoable" => flow.edit_history.undoable?, "redoable" => flow.edit_history.redoable?,
                  "changes" => listed_changes(flow), "flow" => flow_details(flow))
       end

data/app/controllers/easy_flow/flows_controller.rb

@@ -1,6 +1,6 @@
 module EasyFlow
   class FlowsController < ApplicationController
-    helper_method :flow_start_path, :flow_step_path, :previewing?, :step_form, :carries_answers?
+    helper_method :flow_start_path, :flow_step_path, :previewing?, :step_form, :carries_answers?, :flow_address
 
     def show
       @flow = flow
@@ -60,6 +60,12 @@ module EasyFlow
       Run.start(flow)
     end
 
+    def flow_address(slug)
+      return slug unless flow_host.finds_flows_across_owners
+
+      (run&.flow || flow).public_code
+    end
+
     def flow_start_path(slug)
       flow_routes.flow_path(slug)
     end
@@ -75,7 +81,7 @@ module EasyFlow
     def step_form
       return { url: run_location(run), method: :patch } if run
 
-      { url: flow_step_path(@guide.slug), method: :get }
+      { url: flow_step_path(flow_address(@guide.slug)), method: :get }
     end
 
     def carries_answers?
@@ -109,13 +115,25 @@ module EasyFlow
     end
 
     def admitted_run
-      found = find_run(Run.where(flow: hosted_flows), params[:id])
+      found = find_run(Run.where(flow: visited_flows), params[:id])
 
       Admission.of_run(found, permitted: permitted?(found.flow))
     end
 
     def flow
-      @stored_flow ||= admit(hosted_flows.find_by(slug: params[:slug]))
+      @stored_flow ||= admit(visited_flow)
+    end
+
+    def visited_flow
+      return hosted_flows.find_by(slug: params[:slug]) unless flow_host.finds_flows_across_owners
+
+      visited_flows.find_by_public_code!(params[:slug])
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
+    def visited_flows
+      flow_host.finds_flows_across_owners ? flow_host.flows : hosted_flows
     end
 
     def flowing_definition(flow)

data/app/controllers/easy_flow/manage/canvas_controller.rb

@@ -83,7 +83,7 @@ module EasyFlow
       end
 
       def flow
-        @flow ||= hosted_flows.find(params[:flow_id])
+        @flow ||= hosted_flows.find_by_public_code!(params[:flow_id])
       end
 
       def document

data/app/controllers/easy_flow/manage/definitions_controller.rb

@@ -2,11 +2,11 @@ module EasyFlow
   module Manage
     class DefinitionsController < BaseController
       def edit
-        @flow = hosted_flows.find(params[:flow_id])
+        @flow = hosted_flows.find_by_public_code!(params[:flow_id])
       end
 
       def update
-        @flow = hosted_flows.find(params[:flow_id])
+        @flow = hosted_flows.find_by_public_code!(params[:flow_id])
         @flow.edit_history.edit_document(JSON.parse(params.require(:definition)))
         redirect_to manage_flow_path(@flow), notice: "Definition saved."
       end

data/app/controllers/easy_flow/manage/flows_controller.rb

@@ -21,23 +21,23 @@ module EasyFlow
       end
 
       def show
-        @flow = hosted_flows.find(params[:id])
-        @parent = hosted_flows.find_by(id: params[:from])
+        @flow = hosted_flows.find_by_public_code!(params[:id])
+        @parent = parent_flow
         @canvas = canvas_payload(@flow)
       end
 
       def edit
-        @flow = hosted_flows.find(params[:id])
+        @flow = hosted_flows.find_by_public_code!(params[:id])
       end
 
       def update
-        @flow = hosted_flows.find(params[:id])
+        @flow = hosted_flows.find_by_public_code!(params[:id])
         @flow.update!(flow_params)
         redirect_to manage_flow_path(@flow), notice: "Saved."
       end
 
       def destroy
-        flow = hosted_flows.find(params[:id])
+        flow = hosted_flows.find_by_public_code!(params[:id])
         return redirect_to manage_flows_path, alert: flow.errors.full_messages.to_sentence unless flow.destroy
 
         redirect_to manage_flows_path, notice: "Flow removed."
@@ -45,6 +45,12 @@ module EasyFlow
 
       private
 
+      def parent_flow
+        hosted_flows.find_by_public_code!(params[:from]) if params[:from].present?
+      rescue ActiveRecord::RecordNotFound
+        nil
+      end
+
       def ordered_flows
         hosted_flows.order(:slug)
       end

data/app/controllers/easy_flow/manage/previews_controller.rb

@@ -27,7 +27,7 @@ module EasyFlow
       end
 
       def previewed
-        @previewed ||= hosted_flows.find(params[:flow_id])
+        @previewed ||= hosted_flows.find_by_public_code!(params[:flow_id])
       end
 
       def admit(_flow)

data/app/controllers/easy_flow/manage/versions_controller.rb

@@ -7,7 +7,7 @@ module EasyFlow
       end
 
       def return
-        flow.return_to(flow.definition_versions.find(params[:id]))
+        flow.return_to(flow.definition_versions.find_by_public_code!(params[:id]))
 
         redirect_to manage_flow_path(flow), notice: "The flow is back to that version."
       end
@@ -15,7 +15,7 @@ module EasyFlow
       private
 
       def flow
-        @flow ||= hosted_flows.find(params[:flow_id])
+        @flow ||= hosted_flows.find_by_public_code!(params[:flow_id])
       end
     end
   end

data/app/models/easy_flow/definition.rb

@@ -2,6 +2,8 @@ module EasyFlow
   class Definition < ApplicationRecord
     self.table_name = "easy_flow_definitions"
 
+    has_public_code
+
     enum :status, { active: "active", hidden: "hidden", inactive: "inactive" }
     enum :kind, { scored: "scored", guide: "guide" }
     enum :persists, { unsaved: "unsaved", each_step: "each_step", on_finish: "on_finish" }

data/app/models/easy_flow/version.rb

@@ -2,6 +2,8 @@ module EasyFlow
   class Version < ApplicationRecord
     self.table_name = "easy_flow_versions"
 
+    has_public_code
+
     enum :status, { draft: "draft", live: "live", superseded: "superseded",
                     retired: "retired", withdrawn: "withdrawn" }
 

data/app/views/easy_flow/flows/complete.html.erb

@@ -1,6 +1,6 @@
 <% content_for(:title, "Complete") %>
 
-<% starting_over = flow_start_path(@guide.slug) %>
+<% starting_over = flow_start_path(flow_address(@guide.slug)) %>
 
 <%= ui_page(max_width: :md) do %>
   <%= ui_page_header(title: "That's everything", subtitle: "Thanks — here's what you told us") do |header| %>

data/app/views/easy_flow/flows/show.html.erb

@@ -6,11 +6,11 @@
   <%= ui_section do %>
     <div class="flex flex-wrap items-center gap-3">
       <% if @flow.each_step? && @flow.definition.present? && !previewing? %>
-        <%= ui_form(action: flow_routes.flow_runs_path(@flow.slug), method: :post) do %>
+        <%= ui_form(action: flow_routes.flow_runs_path(flow_address(@flow.slug)), method: :post) do %>
           <%= ui_button(label: @flow.start_label.presence || "Start", type: :submit) %>
         <% end %>
       <% else %>
-        <%= ui_button(label: @flow.start_label.presence || "Start", href: flow_step_path(@flow.slug)) %>
+        <%= ui_button(label: @flow.start_label.presence || "Start", href: flow_step_path(flow_address(@flow.slug))) %>
       <% end %>
     </div>
   <% end %>

data/app/views/easy_flow/flows/step.html.erb

@@ -1,7 +1,7 @@
 <% content_for(:title, @guide.headline) %>
 
 <%= ui_page(max_width: :md) do %>
-  <%= link_to "← Start over", flow_start_path(@guide.slug), class: "text-sm text-accent-600 hover:text-accent-700" %>
+  <%= link_to "← Start over", flow_start_path(flow_address(@guide.slug)), class: "text-sm text-accent-600 hover:text-accent-700" %>
 
   <div class="mt-6 mb-6">
     <%= ui_progress(value: @answers.size, max: [ @guide.steps_on_path(@answers).size, 1 ].max, label: "Question #{@answers.size + 1}") %>
@@ -14,7 +14,7 @@
   <% if @waiting %>
     <p class="ks-hint">Waiting for <%= @waiting %>.</p>
     <% if carries_answers? %>
-      <div class="mt-4"><%= ui_button(label: "Check again", href: "#{flow_step_path(@guide.slug)}?#{{ answers: @answers, completed_at: @progress.completed_at.transform_values(&:iso8601) }.to_query}", variant: :secondary) %></div>
+      <div class="mt-4"><%= ui_button(label: "Check again", href: "#{flow_step_path(flow_address(@guide.slug))}?#{{ answers: @answers, completed_at: @progress.completed_at.transform_values(&:iso8601) }.to_query}", variant: :secondary) %></div>
     <% end %>
   <% else %>
     <%= form_with url: step_form[:url], method: step_form[:method], multipart: true, data: { turbo: false } do %>

data/db/migrate/20261012210000_add_public_code_to_easy_flow_definitions.rb

@@ -0,0 +1,17 @@
+class AddPublicCodeToEasyFlowDefinitions < ActiveRecord::Migration[8.1]
+  class Record < ActiveRecord::Base
+    self.table_name = "easy_flow_definitions"
+  end
+
+  def up
+    add_column :easy_flow_definitions, :public_code, :string
+    Record.reset_column_information
+    Record.find_each { |record| record.update_columns(public_code: PublicCode.generate) }
+    change_column_null :easy_flow_definitions, :public_code, false
+    add_index :easy_flow_definitions, :public_code, unique: true
+  end
+
+  def down
+    remove_column :easy_flow_definitions, :public_code
+  end
+end

data/db/migrate/20261012210100_add_public_code_to_easy_flow_versions.rb

@@ -0,0 +1,17 @@
+class AddPublicCodeToEasyFlowVersions < ActiveRecord::Migration[8.1]
+  class Record < ActiveRecord::Base
+    self.table_name = "easy_flow_versions"
+  end
+
+  def up
+    add_column :easy_flow_versions, :public_code, :string
+    Record.reset_column_information
+    Record.find_each { |record| record.update_columns(public_code: PublicCode.generate) }
+    change_column_null :easy_flow_versions, :public_code, false
+    add_index :easy_flow_versions, :public_code, unique: true
+  end
+
+  def down
+    remove_column :easy_flow_versions, :public_code
+  end
+end

data/lib/easy_flow/host.rb

@@ -2,7 +2,7 @@ module EasyFlow
   class Host
     attr_reader :name
     attr_writer :layout, :admin_layout, :offers, :allowed_answers
-    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method, :owner_method
+    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method, :owner_method, :finds_flows_across_owners
 
     def initialize(name)
       @name = name.to_s

data/lib/easy_flow/version.rb

@@ -1,3 +1,3 @@
 module EasyFlow
-  VERSION = "0.23.0"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_flow
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - tylercschneider
@@ -166,6 +166,8 @@ files:
 - db/migrate/20261007120000_add_parent_run_to_easy_flow_runs.rb
 - db/migrate/20261011130000_keep_step_visits_whole_in_easy_flow_runs.rb
 - db/migrate/20261012200000_add_public_code_to_easy_flow_runs.rb
+- db/migrate/20261012210000_add_public_code_to_easy_flow_definitions.rb
+- db/migrate/20261012210100_add_public_code_to_easy_flow_versions.rb
 - lib/easy_flow.rb
 - lib/easy_flow/engine.rb
 - lib/easy_flow/host.rb