Merge branch 'next' into add-command-to-import-resource

Author: NoOne7135

adminforth/commands/createApp/templates/Dockerfile.hbs

@@ -3,5 +3,5 @@ WORKDIR /code/
 ADD package.json package-lock.json /code/
 RUN npm ci  
 ADD . /code/
-RUN --mount=type=cache,target=/tmp npx adminforth bundle
+RUN npx adminforth bundle
 CMD ["sh", "-c", "npm run migrate:prod && npm run prod"]

adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md

@@ -519,9 +519,19 @@ Default behavior of the Dialog component will allow user to close it by just cli
   </div>
 </div>
 
-### Dialog open and close
+### Programatically open or close dialog
 
-You can open and close dialog by calling `open` and `close` methods.
+If you want to control dialog programmatically, you can use `ref` to get a reference to the dialog component. 
+
+```html
+<Dialog ref="confirmDialog" class="w-96">
+  <div class="space-y-4">
+    The dialog content goes here.
+  </div>
+</Dialog>
+```
+
+Now you can open and close dialog by calling `open` and `close` methods.
 
 ```ts
 

adminforth/documentation/docs/tutorial/05-Plugins/05-upload.md

@@ -6,10 +6,17 @@ This plugin allows you to upload files to Amazon S3 bucket.
 
 ```
 npm i @adminforth/upload --save
-npm i @adminforth/storage-adapter-amazon-s3 --save
 ```
 
-## S3
+Plugin needs some storage adapter to store files and serve them for preview.
+
+### Using Amazon S3 storage adapter
+
+Amazon S3 is probably the most popular storage service.
+
+```
+npm i @adminforth/storage-adapter-amazon-s3 --save
+```
 
 1. Go to https://aws.amazon.com and login.
 2. Go to Services -> S3 and create a bucket. Put in bucket name e.g. `my-reality-bucket`. 
@@ -204,7 +211,7 @@ export async function getPresignedUrl(s3Path: string): Promise<string> {
 
 Alternatively, if you don't want to generate presigned URLs, you might want to make all objects public. Then you will be able  concatenate backet base domain and path stored in db, and use it as source of image. Let's consider how to do it.
 
-### S3 upload with public access
+#### S3 upload with public access
 
 1. First of all go to your bucket settings, Permissions, scroll down to Block public access (bucket settings for this bucket) and uncheck all checkboxes.
 2. Go to bucket settings, Permissions, Object ownership and select "ACLs Enabled" and "Bucket owner preferred" radio buttons.
@@ -268,6 +275,8 @@ If for example your domain is `my-domain.com` and you bucket has name `static.my
 
 Also you will have to enable static website hosting in your bucket settings and set index.html and error.html to empty strings.
 
+### S
+
 
 ## Image generation
 

adminforth/index.ts

@@ -236,9 +236,15 @@ class AdminForth implements IAdminForth {
     });
   }
 
