[1.10] Append wall entry controls to the file context menu

controllers/BrowseController.php

@@ -8,6 +8,10 @@
 
 namespace humhub\modules\cfiles\controllers;
 
+use humhub\modules\cfiles\models\File;
+use humhub\modules\cfiles\models\Folder;
+use humhub\modules\cfiles\models\rows\FileRow;
+use humhub\modules\cfiles\widgets\FileSystemItem;
 use Yii;
 use humhub\modules\cfiles\widgets\FileList;
 use yii\web\HttpException;
@@ -56,4 +60,46 @@ public function renderFileList($filesOrder = null, $foldersOrder = null)
         ]);
     }
 
+    public function actionLoadEntry()
+    {
+        if ($file = $this->getFileById()) {
+            return $this->asJson([
+                'output' => $this->renderFileRow($file),
+                // Additional scripts may be generated here in order to display some messages in info footer bar
+                'scripts' => $this->renderAjaxContent(''),
+            ]);
+        }
+
+        return $this->asJson([
+            'success' => false,
+            'error' => Yii::t('CfilesModule.base', 'No file found!')
+        ]);
+    }
+
+    private function getFileById(): ?File
+    {
+        $fileId = Yii::$app->request->get('id');
+        $fileId = strpos($fileId, 'file_') === 0 ? substr($fileId, 5) : 0;
+
+        if (empty($fileId)) {
+            return null;
+        }
+
+        return File::find()->readable()->where(['cfiles_file.id' => $fileId])->one();
+    }
+
+    private function renderFileRow(File $file)
+    {
+        if ($file->parent_folder_id) {
+            $folder = Folder::findOne(['id' => $file->parent_folder_id]);
+        } else {
+            $folder = $this->getRootFolder();
+        }
+
+        return FileSystemItem::widget([
+            'folder' => $folder,
+            'row' => new FileRow(['item' => $file]),
+        ]);
+    }
+
 }

docs/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.14.1 - Unreleased
+-----------------------
+- Enh #127: Improve context menu with items from wall stream entry
+
+
 0.14.0 - November 26, 2021
 --------------------------
 - Enh #83: Enable paste/upload files from clipboard

models/File.php

@@ -42,16 +42,6 @@ class File extends FileSystemItem
      */
     protected $_setFileContent = null;
 
-    /**
-     * @inheritdocs
-     */
-    public $canMove = true;
-
-    /**
-     * @inheritdocs
-     */
-    public $moduleId = 'cfiles';
-
     /**
      * @var array Content topics/tags
      */
