Merge pull request #51 from KorzhCom/dev

Version 1.3.2

easydata.js/packs/core/src/i18n/i18n.ts

@@ -424,7 +424,7 @@ export namespace i18n {
 
     export function numberToStr(number: number, format?: string): string {
         if (format && format.length > 0) {
-            const type = format.charAt(0);
+            const type = format.charAt(0).toUpperCase();
             if (type === 'S') {
                 return formatWithSequence(number, format.slice(1));
             }
@@ -444,7 +444,7 @@ export namespace i18n {
     export function booleanToStr(bool: boolean, format?: string) {
 
         if (format && format.length > 0) {
-            const type = format.charAt(0);
+            const type = format.charAt(0).toUpperCase();
             if (type === 'S') {
                 const values = format.slice(1).split('|');
                 if (values.length > 1) {

easydata.js/packs/crud/src/public_api.ts

@@ -2,6 +2,7 @@ export * from './filter/data_filter'
 export * from './filter/text_data_filter'
 
 export * from './form/entity_edit_form'
+export * from './form/entity_form_builder'
 
 export * from './widgets/text_filter_widget'
 export * from './widgets/progress_bar'

easydata.js/packs/crud/src/views/entity_data_view.ts

@@ -6,7 +6,7 @@ import {
     GridCellRenderer, GridColumn, RowClickEvent 
 } from '@easydata/ui';
 
-import { EntityEditFormBuilder } from '../form/entity_edit_form';
+import { EntityEditFormBuilder } from '../form/entity_form_builder';
 import { TextFilterWidget } from '../widgets/text_filter_widget';
 
 import { DataContext } from '../main/data_context';

easydata.js/version.json

@@ -1,5 +1,5 @@
 {
-	"version": "1.3.1",
-	"baseVersion": "1.3.1",
-	"assetVersion": "01_03_01"
+	"version": "1.3.2",
+	"baseVersion": "1.3.2",
+	"assetVersion": "01_03_02"
 }

easydata.net/src/EasyData.Core/Export/ExportHelpers.cs

@@ -44,7 +44,7 @@ public static Dictionary<string, IFormatProvider> GetPredefinedFormatters(IReadO
                 var dfmt = cols[i].DisplayFormat;
                 if (!string.IsNullOrEmpty(dfmt) && !result.ContainsKey(dfmt)) {
                     var format = GetFormat(dfmt);
-                    if (format.StartsWith("S")) {
+                    if (format.StartsWith("S", StringComparison.InvariantCultureIgnoreCase)) {
                         result.Add(dfmt, new SequenceFormat(format, settings.Culture));
                     }
                 }

easydata.net/src/EasyData.EntityFrameworkCore.Relational/MetaDataLoader/DbContextMetaDataLoader.cs

@@ -94,23 +94,18 @@ public virtual void LoadFromDbContext(DbContext context)
 
         protected string GetEntityId(IEntityType entityType)
         {
-            var entityName = GetEntityNameByType(entityType);
+            var entityName = Utils.GetEntityNameByType(entityType);
             return DataUtils.ComposeKey(null, entityName);
         }
 
-        protected string GetEntityNameByType(IEntityType entityType)
-        { 
-            return entityType.ClrType.Name.Split('`').First();
-        }
-
-
+
         #region auxiliary functions for LoadFromDbContext
         protected virtual MetaEntity ProcessEntityType(IModel contextModel, IEntityType entityType)
         {
             var entity = Model.CreateEntity();
             var tableName = entityType.GetTableName();
             entity.Id = GetEntityId(entityType);
-            entity.Name = DataUtils.PrettifyName(GetEntityNameByType(entityType));
+            entity.Name = DataUtils.PrettifyName(Utils.GetEntityNameByType(entityType));
             entity.NamePlural = DataUtils.MakePlural(entity.Name);
 
             entity.ClrType = entityType.ClrType;
@@ -221,10 +216,13 @@ protected virtual void ProcessNavigationProperty(MetaEntity entity, IEntityType
                 if (lookupDataAttr != null) {
                     lookUpAttr.LookupDataAttribute = lookupDataAttr;
 
-                    if (dataAttr.Index == int.MaxValue) {
-                        dataAttr.Index = attrCounter;
+                    if (lookupDataAttr.Index == int.MaxValue) {
+                        lookupDataAttr.Index = attrCounter;
                     }
 
+                    // hide lookup data field of lookup field on managing data
+                    lookupDataAttr.ShowOnEdit = lookupDataAttr.ShowOnCreate = false;
+
                     attrCounter++;
                     entity.Attributes.Add(lookUpAttr);
                 }
@@ -280,7 +278,7 @@ private bool ApplyMetaEntityAttrAttribute(MetaEntityAttr entityAttr, PropertyInf
 
         protected virtual MetaEntityAttr CreateEntityAttribute(MetaEntity entity, IEntityType entityType, IProperty property)
         {
-            var entityName = GetEntityNameByType(entityType);
+            var entityName = Utils.GetEntityNameByType(entityType);
             var propertyName = property.Name;
             var columnName = property.GetColumnName();
 

easydata.net/src/EasyData.EntityFrameworkCore.Relational/Services/EasyDataManagerEF.cs

@@ -69,7 +69,7 @@ public override async Task<EasyDataResultSet> GetEntitiesAsync(string modelId,
             var result = new EasyDataResultSet();
 
             var modelEntity = Model.EntityRoot.SubEntities.FirstOrDefault(e => e.ClrType == entityType.ClrType);
-            var attrIdProps = entityType.GetProperties().ToDictionary(prop => DataUtils.ComposeKey(entityType.Name.Split('.').Last(), prop.Name), prop => prop );
+            var attrIdProps = entityType.GetProperties().ToDictionary(prop => DataUtils.ComposeKey(entityContainer, prop.Name), prop => prop );
 
             var attrs = modelEntity.Attributes.Where(attr => attr.Kind != EntityAttrKind.Lookup);
             foreach (var attr in attrs) {
@@ -168,8 +168,7 @@ public override async Task DeleteEntityAsync(string modelId, string entityContai
         private IEntityType GetCurrentEntityType(DbContext dbContext, string entityContainer)
         {
             var entityType = dbContext.Model.GetEntityTypes()
-                .FirstOrDefault(ent => 
-                    ent.Name.Split('.').LastOrDefault() == entityContainer);
+                .FirstOrDefault(ent => Utils.GetEntityNameByType(ent) == entityContainer);
 
             if (entityType == null) {
                 throw new ContainerNotFoundException(entityContainer);

easydata.net/src/EasyData.EntityFrameworkCore.Relational/Utils.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace EasyData.EntityFrameworkCore
+{
+    internal static class Utils
+    {
+        public static string GetEntityNameByType(IEntityType entityType)
+        {
+            return entityType.ClrType.Name.Split('`').First();
+        }
+    }
+}

easydata.net/version.json

@@ -1,5 +1,5 @@
 {
-	"assemblyVersion": "1.3.1.0",
-	"packageVersion": "1.3.1",
-	"assetVersion": "01_03_01"
+	"assemblyVersion": "1.3.2.0",
+	"packageVersion": "1.3.2",
+	"assetVersion": "01_03_02"
 }

playground/EasyDataAspNetCoreTest01/Startup.cs

@@ -58,7 +58,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                     {
                         model.DisplayFormats.SetDefault(EasyData.DataType.DateTime, "Long date & time");
                     });
-                    options.UseDbContext<AppDbContext>(opts => opts.KeepDbSetDeclarationOrder = true);
+                    options.UseDbContext<AppDbContext>(opts => opts.SkipForeignKeys = false);
                 });
                 //.RequireAuthorization();
 

playground/EasyDataAspNetCoreTest02/Startup.cs

@@ -64,6 +64,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseEndpoints(endpoints => {
                 endpoints.MapEasyData(options => {
                     options.UseDbContext<ApplicationDbContext>(loaderOptions => {
+                        loaderOptions.SkipForeignKeys = false;
                         //loaderOptions.AddFilter(entityType => !entityType.ClrType.Name.StartsWith("Identity"));
                     });
                 });