-  validateRecordValues(resource: AdminForthResource, record: any): any {
+  validateRecordValues(resource: AdminForthResource, record: any,  mode: 'create' | 'edit'): any {
     // check if record with validation is valid
     for (const column of resource.columns.filter((col) => col.name in record && col.validation)) {
+      const required = typeof column.required === 'object'
+      ? column.required[mode]
+      : true;
+
+      if (!required && !record[column.name]) continue;
+
       let error = null;
       if (column.isArray?.enabled) {
         error = record[column.name].reduce((err, item) => {
@@ -333,6 +339,9 @@ class AdminForth implements IAdminForth {
       }
       if (fieldTypes === null) {
         console.error(`⛔ DataSource ${res.dataSource} was not able to perform field discovery. It will not work properly`);
+        if (process.env.NODE_ENV === 'production') {
+          process.exit(1); 
+        }
         return;
       }
       if (!res.columns) {
@@ -465,7 +474,7 @@ class AdminForth implements IAdminForth {
     { resource: AdminForthResource, record: any, adminUser: AdminUser, extra?: HttpExtra }
   ): Promise<{ error?: string, createdRecord?: any }> {
 
-    const err = this.validateRecordValues(resource, record);
+    const err = this.validateRecordValues(resource, record, 'create');
     if (err) {
       return { error: err };
     }
@@ -534,7 +543,7 @@ class AdminForth implements IAdminForth {
     { resource, recordId, record, oldRecord, adminUser, extra }:
     { resource: AdminForthResource, recordId: any, record: any, oldRecord: any, adminUser: AdminUser, extra?: HttpExtra }
   ): Promise<{ error?: string }> {
-    const err = this.validateRecordValues(resource, record);
+    const err = this.validateRecordValues(resource, record, 'edit');
     if (err) {
       return { error: err };
     }

adminforth/modules/codeInjector.ts

@@ -596,7 +596,7 @@ class CodeInjector implements ICodeInjector {
       }
     } catch (e) {
       // ignore
-      process.env.HEAVY_DEBUG && console.log('🪲Hash file does not exist, proceeding with npm ci/install');
+      process.env.HEAVY_DEBUG && console.log('🪲Hash file does not exist, proceeding with npm ci/install', e);
     }
 
     await this.runNpmShell({command: 'ci', cwd: this.spaTmpPath(), envOverrides: { 

adminforth/spa/src/components/MenuLink.vue

@@ -12,19 +12,20 @@
   >
     <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons  transition duration-75  group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
     <span class="text-ellipsis overflow-hidden ms-3">{{ item.label }}</span>
-    <span v-if="item.badge" class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
-          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]"
+    <span v-if="item.badge"
     >
 
         <Tooltip v-if="item.badgeTooltip">
-          {{ item.badge }}
+          <div class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
 
           <template #tooltip>
             {{ item.badgeTooltip }}
           </template>
         </Tooltip>
         <template v-else>
-          {{ item.badge }}
+          <div class="inline-flex items-center justify-center h-3 py-3 px-1 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent min-w-[1.5rem] max-w-[3rem]">{{ item.badge }}</div>
         </template> 
 
     </span>

adminforth/spa/src/stores/core.ts

@@ -86,7 +86,9 @@ export const useCoreStore = defineStore('core', () => {
   }
   async function subscribeToMenuBadges() {
     const processItem = (mi: AdminForthConfigMenuItem) => {
-      if (mi.badge) {
+
+      // console.log('🔔 subscribeToMenuBadges', mi.badge, JSON.stringify(mi));
+      if (mi.badge !== undefined) {
         websocket.subscribe(`/opentopic/update-menu-badge/${mi.itemId}`, ({ badge }) => {
           mi.badge = badge;
         });

adminforth/spa/src/views/EditView.vue

@@ -147,9 +147,18 @@ async function saveRecord() {
   saving.value = true;
   const updates = {};
   for (const key in record.value) {
-    let columnIsUpdated = record.value[key] !== coreStore.record[key];
+    let columnIsUpdated = false;
+
+    if (typeof record.value[key] !== typeof coreStore.record[key]) {
+      columnIsUpdated = true;
+    } else if (typeof record.value[key] === 'object') {
+      columnIsUpdated = JSON.stringify(record.value[key]) !== JSON.stringify(coreStore.record[key]);
+    } else {
+      columnIsUpdated = record.value[key] !== coreStore.record[key];
+    }
 
     const column = coreStore.resource.columns.find((c) => c.name === key);
+
     if (column?.foreignResource) {
       columnIsUpdated = record.value[key] !== coreStore.record[key]?.pk;
     }

live-demo/app/Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /code/
 ADD package.json package-lock.json /code/
 RUN npm ci  
 ADD . /code/
-RUN --mount=type=cache,target=/tmp npm run bundleNow
+RUN npm run bundleNow
 
 
 CMD ["npm", "run", "startLive"]