easy_flow 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d808d59c87ec6f8b6eee1e9032bdab397bf4df8035e6248f24f1d404db59b8bb
-  data.tar.gz: ad2551396fcf8348fb87270287e31d29780514374877735e31fc50ffe8c63d77
+  metadata.gz: e8b63728127549bbca04e9dd1ef8930a0f124c24b99b40f5eb8fcb2e1ab46071
+  data.tar.gz: e3ca65e0a6d5d094f9552d76d41d0357bb8ee623b61163a5fc14efec3f0ccf3e
 SHA512:
-  metadata.gz: 7d0a900d84901dab3444fc04eb9bd84cf12cad6d4eaa463d11c3ecb72e904f02ad48be7882e50965b275c920e7134023f298224c56f679b0f903fa74b8189271
-  data.tar.gz: 6c8b9bf2f4c7aa3581d9b445ce01ba203646e8023a7107266d6d6ab8e94e536b29c2af38ff0b4dd415745d80160da5a9c2906680f227f9674a21665edece86aa
+  metadata.gz: 0fd4374064f2b229ca0b5efa3de4531a30da99fa2707f9875aebcc9294934e499d49dcd60675e4f7dbf678ec69fe48412f3d947b9b6852afc55a2339c5451a52
+  data.tar.gz: 17f7ce19456a3df5796436692373c3e2357f5a8473ee450414b826f2a0ff9df23bda54fb7cf3ccb69f73f4124c8bdf7d91113641378bf310d518065377dd695e

data/app/controllers/concerns/easy_flow/hosted.rb

@@ -17,5 +17,11 @@ module EasyFlow
     def flow_host
       @flow_host ||= EasyFlow.host_named(self.class.named_flow_host || request.path_parameters[:easy_flow_host])
     end
+
+    def hosted_flows
+      return flow_host.flows unless flow_host.owner_method
+
+      flow_host.flows.where(owner: send(flow_host.owner_method))
+    end
   end
 end

data/app/controllers/easy_flow/flows_controller.rb

@@ -91,13 +91,13 @@ module EasyFlow
     end
 
     def admitted_run
-      found = Run.where(flow: flow_host.flows).find(params[:id])
+      found = Run.where(flow: hosted_flows).find(params[:id])
 
       Admission.of_run(found, permitted: permitted?(found.flow))
     end
 
     def flow
-      @stored_flow ||= admit(flow_host.flows.find_by(slug: params[:slug]))
+      @stored_flow ||= admit(hosted_flows.find_by(slug: params[:slug]))
     end
 
     def flowing_definition(flow)

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

@@ -83,7 +83,7 @@ module EasyFlow
       end
 
       def flow
