pageflow 0.11.4 → 12.0.0.rc1

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

@@ -20,22 +20,22 @@ module Pageflow
       def filter_tabs(tabs)
         return tabs unless options[:authorize]
 
-        tabs.select do |tab_options|
-          authorized?(:view, tab_options[:component])
+        tabs.select do |tab|
+          authorized?(options[:authorize], tab)
         end
       end
 
       def build_tab_list
         ul(class: 'tabs') do
-          tabs.each do |tab_options|
-            build_tab_item(tab_options)
+          tabs.each do |tab|
+            build_tab_item(tab)
           end
         end
       end
 
-      def build_tab_item(tab_options)
-        li(class: tab_class(tab_options[:name])) do
-          link_to(t(tab_options[:name], scope: options[:i18n]), tab_href(tab_options[:name]))
+      def build_tab_item(tab)
+        li(class: tab_class(tab.name)) do
+          link_to(t(tab.name, scope: options[:i18n]), tab_href(tab.name))
         end
       end
 
@@ -46,14 +46,14 @@ module Pageflow
       end
 
       def build_tab_containers
-        tabs.each do |tab_options|
-          build_tab_container(tab_options)
+        tabs.each do |tab|
+          build_tab_container(tab)
         end
       end
 
-      def build_tab_container(tab_options)
-        div(class: tab_container_class(tab_options[:name])) do
-          insert_tag(tab_options[:component], *options.fetch(:build_args, []))
+      def build_tab_container(tab)
+        div(class: tab_container_class(tab.name)) do
+          insert_tag(tab.component, *options.fetch(:build_args, []))
         end
       end
 
@@ -79,7 +79,7 @@ module Pageflow
       def current_tab_name
         options[:current_tab] ||
           request.params[:tab] ||
-          tabs.first[:name]
+          tabs.first.name
       end
     end
   end

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

@@ -0,0 +1,43 @@
+module Pageflow
+  module Admin
+    class UserAccountBadgeList < ViewComponent
+      builder_method :user_account_badge_list
+
+      def build(user)
+        ul class: 'badge_list' do
+          user.account_memberships.each do |membership|
+            if authorized?(:see_badge_belonging_to, membership.entity)
+              build_badge(membership)
+            end
+          end
+
+          build_admin_badge if user.admin?
+        end
+      end
+
+      private
+
+      def build_badge(membership)
+        li do
+          if authorized?(:read, membership.entity)
+            account_name_display = span(link_to(membership.entity.name,
+                                                main_app.admin_account_path(membership.entity)),
+                                        class: 'abbreviation')
+            div class: 'tooltip' do
+              account_name_display +
+                " (#{I18n.t(membership.role, scope: 'activerecord.values.pageflow/membership.role')})"
+            end
+          else
+            span(membership.entity.name, class: 'abbreviation')
+          end
+        end
+      end
+
+      def build_admin_badge
+        li do
+          span(I18n.t('pageflow.admin.users.roles.admin'), class: 'abbreviation')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Pageflow
+  module Admin
+    class UserAccountsTab < ViewComponent
+      def build(user)
+        embedded_index_table(user.memberships.on_accounts.includes(:account)
+                              .accessible_by(current_ability, :index),
+                             blank_slate_text: t('pageflow.admin.users.no_accounts')) do
+          table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
+            column :account, sortable: 'pageflow_accounts.name' do |membership|
+              if authorized?(:read, membership.entity)
+                link_to(membership.entity.name, admin_account_path(membership.entity))
+              else
+                membership.entity.name
+              end
+            end
+            column :role, sortable: 'pageflow_memberships.role' do |membership|
+              membership_role_with_tooltip(membership.role, scope: 'accounts')
+            end
+            column :created_at, sortable: 'pageflow_memberships.created_at'
+            column do |membership|
+              if authorized?(:update, membership)
+                link_to(t('pageflow.admin.users.edit_role'),
+                        edit_admin_user_membership_path(user, membership, entity_type: :account),
+                        data: {
+                          rel: "edit_account_role_#{membership.role}"
+                        })
+              end
+            end
+            column do |membership|
+              if authorized?(:destroy, membership)
+                link_to(t('pageflow.admin.users.delete'),
+                        admin_user_membership_path(user, membership),
+                        method: :delete,
+                        data: {
+                          confirm: t('pageflow.admin.users.delete_account_membership_confirmation'),
+                          rel: "delete_account_membership_#{membership.role}"
+                        })
+              end
+            end
+          end
+          add_membership_button_if_needed(user, user, 'account')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Pageflow
+  module Admin
+    class UserEntriesTab < ViewComponent
+      def build(user)
+        embedded_index_table(user.memberships.on_entries.includes(:entry, entry: :account)
+                              .accessible_by(current_ability, :index),
+                             blank_slate_text: t('pageflow.admin.users.no_entries')) do
+          table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
+            column :entry, sortable: 'pageflow_entries.title' do |membership|
+              link_to(membership.entity.title, admin_entry_path(membership.entity))
+            end
+            column :role, sortable: 'pageflow_memberships.role' do |membership|
+              membership_role_with_tooltip(membership.role, scope: 'entries')
+            end
+            column :account, sortable: 'pageflow_accounts.name' do |membership|
+              if authorized?(:read, membership.entity.account)
+                link_to(membership.entity.account.name,
+                        admin_account_path(membership.entity.account))
+              else
+                membership.entity.account.name
+              end
+            end
+            column :created_at, sortable: 'pageflow_memberships.created_at'
+            column do |membership|
+              if authorized?(:update, membership)
+                link_to(t('pageflow.admin.users.edit_role'),
+                        edit_admin_user_membership_path(user, membership, entity_type: :entry),
+                        data: {
+                          rel: "edit_entry_role_#{membership.role}"
+                        })
+              end
+            end
+            column do |membership|
+              if authorized?(:destroy, membership)
+                link_to(t('pageflow.admin.users.delete'),
+                        admin_user_membership_path(user, membership),
+                        method: :delete,
+                        data: {
+                          confirm: t('pageflow.admin.users.delete_entry_membership_confirmation'),
+                          rel: "delete_entry_membership_#{membership.role}"
+                        })
+              end
+            end
+          end
+          add_membership_button_if_needed(user, user, 'entry')
+        end
+      end
+    end
+  end
+end

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

