From 4fd2f2fc23685236f288733bfcf4bb32483ca0f7 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 14 May 2020 15:40:41 +0200
Subject: [PATCH] start moving media into separate table

---
 zero.Core/Api/BackofficeStore.cs            | 32 ++++++++++---------
 zero.Core/Api/MediaUpload.cs                | 19 +++++++----
 zero.Core/Entities/Media/Media.cs           | 35 ++++++++++-----------
 zero.Core/Entities/Media/MediaFolder.cs     |  5 ++-
 zero.Core/Entities/User/User.cs             |  4 +--
 zero.Web.UI/App/navigation.vue              |  3 +-
 zero.Web.UI/App/pages/settings/settings.vue |  4 +--
 zero.Web.UI/App/pages/settings/user.vue     |  2 +-
 zero.Web.UI/Sass/Canvas/_navigation.scss    |  6 +++-
 zero.Web/Mapper/UserMapperConfig.cs         |  6 ++--
 zero.Web/Models/UserEditModel.cs            |  2 +-
 zero.Web/Models/UserListModel.cs            |  2 +-
 zero.Web/ZeroVue.cs                         | 12 ++++++-
 13 files changed, 79 insertions(+), 53 deletions(-)

diff --git a/zero.Core/Api/BackofficeStore.cs b/zero.Core/Api/BackofficeStore.cs
index 09818633..f8a0d950 100644
--- a/zero.Core/Api/BackofficeStore.cs
+++ b/zero.Core/Api/BackofficeStore.cs
@@ -91,24 +91,24 @@ namespace zero.Core.Api
       }
 
       // find all media items in model
-      List<ObjectTraverser.Result<Media>> media = ObjectTraverser.Find<Media>(model);
+      //List<ObjectTraverser.Result<Media>> media = ObjectTraverser.Find<Media>(model);
 
       // upload media items
-      Dictionary<string, Media> mediaItems = new Dictionary<string, Media>();
+      //Dictionary<string, Media> mediaItems = new Dictionary<string, Media>();
 
-      foreach (ObjectTraverser.Result<Media> item in media)
-      {
-        string id = item.Item?.Id;
+      //foreach (ObjectTraverser.Result<Media> item in media)
+      //{
+      //  string id = item.Item?.Id;
 
-        if (!Media.Upload(item.Item, out bool uploaded, out string uploadError))
-        {
-          return EntityResult<T>.Fail(item.Path, uploadError);
-        }
-        else
-        {
-          mediaItems.Add(id, item.Item);
-        }
-      }
+      //  if (!Media.Upload(item.Item, out bool uploaded, out string uploadError))
+      //  {
+      //    return EntityResult<T>.Fail(item.Path, uploadError);
+      //  }
+      //  else
+      //  {
+      //    mediaItems.Add(id, item.Item);
+      //  }
+      //}
 
       //if (operation.Media != null)
       //{
@@ -155,7 +155,11 @@ namespace zero.Core.Api
 
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
+        // store entity
         await session.StoreAsync(model);
+
+        // store media
+
         await session.SaveChangesAsync();
       }
 
diff --git a/zero.Core/Api/MediaUpload.cs b/zero.Core/Api/MediaUpload.cs
index 4c3032ff..76085970 100644
--- a/zero.Core/Api/MediaUpload.cs
+++ b/zero.Core/Api/MediaUpload.cs
@@ -44,15 +44,18 @@ namespace zero.Core.Api
         return true;
       }
 
-      // generate new id
-      media.Id = IdGenerator.Create();
+      // set id to null in case it was prefixed to signal an upload
+      media.Id = null;
+
+      // generate file id which is used as the folder name on disk
+      media.FileId = IdGenerator.Create();
 
       // get bytes for media content
       string byteString = media.Source.Split(SEP)[1];
       byte[] bytes = Convert.FromBase64String(byteString);
 
       // build folder and full file path
-      string folderPath = Path.Combine(Paths.Media, media.Id);
+      string folderPath = Path.Combine(Paths.Media, media.FileId);
       string filePath = Path.Combine(folderPath, media.Name);
 
       Paths.Create(folderPath);
@@ -81,15 +84,19 @@ namespace zero.Core.Api
               Size = new Size(100, 100),
               Mode = ResizeMode.Max
             }));