-        @flow ||= flow_host.flows.find(params[:flow_id])
+        @flow ||= hosted_flows.find(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 = flow_host.flows.find(params[:flow_id])
+        @flow = hosted_flows.find(params[:flow_id])
       end
 
       def update
-        @flow = flow_host.flows.find(params[:flow_id])
+        @flow = hosted_flows.find(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

@@ -6,41 +6,44 @@ module EasyFlow
         @flows = ordered_flows
       end
 
+      def new
+        @flow = hosted_flows.new
+      end
+
       def create
-        @flow = flow_host.flows.new(create_params)
+        @flow = hosted_flows.new(create_params)
 
         if @flow.save
           redirect_to manage_flow_path(@flow), notice: "Flow created."
         else
-          @flows = ordered_flows
-          render :index, status: :unprocessable_entity
+          render :new, status: :unprocessable_entity
         end
       end
 
       def show
-        @flow = flow_host.flows.find(params[:id])
+        @flow = hosted_flows.find(params[:id])
         @canvas = canvas_payload(@flow)
       end
 
       def edit
-        @flow = flow_host.flows.find(params[:id])
+        @flow = hosted_flows.find(params[:id])
       end
 
       def update
-        @flow = flow_host.flows.find(params[:id])
+        @flow = hosted_flows.find(params[:id])
         @flow.update!(flow_params)
         redirect_to manage_flow_path(@flow), notice: "Saved."
       end
 
       def destroy
-        flow_host.flows.find(params[:id]).destroy!
+        hosted_flows.find(params[:id]).destroy!
         redirect_to manage_flows_path, notice: "Flow removed."
       end
 
       private
 
       def ordered_flows
-        flow_host.flows.order(:slug)
+        hosted_flows.order(:slug)
       end
 
       def create_params

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

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

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

@@ -15,7 +15,7 @@ module EasyFlow
       private
 
       def flow
-        @flow ||= flow_host.flows.find(params[:flow_id])
+        @flow ||= hosted_flows.find(params[:flow_id])
       end
     end
   end

data/app/models/easy_flow/definition.rb

@@ -6,6 +6,8 @@ module EasyFlow
     enum :kind, { scored: "scored", guide: "guide" }
     enum :persists, { unsaved: "unsaved", each_step: "each_step", on_finish: "on_finish" }
 
+    belongs_to :owner, polymorphic: true, optional: true
+
     validates :host, :slug, presence: true
 
     after_initialize :begin_the_flow, if: :new_record?
@@ -18,7 +20,7 @@ module EasyFlow
     has_many :definition_versions, class_name: "EasyFlow::Version", foreign_key: :flow_id, dependent: :destroy
 
     def self.upsert_definition(definition, host:)
-      find_or_initialize_by(host: host, slug: definition["slug"]).tap do |flow|
+      find_or_initialize_by(host: host, owner: nil, slug: definition["slug"]).tap do |flow|
         flow.save!
         flow.record_definition(definition) unless flow.definition == definition
       end

data/app/views/easy_flow/manage/flows/index.html.erb

@@ -1,5 +1,9 @@
 <%= ui_page(max_width: :xl) do %>
-  <%= ui_page_header(title: "Flows", subtitle: "Build and edit your flows") %>
+  <%= ui_page_header(title: "Flows", subtitle: "Build and edit your flows") do |header| %>
+    <% header.action do %>
+      <%= ui_button(label: "Create", href: flow_routes.new_manage_flow_path) %>
+    <% end %>
+  <% end %>
 
   <%= ui_data_table(
     items: @flows,
@@ -13,20 +17,4 @@
       <% end %>
     <% end %>
   <% end %>
-
-  <%= ui_section(title: "Create a flow") do %>
-    <% if @flow&.errors&.any? %>
-      <%= ui_alert(message: @flow.errors.full_messages.to_sentence, type: :error) %>
-    <% end %>
-
-    <%= ui_form(action: flow_routes.manage_flows_path, method: :post) do %>
-      <label class="block text-sm font-medium mb-1">Slug</label>
-      <%= ui_input(name: "flow[slug]", placeholder: "e.g. business-scorecard") %>
-
-      <label class="block text-sm font-medium mb-1 mt-4">Kind</label>
-      <%= ui_select(name: "flow[kind]", options: [ [ "Scored", "scored" ], [ "Guide", "guide" ] ]) %>
-
-      <%= ui_button(label: "Create", type: :submit, variant: :secondary) %>
-    <% end %>
-  <% end %>
 <% end %>

data/app/views/easy_flow/manage/flows/new.html.erb

@@ -0,0 +1,17 @@
+<%= ui_page(max_width: :md) do %>
+  <%= ui_page_header(title: "New flow") %>
+
+  <% if @flow.errors.any? %>
+    <%= ui_alert(message: @flow.errors.full_messages.to_sentence, type: :error) %>
+  <% end %>
+
+  <%= ui_form(action: flow_routes.manage_flows_path, method: :post) do %>
+    <label class="block text-sm font-medium mb-1">Slug</label>
+    <%= ui_input(name: "flow[slug]", value: @flow.slug, placeholder: "e.g. business-scorecard") %>
+
+    <label class="block text-sm font-medium mb-1 mt-4">Kind</label>
+    <%= ui_select(name: "flow[kind]", options: [ [ "Scored", "scored" ], [ "Guide", "guide" ] ], selected: @flow.kind) %>
+
+    <%= ui_button(label: "Create", type: :submit) %>
+  <% end %>
+<% end %>

data/config/routes.rb

@@ -1,6 +1,6 @@
 EasyFlow::Engine.routes.draw do
   namespace :manage do
-    resources :flows, only: [ :index, :create, :show, :edit, :update, :destroy ] do
+    resources :flows, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
       resource :definition, only: [ :edit, :update ]
       resource :preview, only: :show, controller: "previews" do
         get :step

data/db/migrate/20261001120000_add_owner_to_easy_flow_definitions.rb

@@ -0,0 +1,10 @@
+class AddOwnerToEasyFlowDefinitions < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :easy_flow_definitions, :owner, polymorphic: true, index: false
+    remove_index :easy_flow_definitions, [ :host, :slug ], unique: true, name: "index_easy_flow_definitions_on_host_and_slug"
+    add_index :easy_flow_definitions, [ :host, :slug ], unique: true, where: "owner_id IS NULL",
+      name: "index_easy_flow_definitions_on_host_and_slug"
+    add_index :easy_flow_definitions, [ :host, :owner_type, :owner_id, :slug ], unique: true, where: "owner_id IS NOT NULL",
+      name: "index_easy_flow_definitions_on_host_owner_and_slug"
+  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
-    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method
+    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method, :owner_method
 
     def initialize(name)
       @name = name.to_s

data/lib/easy_flow/version.rb

@@ -1,3 +1,3 @@
 module EasyFlow
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_flow
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - tylercschneider
@@ -127,6 +127,7 @@ files:
 - app/views/easy_flow/manage/definitions/edit.html.erb
 - app/views/easy_flow/manage/flows/edit.html.erb
 - app/views/easy_flow/manage/flows/index.html.erb
+- app/views/easy_flow/manage/flows/new.html.erb
 - app/views/easy_flow/manage/flows/show.html.erb
 - app/views/easy_flow/manage/versions/index.html.erb
 - app/views/easy_flow/steps/_choosing.html.erb
@@ -137,6 +138,7 @@ files:
 - db/migrate/20260924120100_create_easy_flow_versions.rb
 - db/migrate/20260924120200_create_easy_flow_runs.rb
 - db/migrate/20260924130000_add_host_to_easy_flow_definitions.rb
+- db/migrate/20261001120000_add_owner_to_easy_flow_definitions.rb
 - lib/easy_flow.rb
 - lib/easy_flow/engine.rb
 - lib/easy_flow/host.rb