fix: Add Typescript ignores as Typescript 5+ is required but conflict…

…s with types from react 17 See also: vercel/next.js#42292 We need to update to react 18 to fix this properly Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Nov 29, 2023 · b166210 · b166210
1 parent 7464bde
commit b166210
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 234 deletions.
diff --git a/src/settings/AdminGroupSelect.tsx b/src/settings/AdminGroupSelect.tsx
@@ -21,14 +21,13 @@
  *
  */
 
-import * as React from 'react';
-import Select from 'react-select';
+import * as React from 'react'
+import Select from 'react-select'
 
 import { CLASS_NAME_ADMIN_DELEGATION } from '../Constants.js'
-import { Component } from 'react';
-import { getCurrentUser } from '@nextcloud/auth';
-import { Group, Api, Circle } from './Api';
-import { loadState } from '@nextcloud/initial-state';
+import { Component } from 'react'
+import { getCurrentUser } from '@nextcloud/auth'
+import { Group, Api } from './Api'
 
 interface AdminGroupSelectProps {
 	groups: Group[],
@@ -44,7 +43,7 @@ class AdminGroupSelect extends Component<AdminGroupSelectProps> {
 		delegatedAdminGroups: [],
 	}
 
-	constructor (props) {
+	constructor(props) {
 		super(props)
 		this.state.groups = props.groups
 		this.state.allGroups = props.allGroups
@@ -55,62 +54,64 @@ class AdminGroupSelect extends Component<AdminGroupSelectProps> {
 
 	componentDidMount() {
 		this.api.listGroups().then((groups) => {
-			this.setState({groups});
-		});
+			this.setState({ groups })
+		})
 		this.api.listDelegatedGroups(CLASS_NAME_ADMIN_DELEGATION).then((groups) => {
-			this.setState({delegatedAdminGroups: groups});
-		});
+			this.setState({ delegatedAdminGroups: groups })
+		})
 	}
 
 	updateDelegatedAdminGroups(options: {value: string, label: string}[]): void {
 		if (this.state.groups !== undefined) {
 			const groups = options.map(option => {
-				return this.state.groups.filter(g => g.gid === option.value)[0];
-			});
-			this.setState({delegatedAdminGroups: groups}, () => {
-				this.api.updateDelegatedGroups(this.state.delegatedAdminGroups, CLASS_NAME_ADMIN_DELEGATION);
-			});			
+				return this.state.groups.filter(g => g.gid === option.value)[0]
+			})
+			this.setState({ delegatedAdminGroups: groups }, () => {
+				this.api.updateDelegatedGroups(this.state.delegatedAdminGroups, CLASS_NAME_ADMIN_DELEGATION)
+			})
 		}
 	}
 
-	render () {
+	render() {
 		const options = this.state.groups.map(group => {
 			return {
 				value: group.gid,
-				label: group.displayName
-			};
-		});
+				label: group.displayName,
+			}
+		})
 
+		/* @ts-expect-error Typescript error due to async react component */
 		return <Select
 			onChange={ this.updateDelegatedAdminGroups.bind(this) }
 			isDisabled={getCurrentUser() ? !getCurrentUser()!.isAdmin : true}
 			isMulti
 			value={this.state.delegatedAdminGroups.map(group => {
 				return {
 					value: group.gid,
-					label: group.displayName
-				};
+					label: group.displayName,
+				}
 			})}
 			className="delegated-admins-select"
 			options={options}
 			placeholder={t('groupfolders', 'Add group')}
 			styles={{
 				input: (provided) => ({
 					...provided,
-					height: '30'
+					height: '30',
 				}),
 				control: (provided) => ({
 					...provided,
-					backgroundColor: 'var(--color-main-background)'
+					backgroundColor: 'var(--color-main-background)',
 				}),
 				menu: (provided) => ({
 					...provided,
 					backgroundColor: 'var(--color-main-background)',
-					borderColor: 'var(--color-border, #888)'
-				})
+					borderColor: 'var(--color-border, #888)',
+				}),
 			}}
 		/>
 	}
+
 }
 
-export default AdminGroupSelect
+export default AdminGroupSelect