Add Assignment feature

templaza · Mar 21, 2024 · c769ff8 · c769ff8
1 parent 8ccc2b2
commit c769ff8
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 26 deletions.
diff --git a/assets/vendor/manager/dist/index.js b/assets/vendor/manager/dist/index.js
diff --git a/assets/vendor/manager/src/components/helpers/Assignment.vue b/assets/vendor/manager/src/components/helpers/Assignment.vue
@@ -3,14 +3,29 @@ import { onBeforeMount, ref, computed, watch } from 'vue';
 import MenuListItem from './MenuListItem.vue';
 const emit = defineEmits(['update:modelValue']);
 const props = defineProps({
-  field: { type: Object, default: null },
-  modelValue: { type: String, default: '{}' }
+    field: { type: Object, default: null },
+    modelValue: { type: String, default: '{}' }
 });
 const list = ref({});
 onBeforeMount(() => {
-    list.value = props.field.input.value;
+    try {
+        list.value = JSON.parse(props.modelValue);
+    } catch (e) {
+        props.field.input.menu.forEach(menu => {
+            setDefault(menu);
+        });
+    }
 });
 
+function setDefault(menu) {
+    menu.links.forEach(item => {
+        list.value[item.id] = true;
+        if (item.links.length > 0) {
+            setDefault(item);
+        }
+    });
+}
+
 const list_text = computed(() => {
     return JSON.stringify(list.value);
 })

diff --git a/framework/elements/articles/articles.xml b/framework/elements/articles/articles.xml
@@ -317,6 +317,9 @@
                     <option value="rounded-pill">Circle</option>
                 </field>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/divider/divider.xml b/framework/elements/divider/divider.xml
@@ -16,6 +16,9 @@
                 <field astroidgroup="general" name="color" type="astroidcolor" label="ASTROID_WIDGET_COLOR_LABEL"/>
                 <field astroidgroup="general" name="margin" type="astroidspacing" label="ASTROID_WIDGET_MARGIN_LABEL" />
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/grid/grid.xml b/framework/elements/grid/grid.xml
@@ -311,6 +311,9 @@
                     <option value="rounded-pill">Circle</option>
                 </field>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/heading/heading.xml b/framework/elements/heading/heading.xml
@@ -21,6 +21,9 @@
                 </field>
                 <field astroidgroup="widget_styles" name="font_style" label="ASTROID_WIDGET_FONT_STYLES_LABEL" type="astroidtypography" columns="1" preview="false"/>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/icons/icons.xml b/framework/elements/icons/icons.xml
@@ -37,6 +37,9 @@
                 <field astroidgroup="misc_options" name="color" type="astroidcolor" label="ASTROID_WIDGET_COLOR_LABEL"/>
                 <field astroidgroup="misc_options" name="color_hover" type="astroidcolor" label="ASTROID_WIDGET_COLOR_HOVER_LABEL"/>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/image/image.xml b/framework/elements/image/image.xml
@@ -68,6 +68,9 @@
                     <option value="buzz-out">ASTROID_WIDGET_TRANSITION_BUZZ_OUT</option>
                 </field>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/imagegroup/imagegroup.xml b/framework/elements/imagegroup/imagegroup.xml
@@ -162,6 +162,9 @@
                     <option value="buzz-out">ASTROID_WIDGET_TRANSITION_BUZZ_OUT</option>
                 </field>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/navigation/navigation.xml b/framework/elements/navigation/navigation.xml
@@ -50,6 +50,9 @@
                 <field astroidgroup="spacing_options" name="item_margin" type="astroidspacing" label="ASTROID_WIDGET_MARGIN_LABEL" />
                 <field astroidgroup="spacing_options" name="item_padding" type="astroidspacing" label="ASTROID_WIDGET_PADDING_LABEL" />
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/slideshow/slideshow.xml b/framework/elements/slideshow/slideshow.xml
@@ -156,6 +156,9 @@
                     <option value="rounded-pill">Circle</option>
                 </field>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/text/text.xml b/framework/elements/text/text.xml
@@ -81,6 +81,9 @@
                 <field astroidgroup="content_options" type="astroiddivider" name="content_divider" />
                 <field astroidgroup="content_options" ngShow="[content]!==''" name="content_font_style" label="ASTROID_WIDGET_FONT_STYLES_LABEL" type="astroidtypography" columns="1" preview="false"/>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/elements/video_button/video_button.xml b/framework/elements/video_button/video_button.xml
@@ -27,6 +27,9 @@
                 <field astroidgroup="widget_styles" ngShow="[use_border]==1" name="border_width" type="astroidrange" min="1" max="50" step="1" postfix="px" default="1" label="ASTROID_WIDGET_BORDER_WIDTH" />
                 <field astroidgroup="widget_styles" ngShow="[use_border]==1" name="border_color" type="astroidcolor" label="ASTROID_WIDGET_BORDER_COLOR"/>
             </fieldset>
+            <fieldset name="assignment-settings" label="TPL_ASTROID_ASSIGNMENT_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
+                <field type="astroidassignment" label="ASTROID_ASSIGN_TO_MENU_ITEM" name="assignment"/>
+            </fieldset>
         </fields>
     </form>
 </element>
diff --git a/framework/fields/astroidassignment.php b/framework/fields/astroidassignment.php
@@ -8,7 +8,6 @@
 defined('JPATH_PLATFORM') or die;
 use Joomla\CMS\Form\FormField;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 /**
  * Form Field class for the Joomla Platform.
@@ -36,26 +35,10 @@ class JFormFieldAstroidAssignment extends FormField {
      * @since   3.7.0
      */
     protected function getInput() {
-        $menuTypes = MenusHelper::getMenuLinks();
-        $menus  =   array();
-        $value  =   \json_decode($this->value, true);
-        if (!empty($menuTypes)) {
-            foreach ($menuTypes as $type) {
-                if (count($type->links)) {
-                    foreach ($type->links as $link) {
-                        if (isset($value[$link->value])) {
-                            $menus[$link->value] = $value[$link->value];
-                        } else {
-                            $menus[$link->value] = true;
-                        }
-                    }
-                }
-            }
-        }
         $json =   [
             'id'      =>  $this->id,
             'name'    =>  $this->name,
-            'value'   =>  $menus,
+            'value'   =>  \json_decode($this->value, true),
             'menu'    =>  Astroid\Helper::getMenuLinks(),
             'multilanguage' => Multilanguage::isEnabled(),
             'type'    =>  strtolower($this->type),

diff --git a/framework/library/astroid/Element/BaseElement.php b/framework/library/astroid/Element/BaseElement.php
@@ -58,12 +58,18 @@ protected function wrap()
         if (empty($this->content) || !$this->state) {
             return '';
         }
+        $app = Factory::getApplication();
+        $jinput = $app->input;
+        $menuId = $jinput->get('Itemid', 0, 'INT');
+        $assignment =   $this->params->get('assignment', "");
+        if ($assignment) {
+            $assignment =   \json_decode($assignment, true);
+            if (isset($assignment[$menuId]) && !$assignment[$menuId]) {
+                return '';
+            }
+        }
         $astroid_element_visibility =   $this->params->get('astroid_element_visibility', "allPage");
         if ($astroid_element_visibility == "currentPage") {
-            $app = Factory::getApplication();
-            $jinput = $app->input;
-            $menuId = $jinput->get('Itemid', 0, 'INT');
-
             $menu = $app->getMenu();
             $item = $menu->getItem($menuId);
             if (empty($item)) {