chore: backport fixes

Signed-off-by: Robin Appelman <robin@icewind.nl>

lib/Folder/FolderManager.php

@@ -27,13 +27,11 @@
 use OCA\Circles\CirclesQueryHelper;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Model\Circle;
-use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\CircleProbe;
 use OCA\GroupFolders\ACL\UserMapping\IUserMapping;
 use OCA\GroupFolders\ACL\UserMapping\IUserMappingManager;
 use OCA\GroupFolders\ACL\UserMapping\UserMapping;
 use OCA\GroupFolders\Mount\GroupMountPoint;
-use OCA\GroupFolders\ResponseDefinitions;
 use OCP\AutoloadNotAllowedException;
 use OCP\Constants;
 use OCP\DB\Exception;
@@ -42,6 +40,7 @@
 use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -436,7 +435,7 @@ private function getGroups(int $id): array {
 
 	/**
 	 * @throws Exception
-	 * @return list<GroupFoldersCircle>
+	 * @return list<array{displayname: string, sid: string}>
 	 */
 	private function getCircles(int $id): array {
 		$circles = $this->getAllApplicable()[$id] ?? [];

src/settings/Api.ts

@@ -24,6 +24,11 @@ export interface OCSGroup {
 	displayname: string;
 }
 
+export interface OSCCircle {
+	sid: string;
+	displayname: string;
+}
+
 export interface ManageRuleProps {
 	type: string;
 	id: string;
@@ -141,9 +146,9 @@ export class Api {
 	async aclMappingSearch(folderId: number, search: string): Promise<{
 		groups: ManageRuleProps[],
 		users: ManageRuleProps[],
-		circles: AclManage[],
+		circles: ManageRuleProps[],
 	}> {
-		const response = await axios.get<OCSResponse<{groups: OCSGroup[], users: OCSUser[], circles: Circle[]}>>(this.getUrl(`folders/${folderId}/search`), { params: { search } })
+		const response = await axios.get<OCSResponse<{groups: OCSGroup[], users: OCSUser[], circles: OSCCircle[]}>>(this.getUrl(`folders/${folderId}/search`), { params: { search } })
 		return {
 			groups: Object.values(response.data.ocs.data.groups).map((item) => {
 				return {

src/settings/App.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { Component, FormEvent } from 'react'
 
-import { Api, Circle, Folder, Group, OCSGroup, OCSUser } from './Api'
+import {Api, Circle, Folder, Group, ManageRuleProps, OCSGroup, OCSUser} from './Api'
 import { FolderGroups } from './FolderGroups'
 import { QuotaSelect } from './QuotaSelect'
 import './App.scss'
@@ -371,7 +371,7 @@ export class App extends Component<{}, AppState> implements OC.Plugin<OC.Search.
 interface ManageAclSelectProps {
 	folder: Folder;
 	onChange: (type: string, id: string, manageAcl: boolean) => void;
-	onSearch: (name: string) => Thenable<{ groups: OCSGroup[]; users: OCSUser[]; circles: AclManage[] }>;
+	onSearch: (name: string) => Thenable<{ groups: ManageRuleProps[]; users: ManageRuleProps[]; circles: ManageRuleProps[] }>;
 }
 
 /**
@@ -390,7 +390,7 @@ function ManageAclSelect({ onChange, onSearch, folder }: ManageAclSelectProps) {
 		})
 	}
 
-	const typeLabel = (item: AclManage) => {
+	const typeLabel = (item: ManageRuleProps) => {
 		switch (item.type) {
 			case "circle":
 				return t('groupfolders', 'Team');

tests/Folder/FolderManagerTest.php

@@ -26,6 +26,7 @@
 use OCP\Constants;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IMimeTypeLoader;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;