Do not reload page when adding new redirects

elightup · Dec 22, 2023 · 1455a10 · 1455a10
1 parent 54b5b8c
commit 1455a10
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/js/redirection/redirects/Update.js b/js/redirection/redirects/Update.js
@@ -1,14 +1,16 @@
 import { Button, Modal } from '@wordpress/components';
 import { useEffect, useReducer, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { Tooltip, fetcher } from '../helper/misc';
+import { Tooltip, fetcher, useApi } from '../helper/misc';
 
 const Update = ( { redirectToEdit = {}, children, linkClassName, callback } ) => {
 	const [ redirect, setRedirect ] = useState( {} );
 	const [ isProcessing, setIsProcessing ] = useState( false );
 	const [ warningMessage, setWarningMessage ] = useState( '' );
 	const [ showAdvancedOptions, toggleAdvancedOptions ] = useReducer( onOrOff => !onOrOff, false );
 	const [ showModal, setShowModal ] = useState( false );
+	const { result: redirects, mutate } = useApi( 'redirects', {}, { returnMutate: true } );
+
 	const title = redirect.id ? __( 'Update Redirect', 'slim-seo' ) : __( 'Add Redirect', 'slim-seo' );
 
 	const openModal = e => {
@@ -20,15 +22,21 @@ const Update = ( { redirectToEdit = {}, children, linkClassName, callback } ) =>
 	const updateRedirect = () => {
 		setWarningMessage( '' );
 
-		fetcher( 'update_redirect', { redirect }, 'POST' ).then( result => {
-			if ( ! redirect.id ) {
-				window.location.reload();
+		fetcher( 'update_redirect', { redirect }, 'POST' ).then( id => {
+			setShowModal( false );
+			setIsProcessing( false );
+
+			// Update a redirect.
+			if ( redirect.id ) {
+				callback( redirect );
 				return;
 			}
 
-			setShowModal( false );
-			setIsProcessing( false );
-			callback( redirect );
+			// Add new redirect.
+			redirect.id = id;
+			let newRedirects = [ ...redirects ];
+			newRedirects.push( redirect );
+			mutate( newRedirects, { revalidate: false } );
 		} );
 	};
 

diff --git a/src/Redirection/Api/Redirects.php b/src/Redirection/Api/Redirects.php
@@ -56,12 +56,10 @@ public function exists( WP_REST_Request $request ): bool {
 		return $this->db_redirects->exists( $from );
 	}
 
-	public function update_redirect( WP_REST_Request $request ): bool {
+	public function update_redirect( WP_REST_Request $request ): string {
 		$redirect = $request->get_param( 'redirect' );
 
-		$this->db_redirects->update( $redirect );
-
-		return true;
+		return $this->db_redirects->update( $redirect );
 	}
 
 	public function delete_redirects( WP_REST_Request $request ): bool {

diff --git a/src/Redirection/Database/Redirects.php b/src/Redirection/Database/Redirects.php
@@ -22,16 +22,18 @@ public function exists( string $url ): bool {
 		} ) ) > 0;
 	}
 
-	public function update( array $redirect ) {
+	public function update( array $redirect ): string {
 		$redirect['from'] = Helper::normalize_url( $redirect['from'], false );
 		$redirect['to']   = Helper::normalize_url( $redirect['to'], true, true, false );
 		$redirect['note'] = sanitize_text_field( $redirect['note'] );
-		$redirect_id      = empty( $redirect['id'] ) ? uniqid( wp_rand() ) : $redirect['id'];
+		$id               = (string) ( empty( $redirect['id'] ) ? uniqid() : $redirect['id'] );
 
 		unset( $redirect['id'] );
-		$this->redirects[ $redirect_id ] = $redirect;
+		$this->redirects[ $id ] = $redirect;
 
 		update_option( SLIM_SEO_REDIRECTS, $this->redirects );
+
+		return $id;
 	}
 
 	public function delete( array $ids ) {