@agung_dhewe/webapps 1.1.2 → 1.2.4

package/modules/generator/tpl-searchdesign.html

@@ -0,0 +1,32 @@
+<!-- SEARCH-DESIGN -->
+<div name="designer-search" class="designer-search hidden">
+	Jika search tidak didefinisikan, akan otomatis ditambahkan search criteria exact berdasarkan id<br><br>
+	<table name="tbl-search">
+		<tr>
+			<td style="vertical-align: top;">
+				<input name="criteria_name" class="action-input" placeholder="criteria name">
+				<div style="padding-left: 6px; font-size: 0.8rem;">
+					<a name="btnNew" href="javascript:void(0)">new</a>
+				</div>
+			</td>
+			<td style="vertical-align: top;">
+				<input name="criteria_label" class="action-input" placeholder="criteria label">
+			</td>			
+			<td style="vertical-align: top;">
+				<div>
+					<input name="criteria_fields" class="action-input" style="width: 400px" placeholder="fields">
+				</div>
+				<div style="font-size: 0.8em; font-style: italic; padding-left: 5px;">
+					untuk multiple fields, pisahkan dengan koma (,)<br>
+					ketikkan <b>namafield</b> untuk exact search,<br>
+					atau ketikkan <b>%namafield</b> untuk search like
+				</div>
+				
+			</td>
+			<td style="vertical-align: top;">
+				<button name="btnAdd" class="action-button-add">Add</button>
+			</td>
+		</tr>
+
+	</table>
+</div>

package/modules/generator/tpl-uniquedesign.html

@@ -0,0 +1,25 @@
+<!-- UNIQUE-DESIGN -->
+<div name="designer-unique" class="designer-unique hidden">
+	<table name="tbl-unique">
+		<tr>
+			<td style="vertical-align: top;">
+				<input name="unique_name" class="action-input" placeholder="unique name">
+				<div style="padding-left: 6px; font-size: 0.8rem;">
+					<a name="btnNew" href="javascript:void(0)">new</a>
+				</div>
+			</td>
+			<td style="vertical-align: top;">
+				<div>
+					<input name="unique_fields" class="action-input" style="width: 400px" placeholder="fields">
+				</div>
+				<div style="font-size: 0.8em; font-style: italic; padding-left: 5px;">
+					untuk multiple fields, pisahkan dengan koma (,)
+				</div>
+				
+			</td>
+			<td style="vertical-align: top;">
+				<button name="btnAdd" class="action-button-add">Add</button>
+			</td>
+		</tr>
+	</table>
+</div>

package/modules/login/login.css

@@ -2,10 +2,18 @@
 	margin: 10px
 }
 
+.loginbox h1 {
+	padding-left: 2px;
+}
+
 .loginbox input {
-	margin-bottom: 5px;
+	padding: 5px;
+	margin: 3px;
 }
 
 .loginbox button {
-	margin-top: 5px;
+	margin: 8px 3px 3px 3px;
+	padding: 8px 30px 8px 30px;
+	font-weight: bold;
+	cursor: pointer;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agung_dhewe/webapps",
-  "version": "1.1.2",
+  "version": "1.2.4",
   "description": "library javascript (nodejs+express) untuk pengembangan applikasi web",
   "type": "module",
   "main": "./src/webapps.js",
@@ -16,7 +16,7 @@
     "postgresql"
   ],
   "author": "Agung Nugroho",
-  "license": "GPL-3.0-or-later",
+  "license": "BSD-3-Clause",
   "publishConfig": {
     "access": "public"
   },
@@ -41,6 +41,8 @@
     "pg-promise": "^11.14.0",
     "redis": "^5.5.6",
     "serve-favicon": "^2.5.0",
+    "session-file-store": "^1.5.0",
+    "svgo": "^4.0.0",
     "ws": "^8.18.3"
   }
-}
+}

package/percobaan/coba-sequencer.js

@@ -0,0 +1,16 @@
+import dotenv from 'dotenv';
+import db from '../src/db.js'
+
+dotenv.config();
+
+try {
+
+	
+
+
+} catch (err) {
+	console.error(err)
+	// process.exit(1)
+} finally {
+	// process.exit(0)
+}

package/src/api.js

