easy_flow 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a016478b5c039fb2f7400893c890980fd1c66f52b835f61be7a3a68061a71d
-  data.tar.gz: c8c747889382a26e6c2d340b330f45a802932bac768da695845e697df722848c
+  metadata.gz: '09da0c518d71ed06c4d63399b2038696d15c770ee0706926bad55f81a3a58a34'
+  data.tar.gz: 68642f79f5418b7db09b3a7274948f8480f7519ca4224546b23bdb94e6e7db0d
 SHA512:
-  metadata.gz: 4a42a48255633d247401da16dfb668d0c774c90e0f8a70df7bef426c6a7f5d59f674837337177856c3d7a0e7106993077d1038fbfe2bc0c6953a8624930a45bf
-  data.tar.gz: 4bd045161d5eb15f7ed880df701d6ed7e5016a408fea9da21d98bc4234776b585c12099dcf9224d70a1003252bb12c6db69a38ffff45001d7f6e4898bd356c8d
+  metadata.gz: 2ae172d8e8851e18042c80217e2163f1e4b3cf829f556c2936ee41f353340b05eea8225d0fc3cd412186adb9c662f36380cbca51b1ef259455ea44e1ea5467f6
+  data.tar.gz: 5069ecd19aafa80210158466d6819233b1485bc6820f4d1f259ebcdb0c067b1fafa94ab72be84210d32acbc0c510d7e8c115cb303c0e304f17d87cbeb3587233

data/app/controllers/easy_flow/application_controller.rb

@@ -4,14 +4,24 @@ module EasyFlow
 
     layout -> { flow_host.layout }
     helper KeystoneUiHelper
+    helper AppRoutesHelper
+
+    before_action { AppRoutesHelper.define_app_route_helpers }
 
     rescue_from NotPublished, NotPermitted, Withdrawn, with: :refuse
 
     helper_method :flow_start_path, :flow_routes
 
+    class_attribute :host_route_prefix, instance_accessor: false
+
+    def self.routed_by(prefix)
+      self.host_route_prefix = prefix
+    end
+
     private
 
     def flow_routes
+      return HostRoutes.new(main_app, self.class.host_route_prefix) if self.class.host_route_prefix
       return easy_flow unless request.routes.equal?(EasyFlow::Engine.routes)
 
       @flow_routes ||= ActionDispatch::Routing::RoutesProxy.new(_routes, self, _routes.url_helpers)

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

@@ -13,10 +13,18 @@ module EasyFlow
 
       helper KeystoneUiHelper
       helper KeystoneUi::React::MountHelper
-      helper EasyFlow::Engine.routes.url_helpers
+      helper AppRoutesHelper
+
+      before_action { AppRoutesHelper.define_app_route_helpers }
+
+      helper_method :flow_routes
 
       private
 
+      def flow_routes
+        @flow_routes ||= ActionDispatch::Routing::RoutesProxy.new(_routes, self, _routes.url_helpers)
+      end
+
       def refuse_a_host_not_set_up
         head :not_found unless flow_host.set_up?
       end

data/app/helpers/easy_flow/app_routes_helper.rb

@@ -0,0 +1,12 @@
+module EasyFlow
+  module AppRoutesHelper
+    def self.define_app_route_helpers
+      @app_route_helpers_defined ||= begin
+        (Rails.application.routes.named_routes.helper_names - EasyFlow::Engine.routes.named_routes.helper_names).each do |name|
+          define_method(name) { |*args, **options| main_app.public_send(name, *args, **options) }
+        end
+        true
+      end
+    end
+  end
+end

data/app/views/easy_flow/manage/definitions/edit.html.erb

@@ -1,11 +1,11 @@
 <%= ui_page(max_width: :lg) do %>
   <p class="mb-4">
-    <%= link_to "← Back to the flow", manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
+    <%= link_to "← Back to the flow", flow_routes.manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
   </p>
 
-  <%= ui_form_page(title: "Definition", back_url: manage_flow_path(@flow), subtitle: @flow.slug) %>
+  <%= ui_form_page(title: "Definition", back_url: flow_routes.manage_flow_path(@flow), subtitle: @flow.slug) %>
 
-  <%= ui_form(action: manage_flow_definition_path(@flow), method: :patch) do %>
+  <%= ui_form(action: flow_routes.manage_flow_definition_path(@flow), method: :patch) do %>
     <%= ui_textarea(name: "definition", value: JSON.pretty_generate(@flow.document), rows: 30) %>
 
     <%= ui_button(label: "Save", type: :submit) %>

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

@@ -1,11 +1,11 @@
 <%= ui_page(max_width: :lg) do %>
   <p class="mb-4">
-    <%= link_to "← Back to the flow", manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
+    <%= link_to "← Back to the flow", flow_routes.manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
   </p>
 
-  <%= ui_form_page(title: "Edit details", back_url: manage_flow_path(@flow)) %>
+  <%= ui_form_page(title: "Edit details", back_url: flow_routes.manage_flow_path(@flow)) %>
 
