fix(Filesystem): API and Next app work well together

danactive · May 8, 2021 · 0fb2613 · 0fb2613
1 parent a355a72
commit 0fb2613
Show file tree

Hide file tree

Showing 19 changed files with 182 additions and 229 deletions.
diff --git a/api/server/plugins/editAlbum/lib/index.js b/api/server/plugins/editAlbum/lib/index.js
@@ -11,10 +11,12 @@ const handler = ({ query: { raw: isRaw } }, reply) => new Promise((resolve) => {
   };
   const viewPath = 'plugins/editAlbum/components/page.jsx';
 
-  const handleResponse = (json) => ((isRaw) ? resolve(reply(formatJson(json))) : resolve(reply.view(viewPath, formatJson(json))));
+  const handleResponse = ({ body: { galleries: json } }) => ((isRaw)
+    ? resolve(reply(formatJson(json)))
+    : resolve(reply.view(viewPath, formatJson(json))));
   const handleError = routes.createErrorReply(reply);
 
-  gallery.getGalleries()
+  gallery.get()
     .then(handleResponse)
     .catch(handleError);
 });

diff --git a/api/server/plugins/gallery/lib/index.js b/api/server/plugins/gallery/lib/index.js
@@ -7,8 +7,8 @@ async function register(server) {
     options: {
       tags: ['api'],
       handler: async () => {
-        const { body } = await gallery.get();
-        return body;
+        const { body: { galleries } } = await gallery.get();
+        return { galleries };
       },
     },
   });

diff --git a/api/server/plugins/home/lib/index.js b/api/server/plugins/home/lib/index.js
@@ -3,7 +3,7 @@ const gallery = require('../../../../../app/pages/api/galleries/local');
 async function handler(request, reply) {
   const isRaw = request.query.raw;
   const viewPath = 'plugins/home/components/page.jsx';
-  const galleries = await gallery.getGalleries();
+  const { body: { galleries } } = await gallery.get();
   const out = { galleries };
 
   if (isRaw) {

diff --git a/api/server/plugins/utils/lib/utils.js b/api/server/plugins/utils/lib/utils.js
@@ -5,6 +5,7 @@ const glob = require('glob');
 const path = require('path');
 
 const configFile = require('../../../../../config.json');
+const utilsFactory = require('../../../../../app/pages/api/admin/filesystem/utils');
 
 const config = {
   get: (dotpath) => dotProp.get(configFile, dotpath),
@@ -33,8 +34,7 @@ function clone(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
 
-
-
+const fileMethods = utilsFactory();
 
 fileMethods.videoToThumbsPath = (filepath = null, gallery = null) => {
   if (filepath === null || gallery === null) {
@@ -76,5 +76,5 @@ fileMethods.glob = (sourceFolder, pattern, options = {}) => new Promise((resolve
 });
 
 module.exports = {
-  env, config, clone
+  env, config, clone, file: fileMethods,
 };
diff --git a/api/server/plugins/walk/lib/index.js b/api/server/plugins/walk/lib/index.js
@@ -1,5 +1,5 @@
 const routes = require('../../../lib/routes');
-const files = require('./files');
+const files = require('../../../../../app/pages/api/admin/filesystem/local');
 const validation = require('../../../lib/validation');
 
 const routeWalkPath = {
@@ -8,7 +8,8 @@ const routeWalkPath = {
   options: {
     handler: async function handler({ query: { path } }) {
       try {
-        return files.listFiles(path);
+        const { body } = await files.get(path);
+        return { files: body.files };
       } catch (e) {
         return routes.wrapError(e);
       }

diff --git a/api/server/plugins/walk/test/.eslintrc.js b/api/server/plugins/walk/test/.eslintrc.js
diff --git a/api/server/plugins/walk/test/cases.js b/api/server/plugins/walk/test/cases.js
diff --git a/api/server/plugins/walk/test/files.jest.js b/api/server/plugins/walk/test/files.jest.js
diff --git a/api/server/plugins/walk/test/files.spec.js b/api/server/plugins/walk/test/files.spec.js
diff --git a/api/server/plugins/walk/test/index.spec.js b/api/server/plugins/walk/test/index.spec.js
diff --git a/app/__tests__/__snapshots__/snapshot.js.snap → ...__tests__/__snapshots__/snapshot.jsx.snap b/app/__tests__/__snapshots__/snapshot.js.snap → ...__tests__/__snapshots__/snapshot.jsx.snap
@@ -9,6 +9,7 @@ exports[`renders homepage unchanged 1`] = `
       className="title"
     >
       Welcome to
+       
       <a
         href="https://nextjs.org"
       >
@@ -19,6 +20,7 @@ exports[`renders homepage unchanged 1`] = `
       className="description"
     >
       Get started by editing
+       
       <code>
         pages/index.js
       </code>

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -13,7 +13,6 @@
   },
   "dependencies": {
     "app-root-path": "^3.0.0",
-    "boom": "^7.0.0",
     "glob": "^7.1.6",
     "mime-types": "^2.1.28",
     "next": "^10.0.0",