From c49d02e3415ccf9b3eb5f586c23fd74e5d2e20d5 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Mon, 26 Jul 2021 15:22:19 +0200
Subject: [PATCH] fix some linkpicker bugs

---
 .../components/pickers/linkPicker/overlay.vue   | 17 +++++++++++++----
 zero.Web.UI/sass/Modules/_list.scss             |  7 ++++++-
 zero.Web/Controllers/LinksController.cs         |  9 ++++-----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/zero.Web.UI/App/components/pickers/linkPicker/overlay.vue b/zero.Web.UI/App/components/pickers/linkPicker/overlay.vue
index 552e7640..b0f68cea 100644
--- a/zero.Web.UI/App/components/pickers/linkPicker/overlay.vue
+++ b/zero.Web.UI/App/components/pickers/linkPicker/overlay.vue
@@ -84,13 +84,20 @@
           value: x.name
         };
       });
-      this.area = this.areas[0];
-      this.current = this.area.alias;
 
       this.link = JSON.parse(JSON.stringify(this.model || this.template));
-      this.link.area = this.current;
 
-      console.info(JSON.parse(JSON.stringify(this.link)));
+      if (this.model && this.model.area && this.areas.find(x => x.alias === this.model.area))
+      {
+        this.area = this.areas.find(x => x.alias === this.model.area);
+      }
+      else
+      {
+        this.area = this.areas[0];
+      }
+
+      this.current = this.area.alias;
+      this.link.area = this.current;
 
       setTimeout(() => this.opened = true, 300);
     },
@@ -105,6 +112,7 @@
 
       onSave()
       {
+        this.link.area = this.current;
         this.config.confirm(this.link);
       },
 
@@ -133,6 +141,7 @@
     border-radius: var(--radius);
     box-shadow: var(--shadow-short);
     font-weight: bold;
+    border-color: transparent;
   }
 
   .ui-linkpicker-overlay-area .ui-native-select select
diff --git a/zero.Web.UI/sass/Modules/_list.scss b/zero.Web.UI/sass/Modules/_list.scss
index d5e6c51a..94e5bd87 100644
--- a/zero.Web.UI/sass/Modules/_list.scss
+++ b/zero.Web.UI/sass/Modules/_list.scss
@@ -15,6 +15,11 @@
   position: relative;
   padding: 0 32px;
 
+  &.has-icon
+  {
+    grid-template-columns: 32px 1fr 32px;
+  }
+
   &:hover, &.is-selected
   {
     background: var(--color-tree-selected);
@@ -29,7 +34,7 @@
   position: relative;
   top: -2px;
   color: var(--color-text-dim);
-  justify-self: center;
+  align-self: center;
 }
 
 .ui-list-item-image
diff --git a/zero.Web/Controllers/LinksController.cs b/zero.Web/Controllers/LinksController.cs
index 803a14dd..861dcb2b 100644
--- a/zero.Web/Controllers/LinksController.cs
+++ b/zero.Web/Controllers/LinksController.cs
@@ -13,12 +13,12 @@ namespace zero.Web.Controllers
 {
   public class LinksController : BackofficeController
   {
-    IZeroStore Store;
+    IZeroDocumentSession Session;
     ILinks Links;
 
-    public LinksController(IZeroStore store, ILinks links)
+    public LinksController(IZeroDocumentSession session, ILinks links)
     {
-      Store = store;
+      Session = session;
       Links = links;
     }
 
@@ -26,7 +26,6 @@ namespace zero.Web.Controllers
     public async Task<IList<PreviewModel>> GetPreviews([FromBody] List<Link> links)
     {
       IList<PreviewModel> previews = new List<PreviewModel>();
-      using IAsyncDocumentSession session = Store.OpenAsyncSession();
 
       foreach (Link link in links)
       {
@@ -35,7 +34,7 @@ namespace zero.Web.Controllers
 
         if (provider != null)
         {
-          model = await provider.Preview(session, link);
+          model = await provider.Preview(Session, link);
         }
 
         previews.Add(model ?? new PreviewModel()