Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions inc/Api/AgentFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,18 @@ public static function list_agent_files( WP_REST_Request $request ) {
$input['agent_id'] = (int) $agent_id;
}

$result = self::getAbilities()->executeListAgentFiles( $input );
try {
$result = self::getAbilities()->executeListAgentFiles( $input );
} catch ( \Throwable $e ) {
return new \WP_Error(
'list_agent_files_error',
$e->getMessage(),
array( 'status' => 500 )
);
}

if ( ! $result['success'] ) {
return new WP_Error( 'list_agent_files_error', $result['error'], array( 'status' => 500 ) );
return new \WP_Error( 'list_agent_files_error', $result['error'], array( 'status' => 500 ) );
}

return rest_ensure_response( array(
Expand All @@ -340,11 +348,19 @@ public static function get_agent_file( WP_REST_Request $request ) {
$input['agent_id'] = (int) $agent_id;
}

$result = self::getAbilities()->executeGetAgentFile( $input );
try {
$result = self::getAbilities()->executeGetAgentFile( $input );
} catch ( \Throwable $e ) {
return new \WP_Error(
'get_agent_file_error',
$e->getMessage(),
array( 'status' => 500 )
);
}

if ( ! $result['success'] ) {
$status = false !== strpos( $result['error'] ?? '', 'not found' ) ? 404 : 400;
return new WP_Error( 'get_agent_file_error', $result['error'], array( 'status' => $status ) );
return new \WP_Error( 'get_agent_file_error', $result['error'], array( 'status' => $status ) );
}

return rest_ensure_response( array(
Expand Down
2 changes: 1 addition & 1 deletion inc/Core/Admin/Pages/Agent/assets/react/AgentApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const NoAgentSelectedMessage = ( { message } ) => (
const AgentApp = () => {
const [ selectedFile, setSelectedFile ] = useState( null );
const { data: files } = useAgentFiles();
const hasFiles = files && files.length > 0;
const hasFiles = Array.isArray( files ) && files.length > 0;

// Get selected agent from store
const { selectedAgentId } = useAgentStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ const AgentFileList = ( { selectedFile, onSelectFile } ) => {
}

// Check for duplicates among core files.
const coreFiles = files?.filter( ( f ) => f.type !== 'daily_summary' ) ?? [];
const coreFiles = Array.isArray( files )
? files.filter( ( f ) => f.type !== 'daily_summary' )
: [];
if ( coreFiles.some( ( f ) => f.filename === name ) ) {
setAddError( 'A file with this name already exists.' );
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ export const useAgentFiles = () => {
return useQuery( {
queryKey: KEYS.list( agentId ),
queryFn: api.listAgentFiles,
select: ( response ) => response?.data ?? response ?? [],
select: ( response ) => {
const data = response?.data;
return Array.isArray( data ) ? data : [];
},
} );
};

Expand Down
Loading