@reldens/cms 0.9.0 → 0.11.0

package/lib/admin-manager.js

@@ -662,10 +662,10 @@ class AdminManager
     async generateEditRouteContent(req, driverResource, entityPath)
     {
         let idProperty = this.fetchEntityIdPropertyKey(driverResource);
-        let idValue = (req?.query[idProperty] || '').toString();
-        let templateTitle = ('' === idValue ? 'Create' : 'Edit')+' '+this.translations.labels[driverResource.id()];
-        let loadedEntity = '' === idValue ? null :await this.loadEntityById(driverResource, idValue);
-        let entityViewRoute = '' === idValue
+        let idValue = String(sc.get(req?.query, idProperty, ''));
+        let templateTitle = (!idValue ? 'Create' : 'Edit')+' '+this.translations.labels[driverResource.id()];
+        let loadedEntity = !idValue ? null :await this.loadEntityById(driverResource, idValue);
+        let entityViewRoute = !idValue
             ? this.rootPath+'/'+driverResource.entityPath
             : this.generateEntityRoute('viewPath', driverResource, idProperty, loadedEntity);
         let renderedEditProperties = {
@@ -677,32 +677,29 @@ class AdminManager
         };
         let propertiesKeys = Object.keys(driverResource.options.properties);
         for(let propertyKey of propertiesKeys){
-            let resourceProperty = driverResource.options.properties[propertyKey];
+            let property = driverResource.options.properties[propertyKey];
             let fieldDisabled = -1 === driverResource.options.editProperties.indexOf(propertyKey);
-            let isRequired = resourceProperty.isRequired ? ' required="required"' : '';
-            if(resourceProperty.isUpload && loadedEntity){
-                isRequired = '';
-            }
-            let inputType = this.getInputType(resourceProperty, fieldDisabled);
             renderedEditProperties[propertyKey] = await this.render(
-                this.adminFilesContents.fields.edit[this.propertyType(resourceProperty, 'edit')],
+                this.adminFilesContents.fields.edit[this.propertyType(property, 'edit')],
                 {
                     fieldName: propertyKey,
                     fieldValue: await this.generatePropertyEditRenderedValue(
                         loadedEntity,
                         propertyKey,
-                        resourceProperty,
+                        property,
                         fieldDisabled
                     ),
                     fieldDisabled: fieldDisabled ? ' disabled="disabled"' : '',
-                    required: isRequired,
-                    multiple: resourceProperty.isArray ? ' multiple="multiple"' : '',
-                    inputType
+                    required: (!property.isUpload || !loadedEntity) && property.isRequired ? ' required="required"' : '',
+                    multiple: property.isArray ? ' multiple="multiple"' : '',
+                    inputType: this.getInputType(property, fieldDisabled)
                 }
             );
         }
-        let renderedView = await this.render(this.adminContents.entities[entityPath].edit, renderedEditProperties);
-        return await this.renderRoute(renderedView, this.adminContents.sideBar);
+        return await this.renderRoute(
+            await this.render(this.adminContents.entities[entityPath].edit, renderedEditProperties),
+            this.adminContents.sideBar
+        );
     }
 
     getInputType(resourceProperty, fieldDisabled)
@@ -710,12 +707,18 @@ class AdminManager
         if('datetime' === resourceProperty.type && !fieldDisabled){
             return 'datetime-local';
         }
+        if('number' === resourceProperty.type){
+            return 'number';
+        }
         return 'text';
     }
 
     async loadEntityById(driverResource, id)
     {
         let entityRepository = this.dataServer.getEntity(driverResource.entityKey);
+        if(!entityRepository){
+            return false;
+        }
         return await entityRepository.loadByIdWithRelations(id);
     }
 
@@ -735,24 +738,23 @@ class AdminManager
         };
         let entitySerializedData = {};
         for(let propertyKey of driverResource.options.showProperties){
-            let resourceProperty = driverResource.options.properties[propertyKey];
+            let property = driverResource.options.properties[propertyKey];
             let {fieldValue, fieldName} = this.generatePropertyRenderedValueWithLabel(
                 loadedEntity,
                 propertyKey,
-                resourceProperty
+                property
             );
             entitySerializedData[fieldName] = fieldValue;
-            let renderedFieldValue = await this.generatePropertyRenderedValue(
-                fieldValue,
-                fieldName,
-                resourceProperty,
-                'view'
-            );
             renderedViewProperties[propertyKey] = await this.render(
-                this.adminFilesContents.fields.view[this.propertyType(resourceProperty)],
+                this.adminFilesContents.fields.view[this.propertyType(property)],
                 {
                     fieldName: propertyKey,
-                    fieldValue: renderedFieldValue,
+                    fieldValue: await this.generatePropertyRenderedValue(
+                        fieldValue,
+                        fieldName,
+                        property,
+                        'view'
+                    ),
                     fieldOriginalValue: fieldValue,
                     target: ' target="_blank"'
                 }
@@ -762,13 +764,15 @@ class AdminManager
         await this.events.emit('adminEntityExtraData', extraDataEvent);
         entitySerializedData = extraDataEvent.entitySerializedData;
         renderedViewProperties.entitySerializedData = JSON.stringify(entitySerializedData).replace(/"/g, '"');
-        let renderedView = await this.render(this.adminContents.entities[entityPath].view, renderedViewProperties);
-        return await this.renderRoute(renderedView, this.adminContents.sideBar);
+        return await this.renderRoute(
+            await this.render(this.adminContents.entities[entityPath].view, renderedViewProperties),
+            this.adminContents.sideBar
+        );
     }
 
     propertyType(resourceProperty, templateType)
     {
-        let propertyType = resourceProperty.type || 'text';
+        let propertyType = sc.get(resourceProperty, 'type', 'text');
         if('reference' === propertyType && 'edit' === templateType){
             return 'select';
         }
@@ -805,7 +809,8 @@ class AdminManager
         });
         let entitiesRows = await this.loadEntitiesForList(driverResource, pageSize, page, req, filters);
         let listRawContent = this.adminContents.entities[entityPath].list.toString();
-        let totalPages = Math.ceil(await this.countTotalEntities(driverResource, filters) / pageSize);
+        let totalEntities = await this.countTotalEntities(driverResource, filters);
+        let totalPages = totalEntities <= pageSize ? 1 : Math.ceil(totalEntities / pageSize);
         let pages = PageRangeProvider.fetch(page, totalPages);
         let renderedPagination = '';
         for(let page of pages){
@@ -858,6 +863,9 @@ class AdminManager
     {
         /** @type {BaseDriver|ObjectionJsDriver} entityRepository **/
         let entityRepository = this.dataServer.getEntity(driverResource.entityKey);
+        if(!entityRepository){
+            return false;
+        }
         return await entityRepository.count(filters);
     }