@opengis/fastify-table 1.1.48 → 1.1.50

package/.gitlab-ci.yml

@@ -0,0 +1,18 @@
+stages:
+  - pull
+
+latest-253:
+  stage: pull
+  tags:
+    - cdn
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - cd /data/softpro/docs/fastify-table && git reset --hard && git pull origin main
+    - npm install
+    - npm run docs:build
+    - rm -rf /data/softpro/apidocs/fastify-table || true
+    - mkdir -p /data/softpro/apidocs/fastify-table || true
+    - cp -R ./docs/.vitepress/dist/* /data/softpro/apidocs/fastify-table
+  only:
+    - main

package/Changelog.md

@@ -1,9 +1,9 @@
 # fastify-table
 
-## 1.1.46 - 22.10.2024
+## 1.1.49 - 22.10.2024
 
 - addHook params refactor
-- add handlebars to utils
+- add getFolder, handlebars to utils
 - refactor getAccess for CRUD
 
 ## 1.1.40 - 18.10.2024

package/crud/funcs/getAccess.js

@@ -29,8 +29,9 @@ export default async function getAccess({ table, user = {} }) {
   const { uid } = user;
   const body = await getTemplate('table', table) || {};
 
-  if (config.auth?.disable || user?.user_type?.includes('admin') || body?.public || body.access === 'public' || (body.access === 'user' && user.uid)) {
-    return { actions: ['get'].concat(body.actions || body.action_default || []), query: '1=1' };
+  // console.log(user?.type);
+  if (config.auth?.disable || user?.type === 'admin' || body?.public || body.access === 'public' || (body.access === 'user' && user.uid)) {
+    return { actions: ['get'].concat(user.uid ? body.actions || body.action_default || [] : []), query: '1=1' };
   }
 
   if (!uid || !body?.table) return null;

package/crud/funcs/utils/getFolder.js

@@ -0,0 +1,9 @@
+import path from 'node:path';
+import config from '../../../config.js';
+
+export default function getFolder(req, type = 'server') {
+  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
+  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.48",
+  "version": "1.1.50",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/data.js

@@ -6,7 +6,7 @@ import getAccess from '../../crud/funcs/getAccess.js';
 import setToken from '../../crud/funcs/setToken.js';
 import gisIRColumn from './utils/gisIRColumn.js';
 import applyHook from '../../hook/funcs/applyHook.js';
-import config from '../../config.js';
+// import config from '../../config.js';
 
 const maxLimit = 100;
 export default async function dataAPI(req) {
@@ -36,7 +36,7 @@ export default async function dataAPI(req) {
   }
 
   const {
-    table, columns, sql, cardSql, filters, form, meta, sqlColumns, public: ispublic,
+    table, columns = [], sql, cardSql, filters, form, meta, sqlColumns, public: ispublic,
   } = loadTable;
 
   const tableMeta = await getMeta(table);

package/utils.js

@@ -41,12 +41,14 @@ import getOpt from './crud/funcs/getOpt.js';
 import setOpt from './crud/funcs/setOpt.js';
 
 import isFileExists from './crud/funcs/isFileExists.js';
+import getFolder from './crud/funcs/utils/getFolder.js';
 
 import logger from './logger/getLogger.js';
 
 export default null;
 export {
   config,
+  getFolder,
   handlebars,
   getFilterSQL,
   addCron,