Add flat label list tab

src/Http/Controllers/Api/Projects/FilterImageAnnotationsByLabelController.php

@@ -2,11 +2,10 @@
 
 namespace Biigle\Modules\Largo\Http\Controllers\Api\Projects;
 
-use Biigle\Project;
+use Biigle\Http\Controllers\Api\Controller;
 use Biigle\ImageAnnotation;
+use Biigle\Project;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Biigle\Http\Controllers\Api\Controller;
 
 class FilterImageAnnotationsByLabelController extends Controller
 {
@@ -50,44 +49,4 @@ public function index(Request $request, $pid, $lid)
             ->orderBy('image_annotations.id', 'desc')
             ->pluck('images.uuid', 'image_annotations.id');
     }
-
-    /**
-     * Get all image labels and annotation count for a given project
-     * 
-     * @api {get} 
-     * @apiGroup Projects
-     * @apiName test
-     * @apiParam {Number} id The Project ID
-     * @apiPermission user
-     * @apiDescription Returns a collection of project image labels and annotation label counts
-     * 
-     * @apiSuccessExample {json} Success response:
-     * [{"id":1,
-     * "name":"a",
-     * "color":"f2617c",
-     * "parent_id":null,
-     * "label_tree_id":1,
-     * "source_id":null,
-     * "label_source_id":null,
-     * "uuid":"6d2e6061-9ed1-41df-92f0-4862d0d4b12e",
-     * "count":10}]
-     *
-     * @param int $id Project ID
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getProjectsAnnotationLabels($id)
-    {
-        $project = Project::findOrFail($id);
-        $this->authorize('access', $project);
-
-        return DB::table('labels')
-        ->join('image_annotation_labels', 'labels.id', '=', 'image_annotation_labels.label_id')
-        ->join('image_annotations', 'image_annotation_labels.annotation_id', '=', 'image_annotations.id')
-        ->join('images', 'image_annotations.image_id', '=', 'images.id')
-        ->join('project_volume', 'images.volume_id', '=', 'project_volume.volume_id')
-        ->where('project_volume.project_id','=',$id)
-        ->select('labels.*', DB::raw('COUNT(labels.id) as count'))
-        ->groupBy('labels.id')
-        ->get();
-    }
 }

src/Http/Controllers/Api/Projects/FilterVideoAnnotationsByLabelController.php

@@ -2,11 +2,10 @@
 
 namespace Biigle\Modules\Largo\Http\Controllers\Api\Projects;
 
+use Biigle\Http\Controllers\Api\Controller;
 use Biigle\Project;
 use Biigle\VideoAnnotation;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Biigle\Http\Controllers\Api\Controller;
 
 class FilterVideoAnnotationsByLabelController extends Controller
 {
@@ -50,44 +49,4 @@ public function index(Request $request, $pid, $lid)
             ->orderBy('video_annotations.id', 'desc')
             ->pluck('videos.uuid', 'video_annotations.id');
     }
-
-    /**
-     * Get all video labels and annotation count for a given project
-     * 
-     * @api {get} 
-     * @apiGroup Projects
-     * @apiName test
-     * @apiParam {Number} id The Project ID
-     * @apiPermission user
-     * @apiDescription Returns a collection of project video labels and annotation label counts
-     * 
-     * @apiSuccessExample {json} Success response:
-     * [{"id":1,
-     * "name":"a",
-     * "color":"f2617c",
-     * "parent_id":null,
-     * "label_tree_id":1,
-     * "source_id":null,
-     * "label_source_id":null,
-     * "uuid":"6d2e6061-9ed1-41df-92f0-4862d0d4b12e",
-     * "count":10}]
-     *
-     * @param int $id Project ID
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getProjectsAnnotationLabels($id)
-    {
-        $project = Project::findOrFail($id);
-        $this->authorize('access', $project);
-
-        return DB::table('labels')
-        ->join('video_annotation_labels', 'labels.id', '=', 'video_annotation_labels.label_id')
-        ->join('video_annotations', 'video_annotation_labels.annotation_id', '=', 'video_annotations.id')
-        ->join('videos', 'video_annotations.video_id', '=', 'videos.id')
-        ->join('project_volume', 'videos.volume_id', '=', 'project_volume.volume_id')
-        ->where('project_volume.project_id','=',$id)
-        ->select('labels.*', DB::raw('COUNT(labels.id) as count'))
-        ->groupBy('labels.id')
-        ->get();
-    }
 }

src/Http/Controllers/Api/Projects/ProjectAnnotationLabels.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Biigle\Modules\Largo\Http\Controllers\Api\Projects;
+
+use Biigle\Label;
+use Biigle\Project;
+use Illuminate\Support\Facades\DB;
+use Biigle\Http\Controllers\Api\Controller;
+
+class ProjectAnnotationLabels extends Controller
+{
+    /**
+     * Get all image labels and annotation count for a given project
+     * 
+     * @api {get} projects/:pid/label-count Get annotation labels with a annotation count
+     * @apiGroup Projects
+     * @apiName test
+     * @apiParam {Number} id The Project ID
+     * @apiPermission projectMember
+     * @apiDescription Returns a collection of project image labels and annotation label counts
+     * 
+     * @apiSuccessExample {json} Success response:
+     * [{"id":1,
+     * "name":"a",
+     * "color":"f2617c",
+     * "label_tree_id":1,
+     * "count":10}]
+     *
+     * @param int $id Project ID
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getProjectAnnotationLabelCounts($id)
+    {
+        $project = Project::findOrFail($id);
+        $this->authorize('access', $project);
+
+        $imageLabelQuery = Label::query()
+            ->join('image_annotation_labels', 'labels.id', '=', 'image_annotation_labels.label_id')
+            ->join('image_annotations', 'image_annotation_labels.annotation_id', '=', 'image_annotations.id')
+            ->join('images', 'image_annotations.image_id', '=', 'images.id')
+            ->join('project_volume', 'images.volume_id', '=', 'project_volume.volume_id')
+            ->where('project_volume.project_id', '=', $id)
+            ->select('labels.*');
+
+        $videoLabelQuery = Label::query()
+            ->join('video_annotation_labels', 'labels.id', '=', 'video_annotation_labels.label_id')
+            ->join('video_annotations', 'video_annotation_labels.annotation_id', '=', 'video_annotations.id')
+            ->join('videos', 'video_annotations.video_id', '=', 'videos.id')
+            ->join('project_volume', 'videos.volume_id', '=', 'project_volume.volume_id')
+            ->where('project_volume.project_id', '=', $id)
+            ->select('labels.*');
+
+        $union = $videoLabelQuery->unionAll($imageLabelQuery);
+
+        return DB::query()->fromSub($union, 'labels')
+            ->selectRaw('labels.id, labels.name, labels.color, labels.label_tree_id, count(labels.id) as count')
+            ->groupBy(['labels.id', 'labels.name', 'labels.color', 'labels.label_tree_id'])
+            ->get();
+    }
+}

src/Http/Controllers/Api/Volumes/FilterImageAnnotationsByLabelController.php

@@ -2,11 +2,10 @@
 
 namespace Biigle\Modules\Largo\Http\Controllers\Api\Volumes;
 
-use Biigle\Volume;
+use Biigle\Http\Controllers\Api\Controller;
 use Biigle\ImageAnnotation;
+use Biigle\Volume;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Biigle\Http\Controllers\Api\Controller;
 
 class FilterImageAnnotationsByLabelController extends Controller
 {
@@ -59,43 +58,4 @@ public function index(Request $request, $vid, $lid)
             ->orderBy('image_annotations.id', 'desc')
             ->pluck('images.uuid', 'image_annotations.id');
     }
-
-        /**
-     * Get all image labels and annotation count for a given volume
-     * 
-     * @api {get} 
-     * @apiGroup Volumes
-     * @apiName test
-     * @apiParam {Number} id The Volume ID
-     * @apiPermission user
-     * @apiDescription Returns a collection of project image labels, and annotation label counts
-     * 
-     * @apiSuccessExample {json} Success response:
-     * [{"id":1,
-     * "name":"a",
-     * "color":"f2617c",
-     * "parent_id":null,
-     * "label_tree_id":1,
-     * "source_id":null,
-     * "label_source_id":null,
-     * "uuid":"6d2e6061-9ed1-41df-92f0-4862d0d4b12e",
-     * "count":10}]
-     *
-     * @param int $id Volume ID
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getVolumeAnnotationLabels($id)
-    {
-        $volume = Volume::findOrFail($id);
-        $this->authorize('access', $volume);
-
-        return DB::table('labels')
-        ->join('image_annotation_labels', 'labels.id', '=', 'image_annotation_labels.label_id')
-        ->join('image_annotations', 'image_annotation_labels.annotation_id', '=', 'image_annotations.id')
-        ->join('images', 'image_annotations.image_id', '=', 'images.id')
-        ->where('images.volume_id','=',$id)
-        ->select('labels.*', DB::raw('COUNT(labels.id) as count'))
-        ->groupBy('labels.id')
-        ->get();
-    }
 }

src/Http/Controllers/Api/Volumes/FilterVideoAnnotationsByLabelController.php

@@ -2,11 +2,10 @@
 
 namespace Biigle\Modules\Largo\Http\Controllers\Api\Volumes;
 
-use Biigle\Volume;
+use Biigle\Http\Controllers\Api\Controller;
 use Biigle\VideoAnnotation;
+use Biigle\Volume;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Biigle\Http\Controllers\Api\Controller;
 
 class FilterVideoAnnotationsByLabelController extends Controller
 {
@@ -59,43 +58,4 @@ public function index(Request $request, $vid, $lid)
             ->orderBy('video_annotations.id', 'desc')
             ->pluck('videos.uuid', 'video_annotations.id');
     }
-
-        /**
-     * Get all video annotations and annotation count for a given volume
-     * 
-     * @api {get} 
-     * @apiGroup Volumes
-     * @apiName test
-     * @apiParam {Number} id The Volume ID
-     * @apiPermission user
-     * @apiDescription Returns a collection of project video labels and annotation label counts
-     * 
-     * @apiSuccessExample {json} Success response:
-     * [{"id":1,
-     * "name":"a",
-     * "color":"f2617c",
-     * "parent_id":null,
-     * "label_tree_id":1,
-     * "source_id":null,
-     * "label_source_id":null,
-     * "uuid":"6d2e6061-9ed1-41df-92f0-4862d0d4b12e",
-     * "count":10}]
-     *
-     * @param int $id Volume ID
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getVolumeAnnotationLabels($id)
-    {
-        $volume = Volume::findOrFail($id);
-        $this->authorize('access', $volume);
-
-        return DB::table('labels')
-        ->join('video_annotation_labels', 'labels.id', '=', 'video_annotation_labels.label_id')
-        ->join('video_annotations', 'video_annotation_labels.annotation_id', '=', 'video_annotations.id')
-        ->join('videos', 'video_annotations.video_id', '=', 'videos.id')
-        ->where('videos.volume_id','=',$id)
-        ->select('labels.*', DB::raw('COUNT(labels.id) as count'))
-        ->groupBy('labels.id')
-        ->get();
-    }
 }

src/Http/Controllers/Api/Volumes/VolumeAnnotationLabels.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Biigle\Modules\Largo\Http\Controllers\Api\Volumes;
+
+use Biigle\Label;
+use Biigle\Volume;
+use Biigle\Http\Controllers\Api\Controller;
+
+class VolumeAnnotationLabels extends Controller
+{
+    /**
+     * Get all annotation labels and annotation count for a given volume
+     * 
+     * @api {get} volumes/:vid/label-count Get annotation labels with a annotation count
+     * @apiGroup Volumes
+     * @apiName test
+     * @apiParam {Number} id The Volume ID
+     * @apiPermission projectMember
+     * @apiDescription Returns a collection of project image labels and annotation label counts
+     * 
+     * @apiSuccessExample {json} Success response:
+     * [{"id":1,
+     * "name":"a",
+     * "color":"f2617c",
+     * "label_tree_id":1,
+     * "count":10}]
+     *
+     * @param int $id Volume ID
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getVolumeAnnotationLabels($id)
+    {
+        $volume = Volume::findOrFail($id);
+        $this->authorize('access', $volume);
+
+        if ($volume->isImageVolume()) {
+            $labelQuery = Label::query()
+                ->join('image_annotation_labels', 'labels.id', '=', 'image_annotation_labels.label_id')
+                ->join('image_annotations', 'image_annotation_labels.annotation_id', '=', 'image_annotations.id')
+                ->join('images', 'image_annotations.image_id', '=', 'images.id')
+                ->where('images.volume_id', '=', $id);
+        } else {
+            $labelQuery = Label::query()
+                ->join('video_annotation_labels', 'labels.id', '=', 'video_annotation_labels.label_id')
+                ->join('video_annotations', 'video_annotation_labels.annotation_id', '=', 'video_annotations.id')
+                ->join('videos', 'video_annotations.video_id', '=', 'videos.id')
+                ->where('videos.volume_id', '=', $id);
+        }
+
+        return $labelQuery
+            ->selectRaw('labels.id, labels.name, labels.color, labels.label_tree_id, count(labels.id) as count')
+            ->groupBy(['labels.id', 'labels.name', 'labels.color', 'labels.label_tree_id'])
+            ->orderBy('labels.name')
+            ->get();
+    }
+}

src/Http/routes.php

@@ -53,12 +53,8 @@
         'uses' => 'Projects\FilterVideoAnnotationsByLabelController@index',
     ]);
 
-    $router->get('projects/{id}/image-annotations', [
-        'uses' => 'Projects\FilterImageAnnotationsByLabelController@getProjectsAnnotationLabels',
-    ]);
-
-    $router->get('projects/{id}/video-annotations', [
-        'uses' => 'Projects\FilterVideoAnnotationsByLabelController@getProjectsAnnotationLabels',
+    $router->get('projects/{id}/label-count', [
+        'uses' => 'Projects\ProjectAnnotationLabels@getProjectAnnotationLabelCounts',
     ]);
 
     $router->get('volumes/{id}/annotations/sort/outliers/{id2}', [
@@ -85,11 +81,7 @@
         'uses' => 'Volumes\FilterVideoAnnotationsByLabelController@index',
     ]);
 
-    $router->get('volume/{id}/image-annotations', [
-        'uses' => 'Volumes\FilterImageAnnotationsByLabelController@getVolumeAnnotationLabels'
-    ]);
-
-    $router->get('volume/{id}/video-annotations', [
-        'uses' => 'Volumes\FilterVideoAnnotationsByLabelController@getVolumeAnnotationLabels'
+    $router->get('volume/{id}/label-count', [
+        'uses' => 'Volumes\VolumeAnnotationLabels@getVolumeAnnotationLabels'
     ]);
 });

src/public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/assets/scripts/main.js": "/assets/scripts/main.js?id=54cd6e3415a851a07e5ca29273b2a5f9",
-    "/assets/styles/main.css": "/assets/styles/main.css?id=68a88f330c08af97df1d47c207ea8ccb"
+    "/assets/scripts/main.js": "/assets/scripts/main.js?id=621b7f4dea48e1a93d3d04910a9a8da7",
+    "/assets/styles/main.css": "/assets/styles/main.css?id=0ef4b3ef391cbeaff5022f2ba61a6b05"
 }