From b07858243b7d6eb404e7b39a01ddf9a045135657 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Wed, 9 Sep 2020 13:43:01 +0200
Subject: [PATCH] do highlight errors in editor tabs

---
 zero.Core/Api/ApplicationsApi.cs              |  4 +--
 zero.Core/Validation/ApplicationValidator.cs  |  7 ++--
 .../Validation/BackofficeUserValidator.cs     |  8 ++---
 zero.Core/Validation/MediaFolderValidator.cs  |  5 ++-
 zero.Web.UI/App/components/forms/error.vue    |  6 ++--
 zero.Web.UI/App/components/forms/form.vue     | 36 +++++++++++++++----
 zero.Web.UI/App/components/tabs/tab.vue       | 19 +++++++++-
 zero.Web.UI/App/components/tabs/tabs.vue      |  4 +--
 zero.Web.UI/App/renderers/application.js      | 10 ++++--
 zero.Web.UI/App/renderers/user.js             |  6 ++--
 zero.Web/Controllers/UsersController.cs       |  9 +----
 11 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/zero.Core/Api/ApplicationsApi.cs b/zero.Core/Api/ApplicationsApi.cs
index 81f06daf..2b74576b 100644
--- a/zero.Core/Api/ApplicationsApi.cs
+++ b/zero.Core/Api/ApplicationsApi.cs
@@ -13,9 +13,9 @@ namespace zero.Core.Api
     IValidator<IApplication> Validator;
 
 
-    public ApplicationsApi(IBackofficeStore store) : base(store)
+    public ApplicationsApi(IBackofficeStore store, IValidator<IApplication> validator) : base(store)
     {
-      Validator = null;
+      Validator = validator;
     }
 
 
diff --git a/zero.Core/Validation/ApplicationValidator.cs b/zero.Core/Validation/ApplicationValidator.cs
index 55ef4208..d0aab8cb 100644
--- a/zero.Core/Validation/ApplicationValidator.cs
+++ b/zero.Core/Validation/ApplicationValidator.cs
@@ -1,16 +1,17 @@
 using FluentValidation;
 using zero.Core.Entities;
