@opengis/fastify-table 1.4.68 → 1.4.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.68",
+  "version": "1.4.69",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/routes/table/controllers/getFormByTable.js

@@ -16,7 +16,8 @@ export default async function getForm({
     pg = pgClients.client, params = {}, user = {}, query = {},
 }, reply) {
     const time = Date.now();
-    const { add, edit } = query;
+    const { add } = query;
+    const edit = query.edit || params.id;
 
     if (!user?.uid) {
         return reply.status(401).send('unauthorized');
@@ -52,9 +53,9 @@ export default async function getForm({
         }
     }));
 
-    const res = { schema };
+    const res = { mode: 'form', time: 0, schema };
 
-    if (add && user.uid) {
+    if (user.uid) {
         if (!actions.includes('add') && !config.local) {
             return reply.status(403).send('access restricted: actions');
         }
@@ -67,7 +68,7 @@ export default async function getForm({
             uid: user.uid,
             array: 1,
         });
-        Object.assign(res, { token: addTokens[0] });
+        Object.assign(res, { token: addTokens[0], mode: 'add' });
     }
 
     if (edit && user.uid) {
@@ -82,7 +83,7 @@ export default async function getForm({
         const data = await getEditData({
             pg, params: { table: hookData?.table || params.name, id: edit }, user,
         }, reply, true);
-        Object.assign(res, { token: editTokens[0], data });
+        Object.assign(res, { token: editTokens[0], data, mode: 'edit' });
     }
 
     // replace settings

package/server/routes/table/index.js

@@ -41,15 +41,17 @@ async function plugin(app, config = {}) {
   app.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data);
   app.get(`${prefix}/table-data/:table`, { config: { policy: ['user', 'no-sql'] }, schema: tableDataSchema }, data);
   app.get(`${prefix}/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);
-  app.get(`${prefix}/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
+
   app.get(`${prefix}/data-info/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, dataInfo);
 
+  app.get(`${prefix}/card-data/:token`, { config: { policy }, scheme: cardTabDataSchema }, cardTabData);
   app.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
+
   app.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);
 
   app.get(`${prefix}/templates`, () => loadTemplatePath);
   app.get(`${prefix}/filter/:table`, { config: { policy }, schema: filterSchema }, filter);
-  app.get(`${prefix}/form/:name`, { config: { policy: ['user', 'site'] }, schema: formSchema }, form);
+  app.get(`${prefix}/form/:name/:id?`, { config: { policy: ['user', 'site'] }, schema: formSchema }, form);
 }
 
 export default plugin;

package/server/routes/table/schema.js

@@ -86,6 +86,7 @@ const formSchema = {
   properties: {
     params: {
       name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
     },
   },
 };