yaml-admin-api 0.0.116 → 0.0.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.116",
+  "version": "0.0.118",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/chart-api-generator.js

@@ -14,12 +14,25 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
     if (!dashboard)
         return;
 
-    const chartComponents = dashboard.filter(m => m.component === 'chart');
+    const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
+
+    const chartComponents = [] 
+
+    if(dashboard.sections) {
+        dashboard.sections.forEach(section=>{
+            section.components?.filter(m => m.component === 'chart').forEach(m=>{
+                chartComponents.push(m)
+            });
+        })
+    } else if(Array.isArray(dashboard)){
+        dashboard.filter(m => m.component === 'chart').forEach(m=>{
+            chartComponents.push(m)
+        });
+    }
+
     if (chartComponents.length === 0)
         return;
 
-    const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
-
     const createChartDataTypeDate = async (chart, {from_date, filter}) => {
         const r = {
             options: {
@@ -260,6 +273,42 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
         return r
     }
 
+    const createChartDataTypePie = async (chart, {filter}) => {
+        const { x, y } = chart;
+        const { field, entity: entity_x, values } = x;
+        const entity = entity_x || y?.entity;
+
+        let a = [];
+        if (filter && Object.keys(filter).length > 0)
+            a.push({ $match: filter });
+        a.push({ $group: { _id: `$${field}`, count: { $sum: 1 } } });
+
+        if (chart.debug)
+            console.log('chart pie', chart.label, entity, JSON.stringify(a, null, 2));
+
+        const list = await db.collection(entity).aggregate(a).toArray();
+
+        let labels, series, colors;
+        if (values?.length) {
+            labels  = values.map(v => v.label || v.name);
+            series  = values.map(v => list.find(l => String(l._id) === String(v.name))?.count || 0);
+            colors  = values.map(v => v.color).filter(Boolean);
+        } else {
+            labels  = list.map(l => String(l._id));
+            series  = list.map(l => l.count);
+            colors  = [];
+        }
+
+        return {
+            options: {
+                chart: { id: chart.id },
+                labels,
+                ...(colors.length ? { colors } : {}),
+            },
+            series,
+        };
+    };
+
     for (const chart of chartComponents) {
         const { id } = chart;
         console.log('generateChartApi', chart.id)
@@ -312,7 +361,9 @@ const generateChartApi = async (app, db, yml, api_prefix) => {
                         filter[s.name] = value;
                 });
                 
-                if (x.type == 'date') {
+                if (chart.type === 'pie' || chart.type === 'donut') {
+                    r = await createChartDataTypePie(chart, {filter});
+                } else if (x.type == 'date') {
                     let {from_date} = req.query //YYYYMMDD
                     r = await createChartDataTypeDate(chart, {from_date, filter});
                 } else if(x.type == 'field') {

package/src/member/member.js

@@ -21,7 +21,8 @@ module.exports = async function (app, db, yml, api_prefix) {
     app.get(api_prefix + '/member/islogin',
         auth.isAuthenticated,
         async function (req, res) {
-            res.json({ r: true, member: req.user });
+            const { authority, ...member } = req.user;
+            res.json({ r: true, authority, member });
         }
     );