-using zero.Core.Entities.Setup;
 using zero.Core.Extensions;
 
 namespace zero.Core.Validation
 {
-  public class ApplicationValidator : AbstractValidator<IApplication>
+  public class ApplicationValidator : ZeroValidator<IApplication>
   {
     public ApplicationValidator()
     {
       //RuleFor(x => x.Code).Length(2);
-      RuleFor(x => x.Name).NotEmpty().Length(2, 120);
+      RuleFor(x => x.Name).NotEmpty().Length(2, 50);
+      RuleFor(x => x.FullName).MaximumLength(120);
+      RuleFor(x => x.Email).Email().NotEmpty().MaximumLength(120);
       RuleFor(x => x.Domains).NotEmpty();
     }
   }
diff --git a/zero.Core/Validation/BackofficeUserValidator.cs b/zero.Core/Validation/BackofficeUserValidator.cs
index d468e303..2a23a6e9 100644
--- a/zero.Core/Validation/BackofficeUserValidator.cs
+++ b/zero.Core/Validation/BackofficeUserValidator.cs
@@ -4,14 +4,14 @@ using zero.Core.Extensions;
 
 namespace zero.Core.Validation
 {
-  public class BackofficeUserValidator : AbstractValidator<IUser>
+  public class BackofficeUserValidator : ZeroValidator<IUser>
   {
     public BackofficeUserValidator(bool isCreate = false)
     {
-      RuleFor(x => x.Name).NotEmpty();
-      RuleFor(x => x.Email).Email();
+      RuleFor(x => x.Name).Length(2, 80);
+      RuleFor(x => x.Email).NotEmpty().Email().MaximumLength(120);
       RuleFor(x => x.PasswordHash).NotEmpty();
-      RuleFor(x => x.LanguageId).NotEmpty(); // TODO only allow available languages
+      RuleFor(x => x.LanguageId).NotEmpty();
       RuleFor(x => x.Roles).NotEmpty();
 
       if (isCreate)
diff --git a/zero.Core/Validation/MediaFolderValidator.cs b/zero.Core/Validation/MediaFolderValidator.cs
index f449642a..f7ca42c6 100644
--- a/zero.Core/Validation/MediaFolderValidator.cs
+++ b/zero.Core/Validation/MediaFolderValidator.cs
@@ -1,14 +1,17 @@
 using FluentValidation;
+using zero.Core.Api;
 using zero.Core.Entities;
+using zero.Core.Extensions;
 
 namespace zero.Core.Validation
 {
   public class MediaFolderValidator : ZeroValidator<IMediaFolder>
   {
-    public MediaFolderValidator()
+    public MediaFolderValidator(IBackofficeStore store)
     {
       RuleFor(x => x.Name).Length(2, 80);
       RuleFor(x => x.IsActive).Equal(true);
+      RuleFor(x => x.ParentId).Exists(store);
     }
   }
 }
\ No newline at end of file
diff --git a/zero.Web.UI/App/components/forms/error.vue b/zero.Web.UI/App/components/forms/error.vue
index cb36db58..aded7dfb 100644
--- a/zero.Web.UI/App/components/forms/error.vue
+++ b/zero.Web.UI/App/components/forms/error.vue
@@ -46,11 +46,11 @@
     methods: {
 
       // set and display errors
-      set(errors, append)
+      setErrors(errors, append)
       {
         if (!errors)
         {
-          return this.clear();
+          return this.clearErrors();
         }
 
         if (!_isArray(errors))
@@ -78,7 +78,7 @@
 
 
       // clear errors and hide
-      clear()
+      clearErrors()
       {
         this.errors = [];
       }
diff --git a/zero.Web.UI/App/components/forms/form.vue b/zero.Web.UI/App/components/forms/form.vue
index 22a2e7a3..060988ef 100644
--- a/zero.Web.UI/App/components/forms/form.vue
+++ b/zero.Web.UI/App/components/forms/form.vue
@@ -275,7 +275,12 @@
       {
         this.getErrorComponents().forEach(component =>
         {
-          component.clear();
+          component.clearErrors();
+
+          if (component.tab)
+          {
+            component.tab.clearErrors();
+          }
         });
       },
 
@@ -305,7 +310,12 @@
           if (field && errorGroups[field])
           {
             handledGroups.push(field);
-            component.set(errorGroups[field]);
+            component.setErrors(errorGroups[field]);
+
+            if (component.tab)
+            {
+              component.tab.setErrors(true);
+            }
           }
         });
 
@@ -318,7 +328,12 @@
             {
               if (component.catchRemaining || component.catchAll)
               {
-                component.set(errorGroup, true);
+                component.setErrors(errorGroup, true);
+
+                if (component.tab)
+                {
+                  component.tab.setErrors(true);
+                }
               }
             });
           }
@@ -332,17 +347,26 @@
         let errorComponents = [];
 
         // find components which can output errors
-        let traverseChildren = parent =>
+        let traverseChildren = (parent, tab) =>
         {
           parent.$children.forEach(component =>
           {
             if (this.errorComponents.indexOf(component.$options.name) > -1)
             {
-              errorComponents.push(component);
+              errorComponents.push({
+                name: component.$options.name,
+                field: component.field,
+                catchAll: component.catchAll,
+                catchRemaining: component.catchRemaining,
+                component: component,
+                setErrors: component.setErrors,
+                clearErrors: component.clearErrors,
+                tab: tab
+              });
             }
             else
             {
-              traverseChildren(component);
+              traverseChildren(component, tab || (component.$options.name === 'uiTab' ? component : null));
             }
           });
         };
diff --git a/zero.Web.UI/App/components/tabs/tab.vue b/zero.Web.UI/App/components/tabs/tab.vue
index 3260417e..745c466c 100644
--- a/zero.Web.UI/App/components/tabs/tab.vue
+++ b/zero.Web.UI/App/components/tabs/tab.vue
@@ -6,6 +6,8 @@
 
 
 <script>
+  import Strings from 'zero/services/strings';
+
   export default {
     name: 'uiTab',
 
@@ -25,8 +27,10 @@
     },
 
     data: () => ({
+      id: null,
       loaded: false,
-      active: false
+      active: false,
+      hasErrors: false
     }),
 
     watch: {
@@ -38,11 +42,24 @@
 
     mounted ()
     {
+      this.id = Strings.guid();
       this.loaded = this.active;
     },
 
     methods: {
 
+      // set and display errors
+      setErrors(errors, append)
+      {
+        this.hasErrors = !!errors;
+      },
+
+      // clear errors and hide
+      clearErrors()
+      {
+        this.hasErrors = false;
+      }
+
     }
   }
 </script>
\ No newline at end of file
diff --git a/zero.Web.UI/App/components/tabs/tabs.vue b/zero.Web.UI/App/components/tabs/tabs.vue
index 68bbbff6..602f702f 100644
--- a/zero.Web.UI/App/components/tabs/tabs.vue
+++ b/zero.Web.UI/App/components/tabs/tabs.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="ui-tabs">
     <div role="tablist" class="ui-tabs-list">
-      <button type="button" v-for="(tab, index) in tabs" class="ui-tabs-list-item" :key="index" :class="{ 'is-active': tab.active, 'has-errors': tab.error }" :disabled="tab.disabled" 
+      <button type="button" v-for="(tab, index) in tabs" class="ui-tabs-list-item" :key="index" :class="{ 'is-active': tab.active, 'has-errors': tab.hasErrors }" :disabled="tab.disabled" 
               :aria-selected="tab.active" role="tab" @click="select(index)">
-        <i v-if="tab.error" class="ui-tabs-list-item-error fth-alert-circle"></i>
+        <i v-if="tab.hasErrors" class="ui-tabs-list-item-error fth-alert-circle"></i>
         {{ tab.label | localize }}
         <i v-if="tab.count > 0" class="ui-tabs-list-item-count">{{tab.count}}</i>
       </button>
diff --git a/zero.Web.UI/App/renderers/application.js b/zero.Web.UI/App/renderers/application.js
index 0e921b03..f4a61661 100644
--- a/zero.Web.UI/App/renderers/application.js
+++ b/zero.Web.UI/App/renderers/application.js
@@ -33,16 +33,19 @@
       field: 'name',
       display: 'text',
       label: '@ui.name',
-      required: true
+      required: true,
+      maxLength: 50
     },
     {
       field: 'fullName',
-      display: 'text'
+      display: 'text',
+      maxLength: 120
     },
     {
       field: 'email',
       display: 'text',
-      required: true
+      required: true,
+      maxLength: 120
     },
     {
       field: 'imageId',
@@ -59,6 +62,7 @@
       tab: 'domains',
       field: 'domains',
       display: 'inputList',
+      required: true,
       limit: 10,
       addLabel: '@application.fields.domains_add',
       helpText: '@application.fields.domains_help'
diff --git a/zero.Web.UI/App/renderers/user.js b/zero.Web.UI/App/renderers/user.js
index 50fd01d2..33c97f65 100644
--- a/zero.Web.UI/App/renderers/user.js
+++ b/zero.Web.UI/App/renderers/user.js
@@ -37,12 +37,14 @@ export default {
       field: 'name',
       display: 'text',
       label: '@ui.name',
-      required: true
+      required: true,
+      maxLength: 80
     },
     {
       field: 'email',
       display: 'text',
-      required: true
+      required: true,
+      maxLength: 120
     },
     {
       field: 'languageId',
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index 0b785344..aa89218a 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -12,17 +12,13 @@ namespace zero.Web.Controllers
   {
     IUserApi Api;
     IAuthenticationApi AuthenticationApi;
-    IUserRolesApi RolesApi;
-    ILanguagesApi LanguagesApi;
     IPermissionsApi PermissionsApi;
 
 
-    public UsersController(IUserApi api, IAuthenticationApi authenticationApi, IUserRolesApi rolesApi, ILanguagesApi languagesApi, IPermissionsApi permissionsApi)
+    public UsersController(IUserApi api, IAuthenticationApi authenticationApi, IPermissionsApi permissionsApi)
     {
       Api = api;
       AuthenticationApi = authenticationApi;
-      RolesApi = rolesApi;
-      LanguagesApi = languagesApi;
       PermissionsApi = permissionsApi;
     }
 
@@ -30,9 +26,6 @@ namespace zero.Web.Controllers
     public async Task<IActionResult> GetById([FromQuery] string id) => Edit(await Api.GetUserById(id));
 
 
-    public IActionResult GetSupportedCultures() => Json(LanguagesApi.GetAllCultures(Options.SupportedLanguages));
-
-
     public async Task<IActionResult> GetAll([FromQuery] ListQuery<IUser> query) => Json(await Api.GetByQuery(query));