@@ -22,15 +22,15 @@ export default class Api {
 	static cekLogin(req) {
 		// jika req.session.user tidak ada datanya, berarti belum login 
 		try {
-			if (req.session.user==null) {
+			if (req.session.user == null) {
 				throw new Error('belum login')
 			}
 
-			if (req.session.user.isLogin==null) {
+			if (req.session.user.isLogin == null) {
 				throw new Error('belum login')
 			}
 
-			if (req.session.user.isLogin==false) {
+			if (req.session.user.isLogin == false) {
 				throw new Error('belum login')
 			}
 		} catch (err) {
@@ -42,13 +42,13 @@ export default class Api {
 	static parseUploadData(data, files) {
 		const jsonFieldName = 'form-body-jsondata'
 		try {
-			if (files!=undefined) {
+			if (files != undefined) {
 				// ambil json data
-				const jsondata = files.filter(file => file.fieldname==jsonFieldName)
+				const jsondata = files.filter(file => file.fieldname == jsonFieldName)
 				const jsonstring = jsondata[0].buffer.toString('utf-8')
 				Object.assign(data, JSON.parse(jsonstring).data)
 
-				const filelist = files.filter(file => file.fieldname!=jsonFieldName)
+				const filelist = files.filter(file => file.fieldname != jsonFieldName)
 				return filelist
 			}
 
@@ -63,10 +63,10 @@ export default class Api {
 		try {
 			if (typeof this[methodName] === 'function') {
 				const result = await this[methodName](body)
-				return result 
+				return result
 			} else {
 				const errNotFound = new Error(`Method "${methodName}" tidak ditemukan.`)
-				errNotFound.code = 404 
+				errNotFound.code = 404
 				throw errNotFound
 			}
 		} catch (err) {
@@ -74,7 +74,10 @@ export default class Api {
 		}
 	}
 
-
 }
 
 
+
+
+
+

package/src/apis/generator.api.js

@@ -14,7 +14,16 @@ import jwt from 'jsonwebtoken';
 const MINUTES = 60 * 1000
 
 const moduleName = 'generator'
-const generateTimeoutMs = 5 * MINUTES 
+const generateTimeoutMs = 5 * MINUTES
+
+const ModuleDbContract = {
+	apps: {
+		table: 'core."apps"'
+	},
+	generator: {
+		table: 'core.generator'
+	}
+}
 
 // api: account
 export default class extends Api {
@@ -24,6 +33,7 @@ export default class extends Api {
 
 	}
 
+
 	// dipanggil dengan model snake syntax
 	// contoh: header-list
 	//         header-open-data
@@ -45,7 +55,7 @@ async function generator_init(self, body) {
 
 	try {
 		// ambil data app dari database
-		const sql = 'select apps_id, apps_url, apps_name, apps_directory from core."apps"'
+		const sql = `select apps_id, apps_url, apps_name, apps_directory from ${ModuleDbContract.apps.table}`
 		const result = await db.any(sql)
 
 		const appsUrls = {}
@@ -61,7 +71,7 @@ async function generator_init(self, body) {
 			userId: req.session.user.userId,
 			userName: req.session.user.userName,
 			userFullname: req.session.userFullname,
-			sid: req.session.sid ,
+			sid: req.session.sid,
 			notifierId: Api.generateNotifierId(moduleName, req.sessionID),
 			notifierSocket: req.app.locals.appConfig.notifierSocket,
 			targetDirectory: context.getRootDirectory(),
@@ -77,17 +87,17 @@ async function generator_init(self, body) {
 
 
 async function generator_list(self, body) {
-	const { criteria={}, limit=0, offset=0, columns=[], sort={} } = body
+	const { criteria = {}, limit = 0, offset = 0, columns = [], sort = {} } = body
 	const searchMap = {
 		searchtext: `generator_modulename ILIKE '%' || \${searchtext} || '%' OR generator_id=try_cast_bigint(\${searchtext}, 0)`,
 		appname: `generator_appname=\${appname}`
 	};
 
 	try {
-	
+
 		// hilangkan criteria '' atau null
 		for (var cname in criteria) {
-			if (criteria[cname]==='' || criteria[cname]===null) {
+			if (criteria[cname] === '' || criteria[cname] === null) {
 				delete criteria[cname]
 			}
 		}
@@ -99,29 +109,29 @@ async function generator_list(self, body) {
 
 		sort._modifydate = 'desc'
 
-		var max_rows = limit==0 ? 50 : limit
-		const tablename = 'core."generator"'
-		const {whereClause, queryParams} = sqlUtil.createWhereClause(criteria, searchMap) 
-		const sql = sqlUtil.createSqlSelect({tablename, columns, whereClause, sort, limit:max_rows+1, offset, queryParams})
+		var max_rows = limit == 0 ? 50 : limit
+		const tablename = ModuleDbContract.generator.table
+		const { whereClause, queryParams } = sqlUtil.createWhereClause(criteria, searchMap)
+		const sql = sqlUtil.createSqlSelect({ tablename, columns, whereClause, sort, limit: max_rows + 1, offset, queryParams })
 		const rows = await db.any(sql, queryParams);
 
-		
+
 		var i = 0
 		const data = []
 		for (var row of rows) {
 			i++
-			if (i>max_rows) { break }
+			if (i > max_rows) { break }
 			data.push(row)
 		}
 
 		var nextoffset = null
-		if (rows.length>max_rows) {
-			nextoffset = offset+max_rows
+		if (rows.length > max_rows) {
+			nextoffset = offset + max_rows
 		}
 
 		return {
 			criteria: criteria,
-			limit:  max_rows,
+			limit: max_rows,
 			nextoffset: nextoffset,
 			data: data
 		}
@@ -132,13 +142,14 @@ async function generator_list(self, body) {
 }
 
 async function generator_open(self, body) {
+	const tablename = ModuleDbContract.generator.table
 	try {
-		const { id } = body 
-		const queryParams = {generator_id: id}
-		const sql = 'select * from core."generator" where generator_id = \${generator_id}'
+		const { id } = body
+		const queryParams = { generator_id: id }
+		const sql = `select * from ${tablename} where generator_id = \${generator_id}`
 		const data = await db.one(sql, queryParams);
 
-		if (data==null) { throw new Error("data tidak ditemukan") }	
+		if (data == null) { throw new Error("data tidak ditemukan") }
 
 		return data
 	} catch (err) {
@@ -148,7 +159,7 @@ async function generator_open(self, body) {
 
 async function generator_save(self, body) {
 	const { data } = body
-	const tablename = 'core."generator"'
+	const tablename = ModuleDbContract.generator.table
 	const req = self.req
 	const user_id = req.session.user.userId
 
@@ -168,7 +179,7 @@ async function generator_save(self, body) {
 		}
 
 		let cmd
-		if (id=='') {
+		if (id == '') {
 			obj._createby = user_id
 			obj._createdate = (new Date()).toISOString()
 			cmd = sqlUtil.createInsertCommand(tablename, obj, ['generator_id'])
@@ -196,7 +207,7 @@ async function generator_generate(self, body) {
 	const ipaddress = req.ip
 
 	try {
-		if (id=='') {
+		if (id == '') {
 			throw new Error('save data dahulu sebelum generate')
 		}
 
@@ -213,7 +224,8 @@ async function generator_generate(self, body) {
 			user_name: user_name,
 			ipaddress: ipaddress,
 			timeout: generateTimeoutMs,
-			jeda: 0.5, // jeda 1 detik per masing-masing generate
+			ModuleDbContract: ModuleDbContract,
+			jeda: 0.5, // jeda 0.5 detik per masing-masing generate
 		})
 
 

package/src/apis/login.api.js

@@ -44,6 +44,7 @@ async function login_init(self, body) {
 }
 
 async function login_doLogin(self, body) {
+	const req = self.req
 	try {
 		const {username, password} = body
 		

package/src/context.js

@@ -4,12 +4,22 @@ let __rootDirectory
 
 
 let fnParseModuleRequest
+let apiCache = true
+
 
 export default {
-	setWebappsDirectory: (dirname)=>{ __dir=dirname },
+
+	alwaysLoadApi: (cached = true) => {
+		apiCache = cached
+	},
+	isApiCached: () => {
+		return apiCache
+	},
+
+	setWebappsDirectory: (dirname) => { __dir = dirname },
 	getWebappsDirectory: () => { return __dir },
 
-	setRootDirectory: (rootdir) => { __rootDirectory=rootdir },
+	setRootDirectory: (rootdir) => { __rootDirectory = rootdir },
 	getRootDirectory: () => { return __rootDirectory },
 
 

package/src/db.js

@@ -1,43 +1,31 @@
 import dotenv from 'dotenv';
 import pgp from 'pg-promise';
 
+
 dotenv.config();
 
+// const initOptions = {};
 const initOptions = {
-    // Misalnya, event untuk memantau query atau error
-    // query: (e) => {
-    //     console.log('QUERY:', e.query);
-    // },
-    // error: (err, e) => {
-    //     console.log('ERROR:', err, e.query);
-    // }
+	async connect(db, dc, useCount) {
+		await db.client.query("SET TIMEZONE = 'Asia/Jakarta'");
+	}
 };
 
 const pgpInstance = pgp(initOptions); // <-- Panggil pgp() hanya satu kali di sini
 
 
 const configDb = {
-    port: process.env.DB_PORT,
-    host:  process.env.DB_HOST,
-    database: process.env.DB_NAME,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASS,
+	port: process.env.DB_PORT,
+	host: process.env.DB_HOST,
+	database: process.env.DB_NAME,
+	user: process.env.DB_USER,
+	password: process.env.DB_PASS,
 }
 
-const configDbLog = {
-    port: process.env.LOGGER_DB_PORT,
-    host:  process.env.LOGGER_DB_HOST,
-    database: process.env.LOGGER_DB_NAME,
-    user: process.env.LOGGER_DB_USER,
-    password: process.env.LOGGER_DB_PASS,
-}
 
+pgpInstance.pg.types.setTypeParser(1082, (stringValue) => stringValue);
 
 const db = pgpInstance(configDb);
-export default db
-
-export const dblog = pgpInstance(configDbLog);
-
 
 
 db.connect()
@@ -50,12 +38,50 @@ db.connect()
 		process.exit(1);
 	});
 
-dblog.connect()
-	.then(obj => {
-		console.log('Connected to Logger Database!');
-		obj.done(); // Klien dikembalikan ke pool
-	})
-	.catch(error => {
-		console.error('\n\x1b[31mError!\x1b[0m cannot\nconnect to Logger Database:', error.message || error, "\n");
-		process.exit(1);
-	});
+
+export default db
+export let dblog = db
+
+
+export function setDbLog() {
+	const configDbLog = {
+		port: process.env.LOGGER_DB_PORT,
+		host: process.env.LOGGER_DB_HOST,
+		database: process.env.LOGGER_DB_NAME,
+		user: process.env.LOGGER_DB_USER,
+		password: process.env.LOGGER_DB_PASS,
+	}
+
+	dblog = pgpInstance(configDbLog);
+	if (configDbLog.host !== undefined) {
+		dblog.connect()
+			.then(obj => {
+				console.log('Connected to Logger Database!');
+				obj.done(); // Klien dikembalikan ke pool
+			})
+			.catch(error => {
+				console.error('\n\x1b[31mError!\x1b[0m cannot\nconnect to Logger Database:', error.message || error, "\n");
+				process.exit(1);
+			});
+	}
+}
+
+
+
+
+
+// export const dblog = pgpInstance(configDbLog);
+
+// if (configDbLog.host !== undefined) {
+
+// 	dblog.connect()
+// 		.then(obj => {
+// 			console.log('Connected to Logger Database!');
+// 			obj.done(); // Klien dikembalikan ke pool
+// 		})
+// 		.catch(error => {
+// 			console.error('\n\x1b[31mError!\x1b[0m cannot\nconnect to Logger Database:', error.message || error, "\n");
+// 			process.exit(1);
+// 		});
+// }
+

package/src/generator/createApiModule.js

@@ -82,9 +82,11 @@ export async function createApiModule(context, options) {
 
 		}
 
+		// const headerusesequencerline = entityHeader.identifierMethod=='auto-yearly-short'  ? true : false
 		const usesequencerline = entityHeader.identifierMethod=='auto-yearly-short' || entitiesDetil.length>0 ? true : false
-		// const autoid = usesequencer || usesequencerline ? true : false
 		const autoid = ['auto-by-default', 'auto-always', 'auto-yearly', 'auto-monthly', 'auto-yearly-short'].includes(entityHeader.identifierMethod)
+		const shortsequencer = entityHeader.identifierMethod=='auto-yearly-short' 
+
 
 
 		const variables = {
@@ -94,6 +96,7 @@ export async function createApiModule(context, options) {
 			autoid,
 			usesequencer,
 			usesequencerline,
+			shortsequencer,
 			yearly,
 			identifierPrefix,
 			identifierBlock,

package/src/generator/createIcon.js

@@ -3,6 +3,7 @@ import { fileURLToPath } from 'url';
 import path from 'path'
 import fs from 'fs/promises'
 import ejs from 'ejs'
+import { optimize } from 'svgo';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -27,8 +28,29 @@ export async function createIcon(context, options) {
 			throw new Error('data icon tidak di support, gunakan svg atau png')
 		}
 
-		const svgBuffer = Buffer.from(base64, 'base64');
-		await fs.writeFile(targetFile, svgBuffer, 'utf8');
+		const buff = Buffer.from(base64, 'base64');
+		
+		// jika icon yang di attach adalah svg
+		// optimasi svg agar ukurannya kecil
+		if (ext=='svg') {
+			const svgText = buff.toString('utf8');
+			const result = optimize(svgText, {
+				path: `${moduleName}.${ext}`, // recommended
+				multipass: true, // all other config fields are available here
+			});
+			const optimizedSvgString = result.data;
+
+			// simpan ke file dengan data yang telah dioptimasi
+			await fs.writeFile(targetFile, optimizedSvgString, 'utf8');
+		
+		} else {
+
+			// tulis ke file apa adanya
+			await fs.writeFile(targetFile, buff, 'utf8');
+		}
+
+
+		
 
 		return `${moduleName}.${ext}`
 	} catch (err) {

package/src/generator/createLayoutCss.js

@@ -0,0 +1,107 @@
+import { kebabToCamel, isFileExist, getSectionData, createAdditionalAttributes } from './helper.js'
+import { fileURLToPath } from 'url';
+import path, { basename } from 'path'
+import fs from 'fs/promises'
+import ejs from 'ejs'
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function createLayoutCss(context, options) {
+	const overwrite = options.overwrite===true
+	const moduleName = context.moduleName
+
+	try {
+
+		const targetLayoutFile =  path.join(context.moduleDir, `${moduleName}.layout.css`)
+		const layoutFiles = []
+
+		for (let entityName in context.entities) {
+			const sectionName = entityName
+			const sectionPart = 'edit'
+			const modulePart = kebabToCamel(`${moduleName}-${sectionName}-${sectionPart}`)
+			const targetFile = path.join(context.moduleDir, `${modulePart}.layout.css`)
+
+			// cek dulu apakah file ada 
+			const fileExists = await isFileExist(targetFile)        
+			if (fileExists && !overwrite) {
+				context.postMessage({message: `skip file: '${targetFile}`})
+				return
+			}
+			context.postMessage({message: `generating file: '${targetFile}`})  // reporting progress to parent process
+
+
+			const entityData = context.entities[entityName]
+			if (!entityData.formGridLayout) {
+				continue   // jika tidak menggunakan formGridLautout tidak perlu generate css layout
+			}
+
+
+			layoutFiles.push(basename(targetFile))
+
+			const fields = []
+			let index = 0
+			for (var fieldName in entityData.Items) {
+				const item = entityData.Items[fieldName]
+				index++
+
+				if (!item.showInForm) {
+					continue
+				}
+
+
+				const component = item.component
+				const fieldname = item.data_fieldname
+				const elementId = `${modulePart}-${item.input_name}`
+				const dposrow = item.input_dposrow??'auto'
+				const dposrowspan = item.input_dposrowspan??''
+				const dposcol = item.input_dposcol??'1'
+				const dposcolspan = item.input_dposcolspan??''
+				const dposstyle = item.input_dposstyle??''
+								
+
+
+				fields.push({  
+					elementId,
+					dposrow,
+					dposcol,
+					dposrowspan: dposrowspan.trim()!='' ? ` / span ${dposrowspan}` : '',
+					dposcolspan: dposcolspan.trim()!='' ? ` / span ${dposcolspan}` : '',
+					dposstyle
+				})
+
+			
+			}
+
+
+			const variables = {
+				moduleName: moduleName,
+				modulePart: modulePart,
+				fields: fields,
+			}
+
+			// console.log(variables)
+
+			const tplFilePath = path.join(__dirname, 'templates', 'layout.css.ejs')
+			const template = await fs.readFile(tplFilePath, 'utf-8');
+			const content = ejs.render(template, variables)
+					
+			await fs.writeFile(targetFile, content, 'utf8');
+		}
+
+		// buat parent css
+		let content = `/* auto generated Layout CSS */\n`
+		if (layoutFiles.length>0) {
+			for (var layoutfile of layoutFiles) {
+				content += `@import url('${layoutfile}');\n`
+			}
+		}
+		await fs.writeFile(targetLayoutFile, content, 'utf8');
+		
+
+
+	} catch (err) {
+		throw err
+	}
+
+}

package/src/generator/createModuleDetilEditHtml.js

@@ -14,6 +14,9 @@ export async function createModuleDetilEditHtml(context, options) {
 	const sectionPart = 'edit'
 
 	try {
+
+		const entityHeader = context.entities['header']
+		
 		for (let entityName in context.entities) {
 			// process selain header
 			if (entityName=='header') {
@@ -67,7 +70,15 @@ export async function createModuleDetilEditHtml(context, options) {
 				const tabindex = item.input_index
 				const binding = item.data_fieldname
 				const additionalAttributes = createAdditionalAttributes(item)
-				const cssContainer = item.input_containercss.trim() == '' ? 'input-field' : `input-field ${item.input_containercss.trim()}` 
+				
+				let cssContainer = item.input_containercss.trim() == '' ? 'input-field' : `input-field ${item.input_containercss.trim()}` 
+
+
+
+				if (fieldName==entityHeader.pk) {
+					cssContainer += ' hidden'
+				}
+
 
 				fields.push({  
 					component,