-  <%= ui_form(action: manage_flow_path(@flow), method: :patch) do %>
+  <%= ui_form(action: flow_routes.manage_flow_path(@flow), method: :patch) do %>
     <%= ui_section(title: "How this is introduced") do %>
       <label class="block text-sm font-medium mb-1">Title</label>
       <%= ui_input(name: "flow[title]", value: @flow.title) %>

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

@@ -6,9 +6,9 @@
     columns: [ { title: "Title" }, { slug: "Slug" }, { kind: "Kind" }, { status: "Status" } ],
     empty_message: "No flows yet."
   ) do |table| %>
-    <% table.link(:title) { |flow| manage_flow_path(flow) } %>
+    <% table.link(:title) { |flow| flow_routes.manage_flow_path(flow) } %>
     <% table.actions do |flow| %>
-      <%= ui_form(action: manage_flow_path(flow), method: :delete) do %>
+      <%= ui_form(action: flow_routes.manage_flow_path(flow), method: :delete) do %>
         <%= ui_button(label: "Remove", type: :submit, variant: :secondary) %>
       <% end %>
     <% end %>
@@ -19,7 +19,7 @@
       <%= ui_alert(message: @flow.errors.full_messages.to_sentence, type: :error) %>
     <% end %>
 
-    <%= ui_form(action: manage_flows_path, method: :post) do %>
+    <%= 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") %>
 

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

@@ -14,13 +14,13 @@
               onclick="document.dispatchEvent(new CustomEvent('easy_flow:open-flow'))"
               class="inline-flex items-center justify-center font-semibold rounded-lg border-0 cursor-pointer bg-accent-600 text-white hover:bg-accent-700 text-base px-4 py-2">This flow</button>
 
-      <%= ui_button(label: "Try it", href: manage_flow_preview_path(@flow), variant: :secondary) %>
+      <%= ui_button(label: "Try it", href: flow_routes.manage_flow_preview_path(@flow), variant: :secondary) %>
 
-      <%= ui_button(label: "All flows", href: manage_flows_path, variant: :secondary) %>
+      <%= ui_button(label: "All flows", href: flow_routes.manage_flows_path, variant: :secondary) %>
     </div>
   </header>
 
-  <%= react_ui("easy_flow/flow-editor", { base: manage_flow_canvas_path(@flow), token: form_authenticity_token, initial: @canvas },
+  <%= react_ui("easy_flow/flow-editor", { base: flow_routes.manage_flow_canvas_path(@flow), token: form_authenticity_token, initial: @canvas },
                class: "min-h-0 flex-1",
                data: { flow_canvas: true }) %>
 </div>

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

@@ -1,6 +1,6 @@
 <%= ui_page(max_width: :lg) do %>
   <p class="mb-4">
-    <%= link_to "← Back to the flow", manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
+    <%= link_to "← Back to the flow", flow_routes.manage_flow_path(@flow), class: "text-sm text-accent-600 hover:text-accent-700" %>
   </p>
 
   <%= ui_page_header(title: "History", subtitle: @flow.title.presence || @flow.slug) %>
@@ -30,7 +30,7 @@
 
           <% unless version == @versions.first %>
             <%= button_to "Return the flow to this version",
-                  return_manage_flow_version_path(@flow, version),
+                  flow_routes.return_manage_flow_version_path(@flow, version),
                   form: { data: { turbo: false } }, data: { return: true },
                   class: "mt-3 inline-flex items-center rounded-lg border border-gray-300 bg-white px-3 py-1.5 text-sm text-gray-900 hover:bg-gray-50 cursor-pointer" %>
           <% end %>

data/lib/easy_flow/host_routes.rb

@@ -0,0 +1,14 @@
+module EasyFlow
+  class HostRoutes
+    NAMES = %i[flow_path flow_runs_path flow_step_path run_path].freeze
+
+    def initialize(routes, prefix)
+      @routes = routes
+      @prefix = prefix
+    end
+
+    NAMES.each do |name|
+      define_method(name) { |*args, **options| @routes.public_send(:"#{@prefix}_#{name}", *args, **options) }
+    end
+  end
+end

data/lib/easy_flow/version.rb

@@ -1,3 +1,3 @@
 module EasyFlow
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/lib/easy_flow.rb

@@ -2,6 +2,7 @@ require "json"
 require "easy_flow/version"
 require "easy_flow/host"
 require "easy_flow/unset_host"
+require "easy_flow/host_routes"
 require "easy_flow/engine"
 
 module EasyFlow

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_flow
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - tylercschneider
@@ -61,6 +61,7 @@ files:
 - app/controllers/easy_flow/manage/flows_controller.rb
 - app/controllers/easy_flow/manage/previews_controller.rb
 - app/controllers/easy_flow/manage/versions_controller.rb
+- app/helpers/easy_flow/app_routes_helper.rb
 - app/javascript/easy_flow/canvas.jsx
 - app/javascript/easy_flow/canvas/Canvas.jsx
 - app/javascript/easy_flow/canvas/Connector.jsx
@@ -136,6 +137,7 @@ files:
 - lib/easy_flow.rb
 - lib/easy_flow/engine.rb
 - lib/easy_flow/host.rb
+- lib/easy_flow/host_routes.rb
 - lib/easy_flow/unset_host.rb
 - lib/easy_flow/version.rb
 homepage: https://github.com/DYB-Development/easy_flow