katalyst-navigation 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1e30c9f62f9c95fbd95824c1fca798f29e8d8240040cf92bfe3e6d802f0f4b
-  data.tar.gz: 7b86b9670845b41baa6214bd1ac19e5b6cf9aed0e391f31f270b183b5891e32a
+  metadata.gz: 94de0bbf95ab99d4893ec9decb52fa6c1a7231f1d58d17b1263e63124baaf10a
+  data.tar.gz: 3ec009c2845a80e4371aca788ac2b06de9a602cc468afecbbb5666d5a50fcb07
 SHA512:
-  metadata.gz: 247b24aec0411a6e45c316a68d1020f57bb3672cb2c7f649f3deab98c6c0c3820b3ca49fd4074b779d693ee4bc39ecaad112586b2a75fc32cddb574be8568245
-  data.tar.gz: 8dbe6529fea49f7f497ee5d1310cc5f4f618f86f41bfcd9b83395a91bf4c5764e9fe7ddab32bd0da04826689c5f5b6556ee3bfda79da6ee48397db9e733aa70f
+  metadata.gz: 043ce598613d8f99b98d777be94b0805d1504989eab5dba1e651a8d7fa2a2d8d4f89135530e300e65d37fea900237cba0e2a30caa7e95e81ab17000639bba5bb
+  data.tar.gz: c0795c1f30ed8ecea198e90d90097bcb6728bcbe2e7116ecd106e0c21c6e97e9c68a4ff981586bfa9436a22a7e63adf8c33da00f593541b17e77d316675fe4bb

data/app/assets/javascripts/utils/navigation/editor/rules-engine.js

@@ -7,7 +7,6 @@ export default class RulesEngine {
     "denyRemove",
     "denyDrag",
     "denyEdit",
-    "invalidDepth",
   ];
 
   /**
@@ -19,8 +18,12 @@ export default class RulesEngine {
   update(item) {
     this.rules = {};
 
+    // structural rules enforce a valid tree structure
     this.firstItemDepthZero(item);
     this.depthMustBeSet(item);
+    this.itemCannotHaveInvalidDepth(item);
+
+    // behavioural rules define what the user is allowed to do
     this.parentsCannotDeNest(item);
     this.rootsCannotDeNest(item);
     this.nestingNeedsParent(item);
@@ -28,7 +31,6 @@ export default class RulesEngine {
     this.needHiddenItemsToExpand(item);
     this.parentsCannotBeDeleted(item);
     this.parentsCannotBeDragged(item);
-    this.itemCannotHaveInvalidDepth(item);
 
     RulesEngine.rules.forEach((rule) => {
       item.toggleRule(rule, !!this.rules[rule]);
@@ -55,6 +57,18 @@ export default class RulesEngine {
     }
   }
 
+  /**
+   * Depth must increase stepwise.
+   *
+   * @param {Item} item
+   */
+  itemCannotHaveInvalidDepth(item) {
+    const previous = item.previousItem;
+    if (previous && previous.depth < item.depth - 1) {
+      item.depth = previous.depth + 1;
+    }
+  }
+
   /**
    * De-nesting an item would create a gap of 2 between itself and its children
    *
@@ -119,16 +133,6 @@ export default class RulesEngine {
     if (item.hasExpandedDescendants()) this.#deny("denyDrag");
   }
 
-  /**
-   * Depth must increase stepwise.
-   *
-   * @param {Item} item
-   */
-  itemCannotHaveInvalidDepth(item) {
-    const previous = item.previousItem;
-    if (previous && previous.depth < item.depth - 1) this.#deny("invalidDepth");
-  }
-
   /**
    * Record a deny.
    *

data/app/assets/stylesheets/katalyst/navigation/editor/_index.scss

@@ -10,7 +10,6 @@ $grey: #ececec !default;
 $grey-dark: #999 !default;
 $table-hover-background: #fff0eb !default;
 $primary-color: #ff521f !default;
-$error-color: #990000 !default;
 
 $row-inset: 2rem !default;
 $row-height: 3rem !default;
@@ -20,7 +19,6 @@ $row-background-color: $grey-light !default;
 $row-hover-color: $table-hover-background !default;
 $icon-active-color: $primary-color !default;
 $icon-passive-color: $grey-dark !default;
-$row-depth-invalid-color: $error-color !default;
 
 $status-published-background-color: #ebf9eb !default;
 $status-published-border-color: #4dd45c !default;
@@ -42,7 +40,6 @@ $status-dirty-color: #aaa !default;
   --row-hover-color: #{$row-hover-color};
   --icon-active-color: #{$icon-active-color};
   --icon-passive-color: #{$icon-passive-color};
-  --row-depth-invalid-color: #{$row-depth-invalid-color};
 
   ol,
   li {

data/app/assets/stylesheets/katalyst/navigation/editor/_item-rules.scss

@@ -16,8 +16,4 @@
     display: none !important;
     pointer-events: none;
   }
-
-  [data-invalid-depth] {
-    box-shadow: inset 0 0 0 3px var(--row-depth-invalid-color);
-  }
 }

data/app/controllers/concerns/katalyst/navigation/has_navigation.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Navigation
+    module HasNavigation
+      extend ActiveSupport::Concern
+
+      module NavigationHelper
+        def navigation_menu_for(slug)
+          @navigation_menus[slug.to_s]
+        end
+      end
+
+      included do
+        helper Katalyst::Navigation::FrontendHelper
+        helper NavigationHelper
+
+        before_action :set_navigation_menus
+      end
+
+      protected
+
+      def set_navigation_menus
+        @navigation_menus = Katalyst::Navigation::Menu.includes(:published_version).index_by(&:slug)
+      end
+    end
+  end
+end

data/app/controllers/katalyst/navigation/menus_controller.rb

@@ -62,7 +62,7 @@ module Katalyst
 
         menu.destroy!
 
-        redirect_to action: :index
+        redirect_to action: :index, status: :see_other
       end
 
       private

data/app/views/katalyst/navigation/menus/edit.html.erb

@@ -11,5 +11,10 @@
     <%= form.text_field :slug %>
   </div>
 
-  <%= form.submit :save %>
+  <div class="button-row">
+    <%= form.submit :save %>
+    <%= link_to "Delete", url_for(action: :show),
+                class: "button button-secondary",
+                data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
+  </div>
 <% end %>

data/app/views/katalyst/navigation/menus/index.html.erb

@@ -11,7 +11,4 @@
     <%= link_to cell.value, menu %>
   <% end %>
   <%= row.cell :slug %>
-  <%= row.cell :actions do |cell| %>
-    <%= button_to "Delete", menu, method: :delete, class: "button button--text" %>
-  <% end %>
 <% end %>

data/lib/katalyst/navigation/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Navigation
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -34,6 +34,7 @@ files:
 - app/assets/stylesheets/katalyst/navigation/editor/_item-rules.scss
 - app/assets/stylesheets/katalyst/navigation/editor/_new-items.scss
 - app/assets/stylesheets/katalyst/navigation/editor/_status-bar.scss
+- app/controllers/concerns/katalyst/navigation/has_navigation.rb
 - app/controllers/katalyst/navigation/base_controller.rb
 - app/controllers/katalyst/navigation/items_controller.rb
 - app/controllers/katalyst/navigation/menus_controller.rb