Recycle Bin implemented

xtremespb · Aug 10, 2021 · fdf2462 · fdf2462
1 parent ba286c7
commit fdf2462
Show file tree

Hide file tree

Showing 36 changed files with 859 additions and 60 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "zoia3",
-	"version": "3.1.94",
+	"version": "3.1.95",
 	"description": "ZOIA Content Management System",
 	"scripts": {
 		"config": "node ./dev/bin/config.js",

diff --git a/src/modules/boilerplate/api/apiDelete.js b/src/modules/boilerplate/api/apiDelete.js
@@ -60,8 +60,19 @@ export default () => ({
             await utils.removeFiles(filesList, req.zoiaConfig);
             // Remove images (from disk)
             await utils.removeImages(imagesList, req.zoiaConfig);
-            // Delete requested IDs
-            const result = await this.mongo.db.collection(collectionName).deleteMany(queryDb);
+            let result;
+            if (req.body.recycle) {
+                result = await this.mongo.db.collection(collectionName).updateMany(queryDb, {
+                    $set: {
+                        deletedAt: new Date(),
+                    }
+                }, {
+                    upsert: false
+                });
+            } else {
+                // Delete requested IDs
+                result = await this.mongo.db.collection(collectionName).deleteMany(queryDb);
+            }
             // Check result
             if (!result || !result.acknowledged) {
                 response.deleteError();

diff --git a/src/modules/boilerplate/api/apiList.js b/src/modules/boilerplate/api/apiList.js
@@ -45,7 +45,11 @@ export default () => ({
                 req.body.sortId = `${req.body.language}.${req.body.sortId}`;
                 break;
             }
-            const query = {};
+            const query = {
+                deletedAt: {
+                    $eq: null
+                }
+            };
             if (req.body.searchText && req.body.searchText.length > 1) {
                 query.$or = [];
                 listData.search.map(c => {

diff --git a/src/modules/boilerplate/api/apiRecycledDelete.js b/src/modules/boilerplate/api/apiRecycledDelete.js
@@ -0,0 +1,43 @@
+import moduleConfig from "../module.json";
+
+export default () => ({
+    attachValidation: false,
+    async handler(req) {
+        const {
+            log,
+            response,
+            auth,
+            acl,
+        } = req.zoia;
+        // Check permissions
+        if (!auth.statusAdmin()) {
+            response.unauthorizedError();
+            return;
+        }
+        if (!acl.checkPermission(moduleConfig.id, "delete")) {
+            response.requestAccessDeniedError();
+            return;
+        }
+        const {
+            collectionName
+        } = req.zoiaModulesConfig[moduleConfig.id];
+        try {
+            const result = await this.mongo.db.collection(collectionName).deleteMany({
+                deletedAt: {
+                    $ne: null
+                }
+            });
+            // Check result
+            if (!result || !result.acknowledged) {
+                response.deleteError();
+                return;
+            }
+            // Send "success" result
+            response.successJSON();
+            return;
+        } catch (e) {
+            log.error(e);
+            response.internalServerError(e.message);
+        }
+    }
+});
diff --git a/src/modules/boilerplate/api/apiRecycledList.js b/src/modules/boilerplate/api/apiRecycledList.js
@@ -0,0 +1,71 @@
+import recycledListData from "./data/recycledList.json";
+import moduleConfig from "../module.json";
+
+export default () => ({
+    schema: {
+        body: recycledListData.schema
+    },
+    attachValidation: true,
+    async handler(req) {
+        const {
+            log,
+            response,
+            auth,
+            acl
+        } = req.zoia;
+        // Check permissions
+        if (!auth.statusAdmin()) {
+            response.unauthorizedError();
+            return;
+        }
+        // Validate form
+        if (req.validationError) {
+            log.error(null, req.validationError.message);
+            response.validationError(req.validationError);
+            return;
+        }
+        const {
+            collectionName
+        } = req.zoiaModulesConfig[moduleConfig.id];
+        try {
+            const options = {
+                sort: {},
+                projection: recycledListData.projection
+            };
+            const query = {
+                deletedAt: { $ne: null },
+            };
+            if (req.body.searchText && req.body.searchText.length > 1) {
+                query.$or = recycledListData.search.map(c => {
+                    const sr = {};
+                    sr[c] = {
+                        $regex: req.body.searchText,
+                        $options: "i"
+                    };
+                    return sr;
+                });
+            }
+            const count = await this.mongo.db.collection(collectionName).find(query, options).count();
+            const limit = req.body.itemsPerPage || req.zoiaConfig.commonTableItemsLimit;
+            options.limit = limit;
+            options.skip = (req.body.page - 1) * limit;
+            options.sort[req.body.sortId] = req.body.sortDirection === "asc" ? 1 : -1;
+            const data = (await this.mongo.db.collection(collectionName).find(query, options).toArray()).map(i => ({
+                _id: String(i._id),
+                deletedAt: !acl.checkPermission(moduleConfig.id, "read", i.deletedAt) ? "***" : i.deletedAt,
+                title: !acl.checkPermission(moduleConfig.id, "read", i.uid) ? "***" : i.uid,
+            }));
+            // Send response
+            response.successJSON({
+                data,
+                count,
+                limit,
+                pagesCount: Math.ceil(count / limit),
+            });
+            return;
+        } catch (e) {
+            log.error(e);
+            response.internalServerError(e.message);
+        }
+    }
+});
diff --git a/src/modules/boilerplate/api/apiRecycledRestore.js b/src/modules/boilerplate/api/apiRecycledRestore.js
@@ -0,0 +1,78 @@
+import {
+    ObjectId
+} from "mongodb";
+import deleteData from "./data/delete.json";
+import moduleConfig from "../module.json";
+
+export default () => ({
+    schema: {
+        body: deleteData.root
+    },
+    attachValidation: true,
+    async handler(req) {
+        const {
+            log,
+            response,
+            auth,
+            acl
+        } = req.zoia;
+        // Check permissions
+        if (!auth.statusAdmin()) {
+            response.unauthorizedError();
+            return;
+        }
+        // Validate form
+        if (req.validationError) {
+            log.error(null, req.validationError.message);
+            response.validationError(req.validationError);
+            return;
+        }
+        const {
+            collectionName
+        } = req.zoiaModulesConfig[moduleConfig.id];
+        try {
+            // Build query
+            const queryDb = {
+                $or: req.body.ids.map(id => ({
+                    _id: new ObjectId(id)
+                }))
+            };
+            // Get requested data
+            const dataDb = await this.mongo.db.collection(collectionName).find(queryDb, {
+                projection: {
+                    uid: 1
+                }
+            }).toArray();
+            // Check permission
+            let allowed = true;
+            (dataDb || []).map(i => {
+                if (allowed && !acl.checkPermission(moduleConfig.id, "delete", i.uid)) {
+                    allowed = false;
+                }
+            });
+            if (!allowed) {
+                response.requestAccessDeniedError();
+                return;
+            }
+            // Restore requested IDs
+            const result = await this.mongo.db.collection(collectionName).updateMany(queryDb, {
+                $set: {
+                    deletedAt: null
+                }
+            }, {
+                upsert: false
+            });
+            // Check result
+            if (!result || !result.acknowledged) {
+                response.deleteError();
+                return;
+            }
+            // Send "success" result
+            response.successJSON();
+            return;
+        } catch (e) {
+            log.error(e);
+            response.internalServerError(e.message);
+        }
+    }
+});
diff --git a/src/modules/boilerplate/api/apiSave.js b/src/modules/boilerplate/api/apiSave.js
@@ -89,6 +89,7 @@ export default () => ({
                 updateExtras.createdAt = new Date();
             }
             // Update database
+            delete data.id;
             const update = await this.mongo.db.collection(collectionName).updateOne(id ? {
                 _id: new ObjectId(id)
             } : {

diff --git a/src/modules/boilerplate/api/data/delete.json b/src/modules/boilerplate/api/data/delete.json
@@ -12,6 +12,9 @@
                 },
                 "minItems": 1,
                 "uniqueItems": true
+            },
+            "recycle": {
+                "type": ["boolean", "null"]
             }
         },
         "required": ["ids"]

diff --git a/src/modules/boilerplate/api/data/recycledList.json b/src/modules/boilerplate/api/data/recycledList.json
@@ -0,0 +1,40 @@
+{
+    "schema": {
+        "type": "object",
+        "properties": {
+            "page": {
+                "type": "number",
+                "minimum": 1,
+                "maximum": 999999
+            },
+            "sortId": {
+                "type": "string",
+                "enum": ["title", "deletedAt"]
+            },
+            "sortDirection": {
+                "type": "string",
+                "enum": ["asc", "desc"]
+            },
+            "searchText": {
+                "type": "string",
+                "minLength": 0,
+                "maxLength": 128
+            },
+            "itemsPerPage": {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1000
+            },
+            "autoItemsPerPage": {
+                "type": "boolean"
+            }
+        },
+        "required": ["page", "sortId", "sortDirection"]
+    },
+    "projection": {
+        "_id": 1,
+        "uid": 1,
+        "deletedAt": 1
+    },
+    "search": ["uid"]
+}
diff --git a/src/modules/boilerplate/api/index.js b/src/modules/boilerplate/api/index.js
@@ -2,11 +2,18 @@ import apiList from "./apiList";
 import apiSave from "./apiSave";
 import apiLoad from "./apiLoad";
 import apiDelete from "./apiDelete";
+import apiRecycledDelete from "./apiRecycledDelete";
+import apiRecycledList from "./apiRecycledList";
+import apiRecycledRestore from "./apiRecycledRestore";
+
 import moduleConfig from "../module.json";
 
 export default fastify => {
     fastify.post(`/api/${moduleConfig.id}/list`, apiList());
     fastify.post(`/api/${moduleConfig.id}/edit/save`, apiSave());
     fastify.post(`/api/${moduleConfig.id}/edit/load`, apiLoad());
     fastify.post(`/api/${moduleConfig.id}/edit/delete`, apiDelete());
+    fastify.post(`/api/${moduleConfig.id}/list/recycled`, apiRecycledList());
+    fastify.post(`/api/${moduleConfig.id}/edit/delete/restore`, apiRecycledRestore());
+    fastify.post(`/api/${moduleConfig.id}/edit/delete/recycled`, apiRecycledDelete());
 };
diff --git a/src/modules/boilerplate/config.dist.json b/src/modules/boilerplate/config.dist.json
@@ -4,7 +4,9 @@
         "collections": {
             "boilerplate": {
                 "indexesAsc": ["id", "[language].title"],
-                "indexesDesc": ["id", "[language].title"]
+                "indexesDesc": ["id", "[language].title"],
+                "expires": 259200,
+                "expireField": "deletedAt"
             }
         }
     },

diff --git a/src/modules/boilerplate/web/admin/dataList/index.marko b/src/modules/boilerplate/web/admin/dataList/index.marko
@@ -91,6 +91,7 @@ $ const token = cookies.get(`${out.global.siteId || "zoia3"}.authToken`);
 		sortId="title"
 		sortDirection="asc"
 		checkboxColumn=true
+		recycleBin=true
 		on-action-click("onActionClick")
 		on-top-button-click("onTopButtonClick")
 		i18n=out.global.i18n

diff --git a/src/modules/core/config.dist.json b/src/modules/core/config.dist.json
@@ -15,7 +15,9 @@
             },
             "registry": {
                 "indexesAsc": [],
-                "indexesDesc": []
+                "indexesDesc": [],
+                "expires": 259200,
+                "expireField": "deletedAt"
             },
             "rateLimit": {
                 "indexesAsc": [],