pageflow 0.11.4 → 12.0.0.rc1

data/app/state_machines/pageflow/encoded_file_state_machine.rb

@@ -74,5 +74,9 @@ module Pageflow
     def retryable?
       can_retry? && !encoded?
     end
+
+    def ready?
+      encoded?
+    end
   end
 end

data/app/state_machines/pageflow/image_file_state_machine.rb

@@ -17,7 +17,7 @@ module Pageflow
           transition 'processing_failed' => 'processing'
         end
 
-        job ProcessImageFileJob do
+        job ProcessFileJob do
           on_enter 'processing'
           result :ok => 'processed'
           result :error => 'processing_failed'
@@ -36,5 +36,9 @@ module Pageflow
     def retryable?
       processing_failed?
     end
+
+    def ready?
+      processed?
+    end
   end
 end

data/app/views/admin/entries/_attributes_table.html.arb

@@ -1,7 +1,21 @@
 attributes_table_for entry do
   row :title, :class => 'title'
-  if authorized?(:read, Pageflow::Account)
-    row :account, :class => 'account'
+  if authorized?(:see_own_role_on, :entries)
+    row :own_role do
+      own_role = Pageflow::Roles.high(current_user, entry)
+      membership_role_with_tooltip(own_role, scope: 'own_entry_role')
+    end
+  end
+  if authorized?(:see, :accounts)
+    row :account, :class => 'account' do
+      if authorized?(:read, entry.account)
+        link_to(entry.account.name,
+                admin_account_path(entry.account),
+                data: {id: entry.account.id})
+      else
+        entry.account.name
+      end
+    end
   end
   row :created_at
   row :edited_at
@@ -21,4 +35,9 @@ attributes_table_for entry do
   row :url do
     pretty_entry_url(entry)
   end
+  row :embed_code do
+    embed_code_field(embed_code_entry_snippet(entry),
+                     name: :entry_embed_code,
+                     hint: I18n.t('pageflow.admin.entries.embed_code_hint'))
+  end
 end

data/app/views/admin/entries/_links.html.arb

@@ -1,5 +1,5 @@
 para do
-  if authorized?(:edit, Pageflow::Entry)
+  if authorized?(:edit, entry)
     span(link_to(I18n.t('pageflow.admin.entries.editor'),
                  pageflow.edit_entry_path(entry),
                  class: 'editor icon_button button'))

data/app/views/admin/memberships/_entity_account_input.html.erb

@@ -0,0 +1,5 @@
+<%= f.input :entity,
+            label: I18n.t('activerecord.attributes.pageflow/membership.account'),
+            collection: membership_accounts_collection(parent, resource),
+            include_blank: false,
+            input_html: { disabled: !f.object.new_record? || parent_type == :account } %>

data/app/views/admin/memberships/_entity_entry_input.html.erb

@@ -0,0 +1,5 @@
+<%= f.input :entity,
+            label: I18n.t('activerecord.attributes.pageflow/membership.entry'),
+            input_html: { disabled: !f.object.new_record? || parent_type == :entry },
+            collection: membership_entries_collection(parent, resource),
+            include_blank: false %>

data/app/views/admin/memberships/_form.html.erb

@@ -1,11 +1,22 @@
 <%= admin_form_for [:admin, parent, resource] do |f| %>
   <%= f.inputs do %>
     <%= f.input :user,
-                :input_html => { :disabled => (parent_type == :user) },
-                :collection => membership_users_collection_for_parent(parent) %>
-    <%= f.input :entry,
-                :input_html => { :disabled => (parent_type == :entry) },
-                :collection => membership_entries_collection_for_parent(parent) %>
+                collection: membership_users_collection(parent, resource),
+                include_blank: false,
+                input_html: { disabled: !f.object.new_record? || parent_type == :user }%>
+    <% if params[:entity_type].to_sym == :entry %>
+      <%= render partial: 'admin/memberships/entity_entry_input', locals: {f: f} %>
+    <% else %>
+      <%= render partial: 'admin/memberships/entity_account_input', locals: {f: f} %>
+    <% end %>
+    <%= f.hidden_field :entity_type, value: "Pageflow::#{params[:entity_type].capitalize}" %>
+  <% end %>
+  <%= f.inputs do %>
+    <%= render partial: 'admin/memberships/role_hint' %>
+    <%= f.input :role,
+                collection: membership_roles_collection("Pageflow::#{params[:entity_type]
+                                                          .capitalize}"),
+                                                          include_blank: false %>
   <% end %>
   <%= f.actions do %>
     <%= f.action(:submit) %>

