[BigBlueButton] displays parent ws in administration

claroline · Jan 11, 2021 · 7edb4b4 · 7edb4b4
1 parent 72dc6ce
commit 7edb4b4
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 15 deletions.
diff --git a/src/integration/big-blue-button/Finder/BBBFinder.php b/src/integration/big-blue-button/Finder/BBBFinder.php
@@ -13,11 +13,31 @@
 
 use Claroline\AppBundle\API\Finder\AbstractFinder;
 use Claroline\BigBlueButtonBundle\Entity\BBB;
+use Doctrine\ORM\QueryBuilder;
 
 class BBBFinder extends AbstractFinder
 {
     public function getClass()
     {
         return BBB::class;
     }
+
+    public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], array $sortBy = null, array $options = ['count' => false, 'page' => 0, 'limit' => -1])
+    {
+        foreach ($searches as $filterName => $filterValue) {
+            switch ($filterName) {
+                case 'workspace':
+                    $qb->leftJoin('obj.resourceNode', 'n');
+                    $qb->leftJoin('n.workspace', 'w');
+                    $qb->andWhere('w.uuid = :workspaceId');
+                    $qb->setParameter('workspaceId', $filterValue);
+                    break;
+
+                default:
+                    $this->setDefaults($qb, $filterName, $filterValue);
+            }
+        }
+
+        return $qb;
+    }
 }
diff --git a/src/integration/big-blue-button/Finder/RecordingFinder.php b/src/integration/big-blue-button/Finder/RecordingFinder.php
@@ -13,11 +13,32 @@
 
 use Claroline\AppBundle\API\Finder\AbstractFinder;
 use Claroline\BigBlueButtonBundle\Entity\Recording;
+use Doctrine\ORM\QueryBuilder;
 
 class RecordingFinder extends AbstractFinder
 {
     public function getClass()
     {
         return Recording::class;
     }
+
+    public function configureQueryBuilder(QueryBuilder $qb, array $searches = [], array $sortBy = null, array $options = ['count' => false, 'page' => 0, 'limit' => -1])
+    {
+        foreach ($searches as $filterName => $filterValue) {
+            switch ($filterName) {
+                case 'workspace':
+                    $qb->leftJoin('obj.meeting', 'm');
+                    $qb->leftJoin('m.resourceNode', 'n');
+                    $qb->leftJoin('n.workspace', 'w');
+                    $qb->andWhere('w.uuid = :workspaceId');
+                    $qb->setParameter('workspaceId', $filterValue);
+                    break;
+
+                default:
+                    $this->setDefaults($qb, $filterName, $filterValue);
+            }
+        }
+
+        return $qb;
+    }
 }
diff --git a/src/integration/big-blue-button/Resources/modules/integration/bbb/components/meetings.jsx b/src/integration/big-blue-button/Resources/modules/integration/bbb/components/meetings.jsx
@@ -29,6 +29,14 @@ const BBBMeetings = (props) =>
           displayed: true,
           filterable: false,
           sortable: false
+        }, {
+          name: 'node.workspace',
+          alias: 'workspace',
+          type: 'workspace',
+          label: trans('workspace'),
+          displayed: true,
+          filterable: true,
+          sortable: false
         }, {
           name: 'info.participantCount',
           type: 'number',

diff --git a/src/integration/big-blue-button/Resources/modules/integration/bbb/components/recordings.jsx b/src/integration/big-blue-button/Resources/modules/integration/bbb/components/recordings.jsx
@@ -40,6 +40,15 @@ const BBBRecordings = (props) =>
           displayed: true,
           primary: true,
           order: 1
+        }, {
+          name: 'workspace',
+          alias: 'workspace',
+          type: 'workspace',
+          label: trans('workspace'),
+          displayed: true,
+          filterable: true,
+          sortable: false,
+          order: 2
         }
       ]}
     />

diff --git a/src/integration/big-blue-button/Serializer/RecordingSerializer.php b/src/integration/big-blue-button/Serializer/RecordingSerializer.php
@@ -16,22 +16,37 @@ public function getClass(): string
 
     public function serialize(Recording $recording, array $options = []): array
     {
-        return [
-           'id' => $recording->getUuid(),
-           'recordId' => $recording->getRecordId(),
-           'startTime' => (int) $recording->getStartTime(),
-           'endTime' => (int) $recording->getEndTime(),
-           'status' => $recording->getStatus(),
-           'participants' => $recording->getParticipants(),
-           // this is to display a link to the resource in administration
-           // so I don't need much information
-           'meeting' => [
-               'id' => $recording->getMeeting()->getResourceNode()->getUuid(),
-               'slug' => $recording->getMeeting()->getResourceNode()->getSlug(),
-               'name' => $recording->getMeeting()->getResourceNode()->getName(),
-           ],
-           'medias' => $recording->getMedias(),
+        $resourceNode = $recording->getMeeting()->getResourceNode();
+
+        $serialized = [
+            'id' => $recording->getUuid(),
+            'recordId' => $recording->getRecordId(),
+            'startTime' => (int) $recording->getStartTime(),
+            'endTime' => (int) $recording->getEndTime(),
+            'status' => $recording->getStatus(),
+            'participants' => $recording->getParticipants(),
+            // this is to display a link to the resource in administration
+            // so I don't need much information
+            'meeting' => [
+                'id' => $resourceNode->getUuid(),
+                'slug' => $resourceNode->getSlug(),
+                'name' => $resourceNode->getName(),
+            ],
+            'medias' => $recording->getMedias(),
         ];
+
+        // this is to display a link to the workspace in administration
+        // so I don't need much information
+        $workspace = $resourceNode->getWorkspace();
+        if ($workspace) {
+            $serialized['workspace'] = [
+                'id' => $workspace->getUuid(),
+                'slug' => $workspace->getSlug(),
+                'name' => $workspace->getName(),
+            ];
+        }
+
+        return $serialized;
     }
 
     public function deserialize(array $data, Recording $recording): Recording