-            image.Save(filePath.Replace(extension, THUMB_EXTENSION + extension));
 
-            media.HasThumbnail = true;
+            string thumbFileName = media.Name.Replace(extension, THUMB_EXTENSION + extension);
+            string thumbSourcePath = Path.Combine(Paths.Media, media.FileId, thumbFileName);
+
+            image.Save(thumbSourcePath);
+
+            media.ThumbnailSource = Path.Combine(PATH_PREFIX, media.FileId, thumbFileName).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
           }
         }
 
         // set new properties
         media.LastModifiedDate = DateTimeOffset.Now;
-        media.Source = Path.Combine(PATH_PREFIX, media.Id, media.Name).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
+        media.Source = Path.Combine(PATH_PREFIX, media.FileId, media.Name).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
         media.Size = bytes.Length;
 
         uploaded = true;
diff --git a/zero.Core/Entities/Media/Media.cs b/zero.Core/Entities/Media/Media.cs
index c34b37ef..af845b57 100644
--- a/zero.Core/Entities/Media/Media.cs
+++ b/zero.Core/Entities/Media/Media.cs
@@ -5,16 +5,16 @@ namespace zero.Core.Entities
   /// <summary>
   /// A media file (can contain an image or other media like videos and documents)
   /// </summary>
-  public class Media : IMedia, IZeroDbConventions
+  public class Media : ZeroEntity, IMedia
   {
-    /// <inheritdoc />
-    public string Id { get; set; }
-
     /// <inheritdoc />
     public string AppId { get; set; }
 
     /// <inheritdoc />
-    public string Name { get; set; }
+    public string FileId { get; set; }
+
+    /// <inheritdoc />
+    public string FolderId { get; set; }
 
     /// <inheritdoc />
     public string AlternativeText { get; set; }
@@ -26,7 +26,7 @@ namespace zero.Core.Entities
     public string Source { get; set; }
 
     /// <inheritdoc />
-    public bool HasThumbnail { get; set; }
+    public string ThumbnailSource { get; set; }
 
     /// <inheritdoc />
     public int Size { get; set; }
@@ -39,18 +39,20 @@ namespace zero.Core.Entities
 
     /// <inheritdoc />
     public MediaFocalPoint FocalPoint { get; set; }
-
-    /// <inheritdoc />
-    public string FolderId { get; set; }
   }
 
 
-  public interface IMedia : IZeroIdEntity, IAppAwareEntity
+  public interface IMedia : IZeroEntity, IAppAwareEntity, IZeroDbConventions
   {
     /// <summary>
-    /// File name
+    /// Id/name of the folder which is stored on disk/cloud
     /// </summary>
-    public string Name { get; set; }
+    public string FileId { get; set; }
+
+    /// <summary>
+    /// Id of the media folder
+    /// </summary>
+    public string FolderId { get; set; }
 
     /// <summary>
     /// Alternative text which is used when the image can't be loaded
@@ -68,9 +70,9 @@ namespace zero.Core.Entities
     string Source { get; set; }
 
     /// <summary>
-    /// Whether this file has a thumbnail
+    /// For images this is the source for a 100x100px thumbnail
     /// </summary>
-    bool HasThumbnail { get; set; }
+    string ThumbnailSource { get; set; }
 
     /// <summary>
     /// Filesize in bytes
@@ -91,10 +93,5 @@ namespace zero.Core.Entities
     /// Optional focal point for an image
     /// </summary>
     MediaFocalPoint FocalPoint { get; set; }
-    
-    /// <summary>
-    /// Id of the folder
-    /// </summary>
-    public string FolderId { get; set; }
   }
 }
diff --git a/zero.Core/Entities/Media/MediaFolder.cs b/zero.Core/Entities/Media/MediaFolder.cs
index 27c7719f..d30c9b51 100644
--- a/zero.Core/Entities/Media/MediaFolder.cs
+++ b/zero.Core/Entities/Media/MediaFolder.cs
@@ -3,8 +3,11 @@
   /// <summary>
   /// A media folder contains media and other folders
   /// </summary>
