adminizer 4.1.0-build.15 → 4.1.0-build.17

package/lib/v4/DataAccessor.js

@@ -100,7 +100,6 @@ export class DataAccessor {
             result[key] = { config: fldConfig, model: modelField, populated: populatedModelFieldsConfig };
         });
         this.fields = result;
-        console.log(result);
         return result;
     }
     getAssociatedFieldsConfig(modelName) {
@@ -377,10 +376,11 @@ export class DataAccessor {
                 const relation = modelAttributes[accessField];
                 if (relation && ['userap', 'groupap'].includes(relation.model.toLowerCase())) {
                     if (relation.model.toLowerCase() === 'userap') {
-                        updatedRecord[accessField] = this.user.id;
+                        if (!this.user.isAdministrator) {
+                            updatedRecord[accessField] = this.user.id;
+                        }
                     }
                     else if (relation.model.toLowerCase() === 'groupap') {
-                        // Works only for users with only one group, later it can be resolved with group weight
                         const userGroups = this.user.groups || [];
                         if (userGroups.length === 1) {
                             updatedRecord[accessField] = userGroups[0].id;
@@ -432,6 +432,7 @@ export class DataAccessor {
                 updatedRecord[field] = intermediateRecord.id;
             }
         }
+        console.log(updatedRecord, "<<<<<<<<<<<<<<<<<<<,");
         return updatedRecord;
     }
 }

package/lib/v4/model/adapter/sequelize.js

@@ -3,6 +3,64 @@ import { AbstractAdapter, AbstractModel } from "../AbstractModel";
 import path from "path";
 import fs from "fs";
 import { pathToFileURL } from "url";
+function generateAssociationsFromSchema(models, schemas) {
+    for (const modelName in schemas) {
+        const schema = schemas[modelName];
+        const model = models[modelName];
+        if (!model)
+            continue;
+        for (const fieldName in schema) {
+            const field = schema[fieldName];
+            if (field.collection && field.via) {
+                const targetModel = models[field.collection];
+                const targetSchema = schemas[field.collection];
+                const inverseField = targetSchema?.[field.via];
+                const throughTableName = [modelName, field.collection].sort().join("");
+                // 💡 M:N связь
+                if (inverseField && inverseField.collection === modelName) {
+                    model.belongsToMany(targetModel, {
+                        through: throughTableName,
+                        as: fieldName,
+                        foreignKey: `${modelName}Id`,
+                        otherKey: `${field.collection}Id`
+                    });
+                }
+                // 💡 O:M связь (один ко многим)
+                else {
+                    model.hasMany(targetModel, {
+                        as: fieldName,
+                        foreignKey: `${modelName}Id`,
+                    });
+                    targetModel.belongsTo(model, {
+                        as: field.via,
+                        foreignKey: `${modelName}Id`,
+                    });
+                }
+            }
+            // 💡 O:1 или 1:1 (belongsTo)
+            if (field.model) {
+                const targetModel = models[field.model];
+                if (!targetModel)
+                    continue;
+                // Avoid naming collision by making FK explicit: `${fieldName}Id`
+                const foreignKey = `${fieldName}Id`;
+                const alias = fieldName;
+                // Если поле уже существует — избегаем конфликта
+                if (model.rawAttributes[alias]) {
+                    model.belongsTo(targetModel, {
+                        as: alias,
+                        foreignKey,
+                    });
+                }
+                else {
+                    model.belongsTo(targetModel, {
+                        foreignKey: alias, // если нет конфликта, можно использовать alias как FK
+                    });
+                }
+            }
+        }
+    }
+}
 function resolveType(type) {
     const sqlType = typeof type.toString === "function"
         ? type.toString().toLowerCase()
@@ -401,19 +459,22 @@ export class SequelizeAdapter extends AbstractAdapter {
     static async registerSystemModels(sequelize) {
         const modelsDir = path.resolve(import.meta.dirname, "../../../../models");
         let files = fs.readdirSync(modelsDir).filter(f => f.endsWith(".js"));
-        // Try with ts files (exclude .d.ts)
         if (!files.length) {
             files = fs.readdirSync(modelsDir).filter(f => f.endsWith(".ts") && !f.endsWith(".d.ts"));
         }
         if (!files.length) {
             throw `Model files not found in dir ${modelsDir}`;
         }
+        const schemas = {};
         for (const file of files) {
             const modelName = path.basename(file, path.extname(file));
             const filePath = path.resolve(modelsDir, file);
-            const definition = (await import(pathToFileURL(filePath).href)).default;
+            const mod = await import(pathToFileURL(filePath).href);
+            const definition = mod.default;
+            schemas[modelName] = definition;
             generateSequelizeModel(sequelize, modelName, definition);
         }
+        generateAssociationsFromSchema(sequelize.models, schemas);
         await sequelize.sync();
     }
 }

package/models/MediaManagerAP.d.ts

@@ -8,7 +8,7 @@ declare const _default: {
         primaryKey: boolean;
         required: boolean;
     };
-    parent: {
+    parentMedia: {
         model: string;
     };
     variants: {

package/models/MediaManagerAP.js

@@ -6,7 +6,8 @@ export default {
         primaryKey: true,
         required: true
     },
-    parent: {
+    // WARN!!!  renamed from parent is confict
+    parentMedia: {
         model: "MediaManagerAP"
     },
     variants: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.1.0-build.15",
+  "version": "4.1.0-build.17",
   "main": "index.js",
   "scripts": {
     "test": "vitest --reporter verbose",
@@ -51,6 +51,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^7.27.1",
     "@ckeditor/ckeditor5-react": "^9.5.0",
+    "@eslint/compat": "^1.2.9",
     "@faker-js/faker": "^9.7.0",
     "@handsontable/react": "^15.2.0",
     "@inertiajs/react": "^2.0.0",
@@ -61,14 +62,14 @@
     "@radix-ui/react-dialog": "^1.1.7",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-label": "^2.1.2",
-    "@radix-ui/react-popover": "^1.1.7",
     "@radix-ui/react-menubar": "^1.1.12",
+    "@radix-ui/react-popover": "^1.1.7",
     "@radix-ui/react-portal": "^1.1.6",
-    "@radix-ui/react-switch": "^1.2.4",
     "@radix-ui/react-select": "^2.1.6",
     "@radix-ui/react-separator": "^1.1.3",
     "@radix-ui/react-slider": "^1.2.3",
     "@radix-ui/react-slot": "^1.2.0",
+    "@radix-ui/react-switch": "^1.2.4",
     "@radix-ui/react-tooltip": "^1.1.8",
     "@tailwindcss/vite": "^4.0.15",
     "@tanstack/react-table": "^8.21.2",
@@ -91,12 +92,14 @@
     "@types/sprintf-js": "^1.1.4",
     "@types/uuid": "^10.0.0",
     "@types/waterline": "^0.13.9",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
     "@vitejs/plugin-react": "^4.3.4",
     "babel-plugin-react-compiler": "^19.0.0-beta-e993439-20250405",
     "ckeditor5": "^45.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cross-env": "^7.0.3",
+    "eslint": "^9.26.0",
     "handsontable": "^15.2.0",
     "json-schema": "^0.4.0",
     "leaflet": "^1.9.4",

package/system/bindReqFunctions.js

@@ -33,7 +33,6 @@ export default function bindReqFunctions(adminizer) {
         if (res.locals) {
             req.i18n.registerMethods(res.locals, req);
         }
-        // TODO: I made it quickly, you need to spread for architecture to different files, or re -ize this file to a girlfriend
         // NOTE: This is here because inertia should receive data to routes
         // JWT token
         const cookies = parse(req.headers.cookie || '');