Merge branch 'release-2.20.1' into release

Author: raclim

client/modules/IDE/actions/project.js

@@ -386,7 +386,7 @@ export function changeProjectName(id, newName) {
 }
 
 export function deleteProject(id) {
-  return (dispatch, getState) => {
+  return (dispatch, getState) =>
     apiClient
       .delete(`/projects/${id}`)
       .then(() => {
@@ -411,7 +411,6 @@ export function deleteProject(id) {
           });
         }
       });
-  };
 }
 export function changeVisibility(projectId, projectName, visibility, t) {
   return (dispatch, getState) => {

client/modules/IDE/components/SketchList.jsx

@@ -73,6 +73,30 @@ const SketchList = ({
     [username, user.username, t]
   );
 
+  const handleDeletedProject = useCallback(() => {
+    // sketches table refetches projects post-project deletion for server-side pagination
+    if (sketches.length === 1 && page > 1) {
+      setPage((p) => p - 1);
+    } else {
+      getProjects(username, {
+        page,
+        limit,
+        sortField,
+        sortDir,
+        q: search
+      });
+    }
+  }, [
+    sketches.length,
+    page,
+    getProjects,
+    username,
+    limit,
+    sortField,
+    sortDir,
+    search
+  ]);
+
   const isLoading = () => loading && isInitialDataLoad;
 
   const hasSketches = () => !isLoading() && sketches.length > 0;
@@ -184,6 +208,7 @@ const SketchList = ({
                   user={user}
                   username={username}
                   onAddToCollection={() => setSketchToAddToCollection(sketch)}
+                  onDeletedProject={handleDeletedProject}
                   t={t}
                 />
               ))}

client/modules/IDE/components/SketchListRowBase.jsx

@@ -24,6 +24,7 @@ const SketchListRowBase = ({
   changeProjectName,
   cloneProject,
   deleteProject,
+  onDeletedProject,
   showShareModal,
   changeVisibility,
   t,
@@ -85,7 +86,9 @@ const SketchListRowBase = ({
 
   const handleSketchDelete = () => {
     if (window.confirm(t('Common.DeleteConfirmation', { name: sketch.name }))) {
-      deleteProject(sketch.id);
+      deleteProject(sketch.id).finally(() => {
+        onDeletedProject();
+      });
     }
   };
 
@@ -174,6 +177,7 @@ SketchListRowBase.propTypes = {
     authenticated: PropTypes.bool.isRequired
   }).isRequired,
   deleteProject: PropTypes.func.isRequired,
+  onDeletedProject: PropTypes.func.isRequired,
   cloneProject: PropTypes.func.isRequired,
   changeProjectName: PropTypes.func.isRequired,
   showShareModal: PropTypes.func.isRequired,