-  public class MediaFolder : ZeroEntity
+  public class MediaFolder : ZeroEntity, IAppAwareEntity, IZeroDbConventions
   {
+    /// <inheritdoc />
+    public string AppId { get; set; }
+
     /// <summary>
     /// Parent folder id
     /// </summary>
diff --git a/zero.Core/Entities/User/User.cs b/zero.Core/Entities/User/User.cs
index 49bbdcd7..938bce62 100644
--- a/zero.Core/Entities/User/User.cs
+++ b/zero.Core/Entities/User/User.cs
@@ -24,7 +24,7 @@ namespace zero.Core.Entities
     public string SecurityStamp { get; set; }
 
     /// <inheritdoc/>
-    public Media Avatar { get; set; }
+    public string AvatarId { get; set; }
 
     /// <inheritdoc/>
     public string LanguageId { get; set; }
@@ -101,7 +101,7 @@ namespace zero.Core.Entities
     /// <summary>
     /// Avatar image
     /// </summary>
-    Media Avatar { get; set; }
+    string AvatarId { get; set; }
 
     /// <summary>
     /// Backoffice display language
diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/App/navigation.vue
index ecb45bdc..48dd6158 100644
--- a/zero.Web.UI/App/navigation.vue
+++ b/zero.Web.UI/App/navigation.vue
@@ -31,7 +31,8 @@
       <ui-dropdown align="left bottom">
         <template v-slot:button>
           <button type="button" class="app-nav-account-button">
-            <img class="-image" :src="user.avatar.source" :alt="user.name" />
+            <img class="-image" v-if="user.avatar" :src="user.avatar.source" :alt="user.name" />
+            <span class="-image" v-if="!user.avatar"><i class="fth-user"></i></span>
             <p class="-text"><strong>{{user.name}}</strong><br>{{user.email}}</p>
             <i class="-arrow fth-chevron-down"></i>
           </button>
diff --git a/zero.Web.UI/App/pages/settings/settings.vue b/zero.Web.UI/App/pages/settings/settings.vue
index 99d59232..0df2f100 100644
--- a/zero.Web.UI/App/pages/settings/settings.vue
+++ b/zero.Web.UI/App/pages/settings/settings.vue
@@ -36,8 +36,8 @@
       page: true,
       groups: zero.settingsAreas,
       tokens: {
-        'zero_version': '1.0.0-alpha.1',
-        'plugin_count': 7
+        'zero_version': zero.version,
+        'plugin_count': zero.pluginCount
       }
     })
   }
diff --git a/zero.Web.UI/App/pages/settings/user.vue b/zero.Web.UI/App/pages/settings/user.vue
index 82e76933..bf38a835 100644
--- a/zero.Web.UI/App/pages/settings/user.vue
+++ b/zero.Web.UI/App/pages/settings/user.vue
@@ -30,7 +30,7 @@
             </div>
           </ui-property>
           <ui-property label="@user.fields.avatar" description="@user.fields.avatar_text" :required="true">
-            <ui-media :config="avatarConfig" v-model="model.avatar" :disabled="disabled" />
+            <ui-media :config="avatarConfig" v-model="model.avatarId" :disabled="disabled" />
           </ui-property>
         </div>
 
diff --git a/zero.Web.UI/Sass/Canvas/_navigation.scss b/zero.Web.UI/Sass/Canvas/_navigation.scss
index 0e30ad07..45e7166e 100644
--- a/zero.Web.UI/Sass/Canvas/_navigation.scss
+++ b/zero.Web.UI/Sass/Canvas/_navigation.scss
@@ -165,7 +165,11 @@ a.app-nav-child
     width: 36px;
     border-radius: 18px;
     position: relative;
-    top: -2px;
+    top: -1px;
+    background: var(--color-bg-mid);
+    text-align: center;
+    line-height: 37px;
+    font-size: 16px;
   }
 
   .-text
diff --git a/zero.Web/Mapper/UserMapperConfig.cs b/zero.Web/Mapper/UserMapperConfig.cs
index 9f8bb28f..cebcb594 100644
--- a/zero.Web/Mapper/UserMapperConfig.cs
+++ b/zero.Web/Mapper/UserMapperConfig.cs
@@ -23,7 +23,7 @@ namespace zero.Web.Mapper
         target.IsSuper = source.IsSuper;
         target.Email = source.Email;
         target.IsEmailConfirmed = source.IsEmailConfirmed;
