refactor: clean up AccessControlSettings hook usage and implement log…

…ic to reset access control settings upon toggle
Infinite-Null · Jun 17, 2026 · Jun 18, 2026 · Jun 18, 2026 · Jun 18, 2026 · Jun 18, 2026
commit d6ad4d79bf213973e6916c41c53cd5b94792cd7c
@@ -1,4 +1,9 @@
 <?php
+/**
+ * REST controller for roles and users.
+ *
+ * @package WordPress\AI\REST
+ */
 
 declare( strict_types=1 );
 

@@ -26,41 +26,35 @@
 export function AccessControlSettings( {
 	featureId,
 }: AccessControlSettingsProps ): React.JSX.Element {
 	const {
 		roles,
-		isLoading: rolesLoading,
-		fetchError: rolesFetchError,
+		isLoading,
+		fetchError,
 	} = useRoles();
 	const { suggestions, isSearching, search } = useUserSearch();
 	const { settings, stage, save, isDirty, isSaving } =
 		useAccessControlSettings( featureId );
 
 	const [ localRoles, setLocalRoles ] = useState< string[] | null >( null );
-	// Preserve selected users by ID so they survive suggestion list changes.
 	const [ selectedUserMap, setSelectedUserMap ] = useState<
 		Map< number, string >
 	>( new Map() );
 	const [ localUsers, setLocalUsers ] = useState< number[] | null >( null );
 
 	const effectiveRoles = localRoles ?? settings.roles;
 	const effectiveUsers = localUsers ?? settings.users;
-
-	// Build a name→id map from the current suggestions page.
 	const suggestionNameToId = useMemo( () => {
 		const map = new Map< string, number >();
 		suggestions.forEach( ( u: User ) => map.set( u.name, u.id ) );
 		return map;
 	}, [ suggestions ] );
 
-	// Derive display labels for currently selected users.
-	// Falls back to a merged map of suggestions + previously seen names.
 	const selectedUsersTokens = useMemo( () => {
 		return effectiveUsers.map(
 			( id ) => selectedUserMap.get( id ) ?? id.toString()
 		);
 	}, [ effectiveUsers, selectedUserMap ] );
 
-	// Suggestion labels for the token field.
 	const userSuggestionNames = useMemo(
 		() => suggestions.map( ( u: User ) => u.name ),
 		[ suggestions ]
@@ -111,9 +105,6 @@
 		setLocalUsers( null );
 	}, [ save ] );
 
-	const isLoading = rolesLoading;
-	const fetchError = rolesFetchError;
-
 	return (
 		<div
 			className="ai-access-control-mode-fields ai-feature-settings-form"

@@ -647,7 +647,6 @@
 	const globalEnabled = !! data[ GLOBAL_FIELD_ID ];
 	const checked = !! field.getValue( { item: data } );
 	const isDeveloperMode = useDeveloperModeContext();
-	const isAccessControlMode = useAccessControlModeContext();
 
 	return (
 		<Card.Root
@@ -668,12 +667,6 @@
 					disabled={ ! globalEnabled }
 					help={ field.description }
 				/>
-				{ checked &&
-					isAccessControlMode &&
-					feature &&
-					feature.category !== 'admin' && (
-						<AccessControlSettings featureId={ feature.id } />
-					) }
 				{ globalEnabled && checked && isDeveloperMode && feature && (
 					<DeveloperSettings
 						featureId={ feature.id }
@@ -818,6 +811,44 @@
 		]
 	);
 
+	const handleToggleAccessControlMode = useCallback( async () => {
+		if ( isAccessControlMode ) {
+			const resets: Record< string, [] > = {};
+			const keysToSave: string[] = [];
+
+			featureDefinitions.forEach( ( feature ) => {
+				const rolesKey = `wpai_feature_${ feature.id }_roles`;
+				const usersKey = `wpai_feature_${ feature.id }_users`;
+				resets[ rolesKey ] = [];
+				resets[ usersKey ] = [];
+				keysToSave.push( rolesKey, usersKey );
+			} );
+
+			// @ts-expect-error -- core-data types don't expose editEntityRecord for 'root'/'site' args.
+			editEntityRecord( 'root', 'site', undefined, resets );
+
+			try {
+				await saveSpecifiedEdits( 'root', 'site', undefined, keysToSave, {
+					throwOnError: true,
+				} );
+			} catch {
+				createErrorNotice(
+					__( 'Failed to disable access controls', 'ai' ),
+					{ type: 'snackbar' }
+				);
+			}
+		}
+
+		toggleAccessControlMode();
+	}, [
+		isAccessControlMode,
+		featureDefinitions,
+		editEntityRecord,
+		saveSpecifiedEdits,
+		createErrorNotice,
+		toggleAccessControlMode,
+	] );
+
 	const fields = useMemo< Field< AISettings >[] >( () => {
 		const sectionActionsFields: Field< AISettings >[] = [];
 		const groupedFields = new Map< string, string[] >();
@@ -1038,9 +1069,7 @@
 													? checkIcon
 													: null
 											}
-											onClick={ () => {
-												toggleAccessControlMode();
-											} }
+											onClick={ handleToggleAccessControlMode }
 										>
 											{ __( 'Access controls', 'ai' ) }
 										</MenuItem>