data/app/views/admin/memberships/_role_hint.html.arb

@@ -0,0 +1,2 @@
+li(para(t("pageflow.admin.memberships.on_#{params[:entity_type]}.role.hint_html")),
+   class: 'side_hint')

data/app/views/admin/users/_form.html.erb

@@ -1,26 +1,35 @@
-<% if @user.new_record? && Pageflow.config.quotas.get(:users, @user.account).exhausted? %>
-  <%= render 'admin/users/quota_exhausted' %>
-<% else %>
-  <%= admin_form_for([:admin, @user.becomes(User)]) do |f| %>
-    <%= f.inputs "Details" do %>
-      <% if @user.new_record? %>
-        <%= quota_state_description(:users, @user.account) %>
+<%= admin_form_for([:admin, @user.becomes(User)]) do |f| %>
+  <%= f.inputs "Details" do %>
+    <% if @user.new_record? %>
+      <% Pageflow::AccountPolicy::Scope
+           .new(current_user, Pageflow::Account).member_addable.each do |account| %>
+        <%= quota_state_description(:users, account) %>
       <% end %>
+    <% end %>
 
-      <%= f.input :email, :hint => f.object.new_record? && I18n.t('pageflow.admin.users.email_invitation_hint') %>
-      <%= f.input :first_name %>
-      <%= f.input :last_name %>
-      <%= f.input :locale,
-                  as: :select,
-                  include_blank: false,
-                  collection: available_locales_collection %>
-
-      <% if authorized?(:read, Pageflow::Account) %>
-        <%= f.input :account, :include_blank => false %>
-      <% end %>
+    <%= f.input :email, hint: f.object.new_record? &&
+                                I18n.t('pageflow.admin.users.email_invitation_hint') %>
+    <%= f.input :first_name %>
+    <%= f.input :last_name %>
+    <%= f.input :locale,
+                as: :select,
+                include_blank: false,
+                collection: available_locales_collection %>
 
-      <%= f.input :role, :collection => collection_for_user_roles, :include_blank => false, :hint => authorized?(:read, Pageflow::Account) ? I18n.t('pageflow.admin.users.role_hint.admin') : I18n.t('pageflow.admin.users.role_hint.others') %>
+    <% if Pageflow::AccountPolicy::Scope
+        .new(current_user, Pageflow::Account).member_addable.any? && @user.new_record? %>
+      <%= f.input :initial_account,
+                  collection: membership_accounts_collection(@user,
+                                                             Pageflow::Membership.new(user: @user)),
+                  include_blank: false,
+                  selected: (params[:user][:initial_account] if params[:user].present?) %>
+      <%= f.input :initial_role,
+                  collection: membership_roles_collection('Pageflow::Account'),
+                  include_blank: false,
+                  hint: t('pageflow.admin.memberships.on_account.role.hint_html'),
+                  selected: (params[:user][:initial_role] if params[:user].present?) %>
     <% end %>
-    <%= f.actions %>
+    <%= f.input :admin if authorized?(:set_admin, current_user) %>
   <% end %>
+  <%= f.actions %>
 <% end %>

data/app/views/components/pageflow/admin/add_membership_button_if_needed.rb

