Merge pull request #439 from devforth/new-dev-demo

New dev demo

Author: yaroslav8765

README.md

@@ -61,44 +61,50 @@ npx adminforth create-app
 
 The most convenient way to add new features or fixes is using `dev-demo`. It imports the source code of the repository and plugins so you can edit them and see changes on the fly.
 
-Fork repo, pull it and do next:
+To run dev demo:
+```sh
+cd dev-demo
 
+npm run setup-dev-demo
+npm run migrate:all
 
-```sh
-cd adminforth
-npm ci
-npm run build
+npm start
 ```
 
-To run dev demo:
-```sh
-cd dev-demo
-cp .env.sample .env
+## Adding columns to a database in dev-demo
 
-# this will install all official plugins and link adminforth package, if plugin installed it will git pull and npm ci
-npm run install-plugins
+Open `./migrations` folder. There is prisma migration folder for the sqlite, postgres and mysql and `clickhouse_migrations` folder for the clickhouse:
 
-# same for official adapters
-npm run install-adapters
+### Migrations for the MySQL, SQLite and Postgres
+To make migration add to the .prisma file in folder with database you need and add new tables or columns. Then run:
 
-npm ci
 
-./run_inventory.sh
+```
+npm run makemigration:sqlite -- --name init
+```
+
+and 
 
-npm run migrate:local
-npm start
+```
+npm run migrate:sqlite
 ```
 
-## Adding columns to a database in dev-demo
+to apply migration
+
+> use :sqlite, :mysql or :postgres for you case
+
+### Migrations for the clickhouse
 
-Open `.prisma` file, modify it, and run:
+In order to make migration for the clickhouse, go to the `./migrations/clickhouse_migrations` folder and add migration file to the folder.
 
+Then run
 ```
-npm run namemigration -- --name desctiption_of_changes
+npm run migrate:clickhouse
 ```
 
+to apply the migration.
 
-### Testing CLI commands during development
+## Testing CLI commands during development
 
 
 Make sure you have not `adminforth` globally installed. If you have it, remove it:

adminforth/spa/src/views/EditView.vue

@@ -94,7 +94,7 @@ import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
 import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
-import { computed, onMounted, ref, type Ref, nextTick } from 'vue';
+import { computed, onMounted, ref, type Ref, nextTick, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { showErrorTost } from '@/composables/useFrontendApi';
 import ThreeDotsMenu from '@/components/ThreeDotsMenu.vue';
@@ -118,6 +118,10 @@ const saving = ref(false);
 
 const record: Ref<Record<string, any>> = ref({});
 
+watch(record, (newVal) => {
+  console.log('Record updated:', newVal);
+}, { deep: true });
+
 const resourceFormRef = ref<InstanceType<typeof ResourceForm> | null>(null);
 
 const editSaveButtonInjection = computed<AdminForthComponentDeclarationFull | null>(() => {

adminforth/types/Back.ts

@@ -1102,7 +1102,7 @@ export interface AdminForthInputConfig {
       /**
        * Add custom page to the settings page
        */
-      userMenuSettingsPages: {
+      userMenuSettingsPages?: {
         icon?: string,
         pageLabel: string,
         slug?: string,

dev-demo/.db.sqlite-journal

@@ -0,0 +1,2 @@
+node_modules
+.db.sqlite

dev-demo/.dockerignore

@@ -1,6 +1,14 @@
-KEYCLOAK_URL=http://localhost:8080
-
 ADMINFORTH_SECRET=123
 NODE_ENV=development
-DATABASE_URL=sqlite://./.db.sqlite
-DATABASE_FILE_URL=file:.db.sqlite
+SQLITE_URL=sqlite://migrations/prisma/sqlite/.db.sqlite
+SQLITE_FILE_URL=file:.db.sqlite
+
+CH_MIGRATIONS_HOME=./migrations/clickhouse_migrations
+CH_MIGRATIONS_HOST=localhost:8124/demo
+CH_MIGRATIONS_USER=demo
+CH_MIGRATIONS_PASSWORD=demo
+
+AWS_REGION=eu-central-1
+AWS_BUCKET_NAME=tmpbucket-adminforth
+AWS_ACCESS_KEY_ID=your_access_key_id
+AWS_SECRET_ACCESS_KEY=your_secret_access_key

dev-demo/.env.local

@@ -0,0 +1,3 @@
+NODE_ENV=production
+DATABASE_URL=sqlite:////code/db/.db.sqlite
+PRISMA_DATABASE_URL=file:/code/db/.db.sqlite

dev-demo/.env.prod

@@ -1,4 +1,6 @@
 node_modules
 *.sqlite
+.sqlite
 .env
-db
+db
+images/*

dev-demo/.env.sample

@@ -0,0 +1,7 @@
+FROM node:20-slim
+WORKDIR /code/
+ADD package.json package-lock.json /code/
+RUN npm ci  
+ADD . /code/
+RUN npx adminforth bundle
+CMD ["sh", "-c", "npm run migrate:prod && npm run prod"]