@nestledjs/data-browser 0.1.23 → 0.1.25

package/lib/pages/AdminDataEditPage.js

@@ -279,8 +279,14 @@ function AdminDataEditPageContent({ model, id, basePath, formTheme }) {
       var _a;
       let value = item[field.name];
       if (field.relationName && !field.isList) {
-        const relationFieldName = ((_a = field.relationFromFields) == null ? void 0 : _a[0]) || field.name;
+        const relationFieldName = ((_a = field.relationFromFields) == null ? void 0 : _a[0]) || `${field.name}Id`;
         value = item[relationFieldName];
+        if (value === void 0) {
+          const relationObject = item[field.name];
+          if (relationObject && typeof relationObject === "object" && relationObject.id) {
+            value = relationObject.id;
+          }
+        }
         if (value && typeof value === "object") {
           value = value.id || "";
         }

package/lib/pages/AdminDataListPage.js

@@ -137,8 +137,8 @@ function AdminDataListPage({ modelName: propModelName } = {}) {
     return (model == null ? void 0 : model.pluralModelPropertyName) || pluralParam.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
   }, [model, pluralParam]);
   const paginationPath = useMemo(() => {
-    return model ? `${model.pluralModelPropertyName}_meta` : `${dataPath}_meta`;
-  }, [model, dataPath]);
+    return "counters";
+  }, []);
   const fieldNames = useMemo(() => {
     if (!model) return [];
     return model.fields.filter((field) => !field.relationName || !field.isList).map((field) => field.name);

package/lib/utils/graphql-utils.js

@@ -185,8 +185,14 @@ function buildFormFields(sdk, model, operation, currentItem, isSubmitting, baseP
           break;
         }
         if (field.relationName && !field.isList) {
-          const relationFieldName = ((_a = field.relationFromFields) == null ? void 0 : _a[0]) || field.name;
+          const relationFieldName = ((_a = field.relationFromFields) == null ? void 0 : _a[0]) || `${field.name}Id`;
           let relationValue = currentItem && operation === "update" ? currentItem[relationFieldName] : void 0;
+          if (relationValue === void 0 && currentItem && operation === "update") {
+            const relationObject = currentItem[field.name];
+            if (relationObject && typeof relationObject === "object" && relationObject.id) {
+              relationValue = relationObject.id;
+            }
+          }
           if (relationValue && typeof relationValue === "object" && relationValue.id) {
             relationValue = relationValue.id;
           }
@@ -423,9 +429,7 @@ function cleanFormInput(input, model) {
     if (typeof value === "string") {
       const field = (_c = model == null ? void 0 : model.fields) == null ? void 0 : _c.find((f) => f.name === key);
       const convertedValue = convertStringValue(value, field);
-      if (convertedValue !== null) {
-        cleaned[key] = convertedValue;
-      }
+      cleaned[key] = convertedValue;
       continue;
     }
     if (typeof value === "object" && value !== null && !Array.isArray(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestledjs/data-browser",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Universal admin data browser for Nestled framework projects with full CRUD operations",
   "main": "./index.js",
   "module": "./index.js",
@@ -38,7 +38,7 @@
     "@apollo/client": "^4.0.0",
     "@heroicons/react": "^2.0.0",
     "@nestledjs/forms": "^0.5.0",
-    "@nestledjs/shared-components": "^0.1.23",
+    "@nestledjs/shared-components": "^0.1.25",
     "react": "^19.0.0",
     "react-router": "^7.0.0"
   },