Layout for wall create content form menu

CHANGELOG-DEV.md

@@ -3,6 +3,7 @@ HumHub Changelog
 
 1.13.0 (Unreleased)
 -------------------
+- Enh #5827: Wall menu tabs for create content forms
 - Enh #5808: Add a menu to remove all members of a space
 - Enh #5841: Possibility to show Members/Followers as list from Space about page
 - Enh #5850: Display all levels by default on info logging page

protected/humhub/components/Controller.php

@@ -112,7 +112,7 @@ public function behaviors()
      */
     public function renderAjaxContent($content)
     {
-        return $this->getView()->renderAjaxContent($content, $this);
+        return $this->getView()->renderAjaxContent($content);
     }
 
     /**
@@ -123,7 +123,7 @@ public function renderAjaxContent($content)
      */
     public function renderAjaxPartial(string $content): string
     {
-        return $this->getView()->renderAjaxPartial($content, $this);
+        return $this->getView()->renderAjaxPartial($content);
     }
 
     /**

protected/humhub/config/assets-prod.php

@@ -2,7 +2,7 @@
 /**
  * This file is generated by the "yii asset" command.
  * DO NOT MODIFY THIS FILE DIRECTLY.
- * @version 2022-07-15 11:57:44
+ * @version 2022-08-17 11:53:49
  */
 return [
     'app' => [

protected/humhub/modules/content/components/ContentActiveRecord.php

@@ -93,6 +93,19 @@ class ContentActiveRecord extends ActiveRecord implements ContentOwner, Movable
      */
     protected $streamChannel = 'default';
 
+    /**
+     * Holds an extra create permission by providing one of the following
+     *
+     *  - BasePermission class string
+     *  - Array of type ['class' => '...', 'callback' => '...']
+     *  - Anonymous function
+     *  - BasePermission instance
+     *
+     * @var string permission instance
+     * @since 1.13
+     */
+    protected $createPermission = ManageContent::class;
+
     /**
      * Holds an extra manage permission by providing one of the following
      *
@@ -269,6 +282,31 @@ public function getContentDescription()
         return "";
     }
 
+    /**
+     * Returns the $createPermission settings interpretable by an PermissionManager instance.
+     *
+     * @since 1.13
+     * @see ContentActiveRecord::$createPermission
+     * @return null|object|string
+     */
+    public function getCreatePermission()
+    {
+        return $this->hasCreatePermission()
+            ? $this->getPermissionValue($this->createPermission)
+            : null;
+    }
+
+    /**
+     * Determines whether or not the record has an additional createPermission set.
+     *
+     * @since 1.13
+     * @return boolean
+     */
+    public function hasCreatePermission()
+    {
+        return !empty($this->createPermission);
+    }
+
     /**
      * Returns the $managePermission settings interpretable by an PermissionManager instance.
      *
@@ -278,29 +316,40 @@ public function getContentDescription()
      */
     public function getManagePermission()
     {
-        if(!$this->hasManagePermission()) {
-            return null;
-        }
+        return $this->hasManagePermission()
+            ? $this->getPermissionValue($this->managePermission)
+            : null;
+    }
 
-        if(is_string($this->managePermission)) { // Simple Permission class specification
-            return $this->managePermission;
+    /**
+     * Returns the permission value interpretable by an PermissionManager instance.
+     *
+     * @since 1.13
+     * @see ContentActiveRecord::$managePermission, ContentActiveRecord::$createPermission
+     * @param string|array|null
+     * @return null|object|string
+     */
+    private function getPermissionValue($perm)
+    {
+        if (is_string($perm)) { // Simple Permission class specification
+            return $perm;
         }
 
-        if(is_array($this->managePermission)) {
-            if(isset($this->managePermission['class'])) { // ['class' => '...', 'callback' => '...']
-                $handler = $this->managePermission['class'].'::'.$this->managePermission['callback'];
+        if (is_array($perm)) {
+            if (isset($perm['class'])) { // ['class' => '...', 'callback' => '...']
+                $handler = $perm['class'].'::'.$perm['callback'];
                 return call_user_func($handler, $this);
             }
             // Simple Permission array specification
-            return $this->managePermission;
+            return $perm;
         }
 
-        if(is_callable($this->managePermission)) { // anonymous function
-            return $this->managePermission($this);
+        if (is_callable($perm)) { // anonymous function
+            return call_user_func($perm, $this);
         }
 
-        if($this->managePermission instanceof BasePermission) {
-            return $this->managePermission;
+        if ($perm instanceof BasePermission) {
+            return $perm;
         }
 
         return null;
@@ -358,7 +407,7 @@ public function getWallEntryWidget()
 
         if($this->wallEntryClass) {
             $class = $this->wallEntryClass;
-            $widget = new $class;
+            $widget = new $class(['model' => $this]);
             return $widget;
         }
 

protected/humhub/modules/content/components/ContentContainerModule.php

@@ -219,4 +219,14 @@ protected function getGlobalPermissions()
         return [];
     }
 
+    /**
+     * Returns all content classes provided by the module.
+     *
+     * @return array
+     */
+    public function getContentClasses(): array
+    {
+        return [];
+    }
+
 }

protected/humhub/modules/content/components/ContentContainerModuleManager.php

@@ -12,6 +12,7 @@
 use Yii;
 use humhub\modules\content\models\ContentContainerModuleState;
 use humhub\modules\content\models\ContentContainer;
+use yii\base\InvalidConfigException;
 
 /**
  * ModuleManager handles modules of a content container.
@@ -142,6 +143,7 @@ public function getEnabled()
                 $enabled[] = $id;
             }
         }
+        $enabled[] = 'post';
 
         return $enabled;
     }
@@ -311,4 +313,29 @@ public static function getContentContainerQueryByModule($id)
 
         return $query;
     }
+
+    /**
+     * This method is called to determine classes of Content models which can be posted on wall.
+     *
+     * @since 1.13
+     * @param ContentContainerActiveRecord|null $contentContainer
+     * @return ContentActiveRecord[]
+     */
+    public function getContentClasses(): array
+    {
+        $contentClasses = [];
+        foreach ($this->getEnabled() as $moduleId) {
+            $module = Yii::$app->getModule($moduleId);
+            foreach ($module->getContentClasses($this->contentContainer) as $class) {
+                $content = new $class($this->contentContainer);
+                if (!($content instanceof ContentActiveRecord)) {
+                    throw new InvalidConfigException($class . ' must be instance of ContentActiveRecord!');
+                }
+                $contentClasses[] = $content;
+            }
+        }
+
+        return $contentClasses;
+    }
+
 }

protected/humhub/modules/content/models/Content.php

@@ -725,7 +725,7 @@ public function addTags($tags)
     }
 
     /**
-     * Checks if the given user can edit this content.
+     * Checks if the given user can edit/create this content.
      *
      * A user can edit a content if one of the following conditions are met:
      *
@@ -735,7 +735,7 @@ public function addTags($tags)
      *  - The user meets the additional condition implemented by the model records class own `canEdit()` function.
      *
      * @param User|integer $user user instance or user id
-     * @return bool can edit this content
+     * @return bool can edit/create this content
      * @throws Exception
      * @throws IntegrityException
      * @throws \Throwable
@@ -767,8 +767,13 @@ public function canEdit($user = null)
         $model = $this->getModel();
 
         // Check additional manage permission for the given container
-        if ($model->hasManagePermission() && $this->getContainer() && $this->getContainer()->getPermissionManager($user)->can($model->getManagePermission())) {
-            return true;
+        if ($this->container) {
+            if ($model->isNewRecord && $model->hasCreatePermission() && $this->container->getPermissionManager($user)->can($model->getCreatePermission())) {
+                return true;
+            }
+            if (!$model->isNewRecord && $model->hasManagePermission() && $this->container->getPermissionManager($user)->can($model->getManagePermission())) {
+                return true;
+            }
         }
 
         // Check if underlying models canEdit implementation

protected/humhub/modules/content/resources/js/humhub.content.form.js

@@ -10,6 +10,7 @@ humhub.module('content.form', function(module, require, $) {
     var client = require('client');
     var event = require('event');
     var Widget = require('ui.widget').Widget;
+    var loader = require('ui.loader');
 
     var instance;
 
@@ -21,26 +22,39 @@ humhub.module('content.form', function(module, require, $) {
 
     CreateForm.prototype.init = function() {
         this.$.hide();
+        this.menu = this.$.parent().prev('#contentFormMenu');
         // Hide options by default
         $('.contentForm_options').hide();
 
         this.setDefaultVisibility();
         this.$.fadeIn('fast');
 
         if(!module.config['disabled']) {
+            var that = this;
             $('#contentFormBody').on('click.humhub:content:form dragover.humhub:content:form', function(evt) {
                 // Prevent fading in for topic remove button clicks
                 if($(evt.target).closest('.topic-remove-label').length) {
                     return;
                 }
 
+                that.showMenu();
                 $('.contentForm_options').fadeIn();
             });
         } else {
             $('#contentFormBody').find('.humhub-ui-richtext').trigger('disable');
         }
     };
 
+    CreateForm.prototype.showMenu = function() {
+        this.menu.find('li,a').removeClass('active');
+        const firstMenuWithForm = this.menu.find('a[data-action-click=loadForm]:eq(0)');
+        if (firstMenuWithForm.length) {
+            firstMenuWithForm.addClass('active')
+                .parent().addClass('active');
+        }
+        this.menu.fadeIn();
+    }
+
     CreateForm.prototype.submit = function(evt) {
         this.$.find('.preferences, .fileinput-button').hide();
         this.$.find('.help-block-error').html('');
@@ -114,11 +128,15 @@ humhub.module('content.form', function(module, require, $) {
 
     CreateForm.prototype.handleError = function(response) {
         var that = this;
+        var model = that.$.find('.form-group:first').attr('class').replace(/^.+field-([^-]+).+$/, '$1');
         $.each(response.errors, function(fieldName, errorMessages) {
-            that.$.find('.field-post-' + fieldName).addClass('has-error');
-            var fieldSelector = '.field-contentForm_' + fieldName;
-            that.$.find(fieldSelector + ', ' + fieldSelector + '_input')
-                .find('.help-block-error').html(errorMessages.join('<br>'));
+            var fieldSelector = '.field-' + model + '-' + fieldName;
+            var inputSelector = '.field-contentForm_' + fieldName;
+            var multiInputSelector = '[name="' + fieldName + '[]"]';
+            that.$.find(fieldSelector).addClass('has-error');
+            that.$.find(fieldSelector + ', ' + inputSelector + ', ' + inputSelector + '_input')
+                .find('.help-block-error:first').html(errorMessages.join('<br>'));
+            that.$.find(multiInputSelector).closest('.form-group').addClass('has-error');
         });
     };
 
@@ -168,6 +186,47 @@ humhub.module('content.form', function(module, require, $) {
         }
     };
 
+    const CreateFormMenu = Widget.extend();
+
+    CreateFormMenu.prototype.init = function() {
+        this.topMenu = this.$.find('ul.nav');
+        this.subMenu = this.$.find('li.content-create-menu-more');
+        this.formPanel = this.$.parent().find('.panel');
+        if (!this.formPanel.find('form').length) {
+            this.$.fadeIn();
+            this.$.addClass('menu-without-form');
+        }
+    }
+
+    CreateFormMenu.prototype.activateMenu = function (evt) {
+        this.topMenu.find('li,a').removeClass('active');
+        evt.$trigger.addClass('active').find('a').addClass('active');
+
+        if (evt.$trigger.closest('ul.dropdown-menu').length) {
+            // Move item from sub menu to top menu
+            this.subMenu.find('ul').prepend(this.subMenu.prev());
+            this.subMenu.before(evt.$trigger.parent());
+        }
+    }
+
+    CreateFormMenu.prototype.loadForm = function (evt) {
+        const that = this;
+
+        loader.set(that.formPanel);
+        that.activateMenu(evt);
+
+        client.get(evt).then(function(response) {
+            that.formPanel.replaceWith(response.html);
+            that.formPanel = that.$.parent().find('.panel');
+            that.formPanel.find('[data-action-component], [data-ui-widget]').each(function () {
+                Widget.instance($(this));
+            });
+        }).catch(function(e) {
+            module.log.error(e, true);
+            loader.reset(that.formPanel);
+        });
+    }
+
     var init = function() {
         var $root = $(CREATE_FORM_ROOT_SELECTOR);
         if($root.length) {
@@ -181,6 +240,7 @@ humhub.module('content.form', function(module, require, $) {
 
     module.export({
         CreateForm: CreateForm,
+        CreateFormMenu: CreateFormMenu,
         instance: instance,
         init: init,
         initOnPjaxLoad: true,

protected/humhub/modules/content/tests/codeception/unit/ContentActiveRecordTest.php

@@ -49,6 +49,8 @@ public function testManagePermission()
         $space = Space::findOne(['id' => 3]);
 
         $model = new TestContent($space, Content::VISIBILITY_PUBLIC);
+        $model->isNewRecord = false;
+
         $model->setManagePermission([ManageContent::class]);
 
         $this->becomeUser('User1');