Merge branch 'next' of github.com:devforth/adminforth into feature/AdminForth/893/bug-with-login-via-google

Author: SerVitasik

adminforth/commands/createApp/templates/package.json.hbs

@@ -31,6 +31,6 @@
     "@types/express": "latest",
     "@types/node": "latest",
     "@prisma/client": "latest",
-    "prisma": "latest"
+    "prisma": "^7.0.0"
   }
 }

adminforth/commands/createApp/templates/prisma.config.ts.hbs

@@ -0,0 +1,8 @@
+import 'dotenv/config'
+import { defineConfig, env } from 'prisma/config'
+
+export default defineConfig({
+  datasource: {
+    url: env('PRISMA_DATABASE_URL'),
+  },
+})

adminforth/commands/createApp/templates/schema.prisma.hbs

@@ -4,7 +4,6 @@ generator client {
 
 datasource db {
   provider = "{{provider}}"
-  url      = env("PRISMA_DATABASE_URL")
 }
 
 model adminuser {

adminforth/commands/createApp/utils.js

@@ -222,6 +222,11 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: { provider },
       condition: Boolean(prismaDbUrl), // only create if prismaDbUrl is truthy
     },
+    {
+      src:  'prisma.config.ts.hbs',
+      dest: 'prisma.config.ts',
+      data: {},
+    },
     {
       src: 'package.json.hbs',
       dest: 'package.json',

adminforth/commands/createCustomComponent/main.js

@@ -188,6 +188,9 @@ async function handleCrudPageInjectionCreation(config, resources) {
   const injectionPosition = await select({
     message: 'Where exactly do you want to inject the component?',
     choices: [
+      ...(crudType === 'create' || crudType === 'edit'
+        ? [{ name: '💾 Save button on create/edit page', value: 'saveButton' }, new Separator()]
+        : []),
       { name: '⬆️ Before Breadcrumbs', value: 'beforeBreadcrumbs' },
       { name: '➡️ Before Action Buttons', value: 'beforeActionButtons' },
       { name: '⬇️ After Breadcrumbs', value: 'afterBreadcrumbs' },
@@ -207,13 +210,15 @@ async function handleCrudPageInjectionCreation(config, resources) {
     },
   });
 
-  const isThin = await select({
-    message: 'Will this component be thin enough to fit on the same page with list (so list will still shrink)?',
-    choices: [
-      { name: 'Yes', value: true },
-      { name: 'No', value: false },
-    ],
-  });
+  const isThin = crudType === 'list'
+    ? await select({
+        message: 'Will this component be thin enough to fit on the same page with list (so list will still shrink)?',
+        choices: [
+          { name: 'Yes', value: true },
+          { name: 'No', value: false },
+        ],
+      })
+    : false;
   const formattedAdditionalName = additionalName
     ? additionalName[0].toUpperCase() + additionalName.slice(1)
     : '';

adminforth/commands/createCustomComponent/templates/customCrud/saveButton.vue.hbs

@@ -0,0 +1,28 @@
+<template>
+  <button
+    class="px-4 py-2 border border-blue-500 text-blue-600 rounded hover:bg-blue-50 disabled:opacity-50"
+    :disabled="props.disabled || props.saving || !props.isValid"
+    @click="props.saveRecord()"
+  >
+    <span v-if="props.saving">Saving…</span>
+    <span v-else>Save</span>
+  </button>
+</template>
+
+<script setup lang="ts">
+
+const props = defineProps<{
+  record: any
+  resource: any
+  adminUser: any
+  meta: any
+  saving: boolean
+  validating: boolean
+  isValid: boolean
+  disabled: boolean
+  saveRecord: () => Promise<void>
+}>();
+</script>
+
+<style scoped>
+</style>

adminforth/dataConnectors/baseConnector.ts

@@ -227,11 +227,19 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     throw new Error('Method not implemented.');
   }
 
-  async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any) {
+  async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any, record?: any): Promise<boolean> {
     process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
+
+    const primaryKeyField = this.getPrimaryKey(resource);
     const existingRecord = await this.getData({
       resource,
-      filters: { operator: AdminForthFilterOperators.AND, subFilters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }]},
+      filters: { 
+        operator: AdminForthFilterOperators.AND, 
+        subFilters: [
+          { field: column.name, operator: AdminForthFilterOperators.EQ, value },
+          ...(record ? [{ field: primaryKeyField, operator: AdminForthFilterOperators.NE as AdminForthFilterOperators.NE, value: record[primaryKeyField] }] : [])
+        ]
+      },
       limit: 1,
       sort: [],
       offset: 0,
@@ -245,13 +253,13 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     resource: AdminForthResource; record: any; adminUser: any;
   }): Promise<{ error?: string; ok: boolean; createdRecord?: any; }> {
     // transform value using setFieldValue and call createRecordOriginalValues
-
+    
     const filledRecord = {...record};
     const recordWithOriginalValues = {...record};
 
     for (const col of resource.dataSourceColumns) {
       if (col.fillOnCreate) {
-        if (filledRecord[col.name] === undefined) {
+        if (filledRecord[col.name] === undefined || (Array.isArray(filledRecord[col.name]) && filledRecord[col.name].length === 0)) {
           filledRecord[col.name] = col.fillOnCreate({
             initialRecord: record, 
             adminUser
@@ -306,7 +314,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
   async updateRecord({ resource, recordId, newValues }: { resource: AdminForthResource; recordId: string; newValues: any; }): Promise<{ error?: string; ok: boolean; }> {
     // transform value using setFieldValue and call updateRecordOriginalValues
     const recordWithOriginalValues = {...newValues};
-
+    
     for (const field of Object.keys(newValues)) {
       const col = resource.dataSourceColumns.find((col) => col.name == field);
       // todo instead of throwing error, we can just not use setFieldValue here, and pass original value to updateRecordOriginalValues
@@ -319,6 +327,23 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       }
       recordWithOriginalValues[col.name] = this.setFieldValue(col, newValues[col.name]);
     }
+    const record = await this.getRecordByPrimaryKey(resource, recordId);
+    let error: string | null = null;
+     await Promise.all(
+      resource.dataSourceColumns.map(async (col) => {
+        if (col.isUnique && !col.virtual && !error && Object.prototype.hasOwnProperty.call(recordWithOriginalValues, col.name)) {
+          const exists = await this.checkUnique(resource, col, recordWithOriginalValues[col.name], record);
+          if (exists) {
+            error = `Record with ${col.name} ${recordWithOriginalValues[col.name]} already exists`;
+          }
+        }
+      })
+    );
+    if (error) {
+      process.env.HEAVY_DEBUG && console.log('🪲🆕 check unique error', error);
+      return { error, ok: false };
+    }
+
 
     process.env.HEAVY_DEBUG && console.log(`🪲✏️ updating record id:${recordId}, values: ${JSON.stringify(recordWithOriginalValues)}`);