adminforth 1.7.0-next.12 → 1.7.0-next.14

package/commands/createApp/templates/{users.ts.hbs → adminuser.ts.hbs}

@@ -8,7 +8,7 @@ async function canModifyUsers({ adminUser }: { adminUser: AdminUser }): Promise<
 export default {
   dataSource: 'maindb',
   table: 'adminuser',
-  resourceId: 'users',
+  resourceId: 'adminuser',
   label: 'Users',
   recordLabel: (r) => `👤 ${r.email}`,
   options: {
@@ -44,7 +44,7 @@ export default {
     {
       name: 'created_at',
       type: AdminForthDataTypes.DATETIME,
-      showIn: [{
+      showIn: {
         edit: false,
         create: false,
       },

package/commands/createApp/templates/index.ts.hbs

@@ -1,13 +1,13 @@
 import express from 'express';
 import AdminForth, { Filters } from 'adminforth';
-import usersResource from "./resources/users";
+import usersResource from "./resources/adminuser";
 
 const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({
   baseUrl: ADMIN_BASE_URL,
   auth: {
-    usersResourceId: 'users',
+    usersResourceId: 'adminuser',
     usernameField: 'email',
     passwordHashField: 'password_hash',
     rememberMeDays: 30,
@@ -51,7 +51,7 @@ export const admin = new AdminForth({
     {
       label: 'Users',
       icon: 'flowbite:user-solid',
-      resourceId: 'users'
+      resourceId: 'adminuser'
     }
   ],
 });
@@ -68,8 +68,8 @@ if (import.meta.url === `file://${process.argv[1]}`) {
   admin.express.serve(app)
 
   admin.discoverDatabases().then(async () => {
-    if (!await admin.resource('users').get([Filters.EQ('email', 'adminforth')])) {
-      await admin.resource('users').create({
+    if (!await admin.resource('adminuser').get([Filters.EQ('email', 'adminforth')])) {
+      await admin.resource('adminuser').create({
         email: 'adminforth',
         password_hash: await AdminForth.Utils.generatePasswordHash('adminforth'),
         role: 'superadmin',

package/commands/createApp/utils.js

@@ -191,8 +191,8 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: { dbUrl, prismaDbUrl },
     },
     {
-      src: 'users.ts.hbs',
-      dest: 'resources/users.ts',
+      src: 'adminuser.ts.hbs',
+      dest: 'resources/adminuser.ts',
       data: {},
     },
     {

package/dist/spa/src/components/Filters.vue

@@ -54,7 +54,7 @@
             />
 
             <Input
-              v-else-if="[ 'string', 'text' ].includes(c.type)"
+              v-else-if="['string', 'text', 'unknown'].includes(c.type)"
               type="text"
               full-width
               :placeholder="$t('Search')"
@@ -62,6 +62,14 @@
               :modelValue="getFilterItem({ column: c, operator: 'ilike' })"
             />
 
+            <textarea
+              v-else-if="['json', 'richtext'].includes(c.type)"
+              class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary"
+              :placeholder="$t('Search')"
+              :value="getFilterItem({ column: c, operator: 'ilike' })"
+              @input="setFilterItem({ column: c, operator: 'ilike', value: $event.target.value || undefined })"
+            />
+
            <CustomDateRangePicker
              v-else-if="['datetime'].includes(c.type)"
              :column="c"
@@ -72,7 +80,7 @@
            />
 
             <Input
-              v-else-if="[ 'date', 'time' ].includes(c.type)"
+              v-else-if="['date', 'time'].includes(c.type)"
               type="text"
               full-width
               :placeholder="$t('Search datetime')"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.7.0-next.12",
+  "version": "1.7.0-next.14",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",