-        target.Avatar = source.Avatar;
+        target.AvatarId = source.AvatarId;
         target.LanguageId = source.LanguageId;
         target.Roles = source.Roles;
         target.Claims = source.Claims;
@@ -37,7 +37,7 @@ namespace zero.Web.Mapper
         target.IsActive = source.IsActive;
         target.IsSuper = source.IsSuper;
         target.Email = source.Email;
-        target.Avatar = source.Avatar;
+        target.AvatarId = source.AvatarId;
         target.LanguageId = source.LanguageId;
         target.Roles = source.Roles;
         target.Claims = source.Claims;
@@ -49,7 +49,7 @@ namespace zero.Web.Mapper
         target.Name = source.Name;
         target.IsActive = source.IsActive && (!source.LockoutEnabled || !source.LockoutEnd.HasValue);
         target.Email = source.Email;
-        target.Avatar = source.Avatar?.Source;
+        target.AvatarId = source.AvatarId;
         target.Roles = String.Join(", ", source.Roles); // TODO get name from alias
       });
 
diff --git a/zero.Web/Models/UserEditModel.cs b/zero.Web/Models/UserEditModel.cs
index 48afed23..6759ed56 100644
--- a/zero.Web/Models/UserEditModel.cs
+++ b/zero.Web/Models/UserEditModel.cs
@@ -14,7 +14,7 @@ namespace zero.Web.Models
 
     public bool IsEmailConfirmed { get; set; }
 
-    public Media Avatar { get; set; }
+    public string AvatarId { get; set; }
 
     public string LanguageId { get; set; }
 
diff --git a/zero.Web/Models/UserListModel.cs b/zero.Web/Models/UserListModel.cs
index 49405cbf..19c258ae 100644
--- a/zero.Web/Models/UserListModel.cs
+++ b/zero.Web/Models/UserListModel.cs
@@ -10,6 +10,6 @@
 
     public string Roles { get; set; }
 
-    public string Avatar { get; set; }
+    public string AvatarId { get; set; }
   }
 }
diff --git a/zero.Web/ZeroVue.cs b/zero.Web/ZeroVue.cs
index 5b5afa4e..7598f620 100644
--- a/zero.Web/ZeroVue.cs
+++ b/zero.Web/ZeroVue.cs
@@ -15,6 +15,7 @@ using zero.Core.Extensions;
 using zero.Core.Identity;
 using zero.Core.Mapper;
 using zero.Core.Options;
+using zero.Core.Plugins;
 using zero.Web.Models;
 using zero.Web.Sections;
 
@@ -32,14 +33,17 @@ namespace zero.Web
 
     protected IMapper Mapper { get; private set; }
 
+    protected IEnumerable<IZeroPlugin> Plugins { get; private set; }
 
-    public ZeroVue(IZeroOptions options, IWebHostEnvironment env, IApplicationsApi applicationsApi, IAuthenticationApi authenticationApi, IMapper mapper)
+
+    public ZeroVue(IZeroOptions options, IWebHostEnvironment env, IApplicationsApi applicationsApi, IAuthenticationApi authenticationApi, IMapper mapper, IEnumerable<IZeroPlugin> plugins)
     {
       Environment = env;
       Options = options;
       ApplicationsApi = applicationsApi;
       AuthenticationApi = authenticationApi;
       Mapper = mapper;
+      Plugins = plugins;
       //zero.path = "@Model.BackofficePath.EnsureEndsWith('/')";
       //zero.translations = @Html.Raw(text);
     }
@@ -53,6 +57,8 @@ namespace zero.Web
       config.Path = Options.BackofficePath.EnsureEndsWith('/');
       config.ApiPath = config.Path + "api/";
       config.PluginPath = "@/Plugins";
+      config.Version = Options.ZeroVersion;
+      config.PluginCount = 2; // TODO Plugins.Count();
       config.ErrorFieldNone = Constants.ErrorFieldNone;
       config.Sections = CreateSections();
       config.Translations = CreateTranslations();
@@ -253,6 +259,10 @@ namespace zero.Web
 
     public string PluginPath { get; set; }
 
+    public string Version { get; set; }
+
+    public int PluginCount { get; set; }
+
     public string ErrorFieldNone { get; set; }
 
     public UserEditModel User { get; set; }