@easydata/crud 1.4.0 → 1.4.2-rc01

package/dist/bundles/easydata.crud.js

@@ -1646,6 +1646,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
             this.lookupEntity = dto.lent;
             this.dataAttr = dto.dattr;
             this.lookupDataAttr = dto.ldattr;
+            this.defaultValue = dto.defVal;
             this.isNullable = utils_utils.getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils_utils.getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils_utils.getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -2738,6 +2739,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         this.cachedRows = [];
         this.total = 0;
         this.needTotal = !this._elasticChunks;
+        this.fireUpdated();
     };
     EasyDataTable.prototype.createRow = function (dataOrRow) {
         var _this = this;
@@ -6844,7 +6846,7 @@ var getEditDateTimeFormat = function (dtype) {
 };
 var setLocation = function (path) {
     var state = window.history.state;
-    history.replaceState(state, document.title, path);
+    history.pushState(state, document.title, path);
     window.dispatchEvent(new Event('ed_set_location'));
 };
 
@@ -7276,7 +7278,9 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
         var lookupEntity = this.context.getMetaData().getRootEntity()
             .subEntities.filter(function (ent) { return ent.id == attr.lookupEntity; })[0];
         var dataAttr = this.context.getMetaData().getAttributeById(attr.dataAttr);
-        readOnly = readOnly && dataAttr.isEditable;
+        if (!dataAttr)
+            return;
+        readOnly = readOnly || !dataAttr.isEditable;
         value = this.params.values
             ? this.params.values.getValue(dataAttr.id)
             : undefined;
@@ -7571,9 +7575,11 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
         });
     };
     EntityEditFormBuilder.prototype.addFormField = function (parent, attr) {
-        var value = this.params.values && attr.kind !== EntityAttrKind.Lookup
+        var value = (this.params.values && attr.kind !== EntityAttrKind.Lookup)
             ? this.params.values.getValue(attr.id)
-            : undefined;
+            : !this.params.isEditForm
+                ? attr.defaultValue
+                : undefined;
         var editor = this.resolveEditor(attr);
         var readOnly = this.params.isEditForm && (attr.isPrimaryKey || !attr.isEditable);
         var required = !attr.isNullable;
@@ -7667,15 +7673,10 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
         this.form['setHtmlInt'](formHtml);
         for (var _i = 0, _a = this.context.getActiveEntity().attributes; _i < _a.length; _i++) {
             var attr = _a[_i];
-            if (!attr.isPrimaryKey) {
-                if (this.params.isEditForm) {
-                    if (!attr.showOnEdit)
-                        continue;
-                }
-                else {
-                    if (!attr.showOnCreate)
-                        continue;
-                }
+            if (!this.params.isEditForm && !attr.showOnCreate)
+                continue;
+            if (!attr.isPrimaryKey && this.params.isEditForm && !attr.showOnEdit) {
+                continue;
             }
             this.addFormField(fb.toDOM(), attr);
         }
@@ -7778,7 +7779,7 @@ var data_context_DataContext = /** @class */ (function () {
     DataContext.prototype.getActiveEntity = function () {
         return this.activeEntity;
     };
-    DataContext.prototype.setActiveEntity = function (entityId) {
+    DataContext.prototype.setActiveSource = function (entityId) {
         this.activeEntity = this.model.getRootEntity().subEntities
             .filter(function (e) { return e.id == entityId; })[0];
     };
@@ -8016,10 +8017,12 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
             showBackToEntities: true
         };
         this.defaultValidators = [new required_validator_RequiredValidator(), new type_validator_TypeValidator()];
-        options = options || {};
         this.options = utils_utils.assignDeep(this.options, options || {});
         this.dlg = new DefaultDialogService();
         var ent = this.context.getActiveEntity();
+        if (!ent) {
+            throw "Can't find active entity for " + window.location.pathname;
+        }
         this.slot.innerHTML += "<h1>" + (ent.captionPlural || ent.caption) + "</h1>";
         if (this.options.showBackToEntities) {
             domel(this.slot)
@@ -8272,51 +8275,66 @@ var root_data_view_RootDataView = /** @class */ (function () {
 var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function () {
     function EasyDataViewDispatcher(options) {
         var _this = this;
-        this.options = { basePath: 'easydata' };
+        this.options = {
+            container: '#EasyDataContainer',
+            basePath: 'easydata'
+        };
         this.onSetLocation = function () {
             _this.setActiveView();
         };
-        options = options || {};
-        this.options = utils_utils.assign(this.options, options);
-        this.options.basePath = (!this.options.rootEntity)
-            ? this.pretiffyPath(this.options.basePath)
-            : this.pretiffyPath(window.location.pathname);
-        if (this.options.rootEntity)
+        this.attach = function () {
+            window.addEventListener('ed_set_location', _this.onSetLocation);
+            window.addEventListener('popstate', _this.onSetLocation);
+        };
+        this.options = utils_utils.assign(this.options, options || {});
+        if (this.options.rootEntity) {
             this.options.showBackToEntities = false;
-        this.setContainer(options.container);
+            this.basePath = '/';
+        }
+        else {
+            this.basePath = this.normalizeBasePath(this.options.basePath);
+        }
+        this.setContainer(this.options.container);
         var progressBarSlot = document.createElement('div');
         var bar = new ProgressBar(progressBarSlot);
         var parent = this.container.parentElement;
         parent.insertBefore(progressBarSlot, parent.firstElementChild);
         this.context = new data_context_DataContext({
-            endpoint: options.endpoint,
-            dataTable: options.dataTable,
+            endpoint: this.options.endpoint,
+            dataTable: this.options.dataTable,
             onProcessStart: function () { return bar.show(); },
             onProcessEnd: function () { return bar.hide(); }
         });
-        this.basePath = this.getBasePath();
     }
-    EasyDataViewDispatcher.prototype.pretiffyPath = function (path) {
+    EasyDataViewDispatcher.prototype.normalizeBasePath = function (basePath) {
+        basePath = this.trimSlashes(basePath);
+        var fullPath = decodeURIComponent(window.location.pathname);
+        var idx = fullPath.toLocaleLowerCase().indexOf(basePath);
+        return idx >= 0 ? fullPath.substring(0, idx + basePath.length) : '/';
+    };
+    EasyDataViewDispatcher.prototype.trimSlashes = function (path) {
         return path.replace(/^\/|\/$/g, '');
     };
     EasyDataViewDispatcher.prototype.setContainer = function (container) {
         if (!container) {
-            this.container = document.getElementById('EasyDataContainer');
-            return;
+            throw 'Container is undefined';
         }
         if (typeof container === 'string') {
             if (container.length) {
-                if (container[0] === '#') {
-                    this.container = document.getElementById(container.substring(1));
-                }
-                else if (container[0] === '.') {
+                if (container[0] === '.') {
                     var result = document.getElementsByClassName(container.substring(1));
                     if (result.length)
                         this.container = result[0];
                 }
                 else {
-                    throw Error('Unrecognized container parameter ' +
-                        '(Must be an element ID, a class name or HTMLElement object itself): ' + container);
+                    if (container[0] === '#') {
+                        container = container.substring(1);
+                    }
+                    this.container = document.getElementById(container);
+                }
+                if (!this.container) {
+                    throw Error('Unrecognized `container` parameter: ' + container + '\n'
+                        + 'It must be an element ID, a class name (starting with .) or an HTMLElement object itself.');
                 }
             }
         }
@@ -8324,24 +8342,16 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
             this.container = container;
         }
     };
-    EasyDataViewDispatcher.prototype.getActiveEntityId = function () {
+    EasyDataViewDispatcher.prototype.getActiveSourceId = function () {
         if (this.options.rootEntity)
             return this.options.rootEntity;
-        var decodedUrl = decodeURIComponent(window.location.href);
-        var splitIndex = decodedUrl.lastIndexOf('/');
-        var typeName = decodedUrl.substring(splitIndex + 1);
-        return typeName && typeName.toLocaleLowerCase() !== this.options.basePath
-            ? typeName
-            : null;
-    };
-    EasyDataViewDispatcher.prototype.getBasePath = function () {
-        var decodedUrl = decodeURIComponent(window.location.href);
-        var optBasePathIndex = decodedUrl.toLocaleLowerCase().indexOf(this.options.basePath);
-        return decodedUrl.substring(0, optBasePathIndex + this.options.basePath.length);
+        var path = decodeURIComponent(window.location.pathname);
+        var idIndex = this.basePath.length + 1;
+        return idIndex < path.length ? path.substring(idIndex) : null;
     };
     EasyDataViewDispatcher.prototype.run = function () {
         var _this = this;
-        window.addEventListener('ed_set_location', this.onSetLocation);
+        this.attach();
         return this.context.loadMetaData()
             .then(function () {
             _this.setActiveView();
@@ -8350,9 +8360,9 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
     };
     EasyDataViewDispatcher.prototype.setActiveView = function () {
         this.clear();
-        var activeEntityId = this.getActiveEntityId();
-        if (activeEntityId) {
-            this.context.setActiveEntity(activeEntityId);
+        var sourceId = this.getActiveSourceId();
+        if (sourceId) {
+            this.context.setActiveSource(sourceId);
             window['EDView'] = new entity_data_view_EntityDataView(this.container, this.context, this.basePath, this.options);
         }
         else {
@@ -8365,6 +8375,7 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
     };
     EasyDataViewDispatcher.prototype.detach = function () {
         window.removeEventListener('ed_set_location', this.onSetLocation);
+        window.removeEventListener('popstate', this.onSetLocation);
     };
     return EasyDataViewDispatcher;
 }());