@@ -0,0 +1,62 @@
+module Pageflow
+  module Admin
+    class AddMembershipButtonIfNeeded < ViewComponent
+      builder_method :add_membership_button_if_needed
+
+      def build(user, parent, entity_type)
+        if parent.is_a?(User)
+          button_label = I18n.t("pageflow.admin.#{entity_type}.add")
+          path = new_admin_user_membership_path(parent, entity_type: entity_type.to_sym)
+          data_tooltip = I18n.t("pageflow.admin.#{entity_type}.none_addable_tooltip")
+          rel = "add_#{entity_type}_membership"
+        elsif parent.is_a?(Entry)
+          path = new_admin_entry_membership_path(parent, entity_type: entity_type.to_sym)
+        else
+          path = new_admin_account_membership_path(parent, entity_type: entity_type.to_sym)
+        end
+
+        unless parent.is_a?(User)
+          button_label = I18n.t('pageflow.admin.users.add')
+          data_tooltip = I18n.t('pageflow.admin.user.none_addable_tooltip')
+          rel = 'add_member'
+        end
+
+        if membership_possible_for(user, parent, entity_type)
+          para do
+            link_to(button_label, path, class: 'button', data: {rel: rel})
+          end
+        else
+          para(content_tag('a',
+                           button_label,
+                           class: 'button disabled',
+                           data: {rel: rel}),
+               'data-tooltip' => data_tooltip)
+        end
+      end
+
+      private
+
+      def membership_possible_for(user, parent, entity_type)
+        entity_type == 'entry' && entry_membership_possible_for_creator_and(user, parent) ||
+          entity_type == 'account' && account_membership_possible_for_creator_and(user, parent)
+      end
+
+      def entry_membership_possible_for_creator_and(user, parent)
+        Pageflow::EntryPolicy::Scope.new(user, Pageflow::Entry).member_addable &&
+          ((parent.is_a?(User) &&
+            !membership_entries_collection(parent, Pageflow::Membership.new(user: parent))
+              .blank?) ||
+           (parent.is_a?(Entry) &&
+            !membership_users_collection(parent, Membership.new(entity: parent)).blank?))
+      end
+
+      def account_membership_possible_for_creator_and(user, parent)
+        Pageflow::AccountPolicy::Scope.new(user, Pageflow::Account).member_addable &&
+          ((parent.is_a?(User) &&
+            !membership_accounts_collection(user, Pageflow::Membership.new(user: user)).blank?) ||
+           (parent.is_a?(Account) &&
+            !membership_users_collection(parent, Membership.new(entity: parent)).blank?))
+      end
+    end
+  end
+end

data/app/views/components/pageflow/admin/embed_code_field.rb

@@ -0,0 +1,15 @@
+module Pageflow
+  module Admin
+    class EmbedCodeField < Pageflow::ViewComponent
+      builder_method :embed_code_field
+
+      def build(snippet, options = {})
+        super(class: 'embed_code')
+        text_node(text_field_tag(options.fetch(:name),
+                                 snippet.call,
+                                 onclick: '$(this).select()'))
+        para(options[:hint])
+      end
+    end
+  end
+end

data/app/views/components/pageflow/admin/entry_user_badge_list.rb

@@ -4,20 +4,28 @@ module Pageflow
       builder_method :entry_user_badge_list
 
       def build(entry)
-        ul :class => 'user_badge_list' do
-          entry.users.each do |user|
-            build_badge(user)
+        ul class: 'badge_list' do
+          entry.memberships.each do |membership|
+            build_badge(membership)
           end
         end
       end
 
       private
 
-      def build_badge(user)
+      def build_badge(membership)
         li do
-          span(user_initials(user), :class => 'initials')
-          div :class => 'tooltip' do
-            link_to(user.full_name, admin_user_path(user))
+          span(user_initials(membership.user), class: 'abbreviation')
+          div class: 'tooltip' do
+            role_string =
+              " (#{I18n.t(membership.role, scope: 'activerecord.values.pageflow/membership.role')})"
+            if authorized?(:read, membership.user)
+              link_to(membership.user.full_name, admin_user_path(membership.user)) + role_string
+            else
+              span class: 'name' do
+                membership.user.full_name + role_string
+              end
+            end
           end
         end
       end

data/app/views/components/pageflow/admin/grouped_folder_list.rb

@@ -23,22 +23,22 @@ module Pageflow
       private
 
       def build_all_link
-        ul(:class => 'folders') do
+        ul(class: 'folders') do
           li('data-role' => 'all') do
             if @active_id
-              link_to(t('pageflow.admin.folders.all'), main_app.admin_entries_path, :class => 'name')
+              link_to(t('pageflow.admin.folders.all'), main_app.admin_entries_path, class: 'name')
             else
-              span(t('pageflow.admin.folders.all'), :class => 'name')
+              span(t('pageflow.admin.folders.all'), class: 'name')
             end
           end
         end
       end
 
       def build_folder_list_grouped_by_accounts
-        ul(:class => 'accounts') do
+        ul(class: 'accounts') do
           folder_accounts.each do |account|
             li('data-id' => account.id) do
-              h4(account.name)
+              h4(account.name, class: 'account-name')
               build_folder_list(folders_by_account(account))
             end
           end
@@ -46,37 +46,41 @@ module Pageflow
       end
 
       def build_folder_list(folders)
-        ul(:class => 'folders') do
+        ul(class: 'folders') do
           folders.each do |folder|
             li('data-id' => folder.id) do
               text_node(link_to_folder(folder))
