Merge pull request #965 from indentlabs/docs-rework

Docs improvements

Author: drusepth

Gemfile

@@ -83,6 +83,9 @@ gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feat
 gem 'rails-ujs'
 gem 'language_filter'
 
+# Smarts
+gem 'word_count_analyzer'
+
 # Workers
 gem 'sidekiq'
 gem 'redis'

Gemfile.lock

@@ -1545,6 +1545,8 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    word_count_analyzer (1.0.1)
+      engtagger
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -1623,6 +1625,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console
   webpacker
+  word_count_analyzer
 
 RUBY VERSION
    ruby 2.7.2p137

app/assets/javascripts/autosave.js

@@ -13,6 +13,10 @@ $(document).ready(function() {
     // know that we can do so without ajax'ing it instead
   });
 
+  $('.submit-closest-form-on-click').on('click', function() {
+    $(this).closest('form').submit();
+  })
+
   // To ensure all fields get unblurred (and therefore autosaved) upon navigation,
   // we use this little ditty:
   window.onbeforeunload = function(e){

app/assets/javascripts/content_filtering.js

@@ -8,7 +8,7 @@ $(document).ready(function () {
 
   $('#js-content-name-filter').keyup(function (e) {
     var search_query = $(this).val();
-    var content_list = $('.js-content-cards-list > .js-content-card-container');
+    var content_list = $('.js-content-card-container');
 
     // Show everything, then hide what doesn't match
     content_list.hide();

app/assets/javascripts/page_tags.js

@@ -1,8 +1,9 @@
 $(document).ready(function () {
   $('.js-add-tag').click(function() {
     var clicked_tag = $(this).find('.badge').data('badge-caption');
+    var chips_reference = $(this).closest('.input-field').find('.chips');
 
-    M.Chips.getInstance($('.chips')).addChip({tag: clicked_tag});
+    M.Chips.getInstance(chips_reference).addChip({ tag: clicked_tag });
     return false;
   });
 });

app/assets/stylesheets/page_tags.scss

@@ -7,6 +7,10 @@
     margin-right: 5px;
   }
 
+  .badge, .badge.new {
+    font-size: 0.9rem;
+  }
+
 }
 
 .chip {

app/authorizers/attribute_authorizer.rb

@@ -6,13 +6,13 @@ def self.creatable_by? user
   end
 
   def readable_by? user
-    [
-      PermissionService.user_owns_content?(user: user, content: resource),
-      PermissionService.user_owns_any_containing_universe?(user: user, content: resource),
-      PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource),
-      PermissionService.content_is_public?(content: resource),
-      PermissionService.content_is_in_a_public_universe?(content: resource)
-    ].any?
+    return true if PermissionService.user_owns_content?(user: user, content: resource)
+    return true if PermissionService.user_owns_any_containing_universe?(user: user, content: resource)
+    return true if PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource)
+    return true if PermissionService.content_is_public?(content: resource)
+    return true if PermissionService.content_is_in_a_public_universe?(content: resource)
+    
+    return false
   end
 
   def updatable_by? user

app/authorizers/content_authorizer.rb

@@ -1,36 +1,37 @@
 class ContentAuthorizer < ApplicationAuthorizer
   def readable_by? user
-    [
-      ::PermissionService.user_owns_any_containing_universe?(user: user, content: resource),
-      ::PermissionService.user_owns_content?(user: user, content: resource),
-      ::PermissionService.content_is_public?(content: resource),
-      ::PermissionService.content_is_in_a_public_universe?(content: resource),
-      ::PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource)
-    ].any?
+    return true if user.site_administrator?
+    return true if ::PermissionService.user_owns_any_containing_universe?(user: user, content: resource)
+    return true if ::PermissionService.user_owns_content?(user: user, content: resource)
+    return true if ::PermissionService.content_is_public?(content: resource)
+    return true if ::PermissionService.content_is_in_a_public_universe?(content: resource)
+    return true if ::PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource)
+    
+    return false
   end
 
   def updatable_by? user
-    [
-      PermissionService.user_owns_any_containing_universe?(user: user, content: resource),
-      PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource),
-      [
-        PermissionService.content_has_no_containing_universe?(content: resource),
-        PermissionService.user_owns_content?(user: user, content: resource)
-      ].all?
-    ].any?
+    return true if PermissionService.user_owns_any_containing_universe?(user: user, content: resource)
+    return true if PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource)
+    return true if [
+      PermissionService.content_has_no_containing_universe?(content: resource),
+      PermissionService.user_owns_content?(user: user, content: resource)
+    ].all?
+    
+    return false
   end
 
   def deletable_by? user
-    [
-      PermissionService.user_owns_any_containing_universe?(user: user, content: resource),
-      [
-        PermissionService.content_has_no_containing_universe?(content: resource),
-        PermissionService.user_owns_content?(user: user, content: resource)
-      ].all?,
-      [
-        PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource),
-        PermissionService.user_owns_content?(user: user, content: resource)
-      ].all?
-    ].any?
+    return true if PermissionService.user_owns_any_containing_universe?(user: user, content: resource)
+    return true if [
+      PermissionService.content_has_no_containing_universe?(content: resource),
+      PermissionService.user_owns_content?(user: user, content: resource)
+    ].all?
+    return true if [
+      PermissionService.user_can_contribute_to_containing_universe?(user: user, content: resource),
+      PermissionService.user_owns_content?(user: user, content: resource)
+    ].all?
+
+    return false
   end
 end

app/authorizers/document_authorizer.rb

@@ -4,13 +4,13 @@ def self.creatable_by?(user)
   end
 
   def readable_by?(user)
-    [
-      resource.user_id == user.id,
-      resource.privacy == 'public',
-      resource.universe.present? && resource.universe.privacy == 'public',
-      resource.universe.present? && resource.universe.contributors.pluck(:user_id).include?(user.id),
-      resource.universe.present? && resource.universe.user_id == user.id
-    ].any?
+    return true if resource.user_id == user.id
+    return true if resource.privacy == 'public'
+    return true if resource.universe.present? && resource.universe.privacy == 'public'
+    return true if resource.universe.present? && resource.universe.contributors.pluck(:user_id).include?(user.id)
+    return true if resource.universe.present? && resource.universe.user_id == user.id
+
+    return false
   end
 
   def updatable_by?(user)

app/authorizers/extended_content_authorizer.rb

@@ -2,10 +2,8 @@ class ExtendedContentAuthorizer < ContentAuthorizer
   def self.creatable_by?(user)
     return false if ENV.key?('CONTENT_BLACKLIST') && ENV['CONTENT_BLACKLIST'].split(',').include?(user.email)
 
-    [
-      PermissionService.billing_plan_allows_extended_content?(user: user),
-      PermissionService.user_can_collaborate_in_universe_that_allows_extended_content?(user: user),
-      user.active_promo_codes.any?
-    ].any?
+    return true if PermissionService.billing_plan_allows_extended_content?(user: user)
+    return true if PermissionService.user_can_collaborate_in_universe_that_allows_extended_content?(user: user)
+    return true if user.active_promo_codes.any?
   end
 end