reset dev-demo and live-dom

Author: SerVitasik

adminforth/types/Common.ts

@@ -445,6 +445,7 @@ export interface AdminForthResourceInputCommon {
           bottom?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           threeDotsDropdownItems?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
           customActionIcons?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+          tableBodyStart?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
         },
 
         /**

dev-demo/index.ts

@@ -9,7 +9,6 @@ import apartmentBuyersResource from './resources/apartment_buyers.js';
 import auditLogResource from './resources/audit_log.js';
 import descriptionImageResource from './resources/description_image.js';
 import usersResource from './resources/users.js';
-import userSubResource from './resources/user_sub.js';
 // import gameResource from './resources/game.js';
 // import gamesUsersResource from './resources/games_users.js';
 // import gamesResource from './resources/games.js';
@@ -212,7 +211,6 @@ export const admin = new AdminForth({
     clinicsResource,
     providersResource,
     apiKeysResource,
-    userSubResource,
     // gamesResource,
     // gamesUsersResource,
     // gameResource,
@@ -298,7 +296,7 @@ export const admin = new AdminForth({
           label: 'Translations',
           icon: 'material-symbols:translate',
           resourceId: 'translations',
-        },
+        }
       ]
     },
     {
@@ -454,7 +452,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
 app.get(`${ADMIN_BASE_URL}/api/aparts-by-room-percentages/`,
   admin.express.authorize(
     async (req, res) => {
-      const roomPercentages = await admin.resource('aparts').dataConnector.db.prepare(
+      const roomPercentages = await admin.resource('aparts').dataConnector.client.prepare(
         `SELECT 
           number_of_rooms, 
           COUNT(*) as count 

dev-demo/inventory.yml

@@ -56,28 +56,22 @@ services:
       - mysql-data:/var/lib/mysql
 
   keycloak:
-    image: quay.io/keycloak/keycloak:latest
-    command: start-dev --import-realm
-    environment:
-      - KEYCLOAK_ADMIN=admin
-      - KEYCLOAK_ADMIN_PASSWORD=admin
-      - DB_VENDOR=postgres
-      - DB_ADDR=pg
-      - DB_DATABASE=demo
-      - DB_USER=demo
-      - DB_PASSWORD=demo
-      - KEYCLOAK_IMPORT=/opt/keycloak/data/import/keycloak-realm.json
-      - KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID}
-      - KEYCLOAK_CLIENT_SECRET=${KEYCLOAK_CLIENT_SECRET}
-      - KEYCLOAK_URL=${KEYCLOAK_URL}
-      - KEYCLOAK_REALM=${KEYCLOAK_REALM}
-    ports:
-      - "8080:8080"
-    depends_on:
-      - pg
-    volumes:
-      - keycloak-data:/opt/keycloak/data
-      - ./keycloak-realm.json:/opt/keycloak/data/import/keycloak-realm.json
+      image: quay.io/keycloak/keycloak:latest
+      command: start-dev
+      environment:
+        - KEYCLOAK_ADMIN=admin
+        - KEYCLOAK_ADMIN_PASSWORD=admin
+        - DB_VENDOR=postgres
+        - DB_ADDR=pg
+        - DB_DATABASE=demo
+        - DB_USER=demo
+        - DB_PASSWORD=demo
+      ports:
+        - "8080:8080"
+      depends_on:
+        - pg
+      volumes:
+        - keycloak-data:/opt/keycloak/data
 
 
 volumes:

dev-demo/resources/apartments.ts

@@ -10,10 +10,9 @@ import UploadPlugin from "../../plugins/adminforth-upload";
 import ImportExportPlugin from "../../plugins/adminforth-import-export/index.js";
 import { v1 as uuid } from "uuid";
 import RichEditorPlugin from "../../plugins/adminforth-rich-editor";
-import ListInPlaceEditPlugin from "../../plugins/adminforth-list-in-place-edit";
 import { AdminForthResourceInput } from "../../adminforth";
 import CompletionAdapterOpenAIChatGPT from "../../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js";
-import InlineCreatePlugin from "../../plugins/adminforth-inline-create";
+
 const demoChecker = async ({ record, adminUser, resource }) => {
   if (adminUser.dbUser.role !== "superadmin") {
     return { ok: false, error: "You can't do this on demo.adminforth.dev" };
@@ -191,8 +190,7 @@ export default {
       showIn: {create: true, edit: true, filter: true, show: true},
       allowMinMaxQuery: true, // use better experience for filtering e.g. date range, set it only if you have index on this column or if there will be low number of rows
       editingNote: "Price is in USD", // you can appear note on editing or creating page
-      // editReadonly: true, // you can set field to be readonly on edit page
-      type: AdminForthDataTypes.DECIMAL,
+      editReadonly: true, // you can set field to be readonly on edit page
 
     },
     {
@@ -300,32 +298,21 @@ export default {
             preview: {
               // Used to display preview (if it is image) in list and show views
               // previewUrl: ({s3Path}) => `https://tmpbucket-adminforth.s3.eu-central-1.amazonaws.com/${s3Path}`,
-              // showInList: true,
-              // maxWidth: "200px",
-              maxWidth: "40px",
-              maxListWidth: "300px",
-              minWidth: "200px",
-              // minListWidth: "100px",
-              // minShowWidth: "200px",
-
+              showInList: true,
+              maxWidth: "200px",
             },
           }),
         ]
       : []),
     new ImportExportPlugin({}),
-    // new TextCompletePlugin({
-    //   fieldName: "title",
-    //   expert: {
-    //     debounceTime: 250,
-    //   },
-    //   adapter: new CompletionAdapterOpenAIChatGPT({
-    //     openAiApiKey: process.env.OPENAI_API_KEY as string,
-    //   }),
-    // }),
-    new InlineCreatePlugin({
-    }),
-    new ListInPlaceEditPlugin({
-      columns: ["title", "price", "number_of_rooms", "description", "listed", "room_sizes"] 
+    new TextCompletePlugin({
+      fieldName: "title",
+      expert: {
+        debounceTime: 250,
+      },
+      adapter: new CompletionAdapterOpenAIChatGPT({
+        openAiApiKey: process.env.OPENAI_API_KEY as string,
+      }),
     }),
     // new TextCompletePlugin({
     //   openAiApiKey: process.env.OPENAI_API_KEY as string,

dev-demo/resources/api_keys.ts

@@ -30,16 +30,16 @@ export default {
     {
       name: 'owner',
       type: AdminForthDataTypes.STRING,
-      // enum: [
-      //   {
-      //     value: 'clinic',
-      //     label: 'Clinic',
-      //   },
-      //   {
-      //     value: 'provider',
-      //     label: 'Provider',
-      //   },
-      // ],
+      enum: [
+        {
+          value: 'clinic',
+          label: 'Clinic',
+        },
+        {
+          value: 'provider',
+          label: 'Provider',
+        },
+      ],
       showIn: { create: false, edit: false },
     },
     {

dev-demo/resources/clinics.ts

@@ -1,7 +1,5 @@
 import { AdminForthDataTypes, AdminForthResourceInput } from "../../adminforth";
 import { v1 as uuid } from "uuid";
-import ImportExport from "../../plugins/adminforth-import-export";
-
 
 export default {
   dataSource: 'pg',
@@ -25,16 +23,12 @@ export default {
     },
     {
       name: 'name',
-      type: AdminForthDataTypes.TEXT,
+      type: AdminForthDataTypes.STRING,
       required: true,
       maxLength: 255,
-
     },
 
   ],
-  plugins: [
-    new ImportExport({
-    }),
-  ],
+  plugins: [],
   options: {},
 } as AdminForthResourceInput;

dev-demo/resources/users.ts

@@ -15,7 +15,6 @@ import EmailAdapterAwsSes from "../../adapters/adminforth-email-adapter-aws-ses/
 import OAuthPlugin  from "../../plugins/adminforth-oauth";
 import AdminForthAdapterGoogleOauth2 from "../../adapters/adminforth-google-oauth-adapter";
 import AdminForthAdapterGithubOauth2 from  "../../adapters/adminforth-github-oauth-adapter";
-import ListInPlaceEditPlugin from "../../plugins/adminforth-list-in-place-edit";
 
 import AdminForthAdapterFacebookOauth2 from "../../adapters/adminforth-facebook-oauth-adapter";
 import AdminForthAdapterKeycloakOauth2 from "../../adapters/adminforth-keycloak-oauth-adapter";
@@ -43,7 +42,7 @@ export default {
       foreignResourceId: "audit_log",
     }),
     new ForeignInlineListPlugin({
-      foreignResourceId: "user_sub",
+      foreignResourceId: "users",
     }),
     new TwoFactorsAuthPlugin({
       twoFaSecretFieldName: "secret2fa",
@@ -121,9 +120,6 @@ export default {
       emailField: 'email',
       emailConfirmedField: 'email_confirmed'
     }),
-    // new ListInPlaceEditPlugin({
-    //   columns: ["role"]
-    // })
   ],
   options: {
     allowedActions: {
@@ -186,7 +182,7 @@ export default {
     {
       name: "role",
       enum: [
-        { value: 'superadmin', label: 'Super Admin' },
+        // { value: 'superadmin', label: 'Super Admin' },
         { value: "user", label: "User" },
       ],
     },
@@ -211,7 +207,7 @@ export default {
       foreignResource: {
         resourceId: "users",
       }
-    },
+    }
     // {
     //   name: "email_confirmed",
     // },

live-demo/app/index.ts

@@ -141,7 +141,7 @@ if (import.meta.url === `file://${process.argv[1]}`) {
   app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
     admin.express.authorize(
       async (req, res) => {
-        const db = admin.resource('aparts').dataConnector.db;
+        const db = admin.resource('aparts').dataConnector.client;
         const days = req.body.days || 7;
         const apartsByDays = await db.prepare(
           `SELECT