added single image response instead of images list #137

src/apis/StorageController.php

@@ -20,6 +20,8 @@
 use yii\web\NotFoundHttpException;
 use yii\data\ActiveDataProvider;
 use luya\admin\file\Query;
+use yii\data\ArrayDataProvider;
+use luya\admin\models\StorageImage;
 
 /**
  * Filemanager and Storage API.
@@ -85,7 +87,7 @@ public function actionDataFolders()
  */
  public function actionDataFiles($folderId = 0, $page = 0)
  {
- $perPage = 50;
+ $perPage = 10;
  $totalCount = (new Query())->where(['folder_id' => $folderId, 'is_hidden' => false, 'is_deleted' => false])->count();
 
  $files = $this->getOrSetHasCache(['storageApiDataFiles', $folderId, $page], function() use ($folderId, $page, $perPage) {
@@ -119,12 +121,17 @@ public function actionDataFiles($folderId = 0, $page = 0)
  return $files; 
  }, 0, new DbDependency(['sql' => 'SELECT MAX(id) FROM admin_storage_file WHERE is_deleted=false']));
 
+ return $this->generatePaginationArrayResponse($page, $perPage, $totalCount, $files);
+ }
+
+ private function generatePaginationArrayResponse($currentPage, $perPage, $totalCount, array $files)
+ {
  return [
+ 'page' => (int) $currentPage,
  'perPage' => $perPage,
  'totalCount' => $totalCount,
  'count' => count($files),
  'data' => $files,
- 'page' => (int) $page,
  ];
  }
 
@@ -161,13 +168,24 @@ public function actionDataImages()
  */
  public function actionFileInfo($id)
  {
- $model = StorageFile::find()->where(['id' => $id])->with(['user'])->one();
+ $model = StorageFile::find()->where(['id' => $id])->with(['user', 'images'])->one();
 
  if (!$model) {
  throw new NotFoundHttpException("Unable to find the given storage file.");
  }
 
- return $model->toArray([], ['user', 'file']);
+ return $model->toArray([], ['user', 'file', 'images']);
+ }
+
+ public function actionImageInfo($id)
+ {
+ $model = StorageImage::find()->where(['id' => $id])->with(['file'])->one();
+
+ if (!$model) {
+ throw new NotFoundHttpException("Unable to find the given storage image.");
+ }
+
+ return $model->toArray(['id', 'file_id', 'filter_id', 'resolution_width', 'resolution_height'], ['source']);
  }
 
  /**
@@ -229,10 +247,9 @@ public function actionFilemanagerUpdateCaption()
  *
  * @return array
  */
- public function actionImageUpload()
+ public function actionImageFilter()
  {
  $this->checkRouteAccess(self::PERMISSION_ROUTE);
-
  try {
  $create = Yii::$app->storage->addImage(Yii::$app->request->post('fileId', null), Yii::$app->request->post('filterId', null), true);
  if ($create) {

src/models/StorageFile.php

@@ -116,6 +116,16 @@ public function getUser()
  return $this->hasOne(User::class, ['id' => 'upload_user_id']);
  }
 
+ /**
+ * Get all images fro the given file.
+ * 
+ * @return \yii\db\ActiveQuery
+ */
+ public function getImages()
+ {
+ return $this->hasMany(StorageImage::class, ['file_id' => 'id']);
+ }
+
  /**
  * Get the file for the corresponding model.
  * 
@@ -132,6 +142,6 @@ public function getFile()
  */
  public function extraFields()
  {
- return ['user', 'file'];
+ return ['user', 'file', 'images'];
  }
 }

src/models/StorageImage.php

@@ -10,6 +10,12 @@
 /**
  * StorageImage Model.
  *
+ * @property int $id
+ * @property int $file_id
+ * @property int $filter_id
+ * @property int $resolution_width
+ * @property int $resolution_height
+ *
  * @author Basil Suter <basil@nadar.io>
  * @since 1.0.0
  */
@@ -47,11 +53,29 @@ public function beforeDelete()
  }
  }
 
+ /**
+ * 
+ * @return StorageFile
+ */
  public function getFile()
  {
  return $this->hasOne(StorageFile::className(), ['id' => 'file_id']);
  }
 
+ /**
+ * Returns the current file source path for the current filter image.
+ * @return string
+ */
+ public function getSource()
+ {
+ $fileName = $this->filter_id . '_' . $this->file->name_new_compound;
+
+ return Yii::$app->storage->fileAbsoluteHttpPath($fileName);
+ }
+
+ /**
+ * @return boolean
+ */
  public function deleteSource()
  {
  $image = Yii::$app->storage->getImage($this->id);
@@ -65,4 +89,9 @@ public function deleteSource()
 
  return true;
  }
+
+ public function extraFields()
+ {
+ return ['source'];
+ }
 }