@opengis/admin 0.3.7 → 0.3.9

package/server/routes/templates/controllers/getTemplate.js

@@ -1,10 +1,12 @@
-import { config, applyHook, getTemplate, getToken, setToken } from "@opengis/fastify-table/utils.js";
+import { config, applyHook, getTemplate, getToken, setToken, handlebarsSync } from "@opengis/fastify-table/utils.js";
 
-function formatSchema(schema, user) {
+function formatSchema(schema, user, opt) {
     function parseDataTables(obj) {
         if (obj?.add) {
+            const obj1 = obj.add?.obj?.includes('{{') && opt ? handlebarsSync.compile(obj.add.obj)(opt) : obj.add?.obj;
+            if (obj.add?.obj) obj.add.obj = obj1;
             const [token] = setToken({
-                ids: [JSON.stringify({ ... obj.add, table: obj.add?.table || obj.add?.model })],
+                ids: [JSON.stringify({ ...obj.add, table: obj.add?.table || obj.add?.model })],
                 uid: user.uid,
                 array: 1,
             });
@@ -18,33 +20,26 @@ function formatSchema(schema, user) {
 
 export default async function getTemplateApi(req) {
     const { user } = req?.session?.passport || {};
-    const { params = {}, session = {} } = req;
+    const { params = {} } = req;
     const { type, name } = params;
 
     const tokenData = await getToken({ token: name, uid: user?.uid, json: 1 }) || {};
 
     const hookData = await applyHook('preTemplate', { name: tokenData.name || name, type, user });
-    if (hookData?.message && hookData?.status) {
-        return hookData;
-    }
+    if (hookData?.message && hookData?.status) return hookData;
 
     const data = await getTemplate(type, hookData?.name || tokenData.form || name);
-    if (!['interface', 'table'].includes(type)
-        && (!data?.public || !data?.ispublic)
-        && !config?.auth?.disable
-        && !session.passport?.user?.uid
-        && false
-    ) {
-        return `access restricted ${name}`;
+
+    if (tokenData.obj) {
+        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
+        Object.assign(data, { obj });
     }
+
     if (type === 'form' && user?.uid) {
         const schema = data.schema || data;
-        formatSchema(schema, user);
+        formatSchema(schema, user, data.obj);
     }
+
     await applyHook('afterTemplate', { name, type, data, user });
-    if (tokenData.obj) {
-        const obj = tokenData.obj.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {})
-        Object.assign(data, { obj });
-    }
     return data?.html || data || `template not found "${name}"`;
 }