-              text_node(edit_folder_link(folder))
-              text_node(delete_folder_link(folder))
+              text_node(edit_folder_link(folder)) if authorized?(:configure_folder_on,
+                                                                 folder.account)
+              text_node(delete_folder_link(folder)) if authorized?(:configure_folder_on,
+                                                                   folder.account)
             end
           end
         end
       end
 
       def link_to_folder(folder)
-        link_to_unless(folder.id == @active_id.to_i, folder.name, main_app.admin_entries_path(:folder_id => folder), :class => 'name') do
-          span(folder.name, :Class => 'name')
+        link_to_unless(folder.id == @active_id.to_i,
+                       folder.name,
+                       main_app.admin_entries_path(folder_id: folder), class: 'name') do
+          span(folder.name, Class: 'name')
         end
       end
 
       def edit_folder_link(folder)
         link_to(t('pageflow.admin.folders.edit'),
                 main_app.edit_admin_folder_path(folder),
-                :title => t('pageflow.admin.folders.edit'),
-                :class => 'edit_folder')
+                title: t('pageflow.admin.folders.edit'),
+                class: 'edit_folder')
       end
 
       def delete_folder_link(folder)
         link_to(t('pageflow.admin.folders.destroy'),
                 main_app.admin_folder_path(folder),
-                :method => :delete,
-                :title => t('pageflow.admin.folders.destroy'),
-                :class => 'delete',
-                :data => {:confirm => t('pageflow.admin.folders.confirm_destroy')})
+                method: :delete,
+                title: t('pageflow.admin.folders.destroy'),
+                class: 'delete',
+                data: {confirm: t('pageflow.admin.folders.confirm_destroy')})
       end
 
       def folders_by_account(account)

data/app/views/components/pageflow/admin/members_tab.rb

@@ -6,35 +6,46 @@ module Pageflow
                              blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
           table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
             column :user, sortable: 'users.last_name', class: 'name' do |membership|
-              if authorized? :manage, User
+              if authorized? :read, membership.user
                 link_to(membership.user.formal_name, admin_user_path(membership.user),
                         class: 'view_creator')
               else
                 membership.user.full_name
               end
             end
+            column :role,
+                   sortable: 'pageflow_memberships.role',
+                   title: I18n.t('activerecord.attributes.pageflow/membership.role') do |membership|
+              membership_role_with_tooltip(membership.role, scope: 'entries')
+            end
             column :created_at, sortable: 'pageflow_memberships.created_at'
+            column do |membership|
+              if authorized?(:update, membership)
+                link_to(I18n.t('pageflow.admin.users.edit_role'),
+                        edit_admin_entry_membership_path(entry,
+                                                         membership,
+                                                         entity_type: :entry),
+                        data: {
+                          rel: "edit_entry_membership_#{membership.role}"
+                        })
+              end
+            end
             column do |membership|
               if authorized?(:destroy, membership)
                 link_to(I18n.t('pageflow.admin.entries.remove'),
-                        admin_entry_membership_path(membership.entry, membership),
+                        admin_entry_membership_path(membership.entity, membership),
                         method: :delete,
                         data: {
                           confirm: I18n.t('active_admin.delete_confirmation'),
-                          rel: 'delete_membership'
+                          rel: "delete_membership_#{membership.role}"
                         })
               end
             end
           end
         end
-
-        if authorized? :manage, Pageflow::Entry
-          span do
-            link_to(I18n.t('pageflow.admin.users.add'),
-                    new_admin_entry_membership_path(entry),
-                    class: 'button',
-                    data: {rel: 'add_member'})
-          end
+        para text_node I18n.t('pageflow.admin.resource_tabs.account_editor_hint')
+        if authorized?(:add_member_to, entry)
+          add_membership_button_if_needed(current_user, entry, 'entry')
         end
       end
     end

data/app/views/components/pageflow/admin/membership_role_with_tooltip.rb

@@ -0,0 +1,21 @@
+module Pageflow
+  module Admin
+    class MembershipRoleWithTooltip < ViewComponent
+      builder_method :membership_role_with_tooltip
+
+      def build(role, options = {})
+        span t(role, scope: 'activerecord.values.pageflow/membership.role'),
+        class: "membership_role #{role} tooltip_clue" do
+          div t(role, scope: tooltip_scope(options)),
+          class: 'tooltip_bubble'
+        end
+      end
+
+      private
+
+      def tooltip_scope(options)
+        "pageflow.admin.users.roles.#{options[:scope]}.tooltip"
+      end
+    end
+  end
+end