@@ -210,24 +200,6 @@ public function afterSave($insert, $changedAttributes)
         RichText::postProcess($this->description, $this);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function afterMove(ContentContainerActiveRecord $container = null) {
-        parent::afterMove($container);
-
-        /* @var $root Folder */
-        $root = Folder::find()
-            ->contentContainer($container)
-            ->andWhere(['type' => Folder::TYPE_FOLDER_ROOT])
-            ->one();
-        if ($root) {
-            // Put the moved file into the root of new container:
-            $this->parent_folder_id = $root->id;
-            $this->save();
-        }
-    }
-
     public function updateVisibility($visibility)
     {
         if ($visibility === null) {
@@ -267,6 +239,14 @@ public function getItemId()
         return 'file_' . $this->id;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getContentId()
+    {
+        return $this->content->id;
+    }
+
     /**
      * @return string
      */

models/FileSystemItem.php

@@ -3,6 +3,7 @@
 namespace humhub\modules\cfiles\models;
 
 use humhub\modules\cfiles\permissions\ManageFiles;
+use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\content\models\Content;
 use humhub\modules\user\models\User;
@@ -28,6 +29,16 @@ abstract class FileSystemItem extends ContentActiveRecord implements ItemInterfa
      */
     public $managePermission = ManageFiles::class;
 
+    /**
+     * @inheritdocs
+     */
+    public $canMove = true;
+
+    /**
+     * @inheritdocs
+     */
+    public $moduleId = 'cfiles';
+
     /**
      * @inheritdoc
      */
@@ -115,6 +126,37 @@ public function afterSave($insert, $changedAttributes)
         parent::afterSave($insert, $changedAttributes);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function afterMove(ContentContainerActiveRecord $container = null)
+    {
+        parent::afterMove($container);
+        $this->updateParentFolder();
+    }
+
+    /**
+     * Update parent Folder if it is from different Content Container(Space/User)
+     * This File/Folder will be moved into the root Folder of the current Content Container
+     *
+     * @param ContentContainerActiveRecord $container
+     * @return bool True on success moving or if parent Folder is already in the same Content Container
+     */
+    public function updateParentFolder(): bool
+    {
+        $parentFolder = Folder::findOne(['id' => $this->parent_folder_id]);
+        if ($parentFolder && $parentFolder->content->contentcontainer_id == $this->content->contentcontainer_id) {
+            return true;
+        }
+
+        if (!($root = Folder::getOrInitRoot($this->content->getContainer()))) {
+            return false;
+        }
+
+        $this->parent_folder_id = $root->id;
+        return $this->save();
+    }
+
     public function hasAttributeChanged($attributeName)
     {
         return $this->hasAttribute($attributeName) && ($this->isNewRecord || $this->getOldAttribute($attributeName) != $this->$attributeName);

models/Folder.php

@@ -2,16 +2,16 @@
 
 namespace humhub\modules\cfiles\models;
 
+use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\content\models\Content;
 use humhub\modules\file\libs\ImageHelper;
 use humhub\modules\file\models\FileContent;
-use Yii;
-use yii\db\ActiveQuery;
 use humhub\modules\file\libs\FileHelper;
 use humhub\modules\user\models\User;
-use humhub\modules\content\components\ContentContainerActiveRecord;
-use humhub\modules\content\models\Content;
 use humhub\modules\search\events\SearchAddEvent;
 use humhub\modules\space\models\Space;
+use Yii;
+use yii\db\ActiveQuery;
 use yii\imagine\Image;
 use yii\web\UploadedFile;
 
@@ -178,6 +178,51 @@ public function beforeSave($insert)
         return parent::beforeSave($insert);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function afterMove(ContentContainerActiveRecord $container = null)
+    {
+        parent::afterMove($container);
+
+        // Move all sub folders and files into the same Container where this Folder has been moved to
+        $this->moveSubFoldersToContainer($container);
+        $this->moveSubFilesToContainer($container);
+    }
+
+    public function moveSubFoldersToContainer(ContentContainerActiveRecord $container = null)
+    {
+        if ($container === null) {
+            $container = $this->content->getContainer();
+        }
+
+        $folders = Folder::find()
+            ->andWhere(['parent_folder_id' => $this->id])
+            ->all();
+
+        foreach ($folders as $folder) {
+            /* @var Folder $folder */
+            $folder->move($container);
+        }
+    }
+
+    public function moveSubFilesToContainer(ContentContainerActiveRecord $container = null)
+    {
+        if ($container === null) {
+            $container = $this->content->getContainer();
+        }
+
+        $files = File::find()
+            ->joinWith('baseFile')
+            ->andWhere(['cfiles_file.parent_folder_id' => $this->id])
+            ->all();
+
+        foreach ($files as $file) {
+            /* @var File $file */
+            $file->move($container);
+        }
+    }
+
     /**
      * @param $visibility
      */
@@ -376,6 +421,19 @@ private static function getContainerOwnerId(ContentContainerActiveRecord $conten
         return null;
     }
 
+    /**
+     * @param ContentContainerActiveRecord $contentContainer
+     * @return Folder the root folder of the given ContentContainerActiveRecord
+     */
+    public static function getOrInitRoot(ContentContainerActiveRecord $contentContainer)
+    {
+        if ($root = Folder::getRoot($contentContainer)) {
+            return $root;
+        }
+
+        return Folder::initRoot($contentContainer);
+    }
+
     /**
      * @param ContentContainerActiveRecord $contentContainer
      * @return Folder the root folder of the given ContentContainerActiveRecord
@@ -428,6 +486,14 @@ public function getItemId()
         return $this->getItemType() . '_' . $this->id;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getContentId()
+    {
+        return $this->content->id;
+    }
+
     /**
      * @return string
      */

models/ItemInterface.php

@@ -15,6 +15,8 @@ interface ItemInterface
 
     public function getItemId();
 
+    public function getContentId();
+
     public function getTitle();
 
     public function getSize();

models/forms/MoveForm.php

@@ -10,7 +10,6 @@
 
 use humhub\modules\cfiles\models\FileSystemItem;
 use humhub\modules\cfiles\models\Folder;
-use humhub\modules\cfiles\models\File;
 use Yii;
 
 /**
@@ -94,6 +93,24 @@ public function getMoveUrl()
         return $this->sourceFolder->createUrl('/cfiles/move');
     }
 
+    /**
+     * @return string URL to move Content to another Container
+     */
+    public function getMoveToContainerUrl(): ?string
+    {
+        if (count($this->selection) !== 1) {
+            // Only single selected File/Folder can be moved to another Container
+            return null;
+        }
+
+        $item = FileSystemItem::getItemById($this->selection[0]);
+        if (!$item || !$item->content->container || !$item->content->checkMovePermission()) {
+            return null;
+        }
+
+        return $item->content->container->createUrl('/content/move/move', ['id' => $item->content->id]);
+    }
+
     /**
      * Executes the actual move of the selection files from source into target.
      * @return bool

models/rows/AbstractFileSystemItemRow.php

@@ -133,6 +133,11 @@ public abstract function getType();
      */
     public abstract function getItemId();
 
+    /**
+     * @return int
+     */
+    public abstract function getContentId();
+
     /**
      * @return string
      */

models/rows/BaseFileRow.php

@@ -89,6 +89,14 @@ public function getItemId()
         return 'baseFile_'.$this->baseFile->id;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getContentId()
+    {
+        return null;
+    }
+
     /**
      * @return string
      */

models/rows/FileRow.php

@@ -8,7 +8,8 @@
 
 namespace humhub\modules\cfiles\models\rows;
 
-use Yii;
+use humhub\modules\cfiles\widgets\WallEntryFile;
+use humhub\modules\content\widgets\stream\WallStreamModuleEntryWidget;
 
 /**
  * Created by PhpStorm.
@@ -56,4 +57,12 @@ public function canEdit()
     {
         return $this->item->content->canEdit();
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContext(): WallStreamModuleEntryWidget
+    {
+        return new WallEntryFile(['model' => $this->item]);
+    }
 }