@@ -3,14 +3,42 @@ module Pageflow
     class UsersTab < ViewComponent
       def build(theming)
         account = theming.account
-        embedded_index_table(account.users,
+        embedded_index_table(account.memberships.on_accounts.includes(:user)
+                              .accessible_by(current_ability, :index)
+                                            .where('pageflow_memberships.user_id IS NOT NULL'),
                              blank_slate_text: I18n.t('pageflow.admin.accounts.no_members')) do
-          table_for_collection sortable: true, class: 'users', i18n: User do
-            column :full_name, sortable: :last_name do |user|
-              link_to user.formal_name, admin_user_path(user)
+          table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
+            column :full_name, sortable: 'users.last_name' do |membership|
+              link_to membership.user.formal_name, admin_user_path(membership.user)
+            end
+            column :role, sortable: 'pageflow_memberships.role' do |membership|
+              membership_role_with_tooltip(membership.role, scope: 'accounts')
             end
             column :created_at
+            column do |membership|
+              if authorized?(:update, membership)
+                link_to(I18n.t('pageflow.admin.users.edit_role'),
+                        edit_admin_account_membership_path(membership.entity,
+                                                           membership,
+                                                           entity_type: :account),
+                        data: {
+                          rel: "edit_account_role_#{membership.role}"
+                        })
+              end
+            end
+            column do |membership|
+              if authorized?(:destroy, membership)
+                link_to(I18n.t('pageflow.admin.users.delete'),
+                        admin_account_membership_path(membership.entity, membership),
+                        method: :delete,
+                        data: {
+                          confirm: I18n.t('active_admin.delete_confirmation'),
+                          rel: "delete_account_membership_#{membership.role}"
+                        })
+              end
+            end
           end
+          add_membership_button_if_needed(current_user, account, 'account')
         end
       end
     end

data/app/views/layouts/pageflow/application.html.erb

@@ -20,11 +20,12 @@
 
   <%= render 'layouts/pageflow/ie_include_tags' %>
 </head>
-<%= content_tag :body, :class => [@body_class, 'load_all_images has_no_mobile_platform non_js'].compact.flatten.join(' ') do %>
+
+<body class="load_all_images has_no_mobile_platform non_js">
   <script>
     jQuery('body').removeClass('load_all_images');
     jQuery("body").removeClass('non_js').addClass('js');
   </script>
   <%= yield %>
-<% end %>
+</body>
 <% end %>

data/app/views/pageflow/config/_editor_seeds.json.jbuilder

@@ -1,6 +1,19 @@
 json.key_format!(camelize: :lower)
-json.(Pageflow.config, :confirm_encoding_jobs, :available_locales, :available_public_locales)
-json.file_types(Pageflow.config.file_types, :collection_name, :type_name, :param_key, :i18n_key)
+json.call(Pageflow.config,
+          :confirm_encoding_jobs,
+          :available_locales,
+          :available_public_locales,
+          :available_text_track_kinds)
+json.file_types Pageflow.config.file_types do |file_type|
+  json.collection_name file_type.collection_name
+  json.top_level_type file_type.top_level_type
+  json.type_name file_type.type_name
+  json.param_key file_type.param_key
+  json.i18n_key file_type.i18n_key
+  json.nested_file_types file_type.nested_file_types do |nested_file_type|
+    json.collection_name nested_file_type.collection_name
+  end
+end
 json.default_author_meta_tag Pageflow.config.default_author_meta_tag
 json.default_publisher_meta_tag Pageflow.config.default_publisher_meta_tag
 json.default_keywords_meta_tag Pageflow.config.default_keywords_meta_tag

data/app/views/pageflow/editor/entries/_entry.json.jbuilder

@@ -4,6 +4,7 @@ json.pretty_url pretty_entry_url(entry)
 
 json.default_file_rights entry.account.default_file_rights
 json.published(entry.published?)
+json.publishable(can?(:publish, entry.to_model))
 json.password_protected(entry.password_digest.present?)
 
 json.configuration do

data/app/views/pageflow/editor/files/_file.json.jbuilder

@@ -1,4 +1,12 @@
-json.(file, :id, :state, :rights, :usage_id)
+json.partial!(partial: 'pageflow/files/file',
+              object: file,
+              locals: {file_type: file_type})
+
+json.call(file,
+          :state,
+          :rights,
+          :usage_id)
+
 json.retryable(file.retryable?)
 json.file_name(file.attachment.original_filename)
 
@@ -11,7 +19,7 @@ if file.original_url.present?
 end
 
 if file_type.editor_partial.present?
-  json.partial!(:object => file, :partial => file_type.editor_partial)
+  json.partial!(object: file, partial: file_type.editor_partial)
 end
 
 if file.respond_to?(:thumbnail_url)

data/app/views/pageflow/entries/show.css.erb

@@ -6,6 +6,9 @@
           <%= background_image_lazy_loading_css_class('image', image_file) %> {
             background-image: url('<%= image_file.attachment.url(style) %>');
           }
+          <%= background_image_lazy_loading_css_class('image_panorama', image_file) %> {
+            background-image: url('<%= image_file.attachment.url("panorama_#{style}") %>');
+          }
         <% end %>
 
         <% @entry.video_files.each do |video_file| %>
@@ -16,16 +19,6 @@
       <% end %>
     <% end %>
 
-    <% page_media_breakpoints.each do |style, condition| %>
-      <%= media_query(condition) do %>
-        <% @entry.image_files.each do |image_file| %>
-          <%= background_image_lazy_loading_css_class('image_panorama', image_file) %> {
-            background-image: url('<%= image_file.attachment.url("panorama_#{style}") %>');
-          }
-        <% end %>
-      <% end %>
-    <% end %>
-
     <%= file_thumbnails_css(@entry) %>
     <%= render 'pageflow/entries/theming' %>
-<% end %>
+<% end %>

data/app/views/pageflow/entries/show.json.jbuilder

@@ -1,5 +1,5 @@
 Pageflow.config.file_types.each do |file_type|
-  json.set!(file_type.collection_name, @entry.files(file_type.model)) do |file|
+  json.set!(file_type.collection_name, @entry.find_files(file_type.model)) do |file|
     json.cache!(file) do
       json.partial!(object: file,
                     partial: 'pageflow/editor/files/file',

data/app/views/pageflow/entry_json_seed/_entry.json.jbuilder

@@ -0,0 +1,19 @@
+json.merge! common_entry_seed(entry)
+
+json.theming entry_theming_seed(entry)
+
+json.storylines entry_storylines_seed(entry)
+json.chapters entry_chapters_seed(entry)
+json.pages entry_pages_seed(entry)
+
+json.file_ids entry_file_ids_seed(entry)
+
+json.files do
+  Pageflow.config.file_types.each do |file_type|
+    json.set!(file_type.collection_name) do
+      json.array!(entry.find_files(file_type.model)) do |file|
+        json.partial! 'pageflow/files/file', file: file, file_type: file_type
+      end
+    end
+  end
+end

data/app/views/pageflow/file_types/_thumbnails.css.erb

@@ -1,4 +1,4 @@
-<% revision.files(file_type.model).each do |file| %>
+<% revision.find_files(file_type.model).each do |file| %>
   <% styles.each do |style| %>
     .load_all_images .lazy_<%= file_thumbnail_css_class(file, style) %>,
     .load_image.lazy_<%= file_thumbnail_css_class(file, style) %>,

data/app/views/pageflow/files/_file.json.jbuilder

@@ -0,0 +1,12 @@
+json.call(file,
+          :id,
+          :basename,
+          :configuration,
+          :parent_file_id,
+          :parent_file_model_type)
+
+json.is_ready(file.ready?)
+
+if file_type.partial.present?
+  json.partial!(object: file, partial: file_type.partial)
+end

data/app/views/pageflow/page_background_asset/_element.html.erb

@@ -0,0 +1,3 @@
+<div class="page_background_asset" style="height: 100%;">
+  <%= background_image_div(configuration, 'background_image') %>
+</div>

data/app/views/pageflow/page_types/_page_type.json.jbuilder

@@ -8,6 +8,13 @@ json.(page_type,
 
 json.thumbnail_candidates(page_type.thumbnail_candidates) do |candidate|
   json.(candidate, :attribute, :file_collection)
+
+  if (condition = candidate[:unless] || candidate[:if])
+    json.condition do
+      json.(condition, :attribute, :value)
+      json.negated(!!candidate[:unless])
+    end
+  end
 end
 
 if page_type.json_seed_template

data/app/views/pageflow/react/_widget.html.erb

@@ -0,0 +1 @@
+<%= content_tag(:div, '', data: {widget: name}) %>

data/app/views/pageflow/react/page.html.erb

@@ -0,0 +1,6 @@
+<% if page.template.present? %>
+  <% concat React::ServerRendering.render(
+     'pageflow.react.ServerSidePage',
+     %Q'{ "resolverSeed": #{@_pageflow_react_entry_seed ||= entry_json_seed(@entry)}, "pageId": #{page.perma_id}, "pageType": "#{page.template}" }',
+     true) %>
+<% end %>

data/app/views/pageflow/video_files/_video_file.json.jbuilder

@@ -0,0 +1,2 @@
+json.call(video_file, :width, :height)
+json.variants video_file.present_outputs + [:poster_medium, :poster_large, :poster_ultra, :print]

data/config/initializers/admin_resource_tabs.rb

@@ -1,7 +1,14 @@
 Pageflow.configure do |config|
   config.admin_resource_tabs.register(:entry, name: :members, component: Pageflow::Admin::MembersTab)
   config.admin_resource_tabs.register(:entry, name: :revisions, component: Pageflow::Admin::RevisionsTab)
-  config.admin_resource_tabs.register(:entry, name: :features, component: Pageflow::Admin::FeaturesTab)
+
+  config.admin_resource_tabs.register(:entry,
+                                      name: :features,
+                                      component: Pageflow::Admin::FeaturesTab,
+                                      required_account_role: :manager)
+
+  config.admin_resource_tabs.register(:user, name: :accounts, component: Pageflow::Admin::UserAccountsTab)
+  config.admin_resource_tabs.register(:user, name: :entries, component: Pageflow::Admin::UserEntriesTab)
 
   config.admin_resource_tabs.register(:theming, name: :entries, component: Pageflow::Admin::EntriesTab)
   config.admin_resource_tabs.register(:theming, name: :users, component: Pageflow::Admin::UsersTab)