lib/Controller/RoomShareController.php

@@ -11,7 +11,6 @@ use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 
-use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\IUserManager;
 
@@ -25,9 +24,6 @@ class RoomShareController extends Controller {
 	/** @var IUserManager */
 	private $userManager;
 
-	/** @var IGroupManager */
-	private $groupManager;
-
 	/** @var RoomService */
 	private $roomService;
 
@@ -41,7 +37,6 @@ class RoomShareController extends Controller {
 		IRequest $request,
 		RoomShareService $service,
 		IUserManager $userManager,
-		IGroupManager $groupManager,
 		RoomService $roomService,
 		CircleHelper $circleHelper,
 		$userId
@@ -49,7 +44,6 @@ class RoomShareController extends Controller {
 		parent::__construct($appName, $request);
 		$this->service = $service;
 		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
 		$this->roomService = $roomService;
 		$this->circleHelper = $circleHelper;
 		$this->userId = $userId;
@@ -96,14 +90,6 @@ class RoomShareController extends Controller {
 				}
 
 				$roomShare->setShareWithDisplayName($circle->getName());
-			} elseif ($roomShare->getShareType() === RoomShare::SHARE_TYPE_GROUP) {
-				$shareWithGroup = $this->groupManager->get($roomShare->getShareWith());
-
-				if ($shareWithGroup === null) {
-					continue;
-				}
-
-				$roomShare->setShareWithDisplayName($shareWithGroup->getDisplayName());
 			}
 
 			$shares[] = $roomShare;

tests/Unit/Controller/RoomShareControllerTest.php

@@ -9,7 +9,6 @@ use OCA\BigBlueButton\Db\RoomShare;
 use OCA\BigBlueButton\Service\RoomService;
 use OCA\BigBlueButton\Service\RoomShareService;
 use OCP\AppFramework\Http;
-use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\IUserManager;
 use PHPUnit\Framework\TestCase;
@@ -20,7 +19,6 @@ class RoomShareControllerTest extends TestCase {
 	private $roomService;
 	private $circleHelper;
 	private $userManager;
-	private $groupManager;
 	private $controller;
 
 	private $userId = 'user_foo';
@@ -31,7 +29,6 @@ class RoomShareControllerTest extends TestCase {
 		$this->request = $this->createMock(IRequest::class);
 		$this->service = $this->createMock(RoomShareService::class);
 		$this->userManager = $this->createMock(IUserManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->roomService = $this->createMock(RoomService::class);
 		$this->circleHelper = $this->createMock(CircleHelper::class);
 
@@ -40,7 +37,6 @@ class RoomShareControllerTest extends TestCase {
 			$this->request,
 			$this->service,
 			$this->userManager,
-			$this->groupManager,
 			$this->roomService,
 			$this->circleHelper,
 			$this->userId

ts/Manager/EditRoomDialog.tsx

@@ -132,7 +132,7 @@ const EditRoomDialog: React.FC<Props> = ({ room, restriction, updateProperty, op
 
 				{room.access === Access.InternalRestricted &&
 					<div className="bbb-form-element bbb-form-shareWith">
-						<span className="icon icon-details icon-visible"></span><em>{t('bbb', 'Access') + ' : ' + descriptions.internalRestrictedShareWith}</em>
+						<span className="icon icon-details icon-visible"></span><em>{`${t('bbb', 'Access')} : ${descriptions.internalRestrictedShareWith}`}</em>
 					</div>
 				}
 

ts/Manager/RecordingRow.tsx

@@ -16,12 +16,12 @@ const RecordingRow: React.FC<Props> = ({recording, isAdmin, deleteRecording, sto
 	function checkPublished(recording: Recording, onChange: (value: boolean) => void) {
 		return (
 			<div>
-				<input id={'bbb-record-state-' + recording.id}
+				<input id={`bbb-record-state-${recording.id}`}
 					type="checkbox"
 					className="checkbox"
 					checked={recording.state === 'published'}
 					onChange={(event) =>  onChange(event.target.checked)} />
-				<label htmlFor={'bbb-record-state-' + recording.id}>{t('bbb', 'Published')}</label>
+				<label htmlFor={`bbb-record-state-${recording.id}`}>{t('bbb', 'Published')}</label>
 			</div>
 		);
 	}

ts/Manager/ShareWith.tsx

@@ -107,7 +107,7 @@ const ShareWith: React.FC<Props> = ({ room, permission, shares: allShares, setSh
 							</div>
 							<div className="bbb-shareWith__item__label">
 								<h5>{displayName}
-									{(share.id === ROOM_OWNER_ID || !isOwner) && (' (' + permissionLabel(share.permission) + ')')}
+									{(share.id === ROOM_OWNER_ID || !isOwner) && ` (${permissionLabel(share.permission)})`}
 								</h5>
 							</div>
 							{(share.id > ROOM_OWNER_ID && isOwner) && selectPermission(share.permission, (value) => {