Merge branch 'imprv/reduce-the-load-of-the-completely-delete-including-recursive' into imprv/refactor-revertDelete

src/client/js/components/EmptyTrashModal.jsx

@@ -23,7 +23,7 @@ const EmptyTrashModal = (props) => {
     setErrs(null);
 
     try {
-      await appContainer.apiv3Delete('/pages/empty-trash', { socketclientId: socketIoContainer.getSocketClientId() });
+      await appContainer.apiv3Delete('/pages/empty-trash', { socketClientId: socketIoContainer.getSocketClientId() });
       window.location.reload();
     }
     catch (err) {

src/server/routes/apiv3/pages.js

@@ -436,7 +436,7 @@ module.exports = (crowi) => {
    *            description: Succeeded to remove all trash pages
    */
   router.delete('/empty-trash', loginRequired, adminRequired, csrf, async(req, res) => {
-    const socketClientId = req.query.socketclientId;
+    const socketClientId = req.query.socketClientId;
     const options = { socketClientId };
 
     try {