@reldens/cms 0.76.0 → 0.78.0

package/admin/reldens-admin-client.css

@@ -728,6 +728,10 @@
                     font-weight: var(--bold);
                     color: var(--darkGrey);
                     flex: 1;
+
+                    & sup {
+                        cursor: help;
+                    }
                 }
 
                 &.field-value {

package/admin/reldens-admin-client.js

@@ -304,6 +304,10 @@ window.addEventListener('DOMContentLoaded', () => {
             }
             let idValueInput = editForm.querySelector('.entity-id-value');
             if(idValueInput){
+                let idDisplayInput = editForm.querySelector('[name="disabled-'+idValueInput.name+'"]');
+                if(idDisplayInput){
+                    idDisplayInput.value = '';
+                }
                 idValueInput.value = '';
             }
             let titleElement = document.querySelector('.entity-edit h2');

package/admin/templates/edit.html

@@ -20,7 +20,7 @@
         </div>
         {{#editFields}}
         <div class="edit-field">
-            <span class="field-name">{{&name}}</span>
+            <span class="field-name">{{&name}}{{#isRequired}}<sup title="required">r</sup>{{/isRequired}}{{#hasBothMarkers}}<sup>,</sup>{{/hasBothMarkers}}{{#isUnique}}<sup title="unique">u</sup>{{/isUnique}}</span>
             <span class="field-value">{{&value}}</span>
         </div>
         {{/editFields}}

package/lib/admin-manager/contents-builder.js

@@ -145,12 +145,7 @@ class ContentsBuilder
                     value: '{{&'+property+'}}'
                 };
             });
-            let editFields = editProperties.map((property) => {
-                return {
-                    name: this.fetchTranslation(property, entityId),
-                    value: '{{&'+property+'}}'
-                };
-            });
+            let editFields = this.buildEditFields(editProperties, driverResource.options.properties, entityId);
             let sectionsContents = this.adminFilesContents?.sections;
             let extraContentForList = sc.get(sectionsContents?.list, driverResource.entityPath, '');
             let extraContentForView = await this.render(
@@ -216,6 +211,23 @@ class ContentsBuilder
         return entitiesContents;
     }
 
+    buildEditFields(editProperties, properties, entityId)
+    {
+        let editFields = [];
+        for(let propertyKey of editProperties){
+            let isRequired = sc.get(properties[propertyKey], 'isRequired', false);
+            let isUnique = sc.get(properties[propertyKey], 'isUnique', false);
+            editFields.push({
+                name: this.fetchTranslation(propertyKey, entityId),
+                value: '{{&'+propertyKey+'}}',
+                isRequired,
+                isUnique,
+                hasBothMarkers: isRequired && isUnique
+            });
+        }
+        return editFields;
+    }
+
     buildReverseRelationsMap()
     {
         let reverseRelations = {};

package/lib/admin-manager/router-contents.js

@@ -357,8 +357,10 @@ class RouterContents
             let saveResult = await this.saveEntity(id, entityRepository, entityDataPatch);
             if(!saveResult){
                 Logger.error('Save result error.', saveResult, entityDataPatch);
-                return this.generateEntityRoute('editPath', driverResource, idProperty, null, id)
-                    +'&result=saveEntityStorageError';
+                return this.appendResultParam(
+                    this.generateEntityRoute('editPath', driverResource, idProperty, null, id),
+                    'saveEntityStorageError'
+                );
             }
             await this.emitEvent('reldens.adminAfterEntitySave', {
                 req,
@@ -382,7 +384,10 @@ class RouterContents
             }
             let saveAction = sc.get(req.body, 'saveAction', 'save');
             if('saveAndContinue' === saveAction){
-                return this.generateEntityRoute('editPath', driverResource, idProperty, saveResult) +'&result=success';
+                return this.appendResultParam(
+                    this.generateEntityRoute('editPath', driverResource, idProperty, saveResult),
+                    'success'
+                );
             }
             if('saveAndGoBack' === saveAction){
                 return this.rootPath+'/'+entityPath+'?result=success';
@@ -836,6 +841,14 @@ class RouterContents
         return this.rootPath + '/' + driverResource.entityPath + this[routeType] + idParam;
     }
 
+    appendResultParam(route, result)
+    {
+        if(route.includes('?')){
+            return route+'&result='+result;
+        }
+        return route+'?result='+result;
+    }
+
 }
 
 module.exports.RouterContents = RouterContents;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.76.0",
+    "version": "0.78.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -35,7 +35,7 @@
     },
     "dependencies": {
         "@reldens/server-utils": "^0.53.0",
-        "@reldens/storage": "^0.105.0",
+        "@reldens/storage": "^0.106.0",
         "@reldens/utils": "^0.57.0",
         "dotenv": "17.4.2",
         "mustache": "4.2.0"