Merge branch 'release/7.0.16' into main

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.1.0] - 21-10-2022
+
+### Added
+
+- Custom menu items now have `getEnabledValue` function available. [#75]
+  - You can use this to override the enabled value set in database.
+    Useful when dealing with relationships inside menu items that might of have been deleted.
+
+### Changed
+
+- Updated the width of fields inside menu modal [#162]
+
 ## [7.0.5] - 15-09-2022
 
 ### Changed

README.md

@@ -212,6 +212,19 @@ public static function getDisplayValue($value, ?array $data, $locale) {
     return $value;
 }
 
+/**
+ * Get the enabled value
+ *
+ * @param $value
+ * @param $data The data from item fields.
+ * @param $locale
+ * @return string
+*/
+public static function getEnabledValue($value, ?array $data, $locale)
+{
+  return true;
+}
+
 /**
  * Get the value of the link visible to the front-end.
  *

dist/js/entry.js.LICENSE.txt

@@ -6,8 +6,8 @@
  */
 
 /*!
- * vuex v4.0.2
- * (c) 2021 Evan You
+ * vuex v4.1.0
+ * (c) 2022 Evan You
  * @license MIT
  */
 

resources/js/components/modals/UpdateMenuItemModal.vue

@@ -20,6 +20,7 @@
       <form @submit.prevent="$emit(update ? 'updateItem' : 'confirmItemCreate')" autocomplete="off">
         <DefaultField
           :errors="wrappedErrors"
+          :fullWidthContent="true"
           :field="{
             visible: true,
             stacked: true,
@@ -41,6 +42,7 @@
 
         <DefaultField
           :errors="wrappedErrors"
+          :fullWidthContent="true"
           :field="{
             visible: true,
             stacked: true,
@@ -64,6 +66,7 @@
         <DefaultField
           v-if="linkType.type === 'static-url'"
           :errors="wrappedErrors"
+          :fullWidthContent="true"
           :field="{
             visible: true,
             stacked: true,
@@ -87,6 +90,7 @@
           v-if="linkType.type === 'select'"
           class="option-select-field o1-menu-builder-multiselect-wrapper"
           :errors="wrappedErrors"
+          :fullWidthContent="true"
           :field="{
             visible: true,
             stacked: true,
@@ -129,6 +133,7 @@
 
         <DefaultField
           v-if="linkType.type && linkType.type !== 'text'"
+          :fullWidthContent="true"
           :field="{
             visible: true,
             stacked: true,
@@ -164,6 +169,7 @@
             :errors="wrappedErrors"
             :show-errors="true"
             class="menu-item-component"
+            :fullWidthContent="true"
           />
         </template>
       </form>

src/MenuItemTypes/BaseMenuItemType.php

@@ -42,6 +42,19 @@ public static function getDisplayValue($value, ?array $data, $locale)
         return $value;
     }
 
+    /**
+     * Get the enabled value
+     *
+     * @param $value
+     * @param $data The data from item fields.
+     * @param $locale
+     * @return string
+     */
+    public static function getEnabledValue($value, ?array $data, $locale)
+    {
+        return true;
+    }
+
     /**
      * Get the value of the link visible to the front-end.
      *

src/Models/MenuItem.php

@@ -54,6 +54,20 @@ public function scopeEnabled($query)
         return $query->where('enabled', 1);
     }
 
+    public function getEnabledAttribute()
+    {
+        if (!$this->attributes['enabled']) {
+            // Filter out already disabled menu items
+            return $this->attributes['enabled'];
+        }
+
+        if (method_exists($this->class, 'getEnabledValue')) {
+            return $this->class::getEnabledValue($this->value, $this->data, $this->locale);
+        }
+
+        return true;
+    }
+
     public function getDisplayValueAttribute()
     {
         if (class_exists($this->class)) {