Wiki reviews, improved node system handling, node link annotations, a…

…utosaving and dirty state checks
steffendx · Jun 17, 2021 · f5a9522 · f5a9522
1 parent 7d8f1a3
commit f5a9522
Show file tree

Hide file tree

Showing 187 changed files with 10,436 additions and 1,473 deletions.
diff --git a/Authentication/ExternalUserConstants.cs b/Authentication/ExternalUserConstants.cs
@@ -0,0 +1,18 @@
+namespace GoNorth.Authentication
+{
+    /// <summary>
+    /// Constants for external user
+    /// </summary>
+    public class ExternalUserConstants 
+    {
+        /// <summary>
+        /// External user id
+        /// </summary>
+        public const string ExternalUserId = "00000000-0000-0000-0000-000000000001";
+
+        /// <summary>
+        /// Login Name for an external user
+        /// </summary>
+        public const string ExternalUserLoginName = "EXTERNAL_USER";
+    }
+}
diff --git a/Config/MiscConfig.cs b/Config/MiscConfig.cs
@@ -54,5 +54,15 @@ public class MiscConfig
         /// Timeout for locks
         /// </summary>
         public int? ResourceLockTimespan { get; set;}
+
+        /// <summary>
+        /// True if external wiki sharing must be disabled, else false
+        /// </summary>
+        public bool? DisableWikiExternalSharing { get; set; }
+
+        /// <summary>
+        /// True if auto saving must be disabled
+        /// </summary>
+        public bool? DisableAutoSaving { get; set; }
     }
 }
diff --git a/Controllers/AikaController.cs b/Controllers/AikaController.cs
@@ -1,5 +1,8 @@
+using GoNorth.Config;
+using GoNorth.Models.AikaViewModels;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace GoNorth.Controllers
 {
@@ -10,14 +13,30 @@ namespace GoNorth.Controllers
     [ApiExplorerSettings(IgnoreApi = true)]
     public class AikaController : Controller
     {
+        /// <summary>
+        /// Misc config
+        /// </summary>
+        private readonly MiscConfig _config;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="configuration">Configuration</param>
+        public AikaController(IOptions<ConfigurationData> configuration)
+        {
+            _config = configuration.Value.Misc;
+        }
+
         /// <summary>
         /// Chapter Overview view
         /// </summary>
         /// <returns>View</returns>
         [HttpGet]
         public IActionResult Index()
         {
-            return View();
+            SharedAikaViewModel viewModel = new SharedAikaViewModel();
+            viewModel.DisableAutoSaving = _config.DisableAutoSaving.HasValue ? _config.DisableAutoSaving.Value : false;
+            return View(viewModel);
         }
 
         /// <summary>
@@ -27,7 +46,9 @@ public IActionResult Index()
         [HttpGet]
         public IActionResult Detail()
         {
-            return View();
+            SharedAikaViewModel viewModel = new SharedAikaViewModel();
+            viewModel.DisableAutoSaving = _config.DisableAutoSaving.HasValue ? _config.DisableAutoSaving.Value : false;
+            return View(viewModel);
         }
 
         /// <summary>
@@ -37,7 +58,9 @@ public IActionResult Detail()
         [HttpGet]
         public IActionResult Quest()
         {
-            return View();
+            SharedAikaViewModel viewModel = new SharedAikaViewModel();
+            viewModel.DisableAutoSaving = _config.DisableAutoSaving.HasValue ? _config.DisableAutoSaving.Value : false;
+            return View(viewModel);
         }
 
         /// <summary>

diff --git a/Controllers/Api/FlexFieldBaseApiController.cs b/Controllers/Api/FlexFieldBaseApiController.cs
@@ -157,6 +157,11 @@ public class ImportFieldValuesLogQueryResult
         /// </summary>
         private const string ExcelCsvContentType = "application/vnd.ms-excel";
 
+        /// <summary>
+        /// Octet Stream Content Type
+        /// </summary>
+        private const string OctetStreamContentType = "application/octet-stream";
+
         /// <summary>
         /// CSV Header Id
         /// </summary>
@@ -1670,7 +1675,7 @@ public async Task<IActionResult> ImportFieldValuesPreCheck()
             }
 
             IFormFile uploadFile = Request.Form.Files[0];
-            if (uploadFile.ContentType != CsvContentType && uploadFile.ContentType != ExcelCsvContentType)
+            if (uploadFile.ContentType != CsvContentType && uploadFile.ContentType != ExcelCsvContentType && uploadFile.ContentType != OctetStreamContentType)
             {
                 return BadRequest();
             }